diff --git a/app/build.gradle b/app/build.gradle
index b7ccd8e5e3..855bd310a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 98006
-        versionName "98.6 - Stable"
+        versionCode 98009
+        versionName "98.9 - Stable"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 34d176828f..bb4d0b50cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="98006" android:versionName="98.6 - Stable" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="98009" android:versionName="98.9 - Stable" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
diff --git a/app/src/main/java/c/a/a/b/a.java b/app/src/main/java/c/a/a/b/a.java
index ef038ee38c..a6d83bc7f3 100644
--- a/app/src/main/java/c/a/a/b/a.java
+++ b/app/src/main/java/c/a/a/b/a.java
@@ -255,9 +255,9 @@ public final class a extends AppDialog {
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<R> E = h().observeViewState().w(d.i).E(e.i);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(E, this, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new f(this), 62, (Object) null);
+        Observable<R> F = h().observeViewState().x(d.i).F(e.i);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(F, this, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new f(this), 62, (Object) null);
         PublishSubject<f.b> publishSubject = h().j;
         m.checkNotNullExpressionValue(publishSubject, "eventSubject");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(publishSubject, this, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new g(this), 62, (Object) null);
diff --git a/app/src/main/java/c/a/a/b/d.java b/app/src/main/java/c/a/a/b/d.java
index 8b24c0adbe..ef7140647e 100644
--- a/app/src/main/java/c/a/a/b/d.java
+++ b/app/src/main/java/c/a/a/b/d.java
@@ -22,6 +22,6 @@ public final class d<T, R> implements b<Channel, Observable<? extends GuildMembe
     @Override // i0.k.b
     public Observable<? extends GuildMember> call(Channel channel) {
         Channel channel2 = channel;
-        return channel2 != null ? this.i.observeComputed(channel2.f(), m0.setOf(Long.valueOf(this.j))).E(new c(this, channel2)) : new j(null);
+        return channel2 != null ? this.i.observeComputed(channel2.f(), m0.setOf(Long.valueOf(this.j))).F(new c(this, channel2)) : new j(null);
     }
 }
diff --git a/app/src/main/java/c/a/a/b/f.java b/app/src/main/java/c/a/a/b/f.java
index 6c2fb56ff9..78c7194bac 100644
--- a/app/src/main/java/c/a/a/b/f.java
+++ b/app/src/main/java/c/a/a/b/f.java
@@ -265,7 +265,7 @@ public final class f extends AppViewModel<d> {
             StoreChannels channels = companion.getChannels();
             Observable<User> observeUser = users.observeUser(j);
             Observable<Integer> observe = userRelationships.observe(j);
-            Observable q = channels.observeChannel(j2).X(new d(guilds, j)).q();
+            Observable q = channels.observeChannel(j2).Y(new d(guilds, j)).q();
             m.checkNotNullExpressionValue(q, "storeChannels\n          …  .distinctUntilChanged()");
             observable2 = Observable.i(observeUser, observe, q, e.a).q();
             m.checkNotNullExpressionValue(observable2, "Observable.combineLatest…  .distinctUntilChanged()");
@@ -276,7 +276,7 @@ public final class f extends AppViewModel<d> {
         m.checkNotNullParameter(observable2, "storeObservable");
         this.k = j;
         this.l = api;
-        this.j = PublishSubject.j0();
+        this.j = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/c/a/a/c/k.java b/app/src/main/java/c/a/a/c/k.java
index 0c8697ba9f..97d23a6858 100644
--- a/app/src/main/java/c/a/a/c/k.java
+++ b/app/src/main/java/c/a/a/c/k.java
@@ -207,7 +207,7 @@ public final class k extends AppViewModel<c> {
         StorePremiumGuildSubscription premiumGuildSubscriptions = (i2 & 4) != 0 ? StoreStream.Companion.getPremiumGuildSubscriptions() : null;
         RestAPI api = (i2 & 8) != 0 ? RestAPI.Companion.getApi() : null;
         if ((i2 & 16) != 0) {
-            observable2 = subscriptions.observeSubscriptions().E(j.i);
+            observable2 = subscriptions.observeSubscriptions().F(j.i);
             m.checkNotNullExpressionValue(observable2, "storeSubscriptions\n     …toreState(it)\n          }");
         } else {
             observable2 = null;
diff --git a/app/src/main/java/c/a/a/f/a/a.java b/app/src/main/java/c/a/a/f/a/a.java
index 64dfd7871b..37126757a7 100644
--- a/app/src/main/java/c/a/a/f/a/a.java
+++ b/app/src/main/java/c/a/a/f/a/a.java
@@ -215,9 +215,9 @@ public final class a extends AppDialog {
 
     public static final void g(a aVar) {
         Objects.requireNonNull(aVar);
-        Observable<Long> c02 = Observable.c0(300, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(c02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, aVar, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(aVar), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(300, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, aVar, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(aVar), 62, (Object) null);
     }
 
     public static final d h(a aVar) {
diff --git a/app/src/main/java/c/a/a/w.java b/app/src/main/java/c/a/a/w.java
index 4a93418975..5f71e7a8ed 100644
--- a/app/src/main/java/c/a/a/w.java
+++ b/app/src/main/java/c/a/a/w.java
@@ -139,7 +139,7 @@ public final class w extends AppViewModel<d> {
         RestAPI api = (i2 & 1) != 0 ? RestAPI.Companion.getApi() : null;
         StoreUser users = (i2 & 2) != 0 ? StoreStream.Companion.getUsers() : null;
         if ((i2 & 4) != 0) {
-            observable2 = StoreUser.observeMe$default(users, false, 1, null).E(v.i);
+            observable2 = StoreUser.observeMe$default(users, false, 1, null).F(v.i);
             m.checkNotNullExpressionValue(observable2, "storeUser.observeMe().ma…oreState(user = meUser) }");
         } else {
             observable2 = null;
@@ -149,6 +149,6 @@ public final class w extends AppViewModel<d> {
         m.checkNotNullParameter(observable2, "storeObservable");
         this.k = api;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), w.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new u(this), 62, (Object) null);
-        this.j = PublishSubject.j0();
+        this.j = PublishSubject.k0();
     }
 }
diff --git a/app/src/main/java/c/a/d/a0.java b/app/src/main/java/c/a/d/a0.java
index 60517257d0..3ad7facf23 100644
--- a/app/src/main/java/c/a/d/a0.java
+++ b/app/src/main/java/c/a/d/a0.java
@@ -16,6 +16,6 @@ public final class a0<T, R> implements Observable.c<T, R> {
 
     @Override // i0.k.b
     public Object call(Object obj) {
-        return ((Observable) obj).X(new z(this));
+        return ((Observable) obj).Y(new z(this));
     }
 }
diff --git a/app/src/main/java/c/a/d/k0.java b/app/src/main/java/c/a/d/k0.java
index 0cd289455f..4efed1a27a 100644
--- a/app/src/main/java/c/a/d/k0.java
+++ b/app/src/main/java/c/a/d/k0.java
@@ -12,6 +12,6 @@ public final class k0<T, R> implements b<Boolean, Observable<? extends RtcConnec
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // i0.k.b
     public Observable<? extends RtcConnection.StateChange> call(Boolean bool) {
-        return StoreStream.Companion.getRtcConnection().getConnectionState().w(j0.i);
+        return StoreStream.Companion.getRtcConnection().getConnectionState().x(j0.i);
     }
 }
diff --git a/app/src/main/java/c/a/d/l.java b/app/src/main/java/c/a/d/l.java
index 54c49341eb..ddc6216520 100644
--- a/app/src/main/java/c/a/d/l.java
+++ b/app/src/main/java/c/a/d/l.java
@@ -8,7 +8,7 @@ import rx.subjects.BehaviorSubject;
 /* compiled from: AppState.kt */
 public final class l {
     public static final ArrayList<Object> a = new ArrayList<>(4);
-    public static final BehaviorSubject<Integer> b = BehaviorSubject.k0(0);
+    public static final BehaviorSubject<Integer> b = BehaviorSubject.l0(0);
 
     /* renamed from: c  reason: collision with root package name */
     public static final l f48c = new l();
diff --git a/app/src/main/java/c/a/d/o.java b/app/src/main/java/c/a/d/o.java
index 86528791b0..0d4427757c 100644
--- a/app/src/main/java/c/a/d/o.java
+++ b/app/src/main/java/c/a/d/o.java
@@ -58,7 +58,7 @@ public final class o {
 
         @Override // i0.k.b
         public Object call(Object obj) {
-            return ((Observable) obj).X(new s(this)).q();
+            return ((Observable) obj).Y(new s(this)).q();
         }
     }
 
@@ -78,7 +78,7 @@ public final class o {
 
         @Override // i0.k.b
         public Object call(Object obj) {
-            return ((Observable) obj).X(new t(this));
+            return ((Observable) obj).Y(new t(this));
         }
     }
 
diff --git a/app/src/main/java/c/a/d/s.java b/app/src/main/java/c/a/d/s.java
index 17f64498ff..174a7229b0 100644
--- a/app/src/main/java/c/a/d/s.java
+++ b/app/src/main/java/c/a/d/s.java
@@ -15,6 +15,6 @@ public final class s<T, R> implements b<Map<K, ? extends V>, Observable<? extend
     @Override // i0.k.b
     public Object call(Object obj) {
         Map map = (Map) obj;
-        return Observable.z(this.i.i).w(new p(map)).f0(q.i, new r(this, map));
+        return Observable.A(this.i.i).x(new p(map)).g0(q.i, new r(this, map));
     }
 }
diff --git a/app/src/main/java/c/a/e/b.java b/app/src/main/java/c/a/e/b.java
index 4daedf5e8e..1e8890cbdb 100644
--- a/app/src/main/java/c/a/e/b.java
+++ b/app/src/main/java/c/a/e/b.java
@@ -42,7 +42,7 @@ public final class b implements Application.ActivityLifecycleCallbacks {
         if (function1 != null) {
             function1 = new c(function1);
         }
-        d.f55c = p.V(cVar, (Action1) function1);
+        d.f55c = p.W(cVar, (Action1) function1);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
diff --git a/app/src/main/java/c/a/e/d.java b/app/src/main/java/c/a/e/d.java
index 5e9b3d6a1b..7e57dac8b8 100644
--- a/app/src/main/java/c/a/e/d.java
+++ b/app/src/main/java/c/a/e/d.java
@@ -15,9 +15,9 @@ public final class d {
     public static final d d = new d();
 
     static {
-        BehaviorSubject k0 = BehaviorSubject.k0(true);
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(isBackgrounded)");
-        b = k0;
+        BehaviorSubject l0 = BehaviorSubject.l0(true);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(isBackgrounded)");
+        b = l0;
     }
 
     public final Observable<Boolean> a() {
diff --git a/app/src/main/java/c/a/i/u2.java b/app/src/main/java/c/a/i/u2.java
index ef4cf92ce7..86fe02bf73 100644
--- a/app/src/main/java/c/a/i/u2.java
+++ b/app/src/main/java/c/a/i/u2.java
@@ -19,16 +19,13 @@ public final class u2 implements ViewBinding {
     public final TextView d;
     @NonNull
     public final TextView e;
-    @NonNull
-    public final TextView f;
 
     public u2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) {
         this.a = linearLayout;
         this.b = textView;
-        this.f170c = textView2;
-        this.d = textView3;
-        this.e = textView4;
-        this.f = textView5;
+        this.f170c = textView3;
+        this.d = textView4;
+        this.e = textView5;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/k/b.java b/app/src/main/java/c/a/k/b.java
index e0b0e1ba32..1867737fce 100644
--- a/app/src/main/java/c/a/k/b.java
+++ b/app/src/main/java/c/a/k/b.java
@@ -218,7 +218,7 @@ public final class b {
         m.checkNotNullParameter(objArr, "formatArgs");
         m.checkNotNullParameter(renderContext, "renderContext");
         Map<String, String> map = renderContext.a;
-        List<? extends Object> list = renderContext.f2506c;
+        List<? extends Object> list = renderContext.f2504c;
         boolean z2 = true;
         if (!map.isEmpty()) {
             charSequence = a.replace(charSequence, new f(map));
diff --git a/app/src/main/java/c/a/k/f/c.java b/app/src/main/java/c/a/k/f/c.java
index c6a101c86b..64f67d0844 100644
--- a/app/src/main/java/c/a/k/f/c.java
+++ b/app/src/main/java/c/a/k/f/c.java
@@ -38,7 +38,7 @@ public final class c extends Node.a<RenderContext> {
                 spannableStringBuilder.setSpan(obj2, length, spannableStringBuilder.length(), 33);
             }
         }
-        Hook.a aVar2 = hook != null ? hook.f2505c : null;
+        Hook.a aVar2 = hook != null ? hook.f2503c : null;
         if (aVar2 != null) {
             aVar = aVar2;
         } else if (URLUtil.isValidUrl(this.a)) {
diff --git a/app/src/main/java/c/a/n/b.java b/app/src/main/java/c/a/n/b.java
index cc58164f48..78112297d4 100644
--- a/app/src/main/java/c/a/n/b.java
+++ b/app/src/main/java/c/a/n/b.java
@@ -23,7 +23,7 @@ public final class b extends o implements Function1<OverlayBubbleWrap, Boolean>
         OverlayBubbleWrap overlayBubbleWrap2 = overlayBubbleWrap;
         m.checkNotNullParameter(overlayBubbleWrap2, "bubbleWrap");
         try {
-            this.this$0.f2554r.removeViewImmediate(overlayBubbleWrap2);
+            this.this$0.f2552r.removeViewImmediate(overlayBubbleWrap2);
             this.this$0.l.invoke(overlayBubbleWrap2);
             z2 = true;
         } catch (IllegalArgumentException unused) {
diff --git a/app/src/main/java/c/a/n/d.java b/app/src/main/java/c/a/n/d.java
index eac41f3da3..d4986f48a9 100644
--- a/app/src/main/java/c/a/n/d.java
+++ b/app/src/main/java/c/a/n/d.java
@@ -77,8 +77,8 @@ public final class d implements View.OnClickListener {
         overlayBubbleWrap.addOnAttachStateChangeListener(new a(this));
         this.i.a(overlayBubbleWrap);
         this.k.setBubbleTouchable(false);
-        this.i.f2554r.removeViewImmediate(this.k);
-        WindowManager windowManager = this.i.f2554r;
+        this.i.f2552r.removeViewImmediate(this.k);
+        WindowManager windowManager = this.i.f2552r;
         OverlayBubbleWrap overlayBubbleWrap2 = this.k;
         windowManager.addView(overlayBubbleWrap2, overlayBubbleWrap2.getWindowLayoutParams());
     }
diff --git a/app/src/main/java/c/a/p/e.java b/app/src/main/java/c/a/p/e.java
index c1304c42c4..a0e9bdabe8 100644
--- a/app/src/main/java/c/a/p/e.java
+++ b/app/src/main/java/c/a/p/e.java
@@ -31,7 +31,7 @@ public final class e<T> implements Action1<k.c> {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            appMediaPlayer.b = Observable.D(500, 500, TimeUnit.MILLISECONDS, appMediaPlayer.i).J().H(a.a()).V(new g(appMediaPlayer), new h(appMediaPlayer));
+            appMediaPlayer.b = Observable.E(500, 500, TimeUnit.MILLISECONDS, appMediaPlayer.i).K().I(a.a()).W(new g(appMediaPlayer), new h(appMediaPlayer));
         } else if (i == 4) {
             PublishSubject<AppMediaPlayer.Event> publishSubject3 = this.i.a;
             publishSubject3.j.onNext(AppMediaPlayer.Event.e.a);
diff --git a/app/src/main/java/c/a/p/k.java b/app/src/main/java/c/a/p/k.java
index 190b82d349..dd3da708f9 100644
--- a/app/src/main/java/c/a/p/k.java
+++ b/app/src/main/java/c/a/p/k.java
@@ -12,9 +12,9 @@ import java.util.List;
 import rx.subjects.PublishSubject;
 /* compiled from: RxPlayerEventListener.kt */
 public final class k implements g1.a {
-    public final PublishSubject<c> i = PublishSubject.j0();
-    public final PublishSubject<a> j = PublishSubject.j0();
-    public final PublishSubject<b> k = PublishSubject.j0();
+    public final PublishSubject<c> i = PublishSubject.k0();
+    public final PublishSubject<a> j = PublishSubject.k0();
+    public final PublishSubject<b> k = PublishSubject.k0();
 
     /* compiled from: RxPlayerEventListener.kt */
     public static final class a {
diff --git a/app/src/main/java/c/a/q/a0.java b/app/src/main/java/c/a/q/a0.java
index ee18dc3e29..11c998e562 100644
--- a/app/src/main/java/c/a/q/a0.java
+++ b/app/src/main/java/c/a/q/a0.java
@@ -24,7 +24,7 @@ public final /* synthetic */ class a0 extends k implements Function1<Pair<? exte
         Pair<? extends Map<String, ? extends EncodeQuality>, ? extends RtcConnection.State> pair2 = pair;
         m.checkNotNullParameter(pair2, "p1");
         RtcConnection rtcConnection = (RtcConnection) this.receiver;
-        if (rtcConnection.f2571a0) {
+        if (rtcConnection.f2569a0) {
             Map map = (Map) pair2.component1();
             if (m.areEqual((RtcConnection.State) pair2.component2(), RtcConnection.State.f.a)) {
                 rtcConnection.U.i(rtcConnection.k, "local MediaSinkWants: " + map, null);
diff --git a/app/src/main/java/c/a/q/b0.java b/app/src/main/java/c/a/q/b0.java
index a2aa06d34f..60e9bf0a42 100644
--- a/app/src/main/java/c/a/q/b0.java
+++ b/app/src/main/java/c/a/q/b0.java
@@ -42,7 +42,7 @@ public final class b0 implements MediaEngineConnection.d {
         RtcConnection rtcConnection = this.a;
         rtcConnection.p.succeed();
         rtcConnection.q = transportInfo;
-        MediaEngineConnection mediaEngineConnection2 = rtcConnection.f2575w;
+        MediaEngineConnection mediaEngineConnection2 = rtcConnection.f2573w;
         if (mediaEngineConnection2 != null) {
             d dVar = new d(1000, rtcConnection.U, mediaEngineConnection2, new VoiceQuality(), rtcConnection.A, new KrispOveruseDetector(mediaEngineConnection2), 0, 64);
             dVar.a.clear();
@@ -50,13 +50,13 @@ public final class b0 implements MediaEngineConnection.d {
             if (subscription != null && !subscription.isUnsubscribed()) {
                 dVar.a();
             }
-            dVar.b = Observable.C(0, dVar.f230c, TimeUnit.MILLISECONDS).V(new b(dVar), new c(dVar));
+            dVar.b = Observable.D(0, dVar.f230c, TimeUnit.MILLISECONDS).W(new b(dVar), new c(dVar));
             rtcConnection.n = dVar;
             rtcConnection.o = false;
         }
-        if (transportInfo.f2593c.ordinal() != 0) {
+        if (transportInfo.f2591c.ordinal() != 0) {
             StringBuilder O = c.d.b.a.a.O("Unsupported protocol: ");
-            O.append(transportInfo.f2593c);
+            O.append(transportInfo.f2591c);
             O.append('.');
             RtcConnection.j(rtcConnection, true, O.toString(), null, false, 12);
         } else {
@@ -91,7 +91,7 @@ public final class b0 implements MediaEngineConnection.d {
         m.checkNotNullParameter(mediaEngineConnection, "connection");
         m.checkNotNullParameter(connectionState, "connectionState");
         RtcConnection rtcConnection = this.a;
-        RtcConnection.StateChange stateChange = rtcConnection.f2574r;
+        RtcConnection.StateChange stateChange = rtcConnection.f2572r;
         rtcConnection.r("Connection state change: " + connectionState);
         int ordinal = connectionState.ordinal();
         if (ordinal == 0) {
@@ -106,10 +106,10 @@ public final class b0 implements MediaEngineConnection.d {
             throw new NoWhenBranchMatchedException();
         }
         rtcConnection.u(state);
-        if (stateChange.a == RtcConnection.State.g.a && rtcConnection.f2574r.a == RtcConnection.State.h.a) {
+        if (stateChange.a == RtcConnection.State.g.a && rtcConnection.f2572r.a == RtcConnection.State.h.a) {
             rtcConnection.q();
         }
-        if (rtcConnection.f2574r.a == RtcConnection.State.f.a) {
+        if (rtcConnection.f2572r.a == RtcConnection.State.f.a) {
             rtcConnection.C = Long.valueOf(rtcConnection.V.currentTimeMillis());
             rtcConnection.I = true;
             Map<String, Object> mutableMapOf = h0.mutableMapOf(c0.o.to("connect_count", Integer.valueOf(rtcConnection.D)));
@@ -123,7 +123,7 @@ public final class b0 implements MediaEngineConnection.d {
             rtcConnection.p(RtcConnection.AnalyticsEvent.VOICE_CONNECTION_SUCCESS, mutableMapOf);
             MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.G;
             if (mediaSinkWantsManager != null) {
-                mediaSinkWantsManager.b(new i(mediaSinkWantsManager, rtcConnection.f2575w));
+                mediaSinkWantsManager.b(new i(mediaSinkWantsManager, rtcConnection.f2573w));
             }
         }
     }
diff --git a/app/src/main/java/c/a/q/h0.java b/app/src/main/java/c/a/q/h0.java
index 2153f429b5..843e0ea610 100644
--- a/app/src/main/java/c/a/q/h0.java
+++ b/app/src/main/java/c/a/q/h0.java
@@ -41,7 +41,7 @@ public final class h0 implements a.d {
     public void a(String str, String str2) {
         m.checkNotNullParameter(str, "audioCodec");
         m.checkNotNullParameter(str2, "videoCodec");
-        MediaEngineConnection mediaEngineConnection = this.a.f2575w;
+        MediaEngineConnection mediaEngineConnection = this.a.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.r(str, str2);
         }
@@ -52,11 +52,11 @@ public final class h0 implements a.d {
         RtcConnection rtcConnection = this.a;
         Objects.requireNonNull(rtcConnection);
         rtcConnection.r("Disconnected from RTC server. wasFatal: " + z2 + " -- code: " + num + " -- reason: " + str);
-        MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+        MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.destroy();
         }
-        MediaEngineConnection mediaEngineConnection2 = rtcConnection.f2575w;
+        MediaEngineConnection mediaEngineConnection2 = rtcConnection.f2573w;
         if (mediaEngineConnection2 != null) {
             mediaEngineConnection2.o(rtcConnection.M);
         }
@@ -67,7 +67,7 @@ public final class h0 implements a.d {
         if ((num != null && num.intValue() == 1000) || z4) {
             z3 = false;
         }
-        if (!(rtcConnection.f2574r.a instanceof RtcConnection.State.d)) {
+        if (!(rtcConnection.f2572r.a instanceof RtcConnection.State.d)) {
             rtcConnection.n(z3, str);
             d dVar = rtcConnection.n;
             if (dVar != null) {
@@ -76,7 +76,7 @@ public final class h0 implements a.d {
             rtcConnection.n = null;
             rtcConnection.o = false;
         }
-        rtcConnection.f2578z = 0;
+        rtcConnection.f2576z = 0;
         rtcConnection.C = null;
         MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.G;
         if (mediaSinkWantsManager != null) {
@@ -93,7 +93,7 @@ public final class h0 implements a.d {
     public void c(String str, List<Integer> list) {
         m.checkNotNullParameter(str, "mode");
         m.checkNotNullParameter(list, "secretKey");
-        MediaEngineConnection mediaEngineConnection = this.a.f2575w;
+        MediaEngineConnection mediaEngineConnection = this.a.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.t(str, u.toIntArray(list));
         }
@@ -241,7 +241,7 @@ public final class h0 implements a.d {
                     n nVar = cVar2.a;
                     int max = Math.max((int) (((double) j0Var.f212c.a) * nVar.f224c), j0Var.d);
                     int max2 = Math.max((int) (((double) j0Var.f212c.b) * nVar.f224c), j0Var.d);
-                    MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+                    MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
                     if (mediaEngineConnection != null) {
                         mediaEngineConnection.m(new MediaEngineConnection.b(max, max2, nVar.a, nVar.b, nVar.d, nVar.e));
                         return;
@@ -261,7 +261,7 @@ public final class h0 implements a.d {
             r.removeFirst(rtcConnection.u);
         }
         if (j > ((long) 500)) {
-            rtcConnection.f2578z++;
+            rtcConnection.f2576z++;
         }
         double d = (double) j;
         Objects.requireNonNull(RtcConnection.Quality.Companion);
@@ -372,7 +372,7 @@ public final class h0 implements a.d {
             return;
         }
         g.l(rtcConnection.M);
-        rtcConnection.f2575w = g;
+        rtcConnection.f2573w = g;
     }
 
     @Override // c.a.q.n0.a.d
@@ -391,7 +391,7 @@ public final class h0 implements a.d {
     public void onSpeaking(long j, int i, boolean z2) {
         RtcConnection rtcConnection = this.a;
         if (j != rtcConnection.S) {
-            MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+            MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
             if (mediaEngineConnection != null) {
                 mediaEngineConnection.s(j, i, null, rtcConnection.g(j), rtcConnection.h(j));
             }
diff --git a/app/src/main/java/c/a/q/j.java b/app/src/main/java/c/a/q/j.java
index a05f77f637..58101ee2f2 100644
--- a/app/src/main/java/c/a/q/j.java
+++ b/app/src/main/java/c/a/q/j.java
@@ -34,7 +34,7 @@ public final class j extends o implements Function0<Unit> {
         Long l2 = this.$userId;
         if (l2 == null) {
             this.this$0.e = null;
-        } else if (this.this$0.f2569c.contains(l2)) {
+        } else if (this.this$0.f2567c.contains(l2)) {
             MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0;
             Long l3 = this.$userId;
             mediaSinkWantsManager2.e = l3;
diff --git a/app/src/main/java/c/a/q/k0/f.java b/app/src/main/java/c/a/q/k0/f.java
index e3ef21aa61..64ba657fdd 100644
--- a/app/src/main/java/c/a/q/k0/f.java
+++ b/app/src/main/java/c/a/q/k0/f.java
@@ -19,8 +19,8 @@ public final class f extends ContentObserver {
         super.onChange(z2);
         DiscordAudioManager discordAudioManager = this.a;
         int streamVolume = discordAudioManager.e.getStreamVolume(3);
-        discordAudioManager.f2583w = streamVolume;
-        SerializedSubject<Integer, Integer> serializedSubject = discordAudioManager.f2585y;
+        discordAudioManager.f2581w = streamVolume;
+        SerializedSubject<Integer, Integer> serializedSubject = discordAudioManager.f2583y;
         serializedSubject.j.onNext(Integer.valueOf(streamVolume));
     }
 }
diff --git a/app/src/main/java/c/a/q/l.java b/app/src/main/java/c/a/q/l.java
index 3fa1d0d1b7..2cb01bd9b8 100644
--- a/app/src/main/java/c/a/q/l.java
+++ b/app/src/main/java/c/a/q/l.java
@@ -96,10 +96,10 @@ public final class l extends o implements Function0<Unit> {
         }
         if (arrayList2.isEmpty()) {
             this.this$0.b.remove(Long.valueOf(this.$userId));
-            this.this$0.f2569c.remove(Long.valueOf(this.$userId));
+            this.this$0.f2567c.remove(Long.valueOf(this.$userId));
         } else {
             this.this$0.b.put(Long.valueOf(this.$userId), arrayList2);
-            this.this$0.f2569c.add(Long.valueOf(this.$userId));
+            this.this$0.f2567c.add(Long.valueOf(this.$userId));
         }
         this.this$0.d(arrayList2.isEmpty() ? n.emptyList() : c0.t.m.listOf(String.valueOf(this.$userId)));
         return Unit.a;
diff --git a/app/src/main/java/c/a/q/m0/b.java b/app/src/main/java/c/a/q/m0/b.java
index e6076a06ed..8707e9df80 100644
--- a/app/src/main/java/c/a/q/m0/b.java
+++ b/app/src/main/java/c/a/q/m0/b.java
@@ -172,7 +172,7 @@ public final class b extends ScreenCapturerAndroid {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            Observable<Long> c02 = Observable.c0(((long) this.p) / 1000000, TimeUnit.MILLISECONDS);
+            Observable<Long> d02 = Observable.d0(((long) this.p) / 1000000, TimeUnit.MILLISECONDS);
             SurfaceTextureHelper surfaceTextureHelper = this.l;
             if (surfaceTextureHelper == null) {
                 m.throwUninitializedPropertyAccessException("surfaceTextureHelper");
@@ -182,7 +182,7 @@ public final class b extends ScreenCapturerAndroid {
             Looper looper = handler.getLooper();
             AtomicReference<i0.j.b.a> atomicReference = i0.j.b.a.a;
             Objects.requireNonNull(looper, "looper == null");
-            this.v = c02.W(new i0.j.b.b(looper)).V(new c(this), d.i);
+            this.v = d02.X(new i0.j.b.b(looper)).W(new c(this), d.i);
         }
     }
 
@@ -218,7 +218,7 @@ public final class b extends ScreenCapturerAndroid {
         if (thumbnailEmitter != null) {
             synchronized (thumbnailEmitter) {
                 thumbnailEmitter.d.release();
-                thumbnailEmitter.f2596c.release();
+                thumbnailEmitter.f2594c.release();
                 JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b);
                 thumbnailEmitter.a = RecyclerView.FOREVER_NS;
             }
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 1a8e43a4da..1bbc7cd72c 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
@@ -288,7 +288,7 @@ public final class e implements MediaEngineConnection {
             Connection connection2 = connection;
             c0.z.d.m.checkNotNullParameter(connection2, "$receiver");
             connection2.setVADLeadingFramesToBuffer(this.$inputModeOptions.b);
-            connection2.setVADTrailingFramesToSend(this.$inputModeOptions.f2595c);
+            connection2.setVADTrailingFramesToSend(this.$inputModeOptions.f2593c);
             connection2.setVADTriggerThreshold((float) this.$inputModeOptions.a);
             connection2.setVADAutoThreshold(this.$inputModeOptions.d ? 3 : -1);
             connection2.setVADUseKrisp(this.$inputModeOptions.e);
@@ -473,7 +473,7 @@ public final class e implements MediaEngineConnection {
             Connection connection2 = connection;
             c0.z.d.m.checkNotNullParameter(connection2, "$receiver");
             MediaEngineConnection.b bVar = this.$quality;
-            connection2.setEncodingQuality(bVar.a, bVar.b, bVar.f2594c, bVar.d, this.$frameRate);
+            connection2.setEncodingQuality(bVar.a, bVar.b, bVar.f2592c, bVar.d, this.$frameRate);
             return Unit.a;
         }
     }
@@ -610,7 +610,7 @@ public final class e implements MediaEngineConnection {
         this.d = h0.mutableMapOf(c0.o.to(Long.valueOf(j2), Integer.valueOf(aVar.a)));
         int i2 = aVar.a;
         String str = aVar.b;
-        int i3 = aVar.f2592c;
+        int i3 = aVar.f2590c;
         Object[] array = aVar.d.toArray(new StreamParameters[0]);
         Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
         Connection connectToServer = discord.connectToServer(i2, j2, str, i3, (StreamParameters[]) array, new d(this));
diff --git a/app/src/main/java/c/a/q/m0/c/k.java b/app/src/main/java/c/a/q/m0/c/k.java
index 5e3a7ae597..530308dcd8 100644
--- a/app/src/main/java/c/a/q/m0/c/k.java
+++ b/app/src/main/java/c/a/q/m0/c/k.java
@@ -418,7 +418,7 @@ public final class k implements MediaEngine {
                 discord2.setEchoCancellation(z2, false, new m(kVar2));
             }
             k kVar3 = this.this$0;
-            boolean z4 = voiceConfig.f2591c;
+            boolean z4 = voiceConfig.f2589c;
             Discord discord3 = kVar3.f;
             if (discord3 != null) {
                 discord3.setNoiseSuppression(z4);
@@ -492,15 +492,15 @@ public final class k implements MediaEngine {
         }
         p();
         if (this.f == null) {
-            Observable<Unit> v = Observable.v(new IllegalStateException("Failed to initialize native media engine"));
-            m.checkNotNullExpressionValue(v, "Observable.error(Illegal…ze native media engine\"))");
-            return v;
+            Observable<Unit> w2 = Observable.w(new IllegalStateException("Failed to initialize native media engine"));
+            m.checkNotNullExpressionValue(w2, "Observable.error(Illegal…ze native media engine\"))");
+            return w2;
         }
         Observable n = Observable.n(new q(this), Emitter.BackpressureMode.NONE);
         m.checkNotNullExpressionValue(n, "Observable.create({ emit…er.BackpressureMode.NONE)");
-        Observable<Unit> E = n.s(new e(this)).E(f.i);
-        m.checkNotNullExpressionValue(E, "getSupportedVideoCodecs(…s }\n        .map { Unit }");
-        return E;
+        Observable<Unit> F = n.t(new e(this)).F(f.i);
+        m.checkNotNullExpressionValue(F, "getSupportedVideoCodecs(…s }\n        .map { Unit }");
+        return F;
     }
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngine
diff --git a/app/src/main/java/c/a/q/m0/c/m.java b/app/src/main/java/c/a/q/m0/c/m.java
index f02589b647..36d8a1047f 100644
--- a/app/src/main/java/c/a/q/m0/c/m.java
+++ b/app/src/main/java/c/a/q/m0/c/m.java
@@ -38,7 +38,7 @@ public final class m implements Discord.AecConfigCallback {
             MediaEngine.EchoCancellationInfo echoCancellationInfo = kVar.i;
             kVar.i = null;
             if (echoCancellationInfo != null) {
-                MediaEngine.EchoCancellationInfo echoCancellationInfo2 = new MediaEngine.EchoCancellationInfo(echoCancellationInfo.a, echoCancellationInfo.b, echoCancellationInfo.f2590c, echoCancellationInfo.d, this.$requestEnable, this.$enabled, this.$requestMobileMode, this.$previouslyEnabled, this.$previouslyMobileMode);
+                MediaEngine.EchoCancellationInfo echoCancellationInfo2 = new MediaEngine.EchoCancellationInfo(echoCancellationInfo.a, echoCancellationInfo.b, echoCancellationInfo.f2588c, echoCancellationInfo.d, this.$requestEnable, this.$enabled, this.$requestMobileMode, this.$previouslyEnabled, this.$previouslyMobileMode);
                 d.e1("MediaEngineLegacy", "onEchoCancellationUpdated: " + echoCancellationInfo2);
                 this.this$0.a.p.onEchoCancellationUpdated(echoCancellationInfo2);
             }
diff --git a/app/src/main/java/c/a/q/n0/a.java b/app/src/main/java/c/a/q/n0/a.java
index 152788510e..e4d2c2699b 100644
--- a/app/src/main/java/c/a/q/n0/a.java
+++ b/app/src/main/java/c/a/q/n0/a.java
@@ -640,7 +640,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
         aVar.a(1, TimeUnit.MINUTES);
         SSLSocketFactory sSLSocketFactory = this.E;
         if (sSLSocketFactory != null) {
-            h.a aVar2 = e0.e0.k.h.f2993c;
+            h.a aVar2 = e0.e0.k.h.f2991c;
             aVar.b(sSLSocketFactory, e0.e0.k.h.a.n());
         }
         String G = c.d.b.a.a.G(new StringBuilder(), this.C, "?v=5");
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 dcd22589bf..d1bf2658fa 100644
--- a/app/src/main/java/c/a/q/o0/a.java
+++ b/app/src/main/java/c/a/q/o0/a.java
@@ -98,13 +98,13 @@ public final /* synthetic */ class a extends k implements Function1<Stats, Unit>
                     if (booleanValue) {
                         krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE);
                     } else if (longValue == 0) {
-                        int i = krispOveruseDetector.f2568c + 1;
-                        krispOveruseDetector.f2568c = i;
+                        int i = krispOveruseDetector.f2566c + 1;
+                        krispOveruseDetector.f2566c = i;
                         if (i > 2) {
                             krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED);
                         }
                     } else {
-                        krispOveruseDetector.f2568c = 0;
+                        krispOveruseDetector.f2566c = 0;
                     }
                 }
                 krispOveruseDetector.b = stats2.getOutboundRtpAudio();
diff --git a/app/src/main/java/c/a/q/s.java b/app/src/main/java/c/a/q/s.java
index c6f7ba6804..1c21af48c6 100644
--- a/app/src/main/java/c/a/q/s.java
+++ b/app/src/main/java/c/a/q/s.java
@@ -53,8 +53,8 @@ public final class s extends o implements Function0<Unit> {
                 rtcConnection.r("connecting via endpoint: " + replace$default + " token: " + str2);
                 try {
                     URI uri = new URI(v);
-                    rtcConnection.f2576x = uri.getHost();
-                    rtcConnection.f2577y = Integer.valueOf(uri.getPort());
+                    rtcConnection.f2574x = uri.getHost();
+                    rtcConnection.f2575y = Integer.valueOf(uri.getPort());
                 } catch (Exception e) {
                     rtcConnection.U.e(rtcConnection.k, "Failed to parse RTC endpoint", e, g0.mapOf(c0.o.to("endpoint", replace$default)));
                 }
diff --git a/app/src/main/java/c/a/q/w.java b/app/src/main/java/c/a/q/w.java
index 57645e6f02..88954208dd 100644
--- a/app/src/main/java/c/a/q/w.java
+++ b/app/src/main/java/c/a/q/w.java
@@ -30,7 +30,7 @@ public final class w extends o implements Function0<Unit> {
         rtcConnection.B = Long.valueOf(rtcConnection.V.currentTimeMillis());
         RtcConnection rtcConnection2 = this.this$0;
         rtcConnection2.D++;
-        rtcConnection2.E = rtcConnection2.T.a().b0(2, TimeUnit.SECONDS).V(new t(this), new v(this));
+        rtcConnection2.E = rtcConnection2.T.a().c0(2, TimeUnit.SECONDS).W(new t(this), new v(this));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/r/b.java b/app/src/main/java/c/a/r/b.java
index 0843566162..843dc161e1 100644
--- a/app/src/main/java/c/a/r/b.java
+++ b/app/src/main/java/c/a/r/b.java
@@ -77,7 +77,7 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
             }
             String joinToString$default = u.joinToString$default(arrayList, "&", null, null, 0, null, null, 62, null);
             RequestBody.Companion companion = RequestBody.Companion;
-            MediaType.a aVar = MediaType.f3124c;
+            MediaType.a aVar = MediaType.f3122c;
             RequestBody a = companion.a(joinToString$default, MediaType.a.a(ShareTarget.ENCODING_TYPE_URL_ENCODED));
             Request.a aVar2 = new Request.a();
             m.checkParameterIsNotNull(a, "body");
diff --git a/app/src/main/java/c/a/y/h0.java b/app/src/main/java/c/a/y/h0.java
index 1537123ad9..a54a88be82 100644
--- a/app/src/main/java/c/a/y/h0.java
+++ b/app/src/main/java/c/a/y/h0.java
@@ -18,6 +18,6 @@ public final class h0 extends o implements Function0<Boolean> {
     /* renamed from: invoke */
     public Boolean mo17invoke() {
         VoiceUserView voiceUserView = this.this$0;
-        return Boolean.valueOf(voiceUserView.l == VoiceUserView.a.RINGING && voiceUserView.f2620r);
+        return Boolean.valueOf(voiceUserView.l == VoiceUserView.a.RINGING && voiceUserView.f2618r);
     }
 }
diff --git a/app/src/main/java/c/a/y/j0/a.java b/app/src/main/java/c/a/y/j0/a.java
index c6087bd614..bef43ea689 100644
--- a/app/src/main/java/c/a/y/j0/a.java
+++ b/app/src/main/java/c/a/y/j0/a.java
@@ -18,8 +18,8 @@ public final class a<T, R> implements b<Unit, Observable<? extends Point>> {
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // i0.k.b
     public Observable<? extends Point> call(Unit unit) {
-        Observable<R> J = this.i.i.N(50, TimeUnit.MILLISECONDS).E(f.i).J();
-        m.checkNotNullExpressionValue(J, "frameResolutionSubject\n …  .onBackpressureLatest()");
-        return J;
+        Observable<R> K = this.i.i.O(50, TimeUnit.MILLISECONDS).F(f.i).K();
+        m.checkNotNullExpressionValue(K, "frameResolutionSubject\n …  .onBackpressureLatest()");
+        return K;
     }
 }
diff --git a/app/src/main/java/c/a/y/j0/e.java b/app/src/main/java/c/a/y/j0/e.java
index 19cd27d3bc..e13f1fb691 100644
--- a/app/src/main/java/c/a/y/j0/e.java
+++ b/app/src/main/java/c/a/y/j0/e.java
@@ -4,7 +4,7 @@ import org.webrtc.RendererCommon;
 import rx.subjects.BehaviorSubject;
 /* compiled from: RxRendererEvents.kt */
 public final class e implements RendererCommon.RendererEvents {
-    public final BehaviorSubject<a> i = BehaviorSubject.j0();
+    public final BehaviorSubject<a> i = BehaviorSubject.k0();
 
     /* compiled from: RxRendererEvents.kt */
     public static final class a {
diff --git a/app/src/main/java/c/a/y/l.java b/app/src/main/java/c/a/y/l.java
index 000c8641a6..c3557c610b 100644
--- a/app/src/main/java/c/a/y/l.java
+++ b/app/src/main/java/c/a/y/l.java
@@ -73,9 +73,9 @@ public abstract class l extends OverlayDialog implements AppComponent {
     public l(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.f249w = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.f249w = k0;
         setOnClickListener(new k(this));
     }
 
diff --git a/app/src/main/java/c/a/y/m0/a.java b/app/src/main/java/c/a/y/m0/a.java
index 7961a487cc..8cb4e1c8bf 100644
--- a/app/src/main/java/c/a/y/m0/a.java
+++ b/app/src/main/java/c/a/y/m0/a.java
@@ -21,6 +21,6 @@ public final class a implements View.OnClickListener {
         if (!(googlePlayInAppSku == null || (function1 = giftSelectView.j) == null)) {
             function1.invoke(googlePlayInAppSku);
         }
-        giftSelectView.i.f2203c.setOnClickListener(null);
+        giftSelectView.i.f2202c.setOnClickListener(null);
     }
 }
diff --git a/app/src/main/java/c/a/y/p.java b/app/src/main/java/c/a/y/p.java
index 1e5254ccc5..bb86ca6fc7 100644
--- a/app/src/main/java/c/a/y/p.java
+++ b/app/src/main/java/c/a/y/p.java
@@ -28,6 +28,6 @@ public final class p<T, R> implements b<Channel, Observable<? extends List<? ext
         StoreVoiceParticipants voiceParticipants = StoreStream.Companion.getVoiceParticipants();
         Long l = this.i;
         m.checkNotNullExpressionValue(l, "channelId");
-        return voiceParticipants.get(l.longValue()).E(new o(channel2)).q();
+        return voiceParticipants.get(l.longValue()).F(new o(channel2)).q();
     }
 }
diff --git a/app/src/main/java/c/a/y/w.java b/app/src/main/java/c/a/y/w.java
index cfd896b2bb..9dbccad62c 100644
--- a/app/src/main/java/c/a/y/w.java
+++ b/app/src/main/java/c/a/y/w.java
@@ -50,7 +50,7 @@ public final class w extends OverlayBubbleWrap implements AppComponent {
             }
             StoreVoiceParticipants voiceParticipants = StoreStream.Companion.getVoiceParticipants();
             m.checkNotNullExpressionValue(l2, "channelId");
-            return voiceParticipants.get(l2.longValue()).E(v.i).q();
+            return voiceParticipants.get(l2.longValue()).F(v.i).q();
         }
     }
 
@@ -92,9 +92,9 @@ public final class w extends OverlayBubbleWrap implements AppComponent {
         s0 s0Var = new s0(simpleDraweeView, simpleDraweeView);
         m.checkNotNullExpressionValue(s0Var, "OverlayVoiceBubbleBindin…rom(context), this, true)");
         this.f252x = s0Var;
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.f253y = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.f253y = k0;
     }
 
     @Override // com.discord.overlay.views.OverlayBubbleWrap
@@ -132,9 +132,9 @@ public final class w extends OverlayBubbleWrap implements AppComponent {
     @Override // android.view.View, android.view.ViewGroup
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        Observable<R> X = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().X(a.i);
-        m.checkNotNullExpressionValue(X, "StoreStream\n        .get…d()\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(X), this, null, 2, null), w.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 60, (Object) null);
+        Observable<R> Y = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().Y(a.i);
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…d()\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Y), this, null, 2, null), w.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 60, (Object) null);
     }
 
     @Override // com.discord.overlay.views.OverlayBubbleWrap, android.view.View
diff --git a/app/src/main/java/c/a/y/z.java b/app/src/main/java/c/a/y/z.java
index d9f99fd384..e52e3337cf 100644
--- a/app/src/main/java/c/a/y/z.java
+++ b/app/src/main/java/c/a/y/z.java
@@ -33,7 +33,7 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: OverlayVoiceSelectorBubbleDialog.kt */
 public final class z extends l implements AppComponent {
-    public final BehaviorSubject<String> A = BehaviorSubject.k0("");
+    public final BehaviorSubject<String> A = BehaviorSubject.l0("");
     public String B;
 
     /* renamed from: y  reason: collision with root package name */
@@ -170,9 +170,9 @@ public final class z extends l implements AppComponent {
         widgetGlobalSearchAdapter.setRecycler(recyclerView);
         MGRecyclerAdapter.Companion.configure(this.f255z);
         WidgetGlobalSearchModel.Companion companion = WidgetGlobalSearchModel.Companion;
-        Observable<String> E = this.A.E(c.i);
-        m.checkNotNullExpressionValue(E, "filterPublisher.map { \"!$it\" }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(companion.getForNav(E), this, this.f255z), z.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
+        Observable<String> F = this.A.F(c.i);
+        m.checkNotNullExpressionValue(F, "filterPublisher.map { \"!$it\" }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(companion.getForNav(F), this, this.f255z), z.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 
     @Override // android.view.View, android.view.ViewGroup
diff --git a/app/src/main/java/c/a/z/a/a/e.java b/app/src/main/java/c/a/z/a/a/e.java
index 40059d2c95..236ea2ae9c 100644
--- a/app/src/main/java/c/a/z/a/a/e.java
+++ b/app/src/main/java/c/a/z/a/a/e.java
@@ -29,7 +29,7 @@ public final /* synthetic */ class e implements b {
         if (channel == null) {
             return new j(null);
         }
-        Observable h = Observable.h(StoreStream.getUsers().observeMe(), StoreStream.getGuilds().observeGuild(j), StoreStream.getPermissions().observePermissionsForChannel(j2), observable.o(300, TimeUnit.MILLISECONDS).X(new g(j, channel)).q(), new j(channel));
+        Observable h = Observable.h(StoreStream.getUsers().observeMe(), StoreStream.getGuilds().observeGuild(j), StoreStream.getPermissions().observePermissionsForChannel(j2), observable.o(300, TimeUnit.MILLISECONDS).Y(new g(j, channel)).q(), new j(channel));
         m.checkNotNullExpressionValue(h, "observable");
         return ObservableExtensionsKt.computationBuffered(h).q();
     }
diff --git a/app/src/main/java/c/a/z/a/a/h.java b/app/src/main/java/c/a/z/a/a/h.java
index e6a83ffb0d..6f50912f90 100644
--- a/app/src/main/java/c/a/z/a/a/h.java
+++ b/app/src/main/java/c/a/z/a/a/h.java
@@ -25,8 +25,8 @@ public final /* synthetic */ class h implements b {
     public final Object call(Object obj) {
         List list = this.i;
         Map map = this.j;
-        Observable g02 = Observable.g0(new r(Observable.z(((Map) obj).values()).w(new l(list)).w(new m(map)).w(new k(this.k)).i, new o2(new f(map), 10)));
+        Observable h02 = Observable.h0(new r(Observable.A(((Map) obj).values()).x(new l(list)).x(new m(map)).x(new k(this.k)).i, new o2(new f(map), 10)));
         l lVar = l.INSTANCE;
-        return (g02 instanceof j ? Observable.g0(new n.b(((j) g02).k, lVar)) : Observable.g0(new n(g02, lVar, i0.l.e.h.i))).E(new d(map)).e0();
+        return (h02 instanceof j ? Observable.h0(new n.b(((j) h02).k, lVar)) : Observable.h0(new n(h02, lVar, i0.l.e.h.i))).F(new d(map)).f0();
     }
 }
diff --git a/app/src/main/java/c/a/z/a/a/i.java b/app/src/main/java/c/a/z/a/a/i.java
index a9142f53c3..9d29a3f664 100644
--- a/app/src/main/java/c/a/z/a/a/i.java
+++ b/app/src/main/java/c/a/z/a/a/i.java
@@ -17,6 +17,6 @@ public final /* synthetic */ class i implements b {
     @Override // i0.k.b
     public final Object call(Object obj) {
         Map map = (Map) obj;
-        return StoreStream.getUsers().observeUsers(map.keySet()).X(new h(this.i, map, this.j));
+        return StoreStream.getUsers().observeUsers(map.keySet()).Y(new h(this.i, map, this.j));
     }
 }
diff --git a/app/src/main/java/c/a/z/a/a/q.java b/app/src/main/java/c/a/z/a/a/q.java
index 716a9f7b9d..6e0ece97ed 100644
--- a/app/src/main/java/c/a/z/a/a/q.java
+++ b/app/src/main/java/c/a/z/a/a/q.java
@@ -16,6 +16,6 @@ public final /* synthetic */ class q implements b {
     @Override // i0.k.b
     public final Object call(Object obj) {
         Channel channel = (Channel) obj;
-        return channel == null ? new j(null) : Observable.h(StoreStream.getGuilds().observeGuild(channel.f()), StoreStream.getUsers().observeMe(), StoreStream.getPermissions().observePermissionsForChannel(this.i), StoreStream.getGuilds().observeSortedRoles(channel.f()).X(new s(channel)), new r(channel));
+        return channel == null ? new j(null) : Observable.h(StoreStream.getGuilds().observeGuild(channel.f()), StoreStream.getUsers().observeMe(), StoreStream.getPermissions().observePermissionsForChannel(this.i), StoreStream.getGuilds().observeSortedRoles(channel.f()).Y(new s(channel)), new r(channel));
     }
 }
diff --git a/app/src/main/java/c/a/z/a/a/s.java b/app/src/main/java/c/a/z/a/a/s.java
index 439c9c78b7..997746b5f5 100644
--- a/app/src/main/java/c/a/z/a/a/s.java
+++ b/app/src/main/java/c/a/z/a/a/s.java
@@ -15,6 +15,6 @@ public final /* synthetic */ class s implements b {
 
     @Override // i0.k.b
     public final Object call(Object obj) {
-        return Observable.g0(new q((List) obj)).w(new t(this.i)).E(v.i).e0();
+        return Observable.h0(new q((List) obj)).x(new t(this.i)).F(v.i).f0();
     }
 }
diff --git a/app/src/main/java/c/b/a/a/a.java b/app/src/main/java/c/b/a/a/a.java
index f71e5cd955..d96fec3aaa 100644
--- a/app/src/main/java/c/b/a/a/a.java
+++ b/app/src/main/java/c/b/a/a/a.java
@@ -98,7 +98,7 @@ public class a extends AppCompatDialogFragment {
                 }
             } else if (i == 2) {
                 FlexInputFragment flexInputFragment = (FlexInputFragment) ((Fragment) this.j);
-                FlexInputViewModel flexInputViewModel = flexInputFragment.f2924r;
+                FlexInputViewModel flexInputViewModel = flexInputFragment.f2922r;
                 if (flexInputViewModel != null) {
                     flexInputViewModel.onSendButtonClicked(flexInputFragment.n);
                 }
@@ -418,7 +418,7 @@ public class a extends AppCompatDialogFragment {
                 flexInputFragment.k();
                 eVar.mo17invoke();
             } catch (UninitializedPropertyAccessException unused) {
-                flexInputFragment.f2925w.add(eVar);
+                flexInputFragment.f2923w.add(eVar);
             }
             FloatingActionButton floatingActionButton2 = this.l;
             if (floatingActionButton2 != null) {
diff --git a/app/src/main/java/c/b/a/a/b.java b/app/src/main/java/c/b/a/a/b.java
index 3fee35fe3c..23d76f9623 100644
--- a/app/src/main/java/c/b/a/a/b.java
+++ b/app/src/main/java/c/b/a/a/b.java
@@ -27,7 +27,7 @@ public final class b implements TabLayout.OnTabSelectedListener {
         if (position == 3) {
             this.a.h(false);
             Fragment parentFragment = this.a.getParentFragment();
-            if ((parentFragment instanceof FlexInputFragment) && (flexInputViewModel = ((FlexInputFragment) parentFragment).f2924r) != null) {
+            if ((parentFragment instanceof FlexInputFragment) && (flexInputViewModel = ((FlexInputFragment) parentFragment).f2922r) != null) {
                 flexInputViewModel.onCreateThreadSelected();
                 return;
             }
diff --git a/app/src/main/java/c/b/a/a/f.java b/app/src/main/java/c/b/a/a/f.java
index e57361ae2b..21d6e77d35 100644
--- a/app/src/main/java/c/b/a/a/f.java
+++ b/app/src/main/java/c/b/a/a/f.java
@@ -21,7 +21,7 @@ public final class f implements ViewPager.OnPageChangeListener {
 
     @Override // androidx.viewpager.widget.ViewPager.OnPageChangeListener
     public void onPageSelected(int i) {
-        FlexInputViewModel flexInputViewModel = this.a.f2924r;
+        FlexInputViewModel flexInputViewModel = this.a.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onContentDialogPageChanged(i);
         }
diff --git a/app/src/main/java/c/b/a/a/g.java b/app/src/main/java/c/b/a/a/g.java
index c318bcb620..50865afe8b 100644
--- a/app/src/main/java/c/b/a/a/g.java
+++ b/app/src/main/java/c/b/a/a/g.java
@@ -15,7 +15,7 @@ public final class g implements DialogInterface.OnDismissListener {
     @Override // android.content.DialogInterface.OnDismissListener
     public final void onDismiss(DialogInterface dialogInterface) {
         FlexInputViewModel flexInputViewModel;
-        if (this.i.isAdded() && !this.i.isHidden() && (flexInputViewModel = this.i.f2924r) != null) {
+        if (this.i.isAdded() && !this.i.isHidden() && (flexInputViewModel = this.i.f2922r) != null) {
             c.c0(flexInputViewModel, false, 1, null);
         }
     }
diff --git a/app/src/main/java/c/b/a/a/h.java b/app/src/main/java/c/b/a/a/h.java
index 45b9b976e3..defaf4e4a2 100644
--- a/app/src/main/java/c/b/a/a/h.java
+++ b/app/src/main/java/c/b/a/a/h.java
@@ -23,7 +23,7 @@ public final class h extends o implements Function1<View, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        FlexInputViewModel flexInputViewModel = this.this$0.f2924r;
+        FlexInputViewModel flexInputViewModel = this.this$0.f2922r;
         if (flexInputViewModel != null) {
             c.c0(flexInputViewModel, false, 1, null);
         }
diff --git a/app/src/main/java/c/b/a/a/i.java b/app/src/main/java/c/b/a/a/i.java
index a97dda852e..8fbc292854 100644
--- a/app/src/main/java/c/b/a/a/i.java
+++ b/app/src/main/java/c/b/a/a/i.java
@@ -14,7 +14,7 @@ public final class i implements View.OnLongClickListener {
 
     @Override // android.view.View.OnLongClickListener
     public final boolean onLongClick(View view) {
-        FlexInputViewModel flexInputViewModel = this.i.f2924r;
+        FlexInputViewModel flexInputViewModel = this.i.f2922r;
         if (flexInputViewModel == null) {
             return false;
         }
diff --git a/app/src/main/java/c/b/a/a/l.java b/app/src/main/java/c/b/a/a/l.java
index fae8eaa6d5..465daa3075 100644
--- a/app/src/main/java/c/b/a/a/l.java
+++ b/app/src/main/java/c/b/a/a/l.java
@@ -58,6 +58,6 @@ public final class l extends o implements Function0<Unit> {
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
-        this.this$0.u = Observable.c0(300, TimeUnit.MILLISECONDS).H(i0.j.b.a.a()).U(new a(this));
+        this.this$0.u = Observable.d0(300, TimeUnit.MILLISECONDS).I(i0.j.b.a.a()).V(new a(this));
     }
 }
diff --git a/app/src/main/java/c/b/a/a/m.java b/app/src/main/java/c/b/a/a/m.java
index 1ac6f82e58..3d435b0085 100644
--- a/app/src/main/java/c/b/a/a/m.java
+++ b/app/src/main/java/c/b/a/a/m.java
@@ -17,7 +17,7 @@ public final class m implements SelectionCoordinator.ItemSelectionListener<Attac
     public void onItemSelected(Attachment<? extends Object> attachment) {
         c0.z.d.m.checkNotNullParameter(attachment, "item");
         FlexInputFragment flexInputFragment = this.a;
-        FlexInputViewModel flexInputViewModel = flexInputFragment.f2924r;
+        FlexInputViewModel flexInputViewModel = flexInputFragment.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onAttachmentsUpdated(flexInputFragment.b().getAttachments());
         }
@@ -28,7 +28,7 @@ public final class m implements SelectionCoordinator.ItemSelectionListener<Attac
     public void onItemUnselected(Attachment<? extends Object> attachment) {
         c0.z.d.m.checkNotNullParameter(attachment, "item");
         FlexInputFragment flexInputFragment = this.a;
-        FlexInputViewModel flexInputViewModel = flexInputFragment.f2924r;
+        FlexInputViewModel flexInputViewModel = flexInputFragment.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onAttachmentsUpdated(flexInputFragment.b().getAttachments());
         }
diff --git a/app/src/main/java/c/c/a/a0/d.java b/app/src/main/java/c/c/a/a0/d.java
index 58fcd0224b..4a6a95bf43 100644
--- a/app/src/main/java/c/c/a/a0/d.java
+++ b/app/src/main/java/c/c/a/a0/d.java
@@ -801,7 +801,7 @@ public class d {
         function1.invoke(renderContext);
         if (!(objArr.length == 0)) {
             if (!(!renderContext.a.isEmpty())) {
-                renderContext.f2506c = k.toList(objArr);
+                renderContext.f2504c = k.toList(objArr);
             } else {
                 throw new IllegalArgumentException("must provide named arguments OR formatArgs, not both.");
             }
diff --git a/app/src/main/java/c/e/b/c.java b/app/src/main/java/c/e/b/c.java
index 419fc34ea1..e167662fb6 100644
--- a/app/src/main/java/c/e/b/c.java
+++ b/app/src/main/java/c/e/b/c.java
@@ -77,8 +77,8 @@ public abstract class c {
                     q(fVar, replace2, arrayList, w.i);
                     n(fVar, replace2, arrayList, w.g);
                     q(fVar, replace2, arrayList, w.g);
-                    n(fVar, replace2, arrayList, w.f3066c);
-                    q(fVar, replace2, arrayList, w.f3066c);
+                    n(fVar, replace2, arrayList, w.f3064c);
+                    q(fVar, replace2, arrayList, w.f3064c);
                     o(fVar, replace2, arrayList);
                     cls2 = b.a(u, fVar.b());
                 }
diff --git a/app/src/main/java/c/f/g/a/a/c.java b/app/src/main/java/c/f/g/a/a/c.java
index 3126d92130..b053036acf 100644
--- a/app/src/main/java/c/f/g/a/a/c.java
+++ b/app/src/main/java/c/f/g/a/a/c.java
@@ -311,13 +311,13 @@ public class c extends AbstractDraweeController<CloseableReference<c.f.j.j.c>, I
         ImageRequest imageRequest = this.I;
         ImageRequest imageRequest2 = this.K;
         ImageRequest[] imageRequestArr = this.J;
-        if (imageRequest == null || (uri = imageRequest.f2681c) == null) {
+        if (imageRequest == null || (uri = imageRequest.f2679c) == null) {
             if (!(imageRequestArr == null || imageRequestArr.length <= 0 || imageRequestArr[0] == null)) {
                 ImageRequest imageRequest3 = imageRequestArr[0];
-                uri = imageRequest3 != null ? imageRequest3.f2681c : null;
+                uri = imageRequest3 != null ? imageRequest3.f2679c : null;
             }
             if (imageRequest2 != null) {
-                return imageRequest2.f2681c;
+                return imageRequest2.f2679c;
             }
             return null;
         }
diff --git a/app/src/main/java/c/f/g/a/a/d.java b/app/src/main/java/c/f/g/a/a/d.java
index df131fa9b5..2ca47188fc 100644
--- a/app/src/main/java/c/f/g/a/a/d.java
+++ b/app/src/main/java/c/f/g/a/a/d.java
@@ -85,7 +85,7 @@ public class d extends AbstractDraweeControllerBuilder<d, ImageRequest, Closeabl
         c.f.j.r.b.b();
         try {
             DraweeController draweeController = this.n;
-            String valueOf = String.valueOf(AbstractDraweeControllerBuilder.f2668c.getAndIncrement());
+            String valueOf = String.valueOf(AbstractDraweeControllerBuilder.f2666c.getAndIncrement());
             if (draweeController instanceof c) {
                 cVar = (c) draweeController;
             } else {
diff --git a/app/src/main/java/c/f/g/f/b.java b/app/src/main/java/c/f/g/f/b.java
index a6435d10e6..1f30af5950 100644
--- a/app/src/main/java/c/f/g/f/b.java
+++ b/app/src/main/java/c/f/g/f/b.java
@@ -30,7 +30,7 @@ public class b extends g implements f0 {
                 if (!draweeHolder.a) {
                     a.m(c.class, "%x: Draw requested for a non-attached controller %x. %s", Integer.valueOf(System.identityHashCode(draweeHolder)), Integer.valueOf(System.identityHashCode(draweeHolder.e)), draweeHolder.toString());
                     draweeHolder.b = true;
-                    draweeHolder.f2672c = true;
+                    draweeHolder.f2670c = true;
                     draweeHolder.b();
                 }
             }
diff --git a/app/src/main/java/c/f/j/c/f.java b/app/src/main/java/c/f/j/c/f.java
index 99fc626f10..7273a3c479 100644
--- a/app/src/main/java/c/f/j/c/f.java
+++ b/app/src/main/java/c/f/j/c/f.java
@@ -155,7 +155,7 @@ public class f {
         Objects.requireNonNull((z) this.g);
         Executor executor = y.g.a;
         if (eVar instanceof Boolean) {
-            return ((Boolean) eVar).booleanValue() ? y.g.f3155c : y.g.d;
+            return ((Boolean) eVar).booleanValue() ? y.g.f3153c : y.g.d;
         }
         y.g<e> gVar = new y.g<>();
         if (gVar.h(eVar)) {
diff --git a/app/src/main/java/c/f/j/c/n.java b/app/src/main/java/c/f/j/c/n.java
index 153cd7346b..db2edaccc8 100644
--- a/app/src/main/java/c/f/j/c/n.java
+++ b/app/src/main/java/c/f/j/c/n.java
@@ -9,11 +9,11 @@ public class n implements i {
     public static n a;
 
     public CacheKey a(ImageRequest imageRequest, Object obj) {
-        return new b(imageRequest.f2681c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, null, null, obj);
+        return new b(imageRequest.f2679c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, null, null, obj);
     }
 
     public CacheKey b(ImageRequest imageRequest, Object obj) {
-        return new f(imageRequest.f2681c.toString());
+        return new f(imageRequest.f2679c.toString());
     }
 
     public CacheKey c(ImageRequest imageRequest, Object obj) {
@@ -28,6 +28,6 @@ public class n implements i {
             cacheKey = null;
             str = null;
         }
-        return new b(imageRequest.f2681c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj);
+        return new b(imageRequest.f2679c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj);
     }
 }
diff --git a/app/src/main/java/c/f/j/c/v.java b/app/src/main/java/c/f/j/c/v.java
index ca0201f164..330e4d5a72 100644
--- a/app/src/main/java/c/f/j/c/v.java
+++ b/app/src/main/java/c/f/j/c/v.java
@@ -262,7 +262,7 @@ public class v<K, V> implements m<K, V>, w<K, V> {
             MemoryCacheParams memoryCacheParams = this.f;
             int min = Math.min(memoryCacheParams.d, memoryCacheParams.b - e());
             MemoryCacheParams memoryCacheParams2 = this.f;
-            p = p(min, Math.min(memoryCacheParams2.f2674c, memoryCacheParams2.a - f()));
+            p = p(min, Math.min(memoryCacheParams2.f2672c, memoryCacheParams2.a - f()));
             h(p);
         }
         i(p);
diff --git a/app/src/main/java/c/f/j/e/c.java b/app/src/main/java/c/f/j/e/c.java
index e1e6c0a07d..c71a88e856 100644
--- a/app/src/main/java/c/f/j/e/c.java
+++ b/app/src/main/java/c/f/j/e/c.java
@@ -17,7 +17,7 @@ public class c implements f {
 
     public h a(DiskCacheConfig diskCacheConfig) {
         Objects.requireNonNull(this.a);
-        e eVar = new e(diskCacheConfig.a, diskCacheConfig.f2661c, diskCacheConfig.b, diskCacheConfig.h);
+        e eVar = new e(diskCacheConfig.a, diskCacheConfig.f2659c, diskCacheConfig.b, diskCacheConfig.h);
         ExecutorService newSingleThreadExecutor = Executors.newSingleThreadExecutor();
         return new d(eVar, diskCacheConfig.g, new d.c(diskCacheConfig.f, diskCacheConfig.e, diskCacheConfig.d), diskCacheConfig.i, diskCacheConfig.h, diskCacheConfig.j, newSingleThreadExecutor, false);
     }
diff --git a/app/src/main/java/c/f/j/e/h.java b/app/src/main/java/c/f/j/e/h.java
index 97e73b42ed..27270c1e60 100644
--- a/app/src/main/java/c/f/j/e/h.java
+++ b/app/src/main/java/c/f/j/e/h.java
@@ -73,7 +73,7 @@ public class h {
         c.f.j.k.c cVar2;
         c.f.j.r.b.b();
         if (eVar == null) {
-            e eVar3 = imageRequest.f2682r;
+            e eVar3 = imageRequest.f2680r;
             if (eVar3 == null) {
                 eVar2 = this.b;
                 b0 b0Var = new b0(eVar2, this.f462c);
@@ -84,7 +84,7 @@ public class h {
                 ImageRequest.c f = ImageRequest.c.f(imageRequest.m, cVar);
                 String valueOf = String.valueOf(this.i.getAndIncrement());
                 if (!imageRequest.f) {
-                    if (c.f.d.l.b.e(imageRequest.f2681c)) {
+                    if (c.f.d.l.b.e(imageRequest.f2679c)) {
                         z2 = false;
                         c1 c1Var = new c1(imageRequest, valueOf, str, b0Var, obj, f, false, z2, imageRequest.l, this.l);
                         c.f.j.r.b.b();
@@ -102,7 +102,7 @@ public class h {
             }
             cVar2 = new c.f.j.k.c(this.b, eVar3);
         } else {
-            e eVar4 = imageRequest.f2682r;
+            e eVar4 = imageRequest.f2680r;
             if (eVar4 == null) {
                 eVar2 = new c.f.j.k.c(this.b, eVar);
                 b0 b0Var = new b0(eVar2, this.f462c);
diff --git a/app/src/main/java/c/f/j/e/p.java b/app/src/main/java/c/f/j/e/p.java
index dc39a02844..853c919d35 100644
--- a/app/src/main/java/c/f/j/e/p.java
+++ b/app/src/main/java/c/f/j/e/p.java
@@ -155,7 +155,7 @@ public class p {
         try {
             b.b();
             Objects.requireNonNull(imageRequest);
-            Uri uri = imageRequest.f2681c;
+            Uri uri = imageRequest.f2679c;
             d.y(uri, "Uri is null.");
             int i = imageRequest.d;
             if (i != 0) {
diff --git a/app/src/main/java/c/f/j/p/a1.java b/app/src/main/java/c/f/j/p/a1.java
index 01b96e230e..5ef0611f20 100644
--- a/app/src/main/java/c/f/j/p/a1.java
+++ b/app/src/main/java/c/f/j/p/a1.java
@@ -19,7 +19,7 @@ public class a1 extends g0 {
 
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
-        return c(this.f498c.openInputStream(imageRequest.f2681c), -1);
+        return c(this.f498c.openInputStream(imageRequest.f2679c), -1);
     }
 
     @Override // c.f.j.p.g0
diff --git a/app/src/main/java/c/f/j/p/d.java b/app/src/main/java/c/f/j/p/d.java
index d67ca3da25..169aa0e189 100644
--- a/app/src/main/java/c/f/j/p/d.java
+++ b/app/src/main/java/c/f/j/p/d.java
@@ -45,7 +45,7 @@ public class d implements w0 {
         HashMap hashMap = new HashMap();
         this.h = hashMap;
         hashMap.put(ModelAuditLogEntry.CHANGE_KEY_ID, str);
-        hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2681c);
+        hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2679c);
         this.d = str2;
         this.e = y0Var;
         this.f = obj;
diff --git a/app/src/main/java/c/f/j/p/d0.java b/app/src/main/java/c/f/j/p/d0.java
index 20badc4fd0..af8aaa86fc 100644
--- a/app/src/main/java/c/f/j/p/d0.java
+++ b/app/src/main/java/c/f/j/p/d0.java
@@ -25,10 +25,10 @@ public class d0 extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         int i;
-        InputStream open = this.f504c.open(imageRequest.f2681c.getPath().substring(1), 2);
+        InputStream open = this.f504c.open(imageRequest.f2679c.getPath().substring(1), 2);
         AssetFileDescriptor assetFileDescriptor = null;
         try {
-            assetFileDescriptor = this.f504c.openFd(imageRequest.f2681c.getPath().substring(1));
+            assetFileDescriptor = this.f504c.openFd(imageRequest.f2679c.getPath().substring(1));
             i = (int) assetFileDescriptor.getLength();
         } catch (IOException unused) {
             i = -1;
diff --git a/app/src/main/java/c/f/j/p/e0.java b/app/src/main/java/c/f/j/p/e0.java
index 4d180d9481..e0164e35aa 100644
--- a/app/src/main/java/c/f/j/p/e0.java
+++ b/app/src/main/java/c/f/j/p/e0.java
@@ -28,7 +28,7 @@ public class e0 extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         InputStream inputStream;
-        Uri uri = imageRequest.f2681c;
+        Uri uri = imageRequest.f2679c;
         Uri uri2 = b.a;
         boolean z2 = false;
         if (uri.getPath() != null && b.c(uri) && "com.android.contacts".equals(uri.getAuthority()) && !uri.getPath().startsWith(b.a.getPath())) {
diff --git a/app/src/main/java/c/f/j/p/f0.java b/app/src/main/java/c/f/j/p/f0.java
index 070ff02f20..80e591d1c1 100644
--- a/app/src/main/java/c/f/j/p/f0.java
+++ b/app/src/main/java/c/f/j/p/f0.java
@@ -42,7 +42,7 @@ public class f0 extends g0 implements j1<e> {
         c.f.j.d.e eVar;
         Cursor query;
         e f2;
-        Uri uri = imageRequest.f2681c;
+        Uri uri = imageRequest.f2679c;
         if (!b.b(uri) || (eVar = imageRequest.i) == null || (query = this.g.query(uri, f506c, null, null, null)) == null) {
             return null;
         }
diff --git a/app/src/main/java/c/f/j/p/i0.java b/app/src/main/java/c/f/j/p/i0.java
index aaa0d968cb..da06083290 100644
--- a/app/src/main/java/c/f/j/p/i0.java
+++ b/app/src/main/java/c/f/j/p/i0.java
@@ -25,10 +25,10 @@ public class i0 extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         int i;
-        InputStream openRawResource = this.f513c.openRawResource(Integer.parseInt(imageRequest.f2681c.getPath().substring(1)));
+        InputStream openRawResource = this.f513c.openRawResource(Integer.parseInt(imageRequest.f2679c.getPath().substring(1)));
         AssetFileDescriptor assetFileDescriptor = null;
         try {
-            assetFileDescriptor = this.f513c.openRawResourceFd(Integer.parseInt(imageRequest.f2681c.getPath().substring(1)));
+            assetFileDescriptor = this.f513c.openRawResourceFd(Integer.parseInt(imageRequest.f2679c.getPath().substring(1)));
             i = (int) assetFileDescriptor.getLength();
         } catch (Resources.NotFoundException unused) {
             i = -1;
diff --git a/app/src/main/java/c/f/j/p/j0.java b/app/src/main/java/c/f/j/p/j0.java
index 85c3478785..fdb216cd84 100644
--- a/app/src/main/java/c/f/j/p/j0.java
+++ b/app/src/main/java/c/f/j/p/j0.java
@@ -83,7 +83,7 @@ public class j0 implements v0<CloseableReference<c>> {
                 bitmap = ThumbnailUtils.createVideoThumbnail(str, i);
             } else {
                 try {
-                    ParcelFileDescriptor openFileDescriptor = j0.this.b.openFileDescriptor(this.p.f2681c, "r");
+                    ParcelFileDescriptor openFileDescriptor = j0.this.b.openFileDescriptor(this.p.f2679c, "r");
                     MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
                     mediaMetadataRetriever.setDataSource(openFileDescriptor.getFileDescriptor());
                     bitmap = mediaMetadataRetriever.getFrameAtTime(-1);
@@ -141,7 +141,7 @@ public class j0 implements v0<CloseableReference<c>> {
         String str;
         Uri uri;
         Objects.requireNonNull(j0Var);
-        Uri uri2 = imageRequest.f2681c;
+        Uri uri2 = imageRequest.f2679c;
         if (c.f.d.l.b.d(uri2)) {
             return imageRequest.a().getPath();
         }
diff --git a/app/src/main/java/c/f/j/p/m.java b/app/src/main/java/c/f/j/p/m.java
index 8056822aec..979bb42d0b 100644
--- a/app/src/main/java/c/f/j/p/m.java
+++ b/app/src/main/java/c/f/j/p/m.java
@@ -18,7 +18,7 @@ public class m extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         boolean z2;
-        String uri = imageRequest.f2681c.toString();
+        String uri = imageRequest.f2679c.toString();
         d.j(Boolean.valueOf(uri.substring(0, 5).equals("data:")));
         int indexOf = uri.indexOf(44);
         String substring = uri.substring(indexOf + 1, uri.length());
diff --git a/app/src/main/java/c/f/j/p/n.java b/app/src/main/java/c/f/j/p/n.java
index a59a3ea0f7..273961a78f 100644
--- a/app/src/main/java/c/f/j/p/n.java
+++ b/app/src/main/java/c/f/j/p/n.java
@@ -141,7 +141,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                     w0Var.d("image_format", eVar.k.b);
                     if (n.this.f || !b.m(i2, 16)) {
                         ImageRequest e2 = this.a.e();
-                        if (n.this.g || !c.f.d.l.b.e(e2.f2681c)) {
+                        if (n.this.g || !c.f.d.l.b.e(e2.f2679c)) {
                             eVar.p = c.c.a.a0.d.c0(e2.j, e2.i, eVar, this.b);
                         }
                     }
@@ -179,7 +179,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                                 synchronized (c0Var) {
                                     j = c0Var.j - c0Var.i;
                                 }
-                                String valueOf2 = String.valueOf(cVar2.f522c.e().f2681c);
+                                String valueOf2 = String.valueOf(cVar2.f522c.e().f2679c);
                                 int f = (z3 || m) ? eVar.f() : cVar2.o(eVar);
                                 i p = (z3 || m) ? h.a : cVar2.p();
                                 cVar2.d.e(cVar2.f522c, "DecodeProducer");
@@ -439,7 +439,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
     public void b(l<CloseableReference<c.f.j.j.c>> lVar, w0 w0Var) {
         try {
             c.f.j.r.b.b();
-            this.e.b(!c.f.d.l.b.e(w0Var.e().f2681c) ? new a(this, lVar, w0Var, this.h, this.i) : new b(this, lVar, w0Var, new d(this.a), this.d, this.h, this.i), w0Var);
+            this.e.b(!c.f.d.l.b.e(w0Var.e().f2679c) ? new a(this, lVar, w0Var, this.h, this.i) : new b(this, lVar, w0Var, new d(this.a), this.d, this.h, this.i), w0Var);
             c.f.j.r.b.b();
         } catch (Throwable th) {
             c.f.j.r.b.b();
diff --git a/app/src/main/java/c/f/j/p/o0.java b/app/src/main/java/c/f/j/p/o0.java
index 27c0bd5c26..2eadfe627e 100644
--- a/app/src/main/java/c/f/j/p/o0.java
+++ b/app/src/main/java/c/f/j/p/o0.java
@@ -64,7 +64,7 @@ public class o0 implements c<e, Void> {
                     this.f524c.b(eVar2, 9);
                 } else {
                     this.f524c.b(eVar2, 8);
-                    ImageRequestBuilder b = ImageRequestBuilder.b(e.f2681c);
+                    ImageRequestBuilder b = ImageRequestBuilder.b(e.f2679c);
                     b.e = e.h;
                     b.o = e.k;
                     b.f = e.b;
@@ -73,8 +73,8 @@ public class o0 implements c<e, Void> {
                     b.j = e.q;
                     b.g = e.f;
                     b.i = e.l;
-                    b.f2683c = e.i;
-                    b.n = e.f2682r;
+                    b.f2681c = e.i;
+                    b.n = e.f2680r;
                     b.d = e.j;
                     b.m = e.p;
                     b.p = e.s;
diff --git a/app/src/main/java/c/f/j/p/q0.java b/app/src/main/java/c/f/j/p/q0.java
index 51f7bedc08..ccda19c1f3 100644
--- a/app/src/main/java/c/f/j/p/q0.java
+++ b/app/src/main/java/c/f/j/p/q0.java
@@ -185,7 +185,7 @@ public class q0 implements v0<e> {
             return;
         }
         w0Var.o().e(w0Var, "PartialDiskCacheProducer");
-        Uri build = e.f2681c.buildUpon().appendQueryParameter("fresco_partial", "true").build();
+        Uri build = e.f2679c.buildUpon().appendQueryParameter("fresco_partial", "true").build();
         i iVar = this.b;
         w0Var.b();
         Objects.requireNonNull((n) iVar);
diff --git a/app/src/main/java/c/f/j/p/y.java b/app/src/main/java/c/f/j/p/y.java
index bb8c003217..d299e92f96 100644
--- a/app/src/main/java/c/f/j/p/y.java
+++ b/app/src/main/java/c/f/j/p/y.java
@@ -34,7 +34,7 @@ public class y implements Runnable {
         Objects.requireNonNull(a0Var);
         InputStream inputStream = null;
         try {
-            httpURLConnection = a0Var.a(aVar.b.e().f2681c, 5);
+            httpURLConnection = a0Var.a(aVar.b.e().f2679c, 5);
             try {
                 aVar.e = a0Var.f497c.now();
                 if (httpURLConnection != null) {
diff --git a/app/src/main/java/c/f/m/j.java b/app/src/main/java/c/f/m/j.java
index 7e6c385bdb..1b5e889814 100644
--- a/app/src/main/java/c/f/m/j.java
+++ b/app/src/main/java/c/f/m/j.java
@@ -12,7 +12,7 @@ public class j implements b {
         boolean z2;
         boolean contains;
         int i2 = ((i & 1) != 0 ? 16 : 0) | 0;
-        ReentrantReadWriteLock reentrantReadWriteLock = SoLoader.f2685c;
+        ReentrantReadWriteLock reentrantReadWriteLock = SoLoader.f2683c;
         reentrantReadWriteLock.readLock().lock();
         try {
             if (SoLoader.d == null) {
@@ -49,7 +49,7 @@ public class j implements b {
                     continue;
                 } catch (UnsatisfiedLinkError e) {
                     int i3 = SoLoader.e;
-                    SoLoader.f2685c.writeLock().lock();
+                    SoLoader.f2683c.writeLock().lock();
                     try {
                         if (SoLoader.g == null || !SoLoader.g.c()) {
                             z2 = false;
@@ -58,21 +58,21 @@ public class j implements b {
                             SoLoader.e = SoLoader.e + 1;
                             z2 = true;
                         }
-                        SoLoader.f2685c.writeLock().unlock();
+                        SoLoader.f2683c.writeLock().unlock();
                         if (SoLoader.e == i3) {
                             throw e;
                         }
                     } catch (IOException e2) {
                         throw new RuntimeException(e2);
                     } catch (Throwable th2) {
-                        SoLoader.f2685c.writeLock().unlock();
+                        SoLoader.f2683c.writeLock().unlock();
                         throw th2;
                     }
                 }
             } while (z2);
             return z5;
         } finally {
-            SoLoader.f2685c.readLock().unlock();
+            SoLoader.f2683c.readLock().unlock();
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/c/a2/b0/b.java b/app/src/main/java/c/i/a/c/a2/b0/b.java
index 3bb37100a5..ac06010a06 100644
--- a/app/src/main/java/c/i/a/c/a2/b0/b.java
+++ b/app/src/main/java/c/i/a/c/a2/b0/b.java
@@ -125,8 +125,8 @@ public final class b implements h {
                 Format.b bVar = new Format.b();
                 bVar.k = str;
                 bVar.l = e;
-                bVar.f2701x = 1;
-                bVar.f2702y = i;
+                bVar.f2699x = 1;
+                bVar.f2700y = i;
                 wVar.e(bVar.a());
             }
             int i2 = -1;
diff --git a/app/src/main/java/c/i/a/c/a2/d0/b.java b/app/src/main/java/c/i/a/c/a2/d0/b.java
index 2762919a42..b6b3332712 100644
--- a/app/src/main/java/c/i/a/c/a2/d0/b.java
+++ b/app/src/main/java/c/i/a/c/a2/d0/b.java
@@ -31,16 +31,16 @@ public final class b extends TagPayloadReader {
                 int i2 = b[(s >> 2) & 3];
                 Format.b bVar = new Format.b();
                 bVar.k = "audio/mpeg";
-                bVar.f2701x = 1;
-                bVar.f2702y = i2;
+                bVar.f2699x = 1;
+                bVar.f2700y = i2;
                 this.a.e(bVar.a());
                 this.d = true;
             } else if (i == 7 || i == 8) {
                 String str = i == 7 ? "audio/g711-alaw" : "audio/g711-mlaw";
                 Format.b bVar2 = new Format.b();
                 bVar2.k = str;
-                bVar2.f2701x = 1;
-                bVar2.f2702y = 8000;
+                bVar2.f2699x = 1;
+                bVar2.f2700y = 8000;
                 this.a.e(bVar2.a());
                 this.d = true;
             } else if (i != 10) {
@@ -73,8 +73,8 @@ public final class b extends TagPayloadReader {
             Format.b bVar = new Format.b();
             bVar.k = "audio/mp4a-latm";
             bVar.h = c2.f1056c;
-            bVar.f2701x = c2.b;
-            bVar.f2702y = c2.a;
+            bVar.f2699x = c2.b;
+            bVar.f2700y = c2.a;
             bVar.m = Collections.singletonList(bArr);
             this.a.e(bVar.a());
             this.d = true;
diff --git a/app/src/main/java/c/i/a/c/a2/f0/e.java b/app/src/main/java/c/i/a/c/a2/f0/e.java
index 491850e28a..3d235182b9 100644
--- a/app/src/main/java/c/i/a/c/a2/f0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/f0/e.java
@@ -1926,9 +1926,9 @@ public class e implements h {
                                 int i14 = (cVar.V ? 1 : 0) | 0 | (!cVar.U ? 2 : 0);
                                 bVar = new Format.b();
                                 if (!c.i.a.c.i2.s.h(str12)) {
-                                    bVar.f2701x = cVar.O;
-                                    bVar.f2702y = cVar.Q;
-                                    bVar.f2703z = i3;
+                                    bVar.f2699x = cVar.O;
+                                    bVar.f2700y = cVar.Q;
+                                    bVar.f2701z = i3;
                                     i4 = 1;
                                 } else if (c.i.a.c.i2.s.j(str12)) {
                                     if (cVar.q == 0) {
@@ -1997,7 +1997,7 @@ public class e implements h {
                                             bVar.s = i6;
                                             bVar.u = cVar.v;
                                             bVar.v = cVar.f716w;
-                                            bVar.f2700w = colorInfo;
+                                            bVar.f2698w = colorInfo;
                                             i4 = 2;
                                         }
                                     }
@@ -2010,7 +2010,7 @@ public class e implements h {
                                     bVar.s = i6;
                                     bVar.u = cVar.v;
                                     bVar.v = cVar.f716w;
-                                    bVar.f2700w = colorInfo;
+                                    bVar.f2698w = colorInfo;
                                     i4 = 2;
                                 } else if ("application/x-subrip".equals(str12) || "text/x-ssa".equals(str12) || "application/vobsub".equals(str12) || "application/pgs".equals(str12) || "application/dvbsubs".equals(str12)) {
                                     i4 = 3;
@@ -2024,7 +2024,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2074,7 +2074,7 @@ public class e implements h {
                                             bVar.b(i13);
                                             bVar.k = str12;
                                             bVar.l = i2;
-                                            bVar.f2698c = cVar.W;
+                                            bVar.f2696c = cVar.W;
                                             bVar.d = i14;
                                             bVar.m = list;
                                             bVar.h = str;
@@ -2113,7 +2113,7 @@ public class e implements h {
                                         bVar.b(i13);
                                         bVar.k = str12;
                                         bVar.l = i2;
-                                        bVar.f2698c = cVar.W;
+                                        bVar.f2696c = cVar.W;
                                         bVar.d = i14;
                                         bVar.m = list;
                                         bVar.h = str;
@@ -2152,7 +2152,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2698c = cVar.W;
+                                    bVar.f2696c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2191,7 +2191,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2256,7 +2256,7 @@ public class e implements h {
                                                     bVar.b(i13);
                                                     bVar.k = str12;
                                                     bVar.l = i2;
-                                                    bVar.f2698c = cVar.W;
+                                                    bVar.f2696c = cVar.W;
                                                     bVar.d = i14;
                                                     bVar.m = list;
                                                     bVar.h = str;
@@ -2308,7 +2308,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2345,7 +2345,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2402,7 +2402,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2698c = cVar.W;
+                                    bVar.f2696c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2446,7 +2446,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2484,7 +2484,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2522,7 +2522,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2560,7 +2560,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2599,7 +2599,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2637,7 +2637,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2676,7 +2676,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2714,7 +2714,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2752,7 +2752,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2790,7 +2790,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2828,7 +2828,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2865,7 +2865,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2895,7 +2895,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2698c = cVar.W;
+                                    bVar.f2696c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2936,7 +2936,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2698c = cVar.W;
+                                    bVar.f2696c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2982,7 +2982,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2698c = cVar.W;
+                                    bVar.f2696c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -3012,7 +3012,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3055,7 +3055,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2698c = cVar.W;
+                                    bVar.f2696c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -3083,7 +3083,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3125,7 +3125,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3163,7 +3163,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3201,7 +3201,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3239,7 +3239,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3277,7 +3277,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3315,7 +3315,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3357,7 +3357,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2698c = cVar.W;
+                                bVar.f2696c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
diff --git a/app/src/main/java/c/i/a/c/a2/g0/f.java b/app/src/main/java/c/i/a/c/a2/g0/f.java
index cfe94fe107..87791dc720 100644
--- a/app/src/main/java/c/i/a/c/a2/g0/f.java
+++ b/app/src/main/java/c/i/a/c/a2/g0/f.java
@@ -382,8 +382,8 @@ public final class f implements h {
                     z.a aVar4 = fVar.e;
                     bVar.k = aVar4.b;
                     bVar.l = 4096;
-                    bVar.f2701x = aVar4.e;
-                    bVar.f2702y = aVar4.d;
+                    bVar.f2699x = aVar4.e;
+                    bVar.f2700y = aVar4.d;
                     p pVar3 = fVar.f;
                     bVar.A = pVar3.b;
                     bVar.B = pVar3.f804c;
@@ -401,8 +401,8 @@ public final class f implements h {
                 z.a aVar4 = fVar.e;
                 bVar.k = aVar4.b;
                 bVar.l = 4096;
-                bVar.f2701x = aVar4.e;
-                bVar.f2702y = aVar4.d;
+                bVar.f2699x = aVar4.e;
+                bVar.f2700y = aVar4.d;
                 p pVar3 = fVar.f;
                 bVar.A = pVar3.b;
                 bVar.B = pVar3.f804c;
@@ -449,8 +449,8 @@ public final class f implements h {
                     z.a aVar4 = fVar.e;
                     bVar.k = aVar4.b;
                     bVar.l = 4096;
-                    bVar.f2701x = aVar4.e;
-                    bVar.f2702y = aVar4.d;
+                    bVar.f2699x = aVar4.e;
+                    bVar.f2700y = aVar4.d;
                     p pVar3 = fVar.f;
                     bVar.A = pVar3.b;
                     bVar.B = pVar3.f804c;
@@ -495,8 +495,8 @@ public final class f implements h {
             z.a aVar4 = fVar.e;
             bVar.k = aVar4.b;
             bVar.l = 4096;
-            bVar.f2701x = aVar4.e;
-            bVar.f2702y = aVar4.d;
+            bVar.f2699x = aVar4.e;
+            bVar.f2700y = aVar4.d;
             p pVar3 = fVar.f;
             bVar.A = pVar3.b;
             bVar.B = pVar3.f804c;
diff --git a/app/src/main/java/c/i/a/c/a2/h0/e.java b/app/src/main/java/c/i/a/c/a2/h0/e.java
index 2d12fea583..8cc9921d8a 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/e.java
@@ -1234,10 +1234,10 @@ public final class e {
                                                     Format.b bVar = new Format.b();
                                                     bVar.a = num;
                                                     bVar.k = str15;
-                                                    bVar.f2701x = i43;
-                                                    bVar.f2702y = i42;
+                                                    bVar.f2699x = i43;
+                                                    bVar.f2700y = i42;
                                                     bVar.n = drmInitData3;
-                                                    bVar.f2698c = str11;
+                                                    bVar.f2696c = str11;
                                                     format = bVar.a();
                                                     str7 = str15;
                                                 } else {
@@ -1266,10 +1266,10 @@ public final class e {
                                                         Format.b bVar2 = new Format.b();
                                                         bVar2.a = num2;
                                                         bVar2.k = str9;
-                                                        bVar2.f2701x = i45;
-                                                        bVar2.f2702y = i44;
+                                                        bVar2.f2699x = i45;
+                                                        bVar2.f2700y = i44;
                                                         bVar2.n = drmInitData3;
-                                                        bVar2.f2698c = str11;
+                                                        bVar2.f2696c = str11;
                                                         format = bVar2.a();
                                                     } else {
                                                         str7 = str15;
@@ -1281,18 +1281,18 @@ public final class e {
                                                             Format.b bVar3 = new Format.b();
                                                             bVar3.a = num3;
                                                             bVar3.k = "audio/ac4";
-                                                            bVar3.f2701x = 2;
-                                                            bVar3.f2702y = i46;
+                                                            bVar3.f2699x = 2;
+                                                            bVar3.f2700y = i46;
                                                             bVar3.n = drmInitData3;
-                                                            bVar3.f2698c = str11;
+                                                            bVar3.f2696c = str11;
                                                             format = bVar3.a();
                                                         } else if (f17 == 1684305011) {
                                                             Format.b r02 = c.d.b.a.a.r0(f3);
                                                             r02.k = str6;
-                                                            r02.f2701x = i19;
-                                                            r02.f2702y = i18;
+                                                            r02.f2699x = i19;
+                                                            r02.f2700y = i18;
                                                             r02.n = drmInitData3;
-                                                            r02.f2698c = str11;
+                                                            r02.f2696c = str11;
                                                             format = r02.a();
                                                         } else {
                                                             if (f17 == 1682927731) {
@@ -1412,12 +1412,12 @@ public final class e {
                                             Format.b r03 = c.d.b.a.a.r0(f3);
                                             r03.k = str6;
                                             r03.h = str5;
-                                            r03.f2701x = i19;
-                                            r03.f2702y = i18;
-                                            r03.f2703z = i16;
+                                            r03.f2699x = i19;
+                                            r03.f2700y = i18;
+                                            r03.f2701z = i16;
                                             r03.m = uVar;
                                             r03.n = drmInitData3;
-                                            r03.f2698c = str11;
+                                            r03.f2696c = str11;
                                             format2 = r03.a();
                                         }
                                         str = str11;
@@ -1442,12 +1442,12 @@ public final class e {
                                         Format.b r03 = c.d.b.a.a.r0(f3);
                                         r03.k = str6;
                                         r03.h = str5;
-                                        r03.f2701x = i19;
-                                        r03.f2702y = i18;
-                                        r03.f2703z = i16;
+                                        r03.f2699x = i19;
+                                        r03.f2700y = i18;
+                                        r03.f2701z = i16;
                                         r03.m = uVar;
                                         r03.n = drmInitData3;
-                                        r03.f2698c = str11;
+                                        r03.f2696c = str11;
                                         format2 = r03.a();
                                         str = str11;
                                         i29 = i12;
@@ -1475,12 +1475,12 @@ public final class e {
                                 Format.b r03 = c.d.b.a.a.r0(f3);
                                 r03.k = str6;
                                 r03.h = str5;
-                                r03.f2701x = i19;
-                                r03.f2702y = i18;
-                                r03.f2703z = i16;
+                                r03.f2699x = i19;
+                                r03.f2700y = i18;
+                                r03.f2701z = i16;
                                 r03.m = uVar;
                                 r03.n = drmInitData3;
-                                r03.f2698c = str11;
+                                r03.f2696c = str11;
                                 format2 = r03.a();
                                 str = str11;
                                 i29 = i12;
@@ -1501,7 +1501,7 @@ public final class e {
                                         aVar4 = aVar6;
                                         Format.b r04 = c.d.b.a.a.r0(f3);
                                         r04.k = str18;
-                                        r04.f2698c = str11;
+                                        r04.f2696c = str11;
                                         r04.o = j3;
                                         r04.m = uVar2;
                                         format2 = r04.a();
@@ -1522,7 +1522,7 @@ public final class e {
                                         aVar4 = aVar6;
                                         Format.b r04 = c.d.b.a.a.r0(f3);
                                         r04.k = str18;
-                                        r04.f2698c = str11;
+                                        r04.f2696c = str11;
                                         r04.o = j3;
                                         r04.m = uVar2;
                                         format2 = r04.a();
@@ -1533,7 +1533,7 @@ public final class e {
                                 aVar4 = aVar6;
                                 Format.b r04 = c.d.b.a.a.r0(f3);
                                 r04.k = str18;
-                                r04.f2698c = str11;
+                                r04.f2696c = str11;
                                 r04.o = j3;
                                 r04.m = uVar2;
                                 format2 = r04.a();
diff --git a/app/src/main/java/c/i/a/c/a2/h0/i.java b/app/src/main/java/c/i/a/c/a2/h0/i.java
index afc814db50..bd86245f1d 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/i.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/i.java
@@ -1115,7 +1115,7 @@ public final class i implements h, t {
                                         a2.l = pVar2.e + 30;
                                         int i35 = mVar.b;
                                         if (i35 == 2 && j4 > 0 && (i7 = pVar2.b) > 1) {
-                                            a2.f2699r = ((float) i7) / (((float) j4) / 1000000.0f);
+                                            a2.f2697r = ((float) i7) / (((float) j4) / 1000000.0f);
                                         }
                                         if (i35 == 1) {
                                             int i36 = pVar.b;
diff --git a/app/src/main/java/c/i/a/c/a2/i0/h.java b/app/src/main/java/c/i/a/c/a2/i0/h.java
index 48409fe382..83c46e6acb 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/h.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/h.java
@@ -39,8 +39,8 @@ public final class h extends i {
             List<byte[]> h = d.h(copyOf);
             Format.b bVar2 = new Format.b();
             bVar2.k = "audio/opus";
-            bVar2.f2701x = copyOf[9] & 255;
-            bVar2.f2702y = 48000;
+            bVar2.f2699x = copyOf[9] & 255;
+            bVar2.f2700y = 48000;
             bVar2.m = h;
             bVar.a = bVar2.a();
             this.o = true;
diff --git a/app/src/main/java/c/i/a/c/a2/i0/j.java b/app/src/main/java/c/i/a/c/a2/i0/j.java
index e83aeb2730..af0b305722 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/j.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/j.java
@@ -375,8 +375,8 @@ public final class j extends i {
                 bVar2.k = "audio/vorbis";
                 bVar2.f = a0Var2.d;
                 bVar2.g = a0Var2.f686c;
-                bVar2.f2701x = a0Var2.a;
-                bVar2.f2702y = a0Var2.b;
+                bVar2.f2699x = a0Var2.a;
+                bVar2.f2700y = a0Var2.b;
                 bVar2.m = arrayList;
                 bVar.a = bVar2.a();
                 return true;
diff --git a/app/src/main/java/c/i/a/c/a2/j0/e0.java b/app/src/main/java/c/i/a/c/a2/j0/e0.java
index 9dff201b26..eee4792892 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/e0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/e0.java
@@ -32,7 +32,7 @@ public final class e0 {
             bVar.a = str2;
             bVar.k = str;
             bVar.d = format.l;
-            bVar.f2698c = format.k;
+            bVar.f2696c = format.k;
             bVar.C = format.L;
             bVar.m = format.v;
             p.e(bVar.a());
diff --git a/app/src/main/java/c/i/a/c/a2/j0/g.java b/app/src/main/java/c/i/a/c/a2/j0/g.java
index 39a558cf77..bb41aa4fd2 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/g.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/g.java
@@ -313,9 +313,9 @@ public final class g implements o {
                         Format.b bVar = new Format.b();
                         bVar.a = this.d;
                         bVar.k = str;
-                        bVar.f2701x = i;
-                        bVar.f2702y = i15;
-                        bVar.f2698c = this.f766c;
+                        bVar.f2699x = i;
+                        bVar.f2700y = i15;
+                        bVar.f2696c = this.f766c;
                         Format a2 = bVar.a();
                         this.j = a2;
                         this.e.e(a2);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/i.java b/app/src/main/java/c/i/a/c/a2/j0/i.java
index 37c5af7a30..a34f00c6cb 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/i.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/i.java
@@ -89,9 +89,9 @@ public final class i implements o {
                         Format.b bVar = new Format.b();
                         bVar.a = this.d;
                         bVar.k = "audio/ac4";
-                        bVar.f2701x = 2;
-                        bVar.f2702y = b.a;
-                        bVar.f2698c = this.f772c;
+                        bVar.f2699x = 2;
+                        bVar.f2700y = b.a;
+                        bVar.f2696c = this.f772c;
                         Format a = bVar.a();
                         this.k = a;
                         this.e.e(a);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/j0.java b/app/src/main/java/c/i/a/c/a2/j0/j0.java
index 433e9d6f8d..35e40e9cae 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/j0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/j0.java
@@ -39,7 +39,7 @@ public final class j0 {
             bVar.a = dVar.b();
             bVar.k = str;
             bVar.d = format.l;
-            bVar.f2698c = format.k;
+            bVar.f2696c = format.k;
             bVar.C = format.L;
             bVar.m = format.v;
             p.e(bVar.a());
diff --git a/app/src/main/java/c/i/a/c/a2/j0/k.java b/app/src/main/java/c/i/a/c/a2/j0/k.java
index 969091ef65..665a00bead 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/k.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/k.java
@@ -191,10 +191,10 @@ public final class k implements o {
                                 bVar.a = this.f;
                                 bVar.k = "audio/mp4a-latm";
                                 bVar.h = c2.f1056c;
-                                bVar.f2701x = c2.b;
-                                bVar.f2702y = c2.a;
+                                bVar.f2699x = c2.b;
+                                bVar.f2700y = c2.a;
                                 bVar.m = Collections.singletonList(bArr3);
-                                bVar.f2698c = this.e;
+                                bVar.f2696c = this.e;
                                 Format a2 = bVar.a();
                                 this.f777r = 1024000000 / ((long) a2.H);
                                 this.g.e(a2);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/l.java b/app/src/main/java/c/i/a/c/a2/j0/l.java
index 9ad9036f7f..be43c1c224 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/l.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/l.java
@@ -144,7 +144,7 @@ public final class l implements i0.c {
                     }
                     Format.b bVar2 = new Format.b();
                     bVar2.k = str;
-                    bVar2.f2698c = str2;
+                    bVar2.f2696c = str2;
                     bVar2.C = i;
                     bVar2.m = list;
                     arrayList.add(bVar2.a());
diff --git a/app/src/main/java/c/i/a/c/a2/j0/m.java b/app/src/main/java/c/i/a/c/a2/j0/m.java
index ed6b8f4b94..e23f4c5750 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/m.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/m.java
@@ -168,10 +168,10 @@ public final class m implements o {
                         bVar.a = str;
                         bVar.k = "audio/vnd.dts";
                         bVar.f = i8;
-                        bVar.f2701x = i24;
-                        bVar.f2702y = i23;
+                        bVar.f2699x = i24;
+                        bVar.f2700y = i23;
                         bVar.n = null;
-                        bVar.f2698c = str2;
+                        bVar.f2696c = str2;
                         Format a = bVar.a();
                         this.i = a;
                         this.d.e(a);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/n.java b/app/src/main/java/c/i/a/c/a2/j0/n.java
index 155eb66176..a9d3287548 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/n.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/n.java
@@ -77,7 +77,7 @@ public final class n implements o {
             bVar.a = dVar.b();
             bVar.k = "application/dvbsubs";
             bVar.m = Collections.singletonList(aVar.b);
-            bVar.f2698c = aVar.a;
+            bVar.f2696c = aVar.a;
             p.e(bVar.a());
             this.b[i] = p;
         }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/u.java b/app/src/main/java/c/i/a/c/a2/j0/u.java
index e6825ae5c7..99a2384bd1 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/u.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/u.java
@@ -124,10 +124,10 @@ public final class u implements o {
                                             bVar.a = this.e;
                                             bVar.k = "audio/mp4a-latm";
                                             bVar.h = this.u;
-                                            bVar.f2701x = this.t;
-                                            bVar.f2702y = this.f793r;
+                                            bVar.f2699x = this.t;
+                                            bVar.f2700y = this.f793r;
                                             bVar.m = Collections.singletonList(bArr3);
-                                            bVar.f2698c = this.a;
+                                            bVar.f2696c = this.a;
                                             Format a = bVar.a();
                                             if (!a.equals(this.f)) {
                                                 this.f = a;
diff --git a/app/src/main/java/c/i/a/c/a2/j0/v.java b/app/src/main/java/c/i/a/c/a2/j0/v.java
index eda8cbc2c8..1e6f1b80f3 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/v.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/v.java
@@ -80,9 +80,9 @@ public final class v implements o {
                             bVar.a = this.e;
                             bVar.k = aVar.b;
                             bVar.l = 4096;
-                            bVar.f2701x = aVar.e;
-                            bVar.f2702y = i5;
-                            bVar.f2698c = this.f794c;
+                            bVar.f2699x = aVar.e;
+                            bVar.f2700y = i5;
+                            bVar.f2696c = this.f794c;
                             this.d.e(bVar.a());
                             this.h = true;
                         }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/x.java b/app/src/main/java/c/i/a/c/a2/j0/x.java
index e7771e53a3..932b52d2a1 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/x.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/x.java
@@ -40,7 +40,7 @@ public final class x implements c0 {
         long j2 = -9223372036854775807L;
         if (d != -9223372036854775807L) {
             Format format = this.a;
-            if (d != format.f2695x) {
+            if (d != format.f2693x) {
                 Format.b a = format.a();
                 a.o = d;
                 Format a2 = a.a();
diff --git a/app/src/main/java/c/i/a/c/a2/k0/b.java b/app/src/main/java/c/i/a/c/a2/k0/b.java
index 7dcacbe8e0..c4578198cf 100644
--- a/app/src/main/java/c/i/a/c/a2/k0/b.java
+++ b/app/src/main/java/c/i/a/c/a2/k0/b.java
@@ -67,9 +67,9 @@ public final class b implements h {
                 bVar.f = i5;
                 bVar.g = i5;
                 bVar.l = max * 2 * i2;
-                bVar.f2701x = cVar.b;
-                bVar.f2702y = i4;
-                bVar.f2703z = 2;
+                bVar.f2699x = cVar.b;
+                bVar.f2700y = i4;
+                bVar.f2701z = 2;
                 this.j = bVar.a();
                 return;
             }
@@ -157,9 +157,9 @@ public final class b implements h {
                 bVar.f = i4;
                 bVar.g = i4;
                 bVar.l = max;
-                bVar.f2701x = cVar.b;
-                bVar.f2702y = cVar.f801c;
-                bVar.f2703z = i;
+                bVar.f2699x = cVar.b;
+                bVar.f2700y = cVar.f801c;
+                bVar.f2701z = i;
                 this.d = bVar.a();
                 return;
             }
diff --git a/app/src/main/java/c/i/a/c/a2/o.java b/app/src/main/java/c/i/a/c/a2/o.java
index 9a1af17caf..bd0d17efb1 100644
--- a/app/src/main/java/c/i/a/c/a2/o.java
+++ b/app/src/main/java/c/i/a/c/a2/o.java
@@ -163,8 +163,8 @@ public final class o {
         Format.b bVar = new Format.b();
         bVar.k = "audio/flac";
         bVar.l = i;
-        bVar.f2701x = this.g;
-        bVar.f2702y = this.e;
+        bVar.f2699x = this.g;
+        bVar.f2700y = this.e;
         bVar.m = Collections.singletonList(bArr);
         bVar.i = f;
         return bVar.a();
diff --git a/app/src/main/java/c/i/a/c/b2/s.java b/app/src/main/java/c/i/a/c/b2/s.java
index ef1d8d303b..59d22e49c4 100644
--- a/app/src/main/java/c/i/a/c/b2/s.java
+++ b/app/src/main/java/c/i/a/c/b2/s.java
@@ -116,7 +116,7 @@ public final class s {
             if (format.B != format2.B) {
                 i |= 1024;
             }
-            if (!this.e && !(format.f2696y == format2.f2696y && format.f2697z == format2.f2697z)) {
+            if (!this.e && !(format.f2694y == format2.f2694y && format.f2695z == format2.f2695z)) {
                 i |= 512;
             }
             if (!f0.a(format.F, format2.F)) {
@@ -226,8 +226,8 @@ public final class s {
                 return false;
             }
             if (this.g) {
-                int i4 = format.f2696y;
-                if (i4 <= 0 || (i = format.f2697z) <= 0) {
+                int i4 = format.f2694y;
+                if (i4 <= 0 || (i = format.f2695z) <= 0) {
                     return true;
                 }
                 if (f0.a >= 21) {
@@ -238,9 +238,9 @@ public final class s {
                 }
                 if (!z5) {
                     StringBuilder O3 = a.O("legacyFrameSize, ");
-                    O3.append(format.f2696y);
+                    O3.append(format.f2694y);
                     O3.append("x");
-                    O3.append(format.f2697z);
+                    O3.append(format.f2695z);
                     h(O3.toString());
                 }
                 return z5;
diff --git a/app/src/main/java/c/i/a/c/c2/f.java b/app/src/main/java/c/i/a/c/c2/f.java
index db63311c26..bd95be9849 100644
--- a/app/src/main/java/c/i/a/c/c2/f.java
+++ b/app/src/main/java/c/i/a/c/c2/f.java
@@ -176,7 +176,7 @@ public final class f extends g0 implements Handler.Callback {
             } else if (I == -5) {
                 Format format = A.b;
                 Objects.requireNonNull(format);
-                this.E = format.f2695x;
+                this.E = format.f2693x;
             }
         }
         if (this.A > 0) {
diff --git a/app/src/main/java/c/i/a/c/d2/b0.java b/app/src/main/java/c/i/a/c/d2/b0.java
index 0c4bacecf8..c60802ff4e 100644
--- a/app/src/main/java/c/i/a/c/d2/b0.java
+++ b/app/src/main/java/c/i/a/c/d2/b0.java
@@ -1157,7 +1157,7 @@ public final class b0 implements v, j, Loader.b<a>, Loader.f, e0.b {
                 IcyHeaders icyHeaders = this.B;
                 if (icyHeaders != null) {
                     if (h || this.D[i2].b) {
-                        Metadata metadata = l.f2693r;
+                        Metadata metadata = l.f2691r;
                         Metadata metadata2 = metadata == null ? new Metadata(icyHeaders) : metadata.a(icyHeaders);
                         Format.b a2 = l.a();
                         a2.i = metadata2;
diff --git a/app/src/main/java/c/i/a/c/d2/c0.java b/app/src/main/java/c/i/a/c/d2/c0.java
index 44119d5603..7de4d8da00 100644
--- a/app/src/main/java/c/i/a/c/d2/c0.java
+++ b/app/src/main/java/c/i/a/c/d2/c0.java
@@ -106,8 +106,8 @@ public final class c0 extends j implements b0.b {
         if (dVar != null) {
             dVar.a(true);
         }
-        loader.f2776c.execute(new Loader.g(b0Var));
-        loader.f2776c.shutdown();
+        loader.f2774c.execute(new Loader.g(b0Var));
+        loader.f2774c.shutdown();
         b0Var.f836z.removeCallbacksAndMessages(null);
         b0Var.A = null;
         b0Var.V = true;
diff --git a/app/src/main/java/c/i/a/c/d2/e0.java b/app/src/main/java/c/i/a/c/d2/e0.java
index 3d44089e35..f3e6d5c664 100644
--- a/app/src/main/java/c/i/a/c/d2/e0.java
+++ b/app/src/main/java/c/i/a/c/d2/e0.java
@@ -371,9 +371,9 @@ public class e0 implements w {
         Format format2;
         Format format3 = this.g;
         boolean z2 = format3 == null;
-        DrmInitData drmInitData = z2 ? null : format3.f2694w;
+        DrmInitData drmInitData = z2 ? null : format3.f2692w;
         this.g = format;
-        DrmInitData drmInitData2 = format.f2694w;
+        DrmInitData drmInitData2 = format.f2692w;
         s sVar = this.f843c;
         if (sVar != null) {
             Class<? extends c.i.a.c.z1.w> c2 = sVar.c(format);
diff --git a/app/src/main/java/c/i/a/c/e2/l.java b/app/src/main/java/c/i/a/c/e2/l.java
index 2b4608c86c..bfdfd0dc87 100644
--- a/app/src/main/java/c/i/a/c/e2/l.java
+++ b/app/src/main/java/c/i/a/c/e2/l.java
@@ -447,7 +447,7 @@ public final class l extends g0 implements Handler.Callback {
                                 } else {
                                     Format format = this.f869w.b;
                                     if (format != null) {
-                                        iVar.q = format.f2695x;
+                                        iVar.q = format.f2693x;
                                         iVar.s();
                                         this.f872z &= !iVar.o();
                                     } else {
diff --git a/app/src/main/java/c/i/a/c/f2/b.java b/app/src/main/java/c/i/a/c/f2/b.java
index 261b3cff35..9159d46bf3 100644
--- a/app/src/main/java/c/i/a/c/f2/b.java
+++ b/app/src/main/java/c/i/a/c/f2/b.java
@@ -10,7 +10,7 @@ public final /* synthetic */ class b implements Comparator {
     public final int compare(Object obj, Object obj2) {
         Integer num = (Integer) obj;
         Integer num2 = (Integer) obj2;
-        int[] iArr = DefaultTrackSelector.f2741c;
+        int[] iArr = DefaultTrackSelector.f2739c;
         return 0;
     }
 }
diff --git a/app/src/main/java/c/i/a/c/f2/c.java b/app/src/main/java/c/i/a/c/f2/c.java
index 02ed8120e7..15e10cae46 100644
--- a/app/src/main/java/c/i/a/c/f2/c.java
+++ b/app/src/main/java/c/i/a/c/f2/c.java
@@ -10,7 +10,7 @@ public final /* synthetic */ class c implements Comparator {
     public final int compare(Object obj, Object obj2) {
         Integer num = (Integer) obj;
         Integer num2 = (Integer) obj2;
-        int[] iArr = DefaultTrackSelector.f2741c;
+        int[] iArr = DefaultTrackSelector.f2739c;
         if (num.intValue() == -1) {
             return num2.intValue() == -1 ? 0 : -1;
         }
diff --git a/app/src/main/java/c/i/a/c/f2/i.java b/app/src/main/java/c/i/a/c/f2/i.java
index 0a5fe64331..3abedae26a 100644
--- a/app/src/main/java/c/i/a/c/f2/i.java
+++ b/app/src/main/java/c/i/a/c/f2/i.java
@@ -206,7 +206,7 @@ public abstract class i extends l {
                     int i25 = iArr13[i24];
                     if (!parameters6.N && !parameters6.M) {
                         int i26 = parameters6.A ? 24 : 16;
-                        boolean z12 = parameters6.f2746z && (i25 & i26) != 0;
+                        boolean z12 = parameters6.f2744z && (i25 & i26) != 0;
                         DefaultTrackSelector.Parameters parameters7 = parameters6;
                         int i27 = 0;
                         while (true) {
@@ -218,7 +218,7 @@ public abstract class i extends l {
                             defaultTrackSelector = defaultTrackSelector2;
                             int i28 = parameters7.q;
                             iArr7 = iArr13;
-                            int i29 = parameters7.f2742r;
+                            int i29 = parameters7.f2740r;
                             iArr6 = iArr12;
                             int i30 = parameters7.s;
                             i9 = i23;
@@ -228,9 +228,9 @@ public abstract class i extends l {
                             aVar4 = aVar6;
                             int i33 = parameters7.v;
                             aVarArr = aVarArr2;
-                            int i34 = parameters7.f2743w;
+                            int i34 = parameters7.f2741w;
                             i8 = i24;
-                            int i35 = parameters7.f2744x;
+                            int i35 = parameters7.f2742x;
                             iArr8 = iArr16;
                             int i36 = parameters7.B;
                             parameters4 = parameters5;
@@ -238,12 +238,12 @@ public abstract class i extends l {
                             boolean z13 = parameters7.D;
                             trackGroupArray2 = trackGroupArray4;
                             if (trackGroup4.i < 2) {
-                                iArr9 = DefaultTrackSelector.f2741c;
+                                iArr9 = DefaultTrackSelector.f2739c;
                             } else {
                                 List<Integer> d = DefaultTrackSelector.d(trackGroup4, i36, i37, z13);
                                 ArrayList arrayList3 = (ArrayList) d;
                                 if (arrayList3.size() < 2) {
-                                    iArr9 = DefaultTrackSelector.f2741c;
+                                    iArr9 = DefaultTrackSelector.f2739c;
                                 } else {
                                     if (!z12) {
                                         HashSet hashSet2 = new HashSet();
@@ -301,7 +301,7 @@ public abstract class i extends l {
                                         }
                                         arrayList = arrayList;
                                     }
-                                    iArr9 = arrayList.size() < 2 ? DefaultTrackSelector.f2741c : c.l0(list);
+                                    iArr9 = arrayList.size() < 2 ? DefaultTrackSelector.f2739c : c.l0(list);
                                     if (iArr9.length <= 0) {
                                         aVar5 = new g.a(trackGroup4, iArr9);
                                         break;
@@ -354,7 +354,7 @@ public abstract class i extends l {
                                 Format format = trackGroup6.j[i44];
                                 if ((format.m & 16384) == 0 && DefaultTrackSelector.e(iArr18[i44], parameters4.O)) {
                                     DefaultTrackSelector.e eVar3 = new DefaultTrackSelector.e(format, parameters4, iArr18[i44], ((ArrayList) d2).contains(Integer.valueOf(i44)));
-                                    if ((eVar3.i || parameters4.f2745y) && (eVar2 == null || eVar3.compareTo(eVar2) > 0)) {
+                                    if ((eVar3.i || parameters4.f2743y) && (eVar2 == null || eVar3.compareTo(eVar2) > 0)) {
                                         i43 = i44;
                                         trackGroup7 = trackGroup6;
                                         eVar2 = eVar3;
diff --git a/app/src/main/java/c/i/a/c/g0.java b/app/src/main/java/c/i/a/c/g0.java
index 876fa89c58..f00e9372b4 100644
--- a/app/src/main/java/c/i/a/c/g0.java
+++ b/app/src/main/java/c/i/a/c/g0.java
@@ -71,9 +71,9 @@ public abstract class g0 implements k1, l1 {
         } else if (a == -5) {
             Format format = s0Var.b;
             Objects.requireNonNull(format);
-            if (format.f2695x != RecyclerView.FOREVER_NS) {
+            if (format.f2693x != RecyclerView.FOREVER_NS) {
                 Format.b a2 = format.a();
-                a2.o = format.f2695x + this.p;
+                a2.o = format.f2693x + this.p;
                 s0Var.b = a2.a();
             }
         }
diff --git a/app/src/main/java/c/i/a/c/j2/n.java b/app/src/main/java/c/i/a/c/j2/n.java
index 36d13c1eff..6636f614b2 100644
--- a/app/src/main/java/c/i/a/c/j2/n.java
+++ b/app/src/main/java/c/i/a/c/j2/n.java
@@ -1518,7 +1518,7 @@ public class n extends MediaCodecRenderer {
 
     public static int I0(s sVar, Format format) {
         if (format.u == -1) {
-            return G0(sVar, format.t, format.f2696y, format.f2697z);
+            return G0(sVar, format.t, format.f2694y, format.f2695z);
         }
         int size = format.v.size();
         int i = 0;
@@ -1710,9 +1710,9 @@ public class n extends MediaCodecRenderer {
     public e K(s sVar, Format format, Format format2) {
         e c2 = sVar.c(format, format2);
         int i = c2.e;
-        int i2 = format2.f2696y;
+        int i2 = format2.f2694y;
         a aVar = this.Y0;
-        if (i2 > aVar.a || format2.f2697z > aVar.b) {
+        if (i2 > aVar.a || format2.f2695z > aVar.b) {
             i |= 256;
         }
         if (I0(sVar, format2) > this.Y0.f982c) {
@@ -1768,11 +1768,11 @@ public class n extends MediaCodecRenderer {
         String str2 = sVar.f818c;
         Format[] formatArr2 = this.o;
         Objects.requireNonNull(formatArr2);
-        int i3 = format.f2696y;
-        int i4 = format.f2697z;
+        int i3 = format.f2694y;
+        int i4 = format.f2695z;
         int I0 = I0(sVar, format);
         if (formatArr2.length == 1) {
-            if (!(I0 == -1 || (G0 = G0(sVar, format.t, format.f2696y, format.f2697z)) == -1)) {
+            if (!(I0 == -1 || (G0 = G0(sVar, format.t, format.f2694y, format.f2695z)) == -1)) {
                 I0 = Math.min((int) (((float) I0) * 1.5f), G0);
             }
             aVar = new a(i3, i4, I0);
@@ -1785,15 +1785,15 @@ public class n extends MediaCodecRenderer {
                 Format format2 = formatArr2[i5];
                 if (format.F != null && format2.F == null) {
                     Format.b a2 = format2.a();
-                    a2.f2700w = format.F;
+                    a2.f2698w = format.F;
                     format2 = a2.a();
                 }
                 if (sVar.c(format, format2).d != 0) {
-                    int i6 = format2.f2696y;
+                    int i6 = format2.f2694y;
                     formatArr = formatArr2;
-                    z4 |= i6 == -1 || format2.f2697z == -1;
+                    z4 |= i6 == -1 || format2.f2695z == -1;
                     int max = Math.max(i3, i6);
-                    int max2 = Math.max(i4, format2.f2697z);
+                    int max2 = Math.max(i4, format2.f2695z);
                     I0 = Math.max(I0, I0(sVar, format2));
                     i4 = max2;
                     i3 = max;
@@ -1805,8 +1805,8 @@ public class n extends MediaCodecRenderer {
             }
             if (z4) {
                 Log.w("MediaCodecVideoRenderer", "Resolutions unknown. Codec max resolution: " + i3 + "x" + i4);
-                int i7 = format.f2697z;
-                int i8 = format.f2696y;
+                int i7 = format.f2695z;
+                int i8 = format.f2694y;
                 boolean z5 = i7 > i8;
                 int i9 = z5 ? i7 : i8;
                 if (z5) {
@@ -1863,8 +1863,8 @@ public class n extends MediaCodecRenderer {
                             }
                             mediaFormat = new MediaFormat();
                             mediaFormat.setString("mime", str);
-                            mediaFormat.setInteger("width", format.f2696y);
-                            mediaFormat.setInteger("height", format.f2697z);
+                            mediaFormat.setInteger("width", format.f2694y);
+                            mediaFormat.setInteger("height", format.f2695z);
                             d.W1(mediaFormat, format.v);
                             f2 = format.A;
                             if (f2 != -1.0f) {
@@ -1915,8 +1915,8 @@ public class n extends MediaCodecRenderer {
         i = !this.A1 ? this.B1 : 0;
         mediaFormat = new MediaFormat();
         mediaFormat.setString("mime", str);
-        mediaFormat.setInteger("width", format.f2696y);
-        mediaFormat.setInteger("height", format.f2697z);
+        mediaFormat.setInteger("width", format.f2694y);
+        mediaFormat.setInteger("height", format.f2695z);
         d.W1(mediaFormat, format.v);
         f2 = format.A;
         if (f2 != -1.0f) {
@@ -2215,8 +2215,8 @@ public class n extends MediaCodecRenderer {
             rVar.f(this.e1);
         }
         if (this.A1) {
-            this.s1 = format.f2696y;
-            this.t1 = format.f2697z;
+            this.s1 = format.f2694y;
+            this.t1 = format.f2695z;
         } else {
             Objects.requireNonNull(mediaFormat);
             boolean z2 = mediaFormat.containsKey("crop-right") && mediaFormat.containsKey("crop-left") && mediaFormat.containsKey("crop-bottom") && mediaFormat.containsKey("crop-top");
@@ -2596,7 +2596,7 @@ public class n extends MediaCodecRenderer {
         if (!c.i.a.c.i2.s.j(format.t)) {
             return 0;
         }
-        boolean z2 = format.f2694w != null;
+        boolean z2 = format.f2692w != null;
         List<s> H0 = H0(tVar, format, z2, false);
         if (z2 && H0.isEmpty()) {
             H0 = H0(tVar, format, false, false);
diff --git a/app/src/main/java/c/i/a/c/q0.java b/app/src/main/java/c/i/a/c/q0.java
index a627846059..ab9d8ccee9 100644
--- a/app/src/main/java/c/i/a/c/q0.java
+++ b/app/src/main/java/c/i/a/c/q0.java
@@ -2472,7 +2472,7 @@ public final class q0 implements Handler.Callback, v.a, b1.d, m0.a, h1.a {
             while (i2 < length) {
                 c.i.a.c.f2.g gVar = gVarArr[i2];
                 if (gVar != null) {
-                    Metadata metadata = gVar.d(i).f2693r;
+                    Metadata metadata = gVar.d(i).f2691r;
                     if (metadata == null) {
                         Metadata metadata2 = new Metadata(new Metadata.Entry[i]);
                         int i4 = i3 + 1;
diff --git a/app/src/main/java/c/i/a/c/v1/a0.java b/app/src/main/java/c/i/a/c/v1/a0.java
index 7019398065..8b2fbf3906 100644
--- a/app/src/main/java/c/i/a/c/v1/a0.java
+++ b/app/src/main/java/c/i/a/c/v1/a0.java
@@ -84,7 +84,7 @@ public final class a0 extends u {
     public AudioProcessor.a f(AudioProcessor.a aVar) throws AudioProcessor.UnhandledAudioFormatException {
         int i = aVar.d;
         if (i == 3 || i == 2 || i == 268435456 || i == 536870912 || i == 805306368 || i == 4) {
-            return i != 2 ? new AudioProcessor.a(aVar.b, aVar.f2704c, 2) : AudioProcessor.a.a;
+            return i != 2 ? new AudioProcessor.a(aVar.b, aVar.f2702c, 2) : AudioProcessor.a.a;
         }
         throw new AudioProcessor.UnhandledAudioFormatException(aVar);
     }
diff --git a/app/src/main/java/c/i/a/c/v1/d0.java b/app/src/main/java/c/i/a/c/v1/d0.java
index 4ee9cf7020..2c9580b14b 100644
--- a/app/src/main/java/c/i/a/c/v1/d0.java
+++ b/app/src/main/java/c/i/a/c/v1/d0.java
@@ -79,7 +79,7 @@ public final class d0 implements AudioProcessor {
                 i = aVar.b;
             }
             this.e = aVar;
-            AudioProcessor.a aVar2 = new AudioProcessor.a(i, aVar.f2704c, 2);
+            AudioProcessor.a aVar2 = new AudioProcessor.a(i, aVar.f2702c, 2);
             this.f = aVar2;
             this.i = true;
             return aVar2;
@@ -128,7 +128,7 @@ public final class d0 implements AudioProcessor {
             AudioProcessor.a aVar2 = this.f;
             this.h = aVar2;
             if (this.i) {
-                this.j = new c0(aVar.b, aVar.f2704c, this.f1055c, this.d, aVar2.b);
+                this.j = new c0(aVar.b, aVar.f2702c, this.f1055c, this.d, aVar2.b);
             } else {
                 c0 c0Var = this.j;
                 if (c0Var != null) {
diff --git a/app/src/main/java/c/i/a/c/v1/v.java b/app/src/main/java/c/i/a/c/v1/v.java
index 9b47720b62..144ba585a0 100644
--- a/app/src/main/java/c/i/a/c/v1/v.java
+++ b/app/src/main/java/c/i/a/c/v1/v.java
@@ -35,11 +35,11 @@ public final class v extends u {
             return AudioProcessor.a.a;
         }
         if (aVar.d == 2) {
-            boolean z2 = aVar.f2704c != iArr.length;
+            boolean z2 = aVar.f2702c != iArr.length;
             int i = 0;
             while (i < iArr.length) {
                 int i2 = iArr[i];
-                if (i2 < aVar.f2704c) {
+                if (i2 < aVar.f2702c) {
                     z2 |= i2 != i;
                     i++;
                 } else {
diff --git a/app/src/main/java/c/i/a/c/v1/x.java b/app/src/main/java/c/i/a/c/v1/x.java
index f34ae1b38b..6088f1cd4b 100644
--- a/app/src/main/java/c/i/a/c/v1/x.java
+++ b/app/src/main/java/c/i/a/c/v1/x.java
@@ -45,7 +45,7 @@ public final class x extends u {
     public AudioProcessor.a f(AudioProcessor.a aVar) throws AudioProcessor.UnhandledAudioFormatException {
         int i2 = aVar.d;
         if (f0.y(i2)) {
-            return i2 != 4 ? new AudioProcessor.a(aVar.b, aVar.f2704c, 4) : AudioProcessor.a.a;
+            return i2 != 4 ? new AudioProcessor.a(aVar.b, aVar.f2702c, 4) : AudioProcessor.a.a;
         }
         throw new AudioProcessor.UnhandledAudioFormatException(aVar);
     }
diff --git a/app/src/main/java/c/i/a/c/v1/y.java b/app/src/main/java/c/i/a/c/v1/y.java
index 27cfacbd00..d000a72d07 100644
--- a/app/src/main/java/c/i/a/c/v1/y.java
+++ b/app/src/main/java/c/i/a/c/v1/y.java
@@ -227,9 +227,9 @@ public class y extends MediaCodecRenderer implements r {
                     int i4 = format.H;
                     Format.b bVar = new Format.b();
                     bVar.k = "audio/raw";
-                    bVar.f2701x = i3;
-                    bVar.f2702y = i4;
-                    bVar.f2703z = 4;
+                    bVar.f2699x = i3;
+                    bVar.f2700y = i4;
+                    bVar.f2701z = 4;
                     if (audioSink.s(bVar.a()) == 2) {
                         mediaFormat.setInteger("pcm-encoding", 4);
                     }
@@ -365,11 +365,11 @@ public class y extends MediaCodecRenderer implements r {
             int r2 = "audio/raw".equals(format.t) ? format.I : (f0.a < 24 || !mediaFormat.containsKey("pcm-encoding")) ? mediaFormat.containsKey("v-bits-per-sample") ? f0.r(mediaFormat.getInteger("v-bits-per-sample")) : "audio/raw".equals(format.t) ? format.I : 2 : mediaFormat.getInteger("pcm-encoding");
             Format.b bVar = new Format.b();
             bVar.k = "audio/raw";
-            bVar.f2703z = r2;
+            bVar.f2701z = r2;
             bVar.A = format.J;
             bVar.B = format.K;
-            bVar.f2701x = mediaFormat.getInteger("channel-count");
-            bVar.f2702y = mediaFormat.getInteger("sample-rate");
+            bVar.f2699x = mediaFormat.getInteger("channel-count");
+            bVar.f2700y = mediaFormat.getInteger("sample-rate");
             Format a2 = bVar.a();
             if (this.T0 && a2.G == 6 && (i = format.G) < 6) {
                 iArr = new int[i];
@@ -510,9 +510,9 @@ public class y extends MediaCodecRenderer implements r {
         int i3 = format.H;
         Format.b bVar = new Format.b();
         bVar.k = "audio/raw";
-        bVar.f2701x = i2;
-        bVar.f2702y = i3;
-        bVar.f2703z = 2;
+        bVar.f2699x = i2;
+        bVar.f2700y = i3;
+        bVar.f2701z = 2;
         if (!audioSink.a(bVar.a())) {
             return 1;
         }
diff --git a/app/src/main/java/c/i/a/c/z1/m.java b/app/src/main/java/c/i/a/c/z1/m.java
index d6621aa510..f418b9038e 100644
--- a/app/src/main/java/c/i/a/c/z1/m.java
+++ b/app/src/main/java/c/i/a/c/z1/m.java
@@ -19,7 +19,7 @@ public final /* synthetic */ class m implements MediaDrm.OnEventListener {
         z zVar = this.a;
         x.b bVar = this.b;
         Objects.requireNonNull(zVar);
-        DefaultDrmSessionManager.c cVar = DefaultDrmSessionManager.this.f2722x;
+        DefaultDrmSessionManager.c cVar = DefaultDrmSessionManager.this.f2720x;
         Objects.requireNonNull(cVar);
         cVar.obtainMessage(i, bArr).sendToTarget();
     }
diff --git a/app/src/main/java/c/i/a/c/z1/p.java b/app/src/main/java/c/i/a/c/z1/p.java
index 9a8b9855b4..6e34677680 100644
--- a/app/src/main/java/c/i/a/c/z1/p.java
+++ b/app/src/main/java/c/i/a/c/z1/p.java
@@ -62,7 +62,7 @@ public final class p implements t {
         byte[] copyOf = bArr != null ? Arrays.copyOf(bArr, bArr.length) : null;
         d.D(defaultDrmSessionManager.m.isEmpty());
         defaultDrmSessionManager.v = 0;
-        defaultDrmSessionManager.f2721w = copyOf;
+        defaultDrmSessionManager.f2719w = copyOf;
         return defaultDrmSessionManager;
     }
 }
diff --git a/app/src/main/java/c/i/a/c/z1/s.java b/app/src/main/java/c/i/a/c/z1/s.java
index d501c00d04..b73bede876 100644
--- a/app/src/main/java/c/i/a/c/z1/s.java
+++ b/app/src/main/java/c/i/a/c/z1/s.java
@@ -20,7 +20,7 @@ public interface s {
         @Override // c.i.a.c.z1.s
         @Nullable
         public DrmSession b(Looper looper, @Nullable q.a aVar, Format format) {
-            if (format.f2694w == null) {
+            if (format.f2692w == null) {
                 return null;
             }
             return new v(new DrmSession.DrmSessionException(new UnsupportedDrmException(1)));
@@ -29,7 +29,7 @@ public interface s {
         @Override // c.i.a.c.z1.s
         @Nullable
         public Class<c0> c(Format format) {
-            if (format.f2694w != null) {
+            if (format.f2692w != null) {
                 return c0.class;
             }
             return null;
diff --git a/app/src/main/java/c/i/a/f/c/a/f/a.java b/app/src/main/java/c/i/a/f/c/a/f/a.java
index aa76c99524..40d4536606 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/a.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/a.java
@@ -17,7 +17,7 @@ public class a extends b<GoogleSignInOptions> {
     public final synchronized int f() {
         if (j == 1) {
             Context context = this.a;
-            Object obj = GoogleApiAvailability.f2799c;
+            Object obj = GoogleApiAvailability.f2797c;
             GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
             int b = googleApiAvailability.b(context, 12451000);
             if (b == 0) {
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/a.java b/app/src/main/java/c/i/a/f/c/a/f/b/a.java
index b7c2ef0767..a33d8a1bf8 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/a.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/a.java
@@ -128,7 +128,7 @@ public class a {
             jSONObject.put("expirationTime", googleSignInAccount.p);
             jSONObject.put("obfuscatedIdentifier", googleSignInAccount.q);
             JSONArray jSONArray = new JSONArray();
-            List<Scope> list = googleSignInAccount.f2793r;
+            List<Scope> list = googleSignInAccount.f2791r;
             Scope[] scopeArr = (Scope[]) list.toArray(new Scope[list.size()]);
             Arrays.sort(scopeArr, c.i);
             int i = 0;
@@ -155,7 +155,7 @@ public class a {
                 if (account != null) {
                     jSONObject2.put("accountName", account.name);
                 }
-                jSONObject2.put("idTokenRequested", googleSignInOptions.f2794r);
+                jSONObject2.put("idTokenRequested", googleSignInOptions.f2792r);
                 jSONObject2.put("forceCodeForRefreshToken", googleSignInOptions.t);
                 jSONObject2.put("serverAuthRequested", googleSignInOptions.s);
                 if (!TextUtils.isEmpty(googleSignInOptions.u)) {
diff --git a/app/src/main/java/c/i/a/f/e/h/j/a1.java b/app/src/main/java/c/i/a/f/e/h/j/a1.java
index 62e0c7eca5..c2a899ab80 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/a1.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/a1.java
@@ -16,7 +16,7 @@ public class a1 extends t0 {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public a1(j jVar, g gVar) {
         super(jVar, GoogleApiAvailability.d);
-        Object obj = GoogleApiAvailability.f2799c;
+        Object obj = GoogleApiAvailability.f2797c;
         this.o = gVar;
         jVar.a("ConnectionlessLifecycleHelper", this);
     }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/b0.java b/app/src/main/java/c/i/a/f/e/h/j/b0.java
index 1db293a348..dc71e5326a 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/b0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/b0.java
@@ -16,7 +16,7 @@ public class b0 extends t0 {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public b0(j jVar) {
         super(jVar, GoogleApiAvailability.d);
-        Object obj = GoogleApiAvailability.f2799c;
+        Object obj = GoogleApiAvailability.f2797c;
         jVar.a("GmsAvailabilityHelper", this);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/h/j/g.java b/app/src/main/java/c/i/a/f/e/h/j/g.java
index c088375714..01b1de0481 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/g.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/g.java
@@ -656,7 +656,7 @@ public class g implements Handler.Callback {
                 handlerThread.start();
                 Looper looper = handlerThread.getLooper();
                 Context applicationContext = context.getApplicationContext();
-                Object obj = GoogleApiAvailability.f2799c;
+                Object obj = GoogleApiAvailability.f2797c;
                 l = new g(applicationContext, looper, GoogleApiAvailability.d);
             }
             gVar = l;
diff --git a/app/src/main/java/c/i/a/f/e/k/b.java b/app/src/main/java/c/i/a/f/e/k/b.java
index c75358c3d3..f21d022507 100644
--- a/app/src/main/java/c/i/a/f/e/k/b.java
+++ b/app/src/main/java/c/i/a/f/e/k/b.java
@@ -583,7 +583,7 @@ public abstract class b<T extends IInterface> {
             }
         }
         getServiceRequest.q = a;
-        getServiceRequest.f2802r = t();
+        getServiceRequest.f2800r = t();
         try {
             synchronized (this.i) {
                 j jVar = this.j;
diff --git a/app/src/main/java/c/i/a/f/e/k/d.java b/app/src/main/java/c/i/a/f/e/k/d.java
index 9035540285..ca1ddacd71 100644
--- a/app/src/main/java/c/i/a/f/e/k/d.java
+++ b/app/src/main/java/c/i/a/f/e/k/d.java
@@ -31,7 +31,7 @@ public abstract class d<T extends IInterface> extends b<T> implements a.f {
     public d(Context context, Looper looper, int i, c cVar, f fVar, l lVar) {
         super(context, looper, r3, r4, i, new r(fVar), new q(lVar), cVar.f);
         e a = e.a(context);
-        Object obj = GoogleApiAvailability.f2799c;
+        Object obj = GoogleApiAvailability.f2797c;
         GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
         Objects.requireNonNull(fVar, "null reference");
         Objects.requireNonNull(lVar, "null reference");
diff --git a/app/src/main/java/c/i/a/f/g/b.java b/app/src/main/java/c/i/a/f/g/b.java
index 43e243c55b..e56de36229 100644
--- a/app/src/main/java/c/i/a/f/g/b.java
+++ b/app/src/main/java/c/i/a/f/g/b.java
@@ -10,12 +10,12 @@ public final class b implements DynamiteModule.a {
         int b = bVar.b(context, str);
         aVar.a = b;
         if (b != 0) {
-            aVar.f2804c = -1;
+            aVar.f2802c = -1;
         } else {
             int a = bVar.a(context, str, true);
             aVar.b = a;
             if (a != 0) {
-                aVar.f2804c = 1;
+                aVar.f2802c = 1;
             }
         }
         return aVar;
diff --git a/app/src/main/java/c/i/a/f/g/c.java b/app/src/main/java/c/i/a/f/g/c.java
index c2c9d244be..30c7b14803 100644
--- a/app/src/main/java/c/i/a/f/g/c.java
+++ b/app/src/main/java/c/i/a/f/g/c.java
@@ -16,11 +16,11 @@ public final class c implements DynamiteModule.a {
         }
         int i = aVar.a;
         if (i == 0 && aVar.b == 0) {
-            aVar.f2804c = 0;
+            aVar.f2802c = 0;
         } else if (i >= aVar.b) {
-            aVar.f2804c = -1;
+            aVar.f2802c = -1;
         } else {
-            aVar.f2804c = 1;
+            aVar.f2802c = 1;
         }
         return aVar;
     }
diff --git a/app/src/main/java/c/i/a/f/g/d.java b/app/src/main/java/c/i/a/f/g/d.java
index 0fecdb70a4..78107bd6ce 100644
--- a/app/src/main/java/c/i/a/f/g/d.java
+++ b/app/src/main/java/c/i/a/f/g/d.java
@@ -12,11 +12,11 @@ public final class d implements DynamiteModule.a {
         aVar.b = a;
         int i = aVar.a;
         if (i == 0 && a == 0) {
-            aVar.f2804c = 0;
+            aVar.f2802c = 0;
         } else if (a >= i) {
-            aVar.f2804c = 1;
+            aVar.f2802c = 1;
         } else {
-            aVar.f2804c = -1;
+            aVar.f2802c = -1;
         }
         return aVar;
     }
diff --git a/app/src/main/java/c/i/a/f/h/l/g4.java b/app/src/main/java/c/i/a/f/h/l/g4.java
index f85e83b3f2..f629282a0b 100644
--- a/app/src/main/java/c/i/a/f/h/l/g4.java
+++ b/app/src/main/java/c/i/a/f/h/l/g4.java
@@ -11,7 +11,7 @@ public final class g4 implements v7 {
     public g4(zzhi zzhi) {
         Charset charset = w4.a;
         this.a = zzhi;
-        zzhi.f2805c = this;
+        zzhi.f2803c = this;
     }
 
     public final void a(int i, double d) throws IOException {
@@ -41,7 +41,7 @@ public final class g4 implements v7 {
     public final void e(int i, Object obj, q6 q6Var) throws IOException {
         zzhi zzhi = this.a;
         zzhi.f(i, 3);
-        q6Var.g((c6) obj, zzhi.f2805c);
+        q6Var.g((c6) obj, zzhi.f2803c);
         zzhi.f(i, 4);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/u4.java b/app/src/main/java/c/i/a/f/h/l/u4.java
index fa25b7ae7b..6ead34023f 100644
--- a/app/src/main/java/c/i/a/f/h/l/u4.java
+++ b/app/src/main/java/c/i/a/f/h/l/u4.java
@@ -270,7 +270,7 @@ public abstract class u4<MessageType extends u4<MessageType, BuilderType>, Build
     @Override // c.i.a.f.h.l.c6
     public final void i(zzhi zzhi) throws IOException {
         q6 b2 = n6.a.b(this);
-        g4 g4Var = zzhi.f2805c;
+        g4 g4Var = zzhi.f2803c;
         if (g4Var == null) {
             g4Var = new g4(zzhi);
         }
diff --git a/app/src/main/java/c/i/a/f/i/b/g.java b/app/src/main/java/c/i/a/f/i/b/g.java
index 10fc091cca..00e8419b19 100644
--- a/app/src/main/java/c/i/a/f/i/b/g.java
+++ b/app/src/main/java/c/i/a/f/i/b/g.java
@@ -693,7 +693,7 @@ public final class g extends i9 {
         e();
         contentValues.put("triggered_event", t9.g0(zzz.q));
         contentValues.put("triggered_timestamp", Long.valueOf(zzz.k.k));
-        contentValues.put("time_to_live", Long.valueOf(zzz.f2812r));
+        contentValues.put("time_to_live", Long.valueOf(zzz.f2810r));
         e();
         contentValues.put("expired_event", t9.g0(zzz.s));
         try {
diff --git a/app/src/main/java/c/i/a/f/i/b/k9.java b/app/src/main/java/c/i/a/f/i/b/k9.java
index 91e4ba7dcc..31767753a8 100644
--- a/app/src/main/java/c/i/a/f/i/b/k9.java
+++ b/app/src/main/java/c/i/a/f/i/b/k9.java
@@ -359,7 +359,7 @@ public class k9 implements t5 {
                         T = K().T(zzn.i);
                         if (T != null) {
                             this.k.t();
-                            if (t9.d0(zzn.j, T.v(), zzn.f2811z, T.y())) {
+                            if (t9.d0(zzn.j, T.v(), zzn.f2809z, T.y())) {
                                 this.k.g().i.b("New GMP App Id passed in. Removing cached database data. appId", q3.s(T.o()));
                                 g K = K();
                                 String o = T.o();
@@ -380,7 +380,7 @@ public class k9 implements t5 {
                             }
                         }
                         if (T != null) {
-                            if (((T.N() == -2147483648L || T.N() == zzn.f2807r) ? false : true) || (T.N() == -2147483648L && T.M() != null && !T.M().equals(zzn.k))) {
+                            if (((T.N() == -2147483648L || T.N() == zzn.f2805r) ? false : true) || (T.N() == -2147483648L && T.M() != null && !T.M().equals(zzn.k))) {
                                 Bundle bundle = new Bundle();
                                 bundle.putString("_pv", T.M());
                                 l(new zzaq("_au", new zzap(bundle), "auto", j4), zzn);
@@ -408,7 +408,7 @@ public class k9 implements t5 {
                                             str2 = "_et";
                                             j2 = 1;
                                         }
-                                        if (zzn.f2810y) {
+                                        if (zzn.f2808y) {
                                             bundle2.putLong("_dac", j2);
                                         }
                                         g K2 = K();
@@ -486,7 +486,7 @@ public class k9 implements t5 {
                                             } else {
                                                 j = 1;
                                             }
-                                            if (zzn.f2810y) {
+                                            if (zzn.f2808y) {
                                                 bundle3.putLong("_dac", j);
                                             }
                                             B(new zzaq("_v", new zzap(bundle3), "auto", j4), zzn);
@@ -638,8 +638,8 @@ public class k9 implements t5 {
                     T.m(zzn.j);
                     z2 = true;
                 }
-                if (!TextUtils.equals(zzn.f2811z, T.y())) {
-                    T.q(zzn.f2811z);
+                if (!TextUtils.equals(zzn.f2809z, T.y())) {
+                    T.q(zzn.f2809z);
                     z2 = true;
                 }
                 if (da.b() && this.k.h.u(T.o(), p.j0) && !TextUtils.equals(zzn.D, T.B())) {
@@ -659,8 +659,8 @@ public class k9 implements t5 {
                     T.D(zzn.k);
                     z2 = true;
                 }
-                if (zzn.f2807r != T.N()) {
-                    T.p(zzn.f2807r);
+                if (zzn.f2805r != T.N()) {
+                    T.p(zzn.f2805r);
                     z2 = true;
                 }
                 String str = zzn.l;
@@ -688,12 +688,12 @@ public class k9 implements t5 {
                     T.R(zzn.t);
                     z2 = true;
                 }
-                if (zzn.f2808w != T.h()) {
-                    T.n(zzn.f2808w);
+                if (zzn.f2806w != T.h()) {
+                    T.n(zzn.f2806w);
                     z2 = true;
                 }
-                if (zzn.f2809x != T.i()) {
-                    T.r(zzn.f2809x);
+                if (zzn.f2807x != T.i()) {
+                    T.r(zzn.f2807x);
                     z2 = true;
                 }
                 if (zzn.A != T.j()) {
@@ -716,7 +716,7 @@ public class k9 implements t5 {
             z2 = true;
             if (!TextUtils.equals(zzn.j, T.v())) {
             }
-            if (!TextUtils.equals(zzn.f2811z, T.y())) {
+            if (!TextUtils.equals(zzn.f2809z, T.y())) {
             }
             T.u(zzn.D);
             z2 = true;
@@ -727,7 +727,7 @@ public class k9 implements t5 {
             z2 = true;
             T.D(zzn.k);
             z2 = true;
-            if (zzn.f2807r != T.N()) {
+            if (zzn.f2805r != T.N()) {
             }
             String str = zzn.l;
             T.G(zzn.l);
@@ -740,9 +740,9 @@ public class k9 implements t5 {
             }
             T.R(zzn.t);
             z2 = true;
-            if (zzn.f2808w != T.h()) {
+            if (zzn.f2806w != T.h()) {
             }
-            if (zzn.f2809x != T.i()) {
+            if (zzn.f2807x != T.i()) {
             }
             if (zzn.A != T.j()) {
             }
@@ -778,7 +778,7 @@ public class k9 implements t5 {
             T.c(c(h));
         }
         T.m(zzn.j);
-        T.q(zzn.f2811z);
+        T.q(zzn.f2809z);
         if (da.b() && this.k.h.u(T.o(), p.j0)) {
             T.u(zzn.D);
         }
@@ -792,7 +792,7 @@ public class k9 implements t5 {
         if (!TextUtils.isEmpty(zzn.k)) {
             T.D(zzn.k);
         }
-        T.p(zzn.f2807r);
+        T.p(zzn.f2805r);
         String str3 = zzn.l;
         if (str3 != null) {
             T.G(str3);
@@ -805,8 +805,8 @@ public class k9 implements t5 {
         if (!this.k.h.o(p.y0)) {
             T.R(zzn.t);
         }
-        T.n(zzn.f2808w);
-        T.r(zzn.f2809x);
+        T.n(zzn.f2806w);
+        T.r(zzn.f2807x);
         T.b(zzn.A);
         T.z(zzn.B);
         T.a.f().b();
@@ -1044,7 +1044,7 @@ public class k9 implements t5 {
             if (!TextUtils.isEmpty(zzn.k)) {
                 u0.a0(zzn.k);
             }
-            long j3 = zzn.f2807r;
+            long j3 = zzn.f2805r;
             if (j3 != -2147483648L) {
                 u0.c0((int) j3);
             }
@@ -1059,11 +1059,11 @@ public class k9 implements t5 {
                 if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.D)) {
                     u0.u0(zzn.D);
                 }
-                if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2811z)) {
-                    u0.r0(zzn.f2811z);
+                if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2809z)) {
+                    u0.r0(zzn.f2809z);
                 }
-            } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2811z)) {
-                u0.r0(zzn.f2811z);
+            } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2809z)) {
+                u0.r0(zzn.f2809z);
             }
             long j4 = zzn.n;
             if (j4 != 0) {
@@ -1078,14 +1078,14 @@ public class k9 implements t5 {
             if (!t8.b() || !this.k.a().o(p.J0) || h.j()) {
                 Pair<String, Boolean> s = this.j.s(zzn.i, h);
                 if (!TextUtils.isEmpty((CharSequence) s.first)) {
-                    if (zzn.f2808w) {
+                    if (zzn.f2806w) {
                         u0.e0((String) s.first);
                         Object obj2 = s.second;
                         if (obj2 != null) {
                             u0.y(((Boolean) obj2).booleanValue());
                         }
                     }
-                } else if (!this.k.y().s(this.k.j()) && zzn.f2809x && (!hb.b() || !this.k.a().v(zzn.i, p.G0))) {
+                } else if (!this.k.y().s(this.k.j()) && zzn.f2807x && (!hb.b() || !this.k.a().v(zzn.i, p.G0))) {
                     String string = Settings.Secure.getString(this.k.j().getContentResolver(), "android_id");
                     if (string == null) {
                         this.k.g().A().b("null secure ID. appId", q3.s(u0.k0()));
@@ -1133,7 +1133,7 @@ public class k9 implements t5 {
                 T2.a(0);
                 T2.l(0);
                 T2.D(zzn.k);
-                T2.p(zzn.f2807r);
+                T2.p(zzn.f2805r);
                 T2.G(zzn.l);
                 T2.t(zzn.m);
                 T2.w(zzn.n);
@@ -1204,7 +1204,7 @@ public class k9 implements t5 {
     }
 
     public final boolean L(zzn zzn) {
-        return (!da.b() || !this.k.h.u(zzn.i, p.j0)) ? !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2811z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2811z);
+        return (!da.b() || !this.k.h.u(zzn.i, p.j0)) ? !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2809z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2809z);
     }
 
     public final ba M() {
diff --git a/app/src/main/java/c/i/a/f/i/b/q9.java b/app/src/main/java/c/i/a/f/i/b/q9.java
index 0d1f89e1ee..1f8b1167c6 100644
--- a/app/src/main/java/c/i/a/f/i/b/q9.java
+++ b/app/src/main/java/c/i/a/f/i/b/q9.java
@@ -282,7 +282,7 @@ public final class q9 extends i9 {
     @WorkerThread
     public static boolean O(zzaq zzaq, zzn zzn) {
         Objects.requireNonNull(zzaq, "null reference");
-        return !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2811z);
+        return !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2809z);
     }
 
     public static boolean P(String str) {
diff --git a/app/src/main/java/c/i/a/f/i/b/t9.java b/app/src/main/java/c/i/a/f/i/b/t9.java
index 156abbb7ab..a87fb2e15b 100644
--- a/app/src/main/java/c/i/a/f/i/b/t9.java
+++ b/app/src/main/java/c/i/a/f/i/b/t9.java
@@ -210,7 +210,7 @@ public final class t9 extends r5 {
                 }
             }
             bundle.putLong("triggered_timestamp", zzz.k.k);
-            bundle.putLong("time_to_live", zzz.f2812r);
+            bundle.putLong("time_to_live", zzz.f2810r);
             zzaq zzaq3 = zzz.s;
             if (zzaq3 != null) {
                 bundle.putString("expired_event_name", zzaq3.i);
diff --git a/app/src/main/java/c/i/a/f/i/b/z4.java b/app/src/main/java/c/i/a/f/i/b/z4.java
index 1a9a757ae9..97481983e8 100644
--- a/app/src/main/java/c/i/a/f/i/b/z4.java
+++ b/app/src/main/java/c/i/a/f/i/b/z4.java
@@ -286,6 +286,6 @@ public final class z4 extends l3 {
     public final void z0(zzn zzn) {
         Objects.requireNonNull(zzn, "null reference");
         y0(zzn.i, false);
-        this.a.k.t().c0(zzn.j, zzn.f2811z, zzn.D);
+        this.a.k.t().c0(zzn.j, zzn.f2809z, zzn.D);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/i.java b/app/src/main/java/c/i/a/f/j/b/e/i.java
index aa5b2c747f..92ea197a22 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/i.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/i.java
@@ -66,9 +66,9 @@ public final class i extends MessagesClient {
 
     @Override // com.google.android.gms.nearby.messages.MessagesClient
     public final Task<Void> g(MessageListener messageListener, SubscribeOptions subscribeOptions) {
-        d.p(subscribeOptions.a.f2813r == 0, "Strategy.setBackgroundScanMode() is only supported by background subscribe (the version which takes a PendingIntent).");
+        d.p(subscribeOptions.a.f2811r == 0, "Strategy.setBackgroundScanMode() is only supported by background subscribe (the version which takes a PendingIntent).");
         k m = m(messageListener);
-        return k(m, new l(this, m, new s(this, m(subscribeOptions.f2814c), m), subscribeOptions), new m(m));
+        return k(m, new l(this, m, new s(this, m(subscribeOptions.f2812c), m), subscribeOptions), new m(m));
     }
 
     @Override // com.google.android.gms.nearby.messages.MessagesClient
diff --git a/app/src/main/java/c/i/a/g/k/b.java b/app/src/main/java/c/i/a/g/k/b.java
index d9b8c06e30..60a7b95b43 100644
--- a/app/src/main/java/c/i/a/g/k/b.java
+++ b/app/src/main/java/c/i/a/g/k/b.java
@@ -23,7 +23,7 @@ public class b implements ViewTreeObserver.OnPreDrawListener {
             clockFaceView.j = height;
             clockFaceView.a();
             ClockHandView clockHandView = clockFaceView.l;
-            clockHandView.f2853z = clockFaceView.j;
+            clockHandView.f2851z = clockFaceView.j;
             clockHandView.invalidate();
         }
         return true;
diff --git a/app/src/main/java/c/i/a/g/k/f.java b/app/src/main/java/c/i/a/g/k/f.java
index aeac472e2e..da0a1387fe 100644
--- a/app/src/main/java/c/i/a/g/k/f.java
+++ b/app/src/main/java/c/i/a/g/k/f.java
@@ -32,7 +32,7 @@ public class f implements ClockHandView.OnRotateListener, TimePickerView.d, Time
         TimePickerView timePickerView2 = this.l;
         timePickerView2.p = this;
         timePickerView2.o = this;
-        timePickerView2.k.f2851x = this;
+        timePickerView2.k.f2849x = this;
         g(i, "%d");
         g(j, "%d");
         g(k, "%02d");
diff --git a/app/src/main/java/c/i/c/m/d/n/a.java b/app/src/main/java/c/i/c/m/d/n/a.java
index 4b996de131..e34321b098 100644
--- a/app/src/main/java/c/i/c/m/d/n/a.java
+++ b/app/src/main/java/c/i/c/m/d/n/a.java
@@ -35,7 +35,7 @@ public class a {
         x.a f = new x().f();
         TimeUnit timeUnit = TimeUnit.MILLISECONDS;
         m.checkParameterIsNotNull(timeUnit, "unit");
-        f.f3029w = c.b("timeout", 10000, timeUnit);
+        f.f3027w = c.b("timeout", 10000, timeUnit);
         a = new x(f);
     }
 
@@ -105,7 +105,7 @@ public class a {
     }
 
     public a c(String str, String str2, String str3, File file) {
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
         RequestBody create = RequestBody.create(MediaType.a.b(str3), file);
         if (this.f == null) {
             MultipartBody.a aVar2 = new MultipartBody.a();
diff --git a/app/src/main/java/c/i/e/q/j.java b/app/src/main/java/c/i/e/q/j.java
index 5a61c6af5c..81a5a52667 100644
--- a/app/src/main/java/c/i/e/q/j.java
+++ b/app/src/main/java/c/i/e/q/j.java
@@ -54,7 +54,7 @@ public final class j extends k {
                         if (z3 || !z2) {
                             return k;
                         }
-                        Result result = new Result(k.a.substring(1), k.b, k.f2898c, aVar2);
+                        Result result = new Result(k.a.substring(1), k.b, k.f2896c, aVar2);
                         result.a(k.e);
                         return result;
                     }
diff --git a/app/src/main/java/c/i/e/q/k.java b/app/src/main/java/c/i/e/q/k.java
index a592884a81..6f73aa02a8 100644
--- a/app/src/main/java/c/i/e/q/k.java
+++ b/app/src/main/java/c/i/e/q/k.java
@@ -113,7 +113,7 @@ public abstract class k implements i {
                 i = (((Integer) map2.get(jVar)).intValue() + 270) % 360;
             }
             c2.b(jVar, Integer.valueOf(i));
-            c.i.e.k[] kVarArr = c2.f2898c;
+            c.i.e.k[] kVarArr = c2.f2896c;
             if (kVarArr != null) {
                 int i2 = d.b;
                 for (int i3 = 0; i3 < kVarArr.length; i3++) {
@@ -171,7 +171,7 @@ public abstract class k implements i {
                                 Result b = kVar.b(i10, aVar, enumMap);
                                 if (i11 != i4) {
                                     b.b(j.ORIENTATION, Integer.valueOf((int) BaseTransientBottomBar.ANIMATION_FADE_DURATION));
-                                    c.i.e.k[] kVarArr = b.f2898c;
+                                    c.i.e.k[] kVarArr = b.f2896c;
                                     if (kVarArr != null) {
                                         float f = (float) i2;
                                         map2 = enumMap;
diff --git a/app/src/main/java/c/i/e/q/l.java b/app/src/main/java/c/i/e/q/l.java
index 5e4d3746e1..9bd83fa8d8 100644
--- a/app/src/main/java/c/i/e/q/l.java
+++ b/app/src/main/java/c/i/e/q/l.java
@@ -16,7 +16,7 @@ public final class l extends p {
     public static Result o(Result result) throws FormatException {
         String str = result.a;
         if (str.charAt(0) == '0') {
-            Result result2 = new Result(str.substring(1), null, result.f2898c, a.UPC_A);
+            Result result2 = new Result(str.substring(1), null, result.f2896c, a.UPC_A);
             Map<j, Object> map = result.e;
             if (map != null) {
                 result2.a(map);
diff --git a/app/src/main/java/c/i/e/q/p.java b/app/src/main/java/c/i/e/q/p.java
index e7aa040738..50936ab202 100644
--- a/app/src/main/java/c/i/e/q/p.java
+++ b/app/src/main/java/c/i/e/q/p.java
@@ -187,15 +187,15 @@ public abstract class p extends k {
                 Result a2 = this.f.a(i, aVar, i3[1]);
                 result.b(j.UPC_EAN_EXTENSION, a2.a);
                 result.a(a2.e);
-                k[] kVarArr = a2.f2898c;
-                k[] kVarArr2 = result.f2898c;
+                k[] kVarArr = a2.f2896c;
+                k[] kVarArr2 = result.f2896c;
                 if (kVarArr2 == null) {
-                    result.f2898c = kVarArr;
+                    result.f2896c = kVarArr;
                 } else if (kVarArr != null && kVarArr.length > 0) {
                     k[] kVarArr3 = new k[(kVarArr2.length + kVarArr.length)];
                     System.arraycopy(kVarArr2, 0, kVarArr3, 0, kVarArr2.length);
                     System.arraycopy(kVarArr, 0, kVarArr3, kVarArr2.length, kVarArr.length);
-                    result.f2898c = kVarArr3;
+                    result.f2896c = kVarArr3;
                 }
                 i2 = a2.a.length();
             } catch (ReaderException unused) {
diff --git a/app/src/main/java/c/o/a/r/f.java b/app/src/main/java/c/o/a/r/f.java
index 5833bdc9c5..5116945005 100644
--- a/app/src/main/java/c/o/a/r/f.java
+++ b/app/src/main/java/c/o/a/r/f.java
@@ -62,15 +62,15 @@ public class f {
                         CameraView.b bVar = (CameraView.b) fVar.f1585c;
                         bVar.b.a(1, "onDeviceOrientationChanged", Integer.valueOf(i2));
                         CameraView cameraView = CameraView.this;
-                        int i3 = cameraView.f2931w.g;
+                        int i3 = cameraView.f2929w.g;
                         if (!cameraView.l) {
                             int i4 = (360 - i3) % 360;
-                            c.o.a.n.t.a e = cameraView.f2932x.e();
+                            c.o.a.n.t.a e = cameraView.f2930x.e();
                             e.e(i4);
                             e.e = i4;
                             e.d();
                         } else {
-                            c.o.a.n.t.a e2 = cameraView.f2932x.e();
+                            c.o.a.n.t.a e2 = cameraView.f2930x.e();
                             e2.e(i2);
                             e2.e = i2;
                             e2.d();
diff --git a/app/src/main/java/c/o/a/v/d.java b/app/src/main/java/c/o/a/v/d.java
index ccc217564b..0ec470f39a 100644
--- a/app/src/main/java/c/o/a/v/d.java
+++ b/app/src/main/java/c/o/a/v/d.java
@@ -34,10 +34,10 @@ public abstract class d {
             boolean z4 = !z2;
             CameraView.b bVar = (CameraView.b) ((g) aVar).l;
             if (z4 && (z3 = (cameraView = CameraView.this).k) && z3) {
-                if (cameraView.f2934z == null) {
-                    cameraView.f2934z = new MediaActionSound();
+                if (cameraView.f2932z == null) {
+                    cameraView.f2932z = new MediaActionSound();
                 }
-                cameraView.f2934z.play(0);
+                cameraView.f2932z.play(0);
             }
             CameraView.this.s.post(new h(bVar));
         }
diff --git a/app/src/main/java/c/q/a/k/a.java b/app/src/main/java/c/q/a/k/a.java
index a4400a5deb..275d0d3a88 100644
--- a/app/src/main/java/c/q/a/k/a.java
+++ b/app/src/main/java/c/q/a/k/a.java
@@ -629,7 +629,7 @@ public class a {
     }
 
     public static final void c(e0.e0.f.a aVar, e0.e0.f.c cVar, String str) {
-        d.b bVar = e0.e0.f.d.f2961c;
+        d.b bVar = e0.e0.f.d.f2959c;
         Logger logger = e0.e0.f.d.b;
         StringBuilder sb = new StringBuilder();
         sb.append(cVar.f);
@@ -638,7 +638,7 @@ public class a {
         m.checkExpressionValueIsNotNull(format, "java.lang.String.format(format, *args)");
         sb.append(format);
         sb.append(": ");
-        sb.append(aVar.f2959c);
+        sb.append(aVar.f2957c);
         logger.fine(sb.toString());
     }
 
diff --git a/app/src/main/java/com/discord/app/AppActivity.java b/app/src/main/java/com/discord/app/AppActivity.java
index 37440da5de..25e9e5df91 100644
--- a/app/src/main/java/com/discord/app/AppActivity.java
+++ b/app/src/main/java/com/discord/app/AppActivity.java
@@ -407,9 +407,9 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     }
 
     public AppActivity() {
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.s = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.s = k0;
         this.u = c0.g.lazy(new e(this));
         this.v = m;
         int i = AppPermissionsRequests.a;
diff --git a/app/src/main/java/com/discord/app/AppBottomSheet.java b/app/src/main/java/com/discord/app/AppBottomSheet.java
index 5f7200e3b7..c971909033 100644
--- a/app/src/main/java/com/discord/app/AppBottomSheet.java
+++ b/app/src/main/java/com/discord/app/AppBottomSheet.java
@@ -221,9 +221,9 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
 
     public AppBottomSheet(boolean z2) {
         this.shouldAvoidKeyboard = z2;
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
         this.peekLayoutListener = new e(this);
         this.appLogger$delegate = c0.g.lazy(new b(this));
     }
diff --git a/app/src/main/java/com/discord/app/AppDialog.java b/app/src/main/java/com/discord/app/AppDialog.java
index b8dfe36f82..dad8045081 100644
--- a/app/src/main/java/com/discord/app/AppDialog.java
+++ b/app/src/main/java/com/discord/app/AppDialog.java
@@ -46,16 +46,16 @@ public abstract class AppDialog extends DialogFragment implements AppComponent {
     }
 
     public AppDialog() {
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public AppDialog(@LayoutRes int i) {
         super(i);
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public static /* synthetic */ void hideKeyboard$default(AppDialog appDialog, View view, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/app/AppFragment.java b/app/src/main/java/com/discord/app/AppFragment.java
index 265674063b..883cf5d240 100644
--- a/app/src/main/java/com/discord/app/AppFragment.java
+++ b/app/src/main/java/com/discord/app/AppFragment.java
@@ -178,16 +178,16 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
     }
 
     public AppFragment() {
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public AppFragment(@LayoutRes int i) {
         super(i);
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     private final Unit bindToolbar(AppActivity appActivity, View view) {
diff --git a/app/src/main/java/com/discord/app/AppViewModel.java b/app/src/main/java/com/discord/app/AppViewModel.java
index 619de36cea..cc826ebf45 100644
--- a/app/src/main/java/com/discord/app/AppViewModel.java
+++ b/app/src/main/java/com/discord/app/AppViewModel.java
@@ -19,13 +19,13 @@ public abstract class AppViewModel<V> extends ViewModel implements AppComponent
     }
 
     public AppViewModel(V v) {
-        BehaviorSubject<V> j0 = BehaviorSubject.j0();
-        this.viewStateSubject = j0;
-        PublishSubject j02 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j02, "PublishSubject.create()");
-        this.unsubscribeSignal = j02;
+        BehaviorSubject<V> k0 = BehaviorSubject.k0();
+        this.viewStateSubject = k0;
+        PublishSubject k02 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k02, "PublishSubject.create()");
+        this.unsubscribeSignal = k02;
         if (v != null) {
-            j0.onNext(v);
+            k0.onNext(v);
         }
     }
 
@@ -42,7 +42,7 @@ public abstract class AppViewModel<V> extends ViewModel implements AppComponent
     public final V getViewState() {
         BehaviorSubject<V> behaviorSubject = this.viewStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "viewStateSubject");
-        return behaviorSubject.m0();
+        return behaviorSubject.n0();
     }
 
     public V modifyPendingViewState(V v, V v2) {
diff --git a/app/src/main/java/com/discord/app/DiscordConnectService.java b/app/src/main/java/com/discord/app/DiscordConnectService.java
index 96c9637058..f783688b58 100644
--- a/app/src/main/java/com/discord/app/DiscordConnectService.java
+++ b/app/src/main/java/com/discord/app/DiscordConnectService.java
@@ -204,7 +204,7 @@ public final class DiscordConnectService extends Service {
         String authToken$app_productionGoogleRelease = companion.getAuthentication().getAuthToken$app_productionGoogleRelease();
         if (authToken$app_productionGoogleRelease == null || t.isBlank(authToken$app_productionGoogleRelease)) {
             c.a.d.m.g(this, R.string.overlay_mobile_unauthed, 0, null, 12);
-            observable2 = Observable.v(new IllegalStateException("UNAUTHED"));
+            observable2 = Observable.w(new IllegalStateException("UNAUTHED"));
             m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…ateException(\"UNAUTHED\"))");
         } else {
             c.a.d.l0.a aVar = c.a.d.l0.a.E;
@@ -221,7 +221,7 @@ public final class DiscordConnectService extends Service {
             if (longOrNull != null) {
                 if (ContextCompat.checkSelfPermission(this, "android.permission.RECORD_AUDIO") != 0) {
                     c.a.d.m.g(this, R.string.permission_microphone_denied, 0, null, 12);
-                    observable2 = Observable.v(new IllegalStateException("Do not have microphone permissions, go to main app"));
+                    observable2 = Observable.w(new IllegalStateException("Do not have microphone permissions, go to main app"));
                     m.checkNotNullExpressionValue(observable2, "Observable.error(\n      …to main app\")\n          )");
                 } else {
                     long longValue = longOrNull.longValue();
@@ -229,9 +229,9 @@ public final class DiscordConnectService extends Service {
                     m.checkNotNullExpressionValue(simpleName3, "DiscordConnectService::class.java.simpleName");
                     Logger.i$default(appLog, simpleName3, "Try joining voice channel", null, 4, null);
                     companion.getVoiceChannelSelected().selectVoiceChannel(longValue);
-                    Observable w2 = StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null).w(i0.i);
-                    m.checkNotNullExpressionValue(w2, "StoreStream\n        .get…()\n        .filter { it }");
-                    observable2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(w2, 10000, false, 2, null).X(k0.i);
+                    Observable x2 = StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null).x(i0.i);
+                    m.checkNotNullExpressionValue(x2, "StoreStream\n        .get…()\n        .filter { it }");
+                    observable2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 10000, false, 2, null).Y(k0.i);
                     m.checkNotNullExpressionValue(observable2, "isConnectedObs.switchMap…nnected\n          }\n    }");
                 }
             } else if (matchEntire != null) {
@@ -241,7 +241,7 @@ public final class DiscordConnectService extends Service {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(observable, 10000, false, 2, null), DiscordConnectService.class, (Context) null, (Function1) null, new d(this, i3), new c(this, i3), (Function0) null, b.i, 38, (Object) null);
                 return 2;
             } else {
-                observable2 = Observable.v(new IllegalArgumentException("Invalid Request: " + data));
+                observable2 = Observable.w(new IllegalArgumentException("Invalid Request: " + data));
                 m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…\"Invalid Request: $uri\"))");
             }
         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java
deleted file mode 100644
index d9d5435b42..0000000000
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.discord.databinding;
-
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textfield.TextInputLayout;
-public final class WidgetChannelsListActionsChangeNicknameBinding implements ViewBinding {
-    @NonNull
-    public final LinearLayout a;
-    @NonNull
-    public final MaterialButton b;
-    @NonNull
-
-    /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2151c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final MaterialButton e;
-    @NonNull
-    public final TextView f;
-
-    public WidgetChannelsListActionsChangeNicknameBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton2, @NonNull TextView textView2) {
-        this.a = linearLayout;
-        this.b = materialButton;
-        this.f2151c = textInputLayout;
-        this.d = textView;
-        this.e = materialButton2;
-        this.f = textView2;
-    }
-
-    @Override // androidx.viewbinding.ViewBinding
-    @NonNull
-    public View getRoot() {
-        return this.a;
-    }
-}
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java
index d25a63802a..a250c4bd77 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java
@@ -25,7 +25,7 @@ public final class WidgetChannelsListBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2152c;
+    public final RecyclerView f2151c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -58,7 +58,7 @@ public final class WidgetChannelsListBinding implements ViewBinding {
     public WidgetChannelsListBinding(@NonNull RoundedCoordinatorLayout roundedCoordinatorLayout, @NonNull CustomAppBarLayout customAppBarLayout, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull Toolbar toolbar, @NonNull TextView textView5, @NonNull AppCompatImageView appCompatImageView, @NonNull View view, @NonNull View view2, @NonNull ViewStub viewStub, @NonNull Toolbar toolbar2, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull RoundedCoordinatorLayout roundedCoordinatorLayout2, @NonNull EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView, @NonNull EmptyFriendsStateView emptyFriendsStateView) {
         this.a = roundedCoordinatorLayout;
         this.b = customAppBarLayout;
-        this.f2152c = recyclerView;
+        this.f2151c = recyclerView;
         this.d = simpleDraweeView;
         this.e = frameLayout;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActionsBinding.java
index 3edb84c01d..5c961cfbd8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActionsBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChannelsListItemActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2153c;
+    public final TextView f2152c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetChannelsListItemActionsBinding implements ViewBinding {
     public WidgetChannelsListItemActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView5, @NonNull View view, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2153c = textView2;
+        this.f2152c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveEventBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveEventBinding.java
index a83352de76..53b2bd3698 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveEventBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveEventBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChannelsListItemActiveEventBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2154c;
+    public final TextView f2153c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetChannelsListItemActiveEventBinding implements ViewBindi
     public WidgetChannelsListItemActiveEventBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull UserSummaryView userSummaryView, @NonNull MaterialTextView materialTextView) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f2154c = textView;
+        this.f2153c = textView;
         this.d = materialButton;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java
index d679722e51..cdd547a8ae 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChannelsListItemCategoryBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2155c;
+    public final ImageView f2154c;
     @NonNull
     public final TextView d;
 
     public WidgetChannelsListItemCategoryBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f2155c = imageView2;
+        this.f2154c = imageView2;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java
index 0b6995c0d0..b28ea3facf 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChannelsListItemChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2156c;
+    public final TextView f2155c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetChannelsListItemChannelBinding implements ViewBinding {
     public WidgetChannelsListItemChannelBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f2156c = textView;
+        this.f2155c = textView;
         this.d = textView2;
         this.e = imageView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java
index a8ffd04c08..a9d1d6c0eb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChannelsListItemChannelPrivateBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2157c;
+    public final SimpleDraweeView f2156c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChannelsListItemChannelPrivateBinding implements ViewBi
     public WidgetChannelsListItemChannelPrivateBinding(@NonNull RelativeLayout relativeLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = relativeLayout;
         this.b = statusView;
-        this.f2157c = simpleDraweeView;
+        this.f2156c = simpleDraweeView;
         this.d = simpleDraweeSpanTextView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java
index bb63cdfd38..561b797b96 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChannelsListItemChannelStageVoiceBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2158c;
+    public final TextView f2157c;
     @NonNull
     public final TextView d;
 
     public WidgetChannelsListItemChannelStageVoiceBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f2158c = textView;
+        this.f2157c = textView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java
index 1b6690df13..736dcea73a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChannelsListItemChannelVoiceBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2159c;
+    public final TextView f2158c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetChannelsListItemChannelVoiceBinding implements ViewBind
     public WidgetChannelsListItemChannelVoiceBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull VoiceUserLimitView voiceUserLimitView) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f2159c = textView2;
+        this.f2158c = textView2;
         this.d = imageView;
         this.e = voiceUserLimitView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java
index a024509ed9..23fb6a6df2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java
@@ -15,12 +15,12 @@ public final class WidgetChannelsListItemDirectoryBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2160c;
+    public final TextView f2159c;
 
     public WidgetChannelsListItemDirectoryBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f2160c = textView;
+        this.f2159c = textView;
     }
 
     @NonNull
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java
index 6c8b3f6b8f..273bf67925 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChannelsListItemHeaderBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2161c;
+    public final ImageView f2160c;
 
     public WidgetChannelsListItemHeaderBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f2161c = imageView;
+        this.f2160c = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java
index 2ed9f2cda5..a1bb2b740a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChannelsListItemThreadActionsBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2162c;
+    public final TextView f2161c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -42,7 +42,7 @@ public final class WidgetChannelsListItemThreadActionsBinding implements ViewBin
     public WidgetChannelsListItemThreadActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull View view, @NonNull View view2, @NonNull TextView textView5, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10) {
         this.a = nestedScrollView;
         this.b = linearLayout;
-        this.f2162c = textView2;
+        this.f2161c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = view;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java
index 414babc575..fec3d4ab2a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChannelsListItemThreadBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2163c;
+    public final TextView f2162c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetChannelsListItemThreadBinding implements ViewBinding {
     public WidgetChannelsListItemThreadBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f2163c = textView;
+        this.f2162c = textView;
         this.d = textView2;
         this.e = imageView;
         this.f = imageView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java
index 483a53ab17..070fb8f61b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChannelsListItemVoiceUserBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2164c;
+    public final ImageView f2163c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChannelsListItemVoiceUserBinding implements ViewBinding
     public WidgetChannelsListItemVoiceUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull LinearLayout linearLayout) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f2164c = imageView;
+        this.f2163c = imageView;
         this.d = imageView2;
         this.e = textView;
         this.f = imageView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java
index 6535f76f8e..cfbc0cad78 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChannelsListUnreadsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f2165c;
+    public final RelativeLayout f2164c;
 
     public WidgetChannelsListUnreadsBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout) {
         this.a = frameLayout;
         this.b = textView;
-        this.f2165c = relativeLayout;
+        this.f2164c = relativeLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java
index 7cfe071860..07ae34ce78 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChatInputApplicationCommandsBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2166c;
+    public final RecyclerView f2165c;
 
     public WidgetChatInputApplicationCommandsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull View view) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2166c = recyclerView;
+        this.f2165c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java
index 707ec888de..72c48f26b6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChatInputAutocompleteItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2167c;
+    public final TextView f2166c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetChatInputAutocompleteItemBinding implements ViewBinding
     public WidgetChatInputAutocompleteItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull View view, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull StatusView statusView) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f2167c = textView;
+        this.f2166c = textView;
         this.d = simpleDraweeSpanTextView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java
index 44a33c9754..6ef78ecafe 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java
@@ -20,7 +20,7 @@ public final class WidgetChatInputBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2168c;
+    public final RecyclerView f2167c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -52,14 +52,14 @@ public final class WidgetChatInputBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final n4 f2169r;
+    public final n4 f2168r;
     @NonNull
     public final o4 s;
 
     public WidgetChatInputBinding(@NonNull LinearLayout linearLayout, @NonNull WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageButton appCompatImageButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView2, @NonNull LinearLayout linearLayout4, @NonNull TextView textView4, @NonNull RecyclerView recyclerView3, @NonNull FragmentContainerView fragmentContainerView, @NonNull LinearLayout linearLayout5, @NonNull n4 n4Var, @NonNull o4 o4Var) {
         this.a = linearLayout;
         this.b = widgetChatInputApplicationCommandsBinding;
-        this.f2168c = recyclerView;
+        this.f2167c = recyclerView;
         this.d = linearLayout2;
         this.e = relativeLayout;
         this.f = appCompatImageButton;
@@ -74,7 +74,7 @@ public final class WidgetChatInputBinding implements ViewBinding {
         this.o = recyclerView3;
         this.p = fragmentContainerView;
         this.q = linearLayout5;
-        this.f2169r = n4Var;
+        this.f2168r = n4Var;
         this.s = o4Var;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
index b019f73777..5f0436758d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
@@ -18,12 +18,12 @@ public final class WidgetChatInputCommandApplicationHeaderItemBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2170c;
+    public final TextView f2169c;
 
     public WidgetChatInputCommandApplicationHeaderItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f2170c = textView;
+        this.f2169c = textView;
     }
 
     @NonNull
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java
index b79c83509c..7881ef90ba 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChatInputEmojiAutocompleteUpsellItemBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2171c;
+    public final TextView f2170c;
 
     public WidgetChatInputEmojiAutocompleteUpsellItemBinding(@NonNull LinearLayout linearLayout, @NonNull PileView pileView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = pileView;
-        this.f2171c = textView;
+        this.f2170c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java
index c2241fe9e2..4dbe26ca63 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChatListActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2172c;
+    public final TextView f2171c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -48,7 +48,7 @@ public final class WidgetChatListActionsBinding implements ViewBinding {
     public WidgetChatListActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @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 TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15) {
         this.a = nestedScrollView;
         this.b = recyclerView;
-        this.f2172c = textView;
+        this.f2171c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = textView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java
index f48b975db9..bc04132852 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemApplicationCommandBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CardView f2173c;
+    public final CardView f2172c;
     @NonNull
     public final FrameLayout d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetChatListAdapterItemApplicationCommandBinding implements
     public WidgetChatListAdapterItemApplicationCommandBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull CardView cardView, @NonNull FrameLayout frameLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull Guideline guideline) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2173c = cardView;
+        this.f2172c = cardView;
         this.d = frameLayout;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java
index 2096aa2e9a..4dd5a51305 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java
@@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemAttachmentBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2174c;
+    public final View f2173c;
     @NonNull
     public final MaterialCardView d;
     @NonNull
@@ -38,7 +38,7 @@ public final class WidgetChatListAdapterItemAttachmentBinding implements ViewBin
     public WidgetChatListAdapterItemAttachmentBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull Barrier barrier, @NonNull MaterialCardView materialCardView, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull InlineMediaView inlineMediaView, @NonNull TextView textView2, @NonNull FrameLayout frameLayout, @NonNull Guideline guideline) {
         this.a = constraintLayout;
         this.b = view;
-        this.f2174c = view2;
+        this.f2173c = view2;
         this.d = materialCardView;
         this.e = textView;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java
index a9c02c2aa9..6fcd93a372 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java
@@ -13,14 +13,14 @@ public final class WidgetChatListAdapterItemBotComponentRowBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2175c;
+    public final View f2174c;
     @NonNull
     public final View d;
 
     public WidgetChatListAdapterItemBotComponentRowBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull View view2) {
         this.a = constraintLayout;
         this.b = linearLayout;
-        this.f2175c = view;
+        this.f2174c = view;
         this.d = view2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java
index 59c9f0995d..05af6b3337 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemCallBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2176c;
+    public final RecyclerView f2175c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChatListAdapterItemCallBinding implements ViewBinding {
     public WidgetChatListAdapterItemCallBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3) {
         this.a = cardView;
         this.b = imageView;
-        this.f2176c = recyclerView;
+        this.f2175c = recyclerView;
         this.d = textView;
         this.e = textView2;
         this.f = linearLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java
index dc7a26f982..661fa504ae 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java
@@ -22,7 +22,7 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2177c;
+    public final View f2176c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -54,7 +54,7 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final LinkifiedTextView f2178r;
+    public final LinkifiedTextView f2177r;
     @NonNull
     public final CardView s;
     @NonNull
@@ -63,7 +63,7 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding
     public WidgetChatListAdapterItemEmbedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull Barrier barrier, @NonNull Barrier barrier2, @NonNull MaterialCardView materialCardView, @NonNull ConstraintLayout constraintLayout2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull View view3, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView3, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView4, @NonNull TextView textView3, @NonNull FrameLayout frameLayout, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull CardView cardView, @NonNull InlineMediaView inlineMediaView) {
         this.a = constraintLayout;
         this.b = view;
-        this.f2177c = view2;
+        this.f2176c = view2;
         this.d = simpleDraweeView;
         this.e = textView;
         this.f = materialCardView;
@@ -78,7 +78,7 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding
         this.o = simpleDraweeView4;
         this.p = textView3;
         this.q = frameLayout;
-        this.f2178r = linkifiedTextView2;
+        this.f2177r = linkifiedTextView2;
         this.s = cardView;
         this.t = inlineMediaView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java
index 5042c952e2..31bdae9fcc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemEphemeralMessageBinding implements V
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2179c;
+    public final View f2178c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetChatListAdapterItemEphemeralMessageBinding implements V
     public WidgetChatListAdapterItemEphemeralMessageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull Guideline guideline) {
         this.a = constraintLayout;
         this.b = view;
-        this.f2179c = view2;
+        this.f2178c = view2;
         this.d = imageView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java
index 23d6f13b85..a565d40eff 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemGiftBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2180c;
+    public final MaterialButton f2179c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -38,7 +38,7 @@ public final class WidgetChatListAdapterItemGiftBinding implements ViewBinding {
     public WidgetChatListAdapterItemGiftBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull View view, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton3, @NonNull ConstraintLayout constraintLayout2) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2180c = materialButton2;
+        this.f2179c = materialButton2;
         this.d = textView;
         this.e = textView2;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java
index 8006bcfb31..e6503ba1dc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java
@@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemGuildInviteReminderBinding implement
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2181c;
+    public final TextView f2180c;
     @NonNull
     public final TextView d;
 
     public WidgetChatListAdapterItemGuildInviteReminderBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2181c = textView;
+        this.f2180c = textView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java
index 633f5ee07c..b3436ae814 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java
@@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemGuildTemplateBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2182c;
+    public final TextView f2181c;
     @NonNull
     public final TextView d;
 
     public WidgetChatListAdapterItemGuildTemplateBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ConstraintLayout constraintLayout2) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2182c = textView2;
+        this.f2181c = textView2;
         this.d = textView3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java
index 412f5c9c00..55f4b2b2aa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemGuildWelcomeBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f2183c;
+    public final LinkifiedTextView f2182c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetChatListAdapterItemGuildWelcomeBinding implements ViewB
     public WidgetChatListAdapterItemGuildWelcomeBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull ChatActionItem chatActionItem, @NonNull ChatActionItem chatActionItem2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2183c = linkifiedTextView;
+        this.f2182c = linkifiedTextView;
         this.d = linkifiedTextView2;
         this.e = chatActionItem;
         this.f = chatActionItem2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java
index 6940f1ebab..ab7ed25c9f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java
@@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2184c;
+    public final TextView f2183c;
     @NonNull
     public final FrameLayout d;
     @NonNull
@@ -44,7 +44,7 @@ public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding
     public WidgetChatListAdapterItemInviteBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull Barrier barrier2, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull FrameLayout frameLayout2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull View view, @NonNull ServerMemberCount serverMemberCount, @NonNull MaterialButton materialButton3, @NonNull TextView textView4, @NonNull ConstraintLayout constraintLayout2) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2184c = textView2;
+        this.f2183c = textView2;
         this.d = frameLayout2;
         this.e = linkifiedTextView;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java
index aa55ac1b31..03d9f7c734 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChatListAdapterItemMentionFooterBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2185c;
+    public final View f2184c;
 
     public WidgetChatListAdapterItemMentionFooterBinding(@NonNull LinearLayout linearLayout, @NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull View view2) {
         this.a = linearLayout;
         this.b = view;
-        this.f2185c = view2;
+        this.f2184c = view2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java
index 58f9b04ef2..0b15e42408 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemMessageHeaderBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2186c;
+    public final View f2185c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetChatListAdapterItemMessageHeaderBinding implements View
     public WidgetChatListAdapterItemMessageHeaderBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull Space space) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f2186c = view;
+        this.f2185c = view;
         this.d = textView2;
         this.e = space;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java
index 1c7c664f9c..2a7cc58b43 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemPrivateChannelStartBinding implement
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final PileView f2187c;
+    public final PileView f2186c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetChatListAdapterItemPrivateChannelStartBinding implement
     public WidgetChatListAdapterItemPrivateChannelStartBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull PileView pileView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2187c = pileView;
+        this.f2186c = pileView;
         this.d = linearLayout2;
         this.e = textView2;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java
index 6aa4ff278a..fe20d8338a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java
@@ -13,14 +13,14 @@ public final class WidgetChatListAdapterItemReactionsBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2188c;
+    public final View f2187c;
     @NonNull
     public final FlexboxLayout d;
 
     public WidgetChatListAdapterItemReactionsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull FlexboxLayout flexboxLayout) {
         this.a = constraintLayout;
         this.b = view;
-        this.f2188c = view2;
+        this.f2187c = view2;
         this.d = flexboxLayout;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java
index 6e1e854804..599b7fe297 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogetherBinding impleme
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2189c;
+    public final TextView f2188c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogetherBinding impleme
     public WidgetChatListAdapterItemSpotifyListenTogetherBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView, @NonNull TextView textView4, @NonNull TextView textView5) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f2189c = textView;
+        this.f2188c = textView;
         this.d = constraintLayout2;
         this.e = textView2;
         this.f = recyclerView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java
index 14627ffe9d..524b4f9b10 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemStageInviteBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2190c;
+    public final TextView f2189c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetChatListAdapterItemStageInviteBinding implements ViewBi
     public WidgetChatListAdapterItemStageInviteBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView5, @NonNull StageCardSpeakersView stageCardSpeakersView) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2190c = textView2;
+        this.f2189c = textView2;
         this.d = simpleDraweeView;
         this.e = textView4;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java
index dab709c8cf..45c72cf192 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemStartBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2191c;
+    public final TextView f2190c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetChatListAdapterItemStartBinding implements ViewBinding
     public WidgetChatListAdapterItemStartBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2191c = textView2;
+        this.f2190c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java
index 50d031885d..efa76c8e82 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChatListAdapterItemStickerGreetBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2192c;
+    public final MaterialButton f2191c;
 
     public WidgetChatListAdapterItemStickerGreetBinding(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = stickerView;
-        this.f2192c = materialButton;
+        this.f2191c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java
index 056e9f16ed..d7be588f0e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java
@@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemStickerGreetCompactBinding implement
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2193c;
+    public final TextView f2192c;
     @NonNull
     public final LinearLayout d;
 
     public WidgetChatListAdapterItemStickerGreetCompactBinding(@NonNull ConstraintLayout constraintLayout, @NonNull StickerView stickerView, @NonNull TextView textView, @NonNull LinearLayout linearLayout) {
         this.a = constraintLayout;
         this.b = stickerView;
-        this.f2193c = textView;
+        this.f2192c = textView;
         this.d = linearLayout;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java
index 132293b3be..5cf0a3ed23 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java
@@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemSystemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2194c;
+    public final ImageView f2193c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetChatListAdapterItemSystemBinding implements ViewBinding
     public WidgetChatListAdapterItemSystemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull Guideline guideline) {
         this.a = constraintLayout;
         this.b = appCompatImageView;
-        this.f2194c = imageView;
+        this.f2193c = imageView;
         this.d = linkifiedTextView;
         this.e = textView;
         this.f = linearLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java
index 79d9401f2a..ddab20bee6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java
@@ -27,7 +27,7 @@ public final class WidgetChatListAdapterItemTextBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2195c;
+    public final SimpleDraweeView f2194c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -42,7 +42,7 @@ public final class WidgetChatListAdapterItemTextBinding implements ViewBinding {
     public WidgetChatListAdapterItemTextBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull LinearLayout linearLayout, @NonNull View view3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout2, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull RoleIconView roleIconView, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull AppCompatImageView appCompatImageView, @NonNull TypingDots typingDots, @NonNull ConstraintLayout constraintLayout3, @NonNull ImageView imageView3, @NonNull TextView textView6, @NonNull Guideline guideline, @NonNull ConstraintLayout constraintLayout4) {
         this.a = constraintLayout;
         this.b = linkifiedTextView;
-        this.f2195c = simpleDraweeView;
+        this.f2194c = simpleDraweeView;
         this.d = textView3;
         this.e = roleIconView;
         this.f = textView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
index c59f4bf697..de4a6b08e3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChatListAdapterItemTextDividerBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2196c;
+    public final View f2195c;
     @NonNull
     public final TextView d;
 
     public WidgetChatListAdapterItemTextDividerBinding(@NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull View view2, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = view;
-        this.f2196c = view2;
+        this.f2195c = view2;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java
index 54feb64b3a..604be5b5ad 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemThreadDraftFormBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f2197c;
+    public final ConstraintLayout f2196c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetChatListAdapterItemThreadDraftFormBinding implements Vi
     public WidgetChatListAdapterItemThreadDraftFormBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull View view, @NonNull ConstraintLayout constraintLayout, @NonNull TextView textView2, @NonNull SwitchMaterial switchMaterial, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull TextInputLayout textInputLayout) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2197c = constraintLayout;
+        this.f2196c = constraintLayout;
         this.d = textView2;
         this.e = switchMaterial;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java
index 4e75af791b..88b927cfb7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java
@@ -18,7 +18,7 @@ public final class WidgetChatListAdapterItemThreadEmbedBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2198c;
+    public final View f2197c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -41,7 +41,7 @@ public final class WidgetChatListAdapterItemThreadEmbedBinding implements ViewBi
     public WidgetChatListAdapterItemThreadEmbedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull View view3, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ConstraintLayout constraintLayout4, @NonNull ViewReplySpline viewReplySpline, @NonNull Guideline guideline) {
         this.a = constraintLayout;
         this.b = view;
-        this.f2198c = view2;
+        this.f2197c = view2;
         this.d = constraintLayout2;
         this.e = imageView;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java
index 96219faff3..3ebf8c8099 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemUploadProgressBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2199c;
+    public final ImageView f2198c;
     @NonNull
     public final UploadProgressView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetChatListAdapterItemUploadProgressBinding implements Vie
     public WidgetChatListAdapterItemUploadProgressBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull UploadProgressView uploadProgressView, @NonNull UploadProgressView uploadProgressView2, @NonNull UploadProgressView uploadProgressView3) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f2199c = imageView2;
+        this.f2198c = imageView2;
         this.d = uploadProgressView;
         this.e = uploadProgressView2;
         this.f = uploadProgressView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
index 2589508bc6..6ac8feaab1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
@@ -18,7 +18,7 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2200c;
+    public final SimpleDraweeView f2199c;
     @NonNull
     public final MaterialTextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind
     public WidgetChatListBotUiButtonComponentBinding(@NonNull ButtonComponentView buttonComponentView, @NonNull MaterialButton materialButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialTextView materialTextView, @NonNull AppCompatImageView appCompatImageView, @NonNull TypingDots typingDots) {
         this.a = buttonComponentView;
         this.b = materialButton;
-        this.f2200c = simpleDraweeView;
+        this.f2199c = simpleDraweeView;
         this.d = materialTextView;
         this.e = appCompatImageView;
         this.f = typingDots;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java
index 8f803333d3..4634b6f64a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java
@@ -18,7 +18,7 @@ public final class WidgetChatOverlayBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f2201c;
+    public final RelativeLayout f2200c;
     @NonNull
     public final TypingDots d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetChatOverlayBinding implements ViewBinding {
     public WidgetChatOverlayBinding(@NonNull ConstraintLayout constraintLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull RelativeLayout relativeLayout, @NonNull TypingDots typingDots, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull q4 q4Var) {
         this.a = constraintLayout;
         this.b = floatingActionButton;
-        this.f2201c = relativeLayout;
+        this.f2200c = relativeLayout;
         this.d = typingDots;
         this.e = textView;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java
index a8497d8273..b26f780b8c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChatStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2202c;
+    public final ImageView f2201c;
     @NonNull
     public final TextView d;
 
     public WidgetChatStatusBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f2202c = imageView;
+        this.f2201c = imageView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
index 7b40f436a9..56cada1d37 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialCardView f2203c;
+    public final MaterialCardView f2202c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding
     public WidgetChoosePlanAdapterPlanItemBinding(@NonNull MaterialCardView materialCardView, @NonNull ImageView imageView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = materialCardView;
         this.b = imageView;
-        this.f2203c = materialCardView2;
+        this.f2202c = materialCardView2;
         this.d = textView;
         this.e = imageView2;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java b/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java
index 9dbe765b5f..a73266e3b0 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChoosePlanBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f2204c;
+    public final LinkifiedTextView f2203c;
     @NonNull
     public final RecyclerView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetChoosePlanBinding implements ViewBinding {
     public WidgetChoosePlanBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull RecyclerView recyclerView, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = linearLayout;
-        this.f2204c = linkifiedTextView;
+        this.f2203c = linkifiedTextView;
         this.d = recyclerView;
         this.e = dimmerView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java b/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java
index 6becebdc03..f5d17840fb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java
@@ -17,7 +17,7 @@ public final class WidgetClaimOutboundPromoBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2205c;
+    public final TextView f2204c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetClaimOutboundPromoBinding implements ViewBinding {
     public WidgetClaimOutboundPromoBinding(@NonNull LinearLayoutCompat linearLayoutCompat, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayoutCompat linearLayoutCompat2, @NonNull MaterialButton materialButton2, @NonNull AppViewFlipper appViewFlipper, @NonNull FrameLayout frameLayout, @NonNull MaterialButton materialButton3, @NonNull MaterialButton materialButton4, @NonNull LinearLayoutCompat linearLayoutCompat3) {
         this.a = linearLayoutCompat;
         this.b = textView;
-        this.f2205c = textView2;
+        this.f2204c = textView2;
         this.d = linearLayout;
         this.e = materialButton;
         this.f = materialButton2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java
index 027dd90a00..ec4ea2bf3c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java
@@ -14,12 +14,12 @@ public final class WidgetCollapsedVoiceUserListItemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2206c;
+    public final SimpleDraweeView f2205c;
 
     public WidgetCollapsedVoiceUserListItemBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView) {
         this.a = frameLayout;
         this.b = textView;
-        this.f2206c = simpleDraweeView;
+        this.f2205c = simpleDraweeView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java
index d55387e2a8..1c8bfc7f30 100644
--- a/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java
@@ -14,12 +14,12 @@ public final class WidgetConfirmRemoveCommunityDialogBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2207c;
+    public final MaterialButton f2206c;
 
     public WidgetConfirmRemoveCommunityDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2207c = materialButton2;
+        this.f2206c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java b/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java
index 190be59af8..23284bd14c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java
@@ -15,14 +15,14 @@ public final class WidgetConnectionsAddXboxBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2208c;
+    public final LinearLayout f2207c;
     @NonNull
     public final DimmerView d;
 
     public WidgetConnectionsAddXboxBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CodeVerificationView codeVerificationView, @NonNull LinearLayout linearLayout, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = codeVerificationView;
-        this.f2208c = linearLayout;
+        this.f2207c = linearLayout;
         this.d = dimmerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java b/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java
index 7b85062f90..3671b56742 100644
--- a/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java
@@ -19,7 +19,7 @@ public final class WidgetContactSyncBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final f0 f2209c;
+    public final f0 f2208c;
     @NonNull
     public final g0 d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetContactSyncBinding implements ViewBinding {
     public WidgetContactSyncBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull c0 c0Var, @NonNull f0 f0Var, @NonNull g0 g0Var, @NonNull d0 d0Var, @NonNull e0 e0Var, @NonNull i0 i0Var, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = c0Var;
-        this.f2209c = f0Var;
+        this.f2208c = f0Var;
         this.d = g0Var;
         this.e = d0Var;
         this.f = e0Var;
diff --git a/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java
index 92926a7032..6af008b1b6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java
@@ -21,7 +21,7 @@ public final class WidgetCreateChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RadioButton f2210c;
+    public final RadioButton f2209c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -53,12 +53,12 @@ public final class WidgetCreateChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final RadioButton f2211r;
+    public final RadioButton f2210r;
 
     public WidgetCreateChannelBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull RadioButton radioButton, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2, @NonNull SwitchCompat switchCompat, @NonNull TextView textView3, @NonNull RecyclerView recyclerView, @NonNull View view, @NonNull TextView textView4, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView2, @NonNull RadioButton radioButton2, @NonNull TextView textView5, @NonNull ConstraintLayout constraintLayout3, @NonNull ImageView imageView3, @NonNull RadioButton radioButton3, @NonNull TextView textView6, @NonNull LinearLayout linearLayout, @NonNull ConstraintLayout constraintLayout4, @NonNull ImageView imageView4, @NonNull RadioButton radioButton4, @NonNull TextView textView7) {
         this.a = coordinatorLayout;
         this.b = constraintLayout;
-        this.f2210c = radioButton;
+        this.f2209c = radioButton;
         this.d = textInputLayout;
         this.e = relativeLayout;
         this.f = textView2;
@@ -73,7 +73,7 @@ public final class WidgetCreateChannelBinding implements ViewBinding {
         this.o = radioButton3;
         this.p = linearLayout;
         this.q = constraintLayout4;
-        this.f2211r = radioButton4;
+        this.f2210r = radioButton4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java b/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java
index 93e90f20b7..d23fc60301 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java
@@ -15,7 +15,7 @@ public final class WidgetCreationIntentBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2212c;
+    public final TextView f2211c;
     @NonNull
     public final MaterialCardView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetCreationIntentBinding implements ViewBinding {
     public WidgetCreationIntentBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialCardView materialCardView, @NonNull TextView textView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView2, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = materialCardView;
-        this.f2212c = textView;
+        this.f2211c = textView;
         this.d = materialCardView2;
         this.e = textView2;
         this.f = linkifiedTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetDirectoriesSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetDirectoriesSearchBinding.java
index 63b3dc0f63..e97d652e05 100644
--- a/app/src/main/java/com/discord/databinding/WidgetDirectoriesSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetDirectoriesSearchBinding.java
@@ -21,7 +21,7 @@ public final class WidgetDirectoriesSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2213c;
+    public final LinearLayout f2212c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetDirectoriesSearchBinding implements ViewBinding {
     public WidgetDirectoriesSearchBinding(@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.f2213c = linearLayout;
+        this.f2212c = linearLayout;
         this.d = textView;
         this.e = recyclerView;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetDirectoryChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetDirectoryChannelBinding.java
index bf7cdbb7c1..74643510bb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetDirectoryChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetDirectoryChannelBinding.java
@@ -17,7 +17,7 @@ public final class WidgetDirectoryChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ServerDiscoveryHeader f2214c;
+    public final ServerDiscoveryHeader f2213c;
     @NonNull
     public final TabLayout d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetDirectoryChannelBinding implements ViewBinding {
     public WidgetDirectoryChannelBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Toolbar toolbar, @NonNull ServerDiscoveryHeader serverDiscoveryHeader, @NonNull TabLayout tabLayout, @NonNull ViewPager2 viewPager2, @NonNull w4 w4Var) {
         this.a = coordinatorLayout;
         this.b = toolbar;
-        this.f2214c = serverDiscoveryHeader;
+        this.f2213c = serverDiscoveryHeader;
         this.d = tabLayout;
         this.e = viewPager2;
         this.f = w4Var;
diff --git a/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java
index e850902f03..eb0cd1df48 100644
--- a/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java
@@ -16,7 +16,7 @@ public final class WidgetDisableDeleteAccountDialogBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2215c;
+    public final MaterialButton f2214c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetDisableDeleteAccountDialogBinding implements ViewBindin
     public WidgetDisableDeleteAccountDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2215c = materialButton;
+        this.f2214c = materialButton;
         this.d = textInputLayout;
         this.e = loadingButton;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEditProfileBannerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEditProfileBannerSheetBinding.java
index affb0afa6b..c868c1d270 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEditProfileBannerSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEditProfileBannerSheetBinding.java
@@ -16,7 +16,7 @@ public final class WidgetEditProfileBannerSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialTextView f2216c;
+    public final MaterialTextView f2215c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetEditProfileBannerSheetBinding implements ViewBinding {
     public WidgetEditProfileBannerSheetBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialTextView materialTextView, @NonNull MaterialTextView materialTextView2, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialTextView materialTextView3, @NonNull MaterialTextView materialTextView4, @NonNull ImageView imageView, @NonNull MaterialTextView materialTextView5, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f2216c = materialTextView2;
+        this.f2215c = materialTextView2;
         this.d = constraintLayout;
         this.e = imageView;
         this.f = materialTextView5;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java b/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java
index 55fd16049c..9b0d804484 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java
@@ -69,17 +69,17 @@ public final class WidgetEditRoleBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: a0  reason: collision with root package name */
-    public final CheckedSetting f2217a0;
+    public final CheckedSetting f2216a0;
     @NonNull
     public final TextInputLayout b;
     @NonNull
 
     /* renamed from: b0  reason: collision with root package name */
-    public final CheckedSetting f2218b0;
+    public final CheckedSetting f2217b0;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2219c;
+    public final FloatingActionButton f2218c;
     @NonNull
     public final View d;
     @NonNull
@@ -111,7 +111,7 @@ public final class WidgetEditRoleBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final CheckedSetting f2220r;
+    public final CheckedSetting f2219r;
     @NonNull
     public final CheckedSetting s;
     @NonNull
@@ -123,24 +123,24 @@ public final class WidgetEditRoleBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final CheckedSetting f2221w;
+    public final CheckedSetting f2220w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final CheckedSetting f2222x;
+    public final CheckedSetting f2221x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final CheckedSetting f2223y;
+    public final CheckedSetting f2222y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final CheckedSetting f2224z;
+    public final CheckedSetting f2223z;
 
     public WidgetEditRoleBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull View view, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull View view2, @NonNull RelativeLayout relativeLayout, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull View view3, @NonNull View view4, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull RelativeLayout relativeLayout2, @NonNull CheckedSetting checkedSetting11, @NonNull CheckedSetting checkedSetting12, @NonNull CheckedSetting checkedSetting13, @NonNull CheckedSetting checkedSetting14, @NonNull CheckedSetting checkedSetting15, @NonNull CheckedSetting checkedSetting16, @NonNull CheckedSetting checkedSetting17, @NonNull CheckedSetting checkedSetting18, @NonNull CheckedSetting checkedSetting19, @NonNull CheckedSetting checkedSetting20, @NonNull CheckedSetting checkedSetting21, @NonNull CheckedSetting checkedSetting22, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting23, @NonNull CheckedSetting checkedSetting24, @NonNull CheckedSetting checkedSetting25, @NonNull CheckedSetting checkedSetting26, @NonNull RoleIconView roleIconView, @NonNull View view5, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting27, @NonNull CheckedSetting checkedSetting28, @NonNull CheckedSetting checkedSetting29, @NonNull CheckedSetting checkedSetting30, @NonNull CheckedSetting checkedSetting31, @NonNull CheckedSetting checkedSetting32, @NonNull CheckedSetting checkedSetting33, @NonNull CheckedSetting checkedSetting34, @NonNull CheckedSetting checkedSetting35, @NonNull CheckedSetting checkedSetting36, @NonNull CheckedSetting checkedSetting37, @NonNull CheckedSetting checkedSetting38, @NonNull CheckedSetting checkedSetting39, @NonNull CheckedSetting checkedSetting40, @NonNull CheckedSetting checkedSetting41) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2219c = floatingActionButton;
+        this.f2218c = floatingActionButton;
         this.d = view;
         this.e = textView;
         this.f = checkedSetting;
@@ -155,15 +155,15 @@ public final class WidgetEditRoleBinding implements ViewBinding {
         this.o = checkedSetting8;
         this.p = view3;
         this.q = view4;
-        this.f2220r = checkedSetting9;
+        this.f2219r = checkedSetting9;
         this.s = checkedSetting10;
         this.t = relativeLayout2;
         this.u = checkedSetting11;
         this.v = checkedSetting12;
-        this.f2221w = checkedSetting13;
-        this.f2222x = checkedSetting14;
-        this.f2223y = checkedSetting15;
-        this.f2224z = checkedSetting16;
+        this.f2220w = checkedSetting13;
+        this.f2221x = checkedSetting14;
+        this.f2222y = checkedSetting15;
+        this.f2223z = checkedSetting16;
         this.A = checkedSetting17;
         this.B = checkedSetting18;
         this.C = checkedSetting19;
@@ -190,8 +190,8 @@ public final class WidgetEditRoleBinding implements ViewBinding {
         this.X = checkedSetting37;
         this.Y = checkedSetting38;
         this.Z = checkedSetting39;
-        this.f2217a0 = checkedSetting40;
-        this.f2218b0 = checkedSetting41;
+        this.f2216a0 = checkedSetting40;
+        this.f2217b0 = checkedSetting41;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java
index 1a60a3af25..094a31fd84 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java
@@ -22,7 +22,7 @@ public final class WidgetEmojiPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2225c;
+    public final AppViewFlipper f2224c;
     @NonNull
     public final AppBarLayout d;
     @NonNull
@@ -49,7 +49,7 @@ public final class WidgetEmojiPickerBinding implements ViewBinding {
     public WidgetEmojiPickerBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull AppBarLayout appBarLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull Barrier barrier, @NonNull RecyclerView recyclerView2, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull ImageView imageView2, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView3, @NonNull TextInputEditText textInputEditText, @NonNull Toolbar toolbar) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2225c = appViewFlipper;
+        this.f2224c = appViewFlipper;
         this.d = appBarLayout;
         this.e = textView;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java
index 472fec67f1..a4715b921a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetEmojiSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2226c;
+    public final TextView f2225c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -50,7 +50,7 @@ public final class WidgetEmojiSheetBinding implements ViewBinding {
     public WidgetEmojiSheetBinding(@NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView, @NonNull FrameLayout frameLayout, @NonNull View view, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppViewFlipper appViewFlipper2, @NonNull MaterialButton materialButton, @NonNull FrameLayout frameLayout2, @NonNull MaterialButton materialButton2, @NonNull TextView textView3, @NonNull FrameLayout frameLayout3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView5, @NonNull MaterialButton materialButton3, @NonNull TextView textView6, @NonNull MaterialButton materialButton4) {
         this.a = appViewFlipper;
         this.b = frameLayout;
-        this.f2226c = textView2;
+        this.f2225c = textView2;
         this.d = simpleDraweeView;
         this.e = appViewFlipper2;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java b/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java
index 17480e892d..efd652ad98 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetEnableMfaStepsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final StepsView f2227c;
+    public final StepsView f2226c;
 
     public WidgetEnableMfaStepsBinding(@NonNull FrameLayout frameLayout, @NonNull DimmerView dimmerView, @NonNull StepsView stepsView) {
         this.a = frameLayout;
         this.b = dimmerView;
-        this.f2227c = stepsView;
+        this.f2226c = stepsView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java
index f60f87f3c2..47142b4de3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java
@@ -16,7 +16,7 @@ public final class WidgetEnableSmsBackupDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2228c;
+    public final MaterialButton f2227c;
     @NonNull
     public final LoadingButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetEnableSmsBackupDialogBinding implements ViewBinding {
     public WidgetEnableSmsBackupDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2228c = materialButton;
+        this.f2227c = materialButton;
         this.d = loadingButton;
         this.e = textView2;
         this.f = textInputLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java
index cef8e9becb..fe939096af 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java
@@ -15,14 +15,14 @@ public final class WidgetEndStageBottomSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2229c;
+    public final MaterialButton f2228c;
     @NonNull
     public final ScreenTitleView d;
 
     public WidgetEndStageBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull ScreenTitleView screenTitleView) {
         this.a = nestedScrollView;
         this.b = materialButton;
-        this.f2229c = materialButton2;
+        this.f2228c = materialButton2;
         this.d = screenTitleView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java b/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java
index 52084e3c51..1827e04a89 100644
--- a/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java
@@ -21,7 +21,7 @@ public final class WidgetExpressionTrayBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f2230c;
+    public final FrameLayout f2229c;
     @NonNull
     public final FragmentContainerView d;
     @NonNull
@@ -48,7 +48,7 @@ public final class WidgetExpressionTrayBinding implements ViewBinding {
     public WidgetExpressionTrayBinding(@NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull FrameLayout frameLayout3, @NonNull FragmentContainerView fragmentContainerView, @NonNull CardSegment cardSegment, @NonNull FragmentContainerView fragmentContainerView2, @NonNull CardSegment cardSegment2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout, @NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull CardSegment cardSegment3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull AppBarLayout appBarLayout) {
         this.a = frameLayout;
         this.b = frameLayout2;
-        this.f2230c = frameLayout3;
+        this.f2229c = frameLayout3;
         this.d = fragmentContainerView;
         this.e = fragmentContainerView2;
         this.f = cardSegment2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java b/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java
index d5ab65268b..95f1567f6e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java
@@ -15,7 +15,7 @@ public final class WidgetFatalCrashBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2231c;
+    public final TextView f2230c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetFatalCrashBinding implements ViewBinding {
     public WidgetFatalCrashBinding(@NonNull ScrollView scrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView5) {
         this.a = scrollView;
         this.b = textView;
-        this.f2231c = textView2;
+        this.f2230c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = linkifiedTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java
index 5cbac9ba13..d7bffa8949 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java
@@ -15,7 +15,7 @@ public final class WidgetFeedbackSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final NestedScrollView f2232c;
+    public final NestedScrollView f2231c;
     @NonNull
     public final FeedbackView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetFeedbackSheetBinding implements ViewBinding {
     public WidgetFeedbackSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull ImageView imageView, @NonNull NestedScrollView nestedScrollView2, @NonNull FeedbackView feedbackView, @NonNull TextView textView) {
         this.a = nestedScrollView;
         this.b = imageView;
-        this.f2232c = nestedScrollView2;
+        this.f2231c = nestedScrollView2;
         this.d = feedbackView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
index 439f6df233..76bad36e5b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
@@ -14,7 +14,7 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2233c;
+    public final TextView f2232c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding {
     public WidgetFolderContextMenuBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = cardView;
         this.b = cardView2;
-        this.f2233c = textView;
+        this.f2232c = textView;
         this.d = textView2;
         this.e = textView3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java
index 02ed000e8b..2618b881a4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java
@@ -16,7 +16,7 @@ public final class WidgetFriendsAddByIdBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2234c;
+    public final LinearLayout f2233c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetFriendsAddByIdBinding implements ViewBinding {
     public WidgetFriendsAddByIdBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2234c = linearLayout;
+        this.f2233c = linearLayout;
         this.d = materialButton;
         this.e = textInputLayout;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java
index 5fb0f4d3be..26227098f2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java
@@ -18,7 +18,7 @@ public final class WidgetFriendsListAdapterItemFriendBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2235c;
+    public final SimpleDraweeView f2234c;
     @NonNull
     public final AppCompatImageView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetFriendsListAdapterItemFriendBinding implements ViewBind
     public WidgetFriendsListAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2) {
         this.a = relativeLayout;
         this.b = simpleDraweeSpanTextView;
-        this.f2235c = simpleDraweeView;
+        this.f2234c = simpleDraweeView;
         this.d = appCompatImageView;
         this.e = appCompatImageView2;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java
index 78f6ddcf4d..b276cadd80 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java
@@ -18,7 +18,7 @@ public final class WidgetFriendsListAdapterItemPendingBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeSpanTextView f2236c;
+    public final SimpleDraweeSpanTextView f2235c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetFriendsListAdapterItemPendingBinding implements ViewBin
     public WidgetFriendsListAdapterItemPendingBinding(@NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2) {
         this.a = relativeLayout;
         this.b = appCompatImageView;
-        this.f2236c = simpleDraweeSpanTextView;
+        this.f2235c = simpleDraweeSpanTextView;
         this.d = simpleDraweeView;
         this.e = appCompatImageView2;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java
index c99b395e42..74b46a9887 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java
@@ -16,7 +16,7 @@ public final class WidgetFriendsListBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final EmptyFriendsStateView f2237c;
+    public final EmptyFriendsStateView f2236c;
     @NonNull
     public final AppViewFlipper d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetFriendsListBinding implements ViewBinding {
     public WidgetFriendsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView, @NonNull EmptyFriendsStateView emptyFriendsStateView, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) {
         this.a = relativeLayout;
         this.b = emptyFriendsStateContactSyncView;
-        this.f2237c = emptyFriendsStateView;
+        this.f2236c = emptyFriendsStateView;
         this.d = appViewFlipper;
         this.e = recyclerView;
         this.f = recyclerView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
index ff944ed737..0d2ee00f6a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
@@ -14,12 +14,12 @@ public final class WidgetFriendsListExpandableHeaderBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2238c;
+    public final TextView f2237c;
 
     public WidgetFriendsListExpandableHeaderBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = frameLayout;
         this.b = textView;
-        this.f2238c = textView2;
+        this.f2237c = textView2;
     }
 
     @NonNull
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java
index 2b4533b3b2..7966de4763 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java
@@ -16,7 +16,7 @@ public final class WidgetFriendsNearbyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2239c;
+    public final TextView f2238c;
     @NonNull
     public final RecyclerView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetFriendsNearbyBinding implements ViewBinding {
     public WidgetFriendsNearbyBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull TextView textView2, @NonNull RLottieImageView rLottieImageView, @NonNull TextView textView3) {
         this.a = nestedScrollView;
         this.b = materialButton;
-        this.f2239c = textView;
+        this.f2238c = textView;
         this.d = recyclerView;
         this.e = textView2;
         this.f = rLottieImageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java
index abc520892e..5ed0ea483b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGifCategoryBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2240c;
+    public final RecyclerView f2239c;
     @NonNull
     public final GifLoadingView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetGifCategoryBinding implements ViewBinding {
     public WidgetGifCategoryBinding(@NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout, @NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout2, @NonNull RecyclerView recyclerView, @NonNull GifLoadingView gifLoadingView, @NonNull TextView textView) {
         this.a = contentResizingCoordinatorLayout;
         this.b = contentResizingCoordinatorLayout2;
-        this.f2240c = recyclerView;
+        this.f2239c = recyclerView;
         this.d = gifLoadingView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java
index 168ee49282..b1ed8fbdc8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java
@@ -14,14 +14,14 @@ public final class WidgetGifPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f2241c;
+    public final FrameLayout f2240c;
     @NonNull
     public final GifLoadingView d;
 
     public WidgetGifPickerBinding(@NonNull FrameLayout frameLayout, @NonNull RecyclerView recyclerView, @NonNull FrameLayout frameLayout2, @NonNull GifLoadingView gifLoadingView) {
         this.a = frameLayout;
         this.b = recyclerView;
-        this.f2241c = frameLayout2;
+        this.f2240c = frameLayout2;
         this.d = gifLoadingView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java
index f6a3bc5a35..0fbfd26894 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGifPickerSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final GifLoadingView f2242c;
+    public final GifLoadingView f2241c;
     @NonNull
     public final AppViewFlipper d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGifPickerSearchBinding implements ViewBinding {
     public WidgetGifPickerSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout appBarLayout, @NonNull RecyclerView recyclerView, @NonNull GifLoadingView gifLoadingView, @NonNull Toolbar toolbar, @NonNull AppViewFlipper appViewFlipper, @NonNull SearchInputView searchInputView) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2242c = gifLoadingView;
+        this.f2241c = gifLoadingView;
         this.d = appViewFlipper;
         this.e = searchInputView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java
index 0e61ecdac7..e9ae83b409 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java
@@ -17,7 +17,7 @@ public final class WidgetGlobalSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2243c;
+    public final TextInputLayout f2242c;
     @NonNull
     public final TextInputEditText d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetGlobalSearchBinding implements ViewBinding {
     public WidgetGlobalSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputEditText textInputEditText, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton2, @NonNull RecyclerView recyclerView2, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f2243c = textInputLayout;
+        this.f2242c = textInputLayout;
         this.d = textInputEditText;
         this.e = recyclerView;
         this.f = materialButton2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java
index 57423f0482..58419f1277 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java
@@ -13,12 +13,12 @@ public final class WidgetGlobalSearchItemGuildBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2244c;
+    public final ImageView f2243c;
 
     public WidgetGlobalSearchItemGuildBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f2244c = imageView2;
+        this.f2243c = imageView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java
index 12625c7610..30bb3611b5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGlobalStatusIndicatorBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2245c;
+    public final LinearLayout f2244c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetGlobalStatusIndicatorBinding implements ViewBinding {
     public WidgetGlobalStatusIndicatorBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull MaterialButton materialButton2, @NonNull ImageView imageView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2245c = linearLayout2;
+        this.f2244c = linearLayout2;
         this.d = materialButton;
         this.e = linearLayout3;
         this.f = linearLayout4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java
index 70179d58e2..6fff6c60cb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGroupInviteFriendsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f2246c;
+    public final RelativeLayout f2245c;
     @NonNull
     public final RecyclerView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetGroupInviteFriendsBinding implements ViewBinding {
     public WidgetGroupInviteFriendsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull ChipsView chipsView, @NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = chipsView;
-        this.f2246c = relativeLayout;
+        this.f2245c = relativeLayout;
         this.d = recyclerView;
         this.e = floatingActionButton;
         this.f = appViewFlipper;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java
index 27a6c6cf1c..b931c28c9e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGroupInviteFriendsItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2247c;
+    public final SimpleDraweeView f2246c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetGroupInviteFriendsItemBinding implements ViewBinding {
     public WidgetGroupInviteFriendsItemBinding(@NonNull LinearLayout linearLayout, @NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull CheckBox checkBox) {
         this.a = linearLayout;
         this.b = relativeLayout;
-        this.f2247c = simpleDraweeView;
+        this.f2246c = simpleDraweeView;
         this.d = simpleDraweeSpanTextView;
         this.e = textView;
         this.f = statusView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java
index e796085319..3ae1e28ef5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java
@@ -22,7 +22,7 @@ public final class WidgetGuildCloneBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2248c;
+    public final AppViewFlipper f2247c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -41,7 +41,7 @@ public final class WidgetGuildCloneBinding implements ViewBinding {
     public WidgetGuildCloneBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull j0 j0Var, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull GuildTemplateChannelsView guildTemplateChannelsView, @NonNull RolesListView rolesListView, @NonNull LinearLayout linearLayout, @NonNull ProgressBar progressBar) {
         this.a = coordinatorLayout;
         this.b = loadingButton;
-        this.f2248c = appViewFlipper;
+        this.f2247c = appViewFlipper;
         this.d = linkifiedTextView;
         this.e = j0Var;
         this.f = textInputLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
index cf7c0c9a07..5a4f41a9b6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
@@ -14,7 +14,7 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2249c;
+    public final TextView f2248c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding {
     public WidgetGuildContextMenuBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) {
         this.a = cardView;
         this.b = cardView2;
-        this.f2249c = textView;
+        this.f2248c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = textView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java
index db7bf91a29..f703f10789 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java
@@ -17,7 +17,7 @@ public final class WidgetGuildCreateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f2250c;
+    public final LinkifiedTextView f2249c;
     @NonNull
     public final j0 d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetGuildCreateBinding implements ViewBinding {
     public WidgetGuildCreateBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull j0 j0Var, @NonNull TextInputLayout textInputLayout, @NonNull ScreenTitleView screenTitleView) {
         this.a = coordinatorLayout;
         this.b = loadingButton;
-        this.f2250c = linkifiedTextView;
+        this.f2249c = linkifiedTextView;
         this.d = j0Var;
         this.e = textInputLayout;
         this.f = screenTitleView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java
index 6d46a52479..e6c8014ca7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildFolderSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2251c;
+    public final TextView f2250c;
     @NonNull
     public final RelativeLayout d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildFolderSettingsBinding implements ViewBinding {
     public WidgetGuildFolderSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2251c = textView;
+        this.f2250c = textView;
         this.d = relativeLayout;
         this.e = view;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildHubProfileActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildHubProfileActionsBinding.java
index 6df125159b..908d537fed 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildHubProfileActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildHubProfileActionsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGuildHubProfileActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2252c;
+    public final SimpleDraweeView f2251c;
     @NonNull
     public final CardView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetGuildHubProfileActionsBinding implements ViewBinding {
     public WidgetGuildHubProfileActionsBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull CardView cardView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull CardView cardView2, @NonNull LinearLayout linearLayout5) {
         this.a = linearLayout;
         this.b = linearLayout4;
-        this.f2252c = simpleDraweeView;
+        this.f2251c = simpleDraweeView;
         this.d = cardView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildIdentityMarketingSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildIdentityMarketingSheetBinding.java
deleted file mode 100644
index d391e04ee3..0000000000
--- a/app/src/main/java/com/discord/databinding/WidgetGuildIdentityMarketingSheetBinding.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.discord.databinding;
-
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import androidx.annotation.NonNull;
-import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-public final class WidgetGuildIdentityMarketingSheetBinding implements ViewBinding {
-    @NonNull
-    public final FrameLayout a;
-    @NonNull
-    public final MaterialButton b;
-    @NonNull
-
-    /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2253c;
-
-    public WidgetGuildIdentityMarketingSheetBinding(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
-        this.a = frameLayout;
-        this.b = materialButton;
-        this.f2253c = materialButton2;
-    }
-
-    @Override // androidx.viewbinding.ViewBinding
-    @NonNull
-    public View getRoot() {
-        return this.a;
-    }
-}
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoViewBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoViewBinding.java
index 49cc10ea8d..c726a867ab 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoViewBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildInviteInfoViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2254c;
+    public final SimpleDraweeView f2252c;
     @NonNull
     public final ServerMemberCount d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildInviteInfoViewBinding implements ViewBinding {
     public WidgetGuildInviteInfoViewBinding(@NonNull View view, @NonNull GuildView guildView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ServerMemberCount serverMemberCount, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout) {
         this.a = view;
         this.b = guildView;
-        this.f2254c = simpleDraweeView;
+        this.f2252c = simpleDraweeView;
         this.d = serverMemberCount;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInvitePageBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInvitePageBinding.java
index c6c0df5b8f..8d9fe660fb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInvitePageBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInvitePageBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGuildInvitePageBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2255c;
+    public final MaterialButton f2253c;
     @NonNull
     public final GuildScheduledEventItemView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildInvitePageBinding implements ViewBinding {
     public WidgetGuildInvitePageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton2, @NonNull GuildScheduledEventItemView guildScheduledEventItemView, @NonNull WidgetInviteInfo widgetInviteInfo, @NonNull NestedScrollView nestedScrollView, @NonNull AppBarLayout appBarLayout) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2255c = materialButton2;
+        this.f2253c = materialButton2;
         this.d = guildScheduledEventItemView;
         this.e = widgetInviteInfo;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java
index e1254d1a65..bfcd607732 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 f2256c;
+    public final RadioGroup f2254c;
     @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.f2256c = radioGroup;
+        this.f2254c = 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 2a9cda7bc0..8436ef316a 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 f2257c;
+    public final TextView f2255c;
     @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.f2257c = textView;
+        this.f2255c = 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 edd8c99900..353bc22516 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 f2258c;
+    public final TextView f2256c;
     @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.f2258c = textView;
+        this.f2256c = 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 f6167a326b..716e638bdd 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 f2259c;
+    public final TextView f2257c;
     @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.f2259c = textView;
+        this.f2257c = 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 e782086ace..f2adee110c 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 f2260c;
+    public final MaterialButton f2258c;
     @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.f2260c = materialButton;
+        this.f2258c = 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 8de1f9a54e..c7ca4937eb 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 f2261c;
+    public final TextView f2259c;
     @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.f2261c = textView;
+        this.f2259c = 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 7f13dadaa5..9549a7df70 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 f2262c;
+    public final TextInputLayout f2260c;
 
     public WidgetGuildJoinBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f2262c = textInputLayout;
+        this.f2260c = 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 cdde637673..324f8bc4bd 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java
@@ -16,9 +16,7 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding {
     @NonNull
     public final MaterialButton A;
     @NonNull
-    public final MaterialButton B;
-    @NonNull
-    public final LinearLayout C;
+    public final LinearLayout B;
     @NonNull
     public final LinearLayout a;
     @NonNull
@@ -26,94 +24,93 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2263c;
+    public final LinearLayout f2261c;
     @NonNull
-    public final LinearLayout d;
+    public final CheckedSetting d;
     @NonNull
-    public final CheckedSetting e;
+    public final LinearLayout e;
     @NonNull
     public final LinearLayout f;
     @NonNull
-    public final LinearLayout g;
+    public final TextView g;
     @NonNull
     public final TextView h;
     @NonNull
     public final TextView i;
     @NonNull
-    public final TextView j;
+    public final ConstraintLayout j;
     @NonNull
-    public final ConstraintLayout k;
+    public final TextView k;
     @NonNull
-    public final TextView l;
+    public final CardView l;
     @NonNull
-    public final CardView m;
+    public final RecyclerView m;
     @NonNull
-    public final RecyclerView n;
+    public final CardView n;
     @NonNull
-    public final CardView o;
+    public final TextView o;
     @NonNull
-    public final TextView p;
+    public final SimpleDraweeView p;
     @NonNull
-    public final SimpleDraweeView q;
+    public final CheckedSetting q;
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final CheckedSetting f2264r;
+    public final MaterialButton f2262r;
     @NonNull
-    public final MaterialButton s;
+    public final TextView s;
     @NonNull
     public final TextView t;
     @NonNull
-    public final TextView u;
+    public final CardView u;
     @NonNull
-    public final CardView v;
+    public final TextView v;
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final TextView f2265w;
+    public final ImageView f2263w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final ImageView f2266x;
+    public final TextView f2264x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextView f2267y;
+    public final CardView f2265y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final CardView f2268z;
+    public final MaterialButton f2266z;
 
     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 ConstraintLayout constraintLayout, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull CardView cardView2, @NonNull TextView textView7, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CheckedSetting checkedSetting2, @NonNull MaterialButton materialButton, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull CardView cardView3, @NonNull TextView textView10, @NonNull ImageView imageView, @NonNull TextView textView11, @NonNull CardView cardView4, @NonNull CardView cardView5, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout6) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f2263c = textView;
-        this.d = linearLayout3;
-        this.e = checkedSetting;
-        this.f = linearLayout4;
-        this.g = linearLayout5;
-        this.h = textView2;
-        this.i = textView3;
-        this.j = textView4;
-        this.k = constraintLayout;
-        this.l = textView6;
-        this.m = cardView;
-        this.n = recyclerView;
-        this.o = cardView2;
-        this.p = textView7;
-        this.q = simpleDraweeView;
-        this.f2264r = checkedSetting2;
-        this.s = materialButton;
-        this.t = textView8;
-        this.u = textView9;
-        this.v = cardView3;
-        this.f2265w = textView10;
-        this.f2266x = imageView;
-        this.f2267y = textView11;
-        this.f2268z = cardView4;
-        this.A = materialButton2;
-        this.B = materialButton3;
-        this.C = linearLayout6;
+        this.f2261c = linearLayout3;
+        this.d = checkedSetting;
+        this.e = linearLayout4;
+        this.f = linearLayout5;
+        this.g = textView2;
+        this.h = textView3;
+        this.i = textView4;
+        this.j = constraintLayout;
+        this.k = textView6;
+        this.l = cardView;
+        this.m = recyclerView;
+        this.n = cardView2;
+        this.o = textView7;
+        this.p = simpleDraweeView;
+        this.q = checkedSetting2;
+        this.f2262r = materialButton;
+        this.s = textView8;
+        this.t = textView9;
+        this.u = cardView3;
+        this.v = textView10;
+        this.f2263w = imageView;
+        this.f2264x = textView11;
+        this.f2265y = cardView4;
+        this.f2266z = materialButton2;
+        this.A = materialButton3;
+        this.B = linearLayout6;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java
index 4e6cce93dc..09ab4c623f 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 f2269c;
+    public final MaterialButton f2267c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -54,7 +54,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2270r;
+    public final TextView f2268r;
     @NonNull
     public final MaterialButton s;
     @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.f2269c = materialButton;
+        this.f2267c = materialButton;
         this.d = constraintLayout;
         this.e = view;
         this.f = textView;
@@ -82,7 +82,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding {
         this.o = textView4;
         this.p = materialButton3;
         this.q = linearLayout3;
-        this.f2270r = textView5;
+        this.f2268r = textView5;
         this.s = materialButton4;
         this.t = linearLayout4;
         this.u = viewStub;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionDetailsBinding.java
index 343e7c8b16..ba80afe087 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 f2271c;
+    public final TextInputLayout f2269c;
     @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.f2271c = textInputLayout;
+        this.f2269c = textInputLayout;
         this.d = guildSubscriptionRoleImageUploadView;
         this.e = textInputEditText2;
         this.f = textInputLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEntryPointBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEntryPointBinding.java
index 165a4cb661..f4cb4b948a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEntryPointBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEntryPointBinding.java
@@ -16,12 +16,12 @@ public final class WidgetGuildRoleSubscriptionEntryPointBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2272c;
+    public final TextView f2270c;
 
     public WidgetGuildRoleSubscriptionEntryPointBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Toolbar toolbar, @NonNull AppBarLayout appBarLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2272c = textView2;
+        this.f2270c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanDetailsBinding.java
index ce256a6f39..09775349d7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanDetailsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanDetailsBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGuildRoleSubscriptionPlanDetailsBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputEditText f2273c;
+    public final TextInputEditText f2271c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetGuildRoleSubscriptionPlanDetailsBinding implements View
     public WidgetGuildRoleSubscriptionPlanDetailsBinding(@NonNull ScrollView scrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputEditText textInputEditText, @NonNull TextView textView3, @NonNull TextInputLayout textInputLayout, @NonNull View view, @NonNull Group group, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull ImageView imageView, @NonNull ScrollView scrollView2) {
         this.a = scrollView;
         this.b = simpleDraweeView;
-        this.f2273c = textInputEditText;
+        this.f2271c = textInputEditText;
         this.d = textInputLayout;
         this.e = group;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanFormatBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanFormatBinding.java
index 6255804f8d..9d8d2a7db5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanFormatBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionPlanFormatBinding.java
@@ -14,7 +14,7 @@ public final class WidgetGuildRoleSubscriptionPlanFormatBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2274c;
+    public final TextView f2272c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetGuildRoleSubscriptionPlanFormatBinding implements ViewB
     public WidgetGuildRoleSubscriptionPlanFormatBinding(@NonNull LinearLayout linearLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull GuildRoleSubscriptionPlanFormatRadioButton guildRoleSubscriptionPlanFormatRadioButton, @NonNull GuildRoleSubscriptionPlanFormatRadioButton guildRoleSubscriptionPlanFormatRadioButton2) {
         this.a = linearLayout;
         this.b = view;
-        this.f2274c = textView;
+        this.f2272c = textView;
         this.d = textView2;
         this.e = guildRoleSubscriptionPlanFormatRadioButton;
         this.f = guildRoleSubscriptionPlanFormatRadioButton2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitBinding.java
index 567d33a9b3..4a2ca254a4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitBinding.java
@@ -20,7 +20,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefitBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2275c;
+    public final TextView f2273c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -47,7 +47,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefitBinding implements View
     public WidgetGuildRoleSubscriptionTierBenefitBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextInputEditText textInputEditText, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull AppBarLayout appBarLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull ScrollView scrollView, @NonNull LinearLayout linearLayout, @NonNull TextView textView5, @NonNull TextView textView6) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2275c = textView2;
+        this.f2273c = textView2;
         this.d = textInputLayout;
         this.e = materialButton;
         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 874c8655a3..2108f6b16b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefitsBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2276c;
+    public final TextView f2274c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefitsBinding implements Vie
     public WidgetGuildRoleSubscriptionTierBenefitsBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialRadioButton materialRadioButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RadioGroup radioGroup, @NonNull MaterialRadioButton materialRadioButton2, @NonNull RecyclerView recyclerView) {
         this.a = linearLayout;
         this.b = materialRadioButton;
-        this.f2276c = textView;
+        this.f2274c = textView;
         this.d = textView2;
         this.e = radioGroup;
         this.f = materialRadioButton2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierDesignBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierDesignBinding.java
index 225e705316..3390b5d52b 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 f2277c;
+    public final LinearLayout f2275c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -30,7 +30,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.f2277c = linearLayout2;
+        this.f2275c = linearLayout2;
         this.d = textView;
         this.e = textView3;
         this.f = guildSubscriptionRoleImageUploadView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsBottomSheetBinding.java
index 9f72c6bb4b..9ff204d72a 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 f2278c;
+    public final ImageView f2276c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -39,7 +39,7 @@ public final class WidgetGuildScheduledEventDetailsBottomSheetBinding implements
     public WidgetGuildScheduledEventDetailsBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull GuildScheduledEventDateView guildScheduledEventDateView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull TextView textView3) {
         this.a = nestedScrollView;
         this.b = guildScheduledEventBottomButtonView;
-        this.f2278c = imageView;
+        this.f2276c = imageView;
         this.d = linkifiedTextView;
         this.e = guildScheduledEventDateView;
         this.f = linkifiedTextView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding.java
index ff4f505a99..bff8cfa4d2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding.java
@@ -13,7 +13,7 @@ public final class WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding impl
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2279c;
+    public final TextView f2277c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding impl
     public WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2279c = textView2;
+        this.f2277c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventListBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventListBottomSheetBinding.java
index be9ebc13ff..85db477930 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 f2280c;
+    public final ConstraintLayout f2278c;
     @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.f2280c = constraintLayout2;
+        this.f2278c = 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 403bcbbba9..9135c894b8 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 f2281c;
+    public final TextInputLayout f2279c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -46,7 +46,7 @@ public final class WidgetGuildScheduledEventLocationSelectBinding implements Vie
     public WidgetGuildScheduledEventLocationSelectBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull ImageView imageView, @NonNull View view, @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 View view2, @NonNull CheckedSetting checkedSetting3) {
         this.a = constraintLayout;
         this.b = textInputEditText;
-        this.f2281c = textInputLayout;
+        this.f2279c = 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 4faa3bbe50..7db5d93bde 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 ImageView f2282c;
+    public final ImageView f2280c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -48,7 +48,7 @@ public final class WidgetGuildScheduledEventSettingsBinding implements ViewBindi
     public WidgetGuildScheduledEventSettingsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @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) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f2282c = imageView2;
+        this.f2280c = imageView2;
         this.d = textView;
         this.e = textInputEditText;
         this.f = textInputLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventUpsellBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventUpsellBottomSheetBinding.java
index b4e65f95ed..929a861d8b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventUpsellBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventUpsellBottomSheetBinding.java
@@ -15,12 +15,12 @@ public final class WidgetGuildScheduledEventUpsellBottomSheetBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2283c;
+    public final MaterialButton f2281c;
 
     public WidgetGuildScheduledEventUpsellBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView) {
         this.a = nestedScrollView;
         this.b = materialButton;
-        this.f2283c = materialButton2;
+        this.f2281c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java
index f4655c381b..f0543f612e 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 f2284c;
+    public final SimpleDraweeView f2282c;
     @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.f2284c = simpleDraweeView;
+        this.f2282c = 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 04dfefa666..17a641bfa2 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 f2285c;
+    public final TextView f2283c;
     @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.f2285c = textView;
+        this.f2283c = 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 23c75453a4..ae5e16ecbd 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 f2286c;
+    public final MaterialButton f2284c;
     @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.f2286c = materialButton;
+        this.f2284c = 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 90b9536b2e..065526ddee 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 f2287c;
+    public final TextView f2285c;
     @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.f2287c = textView;
+        this.f2285c = 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 ecdb6e28f0..0f016c1ffb 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 f2288c;
+    public final TextView f2286c;
     @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.f2288c = textView;
+        this.f2286c = 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 3b1745ec55..297ae6a944 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 f2289c;
+    public final ViewStub f2287c;
 
     public WidgetGuildsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull ViewStub viewStub) {
         this.a = relativeLayout;
         this.b = recyclerView;
-        this.f2289c = viewStub;
+        this.f2287c = 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 035a665f21..f593d83710 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 f2290c;
+    public final TextView f2288c;
 
     public WidgetGuildsListItemDmBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f2290c = textView;
+        this.f2288c = 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 f13ba5d81c..b187ccd61c 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 f2291c;
+    public final FrameLayout f2289c;
     @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.f2291c = frameLayout;
+        this.f2289c = 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 5423f398dd..5e2a40cef6 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 f2292c;
+    public final ImageView f2290c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -33,7 +33,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 ImageView imageView3, @NonNull TextView textView2, @NonNull ImageView imageView4) {
         this.a = view;
         this.b = imageView;
-        this.f2292c = imageView2;
+        this.f2290c = 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 a6ecfa1e03..4b0532f55d 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 f2293c;
+    public final ImageView f2291c;
 
     public WidgetGuildsListItemGuildVerticalBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f2293c = imageView2;
+        this.f2291c = 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 6aa60b23a0..d6bf269e2e 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 f2294c;
+    public final FrameLayout f2292c;
     @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.f2294c = frameLayout;
+        this.f2292c = 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 0a5e0740ea..6f998de9b0 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 f2295c;
+    public final HomePanelsLayout f2293c;
     @NonNull
     public final b5 d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetHomeBinding implements ViewBinding {
     public WidgetHomeBinding(@NonNull FrameLayout frameLayout, @NonNull f5 f5Var, @NonNull HomePanelsLayout homePanelsLayout, @NonNull b5 b5Var, @NonNull e5 e5Var, @NonNull g5 g5Var, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout2) {
         this.a = frameLayout;
         this.b = f5Var;
-        this.f2295c = homePanelsLayout;
+        this.f2293c = homePanelsLayout;
         this.d = b5Var;
         this.e = e5Var;
         this.f = g5Var;
diff --git a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java
index 8906f62eaf..677fad4671 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 f2296c;
+    public final MaterialButton f2294c;
     @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.f2296c = materialButton;
+        this.f2294c = 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 539ff27b4a..041bf55fea 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 f2297c;
+    public final TextInputEditText f2295c;
     @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.f2297c = textInputEditText;
+        this.f2295c = 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 859924f953..f6901801fb 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 f2298c;
+    public final ScreenTitleView f2296c;
     @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.f2298c = screenTitleView;
+        this.f2296c = 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 7c1a771fcf..d77a00e8c7 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 f2299c;
+    public final CodeVerificationView f2297c;
 
     public WidgetHubAuthenticationBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull CodeVerificationView codeVerificationView) {
         this.a = linearLayout;
         this.b = linkifiedTextView;
-        this.f2299c = codeVerificationView;
+        this.f2297c = 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 2fb224053b..fb49e28814 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 f2300c;
+    public final TextView f2298c;
     @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.f2300c = textView;
+        this.f2298c = 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 4dba80ff97..92b33fa8bf 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 f2301c;
+    public final LinearLayout f2299c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -36,7 +36,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.f2301c = linearLayout;
+        this.f2299c = linearLayout;
         this.d = textView;
         this.e = recyclerView;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetHubDomainsBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubDomainsBinding.java
index 1342707046..70c9d54786 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 f2302c;
+    public final MaterialButton f2300c;
 
     public WidgetHubDomainsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = recyclerView;
-        this.f2302c = materialButton;
+        this.f2300c = 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 3eeca80132..48a98eeac1 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 x4 f2303c;
+    public final x4 f2301c;
     @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 h5 h5Var, @NonNull x4 x4Var, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull i5 i5Var) {
         this.a = linearLayout;
         this.b = h5Var;
-        this.f2303c = x4Var;
+        this.f2301c = x4Var;
         this.d = materialButton;
         this.e = loadingButton;
         this.f = i5Var;
diff --git a/app/src/main/java/com/discord/databinding/WidgetHubWaitlistBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubWaitlistBinding.java
index 8af46b69c2..34e8ed6ec8 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 f2304c;
+    public final TextInputEditText f2302c;
     @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.f2304c = textInputEditText;
+        this.f2302c = 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 f800ea0d64..3e13465254 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 f2305c;
+    public final ViewEmbedGameInvite f2303c;
     @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.f2305c = viewEmbedGameInvite;
+        this.f2303c = 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 a40b70953c..baa2d18b94 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 f2306c;
+    public final TextInputLayout f2304c;
     @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.f2306c = textInputLayout;
+        this.f2304c = 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 9c96e5ad8c..390ceef96b 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 f2307c;
+    public final MaterialButton f2305c;
     @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.f2307c = materialButton;
+        this.f2305c = 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 c3f2b4be49..d5068835c7 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 f2308c;
+    public final RecyclerView f2306c;
 
     public WidgetManageReactionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2308c = recyclerView2;
+        this.f2306c = 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 fe4b26b4b0..424d2f3e07 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 f2309c;
+    public final SimpleDraweeSpanTextView f2307c;
     @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.f2309c = simpleDraweeSpanTextView;
+        this.f2307c = 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 148b9feaae..1f13824179 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 f2310c;
+    public final SimpleDraweeView f2308c;
     @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.f2310c = simpleDraweeView;
+        this.f2308c = 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 671eaf41d4..43ffab0e5c 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 f2311c;
+    public final FrameLayout f2309c;
     @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.f2311c = frameLayout2;
+        this.f2309c = 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 ad9be018cb..054a416069 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 f2312c;
+    public final SimpleDraweeView f2310c;
     @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.f2312c = simpleDraweeView;
+        this.f2310c = 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 9e9eacaf5a..0fc303960d 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 f2313c;
+    public final MaterialButton f2311c;
     @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.f2313c = materialButton;
+        this.f2311c = 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 ff159e8300..f4f82b9730 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 f2314c;
+    public final View f2312c;
     @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.f2314c = view;
+        this.f2312c = 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 62d7fbc9f0..c0a0c61333 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 f2315c;
+    public final TextView f2313c;
 
     public WidgetMemberVerificationSuccessBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull CardView cardView) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f2315c = textView;
+        this.f2313c = 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 63ac438ade..482d9e6dd3 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 f2316c;
+    public final ProgressBar f2314c;
 
     public WidgetMobileReportsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FrameLayout frameLayout, @NonNull ProgressBar progressBar) {
         this.a = coordinatorLayout;
         this.b = frameLayout;
-        this.f2316c = progressBar;
+        this.f2314c = 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 38aeecf722..08006e656e 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 f2317c;
+    public final RecyclerView f2315c;
     @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.f2317c = recyclerView;
+        this.f2315c = 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 465d825258..b5aa6a2937 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 f2318c;
+    public final LinearLayout f2316c;
     @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.f2318c = linearLayout;
+        this.f2316c = 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 7d5bffc7f2..ff41917974 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 f2319c;
+    public final TabLayout f2317c;
     @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.f2319c = tabLayout;
+        this.f2317c = 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 694edb621a..2d871ac028 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 f2320c;
+    public final LinkifiedTextView f2318c;
     @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.f2320c = linkifiedTextView;
+        this.f2318c = 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 c009ef9434..620c122c84 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 f2321c;
+    public final MaterialButton f2319c;
 
     public WidgetNoticeNuxOverlayBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2321c = materialButton2;
+        this.f2319c = 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 015e7549f0..c096ddb156 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 f2322c;
+    public final MaterialButton f2320c;
 
     public WidgetNoticeNuxSamsungLinkBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2322c = materialButton2;
+        this.f2320c = 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 c4d7e9bbc1..391856b720 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 f2323c;
+    public final SimpleDraweeSpanTextView f2321c;
     @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.f2323c = simpleDraweeSpanTextView;
+        this.f2321c = 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 9720c53fcf..06eb9cc355 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 f2324c;
+    public final SimpleDraweeView f2322c;
     @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.f2324c = simpleDraweeView;
+        this.f2322c = 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 5d3aa58e55..2eb8f98624 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 f2325c;
+    public final LinearLayout f2323c;
     @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.f2325c = linearLayout2;
+        this.f2323c = 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 6822b6ca42..1a352f2737 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 f2326c;
+    public final SimpleDraweeView f2324c;
     @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.f2326c = simpleDraweeView;
+        this.f2324c = 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 7107362341..1a783424bc 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 f2327c;
+    public final LinkifiedTextView f2325c;
 
     public WidgetOutboundPromoTermsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2327c = linkifiedTextView;
+        this.f2325c = 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 9425acdf67..a32627717f 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 f2328c;
+    public final MaterialButton f2326c;
     @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.f2328c = materialButton;
+        this.f2326c = 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 2f88f1c9d2..e5a1d0c82c 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 f2329c;
+    public final TextInputLayout f2327c;
 
     public WidgetPhoneCountryCodeBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) {
         this.a = linearLayout;
         this.b = recyclerView;
-        this.f2329c = textInputLayout;
+        this.f2327c = 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 4ba025e8a8..9479050b84 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 f2330c;
+    public final ConstraintLayout f2328c;
     @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.f2330c = constraintLayout2;
+        this.f2328c = 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 8f10f0a320..878bb19de3 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 f2331c;
+    public final TextView f2329c;
     @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.f2331c = textView;
+        this.f2329c = 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 db58108c16..75ec0959be 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 ImageView f2332c;
+    public final ImageView f2330c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetPreviewGuildScheduledEventBinding implements ViewBindin
     public WidgetPreviewGuildScheduledEventBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull CheckedSetting checkedSetting, @NonNull GuildScheduledEventItemView guildScheduledEventItemView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull TextView textView4) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f2332c = imageView2;
+        this.f2330c = imageView2;
         this.d = checkedSetting;
         this.e = guildScheduledEventItemView;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetPriceTierPickerBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetPriceTierPickerBottomSheetBinding.java
index b102a4bf94..023c2bfaf1 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 f2333c;
+    public final RecyclerView f2331c;
 
     public WidgetPriceTierPickerBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout appBarLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull Toolbar toolbar) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f2333c = recyclerView;
+        this.f2331c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java b/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java
index 1e0b86263e..8e3ad24c26 100644
--- a/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java
@@ -16,7 +16,7 @@ public final class WidgetPruneUsersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2334c;
+    public final TextView f2332c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetPruneUsersBinding implements ViewBinding {
     public WidgetPruneUsersBinding(@NonNull ScrollView scrollView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull ProgressBar progressBar) {
         this.a = scrollView;
         this.b = materialButton;
-        this.f2334c = textView;
+        this.f2332c = textView;
         this.d = materialButton2;
         this.e = textView2;
         this.f = checkedSetting;
diff --git a/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java b/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java
index 2869920322..ef7dc7e6b2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java
@@ -14,12 +14,12 @@ public final class WidgetQrScannerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Chip f2335c;
+    public final Chip f2333c;
 
     public WidgetQrScannerBinding(@NonNull FrameLayout frameLayout, @NonNull ZXingScannerView zXingScannerView, @NonNull Chip chip) {
         this.a = frameLayout;
         this.b = zXingScannerView;
-        this.f2335c = chip;
+        this.f2333c = chip;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java
index a79d53432f..24791c53e3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java
@@ -14,12 +14,12 @@ public final class WidgetQuickMentionsDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TabLayout f2336c;
+    public final TabLayout f2334c;
 
     public WidgetQuickMentionsDialogBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ViewPager2 viewPager2, @NonNull TabLayout tabLayout) {
         this.a = constraintLayout;
         this.b = viewPager2;
-        this.f2336c = tabLayout;
+        this.f2334c = tabLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java b/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java
index 89c250f09e..d44a088b3e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java
@@ -16,7 +16,7 @@ public final class WidgetRemoteAuthBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final o5 f2337c;
+    public final o5 f2335c;
     @NonNull
     public final p5 d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetRemoteAuthBinding implements ViewBinding {
     public WidgetRemoteAuthBinding(@NonNull RelativeLayout relativeLayout, @NonNull q5 q5Var, @NonNull o5 o5Var, @NonNull p5 p5Var, @NonNull AppViewFlipper appViewFlipper) {
         this.a = relativeLayout;
         this.b = q5Var;
-        this.f2337c = o5Var;
+        this.f2335c = o5Var;
         this.d = p5Var;
         this.e = appViewFlipper;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java
index 4151466ec1..e6d3fd3fa5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetScreenShareNfxSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2338c;
+    public final MaterialButton f2336c;
 
     public WidgetScreenShareNfxSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull MaterialButton materialButton) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2338c = materialButton;
+        this.f2336c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java
index 02388c2bd7..ead52af60e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2339c;
+    public final TextInputLayout f2337c;
     @NonNull
     public final FragmentContainerView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetSearchBinding implements ViewBinding {
     public WidgetSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2) {
         this.a = coordinatorLayout;
         this.b = floatingActionButton;
-        this.f2339c = textInputLayout;
+        this.f2337c = textInputLayout;
         this.d = fragmentContainerView;
         this.e = fragmentContainerView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java
index 2c6f27f1d1..86352bb8b1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSearchSuggestionsItemChannelBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2340c;
+    public final TextView f2338c;
 
     public WidgetSearchSuggestionsItemChannelBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f2340c = textView;
+        this.f2338c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java
index d2341a02b2..ba7c1ae165 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java
@@ -14,14 +14,14 @@ public final class WidgetSearchSuggestionsItemHasBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2341c;
+    public final ImageView f2339c;
     @NonNull
     public final TextView d;
 
     public WidgetSearchSuggestionsItemHasBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f2341c = imageView;
+        this.f2339c = imageView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java
index 7c461a5918..9bf440e665 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSearchSuggestionsItemRecentQueryBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2342c;
+    public final TextView f2340c;
 
     public WidgetSearchSuggestionsItemRecentQueryBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f2342c = textView;
+        this.f2340c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java
index 004c91b3a7..fc0d544816 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSearchSuggestionsItemSuggestionBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f2343c;
+    public final RelativeLayout f2341c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetSearchSuggestionsItemSuggestionBinding implements ViewB
     public WidgetSearchSuggestionsItemSuggestionBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout2, @NonNull TextView textView2, @NonNull ImageView imageView) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f2343c = relativeLayout2;
+        this.f2341c = relativeLayout2;
         this.d = textView2;
         this.e = imageView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java
index 3a770a6e81..4f2970e344 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSelectComponentBottomSheetBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f2344c;
+    public final MaxHeightRecyclerView f2342c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetSelectComponentBottomSheetBinding implements ViewBindin
     public WidgetSelectComponentBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2344c = maxHeightRecyclerView;
+        this.f2342c = maxHeightRecyclerView;
         this.d = textView2;
         this.e = textView3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java
index 08c0fe4d86..d4c45295fe 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSelectComponentBottomSheetItemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2345c;
+    public final View f2343c;
     @NonNull
     public final View d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetSelectComponentBottomSheetItemBinding implements ViewBi
     public WidgetSelectComponentBottomSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialTextView materialTextView, @NonNull View view, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCheckBox materialCheckBox, @NonNull MaterialTextView materialTextView2) {
         this.a = constraintLayout;
         this.b = materialTextView;
-        this.f2345c = view;
+        this.f2343c = view;
         this.d = view2;
         this.e = simpleDraweeView;
         this.f = materialCheckBox;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java
index e58c130e00..384e9524a9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerBoostConfirmationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2346c;
+    public final TextView f2344c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetServerBoostConfirmationBinding implements ViewBinding {
     public WidgetServerBoostConfirmationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = premiumGuildConfirmationView;
-        this.f2346c = textView;
+        this.f2344c = textView;
         this.d = textView2;
         this.e = materialButton;
         this.f = dimmerView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java
index e6d4767393..baf4a9dabb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java
@@ -20,7 +20,7 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f2347c;
+    public final LinkifiedTextView f2345c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -43,7 +43,7 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding {
     public WidgetServerBoostStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull SimplePager simplePager, @NonNull r2 r2Var) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f2347c = linkifiedTextView;
+        this.f2345c = linkifiedTextView;
         this.d = textView;
         this.e = premiumSubscriptionMarketingView;
         this.f = premiumGuildSubscriptionUpsellView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java
index fbd176c04d..cdb48e3ddd 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerDeleteDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2348c;
+    public final MaterialButton f2346c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetServerDeleteDialogBinding implements ViewBinding {
     public WidgetServerDeleteDialogBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2348c = materialButton2;
+        this.f2346c = materialButton2;
         this.d = textView;
         this.e = textInputLayout;
         this.f = linearLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java
index 48904a5526..8e2c58f1cb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerNotificationOverrideSelectorBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2349c;
+    public final TextInputLayout f2347c;
 
     public WidgetServerNotificationOverrideSelectorBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2349c = textInputLayout;
+        this.f2347c = textInputLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java
index 7c0848091b..606d59a662 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerNotificationsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2350c;
+    public final RecyclerView f2348c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -40,7 +40,7 @@ public final class WidgetServerNotificationsBinding implements ViewBinding {
     public WidgetServerNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull w1 w1Var, @NonNull RecyclerView recyclerView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull View view, @NonNull LinearLayout linearLayout, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
         this.a = coordinatorLayout;
         this.b = w1Var;
-        this.f2350c = recyclerView;
+        this.f2348c = recyclerView;
         this.d = checkedSetting;
         this.e = checkedSetting2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java
index c62734fea7..43427b1e21 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsAuditLogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2351c;
+    public final RecyclerView f2349c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsAuditLogBinding implements ViewBinding {
     public WidgetServerSettingsAuditLogBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull AppViewFlipper appViewFlipper, @NonNull AppViewFlipper appViewFlipper2) {
         this.a = coordinatorLayout;
         this.b = textView3;
-        this.f2351c = recyclerView;
+        this.f2349c = recyclerView;
         this.d = textView4;
         this.e = appViewFlipper;
         this.f = appViewFlipper2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java
index c6d4408af5..33cb05755d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsAuditLogFilterActionListitemBinding imple
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2352c;
+    public final ImageView f2350c;
     @NonNull
     public final ImageView d;
 
     public WidgetServerSettingsAuditLogFilterActionListitemBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2) {
         this.a = linearLayout;
         this.b = checkedSetting;
-        this.f2352c = imageView;
+        this.f2350c = imageView;
         this.d = imageView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java
index 6512aeda2b..a869637b47 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsAuditLogFilterUserListitemBinding impleme
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2353c;
+    public final ImageView f2351c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetServerSettingsAuditLogFilterUserListitemBinding impleme
     public WidgetServerSettingsAuditLogFilterUserListitemBinding(@NonNull FrameLayout frameLayout, @NonNull MaterialRadioButton materialRadioButton, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull SettingsMemberView settingsMemberView) {
         this.a = frameLayout;
         this.b = materialRadioButton;
-        this.f2353c = imageView;
+        this.f2351c = imageView;
         this.d = textView;
         this.e = settingsMemberView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListItemBinding.java
index b923bfc97c..730cc3c7b3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListItemBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerSettingsAuditLogListItemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2354c;
+    public final ImageView f2352c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetServerSettingsAuditLogListItemBinding implements ViewBi
     public WidgetServerSettingsAuditLogListItemBinding(@NonNull CardView cardView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView3, @NonNull RelativeLayout relativeLayout) {
         this.a = cardView;
         this.b = imageView;
-        this.f2354c = imageView2;
+        this.f2352c = imageView2;
         this.d = simpleDraweeView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java
index 5054e4e43d..9eee71e372 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java
@@ -14,14 +14,14 @@ public final class WidgetServerSettingsBanListItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2355c;
+    public final SimpleDraweeView f2353c;
     @NonNull
     public final TextView d;
 
     public WidgetServerSettingsBanListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f2355c = simpleDraweeView;
+        this.f2353c = simpleDraweeView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java
index 9eb9428eac..a3a22651af 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java
@@ -16,14 +16,14 @@ public final class WidgetServerSettingsBansBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2356c;
+    public final TextInputLayout f2354c;
     @NonNull
     public final AppViewFlipper d;
 
     public WidgetServerSettingsBansBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2356c = textInputLayout;
+        this.f2354c = textInputLayout;
         this.d = appViewFlipper;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java
index 94ad46a5ef..395a67a23e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2357c;
+    public final TextView f2355c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -47,7 +47,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2358r;
+    public final TextView f2356r;
     @NonNull
     public final LinearLayout s;
     @NonNull
@@ -59,24 +59,24 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final View f2359w;
+    public final View f2357w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final SimpleDraweeView f2360x;
+    public final SimpleDraweeView f2358x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextView f2361y;
+    public final TextView f2359y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final TextView f2362z;
+    public final TextView f2360z;
 
     public WidgetServerSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @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 TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull View view2, @NonNull LinearLayout linearLayout4, @NonNull View view3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView18, @NonNull TextView textView19) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f2357c = textView2;
+        this.f2355c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
@@ -91,15 +91,15 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
         this.o = textView14;
         this.p = textView15;
         this.q = textView16;
-        this.f2358r = textView17;
+        this.f2356r = textView17;
         this.s = linearLayout;
         this.t = linearLayout2;
         this.u = linearLayout3;
         this.v = linearLayout4;
-        this.f2359w = view3;
-        this.f2360x = simpleDraweeView;
-        this.f2361y = textView18;
-        this.f2362z = textView19;
+        this.f2357w = view3;
+        this.f2358x = simpleDraweeView;
+        this.f2359y = textView18;
+        this.f2360z = textView19;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java
index 9ffff27320..6e854cad31 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java
@@ -16,14 +16,14 @@ public final class WidgetServerSettingsChannelsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2363c;
+    public final FloatingActionButton f2361c;
     @NonNull
     public final RecyclerView d;
 
     public WidgetServerSettingsChannelsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull FloatingActionButton floatingActionButton, @NonNull RecyclerView recyclerView, @NonNull FrameLayout frameLayout) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2363c = floatingActionButton;
+        this.f2361c = floatingActionButton;
         this.d = recyclerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java
index d863674a54..945809179f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java
@@ -13,14 +13,14 @@ public final class WidgetServerSettingsChannelsSortActionsBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2364c;
+    public final TextView f2362c;
     @NonNull
     public final TextView d;
 
     public WidgetServerSettingsChannelsSortActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = nestedScrollView;
         this.b = textView2;
-        this.f2364c = textView3;
+        this.f2362c = textView3;
         this.d = textView4;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java
index 1103e2935b..85fc418863 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsChannelsSortFabMenuBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TableLayout f2365c;
+    public final TableLayout f2363c;
 
     public WidgetServerSettingsChannelsSortFabMenuBinding(@NonNull TableLayout tableLayout, @NonNull TableRow tableRow, @NonNull TableRow tableRow2, @NonNull TableRow tableRow3, @NonNull TableRow tableRow4, @NonNull FloatingActionButton floatingActionButton, @NonNull TableLayout tableLayout2) {
         this.a = tableLayout;
         this.b = floatingActionButton;
-        this.f2365c = tableLayout2;
+        this.f2363c = tableLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java
index 8cab3a5263..dbb41e0c47 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsCommunityOverviewBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CommunitySelectorView f2366c;
+    public final CommunitySelectorView f2364c;
     @NonNull
     public final CommunitySelectorView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetServerSettingsCommunityOverviewBinding implements ViewB
     public WidgetServerSettingsCommunityOverviewBinding(@NonNull LinearLayout linearLayout, @NonNull CommunitySelectorView communitySelectorView, @NonNull CommunitySelectorView communitySelectorView2, @NonNull CommunitySelectorView communitySelectorView3, @NonNull ScrollView scrollView, @NonNull LoadingButton loadingButton, @NonNull CommunitySelectorView communitySelectorView4) {
         this.a = linearLayout;
         this.b = communitySelectorView;
-        this.f2366c = communitySelectorView2;
+        this.f2364c = communitySelectorView2;
         this.d = communitySelectorView3;
         this.e = loadingButton;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java
index df2b281a27..84bb5b9ce4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsCommunitySetupFirstStepBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2367c;
+    public final CheckedSetting f2365c;
 
     public WidgetServerSettingsCommunitySetupFirstStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull ScreenTitleView screenTitleView) {
         this.a = scrollView;
         this.b = checkedSetting;
-        this.f2367c = checkedSetting2;
+        this.f2365c = checkedSetting2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java
index 923d955482..959b6c4bf0 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsCommunitySetupSecondStepBinding implement
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CommunitySelectorView f2368c;
+    public final CommunitySelectorView f2366c;
 
     public WidgetServerSettingsCommunitySetupSecondStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CommunitySelectorView communitySelectorView, @NonNull ScreenTitleView screenTitleView, @NonNull CommunitySelectorView communitySelectorView2) {
         this.a = scrollView;
         this.b = communitySelectorView;
-        this.f2368c = communitySelectorView2;
+        this.f2366c = communitySelectorView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java
index 8fa74c9e69..90b66b57a8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsCommunitySetupThirdStepBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f2369c;
+    public final LinkifiedTextView f2367c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetServerSettingsCommunitySetupThirdStepBinding implements
     public WidgetServerSettingsCommunitySetupThirdStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull ScreenTitleView screenTitleView) {
         this.a = scrollView;
         this.b = checkedSetting;
-        this.f2369c = linkifiedTextView;
+        this.f2367c = linkifiedTextView;
         this.d = checkedSetting2;
         this.e = checkedSetting3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java
index 2b0d2ac94b..d69ee56d7e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java
@@ -20,7 +20,7 @@ public final class WidgetServerSettingsEditIntegrationBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2370c;
+    public final LinearLayout f2368c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -51,7 +51,7 @@ public final class WidgetServerSettingsEditIntegrationBinding implements ViewBin
     public WidgetServerSettingsEditIntegrationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout4, @NonNull TextView textView2, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout5, @NonNull LinearLayout linearLayout6, @NonNull w wVar) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2370c = linearLayout;
+        this.f2368c = linearLayout;
         this.d = checkedSetting;
         this.e = checkedSetting2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java
index 02baf56532..b93a44479b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerSettingsEditMemberBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2371c;
+    public final TextView f2369c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetServerSettingsEditMemberBinding implements ViewBinding
     public WidgetServerSettingsEditMemberBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView3) {
         this.a = coordinatorLayout;
         this.b = linearLayout;
-        this.f2371c = textView;
+        this.f2369c = textView;
         this.d = textView2;
         this.e = textInputLayout;
         this.f = linearLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java
index 02509a2d05..1a7a86e3c9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2372c;
+    public final AppViewFlipper f2370c;
 
     public WidgetServerSettingsEmojisBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2372c = appViewFlipper;
+        this.f2370c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java
index 34b10f1478..14252de03b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisEditBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2373c;
+    public final FloatingActionButton f2371c;
 
     public WidgetServerSettingsEmojisEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2373c = floatingActionButton;
+        this.f2371c = floatingActionButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java
index a4d57d6e00..6d0d53e9d3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisHeaderBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2374c;
+    public final TextView f2372c;
 
     public WidgetServerSettingsEmojisHeaderBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2374c = textView;
+        this.f2372c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java
index c28c8782cd..a5b418085f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsEmojisItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f2375c;
+    public final ConstraintLayout f2373c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetServerSettingsEmojisItemBinding implements ViewBinding
     public WidgetServerSettingsEmojisItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull TextView textView3, @NonNull SimpleDraweeView simpleDraweeView2) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f2375c = constraintLayout2;
+        this.f2373c = constraintLayout2;
         this.d = textView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionEditTierBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionEditTierBinding.java
index c42c9bafe3..6f3f22d721 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionEditTierBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionEditTierBinding.java
@@ -21,7 +21,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTierBinding impl
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Group f2376c;
+    public final Group f2374c;
     @NonNull
     public final TabLayout d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTierBinding impl
     public WidgetServerSettingsGuildRoleSubscriptionEditTierBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull Group group, @NonNull TabLayout tabLayout, @NonNull ViewPager2 viewPager2, @NonNull Barrier barrier, @NonNull AppBarLayout appBarLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull AppViewFlipper appViewFlipper) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2376c = group;
+        this.f2374c = group;
         this.d = tabLayout;
         this.e = viewPager2;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionTierListBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionTierListBinding.java
index 55f8ada8a0..afef2f500c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionTierListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionTierListBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsGuildRoleSubscriptionTierListBinding impl
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2377c;
+    public final AppViewFlipper f2375c;
 
     public WidgetServerSettingsGuildRoleSubscriptionTierListBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2377c = appViewFlipper;
+        this.f2375c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionsBinding.java
index c781654e59..ce36cce0fa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionsBinding.java
@@ -16,12 +16,12 @@ public final class WidgetServerSettingsGuildRoleSubscriptionsBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2378c;
+    public final AppViewFlipper f2376c;
 
     public WidgetServerSettingsGuildRoleSubscriptionsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull AppBarLayout appBarLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull AppViewFlipper appViewFlipper) {
         this.a = constraintLayout;
         this.b = floatingActionButton;
-        this.f2378c = appViewFlipper;
+        this.f2376c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java
index d68ccc24cc..70592e0549 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java
@@ -13,7 +13,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2379c;
+    public final TextView f2377c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi
     public WidgetServerSettingsInstantInviteActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2379c = textView2;
+        this.f2377c = textView2;
         this.d = textView3;
         this.e = textView4;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java
index 009e84a11a..29be9b6d7d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2380c;
+    public final TextView f2378c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V
     public WidgetServerSettingsInstantInviteListItemBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull SettingsMemberView settingsMemberView) {
         this.a = cardView;
         this.b = textView;
-        this.f2380c = textView2;
+        this.f2378c = textView2;
         this.d = textView3;
         this.e = textView5;
         this.f = settingsMemberView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java
index 11bb327609..878a55c2a3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsInstantInvitesBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2381c;
+    public final AppViewFlipper f2379c;
 
     public WidgetServerSettingsInstantInvitesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2381c = appViewFlipper;
+        this.f2379c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java
index 45af9fdbe4..8916e9adf7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2382c;
+    public final View f2380c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie
     public WidgetServerSettingsIntegrationListItemBinding(@NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull CheckedSetting checkedSetting, @NonNull ProgressBar progressBar) {
         this.a = frameLayout;
         this.b = relativeLayout;
-        this.f2382c = view;
+        this.f2380c = view;
         this.d = imageView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java
index d2fa9d646b..3201cb2469 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsIntegrationsBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2383c;
+    public final AppViewFlipper f2381c;
 
     public WidgetServerSettingsIntegrationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2383c = appViewFlipper;
+        this.f2381c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java
index c721c69624..a72725bd17 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2384c;
+    public final ImageView f2382c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind
     public WidgetServerSettingsMemberListItemBinding(@NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull RolesListView rolesListView, @NonNull SettingsMemberView settingsMemberView) {
         this.a = frameLayout;
         this.b = frameLayout2;
-        this.f2384c = imageView;
+        this.f2382c = imageView;
         this.d = imageView2;
         this.e = rolesListView;
         this.f = settingsMemberView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java
index 70c6c19359..6129516de9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2385c;
+    public final RecyclerView f2383c;
     @NonNull
     public final Spinner d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding {
     public WidgetServerSettingsMembersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull Spinner spinner, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2385c = recyclerView;
+        this.f2383c = recyclerView;
         this.d = spinner;
         this.e = appViewFlipper;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java
index 2b6dd98197..e869e50e56 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java
@@ -14,7 +14,7 @@ public final class WidgetServerSettingsModerationBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2386c;
+    public final CheckedSetting f2384c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetServerSettingsModerationBinding implements ViewBinding
     public WidgetServerSettingsModerationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull TextView textView2) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2386c = checkedSetting2;
+        this.f2384c = checkedSetting2;
         this.d = checkedSetting3;
         this.e = textView;
         this.f = checkedSetting4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java
index 881a0df6cd..6ede4645cb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java
@@ -13,7 +13,7 @@ public final class WidgetServerSettingsOverviewAfkTimeoutBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2387c;
+    public final TextView f2385c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetServerSettingsOverviewAfkTimeoutBinding implements View
     public WidgetServerSettingsOverviewAfkTimeoutBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
         this.a = nestedScrollView;
         this.b = textView2;
-        this.f2387c = textView3;
+        this.f2385c = textView3;
         this.d = textView4;
         this.e = textView5;
         this.f = textView6;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java
index 023d69f207..5b83ad9724 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java
@@ -21,7 +21,7 @@ public final class WidgetServerSettingsOverviewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final e3 f2388c;
+    public final e3 f2386c;
     @NonNull
     public final f3 d;
     @NonNull
@@ -40,7 +40,7 @@ public final class WidgetServerSettingsOverviewBinding implements ViewBinding {
     public WidgetServerSettingsOverviewBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull s5 s5Var, @NonNull e3 e3Var, @NonNull f3 f3Var, @NonNull g3 g3Var, @NonNull FloatingActionButton floatingActionButton, @NonNull ScrollView scrollView, @NonNull h3 h3Var, @NonNull i3 i3Var, @NonNull j3 j3Var) {
         this.a = coordinatorLayout;
         this.b = s5Var;
-        this.f2388c = e3Var;
+        this.f2386c = e3Var;
         this.d = f3Var;
         this.e = g3Var;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java
index 517df46d07..f9f419d7fa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsRoleItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2389c;
+    public final ImageView f2387c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetServerSettingsRoleItemBinding implements ViewBinding {
     public WidgetServerSettingsRoleItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull View view2, @NonNull View view3, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull RoleIconView roleIconView) {
         this.a = relativeLayout;
         this.b = view3;
-        this.f2389c = imageView;
+        this.f2387c = imageView;
         this.d = textView;
         this.e = roleIconView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleMembersBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleMembersBinding.java
index dd83435b5b..69b09991e8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleMembersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleMembersBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsRoleMembersBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2390c;
+    public final RecyclerView f2388c;
     @NonNull
     public final SearchInputView d;
 
     public WidgetServerSettingsRoleMembersBinding(@NonNull LinearLayout linearLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull SearchInputView searchInputView) {
         this.a = linearLayout;
         this.b = appViewFlipper;
-        this.f2390c = recyclerView;
+        this.f2388c = recyclerView;
         this.d = searchInputView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesBinding.java
index b10b144a8a..e91b8e44b8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsRolesBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2391c;
+    public final FloatingActionButton f2389c;
     @NonNull
     public final RecyclerView d;
 
     public WidgetServerSettingsRolesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull FloatingActionButton floatingActionButton, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2391c = floatingActionButton;
+        this.f2389c = floatingActionButton;
         this.d = recyclerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java
index aac7eb6d26..0edc65ff86 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsSecurityBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2392c;
+    public final MaterialButton f2390c;
 
     public WidgetServerSettingsSecurityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f2392c = materialButton;
+        this.f2390c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java
index 64fdf64327..b3b52536d3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsSecurityDialogBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2393c;
+    public final MaterialButton f2391c;
     @NonNull
     public final TextInputLayout d;
 
     public WidgetServerSettingsSecurityDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2393c = materialButton2;
+        this.f2391c = materialButton2;
         this.d = textInputLayout;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java
index 1146660568..97e6971633 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerSettingsVanityUrlBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2394c;
+    public final TextView f2392c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetServerSettingsVanityUrlBinding implements ViewBinding {
     public WidgetServerSettingsVanityUrlBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RelativeLayout relativeLayout, @NonNull ProgressBar progressBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2394c = textView;
+        this.f2392c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = relativeLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java
index 63776232fc..f5007746c3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAccessibilityBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2395c;
+    public final CheckedSetting f2393c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetSettingsAccessibilityBinding implements ViewBinding {
     public WidgetSettingsAccessibilityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull View view, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2395c = checkedSetting2;
+        this.f2393c = checkedSetting2;
         this.d = textView;
         this.e = linkifiedTextView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java
index 6483033b09..0f00563f56 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAccountBackupCodesBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2396c;
+    public final MaterialButton f2394c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetSettingsAccountBackupCodesBinding implements ViewBindin
     public WidgetSettingsAccountBackupCodesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2396c = materialButton;
+        this.f2394c = materialButton;
         this.d = textView;
         this.e = recyclerView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java
index 88eb41c507..35da9c70e4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java
@@ -35,7 +35,7 @@ public final class WidgetSettingsAccountBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2397c;
+    public final TextView f2395c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -67,7 +67,7 @@ public final class WidgetSettingsAccountBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final LinearLayout f2398r;
+    public final LinearLayout f2396r;
     @NonNull
     public final TextView s;
     @NonNull
@@ -79,24 +79,24 @@ public final class WidgetSettingsAccountBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final TextView f2399w;
+    public final TextView f2397w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final NestedScrollView f2400x;
+    public final NestedScrollView f2398x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final CheckedSetting f2401y;
+    public final CheckedSetting f2399y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final TextView f2402z;
+    public final TextView f2400z;
 
     public WidgetSettingsAccountBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout5, @NonNull TextView textView7, @NonNull AppViewFlipper appViewFlipper, @NonNull LottieAnimationView lottieAnimationView, @NonNull TextView textView8, @NonNull LinearLayout linearLayout6, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout7, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull LinearLayout linearLayout8, @NonNull TextView textView15, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView16, @NonNull LinearLayout linearLayout9, @NonNull TextView textView17, @NonNull TextView textView18, @NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton2, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull TextView textView21) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2397c = textView;
+        this.f2395c = textView;
         this.d = textView2;
         this.e = linearLayout;
         this.f = textView4;
@@ -111,15 +111,15 @@ public final class WidgetSettingsAccountBinding implements ViewBinding {
         this.o = textView8;
         this.p = linearLayout6;
         this.q = textView10;
-        this.f2398r = linearLayout7;
+        this.f2396r = linearLayout7;
         this.s = textView12;
         this.t = textView13;
         this.u = textView14;
         this.v = linearLayout8;
-        this.f2399w = textView15;
-        this.f2400x = nestedScrollView;
-        this.f2401y = checkedSetting;
-        this.f2402z = textView16;
+        this.f2397w = textView15;
+        this.f2398x = nestedScrollView;
+        this.f2399y = checkedSetting;
+        this.f2400z = textView16;
         this.A = linearLayout9;
         this.B = textView18;
         this.C = relativeLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java
index d99c326ce8..69062fc4d4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSettingsAccountChangePasswordBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2403c;
+    public final TextInputLayout f2401c;
     @NonNull
     public final FloatingActionButton d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetSettingsAccountChangePasswordBinding implements ViewBin
     public WidgetSettingsAccountChangePasswordBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout3, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2403c = textInputLayout2;
+        this.f2401c = textInputLayout2;
         this.d = floatingActionButton;
         this.e = textInputLayout3;
         this.f = dimmerView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java
index 56a9bb637a..7b9294b0aa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsAccountContactsNameEditBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2404c;
+    public final MaterialButton f2402c;
     @NonNull
     public final FloatingActionButton d;
 
     public WidgetSettingsAccountContactsNameEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2404c = materialButton;
+        this.f2402c = materialButton;
         this.d = floatingActionButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java
index dc2665c38d..68f2cd55da 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java
@@ -16,14 +16,14 @@ public final class WidgetSettingsAccountEditBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2405c;
+    public final TextInputLayout f2403c;
     @NonNull
     public final FloatingActionButton d;
 
     public WidgetSettingsAccountEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextInputLayout textInputLayout2, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2405c = textInputLayout2;
+        this.f2403c = textInputLayout2;
         this.d = floatingActionButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java
index 088ce0855d..ffc9a266af 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsAccountEmailEditBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2406c;
+    public final FloatingActionButton f2404c;
 
     public WidgetSettingsAccountEmailEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2406c = floatingActionButton;
+        this.f2404c = floatingActionButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java
index b751a73c4d..62940a94c3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAppearanceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2407c;
+    public final TextView f2405c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -41,7 +41,7 @@ public final class WidgetSettingsAppearanceBinding implements ViewBinding {
     public WidgetSettingsAppearanceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull WidgetChatListAdapterItemTextBinding widgetChatListAdapterItemTextBinding, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull View view, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4) {
         this.a = coordinatorLayout;
         this.b = widgetChatListAdapterItemTextBinding;
-        this.f2407c = textView;
+        this.f2405c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = seekBar;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java
index 373f19a144..5d6103a80f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAuthorizedAppsListItemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2408c;
+    public final TextView f2406c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetSettingsAuthorizedAppsListItemBinding implements ViewBi
     public WidgetSettingsAuthorizedAppsListItemBinding(@NonNull MaterialCardView materialCardView, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView) {
         this.a = materialCardView;
         this.b = appCompatImageView;
-        this.f2408c = textView;
+        this.f2406c = textView;
         this.d = textView2;
         this.e = simpleDraweeView;
         this.f = materialCardView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java
index f3dde1fe48..f8fe2e2077 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSettingsBehaviorBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2409c;
+    public final TextView f2407c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetSettingsBehaviorBinding implements ViewBinding {
     public WidgetSettingsBehaviorBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2409c = textView;
+        this.f2407c = textView;
         this.d = checkedSetting2;
         this.e = textView2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java
index e05272886c..feda6dcaed 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java
@@ -39,7 +39,7 @@ public final class WidgetSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2410c;
+    public final TextView f2408c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -71,7 +71,7 @@ public final class WidgetSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2411r;
+    public final TextView f2409r;
     @NonNull
     public final LinearLayout s;
     @NonNull
@@ -83,24 +83,24 @@ public final class WidgetSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final MaterialButton f2412w;
+    public final MaterialButton f2410w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f2413x;
+    public final TextView f2411x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextView f2414y;
+    public final TextView f2412y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final TextView f2415z;
+    public final TextView f2413z;
 
     public WidgetSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @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 TextView textView11, @NonNull TextView textView12, @NonNull View view, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull LinearLayout linearLayout, @NonNull TextView textView18, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull MaterialButton materialButton, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull LinearLayout linearLayout4, @NonNull TextView textView23, @NonNull TextView textView24, @NonNull TextView textView25, @NonNull StatusView statusView, @NonNull TextView textView26, @NonNull TextView textView27, @NonNull TextView textView28, @NonNull TextView textView29, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull TextView textView30) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f2410c = textView2;
+        this.f2408c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
@@ -115,15 +115,15 @@ public final class WidgetSettingsBinding implements ViewBinding {
         this.o = textView13;
         this.p = textView14;
         this.q = textView15;
-        this.f2411r = textView17;
+        this.f2409r = textView17;
         this.s = linearLayout;
         this.t = textView18;
         this.u = linearLayout2;
         this.v = linearLayout3;
-        this.f2412w = materialButton;
-        this.f2413x = textView19;
-        this.f2414y = textView20;
-        this.f2415z = textView21;
+        this.f2410w = materialButton;
+        this.f2411x = textView19;
+        this.f2412y = textView20;
+        this.f2413z = textView21;
         this.A = textView22;
         this.B = linearLayout4;
         this.C = textView24;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java
index bdee7e3390..ddf169739c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java
@@ -15,12 +15,12 @@ public final class WidgetSettingsBlockedUsersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2416c;
+    public final RecyclerView f2414c;
 
     public WidgetSettingsBlockedUsersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull ImageView imageView) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f2416c = recyclerView;
+        this.f2414c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java
index 200492a8f1..cb46c7d90e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java
@@ -20,7 +20,7 @@ public final class WidgetSettingsBoostBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2417c;
+    public final AppViewFlipper f2415c;
     @NonNull
     public final PremiumSubscriptionMarketingView d;
     @NonNull
@@ -39,7 +39,7 @@ public final class WidgetSettingsBoostBinding implements ViewBinding {
     public WidgetSettingsBoostBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull o3 o3Var, @NonNull AppViewFlipper appViewFlipper, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton, @NonNull RecyclerView recyclerView2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView) {
         this.a = coordinatorLayout;
         this.b = o3Var;
-        this.f2417c = appViewFlipper;
+        this.f2415c = appViewFlipper;
         this.d = premiumSubscriptionMarketingView;
         this.e = recyclerView;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java
index bcdffaff17..2c95ee5db6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsConnectionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2418c;
+    public final RecyclerView f2416c;
 
     public WidgetSettingsConnectionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f2418c = recyclerView;
+        this.f2416c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java
index 4a6602b7f7..b717128a66 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsDeveloperBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2419c;
+    public final MaterialButton f2417c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetSettingsDeveloperBinding implements ViewBinding {
     public WidgetSettingsDeveloperBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2, @NonNull MaterialButton materialButton4, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f2419c = materialButton2;
+        this.f2417c = materialButton2;
         this.d = materialButton3;
         this.e = recyclerView;
         this.f = recyclerView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java
index a305db1a6e..6a72dcf1a4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java
@@ -13,14 +13,14 @@ public final class WidgetSettingsEnableMfaKeyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2420c;
+    public final TextView f2418c;
     @NonNull
     public final TextView d;
 
     public WidgetSettingsEnableMfaKeyBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2420c = textView2;
+        this.f2418c = textView2;
         this.d = textView3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java
index f4e64875ab..0e2712b09d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java
@@ -22,7 +22,7 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final GiftSelectView f2421c;
+    public final GiftSelectView f2419c;
     @NonNull
     public final GiftSelectView d;
     @NonNull
@@ -54,14 +54,14 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2422r;
+    public final TextView f2420r;
     @NonNull
     public final RecyclerView s;
 
     public WidgetSettingsGiftingBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull GiftSelectView giftSelectView, @NonNull GiftSelectView giftSelectView2, @NonNull GiftSelectView giftSelectView3, @NonNull GiftSelectView giftSelectView4, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull AppViewFlipper appViewFlipper, @NonNull ProgressBar progressBar, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull RecyclerView recyclerView2) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2421c = giftSelectView;
+        this.f2419c = giftSelectView;
         this.d = giftSelectView2;
         this.e = giftSelectView3;
         this.f = giftSelectView4;
@@ -76,7 +76,7 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding {
         this.o = materialButton;
         this.p = textView3;
         this.q = textView4;
-        this.f2422r = textView5;
+        this.f2420r = textView5;
         this.s = recyclerView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java
index 2a3cc0b8c9..7cab4f21c1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsItemAddConnectedAccountBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2423c;
+    public final TextView f2421c;
 
     public WidgetSettingsItemAddConnectedAccountBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f2423c = textView;
+        this.f2421c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java
index d9558af6b2..39c8d6c06c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsItemBlockedUserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2424c;
+    public final TextView f2422c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetSettingsItemBlockedUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f2424c = textView;
+        this.f2422c = textView;
         this.d = materialButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java
index 873cadfe7f..82cb429e6c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsItemConnectedAccountBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2425c;
+    public final ImageView f2423c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetSettingsItemConnectedAccountBinding implements ViewBind
     public WidgetSettingsItemConnectedAccountBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull View view, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull SwitchMaterial switchMaterial, @NonNull SwitchMaterial switchMaterial2, @NonNull View view2, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SwitchMaterial switchMaterial3) {
         this.a = cardView;
         this.b = imageView;
-        this.f2425c = imageView2;
+        this.f2423c = imageView2;
         this.d = textView;
         this.e = switchMaterial;
         this.f = switchMaterial2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java
index 35332ba301..ae6f58a279 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsLanguageBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2426c;
+    public final ImageView f2424c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetSettingsLanguageBinding implements ViewBinding {
     public WidgetSettingsLanguageBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView3) {
         this.a = coordinatorLayout;
         this.b = relativeLayout;
-        this.f2426c = imageView;
+        this.f2424c = imageView;
         this.d = textView;
         this.e = textView2;
         this.f = checkedSetting;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java
index 46f5ce2c70..8e0126a948 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsLanguageSelectItemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2427c;
+    public final TextView f2425c;
     @NonNull
     public final TextView d;
 
     public WidgetSettingsLanguageSelectItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull Barrier barrier, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f2427c = textView;
+        this.f2425c = textView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java
index 8825720123..939e0241c2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSettingsMediaBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2428c;
+    public final CheckedSetting f2426c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -40,7 +40,7 @@ public final class WidgetSettingsMediaBinding implements ViewBinding {
     public WidgetSettingsMediaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2428c = checkedSetting2;
+        this.f2426c = checkedSetting2;
         this.d = linkifiedTextView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java
index a746c479ff..577b5ddc95 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsNotificationOsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f2429c;
+    public final RelativeLayout f2427c;
     @NonNull
     public final CheckedSetting d;
 
     public WidgetSettingsNotificationOsBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting2) {
         this.a = linearLayout;
         this.b = checkedSetting;
-        this.f2429c = relativeLayout;
+        this.f2427c = relativeLayout;
         this.d = checkedSetting2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java
index 7620eeb4e3..800d6622d5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSettingsNotificationsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2430c;
+    public final CheckedSetting f2428c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetSettingsNotificationsBinding implements ViewBinding {
     public WidgetSettingsNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull LinearLayout linearLayout) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2430c = checkedSetting2;
+        this.f2428c = checkedSetting2;
         this.d = checkedSetting3;
         this.e = checkedSetting4;
         this.f = checkedSetting5;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java
index 063add9e06..2604598f97 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java
@@ -25,7 +25,7 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final k0 f2431c;
+    public final k0 f2429c;
     @NonNull
     public final u2 d;
     @NonNull
@@ -57,7 +57,7 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final AppViewFlipper f2432r;
+    public final AppViewFlipper f2430r;
     @NonNull
     public final v2 s;
     @NonNull
@@ -66,7 +66,7 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
     public WidgetSettingsPremiumBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull y yVar, @NonNull k0 k0Var, @NonNull u2 u2Var, @NonNull ActiveSubscriptionView activeSubscriptionView, @NonNull ActiveSubscriptionView activeSubscriptionView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull ScrollView scrollView, @NonNull Button button, @NonNull CardView cardView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull AppViewFlipper appViewFlipper, @NonNull v2 v2Var, @NonNull w2 w2Var) {
         this.a = coordinatorLayout;
         this.b = yVar;
-        this.f2431c = k0Var;
+        this.f2429c = k0Var;
         this.d = u2Var;
         this.e = activeSubscriptionView;
         this.f = activeSubscriptionView2;
@@ -81,7 +81,7 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
         this.o = textView4;
         this.p = linearLayout2;
         this.q = textView5;
-        this.f2432r = appViewFlipper;
+        this.f2430r = appViewFlipper;
         this.s = v2Var;
         this.t = w2Var;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java
index 741292f910..091cd62143 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java
@@ -17,7 +17,7 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2433c;
+    public final CheckedSetting f2431c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -49,7 +49,7 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final CheckedSetting f2434r;
+    public final CheckedSetting f2432r;
     @NonNull
     public final CheckedSetting s;
     @NonNull
@@ -61,24 +61,24 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final MaterialButton f2435w;
+    public final MaterialButton f2433w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f2436x;
+    public final TextView f2434x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final CheckedSetting f2437y;
+    public final CheckedSetting f2435y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final CheckedSetting f2438z;
+    public final CheckedSetting f2436z;
 
     public WidgetSettingsPrivacyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull DimmerView dimmerView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting5, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull LinearLayout linearLayout2, @NonNull TextView textView4, @NonNull CheckedSetting checkedSetting6, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull CheckedSetting checkedSetting11, @NonNull CheckedSetting checkedSetting12, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting13, @NonNull MaterialButton materialButton, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting14, @NonNull CheckedSetting checkedSetting15) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2433c = checkedSetting2;
+        this.f2431c = checkedSetting2;
         this.d = textView;
         this.e = checkedSetting3;
         this.f = checkedSetting4;
@@ -93,15 +93,15 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
         this.o = checkedSetting7;
         this.p = checkedSetting8;
         this.q = checkedSetting9;
-        this.f2434r = checkedSetting10;
+        this.f2432r = checkedSetting10;
         this.s = checkedSetting11;
         this.t = checkedSetting12;
         this.u = textView6;
         this.v = checkedSetting13;
-        this.f2435w = materialButton;
-        this.f2436x = textView7;
-        this.f2437y = checkedSetting14;
-        this.f2438z = checkedSetting15;
+        this.f2433w = materialButton;
+        this.f2434x = textView7;
+        this.f2435y = checkedSetting14;
+        this.f2436z = checkedSetting15;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java
index 9b190023a3..59d2397a75 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java
@@ -22,7 +22,7 @@ public final class WidgetSettingsUserProfileBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputEditText f2439c;
+    public final TextInputEditText f2437c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -39,7 +39,7 @@ public final class WidgetSettingsUserProfileBinding implements ViewBinding {
     public WidgetSettingsUserProfileBinding(@NonNull TouchInterceptingCoordinatorLayout touchInterceptingCoordinatorLayout, @NonNull CardView cardView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull CardView cardView2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull DimmerView dimmerView, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull UserProfileHeaderView userProfileHeaderView) {
         this.a = touchInterceptingCoordinatorLayout;
         this.b = cardView;
-        this.f2439c = textInputEditText;
+        this.f2437c = textInputEditText;
         this.d = textInputLayout;
         this.e = cardView2;
         this.f = linkifiedTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java
index 684a223a97..9365080d68 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java
@@ -27,7 +27,7 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2440c;
+    public final CheckedSetting f2438c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -59,7 +59,7 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2441r;
+    public final TextView f2439r;
     @NonNull
     public final SeekBar s;
     @NonNull
@@ -71,24 +71,24 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final View f2442w;
+    public final View f2440w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f2443x;
+    public final TextView f2441x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final SeekBar f2444y;
+    public final SeekBar f2442y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final MaterialButton f2445z;
+    public final MaterialButton f2443z;
 
     public WidgetSettingsVoiceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting5, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull SeekBar seekBar, @NonNull LinearLayout linearLayout, @NonNull TextView textView8, @NonNull CheckedSetting checkedSetting11, @NonNull TextView textView9, @NonNull View view, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull SeekBar seekBar2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView12, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2440c = checkedSetting2;
+        this.f2438c = checkedSetting2;
         this.d = checkedSetting3;
         this.e = checkedSetting4;
         this.f = textView;
@@ -103,15 +103,15 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
         this.o = checkedSetting9;
         this.p = checkedSetting10;
         this.q = textView6;
-        this.f2441r = textView7;
+        this.f2439r = textView7;
         this.s = seekBar;
         this.t = textView8;
         this.u = checkedSetting11;
         this.v = textView9;
-        this.f2442w = view;
-        this.f2443x = textView11;
-        this.f2444y = seekBar2;
-        this.f2445z = materialButton;
+        this.f2440w = view;
+        this.f2441x = textView11;
+        this.f2442y = seekBar2;
+        this.f2443z = materialButton;
         this.A = linearLayout2;
         this.B = relativeLayout2;
         this.C = textView12;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java
index 75a9a8f8a9..243a41d33c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsVoiceInputModeBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2446c;
+    public final LinearLayout f2444c;
 
     public WidgetSettingsVoiceInputModeBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2) {
         this.a = nestedScrollView;
         this.b = linearLayout;
-        this.f2446c = linearLayout2;
+        this.f2444c = linearLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java
index 2a0bf3b3c5..fa38481b53 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java
@@ -14,14 +14,14 @@ public final class WidgetStageAudienceBlockedBottomSheetBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f2447c;
+    public final MaxHeightRecyclerView f2445c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetStageAudienceBlockedBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull MaterialButton materialButton2) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2447c = maxHeightRecyclerView;
+        this.f2445c = maxHeightRecyclerView;
         this.d = materialButton2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java
index 0cab5469e4..a8043d3a46 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java
@@ -16,14 +16,14 @@ public final class WidgetStageAudienceNoticeBottomSheetBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2448c;
+    public final TextView f2446c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetStageAudienceNoticeBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Barrier barrier, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull TextView textView3, @NonNull ImageView imageView4, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull ImageView imageView5, @NonNull TextView textView5) {
         this.a = coordinatorLayout;
         this.b = imageView4;
-        this.f2448c = textView4;
+        this.f2446c = textView4;
         this.d = materialButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java
index dbc02f0b75..cb9f5415ec 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java
@@ -16,7 +16,7 @@ public final class WidgetStageChannelAudienceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CutoutView f2449c;
+    public final CutoutView f2447c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetStageChannelAudienceBinding implements ViewBinding {
     public WidgetStageChannelAudienceBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CutoutView cutoutView, @NonNull TextView textView, @NonNull ImageView imageView) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f2449c = cutoutView;
+        this.f2447c = cutoutView;
         this.d = textView;
         this.e = imageView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java
index 4879601535..77e6c49cdf 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java
@@ -14,7 +14,7 @@ public final class WidgetStageChannelDetailsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2450c;
+    public final ImageView f2448c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetStageChannelDetailsBinding implements ViewBinding {
     public WidgetStageChannelDetailsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull TextView textView3, @NonNull ImageView imageView5, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull ImageView imageView6, @NonNull TextView textView6) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f2450c = imageView2;
+        this.f2448c = imageView2;
         this.d = textView;
         this.e = textView2;
         this.f = imageView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java
index 6b6c2db034..a510df98ae 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java
@@ -14,14 +14,14 @@ public final class WidgetStageChannelModeratorPermissionsBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final PermissionOwnerListView f2451c;
+    public final PermissionOwnerListView f2449c;
     @NonNull
     public final PermissionOwnerListView d;
 
     public WidgetStageChannelModeratorPermissionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AddPermissionOwnerView addPermissionOwnerView, @NonNull PermissionOwnerListView permissionOwnerListView, @NonNull PermissionOwnerListView permissionOwnerListView2) {
         this.a = coordinatorLayout;
         this.b = addPermissionOwnerView;
-        this.f2451c = permissionOwnerListView;
+        this.f2449c = permissionOwnerListView;
         this.d = permissionOwnerListView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelPrestartDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelPrestartDetailsBinding.java
index 83c1735a4e..925e4bcf80 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelPrestartDetailsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelPrestartDetailsBinding.java
@@ -13,12 +13,12 @@ public final class WidgetStageChannelPrestartDetailsBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2452c;
+    public final TextView f2450c;
 
     public WidgetStageChannelPrestartDetailsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f2452c = textView2;
+        this.f2450c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java
index bcd576494e..1be1666882 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java
@@ -15,12 +15,12 @@ public final class WidgetStageModeratorJoinBottomSheetBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2453c;
+    public final MaterialButton f2451c;
 
     public WidgetStageModeratorJoinBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f2453c = materialButton2;
+        this.f2451c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java
index 737c3fe442..758be69655 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetStageRaisedHandsBottomSheetBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Group f2454c;
+    public final Group f2452c;
     @NonNull
     public final SwitchMaterial d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetStageRaisedHandsBottomSheetBinding implements ViewBindi
     public WidgetStageRaisedHandsBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull MaterialTextView materialTextView, @NonNull Group group, @NonNull ImageView imageView, @NonNull MaterialTextView materialTextView2, @NonNull MaterialTextView materialTextView3, @NonNull SwitchMaterial switchMaterial, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull MaterialTextView materialTextView4, @NonNull MaterialTextView materialTextView5, @NonNull MaterialTextView materialTextView6, @NonNull Group group2, @NonNull ImageView imageView2) {
         this.a = coordinatorLayout;
         this.b = materialTextView;
-        this.f2454c = group;
+        this.f2452c = group;
         this.d = switchMaterial;
         this.e = maxHeightRecyclerView;
         this.f = materialTextView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java
index 3e3efdd2fe..ee73ec485c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetStageStartEventBottomSheetBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2455c;
+    public final MaterialButton f2453c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetStageStartEventBottomSheetBinding implements ViewBindin
     public WidgetStageStartEventBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextInputEditText textInputEditText, @NonNull TextView textView4, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f2455c = materialButton;
+        this.f2453c = materialButton;
         this.d = textView2;
         this.e = textView3;
         this.f = textInputEditText;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java
index 4b47671006..58e4a31dc6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java
@@ -13,12 +13,12 @@ public final class WidgetStartCallSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2456c;
+    public final TextView f2454c;
 
     public WidgetStartCallSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2456c = textView2;
+        this.f2454c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java
index 53165a2f81..382ba77553 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java
@@ -16,7 +16,7 @@ public final class WidgetStickerPackStoreSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2457c;
+    public final RecyclerView f2455c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetStickerPackStoreSheetBinding implements ViewBinding {
     public WidgetStickerPackStoreSheetBinding(@NonNull RelativeLayout relativeLayout, @NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout2, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LoadingButton loadingButton) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f2457c = recyclerView;
+        this.f2455c = recyclerView;
         this.d = simpleDraweeView;
         this.e = loadingButton;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java
index a7fd2afedc..3be832a5c4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java
@@ -24,7 +24,7 @@ public final class WidgetStickerPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f2458c;
+    public final LinkifiedTextView f2456c;
     @NonNull
     public final StickerView d;
     @NonNull
@@ -56,14 +56,14 @@ public final class WidgetStickerPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final SearchInputView f2459r;
+    public final SearchInputView f2457r;
     @NonNull
     public final Toolbar s;
 
     public WidgetStickerPickerBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull AppBarLayout appBarLayout, @NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull RecyclerView recyclerView2, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull SearchInputView searchInputView, @NonNull Toolbar toolbar) {
         this.a = coordinatorLayout;
         this.b = imageView;
-        this.f2458c = linkifiedTextView;
+        this.f2456c = linkifiedTextView;
         this.d = stickerView;
         this.e = stickerView2;
         this.f = stickerView3;
@@ -78,7 +78,7 @@ public final class WidgetStickerPickerBinding implements ViewBinding {
         this.o = view;
         this.p = recyclerView2;
         this.q = coordinatorLayout2;
-        this.f2459r = searchInputView;
+        this.f2457r = searchInputView;
         this.s = toolbar;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java
index 3c22ab70a9..4dee7b4ba6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java
@@ -18,7 +18,7 @@ public final class WidgetStickerSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2460c;
+    public final TextView f2458c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -39,7 +39,7 @@ public final class WidgetStickerSheetBinding implements ViewBinding {
     public WidgetStickerSheetBinding(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull Chip chip, @NonNull RelativeLayout relativeLayout, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4) {
         this.a = linearLayout;
         this.b = loadingButton;
-        this.f2460c = textView;
+        this.f2458c = textView;
         this.d = textView2;
         this.e = materialButton;
         this.f = chip;
diff --git a/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java b/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java
index 2c180cdd30..33c05d433b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java
@@ -15,7 +15,7 @@ public final class WidgetTabsHostBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f2461c;
+    public final ConstraintLayout f2459c;
     @NonNull
     public final FragmentContainerView d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetTabsHostBinding implements ViewBinding {
     public WidgetTabsHostBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TabsHostBottomNavigationView tabsHostBottomNavigationView, @NonNull ConstraintLayout constraintLayout2, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull FragmentContainerView fragmentContainerView5) {
         this.a = constraintLayout;
         this.b = tabsHostBottomNavigationView;
-        this.f2461c = constraintLayout2;
+        this.f2459c = constraintLayout2;
         this.d = fragmentContainerView;
         this.e = fragmentContainerView3;
         this.f = fragmentContainerView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java
index 111ab35f3b..23f052fd05 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java
@@ -19,7 +19,7 @@ public final class WidgetTextChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2462c;
+    public final TextInputLayout f2460c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -51,12 +51,12 @@ public final class WidgetTextChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final WidgetThreadArchiveActionsSheetBinding f2463r;
+    public final WidgetThreadArchiveActionsSheetBinding f2461r;
 
     public WidgetTextChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull LinearLayout linearLayout6, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull WidgetThreadArchiveActionsSheetBinding widgetThreadArchiveActionsSheetBinding, @NonNull NestedScrollView nestedScrollView) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f2462c = textInputLayout;
+        this.f2460c = textInputLayout;
         this.d = textInputLayout2;
         this.e = linearLayout;
         this.f = checkedSetting2;
@@ -71,7 +71,7 @@ public final class WidgetTextChannelSettingsBinding implements ViewBinding {
         this.o = linearLayout6;
         this.p = textView3;
         this.q = seekBar;
-        this.f2463r = widgetThreadArchiveActionsSheetBinding;
+        this.f2461r = widgetThreadArchiveActionsSheetBinding;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
index 2955f1994f..c5b562c21d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
@@ -18,7 +18,7 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f2464c;
+    public final LinearLayout f2462c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -50,12 +50,12 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2465r;
+    public final TextView f2463r;
 
     public WidgetThreadArchiveActionsSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialRadioButton materialRadioButton, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull TextView textView3, @NonNull MaterialRadioButton materialRadioButton2, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView4, @NonNull ImageView imageView2, @NonNull TextView textView5, @NonNull MaterialRadioButton materialRadioButton3, @NonNull ConstraintLayout constraintLayout4, @NonNull MaterialRadioButton materialRadioButton4, @NonNull TextView textView6, @NonNull TextView textView7) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2464c = linearLayout;
+        this.f2462c = linearLayout;
         this.d = constraintLayout;
         this.e = materialRadioButton;
         this.f = constraintLayout2;
@@ -70,7 +70,7 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
         this.o = materialRadioButton3;
         this.p = constraintLayout4;
         this.q = materialRadioButton4;
-        this.f2465r = textView6;
+        this.f2463r = textView6;
     }
 
     @NonNull
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java
index d7e6f3f9ba..f47ffee203 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java
@@ -14,12 +14,12 @@ public final class WidgetThreadBrowserActiveBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2466c;
+    public final RecyclerView f2464c;
 
     public WidgetThreadBrowserActiveBinding(@NonNull ConstraintLayout constraintLayout, @NonNull p1 p1Var, @NonNull RecyclerView recyclerView) {
         this.a = constraintLayout;
         this.b = p1Var;
-        this.f2466c = recyclerView;
+        this.f2464c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java
index bf8f4eb086..b85c603f0a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java
@@ -16,7 +16,7 @@ public final class WidgetThreadBrowserArchivedBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2467c;
+    public final RecyclerView f2465c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetThreadBrowserArchivedBinding implements ViewBinding {
     public WidgetThreadBrowserArchivedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull p1 p1Var, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton) {
         this.a = constraintLayout;
         this.b = p1Var;
-        this.f2467c = recyclerView;
+        this.f2465c = recyclerView;
         this.d = constraintLayout2;
         this.e = materialButton;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java
index af45855e0c..b17346b6e5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java
@@ -15,12 +15,12 @@ public final class WidgetThreadBrowserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimplePager f2468c;
+    public final SimplePager f2466c;
 
     public WidgetThreadBrowserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TabLayout tabLayout, @NonNull AppBarLayout appBarLayout, @NonNull SimplePager simplePager) {
         this.a = constraintLayout;
         this.b = tabLayout;
-        this.f2468c = simplePager;
+        this.f2466c = simplePager;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java
index 1c3c2f5385..768b96461d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java
@@ -15,7 +15,7 @@ public final class WidgetThreadBrowserFilterSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CardView f2469c;
+    public final CardView f2467c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetThreadBrowserFilterSheetBinding implements ViewBinding
     public WidgetThreadBrowserFilterSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting, @NonNull CardView cardView, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3) {
         this.a = nestedScrollView;
         this.b = checkedSetting;
-        this.f2469c = cardView;
+        this.f2467c = cardView;
         this.d = checkedSetting2;
         this.e = checkedSetting3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java
index dd7c716848..f6f5acb85e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java
@@ -18,7 +18,7 @@ public final class WidgetThreadSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2470c;
+    public final View f2468c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetThreadSettingsBinding implements ViewBinding {
     public WidgetThreadSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull NestedScrollView nestedScrollView, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout3, @NonNull TextView textView2, @NonNull SeekBar seekBar, @NonNull TextView textView3) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f2470c = view;
+        this.f2468c = view;
         this.d = textInputLayout;
         this.e = linearLayout2;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java
index 6dff1f7701..9d83f13710 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java
@@ -14,14 +14,14 @@ public final class WidgetThreadStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f2471c;
+    public final LoadingButton f2469c;
     @NonNull
     public final LinkifiedTextView d;
 
     public WidgetThreadStatusBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull LoadingButton loadingButton, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f2471c = loadingButton;
+        this.f2469c = loadingButton;
         this.d = linkifiedTextView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java
index 7cae494334..17f7dc9b62 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java
@@ -17,7 +17,7 @@ public final class WidgetTosAcceptBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2472c;
+    public final MaterialButton f2470c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetTosAcceptBinding implements ViewBinding {
     public WidgetTosAcceptBinding(@NonNull RelativeLayout relativeLayout, @NonNull CheckBox checkBox, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = relativeLayout;
         this.b = checkBox;
-        this.f2472c = materialButton;
+        this.f2470c = materialButton;
         this.d = linkifiedTextView;
         this.e = linkifiedTextView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java
index 990ec6640d..1d5f7734a9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java
@@ -17,7 +17,7 @@ public final class WidgetTosReportViolationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2473c;
+    public final TextView f2471c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetTosReportViolationBinding implements ViewBinding {
     public WidgetTosReportViolationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ProgressBar progressBar, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = loadingButton;
-        this.f2473c = textView;
+        this.f2471c = textView;
         this.d = linearLayout;
         this.e = textView2;
         this.f = progressBar;
diff --git a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java
index 0172f16e59..26779fd0fe 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java
@@ -14,14 +14,14 @@ public final class WidgetTosReportViolationReasonBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2474c;
+    public final TextView f2472c;
     @NonNull
     public final MaterialRadioButton d;
 
     public WidgetTosReportViolationReasonBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialRadioButton materialRadioButton) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f2474c = textView2;
+        this.f2472c = textView2;
         this.d = materialRadioButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java
index 0aad626c0b..b05be70db1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUnknownStickerSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2475c;
+    public final TextView f2473c;
 
     public WidgetUnknownStickerSheetBinding(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = stickerView;
-        this.f2475c = textView;
+        this.f2473c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java
index 5b66fcbf95..3f34c11653 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java
@@ -13,7 +13,7 @@ public final class WidgetUrlActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2476c;
+    public final TextView f2474c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class WidgetUrlActionsBinding implements ViewBinding {
     public WidgetUrlActionsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = linearLayout;
         this.b = textView;
-        this.f2476c = textView2;
+        this.f2474c = textView2;
         this.d = textView3;
         this.e = textView4;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java
index 96dc7a7566..c6e95a3c03 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java
@@ -14,7 +14,7 @@ public final class WidgetUserAccountVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f2477c;
+    public final RelativeLayout f2475c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetUserAccountVerifyBinding implements ViewBinding {
     public WidgetUserAccountVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull RelativeLayout relativeLayout3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f2477c = relativeLayout3;
+        this.f2475c = relativeLayout3;
         this.d = linkifiedTextView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java
index 98154a6e0a..39da221456 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java
@@ -16,7 +16,7 @@ public final class WidgetUserEmailUpdateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2478c;
+    public final TextInputLayout f2476c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetUserEmailUpdateBinding implements ViewBinding {
     public WidgetUserEmailUpdateBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull DimmerView dimmerView) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f2478c = textInputLayout;
+        this.f2476c = textInputLayout;
         this.d = textInputLayout2;
         this.e = dimmerView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java
index 717ea36279..29b44960fa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUserEmailVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2479c;
+    public final MaterialButton f2477c;
 
     public WidgetUserEmailVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f2479c = materialButton2;
+        this.f2477c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java
index 85825793ad..fa460ba665 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUserMentionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2480c;
+    public final RecyclerView f2478c;
 
     public WidgetUserMentionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Toolbar toolbar, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = toolbar;
-        this.f2480c = recyclerView;
+        this.f2478c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java
index e257dee499..05e8c69e4a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java
@@ -13,14 +13,14 @@ public final class WidgetUserMentionsFilterBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f2481c;
+    public final CheckedSetting f2479c;
     @NonNull
     public final CheckedSetting d;
 
     public WidgetUserMentionsFilterBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3) {
         this.a = nestedScrollView;
         this.b = checkedSetting;
-        this.f2481c = checkedSetting2;
+        this.f2479c = checkedSetting2;
         this.d = checkedSetting3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java
index aa8a60b4ac..7add6e857a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java
@@ -15,14 +15,14 @@ public final class WidgetUserPasswordVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2482c;
+    public final TextInputLayout f2480c;
     @NonNull
     public final FloatingActionButton d;
 
     public WidgetUserPasswordVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f2482c = textInputLayout;
+        this.f2480c = textInputLayout;
         this.d = floatingActionButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java
index 7c6d501a8d..0d752d646c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java
@@ -16,7 +16,7 @@ public final class WidgetUserPhoneManageBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2483c;
+    public final TextView f2481c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetUserPhoneManageBinding implements ViewBinding {
     public WidgetUserPhoneManageBinding(@NonNull FrameLayout frameLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull TextView textView3) {
         this.a = frameLayout;
         this.b = dimmerView;
-        this.f2483c = textView;
+        this.f2481c = textView;
         this.d = textView2;
         this.e = materialButton;
         this.f = phoneOrEmailInputView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java
index e09f4d6a83..d1d0097796 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java
@@ -15,14 +15,14 @@ public final class WidgetUserPhoneVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final DimmerView f2484c;
+    public final DimmerView f2482c;
     @NonNull
     public final CodeVerificationView d;
 
     public WidgetUserPhoneVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull DimmerView dimmerView, @NonNull CodeVerificationView codeVerificationView) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f2484c = dimmerView;
+        this.f2482c = dimmerView;
         this.d = codeVerificationView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java
index d7a5a50a4a..5995ab0e48 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUserProfileAdapterItemEmptyBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2485c;
+    public final TextView f2483c;
 
     public WidgetUserProfileAdapterItemEmptyBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f2485c = textView;
+        this.f2483c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java
index efe1660f71..bd5f66b614 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java
@@ -18,7 +18,7 @@ public final class WidgetUserProfileAdapterItemFriendBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final x5 f2486c;
+    public final x5 f2484c;
     @NonNull
     public final x5 d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetUserProfileAdapterItemFriendBinding implements ViewBind
     public WidgetUserProfileAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull x5 x5Var, @NonNull x5 x5Var2, @NonNull x5 x5Var3, @NonNull x5 x5Var4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = x5Var;
-        this.f2486c = x5Var2;
+        this.f2484c = x5Var2;
         this.d = x5Var3;
         this.e = x5Var4;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java
index 44e9de44ca..d320f3f354 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java
@@ -16,7 +16,7 @@ public final class WidgetUserProfileAdapterItemServerBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f2487c;
+    public final SimpleDraweeView f2485c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetUserProfileAdapterItemServerBinding implements ViewBind
     public WidgetUserProfileAdapterItemServerBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull Barrier barrier2, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView3) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f2487c = simpleDraweeView2;
+        this.f2485c = simpleDraweeView2;
         this.d = textView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java
index e8354c45de..e937e885d9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java
@@ -18,7 +18,7 @@ public final class WidgetUserSetCustomStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f2488c;
+    public final FrameLayout f2486c;
     @NonNull
     public final MaterialRadioButton d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetUserSetCustomStatusBinding implements ViewBinding {
     public WidgetUserSetCustomStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull RadioGroup radioGroup, @NonNull MaterialRadioButton materialRadioButton, @NonNull MaterialRadioButton materialRadioButton2, @NonNull MaterialRadioButton materialRadioButton3, @NonNull MaterialRadioButton materialRadioButton4, @NonNull MaterialRadioButton materialRadioButton5, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = simpleDraweeView;
-        this.f2488c = frameLayout;
+        this.f2486c = frameLayout;
         this.d = materialRadioButton;
         this.e = materialRadioButton2;
         this.f = materialRadioButton3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java
index 77ac1a31c0..b69a9cd170 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java
@@ -56,7 +56,7 @@ public final class WidgetUserSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2489c;
+    public final TextView f2487c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -88,7 +88,7 @@ public final class WidgetUserSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final TextView f2490r;
+    public final TextView f2488r;
     @NonNull
     public final TextView s;
     @NonNull
@@ -100,24 +100,24 @@ public final class WidgetUserSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: w  reason: collision with root package name */
-    public final TextView f2491w;
+    public final TextView f2489w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextInputEditText f2492x;
+    public final TextInputEditText f2490x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextInputLayout f2493y;
+    public final TextInputLayout f2491y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final Button f2494z;
+    public final Button f2492z;
 
     public WidgetUserSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ContentLoadingProgressBar contentLoadingProgressBar, @NonNull FrameLayout frameLayout, @NonNull Button button, @NonNull CardView cardView2, @NonNull UserProfileAdminView userProfileAdminView, @NonNull Button button2, @NonNull TextView textView2, @NonNull UserProfileConnectionsView userProfileConnectionsView, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull FrameLayout frameLayout2, @NonNull Button button3, @NonNull ImageView imageView, @NonNull TextView textView7, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull Button button4, @NonNull LinearLayout linearLayout4, @NonNull View view, @NonNull MaterialButton materialButton3, @NonNull FlexboxLayout flexboxLayout, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull MaterialButton materialButton4, @NonNull CardView cardView3, @NonNull UserProfileStageActionsView userProfileStageActionsView, @NonNull TextView textView8, @NonNull UserProfileVoiceSettingsView userProfileVoiceSettingsView, @NonNull RolesListView rolesListView, @NonNull Button button5, @NonNull CardView cardView4) {
         this.a = nestedScrollView;
         this.b = cardView;
-        this.f2489c = textView;
+        this.f2487c = textView;
         this.d = linkifiedTextView;
         this.e = frameLayout;
         this.f = button;
@@ -132,15 +132,15 @@ public final class WidgetUserSheetBinding implements ViewBinding {
         this.o = materialButton2;
         this.p = linearLayout2;
         this.q = linearLayout3;
-        this.f2490r = textView5;
+        this.f2488r = textView5;
         this.s = textView6;
         this.t = frameLayout2;
         this.u = button3;
         this.v = imageView;
-        this.f2491w = textView7;
-        this.f2492x = textInputEditText;
-        this.f2493y = textInputLayout;
-        this.f2494z = button4;
+        this.f2489w = textView7;
+        this.f2490x = textInputEditText;
+        this.f2491y = textInputLayout;
+        this.f2492z = button4;
         this.A = linearLayout4;
         this.B = view;
         this.C = materialButton3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java
index 7c927fe137..596ca91b99 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java
@@ -15,7 +15,7 @@ public final class WidgetUserStatusUpdateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final z3 f2495c;
+    public final z3 f2493c;
     @NonNull
     public final z3 d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetUserStatusUpdateBinding implements ViewBinding {
     public WidgetUserStatusUpdateBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull UserStatusPresenceCustomView userStatusPresenceCustomView, @NonNull z3 z3Var, @NonNull z3 z3Var2, @NonNull z3 z3Var3, @NonNull z3 z3Var4) {
         this.a = nestedScrollView;
         this.b = userStatusPresenceCustomView;
-        this.f2495c = z3Var;
+        this.f2493c = z3Var;
         this.d = z3Var2;
         this.e = z3Var3;
         this.f = z3Var4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java
index 9a8680b048..0904a5ee0d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java
@@ -19,7 +19,7 @@ public final class WidgetVoiceBottomSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final m0 f2496c;
+    public final m0 f2494c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetVoiceBottomSheetBinding implements ViewBinding {
     public WidgetVoiceBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull l0 l0Var, @NonNull m0 m0Var, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull RelativeLayout relativeLayout, @NonNull AnchoredVoiceControlsView anchoredVoiceControlsView, @NonNull MaterialButton materialButton2, @NonNull RecyclerView recyclerView, @NonNull CoordinatorLayout coordinatorLayout2) {
         this.a = coordinatorLayout;
         this.b = l0Var;
-        this.f2496c = m0Var;
+        this.f2494c = m0Var;
         this.d = materialButton;
         this.e = relativeLayout;
         this.f = anchoredVoiceControlsView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java
index 07684801c7..d6ec18ef5a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java
@@ -18,7 +18,7 @@ public final class WidgetVoiceCallIncomingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2497c;
+    public final FloatingActionButton f2495c;
     @NonNull
     public final FloatingActionButton d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetVoiceCallIncomingBinding implements ViewBinding {
     public WidgetVoiceCallIncomingBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull FloatingActionButton floatingActionButton2, @NonNull PrivateCallBlurredGridView privateCallBlurredGridView, @NonNull FloatingActionButton floatingActionButton3, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull Guideline guideline, @NonNull PrivateCallGridView privateCallGridView) {
         this.a = constraintLayout;
         this.b = linearLayout;
-        this.f2497c = floatingActionButton;
+        this.f2495c = floatingActionButton;
         this.d = floatingActionButton2;
         this.e = privateCallBlurredGridView;
         this.f = floatingActionButton3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java
index e9cbb59476..dffbcf05e6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java
@@ -13,12 +13,12 @@ public final class WidgetVoiceCallInlineBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2498c;
+    public final MaterialButton f2496c;
 
     public WidgetVoiceCallInlineBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f2498c = materialButton;
+        this.f2496c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java
index 26fc17b467..b07ded125d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java
@@ -17,7 +17,7 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2499c;
+    public final TextInputLayout f2497c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -49,14 +49,14 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: r  reason: collision with root package name */
-    public final SeekBar f2500r;
+    public final SeekBar f2498r;
     @NonNull
     public final TextView s;
 
     public WidgetVoiceChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull SeekBar seekBar, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull View view2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView7, @NonNull LinearLayout linearLayout4, @NonNull TextView textView8, @NonNull View view3, @NonNull SeekBar seekBar2, @NonNull TextView textView9) {
         this.a = coordinatorLayout;
         this.b = seekBar;
-        this.f2499c = textInputLayout;
+        this.f2497c = textInputLayout;
         this.d = textInputLayout2;
         this.e = textView2;
         this.f = textView3;
@@ -71,7 +71,7 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding {
         this.o = linearLayout4;
         this.p = textView8;
         this.q = view3;
-        this.f2500r = seekBar2;
+        this.f2498r = seekBar2;
         this.s = textView9;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java
index c4a3c9cfda..bc1b0bf3f8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetVoiceNoiseCancellationBottomSheetBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2501c;
+    public final TextView f2499c;
 
     public WidgetVoiceNoiseCancellationBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2501c = textView;
+        this.f2499c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java
index 686b6691d9..108a4c91b6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java
@@ -14,7 +14,7 @@ public final class WidgetVoiceSettingsBottomSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2502c;
+    public final TextView f2500c;
     @NonNull
     public final SwitchMaterial d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetVoiceSettingsBottomSheetBinding implements ViewBinding
     public WidgetVoiceSettingsBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SwitchMaterial switchMaterial, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull NestedScrollView nestedScrollView2, @NonNull TextView textView5, @NonNull SwitchMaterial switchMaterial2, @NonNull TextView textView6) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2502c = textView2;
+        this.f2500c = textView2;
         this.d = switchMaterial;
         this.e = textView3;
         this.f = textView4;
diff --git a/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java b/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java
index 6b8f32ccb2..6df0408b5e 100644
--- a/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java
+++ b/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java
@@ -8,12 +8,12 @@ public final class RenderableEmbedMedia {
     public final Integer b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Integer f2503c;
+    public final Integer f2501c;
 
     public RenderableEmbedMedia(String str, Integer num, Integer num2) {
         this.a = str;
         this.b = num;
-        this.f2503c = num2;
+        this.f2501c = num2;
     }
 
     public boolean equals(Object obj) {
@@ -24,7 +24,7 @@ public final class RenderableEmbedMedia {
             return false;
         }
         RenderableEmbedMedia renderableEmbedMedia = (RenderableEmbedMedia) obj;
-        return m.areEqual(this.a, renderableEmbedMedia.a) && m.areEqual(this.b, renderableEmbedMedia.b) && m.areEqual(this.f2503c, renderableEmbedMedia.f2503c);
+        return m.areEqual(this.a, renderableEmbedMedia.a) && m.areEqual(this.b, renderableEmbedMedia.b) && m.areEqual(this.f2501c, renderableEmbedMedia.f2501c);
     }
 
     public int hashCode() {
@@ -33,7 +33,7 @@ public final class RenderableEmbedMedia {
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         Integer num = this.b;
         int hashCode2 = (hashCode + (num != null ? num.hashCode() : 0)) * 31;
-        Integer num2 = this.f2503c;
+        Integer num2 = this.f2501c;
         if (num2 != null) {
             i = num2.hashCode();
         }
@@ -46,6 +46,6 @@ public final class RenderableEmbedMedia {
         O.append(", width=");
         O.append(this.b);
         O.append(", height=");
-        return a.D(O, this.f2503c, ")");
+        return a.D(O, this.f2501c, ")");
     }
 }
diff --git a/app/src/main/java/com/discord/gateway/GatewayDiscovery.java b/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
index 3d31baa57f..302dfeaa2e 100644
--- a/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
+++ b/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
@@ -96,7 +96,7 @@ public final class GatewayDiscovery {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            this.gatewayUrlDiscoverySubscription = this.gatewayUrlProvider.H(this.scheduler).V(new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$3(gatewayDiscovery$discoverGatewayUrl$2)), new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$4(gatewayDiscovery$discoverGatewayUrl$1)));
+            this.gatewayUrlDiscoverySubscription = this.gatewayUrlProvider.I(this.scheduler).W(new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$3(gatewayDiscovery$discoverGatewayUrl$2)), new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$4(gatewayDiscovery$discoverGatewayUrl$1)));
             return;
         }
         Function1<String, Unit> function13 = this.log;
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket.java b/app/src/main/java/com/discord/gateway/GatewaySocket.java
index ac9310dcd0..0f791e30c2 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket.java
@@ -383,14 +383,14 @@ public final class GatewaySocket {
         public final void postInterval(Function0<Unit> function0, long j) {
             m.checkNotNullParameter(function0, "callback");
             cancel();
-            this.subscription = Observable.D(j, j, TimeUnit.MILLISECONDS, i0.p.a.a()).H(this.scheduler).V(new GatewaySocket$Timer$postInterval$1(function0), GatewaySocket$Timer$postInterval$2.INSTANCE);
+            this.subscription = Observable.E(j, j, TimeUnit.MILLISECONDS, i0.p.a.a()).I(this.scheduler).W(new GatewaySocket$Timer$postInterval$1(function0), GatewaySocket$Timer$postInterval$2.INSTANCE);
         }
 
         @Override // com.discord.utilities.networking.Backoff.Scheduler
         public void schedule(Function0<Unit> function0, long j) {
             m.checkNotNullParameter(function0, "action");
             cancel();
-            this.subscription = Observable.c0(j, TimeUnit.MILLISECONDS).H(this.scheduler).V(new GatewaySocket$Timer$schedule$1(this, function0), GatewaySocket$Timer$schedule$2.INSTANCE);
+            this.subscription = Observable.d0(j, TimeUnit.MILLISECONDS).I(this.scheduler).W(new GatewaySocket$Timer$schedule$1(this, function0), GatewaySocket$Timer$schedule$2.INSTANCE);
         }
     }
 
@@ -464,8 +464,8 @@ public final class GatewaySocket {
         RestClient restClient = RestClient.INSTANCE;
         restClient.init(restConfig, context);
         this.gatewayDiscovery = new GatewayDiscovery(context, scheduler, backoff, new AnonymousClass1(this), restClient.getGateway());
-        Observable<Boolean> H = networkMonitor.observeIsConnected().H(scheduler);
-        Observable.g0(new r(H.i, new w1(new v1(AnonymousClass2.INSTANCE)))).V(new AnonymousClass3(this), new AnonymousClass4(this));
+        Observable<Boolean> I = networkMonitor.observeIsConnected().I(scheduler);
+        Observable.h0(new r(I.i, new w1(new v1(AnonymousClass2.INSTANCE)))).W(new AnonymousClass3(this), new AnonymousClass4(this));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -1086,7 +1086,7 @@ public final class GatewaySocket {
     }
 
     private final void schedule(Function0<Unit> function0) {
-        new j(function0).W(this.scheduler).V(GatewaySocket$schedule$1.INSTANCE, GatewaySocket$schedule$2.INSTANCE);
+        new j(function0).X(this.scheduler).W(GatewaySocket$schedule$1.INSTANCE, GatewaySocket$schedule$2.INSTANCE);
     }
 
     private final void send(Outgoing outgoing, boolean z2, Gson gson) {
diff --git a/app/src/main/java/com/discord/gateway/rest/RestClient.java b/app/src/main/java/com/discord/gateway/rest/RestClient.java
index 7960a691e8..2517a5aed5 100644
--- a/app/src/main/java/com/discord/gateway/rest/RestClient.java
+++ b/app/src/main/java/com/discord/gateway/rest/RestClient.java
@@ -30,11 +30,11 @@ public final class RestClient {
         if (restApi2 == null) {
             m.throwUninitializedPropertyAccessException("restApi");
         }
-        Observable<ModelGateway> W = restApi2.getGateway().W(a.c());
-        m.checkNotNullExpressionValue(W, "restApi\n          .getGa…scribeOn(Schedulers.io())");
-        Observable<String> E = RetryWithDelay.restRetry$default(retryWithDelay, W, 0, null, null, 7, null).E(RestClient$getGateway$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "restApi\n          .getGa…          .map { it.url }");
-        return E;
+        Observable<ModelGateway> X = restApi2.getGateway().X(a.c());
+        m.checkNotNullExpressionValue(X, "restApi\n          .getGa…scribeOn(Schedulers.io())");
+        Observable<String> F = RetryWithDelay.restRetry$default(retryWithDelay, X, 0, null, null, 7, null).F(RestClient$getGateway$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restApi\n          .getGa…          .map { it.url }");
+        return F;
     }
 
     public final void init(RestConfig restConfig, Context context) {
diff --git a/app/src/main/java/com/discord/i18n/Hook.java b/app/src/main/java/com/discord/i18n/Hook.java
index 54dfed47e6..276f19b421 100644
--- a/app/src/main/java/com/discord/i18n/Hook.java
+++ b/app/src/main/java/com/discord/i18n/Hook.java
@@ -14,7 +14,7 @@ public final class Hook {
     public CharSequence b;
 
     /* renamed from: c  reason: collision with root package name */
-    public a f2505c;
+    public a f2503c;
 
     /* compiled from: Hook.kt */
     public static final class a {
diff --git a/app/src/main/java/com/discord/i18n/RenderContext.java b/app/src/main/java/com/discord/i18n/RenderContext.java
index dba36e4ff9..24f8333cdb 100644
--- a/app/src/main/java/com/discord/i18n/RenderContext.java
+++ b/app/src/main/java/com/discord/i18n/RenderContext.java
@@ -18,7 +18,7 @@ public final class RenderContext {
     public final Map<String, Hook> b = new HashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public List<? extends Object> f2506c;
+    public List<? extends Object> f2504c;
     @ColorInt
     public Integer d;
     @ColorInt
@@ -45,7 +45,7 @@ public final class RenderContext {
             d dVar = new d(this);
             Objects.requireNonNull(hook2);
             m.checkNotNullParameter(dVar, "onClick");
-            hook2.f2505c = new Hook.a(null, dVar);
+            hook2.f2503c = new Hook.a(null, dVar);
             return Unit.a;
         }
     }
diff --git a/app/src/main/java/com/discord/models/commands/Application.java b/app/src/main/java/com/discord/models/commands/Application.java
index 7e94a654c1..bf760c04f8 100644
--- a/app/src/main/java/com/discord/models/commands/Application.java
+++ b/app/src/main/java/com/discord/models/commands/Application.java
@@ -15,12 +15,12 @@ public final class Application {
     private final Integer iconRes;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2507id;
+    private final long f2505id;
     private final String name;
 
     public Application(long j, String str, String str2, Integer num, int i, User user, boolean z2) {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
-        this.f2507id = j;
+        this.f2505id = j;
         this.name = str;
         this.icon = str2;
         this.iconRes = num;
@@ -35,11 +35,11 @@ public final class Application {
     }
 
     public static /* synthetic */ Application copy$default(Application application, long j, String str, String str2, Integer num, int i, User user, boolean z2, int i2, Object obj) {
-        return application.copy((i2 & 1) != 0 ? application.f2507id : j, (i2 & 2) != 0 ? application.name : str, (i2 & 4) != 0 ? application.icon : str2, (i2 & 8) != 0 ? application.iconRes : num, (i2 & 16) != 0 ? application.commandCount : i, (i2 & 32) != 0 ? application.bot : user, (i2 & 64) != 0 ? application.builtIn : z2);
+        return application.copy((i2 & 1) != 0 ? application.f2505id : j, (i2 & 2) != 0 ? application.name : str, (i2 & 4) != 0 ? application.icon : str2, (i2 & 8) != 0 ? application.iconRes : num, (i2 & 16) != 0 ? application.commandCount : i, (i2 & 32) != 0 ? application.bot : user, (i2 & 64) != 0 ? application.builtIn : z2);
     }
 
     public final long component1() {
-        return this.f2507id;
+        return this.f2505id;
     }
 
     public final String component2() {
@@ -79,7 +79,7 @@ public final class Application {
             return false;
         }
         Application application = (Application) obj;
-        return this.f2507id == application.f2507id && m.areEqual(this.name, application.name) && m.areEqual(this.icon, application.icon) && m.areEqual(this.iconRes, application.iconRes) && this.commandCount == application.commandCount && m.areEqual(this.bot, application.bot) && this.builtIn == application.builtIn;
+        return this.f2505id == application.f2505id && m.areEqual(this.name, application.name) && m.areEqual(this.icon, application.icon) && m.areEqual(this.iconRes, application.iconRes) && this.commandCount == application.commandCount && m.areEqual(this.bot, application.bot) && this.builtIn == application.builtIn;
     }
 
     public final User getBot() {
@@ -103,7 +103,7 @@ public final class Application {
     }
 
     public final long getId() {
-        return this.f2507id;
+        return this.f2505id;
     }
 
     public final String getName() {
@@ -111,7 +111,7 @@ public final class Application {
     }
 
     public int hashCode() {
-        int a = b.a(this.f2507id) * 31;
+        int a = b.a(this.f2505id) * 31;
         String str = this.name;
         int i = 0;
         int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
@@ -136,7 +136,7 @@ public final class Application {
 
     public String toString() {
         StringBuilder O = a.O("Application(id=");
-        O.append(this.f2507id);
+        O.append(this.f2505id);
         O.append(", name=");
         O.append(this.name);
         O.append(", icon=");
diff --git a/app/src/main/java/com/discord/models/commands/ApplicationCommand.java b/app/src/main/java/com/discord/models/commands/ApplicationCommand.java
index c5c7124091..4008a10481 100644
--- a/app/src/main/java/com/discord/models/commands/ApplicationCommand.java
+++ b/app/src/main/java/com/discord/models/commands/ApplicationCommand.java
@@ -15,7 +15,7 @@ public abstract class ApplicationCommand {
     private final Long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2508id;
+    private final String f2506id;
     private final String name;
     private final List<ApplicationCommandOption> options;
     private final Map<Long, Boolean> permissions;
@@ -24,7 +24,7 @@ public abstract class ApplicationCommand {
     /* JADX DEBUG: Multi-variable search result rejected for r13v0, resolved type: kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String, ? extends java.lang.Object>, java.lang.String> */
     /* JADX WARN: Multi-variable type inference failed */
     private ApplicationCommand(String str, long j, String str2, String str3, Integer num, List<ApplicationCommandOption> list, boolean z2, Long l, String str4, Boolean bool, Map<Long, Boolean> map, Function1<? super Map<String, ? extends Object>, String> function1) {
-        this.f2508id = str;
+        this.f2506id = str;
         this.applicationId = j;
         this.name = str2;
         this.description = str3;
@@ -72,7 +72,7 @@ public abstract class ApplicationCommand {
     }
 
     public final String getId() {
-        return this.f2508id;
+        return this.f2506id;
     }
 
     public final String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/Harvest.java b/app/src/main/java/com/discord/models/domain/Harvest.java
index c2bd277116..f2d0df1faf 100644
--- a/app/src/main/java/com/discord/models/domain/Harvest.java
+++ b/app/src/main/java/com/discord/models/domain/Harvest.java
@@ -11,13 +11,13 @@ public final class Harvest {
     private final String createdAt;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2509id;
+    private final String f2507id;
     private final long userId;
 
     public Harvest(String str, long j, String str2, String str3) {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "createdAt");
-        this.f2509id = str;
+        this.f2507id = str;
         this.userId = j;
         this.createdAt = str2;
         this.completedAt = str3;
@@ -32,7 +32,7 @@ public final class Harvest {
 
     public static /* synthetic */ Harvest copy$default(Harvest harvest, String str, long j, String str2, String str3, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = harvest.f2509id;
+            str = harvest.f2507id;
         }
         if ((i & 2) != 0) {
             j = harvest.userId;
@@ -55,7 +55,7 @@ public final class Harvest {
     }
 
     public final String component1() {
-        return this.f2509id;
+        return this.f2507id;
     }
 
     public final long component2() {
@@ -84,7 +84,7 @@ public final class Harvest {
             return false;
         }
         Harvest harvest = (Harvest) obj;
-        return m.areEqual(this.f2509id, harvest.f2509id) && this.userId == harvest.userId && m.areEqual(this.createdAt, harvest.createdAt) && m.areEqual(this.completedAt, harvest.completedAt);
+        return m.areEqual(this.f2507id, harvest.f2507id) && this.userId == harvest.userId && m.areEqual(this.createdAt, harvest.createdAt) && m.areEqual(this.completedAt, harvest.completedAt);
     }
 
     public final String getCompletedAt() {
@@ -96,7 +96,7 @@ public final class Harvest {
     }
 
     public final String getId() {
-        return this.f2509id;
+        return this.f2507id;
     }
 
     public final long getUserId() {
@@ -104,7 +104,7 @@ public final class Harvest {
     }
 
     public int hashCode() {
-        String str = this.f2509id;
+        String str = this.f2507id;
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
         long j = this.userId;
@@ -124,7 +124,7 @@ public final class Harvest {
 
     public String toString() {
         StringBuilder O = a.O("Harvest(id=");
-        O.append(this.f2509id);
+        O.append(this.f2507id);
         O.append(", userId=");
         O.append(this.userId);
         O.append(", createdAt=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
index d5442abbf7..d1ae2f24ea 100644
--- a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
+++ b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
@@ -132,7 +132,7 @@ public class ModelAuditLogEntry implements Model {
     private Long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2510id;
+    private long f2508id;
     private Options options;
     private String reason;
     private long targetId;
@@ -301,7 +301,7 @@ public class ModelAuditLogEntry implements Model {
     public static class ChangeNameId implements Model {
 
         /* renamed from: id  reason: collision with root package name */
-        private long f2511id;
+        private long f2509id;
         private String name;
 
         @Override // com.discord.models.domain.Model
@@ -309,7 +309,7 @@ public class ModelAuditLogEntry implements Model {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
             if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
-                this.f2511id = jsonReader.nextLong(this.f2511id);
+                this.f2509id = jsonReader.nextLong(this.f2509id);
             } else if (!nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                 jsonReader.skipValue();
             } else {
@@ -338,7 +338,7 @@ public class ModelAuditLogEntry implements Model {
         }
 
         public long getId() {
-            return this.f2511id;
+            return this.f2509id;
         }
 
         public String getName() {
@@ -367,7 +367,7 @@ public class ModelAuditLogEntry implements Model {
         private int deleteMemberDays;
 
         /* renamed from: id  reason: collision with root package name */
-        private long f2512id;
+        private long f2510id;
         private int membersRemoved;
         private String roleName;
         private int type;
@@ -435,7 +435,7 @@ public class ModelAuditLogEntry implements Model {
                     this.deleteMemberDays = jsonReader.nextInt(this.deleteMemberDays);
                     return;
                 case 3:
-                    this.f2512id = jsonReader.nextLong(this.f2512id);
+                    this.f2510id = jsonReader.nextLong(this.f2510id);
                     return;
                 case 4:
                     this.type = jsonReader.nextInt(this.type);
@@ -485,7 +485,7 @@ public class ModelAuditLogEntry implements Model {
         }
 
         public long getId() {
-            return this.f2512id;
+            return this.f2510id;
         }
 
         public int getMembersRemoved() {
@@ -576,7 +576,7 @@ public class ModelAuditLogEntry implements Model {
     }
 
     public ModelAuditLogEntry(long j, int i, long j2, long j3, List<Change> list, Options options, long j4, Long l) {
-        this.f2510id = j;
+        this.f2508id = j;
         this.actionTypeId = i;
         this.targetId = j2;
         this.userId = j3;
@@ -766,7 +766,7 @@ public class ModelAuditLogEntry implements Model {
                 this.userId = jsonReader.nextLong(this.userId);
                 return;
             case 4:
-                this.f2510id = jsonReader.nextLong(this.f2510id);
+                this.f2508id = jsonReader.nextLong(this.f2508id);
                 return;
             case 5:
                 this.changes = jsonReader.nextList(new h(jsonReader));
@@ -837,7 +837,7 @@ public class ModelAuditLogEntry implements Model {
     }
 
     public long getId() {
-        return this.f2510id;
+        return this.f2508id;
     }
 
     public Options getOptions() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
index 868e549a06..6332c8187e 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
@@ -14,7 +14,7 @@ public final class ModelConnectedAccount implements Model {
     @NonNull
 
     /* renamed from: id  reason: collision with root package name */
-    private String f2513id;
+    private String f2511id;
     private List<ModelConnectedAccountIntegration> integrations;
     private boolean revoked;
     private boolean showActivity;
@@ -97,7 +97,7 @@ public final class ModelConnectedAccount implements Model {
                 this.verified = jsonReader.nextBoolean(this.verified);
                 return;
             case 1:
-                this.f2513id = jsonReader.nextString(this.f2513id);
+                this.f2511id = jsonReader.nextString(this.f2511id);
                 return;
             case 2:
                 this.username = jsonReader.nextString(this.username);
@@ -159,7 +159,7 @@ public final class ModelConnectedAccount implements Model {
 
     @NonNull
     public String getId() {
-        return this.f2513id;
+        return this.f2511id;
     }
 
     public List<ModelConnectedAccountIntegration> getIntegrations() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
index 35241b40ff..25555690c0 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
@@ -20,7 +20,7 @@ public final class ModelConnectedAccountIntegration {
     private final ModelConnectedIntegrationGuild guild;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2514id;
+    private final String f2512id;
     private final String type;
 
     /* compiled from: ModelConnectedAccountIntegration.kt */
@@ -59,7 +59,7 @@ public final class ModelConnectedAccountIntegration {
 
     public ModelConnectedAccountIntegration(String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild) {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
-        this.f2514id = str;
+        this.f2512id = str;
         this.type = str2;
         this.account = modelConnectedIntegrationAccount;
         this.guild = modelConnectedIntegrationGuild;
@@ -67,7 +67,7 @@ public final class ModelConnectedAccountIntegration {
 
     public static /* synthetic */ ModelConnectedAccountIntegration copy$default(ModelConnectedAccountIntegration modelConnectedAccountIntegration, String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelConnectedAccountIntegration.f2514id;
+            str = modelConnectedAccountIntegration.f2512id;
         }
         if ((i & 2) != 0) {
             str2 = modelConnectedAccountIntegration.type;
@@ -82,7 +82,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public final String component1() {
-        return this.f2514id;
+        return this.f2512id;
     }
 
     public final String component2() {
@@ -110,7 +110,7 @@ public final class ModelConnectedAccountIntegration {
             return false;
         }
         ModelConnectedAccountIntegration modelConnectedAccountIntegration = (ModelConnectedAccountIntegration) obj;
-        return m.areEqual(this.f2514id, modelConnectedAccountIntegration.f2514id) && m.areEqual(this.type, modelConnectedAccountIntegration.type) && m.areEqual(this.account, modelConnectedAccountIntegration.account) && m.areEqual(this.guild, modelConnectedAccountIntegration.guild);
+        return m.areEqual(this.f2512id, modelConnectedAccountIntegration.f2512id) && m.areEqual(this.type, modelConnectedAccountIntegration.type) && m.areEqual(this.account, modelConnectedAccountIntegration.account) && m.areEqual(this.guild, modelConnectedAccountIntegration.guild);
     }
 
     public final ModelConnectedIntegrationAccount getAccount() {
@@ -149,7 +149,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public final String getId() {
-        return this.f2514id;
+        return this.f2512id;
     }
 
     public final String getType() {
@@ -157,7 +157,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public int hashCode() {
-        String str = this.f2514id;
+        String str = this.f2512id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.type;
@@ -173,7 +173,7 @@ public final class ModelConnectedAccountIntegration {
 
     public String toString() {
         StringBuilder O = c.d.b.a.a.O("ModelConnectedAccountIntegration(id=");
-        O.append(this.f2514id);
+        O.append(this.f2512id);
         O.append(", type=");
         O.append(this.type);
         O.append(", account=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
index 61679e0cc4..d369a90ea3 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
@@ -11,7 +11,7 @@ import kotlin.reflect.KProperty;
 public final class ModelConnectedIntegrationAccount {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2515id;
+    private final String f2513id;
     private final String name;
 
     /* compiled from: ModelConnectedIntegrationAccount.kt */
@@ -39,13 +39,13 @@ public final class ModelConnectedIntegrationAccount {
     public ModelConnectedIntegrationAccount(String str, String str2) {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
-        this.f2515id = str;
+        this.f2513id = str;
         this.name = str2;
     }
 
     public static /* synthetic */ ModelConnectedIntegrationAccount copy$default(ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, String str, String str2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelConnectedIntegrationAccount.f2515id;
+            str = modelConnectedIntegrationAccount.f2513id;
         }
         if ((i & 2) != 0) {
             str2 = modelConnectedIntegrationAccount.name;
@@ -54,7 +54,7 @@ public final class ModelConnectedIntegrationAccount {
     }
 
     public final String component1() {
-        return this.f2515id;
+        return this.f2513id;
     }
 
     public final String component2() {
@@ -75,11 +75,11 @@ public final class ModelConnectedIntegrationAccount {
             return false;
         }
         ModelConnectedIntegrationAccount modelConnectedIntegrationAccount = (ModelConnectedIntegrationAccount) obj;
-        return m.areEqual(this.f2515id, modelConnectedIntegrationAccount.f2515id) && m.areEqual(this.name, modelConnectedIntegrationAccount.name);
+        return m.areEqual(this.f2513id, modelConnectedIntegrationAccount.f2513id) && m.areEqual(this.name, modelConnectedIntegrationAccount.name);
     }
 
     public final String getId() {
-        return this.f2515id;
+        return this.f2513id;
     }
 
     public final String getName() {
@@ -87,7 +87,7 @@ public final class ModelConnectedIntegrationAccount {
     }
 
     public int hashCode() {
-        String str = this.f2515id;
+        String str = this.f2513id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -99,7 +99,7 @@ public final class ModelConnectedIntegrationAccount {
 
     public String toString() {
         StringBuilder O = c.d.b.a.a.O("ModelConnectedIntegrationAccount(id=");
-        O.append(this.f2515id);
+        O.append(this.f2513id);
         O.append(", name=");
         return c.d.b.a.a.G(O, this.name, ")");
     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
index de0b20eabb..1fca6a85ea 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
@@ -14,7 +14,7 @@ public final class ModelConnectedIntegrationGuild {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2516id;
+    private final long f2514id;
     private final String name;
 
     /* compiled from: ModelConnectedIntegrationGuild.kt */
@@ -40,7 +40,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public ModelConnectedIntegrationGuild(long j, String str, String str2) {
-        this.f2516id = j;
+        this.f2514id = j;
         this.icon = str;
         this.name = str2;
     }
@@ -52,7 +52,7 @@ public final class ModelConnectedIntegrationGuild {
 
     public static /* synthetic */ ModelConnectedIntegrationGuild copy$default(ModelConnectedIntegrationGuild modelConnectedIntegrationGuild, long j, String str, String str2, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelConnectedIntegrationGuild.f2516id;
+            j = modelConnectedIntegrationGuild.f2514id;
         }
         if ((i & 2) != 0) {
             str = modelConnectedIntegrationGuild.icon;
@@ -64,7 +64,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public final long component1() {
-        return this.f2516id;
+        return this.f2514id;
     }
 
     public final String component2() {
@@ -87,7 +87,7 @@ public final class ModelConnectedIntegrationGuild {
             return false;
         }
         ModelConnectedIntegrationGuild modelConnectedIntegrationGuild = (ModelConnectedIntegrationGuild) obj;
-        return this.f2516id == modelConnectedIntegrationGuild.f2516id && m.areEqual(this.icon, modelConnectedIntegrationGuild.icon) && m.areEqual(this.name, modelConnectedIntegrationGuild.name);
+        return this.f2514id == modelConnectedIntegrationGuild.f2514id && m.areEqual(this.icon, modelConnectedIntegrationGuild.icon) && m.areEqual(this.name, modelConnectedIntegrationGuild.name);
     }
 
     public final String getIcon() {
@@ -95,7 +95,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public final long getId() {
-        return this.f2516id;
+        return this.f2514id;
     }
 
     public final String getName() {
@@ -103,7 +103,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public int hashCode() {
-        long j = this.f2516id;
+        long j = this.f2514id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.icon;
         int i2 = 0;
@@ -117,7 +117,7 @@ public final class ModelConnectedIntegrationGuild {
 
     public String toString() {
         StringBuilder O = c.d.b.a.a.O("ModelConnectedIntegrationGuild(id=");
-        O.append(this.f2516id);
+        O.append(this.f2514id);
         O.append(", icon=");
         O.append(this.icon);
         O.append(", name=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelEntitlement.java b/app/src/main/java/com/discord/models/domain/ModelEntitlement.java
index 59e67a0028..0d43f283b5 100644
--- a/app/src/main/java/com/discord/models/domain/ModelEntitlement.java
+++ b/app/src/main/java/com/discord/models/domain/ModelEntitlement.java
@@ -9,7 +9,7 @@ public final class ModelEntitlement {
     private final Boolean consumed;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2517id;
+    private final long f2515id;
     private final Long parentId;
     private final Long promotionId;
     private final ModelSku sku;
@@ -20,7 +20,7 @@ public final class ModelEntitlement {
 
     public ModelEntitlement(long j, long j2, int i, long j3, long j4, ModelSku modelSku, SubscriptionPlan subscriptionPlan, Long l, Boolean bool, Long l2) {
         m.checkNotNullParameter(modelSku, "sku");
-        this.f2517id = j;
+        this.f2515id = j;
         this.applicationId = j2;
         this.type = i;
         this.userId = j3;
@@ -33,11 +33,11 @@ public final class ModelEntitlement {
     }
 
     public static /* synthetic */ ModelEntitlement copy$default(ModelEntitlement modelEntitlement, long j, long j2, int i, long j3, long j4, ModelSku modelSku, SubscriptionPlan subscriptionPlan, Long l, Boolean bool, Long l2, int i2, Object obj) {
-        return modelEntitlement.copy((i2 & 1) != 0 ? modelEntitlement.f2517id : j, (i2 & 2) != 0 ? modelEntitlement.applicationId : j2, (i2 & 4) != 0 ? modelEntitlement.type : i, (i2 & 8) != 0 ? modelEntitlement.userId : j3, (i2 & 16) != 0 ? modelEntitlement.skuId : j4, (i2 & 32) != 0 ? modelEntitlement.sku : modelSku, (i2 & 64) != 0 ? modelEntitlement.subscriptionPlan : subscriptionPlan, (i2 & 128) != 0 ? modelEntitlement.parentId : l, (i2 & 256) != 0 ? modelEntitlement.consumed : bool, (i2 & 512) != 0 ? modelEntitlement.promotionId : l2);
+        return modelEntitlement.copy((i2 & 1) != 0 ? modelEntitlement.f2515id : j, (i2 & 2) != 0 ? modelEntitlement.applicationId : j2, (i2 & 4) != 0 ? modelEntitlement.type : i, (i2 & 8) != 0 ? modelEntitlement.userId : j3, (i2 & 16) != 0 ? modelEntitlement.skuId : j4, (i2 & 32) != 0 ? modelEntitlement.sku : modelSku, (i2 & 64) != 0 ? modelEntitlement.subscriptionPlan : subscriptionPlan, (i2 & 128) != 0 ? modelEntitlement.parentId : l, (i2 & 256) != 0 ? modelEntitlement.consumed : bool, (i2 & 512) != 0 ? modelEntitlement.promotionId : l2);
     }
 
     public final long component1() {
-        return this.f2517id;
+        return this.f2515id;
     }
 
     public final Long component10() {
@@ -89,7 +89,7 @@ public final class ModelEntitlement {
             return false;
         }
         ModelEntitlement modelEntitlement = (ModelEntitlement) obj;
-        return this.f2517id == modelEntitlement.f2517id && this.applicationId == modelEntitlement.applicationId && this.type == modelEntitlement.type && this.userId == modelEntitlement.userId && this.skuId == modelEntitlement.skuId && m.areEqual(this.sku, modelEntitlement.sku) && m.areEqual(this.subscriptionPlan, modelEntitlement.subscriptionPlan) && m.areEqual(this.parentId, modelEntitlement.parentId) && m.areEqual(this.consumed, modelEntitlement.consumed) && m.areEqual(this.promotionId, modelEntitlement.promotionId);
+        return this.f2515id == modelEntitlement.f2515id && this.applicationId == modelEntitlement.applicationId && this.type == modelEntitlement.type && this.userId == modelEntitlement.userId && this.skuId == modelEntitlement.skuId && m.areEqual(this.sku, modelEntitlement.sku) && m.areEqual(this.subscriptionPlan, modelEntitlement.subscriptionPlan) && m.areEqual(this.parentId, modelEntitlement.parentId) && m.areEqual(this.consumed, modelEntitlement.consumed) && m.areEqual(this.promotionId, modelEntitlement.promotionId);
     }
 
     public final long getApplicationId() {
@@ -101,7 +101,7 @@ public final class ModelEntitlement {
     }
 
     public final long getId() {
-        return this.f2517id;
+        return this.f2515id;
     }
 
     public final Long getParentId() {
@@ -133,7 +133,7 @@ public final class ModelEntitlement {
     }
 
     public int hashCode() {
-        long j = this.f2517id;
+        long j = this.f2515id;
         long j2 = this.applicationId;
         long j3 = this.userId;
         long j4 = this.skuId;
@@ -156,7 +156,7 @@ public final class ModelEntitlement {
 
     public String toString() {
         StringBuilder O = a.O("ModelEntitlement(id=");
-        O.append(this.f2517id);
+        O.append(this.f2515id);
         O.append(", applicationId=");
         O.append(this.applicationId);
         O.append(", type=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java b/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java
index d8e208a644..aaa796f2aa 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java
@@ -12,7 +12,7 @@ public final class ModelGuildFolder {
     private final List<Long> guildIds;
 
     /* renamed from: id  reason: collision with root package name */
-    private final Long f2518id;
+    private final Long f2516id;
     private final String name;
 
     /* compiled from: ModelGuildFolder.kt */
@@ -41,7 +41,7 @@ public final class ModelGuildFolder {
 
     public ModelGuildFolder(Long l, List<Long> list, Integer num, String str) {
         m.checkNotNullParameter(list, "guildIds");
-        this.f2518id = l;
+        this.f2516id = l;
         this.guildIds = list;
         this.color = num;
         this.name = str;
@@ -56,7 +56,7 @@ public final class ModelGuildFolder {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelGuildFolder copy$default(ModelGuildFolder modelGuildFolder, Long l, List list, Integer num, String str, int i, Object obj) {
         if ((i & 1) != 0) {
-            l = modelGuildFolder.f2518id;
+            l = modelGuildFolder.f2516id;
         }
         if ((i & 2) != 0) {
             list = modelGuildFolder.guildIds;
@@ -71,7 +71,7 @@ public final class ModelGuildFolder {
     }
 
     public final Long component1() {
-        return this.f2518id;
+        return this.f2516id;
     }
 
     public final List<Long> component2() {
@@ -99,7 +99,7 @@ public final class ModelGuildFolder {
             return false;
         }
         ModelGuildFolder modelGuildFolder = (ModelGuildFolder) obj;
-        return m.areEqual(this.f2518id, modelGuildFolder.f2518id) && m.areEqual(this.guildIds, modelGuildFolder.guildIds) && m.areEqual(this.color, modelGuildFolder.color) && m.areEqual(this.name, modelGuildFolder.name);
+        return m.areEqual(this.f2516id, modelGuildFolder.f2516id) && m.areEqual(this.guildIds, modelGuildFolder.guildIds) && m.areEqual(this.color, modelGuildFolder.color) && m.areEqual(this.name, modelGuildFolder.name);
     }
 
     public final Integer getColor() {
@@ -111,7 +111,7 @@ public final class ModelGuildFolder {
     }
 
     public final Long getId() {
-        return this.f2518id;
+        return this.f2516id;
     }
 
     public final String getName() {
@@ -119,7 +119,7 @@ public final class ModelGuildFolder {
     }
 
     public int hashCode() {
-        Long l = this.f2518id;
+        Long l = this.f2516id;
         int i = 0;
         int hashCode = (l != null ? l.hashCode() : 0) * 31;
         List<Long> list = this.guildIds;
@@ -135,7 +135,7 @@ public final class ModelGuildFolder {
 
     public String toString() {
         StringBuilder O = a.O("ModelGuildFolder(id=");
-        O.append(this.f2518id);
+        O.append(this.f2516id);
         O.append(", guildIds=");
         O.append(this.guildIds);
         O.append(", color=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
index e0ac3a529b..1507aed23f 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
@@ -17,7 +17,7 @@ public class ModelGuildIntegration implements Model {
     private int expireGracePeriod;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2519id;
+    private long f2517id;
     private String name;
     private long roleId;
     private int subscriberCount;
@@ -29,7 +29,7 @@ public class ModelGuildIntegration implements Model {
     public static class IntegrationAccount implements Model {
 
         /* renamed from: id  reason: collision with root package name */
-        private String f2520id;
+        private String f2518id;
         private String name;
 
         @Override // com.discord.models.domain.Model
@@ -37,7 +37,7 @@ public class ModelGuildIntegration implements Model {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
             if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
-                this.f2520id = jsonReader.nextString(this.f2520id);
+                this.f2518id = jsonReader.nextString(this.f2518id);
             } else if (!nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                 jsonReader.skipValue();
             } else {
@@ -71,7 +71,7 @@ public class ModelGuildIntegration implements Model {
         }
 
         public String getId() {
-            return this.f2520id;
+            return this.f2518id;
         }
 
         public String getName() {
@@ -248,7 +248,7 @@ public class ModelGuildIntegration implements Model {
                 this.expireBehavior = jsonReader.nextInt(this.expireBehavior);
                 return;
             case 5:
-                this.f2519id = jsonReader.nextLong(this.f2519id);
+                this.f2517id = jsonReader.nextLong(this.f2517id);
                 return;
             case 6:
                 this.name = jsonReader.nextString(this.name);
@@ -339,7 +339,7 @@ public class ModelGuildIntegration implements Model {
     }
 
     public long getId() {
-        return this.f2519id;
+        return this.f2517id;
     }
 
     public String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
index 6c92a3bec3..8be16a51e5 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
@@ -18,7 +18,7 @@ public final class ModelGuildMemberListUpdate {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2521id;
+    private final String f2519id;
     private final List<Operation> operations;
 
     /* compiled from: ModelGuildMemberListUpdate.kt */
@@ -36,7 +36,7 @@ public final class ModelGuildMemberListUpdate {
         private final int count;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2522id;
+        private final String f2520id;
         private final Type type;
 
         /* compiled from: ModelGuildMemberListUpdate.kt */
@@ -68,7 +68,7 @@ public final class ModelGuildMemberListUpdate {
         public Group(String str, int i) {
             Type type;
             m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
-            this.f2522id = str;
+            this.f2520id = str;
             this.count = i;
             int hashCode = str.hashCode();
             if (hashCode != -1548612125) {
@@ -86,7 +86,7 @@ public final class ModelGuildMemberListUpdate {
 
         public static /* synthetic */ Group copy$default(Group group, String str, int i, int i2, Object obj) {
             if ((i2 & 1) != 0) {
-                str = group.f2522id;
+                str = group.f2520id;
             }
             if ((i2 & 2) != 0) {
                 i = group.count;
@@ -95,7 +95,7 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public final String component1() {
-            return this.f2522id;
+            return this.f2520id;
         }
 
         public final int component2() {
@@ -115,7 +115,7 @@ public final class ModelGuildMemberListUpdate {
                 return false;
             }
             Group group = (Group) obj;
-            return m.areEqual(this.f2522id, group.f2522id) && this.count == group.count;
+            return m.areEqual(this.f2520id, group.f2520id) && this.count == group.count;
         }
 
         public final int getCount() {
@@ -123,7 +123,7 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public final String getId() {
-            return this.f2522id;
+            return this.f2520id;
         }
 
         public final Type getType() {
@@ -131,13 +131,13 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public int hashCode() {
-            String str = this.f2522id;
+            String str = this.f2520id;
             return ((str != null ? str.hashCode() : 0) * 31) + this.count;
         }
 
         public String toString() {
             StringBuilder O = a.O("Group(id=");
-            O.append(this.f2522id);
+            O.append(this.f2520id);
             O.append(", count=");
             return a.z(O, this.count, ")");
         }
@@ -757,7 +757,7 @@ public final class ModelGuildMemberListUpdate {
         m.checkNotNullParameter(list, "operations");
         m.checkNotNullParameter(list2, "groups");
         this.guildId = j;
-        this.f2521id = str;
+        this.f2519id = str;
         this.operations = list;
         this.groups = list2;
     }
@@ -769,7 +769,7 @@ public final class ModelGuildMemberListUpdate {
             j = modelGuildMemberListUpdate.guildId;
         }
         if ((i & 2) != 0) {
-            str = modelGuildMemberListUpdate.f2521id;
+            str = modelGuildMemberListUpdate.f2519id;
         }
         if ((i & 4) != 0) {
             list = modelGuildMemberListUpdate.operations;
@@ -785,7 +785,7 @@ public final class ModelGuildMemberListUpdate {
     }
 
     public final String component2() {
-        return this.f2521id;
+        return this.f2519id;
     }
 
     public final List<Operation> component3() {
@@ -811,7 +811,7 @@ public final class ModelGuildMemberListUpdate {
             return false;
         }
         ModelGuildMemberListUpdate modelGuildMemberListUpdate = (ModelGuildMemberListUpdate) obj;
-        return this.guildId == modelGuildMemberListUpdate.guildId && m.areEqual(this.f2521id, modelGuildMemberListUpdate.f2521id) && m.areEqual(this.operations, modelGuildMemberListUpdate.operations) && m.areEqual(this.groups, modelGuildMemberListUpdate.groups);
+        return this.guildId == modelGuildMemberListUpdate.guildId && m.areEqual(this.f2519id, modelGuildMemberListUpdate.f2519id) && m.areEqual(this.operations, modelGuildMemberListUpdate.operations) && m.areEqual(this.groups, modelGuildMemberListUpdate.groups);
     }
 
     public final List<Group> getGroups() {
@@ -823,7 +823,7 @@ public final class ModelGuildMemberListUpdate {
     }
 
     public final String getId() {
-        return this.f2521id;
+        return this.f2519id;
     }
 
     public final List<Operation> getOperations() {
@@ -833,7 +833,7 @@ public final class ModelGuildMemberListUpdate {
     public int hashCode() {
         long j = this.guildId;
         int i = ((int) (j ^ (j >>> 32))) * 31;
-        String str = this.f2521id;
+        String str = this.f2519id;
         int i2 = 0;
         int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31;
         List<Operation> list = this.operations;
@@ -849,7 +849,7 @@ public final class ModelGuildMemberListUpdate {
         StringBuilder O = a.O("ModelGuildMemberListUpdate(guildId=");
         O.append(this.guildId);
         O.append(", id=");
-        O.append(this.f2521id);
+        O.append(this.f2519id);
         O.append(", operations=");
         O.append(this.operations);
         O.append(", groups=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java b/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java
index bc28d3af62..f0bce4bd43 100644
--- a/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java
+++ b/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java
@@ -10,7 +10,7 @@ public final class ModelOAuth2Token {
     private final Application application;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2523id;
+    private final long f2521id;
     private final List<OAuthScope> scopes;
 
     /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List<? extends com.discord.api.auth.OAuthScope> */
@@ -18,7 +18,7 @@ public final class ModelOAuth2Token {
     public ModelOAuth2Token(long j, List<? extends OAuthScope> list, Application application) {
         m.checkNotNullParameter(list, "scopes");
         m.checkNotNullParameter(application, "application");
-        this.f2523id = j;
+        this.f2521id = j;
         this.scopes = list;
         this.application = application;
     }
@@ -27,7 +27,7 @@ public final class ModelOAuth2Token {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelOAuth2Token copy$default(ModelOAuth2Token modelOAuth2Token, long j, List list, Application application, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelOAuth2Token.f2523id;
+            j = modelOAuth2Token.f2521id;
         }
         if ((i & 2) != 0) {
             list = modelOAuth2Token.scopes;
@@ -39,7 +39,7 @@ public final class ModelOAuth2Token {
     }
 
     public final long component1() {
-        return this.f2523id;
+        return this.f2521id;
     }
 
     public final List<OAuthScope> component2() {
@@ -64,7 +64,7 @@ public final class ModelOAuth2Token {
             return false;
         }
         ModelOAuth2Token modelOAuth2Token = (ModelOAuth2Token) obj;
-        return this.f2523id == modelOAuth2Token.f2523id && m.areEqual(this.scopes, modelOAuth2Token.scopes) && m.areEqual(this.application, modelOAuth2Token.application);
+        return this.f2521id == modelOAuth2Token.f2521id && m.areEqual(this.scopes, modelOAuth2Token.scopes) && m.areEqual(this.application, modelOAuth2Token.application);
     }
 
     public final Application getApplication() {
@@ -72,7 +72,7 @@ public final class ModelOAuth2Token {
     }
 
     public final long getId() {
-        return this.f2523id;
+        return this.f2521id;
     }
 
     public final List<OAuthScope> getScopes() {
@@ -80,7 +80,7 @@ public final class ModelOAuth2Token {
     }
 
     public int hashCode() {
-        long j = this.f2523id;
+        long j = this.f2521id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         List<OAuthScope> list = this.scopes;
         int i2 = 0;
@@ -94,7 +94,7 @@ public final class ModelOAuth2Token {
 
     public String toString() {
         StringBuilder O = a.O("ModelOAuth2Token(id=");
-        O.append(this.f2523id);
+        O.append(this.f2521id);
         O.append(", scopes=");
         O.append(this.scopes);
         O.append(", application=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelPayload.java b/app/src/main/java/com/discord/models/domain/ModelPayload.java
index 4d52fc70bf..76337e4a94 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPayload.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPayload.java
@@ -49,7 +49,7 @@ public class ModelPayload implements Model {
     private List<Guild> guilds;
 
     /* renamed from: me  reason: collision with root package name */
-    private User f2524me;
+    private User f2522me;
     private List<Presence> presences;
     private List<Channel> privateChannels;
     private VersionedReadStates readState;
@@ -329,7 +329,7 @@ public class ModelPayload implements Model {
 
     public ModelPayload(ModelPayload modelPayload) {
         this.v = modelPayload.v;
-        this.f2524me = modelPayload.f2524me;
+        this.f2522me = modelPayload.f2522me;
         this.userSettings = modelPayload.userSettings;
         this.userGuildSettings = modelPayload.userGuildSettings;
         this.sessionId = modelPayload.sessionId;
@@ -548,7 +548,7 @@ public class ModelPayload implements Model {
                 this.v = jsonReader.nextInt(this.v);
                 return;
             case '\n':
-                this.f2524me = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class);
+                this.f2522me = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class);
                 return;
             case 11:
                 this.users = jsonReader.nextList(new x(jsonReader));
@@ -762,7 +762,7 @@ public class ModelPayload implements Model {
     }
 
     public User getMe() {
-        return this.f2524me;
+        return this.f2522me;
     }
 
     public List<Presence> getPresences() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
index 4d4841a891..6955b2c7dc 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
@@ -16,7 +16,7 @@ public abstract class ModelPaymentSource {
     private final boolean f7default;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2525id;
+    private final String f2523id;
     private final boolean invalid;
 
     /* compiled from: ModelPaymentSource.kt */
@@ -62,7 +62,7 @@ public abstract class ModelPaymentSource {
         private final int expiresYear;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2526id;
+        private final String f2524id;
         private final boolean invalid;
         private final String last4;
 
@@ -77,7 +77,7 @@ public abstract class ModelPaymentSource {
             this.last4 = str2;
             this.expiresMonth = i;
             this.expiresYear = i2;
-            this.f2526id = str3;
+            this.f2524id = str3;
             this.invalid = z2;
             this.billingAddress = modelBillingAddress;
             this.f8default = z3;
@@ -162,7 +162,7 @@ public abstract class ModelPaymentSource {
 
         @Override // com.discord.models.domain.ModelPaymentSource
         public String getId() {
-            return this.f2526id;
+            return this.f2524id;
         }
 
         @Override // com.discord.models.domain.ModelPaymentSource
@@ -234,7 +234,7 @@ public abstract class ModelPaymentSource {
         private final String email;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2527id;
+        private final String f2525id;
         private final boolean invalid;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -244,7 +244,7 @@ public abstract class ModelPaymentSource {
             m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(modelBillingAddress, "billingAddress");
             this.email = str;
-            this.f2527id = str2;
+            this.f2525id = str2;
             this.invalid = z2;
             this.billingAddress = modelBillingAddress;
             this.f9default = z3;
@@ -323,7 +323,7 @@ public abstract class ModelPaymentSource {
 
         @Override // com.discord.models.domain.ModelPaymentSource
         public String getId() {
-            return this.f2527id;
+            return this.f2525id;
         }
 
         @Override // com.discord.models.domain.ModelPaymentSource
@@ -384,7 +384,7 @@ public abstract class ModelPaymentSource {
     }
 
     private ModelPaymentSource(String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3) {
-        this.f2525id = str;
+        this.f2523id = str;
         this.invalid = z2;
         this.billingAddress = modelBillingAddress;
         this.f7default = z3;
@@ -403,7 +403,7 @@ public abstract class ModelPaymentSource {
     }
 
     public String getId() {
-        return this.f2525id;
+        return this.f2523id;
     }
 
     public boolean getInvalid() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java
index 3ed460319d..001ce3b14d 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java
@@ -6,18 +6,18 @@ public final class ModelPremiumGuildSubscription {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2528id;
+    private final long f2526id;
     private final long userId;
 
     public ModelPremiumGuildSubscription(long j, long j2, long j3) {
-        this.f2528id = j;
+        this.f2526id = j;
         this.guildId = j2;
         this.userId = j3;
     }
 
     public static /* synthetic */ ModelPremiumGuildSubscription copy$default(ModelPremiumGuildSubscription modelPremiumGuildSubscription, long j, long j2, long j3, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelPremiumGuildSubscription.f2528id;
+            j = modelPremiumGuildSubscription.f2526id;
         }
         if ((i & 2) != 0) {
             j2 = modelPremiumGuildSubscription.guildId;
@@ -29,7 +29,7 @@ public final class ModelPremiumGuildSubscription {
     }
 
     public final long component1() {
-        return this.f2528id;
+        return this.f2526id;
     }
 
     public final long component2() {
@@ -52,7 +52,7 @@ public final class ModelPremiumGuildSubscription {
             return false;
         }
         ModelPremiumGuildSubscription modelPremiumGuildSubscription = (ModelPremiumGuildSubscription) obj;
-        return this.f2528id == modelPremiumGuildSubscription.f2528id && this.guildId == modelPremiumGuildSubscription.guildId && this.userId == modelPremiumGuildSubscription.userId;
+        return this.f2526id == modelPremiumGuildSubscription.f2526id && this.guildId == modelPremiumGuildSubscription.guildId && this.userId == modelPremiumGuildSubscription.userId;
     }
 
     public final long getGuildId() {
@@ -60,7 +60,7 @@ public final class ModelPremiumGuildSubscription {
     }
 
     public final long getId() {
-        return this.f2528id;
+        return this.f2526id;
     }
 
     public final long getUserId() {
@@ -68,7 +68,7 @@ public final class ModelPremiumGuildSubscription {
     }
 
     public int hashCode() {
-        long j = this.f2528id;
+        long j = this.f2526id;
         long j2 = this.guildId;
         long j3 = this.userId;
         return (((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)));
@@ -76,7 +76,7 @@ public final class ModelPremiumGuildSubscription {
 
     public String toString() {
         StringBuilder O = a.O("ModelPremiumGuildSubscription(id=");
-        O.append(this.f2528id);
+        O.append(this.f2526id);
         O.append(", guildId=");
         O.append(this.guildId);
         O.append(", userId=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java
index 4588337d21..ed05e8145d 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java
@@ -9,13 +9,13 @@ public final class ModelPremiumGuildSubscriptionSlot {
     private final String cooldownEndsAt;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2529id;
+    private final long f2527id;
     private final ModelPremiumGuildSubscription premiumGuildSubscription;
     private final long subscriptionId;
 
     public ModelPremiumGuildSubscriptionSlot(String str, long j, long j2, ModelPremiumGuildSubscription modelPremiumGuildSubscription, boolean z2) {
         this.cooldownEndsAt = str;
-        this.f2529id = j;
+        this.f2527id = j;
         this.subscriptionId = j2;
         this.premiumGuildSubscription = modelPremiumGuildSubscription;
         this.canceled = z2;
@@ -30,7 +30,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
             str = modelPremiumGuildSubscriptionSlot.cooldownEndsAt;
         }
         if ((i & 2) != 0) {
-            j = modelPremiumGuildSubscriptionSlot.f2529id;
+            j = modelPremiumGuildSubscriptionSlot.f2527id;
         }
         if ((i & 4) != 0) {
             j2 = modelPremiumGuildSubscriptionSlot.subscriptionId;
@@ -45,7 +45,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
     }
 
     public final long component2() {
-        return this.f2529id;
+        return this.f2527id;
     }
 
     public final long component3() {
@@ -72,7 +72,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
             return false;
         }
         ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot = (ModelPremiumGuildSubscriptionSlot) obj;
-        return m.areEqual(this.cooldownEndsAt, modelPremiumGuildSubscriptionSlot.cooldownEndsAt) && this.f2529id == modelPremiumGuildSubscriptionSlot.f2529id && this.subscriptionId == modelPremiumGuildSubscriptionSlot.subscriptionId && m.areEqual(this.premiumGuildSubscription, modelPremiumGuildSubscriptionSlot.premiumGuildSubscription) && this.canceled == modelPremiumGuildSubscriptionSlot.canceled;
+        return m.areEqual(this.cooldownEndsAt, modelPremiumGuildSubscriptionSlot.cooldownEndsAt) && this.f2527id == modelPremiumGuildSubscriptionSlot.f2527id && this.subscriptionId == modelPremiumGuildSubscriptionSlot.subscriptionId && m.areEqual(this.premiumGuildSubscription, modelPremiumGuildSubscriptionSlot.premiumGuildSubscription) && this.canceled == modelPremiumGuildSubscriptionSlot.canceled;
     }
 
     public final boolean getCanceled() {
@@ -84,7 +84,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
     }
 
     public final long getId() {
-        return this.f2529id;
+        return this.f2527id;
     }
 
     public final ModelPremiumGuildSubscription getPremiumGuildSubscription() {
@@ -99,7 +99,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
         String str = this.cooldownEndsAt;
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j = this.f2529id;
+        long j = this.f2527id;
         long j2 = this.subscriptionId;
         int i2 = ((((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         ModelPremiumGuildSubscription modelPremiumGuildSubscription = this.premiumGuildSubscription;
@@ -121,7 +121,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
         StringBuilder O = a.O("ModelPremiumGuildSubscriptionSlot(cooldownEndsAt=");
         O.append(this.cooldownEndsAt);
         O.append(", id=");
-        O.append(this.f2529id);
+        O.append(this.f2527id);
         O.append(", subscriptionId=");
         O.append(this.subscriptionId);
         O.append(", premiumGuildSubscription=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelSku.java b/app/src/main/java/com/discord/models/domain/ModelSku.java
index ed0f9e9f9b..c0b3de596e 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSku.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSku.java
@@ -16,7 +16,7 @@ public final class ModelSku {
     private final int flags;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2530id;
+    private final long f2528id;
     private final String name;
     private final boolean premium;
     private final Price price;
@@ -359,7 +359,7 @@ public final class ModelSku {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.applicationId = j;
         this.name = str;
-        this.f2530id = j2;
+        this.f2528id = j2;
         this.application = application;
         this.premium = z2;
         this.type = i;
@@ -369,7 +369,7 @@ public final class ModelSku {
     }
 
     public static /* synthetic */ ModelSku copy$default(ModelSku modelSku, long j, String str, long j2, Application application, boolean z2, int i, Price price, int i2, Map map, int i3, Object obj) {
-        return modelSku.copy((i3 & 1) != 0 ? modelSku.applicationId : j, (i3 & 2) != 0 ? modelSku.name : str, (i3 & 4) != 0 ? modelSku.f2530id : j2, (i3 & 8) != 0 ? modelSku.application : application, (i3 & 16) != 0 ? modelSku.premium : z2, (i3 & 32) != 0 ? modelSku.type : i, (i3 & 64) != 0 ? modelSku.price : price, (i3 & 128) != 0 ? modelSku.flags : i2, (i3 & 256) != 0 ? modelSku.externalSkuStrategies : map);
+        return modelSku.copy((i3 & 1) != 0 ? modelSku.applicationId : j, (i3 & 2) != 0 ? modelSku.name : str, (i3 & 4) != 0 ? modelSku.f2528id : j2, (i3 & 8) != 0 ? modelSku.application : application, (i3 & 16) != 0 ? modelSku.premium : z2, (i3 & 32) != 0 ? modelSku.type : i, (i3 & 64) != 0 ? modelSku.price : price, (i3 & 128) != 0 ? modelSku.flags : i2, (i3 & 256) != 0 ? modelSku.externalSkuStrategies : map);
     }
 
     public final long component1() {
@@ -381,7 +381,7 @@ public final class ModelSku {
     }
 
     public final long component3() {
-        return this.f2530id;
+        return this.f2528id;
     }
 
     public final Application component4() {
@@ -421,7 +421,7 @@ public final class ModelSku {
             return false;
         }
         ModelSku modelSku = (ModelSku) obj;
-        return this.applicationId == modelSku.applicationId && m.areEqual(this.name, modelSku.name) && this.f2530id == modelSku.f2530id && m.areEqual(this.application, modelSku.application) && this.premium == modelSku.premium && this.type == modelSku.type && m.areEqual(this.price, modelSku.price) && this.flags == modelSku.flags && m.areEqual(this.externalSkuStrategies, modelSku.externalSkuStrategies);
+        return this.applicationId == modelSku.applicationId && m.areEqual(this.name, modelSku.name) && this.f2528id == modelSku.f2528id && m.areEqual(this.application, modelSku.application) && this.premium == modelSku.premium && this.type == modelSku.type && m.areEqual(this.price, modelSku.price) && this.flags == modelSku.flags && m.areEqual(this.externalSkuStrategies, modelSku.externalSkuStrategies);
     }
 
     public final Application getApplication() {
@@ -441,7 +441,7 @@ public final class ModelSku {
     }
 
     public final long getId() {
-        return this.f2530id;
+        return this.f2528id;
     }
 
     public final String getName() {
@@ -457,7 +457,7 @@ public final class ModelSku {
     }
 
     public final SkuCategory getSkuCategory() {
-        long j = this.f2530id;
+        long j = this.f2528id;
         return j == ModelSkuKt.getPREMIUM_TIER_1_SKU_ID() ? SkuCategory.NITRO_CLASSIC : j == ModelSkuKt.getPREMIUM_TIER_2_SKU_ID() ? SkuCategory.NITRO : SkuCategory.GAME;
     }
 
@@ -471,7 +471,7 @@ public final class ModelSku {
         String str = this.name;
         int i2 = 0;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j2 = this.f2530id;
+        long j2 = this.f2528id;
         int i3 = (((i + hashCode) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         Application application = this.application;
         int hashCode2 = (i3 + (application != null ? application.hashCode() : 0)) * 31;
@@ -506,7 +506,7 @@ public final class ModelSku {
         O.append(", name=");
         O.append(this.name);
         O.append(", id=");
-        O.append(this.f2530id);
+        O.append(this.f2528id);
         O.append(", application=");
         O.append(this.application);
         O.append(", premium=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelStoreListing.java b/app/src/main/java/com/discord/models/domain/ModelStoreListing.java
index 28c92c86da..3a42f76509 100644
--- a/app/src/main/java/com/discord/models/domain/ModelStoreListing.java
+++ b/app/src/main/java/com/discord/models/domain/ModelStoreListing.java
@@ -8,7 +8,7 @@ import kotlin.jvm.internal.Ref$ObjectRef;
 public final class ModelStoreListing {
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2531id;
+    private final long f2529id;
     private final ModelSku sku;
 
     /* compiled from: ModelStoreListing.kt */
@@ -35,7 +35,7 @@ public final class ModelStoreListing {
     public ModelStoreListing(ModelSku modelSku, long j) {
         m.checkNotNullParameter(modelSku, "sku");
         this.sku = modelSku;
-        this.f2531id = j;
+        this.f2529id = j;
     }
 
     public static /* synthetic */ ModelStoreListing copy$default(ModelStoreListing modelStoreListing, ModelSku modelSku, long j, int i, Object obj) {
@@ -43,7 +43,7 @@ public final class ModelStoreListing {
             modelSku = modelStoreListing.sku;
         }
         if ((i & 2) != 0) {
-            j = modelStoreListing.f2531id;
+            j = modelStoreListing.f2529id;
         }
         return modelStoreListing.copy(modelSku, j);
     }
@@ -53,7 +53,7 @@ public final class ModelStoreListing {
     }
 
     public final long component2() {
-        return this.f2531id;
+        return this.f2529id;
     }
 
     public final ModelStoreListing copy(ModelSku modelSku, long j) {
@@ -69,11 +69,11 @@ public final class ModelStoreListing {
             return false;
         }
         ModelStoreListing modelStoreListing = (ModelStoreListing) obj;
-        return m.areEqual(this.sku, modelStoreListing.sku) && this.f2531id == modelStoreListing.f2531id;
+        return m.areEqual(this.sku, modelStoreListing.sku) && this.f2529id == modelStoreListing.f2529id;
     }
 
     public final long getId() {
-        return this.f2531id;
+        return this.f2529id;
     }
 
     public final ModelSku getSku() {
@@ -83,7 +83,7 @@ public final class ModelStoreListing {
     public int hashCode() {
         ModelSku modelSku = this.sku;
         int hashCode = modelSku != null ? modelSku.hashCode() : 0;
-        long j = this.f2531id;
+        long j = this.f2529id;
         return (hashCode * 31) + ((int) (j ^ (j >>> 32)));
     }
 
@@ -91,6 +91,6 @@ public final class ModelStoreListing {
         StringBuilder O = a.O("ModelStoreListing(sku=");
         O.append(this.sku);
         O.append(", id=");
-        return a.A(O, this.f2531id, ")");
+        return a.A(O, this.f2529id, ")");
     }
 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelSubscription.java b/app/src/main/java/com/discord/models/domain/ModelSubscription.java
index 34039f31f1..34afc737a7 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSubscription.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSubscription.java
@@ -16,7 +16,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
     private final String currentPeriodStart;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2532id;
+    private final String f2530id;
     private final List<SubscriptionItem> items;
     private final Integer paymentGateway;
     private final String paymentGatewayPlanId;
@@ -202,19 +202,19 @@ public final class ModelSubscription extends HasSubscriptionItems {
     public static final class SubscriptionItem {
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2533id;
+        private final long f2531id;
         private final long planId;
         private final int quantity;
 
         public SubscriptionItem(long j, long j2, int i) {
-            this.f2533id = j;
+            this.f2531id = j;
             this.planId = j2;
             this.quantity = i;
         }
 
         public static /* synthetic */ SubscriptionItem copy$default(SubscriptionItem subscriptionItem, long j, long j2, int i, int i2, Object obj) {
             if ((i2 & 1) != 0) {
-                j = subscriptionItem.f2533id;
+                j = subscriptionItem.f2531id;
             }
             if ((i2 & 2) != 0) {
                 j2 = subscriptionItem.planId;
@@ -226,7 +226,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
         }
 
         public final long component1() {
-            return this.f2533id;
+            return this.f2531id;
         }
 
         public final long component2() {
@@ -249,11 +249,11 @@ public final class ModelSubscription extends HasSubscriptionItems {
                 return false;
             }
             SubscriptionItem subscriptionItem = (SubscriptionItem) obj;
-            return this.f2533id == subscriptionItem.f2533id && this.planId == subscriptionItem.planId && this.quantity == subscriptionItem.quantity;
+            return this.f2531id == subscriptionItem.f2531id && this.planId == subscriptionItem.planId && this.quantity == subscriptionItem.quantity;
         }
 
         public final long getId() {
-            return this.f2533id;
+            return this.f2531id;
         }
 
         public final long getPlanId() {
@@ -265,14 +265,14 @@ public final class ModelSubscription extends HasSubscriptionItems {
         }
 
         public int hashCode() {
-            long j = this.f2533id;
+            long j = this.f2531id;
             long j2 = this.planId;
             return (((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.quantity;
         }
 
         public String toString() {
             StringBuilder O = a.O("SubscriptionItem(id=");
-            O.append(this.f2533id);
+            O.append(this.f2531id);
             O.append(", planId=");
             O.append(this.planId);
             O.append(", quantity=");
@@ -389,7 +389,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
         m.checkNotNullParameter(str4, "currentPeriodStart");
         m.checkNotNullParameter(str5, "currentPeriodEnd");
         m.checkNotNullParameter(list, "items");
-        this.f2532id = str;
+        this.f2530id = str;
         this.createdAt = str2;
         this.canceledAt = str3;
         this.currentPeriodStart = str4;
@@ -414,11 +414,11 @@ public final class ModelSubscription extends HasSubscriptionItems {
     }
 
     public static /* synthetic */ ModelSubscription copy$default(ModelSubscription modelSubscription, String str, String str2, String str3, String str4, String str5, String str6, Integer num, String str7, String str8, SubscriptionRenewalMutations subscriptionRenewalMutations, List list, String str9, int i, int i2, int i3, Object obj) {
-        return modelSubscription.copy((i3 & 1) != 0 ? modelSubscription.f2532id : str, (i3 & 2) != 0 ? modelSubscription.createdAt : str2, (i3 & 4) != 0 ? modelSubscription.canceledAt : str3, (i3 & 8) != 0 ? modelSubscription.currentPeriodStart : str4, (i3 & 16) != 0 ? modelSubscription.currentPeriodEnd : str5, (i3 & 32) != 0 ? modelSubscription.paymentSourceId : str6, (i3 & 64) != 0 ? modelSubscription.paymentGateway : num, (i3 & 128) != 0 ? modelSubscription.trialId : str7, (i3 & 256) != 0 ? modelSubscription.trialEndsAt : str8, (i3 & 512) != 0 ? modelSubscription.renewalMutations : subscriptionRenewalMutations, (i3 & 1024) != 0 ? modelSubscription.getItems() : list, (i3 & 2048) != 0 ? modelSubscription.paymentGatewayPlanId : str9, (i3 & 4096) != 0 ? modelSubscription.status : i, (i3 & 8192) != 0 ? modelSubscription.type : i2);
+        return modelSubscription.copy((i3 & 1) != 0 ? modelSubscription.f2530id : str, (i3 & 2) != 0 ? modelSubscription.createdAt : str2, (i3 & 4) != 0 ? modelSubscription.canceledAt : str3, (i3 & 8) != 0 ? modelSubscription.currentPeriodStart : str4, (i3 & 16) != 0 ? modelSubscription.currentPeriodEnd : str5, (i3 & 32) != 0 ? modelSubscription.paymentSourceId : str6, (i3 & 64) != 0 ? modelSubscription.paymentGateway : num, (i3 & 128) != 0 ? modelSubscription.trialId : str7, (i3 & 256) != 0 ? modelSubscription.trialEndsAt : str8, (i3 & 512) != 0 ? modelSubscription.renewalMutations : subscriptionRenewalMutations, (i3 & 1024) != 0 ? modelSubscription.getItems() : list, (i3 & 2048) != 0 ? modelSubscription.paymentGatewayPlanId : str9, (i3 & 4096) != 0 ? modelSubscription.status : i, (i3 & 8192) != 0 ? modelSubscription.type : i2);
     }
 
     public final String component1() {
-        return this.f2532id;
+        return this.f2530id;
     }
 
     public final SubscriptionRenewalMutations component10() {
@@ -482,7 +482,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
             return false;
         }
         ModelSubscription modelSubscription = (ModelSubscription) obj;
-        return m.areEqual(this.f2532id, modelSubscription.f2532id) && m.areEqual(this.createdAt, modelSubscription.createdAt) && m.areEqual(this.canceledAt, modelSubscription.canceledAt) && m.areEqual(this.currentPeriodStart, modelSubscription.currentPeriodStart) && m.areEqual(this.currentPeriodEnd, modelSubscription.currentPeriodEnd) && m.areEqual(this.paymentSourceId, modelSubscription.paymentSourceId) && m.areEqual(this.paymentGateway, modelSubscription.paymentGateway) && m.areEqual(this.trialId, modelSubscription.trialId) && m.areEqual(this.trialEndsAt, modelSubscription.trialEndsAt) && m.areEqual(this.renewalMutations, modelSubscription.renewalMutations) && m.areEqual(getItems(), modelSubscription.getItems()) && m.areEqual(this.paymentGatewayPlanId, modelSubscription.paymentGatewayPlanId) && this.status == modelSubscription.status && this.type == modelSubscription.type;
+        return m.areEqual(this.f2530id, modelSubscription.f2530id) && m.areEqual(this.createdAt, modelSubscription.createdAt) && m.areEqual(this.canceledAt, modelSubscription.canceledAt) && m.areEqual(this.currentPeriodStart, modelSubscription.currentPeriodStart) && m.areEqual(this.currentPeriodEnd, modelSubscription.currentPeriodEnd) && m.areEqual(this.paymentSourceId, modelSubscription.paymentSourceId) && m.areEqual(this.paymentGateway, modelSubscription.paymentGateway) && m.areEqual(this.trialId, modelSubscription.trialId) && m.areEqual(this.trialEndsAt, modelSubscription.trialEndsAt) && m.areEqual(this.renewalMutations, modelSubscription.renewalMutations) && m.areEqual(getItems(), modelSubscription.getItems()) && m.areEqual(this.paymentGatewayPlanId, modelSubscription.paymentGatewayPlanId) && this.status == modelSubscription.status && this.type == modelSubscription.type;
     }
 
     public final long getAccountHoldEstimatedExpirationTimestamp() {
@@ -506,7 +506,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
     }
 
     public final String getId() {
-        return this.f2532id;
+        return this.f2530id;
     }
 
     @Override // com.discord.models.domain.HasSubscriptionItems
@@ -585,7 +585,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
     }
 
     public int hashCode() {
-        String str = this.f2532id;
+        String str = this.f2530id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.createdAt;
@@ -633,7 +633,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
 
     public String toString() {
         StringBuilder O = a.O("ModelSubscription(id=");
-        O.append(this.f2532id);
+        O.append(this.f2530id);
         O.append(", createdAt=");
         O.append(this.createdAt);
         O.append(", canceledAt=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserNote.java b/app/src/main/java/com/discord/models/domain/ModelUserNote.java
index 6cb86de61a..ab98fd3d1c 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserNote.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserNote.java
@@ -14,7 +14,7 @@ public final class ModelUserNote {
     public static final class Update {
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2534id;
+        private final long f2532id;
         private final String note;
 
         /* compiled from: ModelUserNote.kt */
@@ -38,13 +38,13 @@ public final class ModelUserNote {
 
         public Update(long j, String str) {
             m.checkNotNullParameter(str, "note");
-            this.f2534id = j;
+            this.f2532id = j;
             this.note = str;
         }
 
         public static /* synthetic */ Update copy$default(Update update, long j, String str, int i, Object obj) {
             if ((i & 1) != 0) {
-                j = update.f2534id;
+                j = update.f2532id;
             }
             if ((i & 2) != 0) {
                 str = update.note;
@@ -53,7 +53,7 @@ public final class ModelUserNote {
         }
 
         public final long component1() {
-            return this.f2534id;
+            return this.f2532id;
         }
 
         public final String component2() {
@@ -73,11 +73,11 @@ public final class ModelUserNote {
                 return false;
             }
             Update update = (Update) obj;
-            return this.f2534id == update.f2534id && m.areEqual(this.note, update.note);
+            return this.f2532id == update.f2532id && m.areEqual(this.note, update.note);
         }
 
         public final long getId() {
-            return this.f2534id;
+            return this.f2532id;
         }
 
         public final String getNote() {
@@ -85,7 +85,7 @@ public final class ModelUserNote {
         }
 
         public int hashCode() {
-            long j = this.f2534id;
+            long j = this.f2532id;
             int i = ((int) (j ^ (j >>> 32))) * 31;
             String str = this.note;
             return i + (str != null ? str.hashCode() : 0);
@@ -93,7 +93,7 @@ public final class ModelUserNote {
 
         public String toString() {
             StringBuilder O = a.O("Update(id=");
-            O.append(this.f2534id);
+            O.append(this.f2532id);
             O.append(", note=");
             return a.G(O, this.note, ")");
         }
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
index 00bb386561..49cf5331e9 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
@@ -14,7 +14,7 @@ public class ModelUserRelationship implements Model {
     public static final int TYPE_NONE = 0;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2535id;
+    private long f2533id;
     private int type;
     private User user;
     private Long userId;
@@ -23,14 +23,14 @@ public class ModelUserRelationship implements Model {
     }
 
     public ModelUserRelationship(long j, int i, User user, Long l) {
-        this.f2535id = j;
+        this.f2533id = j;
         this.type = i;
         this.user = user;
         this.userId = l;
     }
 
     public ModelUserRelationship(ModelUserRelationship modelUserRelationship) {
-        this(modelUserRelationship.f2535id, modelUserRelationship.type, modelUserRelationship.user, modelUserRelationship.userId);
+        this(modelUserRelationship.f2533id, modelUserRelationship.type, modelUserRelationship.user, modelUserRelationship.userId);
     }
 
     public static int getType(Integer num) {
@@ -80,7 +80,7 @@ public class ModelUserRelationship implements Model {
                 this.userId = jsonReader.nextLongOrNull();
                 return;
             case 1:
-                this.f2535id = jsonReader.nextLong(this.f2535id);
+                this.f2533id = jsonReader.nextLong(this.f2533id);
                 return;
             case 2:
                 this.type = jsonReader.nextInt(this.type);
@@ -120,7 +120,7 @@ public class ModelUserRelationship implements Model {
     }
 
     public long getId() {
-        return this.f2535id;
+        return this.f2533id;
     }
 
     public int getType() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
index cf0ecf4030..3b10f34b21 100644
--- a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
+++ b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
@@ -8,7 +8,7 @@ public class ModelVoiceRegion implements Model {
     private boolean hidden;
 
     /* renamed from: id  reason: collision with root package name */
-    private String f2536id;
+    private String f2534id;
     private String name;
     private boolean optimal;
     private String sampleHostname;
@@ -74,7 +74,7 @@ public class ModelVoiceRegion implements Model {
                 this.hidden = jsonReader.nextBoolean(this.hidden);
                 return;
             case 3:
-                this.f2536id = jsonReader.nextString(this.f2536id);
+                this.f2534id = jsonReader.nextString(this.f2534id);
                 return;
             case 4:
                 this.name = jsonReader.nextString(this.name);
@@ -122,7 +122,7 @@ public class ModelVoiceRegion implements Model {
     }
 
     public String getId() {
-        return this.f2536id;
+        return this.f2534id;
     }
 
     public String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelWebhook.java b/app/src/main/java/com/discord/models/domain/ModelWebhook.java
index 841a626476..d3f244bff9 100644
--- a/app/src/main/java/com/discord/models/domain/ModelWebhook.java
+++ b/app/src/main/java/com/discord/models/domain/ModelWebhook.java
@@ -9,7 +9,7 @@ public class ModelWebhook implements Model {
     private long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2537id;
+    private long f2535id;
     private String name;
 
     @Override // com.discord.models.domain.Model
@@ -60,7 +60,7 @@ public class ModelWebhook implements Model {
                 this.guildId = jsonReader.nextLong(this.guildId);
                 return;
             case 3:
-                this.f2537id = jsonReader.nextLong(this.f2537id);
+                this.f2535id = jsonReader.nextLong(this.f2535id);
                 return;
             case 4:
                 this.name = jsonReader.nextString(this.name);
@@ -109,7 +109,7 @@ public class ModelWebhook implements Model {
     }
 
     public long getId() {
-        return this.f2537id;
+        return this.f2535id;
     }
 
     public String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
index cada995569..889cce2b60 100644
--- a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
+++ b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
@@ -15,7 +15,7 @@ public final class PaymentSourceRaw {
     private final int expiresYear;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2538id;
+    private final String f2536id;
     private final boolean invalid;
     private final String last_4;
     private final int type;
@@ -24,7 +24,7 @@ public final class PaymentSourceRaw {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(modelBillingAddress, "billingAddress");
         this.type = i;
-        this.f2538id = str;
+        this.f2536id = str;
         this.invalid = z2;
         this.billingAddress = modelBillingAddress;
         this.f11default = z3;
@@ -36,7 +36,7 @@ public final class PaymentSourceRaw {
     }
 
     public static /* synthetic */ PaymentSourceRaw copy$default(PaymentSourceRaw paymentSourceRaw, int i, String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3, String str2, String str3, String str4, int i2, int i3, int i4, Object obj) {
-        return paymentSourceRaw.copy((i4 & 1) != 0 ? paymentSourceRaw.type : i, (i4 & 2) != 0 ? paymentSourceRaw.f2538id : str, (i4 & 4) != 0 ? paymentSourceRaw.invalid : z2, (i4 & 8) != 0 ? paymentSourceRaw.billingAddress : modelBillingAddress, (i4 & 16) != 0 ? paymentSourceRaw.f11default : z3, (i4 & 32) != 0 ? paymentSourceRaw.email : str2, (i4 & 64) != 0 ? paymentSourceRaw.brand : str3, (i4 & 128) != 0 ? paymentSourceRaw.last_4 : str4, (i4 & 256) != 0 ? paymentSourceRaw.expiresMonth : i2, (i4 & 512) != 0 ? paymentSourceRaw.expiresYear : i3);
+        return paymentSourceRaw.copy((i4 & 1) != 0 ? paymentSourceRaw.type : i, (i4 & 2) != 0 ? paymentSourceRaw.f2536id : str, (i4 & 4) != 0 ? paymentSourceRaw.invalid : z2, (i4 & 8) != 0 ? paymentSourceRaw.billingAddress : modelBillingAddress, (i4 & 16) != 0 ? paymentSourceRaw.f11default : z3, (i4 & 32) != 0 ? paymentSourceRaw.email : str2, (i4 & 64) != 0 ? paymentSourceRaw.brand : str3, (i4 & 128) != 0 ? paymentSourceRaw.last_4 : str4, (i4 & 256) != 0 ? paymentSourceRaw.expiresMonth : i2, (i4 & 512) != 0 ? paymentSourceRaw.expiresYear : i3);
     }
 
     public final int component1() {
@@ -48,7 +48,7 @@ public final class PaymentSourceRaw {
     }
 
     public final String component2() {
-        return this.f2538id;
+        return this.f2536id;
     }
 
     public final boolean component3() {
@@ -93,7 +93,7 @@ public final class PaymentSourceRaw {
             return false;
         }
         PaymentSourceRaw paymentSourceRaw = (PaymentSourceRaw) obj;
-        return this.type == paymentSourceRaw.type && m.areEqual(this.f2538id, paymentSourceRaw.f2538id) && this.invalid == paymentSourceRaw.invalid && m.areEqual(this.billingAddress, paymentSourceRaw.billingAddress) && this.f11default == paymentSourceRaw.f11default && m.areEqual(this.email, paymentSourceRaw.email) && m.areEqual(this.brand, paymentSourceRaw.brand) && m.areEqual(this.last_4, paymentSourceRaw.last_4) && this.expiresMonth == paymentSourceRaw.expiresMonth && this.expiresYear == paymentSourceRaw.expiresYear;
+        return this.type == paymentSourceRaw.type && m.areEqual(this.f2536id, paymentSourceRaw.f2536id) && this.invalid == paymentSourceRaw.invalid && m.areEqual(this.billingAddress, paymentSourceRaw.billingAddress) && this.f11default == paymentSourceRaw.f11default && m.areEqual(this.email, paymentSourceRaw.email) && m.areEqual(this.brand, paymentSourceRaw.brand) && m.areEqual(this.last_4, paymentSourceRaw.last_4) && this.expiresMonth == paymentSourceRaw.expiresMonth && this.expiresYear == paymentSourceRaw.expiresYear;
     }
 
     public final ModelBillingAddress getBillingAddress() {
@@ -121,7 +121,7 @@ public final class PaymentSourceRaw {
     }
 
     public final String getId() {
-        return this.f2538id;
+        return this.f2536id;
     }
 
     public final boolean getInvalid() {
@@ -138,7 +138,7 @@ public final class PaymentSourceRaw {
 
     public int hashCode() {
         int i = this.type * 31;
-        String str = this.f2538id;
+        String str = this.f2536id;
         int i2 = 0;
         int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31;
         boolean z2 = this.invalid;
@@ -172,7 +172,7 @@ public final class PaymentSourceRaw {
         StringBuilder O = a.O("PaymentSourceRaw(type=");
         O.append(this.type);
         O.append(", id=");
-        O.append(this.f2538id);
+        O.append(this.f2536id);
         O.append(", invalid=");
         O.append(this.invalid);
         O.append(", billingAddress=");
diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java b/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java
index eb6de121e2..4850cf110b 100644
--- a/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java
+++ b/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java
@@ -9,7 +9,7 @@ public final class ModelInvoiceItem {
     private final List<ModelInvoiceDiscount> discount;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2539id;
+    private final long f2537id;
     private final boolean proration;
     private final int quantity;
     private final long subscriptionPlanId;
@@ -19,7 +19,7 @@ public final class ModelInvoiceItem {
         m.checkNotNullParameter(list, "discount");
         this.amount = i;
         this.discount = list;
-        this.f2539id = j;
+        this.f2537id = j;
         this.proration = z2;
         this.quantity = i2;
         this.subscriptionPlanId = j2;
@@ -27,7 +27,7 @@ public final class ModelInvoiceItem {
     }
 
     public static /* synthetic */ ModelInvoiceItem copy$default(ModelInvoiceItem modelInvoiceItem, int i, List list, long j, boolean z2, int i2, long j2, int i3, int i4, Object obj) {
-        return modelInvoiceItem.copy((i4 & 1) != 0 ? modelInvoiceItem.amount : i, (i4 & 2) != 0 ? modelInvoiceItem.discount : list, (i4 & 4) != 0 ? modelInvoiceItem.f2539id : j, (i4 & 8) != 0 ? modelInvoiceItem.proration : z2, (i4 & 16) != 0 ? modelInvoiceItem.quantity : i2, (i4 & 32) != 0 ? modelInvoiceItem.subscriptionPlanId : j2, (i4 & 64) != 0 ? modelInvoiceItem.subscriptionPlanPrice : i3);
+        return modelInvoiceItem.copy((i4 & 1) != 0 ? modelInvoiceItem.amount : i, (i4 & 2) != 0 ? modelInvoiceItem.discount : list, (i4 & 4) != 0 ? modelInvoiceItem.f2537id : j, (i4 & 8) != 0 ? modelInvoiceItem.proration : z2, (i4 & 16) != 0 ? modelInvoiceItem.quantity : i2, (i4 & 32) != 0 ? modelInvoiceItem.subscriptionPlanId : j2, (i4 & 64) != 0 ? modelInvoiceItem.subscriptionPlanPrice : i3);
     }
 
     public final int component1() {
@@ -39,7 +39,7 @@ public final class ModelInvoiceItem {
     }
 
     public final long component3() {
-        return this.f2539id;
+        return this.f2537id;
     }
 
     public final boolean component4() {
@@ -71,7 +71,7 @@ public final class ModelInvoiceItem {
             return false;
         }
         ModelInvoiceItem modelInvoiceItem = (ModelInvoiceItem) obj;
-        return this.amount == modelInvoiceItem.amount && m.areEqual(this.discount, modelInvoiceItem.discount) && this.f2539id == modelInvoiceItem.f2539id && this.proration == modelInvoiceItem.proration && this.quantity == modelInvoiceItem.quantity && this.subscriptionPlanId == modelInvoiceItem.subscriptionPlanId && this.subscriptionPlanPrice == modelInvoiceItem.subscriptionPlanPrice;
+        return this.amount == modelInvoiceItem.amount && m.areEqual(this.discount, modelInvoiceItem.discount) && this.f2537id == modelInvoiceItem.f2537id && this.proration == modelInvoiceItem.proration && this.quantity == modelInvoiceItem.quantity && this.subscriptionPlanId == modelInvoiceItem.subscriptionPlanId && this.subscriptionPlanPrice == modelInvoiceItem.subscriptionPlanPrice;
     }
 
     public final int getAmount() {
@@ -83,7 +83,7 @@ public final class ModelInvoiceItem {
     }
 
     public final long getId() {
-        return this.f2539id;
+        return this.f2537id;
     }
 
     public final boolean getProration() {
@@ -106,7 +106,7 @@ public final class ModelInvoiceItem {
         int i = this.amount * 31;
         List<ModelInvoiceDiscount> list = this.discount;
         int hashCode = list != null ? list.hashCode() : 0;
-        long j = this.f2539id;
+        long j = this.f2537id;
         int i2 = (((i + hashCode) * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         boolean z2 = this.proration;
         if (z2) {
@@ -125,7 +125,7 @@ public final class ModelInvoiceItem {
         O.append(", discount=");
         O.append(this.discount);
         O.append(", id=");
-        O.append(this.f2539id);
+        O.append(this.f2537id);
         O.append(", proration=");
         O.append(this.proration);
         O.append(", quantity=");
diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java b/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java
index ca763daf11..4ec8c45043 100644
--- a/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java
+++ b/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java
@@ -8,7 +8,7 @@ public final class ModelInvoicePreview {
     private final String currency;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2540id;
+    private final long f2538id;
     private final List<ModelInvoiceItem> invoiceItems;
     private final String subscriptionPeriodEnd;
     private final String subscriptionPeriodStart;
@@ -23,7 +23,7 @@ public final class ModelInvoicePreview {
         m.checkNotNullParameter(str2, "subscriptionPeriodEnd");
         m.checkNotNullParameter(str3, "subscriptionPeriodStart");
         this.currency = str;
-        this.f2540id = j;
+        this.f2538id = j;
         this.invoiceItems = list;
         this.subscriptionPeriodEnd = str2;
         this.subscriptionPeriodStart = str3;
@@ -34,7 +34,7 @@ public final class ModelInvoicePreview {
     }
 
     public static /* synthetic */ ModelInvoicePreview copy$default(ModelInvoicePreview modelInvoicePreview, String str, long j, List list, String str2, String str3, int i, int i2, boolean z2, int i3, int i4, Object obj) {
-        return modelInvoicePreview.copy((i4 & 1) != 0 ? modelInvoicePreview.currency : str, (i4 & 2) != 0 ? modelInvoicePreview.f2540id : j, (i4 & 4) != 0 ? modelInvoicePreview.invoiceItems : list, (i4 & 8) != 0 ? modelInvoicePreview.subscriptionPeriodEnd : str2, (i4 & 16) != 0 ? modelInvoicePreview.subscriptionPeriodStart : str3, (i4 & 32) != 0 ? modelInvoicePreview.subtotal : i, (i4 & 64) != 0 ? modelInvoicePreview.tax : i2, (i4 & 128) != 0 ? modelInvoicePreview.taxInclusive : z2, (i4 & 256) != 0 ? modelInvoicePreview.total : i3);
+        return modelInvoicePreview.copy((i4 & 1) != 0 ? modelInvoicePreview.currency : str, (i4 & 2) != 0 ? modelInvoicePreview.f2538id : j, (i4 & 4) != 0 ? modelInvoicePreview.invoiceItems : list, (i4 & 8) != 0 ? modelInvoicePreview.subscriptionPeriodEnd : str2, (i4 & 16) != 0 ? modelInvoicePreview.subscriptionPeriodStart : str3, (i4 & 32) != 0 ? modelInvoicePreview.subtotal : i, (i4 & 64) != 0 ? modelInvoicePreview.tax : i2, (i4 & 128) != 0 ? modelInvoicePreview.taxInclusive : z2, (i4 & 256) != 0 ? modelInvoicePreview.total : i3);
     }
 
     public final String component1() {
@@ -42,7 +42,7 @@ public final class ModelInvoicePreview {
     }
 
     public final long component2() {
-        return this.f2540id;
+        return this.f2538id;
     }
 
     public final List<ModelInvoiceItem> component3() {
@@ -89,7 +89,7 @@ public final class ModelInvoicePreview {
             return false;
         }
         ModelInvoicePreview modelInvoicePreview = (ModelInvoicePreview) obj;
-        return m.areEqual(this.currency, modelInvoicePreview.currency) && this.f2540id == modelInvoicePreview.f2540id && m.areEqual(this.invoiceItems, modelInvoicePreview.invoiceItems) && m.areEqual(this.subscriptionPeriodEnd, modelInvoicePreview.subscriptionPeriodEnd) && m.areEqual(this.subscriptionPeriodStart, modelInvoicePreview.subscriptionPeriodStart) && this.subtotal == modelInvoicePreview.subtotal && this.tax == modelInvoicePreview.tax && this.taxInclusive == modelInvoicePreview.taxInclusive && this.total == modelInvoicePreview.total;
+        return m.areEqual(this.currency, modelInvoicePreview.currency) && this.f2538id == modelInvoicePreview.f2538id && m.areEqual(this.invoiceItems, modelInvoicePreview.invoiceItems) && m.areEqual(this.subscriptionPeriodEnd, modelInvoicePreview.subscriptionPeriodEnd) && m.areEqual(this.subscriptionPeriodStart, modelInvoicePreview.subscriptionPeriodStart) && this.subtotal == modelInvoicePreview.subtotal && this.tax == modelInvoicePreview.tax && this.taxInclusive == modelInvoicePreview.taxInclusive && this.total == modelInvoicePreview.total;
     }
 
     public final String getCurrency() {
@@ -97,7 +97,7 @@ public final class ModelInvoicePreview {
     }
 
     public final long getId() {
-        return this.f2540id;
+        return this.f2538id;
     }
 
     public final List<ModelInvoiceItem> getInvoiceItems() {
@@ -132,7 +132,7 @@ public final class ModelInvoicePreview {
         String str = this.currency;
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j = this.f2540id;
+        long j = this.f2538id;
         int i2 = ((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         List<ModelInvoiceItem> list = this.invoiceItems;
         int hashCode2 = (i2 + (list != null ? list.hashCode() : 0)) * 31;
@@ -157,7 +157,7 @@ public final class ModelInvoicePreview {
         StringBuilder O = a.O("ModelInvoicePreview(currency=");
         O.append(this.currency);
         O.append(", id=");
-        O.append(this.f2540id);
+        O.append(this.f2538id);
         O.append(", invoiceItems=");
         O.append(this.invoiceItems);
         O.append(", subscriptionPeriodEnd=");
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
index dd3c1c378c..4cac797997 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
@@ -24,7 +24,7 @@ public class ModelEmojiCustom implements Emoji {
     private long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2541id;
+    private long f2539id;
     private String idStr;
     private boolean isAnimated;
     private transient boolean isUsable;
@@ -61,7 +61,7 @@ public class ModelEmojiCustom implements Emoji {
 
     public ModelEmojiCustom(long j, String str, List<Long> list, boolean z2, boolean z3, int i, String str2, boolean z4, boolean z5, boolean z6, long j2) {
         this.idStr = "0";
-        this.f2541id = j;
+        this.f2539id = j;
         this.idStr = String.valueOf(j);
         this.name = str;
         this.roles = list;
@@ -79,7 +79,7 @@ public class ModelEmojiCustom implements Emoji {
         this.idStr = "0";
         boolean z2 = true;
         this.isUsable = true;
-        this.f2541id = guildEmoji.c();
+        this.f2539id = guildEmoji.c();
         this.name = guildEmoji.e();
         this.idStr = String.valueOf(guildEmoji.c());
         this.roles = guildEmoji.g() != null ? guildEmoji.g() : new ArrayList<>();
@@ -92,7 +92,7 @@ public class ModelEmojiCustom implements Emoji {
 
     public ModelEmojiCustom(ModelEmojiCustom modelEmojiCustom, int i, boolean z2) {
         this.idStr = "0";
-        this.f2541id = modelEmojiCustom.f2541id;
+        this.f2539id = modelEmojiCustom.f2539id;
         this.idStr = modelEmojiCustom.idStr;
         this.roles = modelEmojiCustom.getRoles();
         this.requireColons = modelEmojiCustom.requireColons;
@@ -205,7 +205,7 @@ public class ModelEmojiCustom implements Emoji {
     }
 
     public long getId() {
-        return this.f2541id;
+        return this.f2539id;
     }
 
     public String getIdStr() {
@@ -214,7 +214,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // com.discord.models.domain.emoji.Emoji
     public String getImageUri(boolean z2, int i, Context context) {
-        return getImageUri(this.f2541id, this.isAnimated && z2, i);
+        return getImageUri(this.f2539id, this.isAnimated && z2, i);
     }
 
     @Override // com.discord.models.domain.emoji.Emoji
@@ -231,7 +231,7 @@ public class ModelEmojiCustom implements Emoji {
         sb.append(str);
         sb.append(this.name);
         sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
-        sb.append(this.f2541id);
+        sb.append(this.f2539id);
         sb.append('>');
         return sb.toString();
     }
@@ -247,7 +247,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // com.discord.models.domain.emoji.Emoji
     public String getReactionKey() {
-        return this.name + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + this.f2541id;
+        return this.name + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + this.f2539id;
     }
 
     @Override // com.discord.models.domain.emoji.Emoji
@@ -333,7 +333,7 @@ public class ModelEmojiCustom implements Emoji {
     }
 
     public GuildEmoji toApiEmoji() {
-        return new GuildEmoji(this.f2541id, this.name, this.roles, this.requireColons, this.managed, this.isAnimated, this.available);
+        return new GuildEmoji(this.f2539id, this.name, this.roles, this.requireColons, this.managed, this.isAnimated, this.available);
     }
 
     @Override // java.lang.Object
@@ -368,7 +368,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeLong(this.f2541id);
+        parcel.writeLong(this.f2539id);
         parcel.writeString(this.name);
         parcel.writeList(this.roles);
         parcel.writeInt(this.requireColons ? 1 : 0);
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
index 8aa0acb0f8..4a77ef693b 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
@@ -11,7 +11,7 @@ public final class ModelEmojiGuild {
     private final boolean available;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2542id;
+    private final long f2540id;
     private final boolean managed;
     private final String name;
     private final boolean requiredColons;
@@ -22,7 +22,7 @@ public final class ModelEmojiGuild {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "roles");
         m.checkNotNullParameter(user, "user");
-        this.f2542id = j;
+        this.f2540id = j;
         this.name = str;
         this.managed = z2;
         this.roles = list;
@@ -33,11 +33,11 @@ public final class ModelEmojiGuild {
     }
 
     public static /* synthetic */ ModelEmojiGuild copy$default(ModelEmojiGuild modelEmojiGuild, long j, String str, boolean z2, List list, boolean z3, User user, boolean z4, boolean z5, int i, Object obj) {
-        return modelEmojiGuild.copy((i & 1) != 0 ? modelEmojiGuild.f2542id : j, (i & 2) != 0 ? modelEmojiGuild.name : str, (i & 4) != 0 ? modelEmojiGuild.managed : z2, (i & 8) != 0 ? modelEmojiGuild.roles : list, (i & 16) != 0 ? modelEmojiGuild.requiredColons : z3, (i & 32) != 0 ? modelEmojiGuild.user : user, (i & 64) != 0 ? modelEmojiGuild.animated : z4, (i & 128) != 0 ? modelEmojiGuild.available : z5);
+        return modelEmojiGuild.copy((i & 1) != 0 ? modelEmojiGuild.f2540id : j, (i & 2) != 0 ? modelEmojiGuild.name : str, (i & 4) != 0 ? modelEmojiGuild.managed : z2, (i & 8) != 0 ? modelEmojiGuild.roles : list, (i & 16) != 0 ? modelEmojiGuild.requiredColons : z3, (i & 32) != 0 ? modelEmojiGuild.user : user, (i & 64) != 0 ? modelEmojiGuild.animated : z4, (i & 128) != 0 ? modelEmojiGuild.available : z5);
     }
 
     public final long component1() {
-        return this.f2542id;
+        return this.f2540id;
     }
 
     public final String component2() {
@@ -83,7 +83,7 @@ public final class ModelEmojiGuild {
             return false;
         }
         ModelEmojiGuild modelEmojiGuild = (ModelEmojiGuild) obj;
-        return this.f2542id == modelEmojiGuild.f2542id && m.areEqual(this.name, modelEmojiGuild.name) && this.managed == modelEmojiGuild.managed && m.areEqual(this.roles, modelEmojiGuild.roles) && this.requiredColons == modelEmojiGuild.requiredColons && m.areEqual(this.user, modelEmojiGuild.user) && this.animated == modelEmojiGuild.animated && this.available == modelEmojiGuild.available;
+        return this.f2540id == modelEmojiGuild.f2540id && m.areEqual(this.name, modelEmojiGuild.name) && this.managed == modelEmojiGuild.managed && m.areEqual(this.roles, modelEmojiGuild.roles) && this.requiredColons == modelEmojiGuild.requiredColons && m.areEqual(this.user, modelEmojiGuild.user) && this.animated == modelEmojiGuild.animated && this.available == modelEmojiGuild.available;
     }
 
     public final boolean getAnimated() {
@@ -95,7 +95,7 @@ public final class ModelEmojiGuild {
     }
 
     public final long getId() {
-        return this.f2542id;
+        return this.f2540id;
     }
 
     public final boolean getManaged() {
@@ -119,7 +119,7 @@ public final class ModelEmojiGuild {
     }
 
     public int hashCode() {
-        long j = this.f2542id;
+        long j = this.f2540id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.name;
         int i2 = 0;
@@ -165,7 +165,7 @@ public final class ModelEmojiGuild {
 
     public String toString() {
         StringBuilder O = a.O("ModelEmojiGuild(id=");
-        O.append(this.f2542id);
+        O.append(this.f2540id);
         O.append(", name=");
         O.append(this.name);
         O.append(", managed=");
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
index d56503108b..4ac3ed7f9b 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
@@ -9,7 +9,7 @@ public final class ModelSpotifyAlbum {
     private final String albumType;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2543id;
+    private final String f2541id;
     private final List<AlbumImage> images;
     private final String name;
 
@@ -66,7 +66,7 @@ public final class ModelSpotifyAlbum {
         m.checkNotNullParameter(list, "images");
         m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.albumType = str;
-        this.f2543id = str2;
+        this.f2541id = str2;
         this.images = list;
         this.name = str3;
     }
@@ -78,7 +78,7 @@ public final class ModelSpotifyAlbum {
             str = modelSpotifyAlbum.albumType;
         }
         if ((i & 2) != 0) {
-            str2 = modelSpotifyAlbum.f2543id;
+            str2 = modelSpotifyAlbum.f2541id;
         }
         if ((i & 4) != 0) {
             list = modelSpotifyAlbum.images;
@@ -94,7 +94,7 @@ public final class ModelSpotifyAlbum {
     }
 
     public final String component2() {
-        return this.f2543id;
+        return this.f2541id;
     }
 
     public final List<AlbumImage> component3() {
@@ -121,7 +121,7 @@ public final class ModelSpotifyAlbum {
             return false;
         }
         ModelSpotifyAlbum modelSpotifyAlbum = (ModelSpotifyAlbum) obj;
-        return m.areEqual(this.albumType, modelSpotifyAlbum.albumType) && m.areEqual(this.f2543id, modelSpotifyAlbum.f2543id) && m.areEqual(this.images, modelSpotifyAlbum.images) && m.areEqual(this.name, modelSpotifyAlbum.name);
+        return m.areEqual(this.albumType, modelSpotifyAlbum.albumType) && m.areEqual(this.f2541id, modelSpotifyAlbum.f2541id) && m.areEqual(this.images, modelSpotifyAlbum.images) && m.areEqual(this.name, modelSpotifyAlbum.name);
     }
 
     public final String getAlbumType() {
@@ -129,7 +129,7 @@ public final class ModelSpotifyAlbum {
     }
 
     public final String getId() {
-        return this.f2543id;
+        return this.f2541id;
     }
 
     public final List<AlbumImage> getImages() {
@@ -144,7 +144,7 @@ public final class ModelSpotifyAlbum {
         String str = this.albumType;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
-        String str2 = this.f2543id;
+        String str2 = this.f2541id;
         int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
         List<AlbumImage> list = this.images;
         int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31;
@@ -159,7 +159,7 @@ public final class ModelSpotifyAlbum {
         StringBuilder O = a.O("ModelSpotifyAlbum(albumType=");
         O.append(this.albumType);
         O.append(", id=");
-        O.append(this.f2543id);
+        O.append(this.f2541id);
         O.append(", images=");
         O.append(this.images);
         O.append(", name=");
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
index a75a733ffa..bbcee1f02f 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
@@ -7,19 +7,19 @@ import com.discord.models.domain.ModelAuditLogEntry;
 public final class ModelSpotifyArtist {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2544id;
+    private final String f2542id;
     private final String name;
 
     public ModelSpotifyArtist(String str, String str2) {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
-        this.f2544id = str;
+        this.f2542id = str;
         this.name = str2;
     }
 
     public static /* synthetic */ ModelSpotifyArtist copy$default(ModelSpotifyArtist modelSpotifyArtist, String str, String str2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelSpotifyArtist.f2544id;
+            str = modelSpotifyArtist.f2542id;
         }
         if ((i & 2) != 0) {
             str2 = modelSpotifyArtist.name;
@@ -28,7 +28,7 @@ public final class ModelSpotifyArtist {
     }
 
     public final String component1() {
-        return this.f2544id;
+        return this.f2542id;
     }
 
     public final String component2() {
@@ -49,11 +49,11 @@ public final class ModelSpotifyArtist {
             return false;
         }
         ModelSpotifyArtist modelSpotifyArtist = (ModelSpotifyArtist) obj;
-        return m.areEqual(this.f2544id, modelSpotifyArtist.f2544id) && m.areEqual(this.name, modelSpotifyArtist.name);
+        return m.areEqual(this.f2542id, modelSpotifyArtist.f2542id) && m.areEqual(this.name, modelSpotifyArtist.name);
     }
 
     public final String getId() {
-        return this.f2544id;
+        return this.f2542id;
     }
 
     public final String getName() {
@@ -61,7 +61,7 @@ public final class ModelSpotifyArtist {
     }
 
     public int hashCode() {
-        String str = this.f2544id;
+        String str = this.f2542id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -73,7 +73,7 @@ public final class ModelSpotifyArtist {
 
     public String toString() {
         StringBuilder O = a.O("ModelSpotifyArtist(id=");
-        O.append(this.f2544id);
+        O.append(this.f2542id);
         O.append(", name=");
         return a.G(O, this.name, ")");
     }
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
index aecbf91d2e..d1375b4f1b 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
@@ -11,7 +11,7 @@ public final class ModelSpotifyTrack {
     private final long durationMs;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2545id;
+    private final String f2543id;
     private final boolean isLocal;
     private final String name;
 
@@ -19,7 +19,7 @@ public final class ModelSpotifyTrack {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "artists");
-        this.f2545id = str;
+        this.f2543id = str;
         this.name = str2;
         this.durationMs = j;
         this.album = modelSpotifyAlbum;
@@ -31,7 +31,7 @@ public final class ModelSpotifyTrack {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelSpotifyTrack copy$default(ModelSpotifyTrack modelSpotifyTrack, String str, String str2, long j, ModelSpotifyAlbum modelSpotifyAlbum, List list, boolean z2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelSpotifyTrack.f2545id;
+            str = modelSpotifyTrack.f2543id;
         }
         if ((i & 2) != 0) {
             str2 = modelSpotifyTrack.name;
@@ -52,7 +52,7 @@ public final class ModelSpotifyTrack {
     }
 
     public final String component1() {
-        return this.f2545id;
+        return this.f2543id;
     }
 
     public final String component2() {
@@ -90,7 +90,7 @@ public final class ModelSpotifyTrack {
             return false;
         }
         ModelSpotifyTrack modelSpotifyTrack = (ModelSpotifyTrack) obj;
-        return m.areEqual(this.f2545id, modelSpotifyTrack.f2545id) && m.areEqual(this.name, modelSpotifyTrack.name) && this.durationMs == modelSpotifyTrack.durationMs && m.areEqual(this.album, modelSpotifyTrack.album) && m.areEqual(this.artists, modelSpotifyTrack.artists) && this.isLocal == modelSpotifyTrack.isLocal;
+        return m.areEqual(this.f2543id, modelSpotifyTrack.f2543id) && m.areEqual(this.name, modelSpotifyTrack.name) && this.durationMs == modelSpotifyTrack.durationMs && m.areEqual(this.album, modelSpotifyTrack.album) && m.areEqual(this.artists, modelSpotifyTrack.artists) && this.isLocal == modelSpotifyTrack.isLocal;
     }
 
     public final ModelSpotifyAlbum getAlbum() {
@@ -106,7 +106,7 @@ public final class ModelSpotifyTrack {
     }
 
     public final String getId() {
-        return this.f2545id;
+        return this.f2543id;
     }
 
     public final String getName() {
@@ -114,7 +114,7 @@ public final class ModelSpotifyTrack {
     }
 
     public int hashCode() {
-        String str = this.f2545id;
+        String str = this.f2543id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -144,7 +144,7 @@ public final class ModelSpotifyTrack {
 
     public String toString() {
         StringBuilder O = a.O("ModelSpotifyTrack(id=");
-        O.append(this.f2545id);
+        O.append(this.f2543id);
         O.append(", name=");
         O.append(this.name);
         O.append(", durationMs=");
diff --git a/app/src/main/java/com/discord/models/guild/Guild.java b/app/src/main/java/com/discord/models/guild/Guild.java
index 14f405e1a5..e2cdc6a146 100644
--- a/app/src/main/java/com/discord/models/guild/Guild.java
+++ b/app/src/main/java/com/discord/models/guild/Guild.java
@@ -35,7 +35,7 @@ public final class Guild {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2546id;
+    private final long f2544id;
     private final String joinedAt;
     private final GuildMaxVideoChannelUsers maxVideoChannelUsers;
     private final int memberCount;
@@ -121,7 +121,7 @@ public final class Guild {
         this.name = str;
         this.description = str2;
         this.defaultMessageNotifications = i;
-        this.f2546id = j;
+        this.f2544id = j;
         this.region = str3;
         this.ownerId = j2;
         this.icon = str4;
@@ -157,7 +157,7 @@ public final class Guild {
     }
 
     public static /* synthetic */ Guild copy$default(Guild guild, List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, Object obj) {
-        return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2546id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3);
+        return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2544id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3);
     }
 
     public final boolean canHaveBanner() {
@@ -293,7 +293,7 @@ public final class Guild {
     }
 
     public final long component7() {
-        return this.f2546id;
+        return this.f2544id;
     }
 
     public final String component8() {
@@ -324,7 +324,7 @@ public final class Guild {
             return false;
         }
         Guild guild = (Guild) obj;
-        return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2546id == guild.f2546id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw;
+        return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2544id == guild.f2544id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw;
     }
 
     public final Long getAfkChannelId() {
@@ -368,7 +368,7 @@ public final class Guild {
     }
 
     public final long getId() {
-        return this.f2546id;
+        return this.f2544id;
     }
 
     public final String getJoinedAt() {
@@ -484,7 +484,7 @@ public final class Guild {
         String str = this.name;
         int hashCode4 = (hashCode3 + (str != null ? str.hashCode() : 0)) * 31;
         String str2 = this.description;
-        int a = (b.a(this.f2546id) + ((((hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.defaultMessageNotifications) * 31)) * 31;
+        int a = (b.a(this.f2544id) + ((((hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.defaultMessageNotifications) * 31)) * 31;
         String str3 = this.region;
         int a2 = (b.a(this.ownerId) + ((a + (str3 != null ? str3.hashCode() : 0)) * 31)) * 31;
         String str4 = this.icon;
@@ -558,7 +558,7 @@ public final class Guild {
         }
         Integer h = guild.h();
         int intValue = h != null ? h.intValue() : this.defaultMessageNotifications;
-        long p = guild.p() != 0 ? guild.p() : this.f2546id;
+        long p = guild.p() != 0 ? guild.p() : this.f2544id;
         String D = guild.D();
         if (D == null) {
             D = this.region;
@@ -635,7 +635,7 @@ public final class Guild {
         O.append(", defaultMessageNotifications=");
         O.append(this.defaultMessageNotifications);
         O.append(", id=");
-        O.append(this.f2546id);
+        O.append(this.f2544id);
         O.append(", region=");
         O.append(this.region);
         O.append(", ownerId=");
diff --git a/app/src/main/java/com/discord/models/message/Message.java b/app/src/main/java/com/discord/models/message/Message.java
index ea5944e59e..c9c2e98964 100644
--- a/app/src/main/java/com/discord/models/message/Message.java
+++ b/app/src/main/java/com/discord/models/message/Message.java
@@ -50,7 +50,7 @@ public final class Message {
     private final Boolean hit;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2547id;
+    private final long f2545id;
     private final Long initialAttemptTimestamp;
     private final Interaction interaction;
     private final Long lastManualAttemptTimestamp;
@@ -85,7 +85,7 @@ public final class Message {
     /* JADX DEBUG: Multi-variable search result rejected for r34v0, resolved type: java.util.List<? extends com.discord.api.botuikit.Component> */
     /* JADX WARN: Multi-variable type inference failed */
     public Message(long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List<User> list, List<Long> list2, List<MessageAttachment> list3, List<MessageEmbed> list4, List<MessageReaction> list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List<Sticker> list6, List<StickerPartial> list7, com.discord.api.message.Message message, Interaction interaction, Channel channel, List<? extends Component> list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List<LocalAttachment> list9) {
-        this.f2547id = j;
+        this.f2545id = j;
         this.channelId = j2;
         this.guildId = l;
         this.author = user;
@@ -136,7 +136,7 @@ public final class Message {
     }
 
     public static /* synthetic */ Message copy$default(Message message, long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List list6, List list7, com.discord.api.message.Message message2, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2, Object obj) {
-        return message.copy((i & 1) != 0 ? message.f2547id : j, (i & 2) != 0 ? message.channelId : j2, (i & 4) != 0 ? message.guildId : l, (i & 8) != 0 ? message.author : user, (i & 16) != 0 ? message.content : str, (i & 32) != 0 ? message.timestamp : utcDateTime, (i & 64) != 0 ? message.editedTimestamp : utcDateTime2, (i & 128) != 0 ? message.tts : bool, (i & 256) != 0 ? message.mentionEveryone : bool2, (i & 512) != 0 ? message.mentions : list, (i & 1024) != 0 ? message.mentionRoles : list2, (i & 2048) != 0 ? message.attachments : list3, (i & 4096) != 0 ? message.embeds : list4, (i & 8192) != 0 ? message.reactions : list5, (i & 16384) != 0 ? message.nonce : str2, (i & 32768) != 0 ? message.pinned : bool3, (i & 65536) != 0 ? message.webhookId : l2, (i & 131072) != 0 ? message.type : num, (i & 262144) != 0 ? message.activity : messageActivity, (i & 524288) != 0 ? message.application : application, (i & 1048576) != 0 ? message.applicationId : l3, (i & 2097152) != 0 ? message.messageReference : messageReference, (i & 4194304) != 0 ? message.flags : l4, (i & 8388608) != 0 ? message.stickers : list6, (i & 16777216) != 0 ? message.stickerItems : list7, (i & 33554432) != 0 ? message.referencedMessage : message2, (i & 67108864) != 0 ? message.interaction : interaction, (i & 134217728) != 0 ? message.thread : channel, (i & 268435456) != 0 ? message.components : list8, (i & 536870912) != 0 ? message.call : messageCall, (i & BasicMeasure.EXACTLY) != 0 ? message.hit : bool4, (i & Integer.MIN_VALUE) != 0 ? message.hasLocalUploads : z2, (i2 & 1) != 0 ? message.allowedMentions : messageAllowedMentions, (i2 & 2) != 0 ? message.numRetries : num2, (i2 & 4) != 0 ? message.lastManualAttemptTimestamp : l5, (i2 & 8) != 0 ? message.initialAttemptTimestamp : l6, (i2 & 16) != 0 ? message.localAttachments : list9);
+        return message.copy((i & 1) != 0 ? message.f2545id : j, (i & 2) != 0 ? message.channelId : j2, (i & 4) != 0 ? message.guildId : l, (i & 8) != 0 ? message.author : user, (i & 16) != 0 ? message.content : str, (i & 32) != 0 ? message.timestamp : utcDateTime, (i & 64) != 0 ? message.editedTimestamp : utcDateTime2, (i & 128) != 0 ? message.tts : bool, (i & 256) != 0 ? message.mentionEveryone : bool2, (i & 512) != 0 ? message.mentions : list, (i & 1024) != 0 ? message.mentionRoles : list2, (i & 2048) != 0 ? message.attachments : list3, (i & 4096) != 0 ? message.embeds : list4, (i & 8192) != 0 ? message.reactions : list5, (i & 16384) != 0 ? message.nonce : str2, (i & 32768) != 0 ? message.pinned : bool3, (i & 65536) != 0 ? message.webhookId : l2, (i & 131072) != 0 ? message.type : num, (i & 262144) != 0 ? message.activity : messageActivity, (i & 524288) != 0 ? message.application : application, (i & 1048576) != 0 ? message.applicationId : l3, (i & 2097152) != 0 ? message.messageReference : messageReference, (i & 4194304) != 0 ? message.flags : l4, (i & 8388608) != 0 ? message.stickers : list6, (i & 16777216) != 0 ? message.stickerItems : list7, (i & 33554432) != 0 ? message.referencedMessage : message2, (i & 67108864) != 0 ? message.interaction : interaction, (i & 134217728) != 0 ? message.thread : channel, (i & 268435456) != 0 ? message.components : list8, (i & 536870912) != 0 ? message.call : messageCall, (i & BasicMeasure.EXACTLY) != 0 ? message.hit : bool4, (i & Integer.MIN_VALUE) != 0 ? message.hasLocalUploads : z2, (i2 & 1) != 0 ? message.allowedMentions : messageAllowedMentions, (i2 & 2) != 0 ? message.numRetries : num2, (i2 & 4) != 0 ? message.lastManualAttemptTimestamp : l5, (i2 & 8) != 0 ? message.initialAttemptTimestamp : l6, (i2 & 16) != 0 ? message.localAttachments : list9);
     }
 
     public final boolean canResend() {
@@ -145,7 +145,7 @@ public final class Message {
     }
 
     public final long component1() {
-        return this.f2547id;
+        return this.f2545id;
     }
 
     public final List<User> component10() {
@@ -304,7 +304,7 @@ public final class Message {
             return false;
         }
         Message message = (Message) obj;
-        return this.f2547id == message.f2547id && this.channelId == message.channelId && m.areEqual(this.guildId, message.guildId) && m.areEqual(this.author, message.author) && m.areEqual(this.content, message.content) && m.areEqual(this.timestamp, message.timestamp) && m.areEqual(this.editedTimestamp, message.editedTimestamp) && m.areEqual(this.tts, message.tts) && m.areEqual(this.mentionEveryone, message.mentionEveryone) && m.areEqual(this.mentions, message.mentions) && m.areEqual(this.mentionRoles, message.mentionRoles) && m.areEqual(this.attachments, message.attachments) && m.areEqual(this.embeds, message.embeds) && m.areEqual(this.reactions, message.reactions) && m.areEqual(this.nonce, message.nonce) && m.areEqual(this.pinned, message.pinned) && m.areEqual(this.webhookId, message.webhookId) && m.areEqual(this.type, message.type) && m.areEqual(this.activity, message.activity) && m.areEqual(this.application, message.application) && m.areEqual(this.applicationId, message.applicationId) && m.areEqual(this.messageReference, message.messageReference) && m.areEqual(this.flags, message.flags) && m.areEqual(this.stickers, message.stickers) && m.areEqual(this.stickerItems, message.stickerItems) && m.areEqual(this.referencedMessage, message.referencedMessage) && m.areEqual(this.interaction, message.interaction) && m.areEqual(this.thread, message.thread) && m.areEqual(this.components, message.components) && m.areEqual(this.call, message.call) && m.areEqual(this.hit, message.hit) && this.hasLocalUploads == message.hasLocalUploads && m.areEqual(this.allowedMentions, message.allowedMentions) && m.areEqual(this.numRetries, message.numRetries) && m.areEqual(this.lastManualAttemptTimestamp, message.lastManualAttemptTimestamp) && m.areEqual(this.initialAttemptTimestamp, message.initialAttemptTimestamp) && m.areEqual(this.localAttachments, message.localAttachments);
+        return this.f2545id == message.f2545id && this.channelId == message.channelId && m.areEqual(this.guildId, message.guildId) && m.areEqual(this.author, message.author) && m.areEqual(this.content, message.content) && m.areEqual(this.timestamp, message.timestamp) && m.areEqual(this.editedTimestamp, message.editedTimestamp) && m.areEqual(this.tts, message.tts) && m.areEqual(this.mentionEveryone, message.mentionEveryone) && m.areEqual(this.mentions, message.mentions) && m.areEqual(this.mentionRoles, message.mentionRoles) && m.areEqual(this.attachments, message.attachments) && m.areEqual(this.embeds, message.embeds) && m.areEqual(this.reactions, message.reactions) && m.areEqual(this.nonce, message.nonce) && m.areEqual(this.pinned, message.pinned) && m.areEqual(this.webhookId, message.webhookId) && m.areEqual(this.type, message.type) && m.areEqual(this.activity, message.activity) && m.areEqual(this.application, message.application) && m.areEqual(this.applicationId, message.applicationId) && m.areEqual(this.messageReference, message.messageReference) && m.areEqual(this.flags, message.flags) && m.areEqual(this.stickers, message.stickers) && m.areEqual(this.stickerItems, message.stickerItems) && m.areEqual(this.referencedMessage, message.referencedMessage) && m.areEqual(this.interaction, message.interaction) && m.areEqual(this.thread, message.thread) && m.areEqual(this.components, message.components) && m.areEqual(this.call, message.call) && m.areEqual(this.hit, message.hit) && this.hasLocalUploads == message.hasLocalUploads && m.areEqual(this.allowedMentions, message.allowedMentions) && m.areEqual(this.numRetries, message.numRetries) && m.areEqual(this.lastManualAttemptTimestamp, message.lastManualAttemptTimestamp) && m.areEqual(this.initialAttemptTimestamp, message.initialAttemptTimestamp) && m.areEqual(this.localAttachments, message.localAttachments);
     }
 
     public final MessageActivity getActivity() {
@@ -382,7 +382,7 @@ public final class Message {
     }
 
     public final long getId() {
-        return this.f2547id;
+        return this.f2545id;
     }
 
     public final Long getInitialAttemptTimestamp() {
@@ -517,7 +517,7 @@ public final class Message {
     }
 
     public int hashCode() {
-        int a = (b.a(this.channelId) + (b.a(this.f2547id) * 31)) * 31;
+        int a = (b.a(this.channelId) + (b.a(this.f2545id) * 31)) * 31;
         Long l = this.guildId;
         int i = 0;
         int hashCode = (a + (l != null ? l.hashCode() : 0)) * 31;
@@ -795,12 +795,12 @@ public final class Message {
     }
 
     public final com.discord.api.message.Message synthesizeApiMessage() {
-        return new com.discord.api.message.Message(this.f2547id, this.channelId, this.author, this.content, this.timestamp, this.editedTimestamp, this.tts, this.mentionEveryone, this.mentions, this.mentionRoles, this.attachments, this.embeds, this.reactions, this.nonce, this.pinned, this.webhookId, this.type, this.activity, this.application, this.applicationId, this.messageReference, this.flags, this.stickers, this.stickerItems, this.referencedMessage, this.interaction, this.thread, this.components, this.call, this.guildId, null, null, -1073741824);
+        return new com.discord.api.message.Message(this.f2545id, this.channelId, this.author, this.content, this.timestamp, this.editedTimestamp, this.tts, this.mentionEveryone, this.mentions, this.mentionRoles, this.attachments, this.embeds, this.reactions, this.nonce, this.pinned, this.webhookId, this.type, this.activity, this.application, this.applicationId, this.messageReference, this.flags, this.stickers, this.stickerItems, this.referencedMessage, this.interaction, this.thread, this.components, this.call, this.guildId, null, null, -1073741824);
     }
 
     public String toString() {
         StringBuilder O = a.O("Message(id=");
-        O.append(this.f2547id);
+        O.append(this.f2545id);
         O.append(", channelId=");
         O.append(this.channelId);
         O.append(", guildId=");
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
index 038dac31ee..6522ff5ce4 100644
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
+++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
@@ -15,7 +15,7 @@ public final class ModelStickerPack {
     private final String description;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2548id;
+    private final long f2546id;
     private final String name;
     private final long skuId;
     private final List<Sticker> stickers;
@@ -24,7 +24,7 @@ public final class ModelStickerPack {
     public ModelStickerPack(long j, List<Sticker> list, String str, ModelStickerPackStoreListing modelStickerPackStoreListing, long j2, Long l, String str2, Long l2) {
         m.checkNotNullParameter(list, "stickers");
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
-        this.f2548id = j;
+        this.f2546id = j;
         this.stickers = list;
         this.name = str;
         this.storeListing = modelStickerPackStoreListing;
@@ -35,7 +35,7 @@ public final class ModelStickerPack {
     }
 
     public static /* synthetic */ ModelStickerPack copy$default(ModelStickerPack modelStickerPack, long j, List list, String str, ModelStickerPackStoreListing modelStickerPackStoreListing, long j2, Long l, String str2, Long l2, int i, Object obj) {
-        return modelStickerPack.copy((i & 1) != 0 ? modelStickerPack.f2548id : j, (i & 2) != 0 ? modelStickerPack.stickers : list, (i & 4) != 0 ? modelStickerPack.name : str, (i & 8) != 0 ? modelStickerPack.storeListing : modelStickerPackStoreListing, (i & 16) != 0 ? modelStickerPack.skuId : j2, (i & 32) != 0 ? modelStickerPack.coverStickerId : l, (i & 64) != 0 ? modelStickerPack.description : str2, (i & 128) != 0 ? modelStickerPack.bannerAssetId : l2);
+        return modelStickerPack.copy((i & 1) != 0 ? modelStickerPack.f2546id : j, (i & 2) != 0 ? modelStickerPack.stickers : list, (i & 4) != 0 ? modelStickerPack.name : str, (i & 8) != 0 ? modelStickerPack.storeListing : modelStickerPackStoreListing, (i & 16) != 0 ? modelStickerPack.skuId : j2, (i & 32) != 0 ? modelStickerPack.coverStickerId : l, (i & 64) != 0 ? modelStickerPack.description : str2, (i & 128) != 0 ? modelStickerPack.bannerAssetId : l2);
     }
 
     public final boolean canBePurchased() {
@@ -44,7 +44,7 @@ public final class ModelStickerPack {
     }
 
     public final long component1() {
-        return this.f2548id;
+        return this.f2546id;
     }
 
     public final List<Sticker> component2() {
@@ -89,7 +89,7 @@ public final class ModelStickerPack {
             return false;
         }
         ModelStickerPack modelStickerPack = (ModelStickerPack) obj;
-        return this.f2548id == modelStickerPack.f2548id && m.areEqual(this.stickers, modelStickerPack.stickers) && m.areEqual(this.name, modelStickerPack.name) && m.areEqual(this.storeListing, modelStickerPack.storeListing) && this.skuId == modelStickerPack.skuId && m.areEqual(this.coverStickerId, modelStickerPack.coverStickerId) && m.areEqual(this.description, modelStickerPack.description) && m.areEqual(this.bannerAssetId, modelStickerPack.bannerAssetId);
+        return this.f2546id == modelStickerPack.f2546id && m.areEqual(this.stickers, modelStickerPack.stickers) && m.areEqual(this.name, modelStickerPack.name) && m.areEqual(this.storeListing, modelStickerPack.storeListing) && this.skuId == modelStickerPack.skuId && m.areEqual(this.coverStickerId, modelStickerPack.coverStickerId) && m.areEqual(this.description, modelStickerPack.description) && m.areEqual(this.bannerAssetId, modelStickerPack.bannerAssetId);
     }
 
     public final Long getBannerAssetId() {
@@ -132,7 +132,7 @@ public final class ModelStickerPack {
     }
 
     public final long getId() {
-        return this.f2548id;
+        return this.f2546id;
     }
 
     public final String getName() {
@@ -152,7 +152,7 @@ public final class ModelStickerPack {
     }
 
     public int hashCode() {
-        long j = this.f2548id;
+        long j = this.f2546id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         List<Sticker> list = this.stickers;
         int i2 = 0;
@@ -203,7 +203,7 @@ public final class ModelStickerPack {
 
     public String toString() {
         StringBuilder O = a.O("ModelStickerPack(id=");
-        O.append(this.f2548id);
+        O.append(this.f2546id);
         O.append(", stickers=");
         O.append(this.stickers);
         O.append(", name=");
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
index 42d0922ed3..2aad34648b 100644
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
+++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
@@ -11,7 +11,7 @@ public final class ModelStickerPackStoreListing {
     private final String description;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2549id;
+    private final long f2547id;
     private final ModelSku sku;
     private final ModelStoreAsset thumbnail;
     private final String unpublishedAt;
@@ -20,7 +20,7 @@ public final class ModelStickerPackStoreListing {
         m.checkNotNullParameter(modelSku, "sku");
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         this.sku = modelSku;
-        this.f2549id = j;
+        this.f2547id = j;
         this.description = str;
         this.unpublishedAt = str2;
         this.thumbnail = modelStoreAsset;
@@ -31,7 +31,7 @@ public final class ModelStickerPackStoreListing {
             modelSku = modelStickerPackStoreListing.sku;
         }
         if ((i & 2) != 0) {
-            j = modelStickerPackStoreListing.f2549id;
+            j = modelStickerPackStoreListing.f2547id;
         }
         if ((i & 4) != 0) {
             str = modelStickerPackStoreListing.description;
@@ -50,7 +50,7 @@ public final class ModelStickerPackStoreListing {
     }
 
     public final long component2() {
-        return this.f2549id;
+        return this.f2547id;
     }
 
     public final String component3() {
@@ -79,7 +79,7 @@ public final class ModelStickerPackStoreListing {
             return false;
         }
         ModelStickerPackStoreListing modelStickerPackStoreListing = (ModelStickerPackStoreListing) obj;
-        return m.areEqual(this.sku, modelStickerPackStoreListing.sku) && this.f2549id == modelStickerPackStoreListing.f2549id && m.areEqual(this.description, modelStickerPackStoreListing.description) && m.areEqual(this.unpublishedAt, modelStickerPackStoreListing.unpublishedAt) && m.areEqual(this.thumbnail, modelStickerPackStoreListing.thumbnail);
+        return m.areEqual(this.sku, modelStickerPackStoreListing.sku) && this.f2547id == modelStickerPackStoreListing.f2547id && m.areEqual(this.description, modelStickerPackStoreListing.description) && m.areEqual(this.unpublishedAt, modelStickerPackStoreListing.unpublishedAt) && m.areEqual(this.thumbnail, modelStickerPackStoreListing.thumbnail);
     }
 
     public final String getDescription() {
@@ -87,7 +87,7 @@ public final class ModelStickerPackStoreListing {
     }
 
     public final long getId() {
-        return this.f2549id;
+        return this.f2547id;
     }
 
     public final ModelSku getSku() {
@@ -110,7 +110,7 @@ public final class ModelStickerPackStoreListing {
         ModelSku modelSku = this.sku;
         int i = 0;
         int hashCode = modelSku != null ? modelSku.hashCode() : 0;
-        long j = this.f2549id;
+        long j = this.f2547id;
         int i2 = ((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         String str = this.description;
         int hashCode2 = (i2 + (str != null ? str.hashCode() : 0)) * 31;
@@ -127,7 +127,7 @@ public final class ModelStickerPackStoreListing {
         StringBuilder O = a.O("ModelStickerPackStoreListing(sku=");
         O.append(this.sku);
         O.append(", id=");
-        O.append(this.f2549id);
+        O.append(this.f2547id);
         O.append(", description=");
         O.append(this.description);
         O.append(", unpublishedAt=");
diff --git a/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java b/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java
index 4e8b9833ec..937d16390f 100644
--- a/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java
+++ b/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java
@@ -9,14 +9,14 @@ public final class ModelStoreAsset implements Serializable {
     private final Integer height;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2550id;
+    private final long f2548id;
     private final String mimeType;
     private final int size;
     private final Integer width;
 
     public ModelStoreAsset(long j, int i, String str, String str2, Integer num, Integer num2) {
         m.checkNotNullParameter(str, "mimeType");
-        this.f2550id = j;
+        this.f2548id = j;
         this.size = i;
         this.mimeType = str;
         this.filename = str2;
@@ -25,11 +25,11 @@ public final class ModelStoreAsset implements Serializable {
     }
 
     public static /* synthetic */ ModelStoreAsset copy$default(ModelStoreAsset modelStoreAsset, long j, int i, String str, String str2, Integer num, Integer num2, int i2, Object obj) {
-        return modelStoreAsset.copy((i2 & 1) != 0 ? modelStoreAsset.f2550id : j, (i2 & 2) != 0 ? modelStoreAsset.size : i, (i2 & 4) != 0 ? modelStoreAsset.mimeType : str, (i2 & 8) != 0 ? modelStoreAsset.filename : str2, (i2 & 16) != 0 ? modelStoreAsset.width : num, (i2 & 32) != 0 ? modelStoreAsset.height : num2);
+        return modelStoreAsset.copy((i2 & 1) != 0 ? modelStoreAsset.f2548id : j, (i2 & 2) != 0 ? modelStoreAsset.size : i, (i2 & 4) != 0 ? modelStoreAsset.mimeType : str, (i2 & 8) != 0 ? modelStoreAsset.filename : str2, (i2 & 16) != 0 ? modelStoreAsset.width : num, (i2 & 32) != 0 ? modelStoreAsset.height : num2);
     }
 
     public final long component1() {
-        return this.f2550id;
+        return this.f2548id;
     }
 
     public final int component2() {
@@ -66,7 +66,7 @@ public final class ModelStoreAsset implements Serializable {
             return false;
         }
         ModelStoreAsset modelStoreAsset = (ModelStoreAsset) obj;
-        return this.f2550id == modelStoreAsset.f2550id && this.size == modelStoreAsset.size && m.areEqual(this.mimeType, modelStoreAsset.mimeType) && m.areEqual(this.filename, modelStoreAsset.filename) && m.areEqual(this.width, modelStoreAsset.width) && m.areEqual(this.height, modelStoreAsset.height);
+        return this.f2548id == modelStoreAsset.f2548id && this.size == modelStoreAsset.size && m.areEqual(this.mimeType, modelStoreAsset.mimeType) && m.areEqual(this.filename, modelStoreAsset.filename) && m.areEqual(this.width, modelStoreAsset.width) && m.areEqual(this.height, modelStoreAsset.height);
     }
 
     public final String getFilename() {
@@ -78,7 +78,7 @@ public final class ModelStoreAsset implements Serializable {
     }
 
     public final long getId() {
-        return this.f2550id;
+        return this.f2548id;
     }
 
     public final String getMimeType() {
@@ -95,7 +95,7 @@ public final class ModelStoreAsset implements Serializable {
 
     @Override // java.lang.Object
     public int hashCode() {
-        long j = this.f2550id;
+        long j = this.f2548id;
         int i = ((((int) (j ^ (j >>> 32))) * 31) + this.size) * 31;
         String str = this.mimeType;
         int i2 = 0;
@@ -114,7 +114,7 @@ public final class ModelStoreAsset implements Serializable {
     @Override // java.lang.Object
     public String toString() {
         StringBuilder O = a.O("ModelStoreAsset(id=");
-        O.append(this.f2550id);
+        O.append(this.f2548id);
         O.append(", size=");
         O.append(this.size);
         O.append(", mimeType=");
diff --git a/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java b/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java
index 50166bb130..0c8a7ab009 100644
--- a/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java
+++ b/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java
@@ -8,11 +8,11 @@ public final class ModelStoreDirectoryLayout {
     private final List<Long> allSkus;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2551id;
+    private final long f2549id;
 
     public ModelStoreDirectoryLayout(long j, List<Long> list) {
         m.checkNotNullParameter(list, "allSkus");
-        this.f2551id = j;
+        this.f2549id = j;
         this.allSkus = list;
     }
 
@@ -20,7 +20,7 @@ public final class ModelStoreDirectoryLayout {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelStoreDirectoryLayout copy$default(ModelStoreDirectoryLayout modelStoreDirectoryLayout, long j, List list, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelStoreDirectoryLayout.f2551id;
+            j = modelStoreDirectoryLayout.f2549id;
         }
         if ((i & 2) != 0) {
             list = modelStoreDirectoryLayout.allSkus;
@@ -29,7 +29,7 @@ public final class ModelStoreDirectoryLayout {
     }
 
     public final long component1() {
-        return this.f2551id;
+        return this.f2549id;
     }
 
     public final List<Long> component2() {
@@ -49,7 +49,7 @@ public final class ModelStoreDirectoryLayout {
             return false;
         }
         ModelStoreDirectoryLayout modelStoreDirectoryLayout = (ModelStoreDirectoryLayout) obj;
-        return this.f2551id == modelStoreDirectoryLayout.f2551id && m.areEqual(this.allSkus, modelStoreDirectoryLayout.allSkus);
+        return this.f2549id == modelStoreDirectoryLayout.f2549id && m.areEqual(this.allSkus, modelStoreDirectoryLayout.allSkus);
     }
 
     public final List<Long> getAllSkus() {
@@ -57,11 +57,11 @@ public final class ModelStoreDirectoryLayout {
     }
 
     public final long getId() {
-        return this.f2551id;
+        return this.f2549id;
     }
 
     public int hashCode() {
-        long j = this.f2551id;
+        long j = this.f2549id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         List<Long> list = this.allSkus;
         return i + (list != null ? list.hashCode() : 0);
@@ -69,7 +69,7 @@ public final class ModelStoreDirectoryLayout {
 
     public String toString() {
         StringBuilder O = a.O("ModelStoreDirectoryLayout(id=");
-        O.append(this.f2551id);
+        O.append(this.f2549id);
         O.append(", allSkus=");
         return a.H(O, this.allSkus, ")");
     }
diff --git a/app/src/main/java/com/discord/models/user/CoreUser.java b/app/src/main/java/com/discord/models/user/CoreUser.java
index f42a499895..aeb1c75745 100644
--- a/app/src/main/java/com/discord/models/user/CoreUser.java
+++ b/app/src/main/java/com/discord/models/user/CoreUser.java
@@ -20,7 +20,7 @@ public final class CoreUser implements User {
     private final int flags;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2552id;
+    private final long f2550id;
     private final boolean isBot;
     private final boolean isSystemUser;
     private final PremiumTier premiumTier;
@@ -116,7 +116,7 @@ public final class CoreUser implements User {
     public CoreUser(long j, String str, String str2, String str3, boolean z2, boolean z3, int i, PremiumTier premiumTier, int i2, int i3, String str4, String str5) {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(premiumTier, "premiumTier");
-        this.f2552id = j;
+        this.f2550id = j;
         this.username = str;
         this.avatar = str2;
         this.banner = str3;
@@ -264,7 +264,7 @@ public final class CoreUser implements User {
 
     @Override // com.discord.models.user.User
     public long getId() {
-        return this.f2552id;
+        return this.f2550id;
     }
 
     @Override // com.discord.models.user.User
diff --git a/app/src/main/java/com/discord/models/user/MeUser.java b/app/src/main/java/com/discord/models/user/MeUser.java
index 268466f2dc..11489b30ed 100644
--- a/app/src/main/java/com/discord/models/user/MeUser.java
+++ b/app/src/main/java/com/discord/models/user/MeUser.java
@@ -25,7 +25,7 @@ public final class MeUser implements User {
     private final boolean hasBirthday;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2553id;
+    private final long f2551id;
     private final boolean isBot;
     private final boolean isSystemUser;
     private final boolean isVerified;
@@ -176,7 +176,7 @@ public final class MeUser implements User {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(premiumTier, "premiumTier");
         m.checkNotNullParameter(nsfwAllowance, "nsfwAllowance");
-        this.f2553id = j;
+        this.f2551id = j;
         this.username = str;
         this.avatar = str2;
         this.banner = str3;
@@ -383,7 +383,7 @@ public final class MeUser implements User {
 
     @Override // com.discord.models.user.User
     public long getId() {
-        return this.f2553id;
+        return this.f2551id;
     }
 
     public final boolean getMfaEnabled() {
diff --git a/app/src/main/java/com/discord/overlay/OverlayManager.java b/app/src/main/java/com/discord/overlay/OverlayManager.java
index 2185b2e2e2..dc47534197 100644
--- a/app/src/main/java/com/discord/overlay/OverlayManager.java
+++ b/app/src/main/java/com/discord/overlay/OverlayManager.java
@@ -29,7 +29,7 @@ public class OverlayManager implements Closeable {
     public final Context q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final WindowManager f2554r;
+    public final WindowManager f2552r;
 
     public OverlayManager(Context context, WindowManager windowManager, int i) {
         WindowManager windowManager2;
@@ -43,7 +43,7 @@ public class OverlayManager implements Closeable {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(windowManager2, "windowManager");
         this.q = context;
-        this.f2554r = windowManager2;
+        this.f2552r = windowManager2;
         ArrayList<OverlayBubbleWrap> arrayList = new ArrayList<>(5);
         this.i = arrayList;
         this.j = arrayList;
@@ -54,7 +54,7 @@ public class OverlayManager implements Closeable {
 
     public final void a(OverlayBubbleWrap overlayBubbleWrap) {
         m.checkNotNullParameter(overlayBubbleWrap, "bubble");
-        this.f2554r.addView(overlayBubbleWrap, overlayBubbleWrap.getWindowLayoutParams());
+        this.f2552r.addView(overlayBubbleWrap, overlayBubbleWrap.getWindowLayoutParams());
         this.i.add(overlayBubbleWrap);
         this.k.invoke(overlayBubbleWrap);
     }
@@ -87,7 +87,7 @@ public class OverlayManager implements Closeable {
         r.removeAll((List) this.i, (Function1) new b(this));
         a aVar = this.m;
         if (aVar != null) {
-            this.f2554r.removeView(aVar);
+            this.f2552r.removeView(aVar);
         }
         this.m = null;
     }
@@ -95,7 +95,7 @@ public class OverlayManager implements Closeable {
     public final void d(OverlayBubbleWrap overlayBubbleWrap) {
         m.checkNotNullParameter(overlayBubbleWrap, "bubble");
         if (this.i.remove(overlayBubbleWrap)) {
-            this.f2554r.removeViewImmediate(overlayBubbleWrap);
+            this.f2552r.removeViewImmediate(overlayBubbleWrap);
             this.l.invoke(overlayBubbleWrap);
         }
     }
diff --git a/app/src/main/java/com/discord/overlay/OverlayService.java b/app/src/main/java/com/discord/overlay/OverlayService.java
index 48a59e14b4..04ad54e853 100644
--- a/app/src/main/java/com/discord/overlay/OverlayService.java
+++ b/app/src/main/java/com/discord/overlay/OverlayService.java
@@ -115,7 +115,7 @@ public abstract class OverlayService extends Service {
         Objects.requireNonNull(overlayManager3);
         m.checkNotNullParameter(aVar, "trashWrap");
         overlayManager3.m = aVar;
-        overlayManager3.f2554r.addView(aVar, aVar.getWindowLayoutParams());
+        overlayManager3.f2552r.addView(aVar, aVar.getWindowLayoutParams());
         return true;
     }
 
diff --git a/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java b/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java
index 779e0b4f3f..cc3fb56da1 100644
--- a/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java
+++ b/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java
@@ -40,7 +40,7 @@ public class OverlayBubbleWrap extends FrameLayout {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2555r;
+    public int f2553r;
     public final SpringAnimation s;
     public final SpringAnimation t;
     public Point u;
@@ -230,7 +230,7 @@ public class OverlayBubbleWrap extends FrameLayout {
                         }
                     } else {
                         this.u.x = ((int) motionEvent.getRawX()) - this.q;
-                        this.u.y = ((int) motionEvent.getRawY()) - this.f2555r;
+                        this.u.y = ((int) motionEvent.getRawY()) - this.f2553r;
                         if (ViewCompat.isAttachedToWindow(this) && this.v == null) {
                             WindowManager.LayoutParams layoutParams = this.k;
                             Point point = this.u;
@@ -245,7 +245,7 @@ public class OverlayBubbleWrap extends FrameLayout {
             }
         } else {
             this.q = ((int) motionEvent.getRawX()) - this.k.x;
-            this.f2555r = ((int) motionEvent.getRawY()) - this.k.y;
+            this.f2553r = ((int) motionEvent.getRawY()) - this.k.y;
         }
         return super.dispatchTouchEvent(motionEvent);
     }
diff --git a/app/src/main/java/com/discord/player/AppMediaPlayer.java b/app/src/main/java/com/discord/player/AppMediaPlayer.java
index 8a4eab8042..44ffa6048a 100644
--- a/app/src/main/java/com/discord/player/AppMediaPlayer.java
+++ b/app/src/main/java/com/discord/player/AppMediaPlayer.java
@@ -61,7 +61,7 @@ public final class AppMediaPlayer {
     public Subscription b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final CompositeSubscription f2556c;
+    public final CompositeSubscription f2554c;
     public final BehaviorSubject<Float> d;
     public MediaSource e;
     public final p1 f;
@@ -161,25 +161,25 @@ public final class AppMediaPlayer {
         this.h = aVar;
         this.i = scheduler;
         this.j = logger;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.a = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.a = k0;
         CompositeSubscription compositeSubscription = new CompositeSubscription();
-        this.f2556c = compositeSubscription;
-        BehaviorSubject<Float> k0 = BehaviorSubject.k0(Float.valueOf(p1Var.B));
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(exoPlayer.volume)");
-        this.d = k0;
+        this.f2554c = compositeSubscription;
+        BehaviorSubject<Float> l0 = BehaviorSubject.l0(Float.valueOf(p1Var.B));
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(exoPlayer.volume)");
+        this.d = l0;
         PublishSubject<k.c> publishSubject = kVar.i;
         m.checkNotNullExpressionValue(publishSubject, "playerStateChangeSubject");
-        compositeSubscription.a(publishSubject.I().V(new e(this), new f(this)));
+        compositeSubscription.a(publishSubject.J().W(new e(this), new f(this)));
         PublishSubject<k.a> publishSubject2 = kVar.j;
         m.checkNotNullExpressionValue(publishSubject2, "isPlayingChangeSubject");
-        compositeSubscription.a(publishSubject2.J().V(new a(this), new b(this)));
+        compositeSubscription.a(publishSubject2.K().W(new a(this), new b(this)));
         MediaSource mediaSource = this.e;
         String str = (mediaSource == null || (str = mediaSource.j) == null) ? "" : str;
         PublishSubject<k.b> publishSubject3 = kVar.k;
         m.checkNotNullExpressionValue(publishSubject3, "playerErrorSubject");
-        compositeSubscription.a(publishSubject3.I().V(new c(this, str), new d(this)));
+        compositeSubscription.a(publishSubject3.J().W(new c(this, str), new d(this)));
     }
 
     public static /* synthetic */ void b(AppMediaPlayer appMediaPlayer, MediaSource mediaSource, boolean z2, boolean z3, long j, PlayerView playerView, PlayerControlView playerControlView, int i) {
@@ -287,7 +287,7 @@ public final class AppMediaPlayer {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        this.f2556c.unsubscribe();
+        this.f2554c.unsubscribe();
         p1 p1Var = this.f;
         p1Var.Z();
         if (f0.a < 21 && (audioTrack = p1Var.f1000r) != null) {
diff --git a/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java b/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java
index ead9ff8ff4..1452f8e63d 100644
--- a/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java
@@ -19,7 +19,7 @@ public final class BreadcrumbInterceptor implements Interceptor {
     public Response intercept(Interceptor.Chain chain) {
         m.checkNotNullParameter(chain, "chain");
         Request c2 = chain.c();
-        String str = c2.f3127c;
+        String str = c2.f3125c;
         w wVar = c2.b;
         Logger logger = this.logger;
         logger.recordBreadcrumb("HTTP[" + str + "] - " + wVar, "http");
diff --git a/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java b/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
index fc11923c51..b6fe651e9e 100644
--- a/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
@@ -47,7 +47,7 @@ public final class RequiredHeadersInterceptor implements Interceptor {
         m.checkParameterIsNotNull(c2, "request");
         new LinkedHashMap();
         w wVar = c2.b;
-        String str = c2.f3127c;
+        String str = c2.f3125c;
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
diff --git a/app/src/main/java/com/discord/restapi/RestAPIBuilder.java b/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
index 231e5209f4..63ad718627 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
@@ -184,7 +184,7 @@ public final class RestAPIBuilder {
         if (list != null) {
             for (Interceptor interceptor : list) {
                 m.checkParameterIsNotNull(interceptor, "interceptor");
-                aVar.f3027c.add(interceptor);
+                aVar.f3025c.add(interceptor);
             }
         }
         if (l != null) {
@@ -193,10 +193,10 @@ public final class RestAPIBuilder {
             aVar.a(longValue, timeUnit);
             long longValue2 = l.longValue();
             m.checkParameterIsNotNull(timeUnit, "unit");
-            aVar.f3032z = e0.e0.c.b("timeout", longValue2, timeUnit);
+            aVar.f3030z = e0.e0.c.b("timeout", longValue2, timeUnit);
             long longValue3 = l.longValue();
             m.checkParameterIsNotNull(timeUnit, "unit");
-            aVar.f3030x = e0.e0.c.b("timeout", longValue3, timeUnit);
+            aVar.f3028x = e0.e0.c.b("timeout", longValue3, timeUnit);
         }
         p pVar = this.cookieJar;
         m.checkParameterIsNotNull(pVar, "cookieJar");
diff --git a/app/src/main/java/com/discord/restapi/RestAPIParams.java b/app/src/main/java/com/discord/restapi/RestAPIParams.java
index bf2d8bc9b3..d41be4e92b 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIParams.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIParams.java
@@ -394,7 +394,7 @@ public final class RestAPIParams {
         private final Long deny;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2557id;
+        private final String f2555id;
         private final Integer type;
 
         /* compiled from: RestAPIParams.kt */
@@ -442,7 +442,7 @@ public final class RestAPIParams {
 
         private ChannelPermissionOverwrites(Integer num, String str, Long l, Long l2) {
             this.type = num;
-            this.f2557id = str;
+            this.f2555id = str;
             this.allow = l;
             this.deny = l2;
         }
@@ -466,7 +466,7 @@ public final class RestAPIParams {
         public static final long PARENT_ID_NONE = -1;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2558id;
+        private final long f2556id;
         private final Long parentId;
         private final int position;
 
@@ -503,13 +503,13 @@ public final class RestAPIParams {
         }
 
         public ChannelPosition(long j, int i, Long l) {
-            this.f2558id = j;
+            this.f2556id = j;
             this.position = i;
             this.parentId = l;
         }
 
         public final long getId() {
-            return this.f2558id;
+            return this.f2556id;
         }
 
         public final Long getParentId() {
@@ -965,7 +965,7 @@ public final class RestAPIParams {
         private final boolean friend_sync;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2559id;
+        private final String f2557id;
         private final String name;
         private final boolean revoked;
         private final boolean show_activity;
@@ -998,7 +998,7 @@ public final class RestAPIParams {
             m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(str3, "type");
             this.friend_sync = z2;
-            this.f2559id = str;
+            this.f2557id = str;
             this.name = str2;
             this.revoked = z3;
             this.show_activity = z4;
@@ -1225,7 +1225,7 @@ public final class RestAPIParams {
     public static final class CreateGuildChannel {
 
         /* renamed from: id  reason: collision with root package name */
-        private final Long f2560id;
+        private final Long f2558id;
         private final String name;
         private final Long parentId;
         private final List<ChannelPermissionOverwrites> permissionOverwrites;
@@ -1234,7 +1234,7 @@ public final class RestAPIParams {
 
         public CreateGuildChannel(int i, Long l, String str, Long l2, List<ChannelPermissionOverwrites> list, String str2) {
             this.type = i;
-            this.f2560id = l;
+            this.f2558id = l;
             this.name = str;
             this.parentId = l2;
             this.permissionOverwrites = list;
@@ -1742,12 +1742,12 @@ public final class RestAPIParams {
     public static final class EnableIntegration {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2561id;
+        private final String f2559id;
         private final String type;
 
         public EnableIntegration(String str, String str2) {
             this.type = str;
-            this.f2561id = str2;
+            this.f2559id = str2;
         }
     }
 
@@ -2747,7 +2747,7 @@ public final class RestAPIParams {
         private String icon;
 
         /* renamed from: id  reason: collision with root package name */
-        private long f2562id;
+        private long f2560id;
         private Boolean mentionable;
         private String name;
         private Long permissions;
@@ -2783,7 +2783,7 @@ public final class RestAPIParams {
             this.color = num;
             this.position = num2;
             this.permissions = l;
-            this.f2562id = j;
+            this.f2560id = j;
             this.icon = str2;
         }
 
@@ -2813,7 +2813,7 @@ public final class RestAPIParams {
         }
 
         public final long getId() {
-            return this.f2562id;
+            return this.f2560id;
         }
 
         public final Boolean getMentionable() {
@@ -2845,7 +2845,7 @@ public final class RestAPIParams {
         }
 
         public final void setId(long j) {
-            this.f2562id = j;
+            this.f2560id = j;
         }
 
         public final void setMentionable(Boolean bool) {
diff --git a/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java b/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
index b34b801a47..eec0433c4d 100644
--- a/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
@@ -32,7 +32,7 @@ public final class SpotifyTokenInterceptor implements Interceptor {
         m.checkParameterIsNotNull(c2, "request");
         new LinkedHashMap();
         w wVar = c2.b;
-        String str = c2.f3127c;
+        String str = c2.f3125c;
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
diff --git a/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java b/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java
index 0a0e0f1fac..7fed40f45a 100644
--- a/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java
+++ b/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java
@@ -54,7 +54,7 @@ public final class CountingRequestBody extends RequestBody {
         m.checkNotNullParameter(requestBody, "delegate");
         this.delegate = requestBody;
         this.ignoreWriteToCount = i;
-        this.bytesWrittenSubject = BehaviorSubject.k0(0L);
+        this.bytesWrittenSubject = BehaviorSubject.l0(0L);
         this.estimatedContentLength = requestBody.contentLength();
     }
 
@@ -84,9 +84,9 @@ public final class CountingRequestBody extends RequestBody {
     }
 
     public final Observable<Long> getBytesWrittenObservable() {
-        Observable<Long> J = this.bytesWrittenSubject.q().J();
-        m.checkNotNullExpressionValue(J, "bytesWrittenSubject.dist…().onBackpressureLatest()");
-        return J;
+        Observable<Long> K = this.bytesWrittenSubject.q().K();
+        m.checkNotNullExpressionValue(K, "bytesWrittenSubject.dist…().onBackpressureLatest()");
+        return K;
     }
 
     public final long getEstimatedContentLength() {
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
index bb8948a43f..ccb0d0f72f 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
@@ -33,7 +33,7 @@ public final class RetryWithDelay$restRetry$1 extends o implements Function1<Thr
             HttpException httpException = (HttpException) th;
             int a = httpException.a();
             retrofit2.Response<?> response2 = httpException.i;
-            if (!(response2 == null || (response = response2.a) == null || (request = response.i) == null || (str = request.f3127c) == null || !(!m.areEqual(str, ShareTarget.METHOD_GET))) || a == 401 || a == 429 || a == 503 || a == 403 || a == 404) {
+            if (!(response2 == null || (response = response2.a) == null || (request = response.i) == null || (str = request.f3125c) == null || !(!m.areEqual(str, ShareTarget.METHOD_GET))) || a == 401 || a == 429 || a == 503 || a == 403 || a == 404) {
                 return false;
             }
         } else if (th instanceof TimeoutException) {
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java
index 1352fb87b8..6fbbd0b5b8 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java
@@ -40,9 +40,9 @@ public final class RetryWithDelay$retryWithDelay$1<T, R> implements b<Throwable,
                 if (i2 < this.$maxHalfLives && i3 > 1) {
                     this.$currentDelayMillis.element *= (long) 2;
                 }
-                return Observable.c0(this.$currentDelayMillis.element, TimeUnit.MILLISECONDS);
+                return Observable.d0(this.$currentDelayMillis.element, TimeUnit.MILLISECONDS);
             }
         }
-        return Observable.v(th);
+        return Observable.w(th);
     }
 }
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java
index 9d7fbe0140..f9928fbb1e 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java
@@ -51,24 +51,24 @@ public final class RetryWithDelay {
         ref$IntRef2.element = 0;
         Ref$LongRef ref$LongRef = new Ref$LongRef();
         ref$LongRef.element = j;
-        Observable<R> y2 = observable.y(new RetryWithDelay$retryWithDelay$1(intValue, ref$IntRef, function1, intValue2, ref$IntRef2, ref$LongRef));
-        m.checkNotNullExpressionValue(y2, "flatMap {\n      if (curr…able.error<Any>(it)\n    }");
-        return y2;
+        Observable<R> z2 = observable.z(new RetryWithDelay$retryWithDelay$1(intValue, ref$IntRef, function1, intValue2, ref$IntRef2, ref$LongRef));
+        m.checkNotNullExpressionValue(z2, "flatMap {\n      if (curr…able.error<Any>(it)\n    }");
+        return z2;
     }
 
     public final <T> Observable<T> restRetry(Observable<T> observable, long j, Integer num, Integer num2) {
         m.checkNotNullParameter(observable, "$this$restRetry");
         RetryWithDelay$restRetry$1 retryWithDelay$restRetry$1 = RetryWithDelay$restRetry$1.INSTANCE;
-        Observable<T> M = observable.M(new RetryWithDelay$restRetry$2(j, num, num2));
-        m.checkNotNullExpressionValue(M, "retryWhen { it.retryWith…ries, ::isNetworkError) }");
-        return M;
+        Observable<T> N = observable.N(new RetryWithDelay$restRetry$2(j, num, num2));
+        m.checkNotNullExpressionValue(N, "retryWhen { it.retryWith…ries, ::isNetworkError) }");
+        return N;
     }
 
     public final <T> Observable<T> restRetry(Observable<T> observable, long j, Integer num, Integer num2, Function1<? super Throwable, Boolean> function1) {
         m.checkNotNullParameter(observable, "$this$restRetry");
         m.checkNotNullParameter(function1, "predicate");
-        Observable<T> M = observable.M(new RetryWithDelay$restRetry$3(j, num, num2, function1));
-        m.checkNotNullExpressionValue(M, "retryWhen { it.retryWith… maxRetries, predicate) }");
-        return M;
+        Observable<T> N = observable.N(new RetryWithDelay$restRetry$3(j, num, num2, function1));
+        m.checkNotNullExpressionValue(N, "retryWhen { it.retryWith… maxRetries, predicate) }");
+        return N;
     }
 }
diff --git a/app/src/main/java/com/discord/rlottie/RLottieDrawable.java b/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
index 7568ffe336..2055220b72 100644
--- a/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
+++ b/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
@@ -67,23 +67,23 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
     public final int[] q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2563r;
+    public int f2561r;
     public Integer[] s;
     public final HashMap<String, Integer> t;
     public volatile HashMap<String, Integer> u;
     public PlaybackMode v;
 
     /* renamed from: w  reason: collision with root package name */
-    public int f2564w;
+    public int f2562w;
 
     /* renamed from: x  reason: collision with root package name */
-    public long f2565x;
+    public long f2563x;
 
     /* renamed from: y  reason: collision with root package name */
-    public volatile boolean f2566y;
+    public volatile boolean f2564y;
 
     /* renamed from: z  reason: collision with root package name */
-    public Runnable f2567z;
+    public Runnable f2565z;
 
     /* compiled from: RLottieDrawable.kt */
     public static final class Companion {
@@ -192,20 +192,20 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
                                 PlaybackMode playbackMode = rLottieDrawable8.v;
                                 if (playbackMode == PlaybackMode.LOOP) {
                                     rLottieDrawable8.H = 0;
-                                    rLottieDrawable8.f2566y = false;
+                                    rLottieDrawable8.f2564y = false;
                                 } else if (playbackMode == PlaybackMode.ONCE) {
                                     rLottieDrawable8.H = 0;
-                                    rLottieDrawable8.f2566y = true;
-                                    ((RLottieDrawable) this.j).f2564w++;
+                                    rLottieDrawable8.f2564y = true;
+                                    ((RLottieDrawable) this.j).f2562w++;
                                 } else {
-                                    rLottieDrawable8.f2566y = true;
+                                    rLottieDrawable8.f2564y = true;
                                 }
                             } else if (rLottieDrawable8.v == PlaybackMode.FREEZE) {
-                                rLottieDrawable8.f2566y = true;
-                                ((RLottieDrawable) this.j).f2564w++;
+                                rLottieDrawable8.f2564y = true;
+                                ((RLottieDrawable) this.j).f2562w++;
                             } else {
                                 rLottieDrawable8.H = i5;
-                                rLottieDrawable8.f2566y = false;
+                                rLottieDrawable8.f2564y = false;
                             }
                         } catch (Exception e) {
                             Log.e("RLottieDrawable", "Error loading frame", e);
@@ -221,7 +221,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
                     return;
                 case 2:
                     RLottieDrawable rLottieDrawable10 = (RLottieDrawable) this.j;
-                    rLottieDrawable10.f2567z = null;
+                    rLottieDrawable10.f2565z = null;
                     RLottieDrawable.a(rLottieDrawable10);
                     return;
                 case 3:
@@ -230,14 +230,14 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
                     if (!(((RLottieDrawable) this.j).P == 0 || (threadPoolExecutor = RLottieDrawable.m) == null)) {
                         RLottieDrawable rLottieDrawable11 = (RLottieDrawable) this.j;
                         Runnable runnable = rLottieDrawable11.U;
-                        rLottieDrawable11.f2567z = runnable;
+                        rLottieDrawable11.f2565z = runnable;
                         threadPoolExecutor.execute(runnable);
                     }
                     RLottieDrawable.a((RLottieDrawable) this.j);
                     return;
                 case 4:
                     RLottieDrawable rLottieDrawable12 = (RLottieDrawable) this.j;
-                    if (rLottieDrawable12.f2567z != null) {
+                    if (rLottieDrawable12.f2565z != null) {
                         Companion companion2 = RLottieDrawable.n;
                         long j2 = rLottieDrawable12.P;
                         RLottieDrawable rLottieDrawable13 = (RLottieDrawable) this.j;
@@ -307,7 +307,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
             m.checkExpressionValueIsNotNull(paint, "paint");
             paint.setFlags(2);
             this.P = n.createWithJson(str2, str, this.q, iArr);
-            this.f2563r = Math.max(16, (int) (1000.0f / ((float) this.q[1])));
+            this.f2561r = Math.max(16, (int) (1000.0f / ((float) this.q[1])));
             this.v = PlaybackMode.LOOP;
             if (z2) {
                 e(true);
@@ -355,7 +355,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
         if (this.I && iArr2[1] < 60) {
             this.I = false;
         }
-        this.f2563r = Math.max(this.I ? 33 : 16, (int) (1000.0f / ((float) iArr2[1])));
+        this.f2561r = Math.max(this.I ? 33 : 16, (int) (1000.0f / ((float) iArr2[1])));
     }
 
     public static final void a(RLottieDrawable rLottieDrawable) {
@@ -447,9 +447,9 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
         m.checkParameterIsNotNull(canvas, "canvas");
         if (this.P != 0) {
             long elapsedRealtime = SystemClock.elapsedRealtime();
-            long abs = Math.abs(elapsedRealtime - this.f2565x);
+            long abs = Math.abs(elapsedRealtime - this.f2563x);
             float f = (float) 60;
-            int i2 = this.J <= f ? this.f2563r - 6 : this.f2563r;
+            int i2 = this.J <= f ? this.f2561r - 6 : this.f2561r;
             if (this.O) {
                 if (this.B == null && this.C == null) {
                     d();
@@ -471,7 +471,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
                     if (z2) {
                         this.D = this.B;
                         this.B = this.C;
-                        if (this.f2566y) {
+                        if (this.f2564y) {
                             this.O = false;
                         }
                         this.A = null;
@@ -480,7 +480,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
                         if (this.J > f) {
                             elapsedRealtime -= Math.min(16L, abs - ((long) i2));
                         }
-                        this.f2565x = elapsedRealtime;
+                        this.f2563x = elapsedRealtime;
                         d();
                     }
                 }
@@ -493,7 +493,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
                 if (this.J > f) {
                     elapsedRealtime -= Math.min(16L, abs - ((long) i2));
                 }
-                this.f2565x = elapsedRealtime;
+                this.f2563x = elapsedRealtime;
                 if (this.G) {
                     this.F = false;
                     this.G = false;
@@ -580,7 +580,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable {
         if (this.O) {
             return;
         }
-        if (this.v.compareTo(PlaybackMode.ONCE) < 0 || this.f2564w == 0) {
+        if (this.v.compareTo(PlaybackMode.ONCE) < 0 || this.f2562w == 0) {
             this.O = true;
             d();
             c();
diff --git a/app/src/main/java/com/discord/rlottie/RLottieImageView.java b/app/src/main/java/com/discord/rlottie/RLottieImageView.java
index c795a23beb..e0d20036f5 100644
--- a/app/src/main/java/com/discord/rlottie/RLottieImageView.java
+++ b/app/src/main/java/com/discord/rlottie/RLottieImageView.java
@@ -89,7 +89,7 @@ public class RLottieImageView extends AppCompatImageView {
                 f = 1.0f;
             }
             rLottieDrawable.H = (int) (((float) rLottieDrawable.q[0]) * f);
-            rLottieDrawable.f2566y = false;
+            rLottieDrawable.f2564y = false;
             rLottieDrawable.F = false;
             if (!rLottieDrawable.d()) {
                 rLottieDrawable.G = true;
diff --git a/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java b/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java
index 94ebaa9ce6..468299c4fd 100644
--- a/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java
+++ b/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java
@@ -10,7 +10,7 @@ public final class KrispOveruseDetector {
     public OutboundRtpAudio b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2568c;
+    public int f2566c;
     public final MediaEngineConnection d;
 
     /* compiled from: KrispOveruseDetector.kt */
diff --git a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java
index 0a583b2475..16af78d5d7 100644
--- a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java
+++ b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java
@@ -32,7 +32,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
     public final Map<Long, List<b>> b = new LinkedHashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<Long> f2569c;
+    public final Set<Long> f2567c;
     public MediaEngineConnection d;
     public Long e;
     public final BehaviorSubject<Map<String, EncodeQuality>> f;
@@ -77,13 +77,13 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final VideoMetadata f2570c;
+        public final VideoMetadata f2568c;
 
         public b(EncodeQuality encodeQuality, long j, VideoMetadata videoMetadata) {
             m.checkNotNullParameter(encodeQuality, "encodeQuality");
             this.a = encodeQuality;
             this.b = j;
-            this.f2570c = videoMetadata;
+            this.f2568c = videoMetadata;
         }
 
         public boolean equals(Object obj) {
@@ -94,14 +94,14 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
                 return false;
             }
             b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && this.b == bVar.b && m.areEqual(this.f2570c, bVar.f2570c);
+            return m.areEqual(this.a, bVar.a) && this.b == bVar.b && m.areEqual(this.f2568c, bVar.f2568c);
         }
 
         public int hashCode() {
             EncodeQuality encodeQuality = this.a;
             int i = 0;
             int a = (z.a.a.b.a(this.b) + ((encodeQuality != null ? encodeQuality.hashCode() : 0) * 31)) * 31;
-            VideoMetadata videoMetadata = this.f2570c;
+            VideoMetadata videoMetadata = this.f2568c;
             if (videoMetadata != null) {
                 i = videoMetadata.hashCode();
             }
@@ -114,7 +114,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
             O.append(", ssrc=");
             O.append(this.b);
             O.append(", metadata=");
-            O.append(this.f2570c);
+            O.append(this.f2568c);
             O.append(")");
             return O.toString();
         }
@@ -159,8 +159,8 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
         this.k = logger;
         this.l = aVar;
         new LinkedHashMap();
-        this.f2569c = new LinkedHashSet();
-        this.f = BehaviorSubject.k0(g0.mapOf(c0.o.to("any", EncodeQuality.Hundred)));
+        this.f2567c = new LinkedHashSet();
+        this.f = BehaviorSubject.l0(g0.mapOf(c0.o.to("any", EncodeQuality.Hundred)));
         this.g = h0.emptyMap();
     }
 
@@ -204,7 +204,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
             e eVar = this.j;
             int i2 = 1;
             if (mediaEngineConnection != null) {
-                Set<Long> set = this.f2569c;
+                Set<Long> set = this.f2567c;
                 if (!(set instanceof Collection) || !set.isEmpty()) {
                     i = 0;
                     for (Number number : set) {
@@ -291,7 +291,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d {
                                         if (l4 != null) {
                                             it2 = it;
                                             j = longValue;
-                                            this.l.a(longValue, l4.longValue(), bVar.b, bVar.f2570c);
+                                            this.l.a(longValue, l4.longValue(), bVar.b, bVar.f2568c);
                                         } else {
                                             it2 = it;
                                             j = longValue;
diff --git a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
index c302a98d89..e90545cb39 100644
--- a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
+++ b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
@@ -80,13 +80,13 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     public final String Z;
 
     /* renamed from: a0  reason: collision with root package name */
-    public final boolean f2571a0;
+    public final boolean f2569a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public final String f2572b0;
+    public final String f2570b0;
 
     /* renamed from: c0  reason: collision with root package name */
-    public final String f2573c0;
+    public final String f2571c0;
     public final String k;
     public final String l;
     public final List<c> m;
@@ -96,23 +96,23 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     public MediaEngineConnection.TransportInfo q;
 
     /* renamed from: r  reason: collision with root package name */
-    public StateChange f2574r;
+    public StateChange f2572r;
     public BehaviorSubject<StateChange> s;
     public boolean t;
     public List<Long> u;
     public c.a.q.n0.a v;
 
     /* renamed from: w  reason: collision with root package name */
-    public MediaEngineConnection f2575w;
+    public MediaEngineConnection f2573w;
 
     /* renamed from: x  reason: collision with root package name */
-    public String f2576x;
+    public String f2574x;
 
     /* renamed from: y  reason: collision with root package name */
-    public Integer f2577y;
+    public Integer f2575y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2578z;
+    public int f2576z;
 
     /* compiled from: RtcConnection.kt */
     public enum AnalyticsEvent {
@@ -129,7 +129,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         public final String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Long f2579c;
+        public final Long f2577c;
         public final Long d;
         public final String e;
 
@@ -137,7 +137,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             m.checkNotNullParameter(str, "rtcConnectionId");
             this.a = str;
             this.b = str2;
-            this.f2579c = l;
+            this.f2577c = l;
             this.d = l2;
             this.e = str3;
         }
@@ -150,7 +150,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
                 return false;
             }
             Metadata metadata = (Metadata) obj;
-            return m.areEqual(this.a, metadata.a) && m.areEqual(this.b, metadata.b) && m.areEqual(this.f2579c, metadata.f2579c) && m.areEqual(this.d, metadata.d) && m.areEqual(this.e, metadata.e);
+            return m.areEqual(this.a, metadata.a) && m.areEqual(this.b, metadata.b) && m.areEqual(this.f2577c, metadata.f2577c) && m.areEqual(this.d, metadata.d) && m.areEqual(this.e, metadata.e);
         }
 
         public int hashCode() {
@@ -159,7 +159,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.b;
             int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
-            Long l = this.f2579c;
+            Long l = this.f2577c;
             int hashCode3 = (hashCode2 + (l != null ? l.hashCode() : 0)) * 31;
             Long l2 = this.d;
             int hashCode4 = (hashCode3 + (l2 != null ? l2.hashCode() : 0)) * 31;
@@ -176,7 +176,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             O.append(", mediaSessionId=");
             O.append(this.b);
             O.append(", channelId=");
-            O.append(this.f2579c);
+            O.append(this.f2577c);
             O.append(", guildId=");
             O.append(this.d);
             O.append(", streamKey=");
@@ -530,9 +530,9 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         this.X = linkedHashMap;
         this.Y = linkedHashMap2;
         this.Z = str6;
-        this.f2571a0 = z4;
-        this.f2572b0 = str4;
-        this.f2573c0 = str7;
+        this.f2569a0 = z4;
+        this.f2570b0 = str4;
+        this.f2571c0 = str7;
         StringBuilder S = c.d.b.a.a.S(str4, "->RtcConnection ");
         int i3 = i + 1;
         i = i3;
@@ -545,8 +545,8 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         this.m = arrayList;
         this.p = new Backoff(1000, 10000, 0, false, null, 28, null);
         StateChange stateChange = new StateChange(new State.d(false), null);
-        this.f2574r = stateChange;
-        this.s = BehaviorSubject.k0(stateChange);
+        this.f2572r = stateChange;
+        this.s = BehaviorSubject.l0(stateChange);
         this.u = new ArrayList();
         c.a.q.o0.e eVar = new c.a.q.o0.e(logger, clock);
         eVar.f.add(new x(this));
@@ -563,11 +563,11 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             m.checkNotNull(mediaSinkWantsManager);
             Observable<Map<String, EncodeQuality>> q = mediaSinkWantsManager.f.q();
             m.checkNotNullExpressionValue(q, "mediaSinkWantsSubject.distinctUntilChanged()");
-            subscription = Observable.j(q, this.s, z.i).U(new g0(new a0(this)));
+            subscription = Observable.j(q, this.s, z.i).V(new g0(new a0(this)));
         }
         this.H = subscription;
         r("Created RtcConnection. GuildID: " + l + " ChannelID: " + j2);
-        networkMonitor.observeIsConnected().R(1).V(new p(this), new q(this));
+        networkMonitor.observeIsConnected().S(1).W(new p(this), new q(this));
         arrayList.add(new r(this));
         this.L = new h0(this);
         this.M = new b0(this);
@@ -590,11 +590,11 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             dVar.a();
         }
         rtcConnection.n = null;
-        MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+        MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.destroy();
         }
-        rtcConnection.f2575w = null;
+        rtcConnection.f2573w = null;
         rtcConnection.o = false;
         rtcConnection.p.cancel();
         rtcConnection.u(new State.d(z2));
@@ -622,11 +622,11 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final Map<String, Object> b(Map<String, Object> map) {
-        String str = this.f2576x;
+        String str = this.f2574x;
         if (str != null) {
             map.put("hostname", str);
         }
-        Integer num = this.f2577y;
+        Integer num = this.f2575y;
         if (num != null) {
             map.put("port", Integer.valueOf(num.intValue()));
         }
@@ -639,7 +639,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final void d(long j2, long j3, long j4, VideoMetadata videoMetadata) {
-        MediaEngineConnection mediaEngineConnection = this.f2575w;
+        MediaEngineConnection mediaEngineConnection = this.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.s(j2, (int) j3, Integer.valueOf((int) j4), g(j2), h(j2));
         }
@@ -659,15 +659,15 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         debugPrintBuilder.appendKeyValue(ModelAuditLogEntry.CHANGE_KEY_ID, this.l);
         debugPrintBuilder.appendKeyValue("mediaSessionId", this.J);
         debugPrintBuilder.appendKeyValue("parentMediaSessionId", this.Z);
-        debugPrintBuilder.appendKeyValue("hostname", this.f2576x);
+        debugPrintBuilder.appendKeyValue("hostname", this.f2574x);
         debugPrintBuilder.appendKeyValue("channelId", Long.valueOf(this.O));
         debugPrintBuilder.appendKeyValue("guildId", this.N);
-        debugPrintBuilder.appendKeyValue("streamKey", this.f2573c0);
+        debugPrintBuilder.appendKeyValue("streamKey", this.f2571c0);
         debugPrintBuilder.appendKeyValue("isVideoEnabled", Boolean.valueOf(this.Q));
         debugPrintBuilder.appendKeyValue("rtcServerId", this.R);
         debugPrintBuilder.appendKeyValue("userId", Long.valueOf(this.S));
         debugPrintBuilder.appendKeyValue("rtcConnectionType", this.W);
-        debugPrintBuilder.appendKeyValue("enableMediaSinkWants", Boolean.valueOf(this.f2571a0));
+        debugPrintBuilder.appendKeyValue("enableMediaSinkWants", Boolean.valueOf(this.f2569a0));
         debugPrintBuilder.appendKeyValue("socket", (DebugPrintable) this.v);
         debugPrintBuilder.appendKeyValue("sentVideo", Boolean.valueOf(this.o));
     }
@@ -689,7 +689,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             eVar.o.stop();
             eVar.h = Long.valueOf(eVar.q.currentTimeMillis());
         }
-        if (!(this.f2574r.a instanceof State.d)) {
+        if (!(this.f2572r.a instanceof State.d)) {
             n(false, str);
             d dVar = this.W;
             if (dVar instanceof d.b) {
@@ -715,11 +715,11 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             subscription2.unsubscribe();
         }
         this.E = null;
-        MediaEngineConnection mediaEngineConnection = this.f2575w;
+        MediaEngineConnection mediaEngineConnection = this.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.destroy();
         }
-        this.f2575w = null;
+        this.f2573w = null;
         u(new State.d(false));
         r("Destroy internal RTC connection: " + str);
         this.m.clear();
@@ -744,7 +744,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final Metadata i() {
-        return new Metadata(this.l, this.J, Long.valueOf(this.O), this.N, this.f2573c0);
+        return new Metadata(this.l, this.J, Long.valueOf(this.O), this.N, this.f2571c0);
     }
 
     public final void k(long j2, Map<String, ? extends Object> map) {
@@ -777,7 +777,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         String str2;
         Stats stats;
         VoiceQuality voiceQuality;
-        Map<String, Object> mutableMapOf = c0.t.h0.mutableMapOf(c0.o.to("ping_bad_count", Integer.valueOf(this.f2578z)), c0.o.to("connect_count", Integer.valueOf(this.D)), c0.o.to("channel_count", 1));
+        Map<String, Object> mutableMapOf = c0.t.h0.mutableMapOf(c0.o.to("ping_bad_count", Integer.valueOf(this.f2576z)), c0.o.to("connect_count", Integer.valueOf(this.D)), c0.o.to("channel_count", 1));
         b(mutableMapOf);
         mutableMapOf.put("reconnect", Boolean.valueOf(z2));
         if (str != null) {
@@ -823,7 +823,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         }
         MediaEngineConnection.TransportInfo transportInfo = this.q;
         if (transportInfo != null) {
-            protocol = transportInfo.f2593c;
+            protocol = transportInfo.f2591c;
         }
         if (protocol != null) {
             int ordinal = protocol.ordinal();
@@ -909,8 +909,8 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
 
     public final void t(Intent intent, ThumbnailEmitter thumbnailEmitter) {
         if (this.W instanceof d.b) {
-            r("Setting screenshare " + intent + ' ' + this.f2575w);
-            MediaEngineConnection mediaEngineConnection = this.f2575w;
+            r("Setting screenshare " + intent + ' ' + this.f2573w);
+            MediaEngineConnection mediaEngineConnection = this.f2573w;
             if (mediaEngineConnection == null) {
                 Log.e("RtcConnection", "MediaEngine not connected for setScreenshare.");
             } else if (intent != null) {
@@ -922,9 +922,9 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final void u(State state) {
-        if (!m.areEqual(this.f2574r.a, state)) {
+        if (!m.areEqual(this.f2572r.a, state)) {
             StateChange stateChange = new StateChange(state, i());
-            this.f2574r = stateChange;
+            this.f2572r = stateChange;
             for (c cVar : this.m) {
                 cVar.onStateChange(stateChange);
             }
@@ -933,7 +933,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
 
     public final void v(long j2, float f) {
         this.Y.put(Long.valueOf(j2), Float.valueOf(f));
-        MediaEngineConnection mediaEngineConnection = this.f2575w;
+        MediaEngineConnection mediaEngineConnection = this.f2573w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.e(j2, f);
         }
diff --git a/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java b/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java
index e0a6f741e2..2908820f01 100644
--- a/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java
+++ b/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java
@@ -10,7 +10,7 @@ public final class VideoMetadata {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2580c;
+    public final int f2578c;
     public final Integer d;
     public final Payloads.ResolutionType e;
 
@@ -18,7 +18,7 @@ public final class VideoMetadata {
         m.checkNotNullParameter(resolutionType, "type");
         this.a = j;
         this.b = i;
-        this.f2580c = i2;
+        this.f2578c = i2;
         this.d = num;
         this.e = resolutionType;
     }
@@ -31,11 +31,11 @@ public final class VideoMetadata {
             return false;
         }
         VideoMetadata videoMetadata = (VideoMetadata) obj;
-        return this.a == videoMetadata.a && this.b == videoMetadata.b && this.f2580c == videoMetadata.f2580c && m.areEqual(this.d, videoMetadata.d) && m.areEqual(this.e, videoMetadata.e);
+        return this.a == videoMetadata.a && this.b == videoMetadata.b && this.f2578c == videoMetadata.f2578c && m.areEqual(this.d, videoMetadata.d) && m.areEqual(this.e, videoMetadata.e);
     }
 
     public int hashCode() {
-        int a = ((((b.a(this.a) * 31) + this.b) * 31) + this.f2580c) * 31;
+        int a = ((((b.a(this.a) * 31) + this.b) * 31) + this.f2578c) * 31;
         Integer num = this.d;
         int i = 0;
         int hashCode = (a + (num != null ? num.hashCode() : 0)) * 31;
@@ -52,7 +52,7 @@ public final class VideoMetadata {
         O.append(", maxWidth=");
         O.append(this.b);
         O.append(", maxHeight=");
-        O.append(this.f2580c);
+        O.append(this.f2578c);
         O.append(", maxFrameRate=");
         O.append(this.d);
         O.append(", type=");
diff --git a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
index 4366633bd7..b7f5debade 100644
--- a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
+++ b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
@@ -50,7 +50,7 @@ public final class DiscordAudioManager {
     public static final AudioDevice b = new AudioDevice(null, false, null, null, 15);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final List<DeviceTypes> f2581c = n.listOf((Object[]) new DeviceTypes[]{DeviceTypes.EARPIECE, DeviceTypes.SPEAKERPHONE, DeviceTypes.BLUETOOTH_HEADSET, DeviceTypes.WIRED_HEADSET});
+    public static final List<DeviceTypes> f2579c = n.listOf((Object[]) new DeviceTypes[]{DeviceTypes.EARPIECE, DeviceTypes.SPEAKERPHONE, DeviceTypes.BLUETOOTH_HEADSET, DeviceTypes.WIRED_HEADSET});
     public static final DiscordAudioManager d = null;
     public boolean A;
     public boolean B;
@@ -71,23 +71,23 @@ public final class DiscordAudioManager {
     public AudioFocusRequest q;
 
     /* renamed from: r  reason: collision with root package name */
-    public List<AudioDevice> f2582r;
+    public List<AudioDevice> f2580r;
     public final SerializedSubject<List<AudioDevice>, List<AudioDevice>> s;
     public DeviceTypes t;
     public final SerializedSubject<DeviceTypes, DeviceTypes> u;
     public ContentObserver v;
 
     /* renamed from: w  reason: collision with root package name */
-    public int f2583w;
+    public int f2581w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final int f2584x;
+    public final int f2582x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final SerializedSubject<Integer, Integer> f2585y;
+    public final SerializedSubject<Integer, Integer> f2583y;
 
     /* renamed from: z  reason: collision with root package name */
-    public DeviceTypes f2586z;
+    public DeviceTypes f2584z;
 
     /* compiled from: DiscordAudioManager.kt */
     public static final class AudioDevice {
@@ -95,7 +95,7 @@ public final class DiscordAudioManager {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f2587c;
+        public final String f2585c;
         public final String d;
 
         public AudioDevice() {
@@ -106,7 +106,7 @@ public final class DiscordAudioManager {
             m.checkNotNullParameter(deviceTypes, "type");
             this.a = deviceTypes;
             this.b = z2;
-            this.f2587c = str;
+            this.f2585c = str;
             this.d = str2;
         }
 
@@ -118,7 +118,7 @@ public final class DiscordAudioManager {
             m.checkNotNullParameter(deviceTypes, "type");
             this.a = deviceTypes;
             this.b = z2;
-            this.f2587c = null;
+            this.f2585c = null;
             this.d = null;
         }
 
@@ -128,7 +128,7 @@ public final class DiscordAudioManager {
                 z2 = audioDevice.b;
             }
             if ((i & 4) != 0) {
-                str = audioDevice.f2587c;
+                str = audioDevice.f2585c;
             }
             if ((i & 8) != 0) {
                 str2 = audioDevice.d;
@@ -146,7 +146,7 @@ public final class DiscordAudioManager {
                 return false;
             }
             AudioDevice audioDevice = (AudioDevice) obj;
-            return m.areEqual(this.a, audioDevice.a) && this.b == audioDevice.b && m.areEqual(this.f2587c, audioDevice.f2587c) && m.areEqual(this.d, audioDevice.d);
+            return m.areEqual(this.a, audioDevice.a) && this.b == audioDevice.b && m.areEqual(this.f2585c, audioDevice.f2585c) && m.areEqual(this.d, audioDevice.d);
         }
 
         public int hashCode() {
@@ -161,7 +161,7 @@ public final class DiscordAudioManager {
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
             int i5 = (hashCode + i2) * 31;
-            String str = this.f2587c;
+            String str = this.f2585c;
             int hashCode2 = (i5 + (str != null ? str.hashCode() : 0)) * 31;
             String str2 = this.d;
             if (str2 != null) {
@@ -176,7 +176,7 @@ public final class DiscordAudioManager {
             O.append(", isAvailable=");
             O.append(this.b);
             O.append(", id=");
-            O.append(this.f2587c);
+            O.append(this.f2585c);
             O.append(", name=");
             return c.d.b.a.a.G(O, this.d, ")");
         }
@@ -331,16 +331,16 @@ public final class DiscordAudioManager {
                     c.c.a.a0.d.c1("DiscordAudioManager", O.toString());
                     synchronized (DiscordAudioManager.this.i) {
                         DiscordAudioManager discordAudioManager2 = DiscordAudioManager.this;
-                        List<AudioDevice> list = discordAudioManager2.f2582r;
+                        List<AudioDevice> list = discordAudioManager2.f2580r;
                         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                         for (AudioDevice audioDevice : list) {
                             arrayList.add(audioDevice.a.ordinal() != 5 ? AudioDevice.a(audioDevice, null, false, null, null, 15) : AudioDevice.a(audioDevice, null, false, null, null, 1));
                         }
-                        discordAudioManager2.f2582r = arrayList;
+                        discordAudioManager2.f2580r = arrayList;
                         discordAudioManager2.s.j.onNext(arrayList);
                     }
                     DiscordAudioManager discordAudioManager3 = DiscordAudioManager.this;
-                    discordAudioManager3.a(discordAudioManager3.f2582r);
+                    discordAudioManager3.a(discordAudioManager3.f2580r);
                 }
             } else if (ordinal == 1) {
                 c.c.a.a0.d.c1("DiscordAudioManager", "[onScoAudioStateUpdate] scoAudioStateUpdate = " + bVar);
@@ -369,25 +369,25 @@ public final class DiscordAudioManager {
             if (m.areEqual(aVar, a.b.a)) {
                 synchronized (DiscordAudioManager.this.i) {
                     DiscordAudioManager discordAudioManager = DiscordAudioManager.this;
-                    List<AudioDevice> list = discordAudioManager.f2582r;
+                    List<AudioDevice> list = discordAudioManager.f2580r;
                     ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                     for (AudioDevice audioDevice : list) {
                         int ordinal = audioDevice.a.ordinal();
                         arrayList.add(ordinal != 3 ? ordinal != 4 ? AudioDevice.a(audioDevice, null, false, null, null, 15) : AudioDevice.a(audioDevice, null, DiscordAudioManager.this.h, null, null, 13) : AudioDevice.a(audioDevice, null, false, null, null, 13));
                     }
-                    discordAudioManager.f2582r = arrayList;
+                    discordAudioManager.f2580r = arrayList;
                     discordAudioManager.s.j.onNext(arrayList);
                 }
             } else if (aVar instanceof a.C0036a) {
                 synchronized (DiscordAudioManager.this.i) {
                     DiscordAudioManager discordAudioManager2 = DiscordAudioManager.this;
-                    List<AudioDevice> list2 = discordAudioManager2.f2582r;
+                    List<AudioDevice> list2 = discordAudioManager2.f2580r;
                     ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(list2, 10));
                     for (AudioDevice audioDevice2 : list2) {
                         int ordinal2 = audioDevice2.a.ordinal();
                         arrayList2.add(ordinal2 != 3 ? ordinal2 != 4 ? AudioDevice.a(audioDevice2, null, false, null, null, 15) : AudioDevice.a(audioDevice2, null, false, null, null, 13) : AudioDevice.a(audioDevice2, null, true, null, null, 13));
                     }
-                    discordAudioManager2.f2582r = arrayList2;
+                    discordAudioManager2.f2580r = arrayList2;
                     discordAudioManager2.s.j.onNext(arrayList2);
                 }
             }
@@ -409,7 +409,7 @@ public final class DiscordAudioManager {
             if (bluetoothHeadsetAudioState == null) {
                 bluetoothHeadsetAudioState = BluetoothHeadsetAudioState.Disconnected;
             }
-            BluetoothDevice bluetoothDevice = bVar.f2588c;
+            BluetoothDevice bluetoothDevice = bVar.f2586c;
             StringBuilder sb = new StringBuilder();
             sb.append("[onHeadsetAudioStateChanged] state: ");
             sb.append(bluetoothHeadsetAudioState);
@@ -422,12 +422,12 @@ public final class DiscordAudioManager {
             } else if (ordinal == 2) {
                 synchronized (DiscordAudioManager.this.i) {
                     DiscordAudioManager discordAudioManager = DiscordAudioManager.this;
-                    List<AudioDevice> list = discordAudioManager.f2582r;
+                    List<AudioDevice> list = discordAudioManager.f2580r;
                     ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                     for (AudioDevice audioDevice : list) {
                         arrayList.add(audioDevice.a.ordinal() != 5 ? AudioDevice.a(audioDevice, null, false, null, null, 15) : AudioDevice.a(audioDevice, null, true, bluetoothDevice != null ? bluetoothDevice.getAddress() : null, bluetoothDevice != null ? bluetoothDevice.getName() : null, 1));
                     }
-                    discordAudioManager.f2582r = arrayList;
+                    discordAudioManager.f2580r = arrayList;
                     discordAudioManager.s.j.onNext(arrayList);
                 }
             }
@@ -462,7 +462,7 @@ public final class DiscordAudioManager {
             if (bluetoothProfileConnectionState == null) {
                 bluetoothProfileConnectionState = BluetoothProfileConnectionState.Disconnected;
             }
-            BluetoothDevice bluetoothDevice = bVar.f2589c;
+            BluetoothDevice bluetoothDevice = bVar.f2587c;
             StringBuilder sb = new StringBuilder();
             sb.append("[onHeadsetConnectionStateChanged] state: ");
             sb.append(bluetoothProfileConnectionState);
@@ -493,18 +493,18 @@ public final class DiscordAudioManager {
                 return;
             }
             synchronized (DiscordAudioManager.this.i) {
-                List<AudioDevice> list = DiscordAudioManager.this.f2582r;
+                List<AudioDevice> list = DiscordAudioManager.this.f2580r;
                 arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                 for (AudioDevice audioDevice : list) {
                     arrayList.add(AudioDevice.a(audioDevice, null, false, null, null, 15));
                 }
             }
             DeviceTypes deviceTypes2 = DeviceTypes.BLUETOOTH_HEADSET;
-            if (((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2587c != null) {
+            if (((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2585c != null) {
                 if (bluetoothDevice != null) {
                     str = bluetoothDevice.getAddress();
                 }
-                if (m.areEqual(str, ((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2587c)) {
+                if (m.areEqual(str, ((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2585c)) {
                     DiscordAudioManager.this.l();
                 }
             }
@@ -587,14 +587,14 @@ public final class DiscordAudioManager {
                 arrayList.add(audioDevice);
             }
         }
-        this.f2582r = arrayList;
-        this.s = new SerializedSubject<>(BehaviorSubject.k0(arrayList));
+        this.f2580r = arrayList;
+        this.s = new SerializedSubject<>(BehaviorSubject.l0(arrayList));
         DeviceTypes deviceTypes = DeviceTypes.INVALID;
         this.t = deviceTypes;
-        this.u = new SerializedSubject<>(BehaviorSubject.k0(deviceTypes));
-        this.f2584x = this.e.getStreamMaxVolume(3);
-        this.f2585y = new SerializedSubject<>(BehaviorSubject.k0(Integer.valueOf(this.f2583w)));
-        this.f2586z = DeviceTypes.DEFAULT;
+        this.u = new SerializedSubject<>(BehaviorSubject.l0(deviceTypes));
+        this.f2582x = this.e.getStreamMaxVolume(3);
+        this.f2583y = new SerializedSubject<>(BehaviorSubject.l0(Integer.valueOf(this.f2581w)));
+        this.f2584z = DeviceTypes.DEFAULT;
     }
 
     public static final DiscordAudioManager d() {
@@ -609,7 +609,7 @@ public final class DiscordAudioManager {
         DeviceTypes deviceTypes;
         DeviceTypes deviceTypes2;
         synchronized (this.i) {
-            List<DeviceTypes> list2 = f2581c;
+            List<DeviceTypes> list2 = f2579c;
             ListIterator<DeviceTypes> listIterator = list2.listIterator(list2.size());
             while (true) {
                 if (!listIterator.hasPrevious()) {
@@ -735,12 +735,12 @@ public final class DiscordAudioManager {
                     if (adapter.isEnabled() && profileConnectionState == 2) {
                         z2 = true;
                         synchronized (this.i) {
-                            List<AudioDevice> list2 = this.f2582r;
+                            List<AudioDevice> list2 = this.f2580r;
                             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list2, 10));
                             for (AudioDevice audioDevice : list2) {
                                 arrayList.add(audioDevice.a.ordinal() != 5 ? AudioDevice.a(audioDevice, null, false, null, null, 15) : AudioDevice.a(audioDevice, null, (!this.D || this.t != DeviceTypes.BLUETOOTH_HEADSET) ? z2 : bluetoothDevice3 != null, bluetoothDevice3 != null ? bluetoothDevice3.getAddress() : null, bluetoothDevice3 != null ? bluetoothDevice3.getName() : null, 1));
                             }
-                            this.f2582r = arrayList;
+                            this.f2580r = arrayList;
                             this.s.j.onNext(arrayList);
                         }
                         return;
@@ -836,7 +836,7 @@ public final class DiscordAudioManager {
         this.v = null;
         b(DeviceTypes.INVALID);
         synchronized (this.i) {
-            this.f2586z = DeviceTypes.DEFAULT;
+            this.f2584z = DeviceTypes.DEFAULT;
         }
         i(false);
         if (Build.VERSION.SDK_INT >= 26) {
@@ -933,11 +933,11 @@ public final class DiscordAudioManager {
         DeviceTypes deviceTypes;
         ArrayList arrayList;
         synchronized (this.i) {
-            deviceTypes = this.f2586z;
+            deviceTypes = this.f2584z;
         }
         g();
         synchronized (this.i) {
-            List<AudioDevice> list = this.f2582r;
+            List<AudioDevice> list = this.f2580r;
             arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
             for (AudioDevice audioDevice : list) {
                 arrayList.add(AudioDevice.a(audioDevice, null, false, null, null, 15));
diff --git a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java
index 8a4be7f79f..7cb7dae8b0 100644
--- a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java
+++ b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java
@@ -54,12 +54,12 @@ public enum BluetoothHeadsetAudioState {
         public final BluetoothHeadsetAudioState b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final BluetoothDevice f2588c;
+        public final BluetoothDevice f2586c;
 
         public b(BluetoothHeadsetAudioState bluetoothHeadsetAudioState, BluetoothHeadsetAudioState bluetoothHeadsetAudioState2, BluetoothDevice bluetoothDevice) {
             this.a = bluetoothHeadsetAudioState;
             this.b = bluetoothHeadsetAudioState2;
-            this.f2588c = bluetoothDevice;
+            this.f2586c = bluetoothDevice;
         }
 
         public boolean equals(Object obj) {
@@ -70,7 +70,7 @@ public enum BluetoothHeadsetAudioState {
                 return false;
             }
             b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2588c, bVar.f2588c);
+            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2586c, bVar.f2586c);
         }
 
         public int hashCode() {
@@ -79,7 +79,7 @@ public enum BluetoothHeadsetAudioState {
             int hashCode = (bluetoothHeadsetAudioState != null ? bluetoothHeadsetAudioState.hashCode() : 0) * 31;
             BluetoothHeadsetAudioState bluetoothHeadsetAudioState2 = this.b;
             int hashCode2 = (hashCode + (bluetoothHeadsetAudioState2 != null ? bluetoothHeadsetAudioState2.hashCode() : 0)) * 31;
-            BluetoothDevice bluetoothDevice = this.f2588c;
+            BluetoothDevice bluetoothDevice = this.f2586c;
             if (bluetoothDevice != null) {
                 i = bluetoothDevice.hashCode();
             }
@@ -92,7 +92,7 @@ public enum BluetoothHeadsetAudioState {
             O.append(", previous=");
             O.append(this.b);
             O.append(", device=");
-            O.append(this.f2588c);
+            O.append(this.f2586c);
             O.append(")");
             return O.toString();
         }
diff --git a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java
index 3ce65c5819..2158329001 100644
--- a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java
+++ b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java
@@ -53,12 +53,12 @@ public enum BluetoothProfileConnectionState {
         public final BluetoothProfileConnectionState b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final BluetoothDevice f2589c;
+        public final BluetoothDevice f2587c;
 
         public b(BluetoothProfileConnectionState bluetoothProfileConnectionState, BluetoothProfileConnectionState bluetoothProfileConnectionState2, BluetoothDevice bluetoothDevice) {
             this.a = bluetoothProfileConnectionState;
             this.b = bluetoothProfileConnectionState2;
-            this.f2589c = bluetoothDevice;
+            this.f2587c = bluetoothDevice;
         }
 
         public boolean equals(Object obj) {
@@ -69,7 +69,7 @@ public enum BluetoothProfileConnectionState {
                 return false;
             }
             b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2589c, bVar.f2589c);
+            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2587c, bVar.f2587c);
         }
 
         public int hashCode() {
@@ -78,7 +78,7 @@ public enum BluetoothProfileConnectionState {
             int hashCode = (bluetoothProfileConnectionState != null ? bluetoothProfileConnectionState.hashCode() : 0) * 31;
             BluetoothProfileConnectionState bluetoothProfileConnectionState2 = this.b;
             int hashCode2 = (hashCode + (bluetoothProfileConnectionState2 != null ? bluetoothProfileConnectionState2.hashCode() : 0)) * 31;
-            BluetoothDevice bluetoothDevice = this.f2589c;
+            BluetoothDevice bluetoothDevice = this.f2587c;
             if (bluetoothDevice != null) {
                 i = bluetoothDevice.hashCode();
             }
@@ -91,7 +91,7 @@ public enum BluetoothProfileConnectionState {
             O.append(", current=");
             O.append(this.b);
             O.append(", device=");
-            O.append(this.f2589c);
+            O.append(this.f2587c);
             O.append(")");
             return O.toString();
         }
diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java
index f67e185a62..7e14bcf829 100644
--- a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java
+++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java
@@ -63,7 +63,7 @@ public interface MediaEngine {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2590c;
+        public final boolean f2588c;
         public final boolean d;
         public final boolean e;
         public final boolean f;
@@ -78,7 +78,7 @@ public interface MediaEngine {
         public EchoCancellationInfo(boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, boolean z8, boolean z9, boolean z10) {
             this.a = z2;
             this.b = z3;
-            this.f2590c = z4;
+            this.f2588c = z4;
             this.d = z5;
             this.e = z6;
             this.f = z7;
@@ -100,7 +100,7 @@ public interface MediaEngine {
                 return false;
             }
             EchoCancellationInfo echoCancellationInfo = (EchoCancellationInfo) obj;
-            return this.a == echoCancellationInfo.a && this.b == echoCancellationInfo.b && this.f2590c == echoCancellationInfo.f2590c && this.d == echoCancellationInfo.d && this.e == echoCancellationInfo.e && this.f == echoCancellationInfo.f && this.g == echoCancellationInfo.g && this.h == echoCancellationInfo.h && this.i == echoCancellationInfo.i;
+            return this.a == echoCancellationInfo.a && this.b == echoCancellationInfo.b && this.f2588c == echoCancellationInfo.f2588c && this.d == echoCancellationInfo.d && this.e == echoCancellationInfo.e && this.f == echoCancellationInfo.f && this.g == echoCancellationInfo.g && this.h == echoCancellationInfo.h && this.i == echoCancellationInfo.i;
         }
 
         public int hashCode() {
@@ -121,7 +121,7 @@ public interface MediaEngine {
             int i7 = z3 ? 1 : 0;
             int i8 = z3 ? 1 : 0;
             int i9 = (i5 + i6) * 31;
-            boolean z4 = this.f2590c;
+            boolean z4 = this.f2588c;
             if (z4) {
                 z4 = true;
             }
@@ -182,7 +182,7 @@ public interface MediaEngine {
             O.append(", builtinAecSupportedNative=");
             O.append(this.b);
             O.append(", builtinAecSupportedJava=");
-            O.append(this.f2590c);
+            O.append(this.f2588c);
             O.append(", builtinAecEnabled=");
             O.append(this.d);
             O.append(", aecEnabledInSettings=");
@@ -258,7 +258,7 @@ public interface MediaEngine {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2591c;
+        public final boolean f2589c;
         public final boolean d;
         public final boolean e;
         public final MediaEngineConnection.InputMode f;
@@ -271,7 +271,7 @@ public interface MediaEngine {
             m.checkNotNullParameter(cVar, "inputModeOptions");
             this.a = f;
             this.b = z2;
-            this.f2591c = z3;
+            this.f2589c = z3;
             this.d = z4;
             this.e = z5;
             this.f = inputMode;
@@ -288,7 +288,7 @@ public interface MediaEngine {
                 return false;
             }
             VoiceConfig voiceConfig = (VoiceConfig) obj;
-            return Float.compare(this.a, voiceConfig.a) == 0 && this.b == voiceConfig.b && this.f2591c == voiceConfig.f2591c && this.d == voiceConfig.d && this.e == voiceConfig.e && m.areEqual(this.f, voiceConfig.f) && m.areEqual(this.g, voiceConfig.g) && this.h == voiceConfig.h && this.i == voiceConfig.i;
+            return Float.compare(this.a, voiceConfig.a) == 0 && this.b == voiceConfig.b && this.f2589c == voiceConfig.f2589c && this.d == voiceConfig.d && this.e == voiceConfig.e && m.areEqual(this.f, voiceConfig.f) && m.areEqual(this.g, voiceConfig.g) && this.h == voiceConfig.h && this.i == voiceConfig.i;
         }
 
         public int hashCode() {
@@ -302,7 +302,7 @@ public interface MediaEngine {
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
             int i5 = (floatToIntBits + i2) * 31;
-            boolean z3 = this.f2591c;
+            boolean z3 = this.f2589c;
             if (z3) {
                 z3 = true;
             }
@@ -355,7 +355,7 @@ public interface MediaEngine {
             O.append(", echoCancellation=");
             O.append(this.b);
             O.append(", noiseSuppression=");
-            O.append(this.f2591c);
+            O.append(this.f2589c);
             O.append(", noiseCancellation=");
             O.append(this.d);
             O.append(", automaticGainControl=");
@@ -377,7 +377,7 @@ public interface MediaEngine {
         public final String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2592c;
+        public final int f2590c;
         public final List<StreamParameters> d;
 
         public a(int i, String str, int i2, List<StreamParameters> list) {
@@ -385,7 +385,7 @@ public interface MediaEngine {
             m.checkNotNullParameter(list, "streams");
             this.a = i;
             this.b = str;
-            this.f2592c = i2;
+            this.f2590c = i2;
             this.d = list;
         }
 
@@ -397,14 +397,14 @@ public interface MediaEngine {
                 return false;
             }
             a aVar = (a) obj;
-            return this.a == aVar.a && m.areEqual(this.b, aVar.b) && this.f2592c == aVar.f2592c && m.areEqual(this.d, aVar.d);
+            return this.a == aVar.a && m.areEqual(this.b, aVar.b) && this.f2590c == aVar.f2590c && m.areEqual(this.d, aVar.d);
         }
 
         public int hashCode() {
             int i = this.a * 31;
             String str = this.b;
             int i2 = 0;
-            int hashCode = (((i + (str != null ? str.hashCode() : 0)) * 31) + this.f2592c) * 31;
+            int hashCode = (((i + (str != null ? str.hashCode() : 0)) * 31) + this.f2590c) * 31;
             List<StreamParameters> list = this.d;
             if (list != null) {
                 i2 = list.hashCode();
@@ -418,7 +418,7 @@ public interface MediaEngine {
             O.append(", ip=");
             O.append(this.b);
             O.append(", port=");
-            O.append(this.f2592c);
+            O.append(this.f2590c);
             O.append(", streams=");
             return c.d.b.a.a.H(O, this.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 9be653dceb..ac5b327a6d 100644
--- a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java
+++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java
@@ -83,7 +83,7 @@ public interface MediaEngineConnection {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Protocol f2593c;
+        public final Protocol f2591c;
 
         /* compiled from: MediaEngineConnection.kt */
         public enum Protocol {
@@ -96,7 +96,7 @@ public interface MediaEngineConnection {
             m.checkNotNullParameter(protocol, "protocol");
             this.a = str;
             this.b = i;
-            this.f2593c = protocol;
+            this.f2591c = protocol;
         }
 
         public boolean equals(Object obj) {
@@ -107,14 +107,14 @@ public interface MediaEngineConnection {
                 return false;
             }
             TransportInfo transportInfo = (TransportInfo) obj;
-            return m.areEqual(this.a, transportInfo.a) && this.b == transportInfo.b && m.areEqual(this.f2593c, transportInfo.f2593c);
+            return m.areEqual(this.a, transportInfo.a) && this.b == transportInfo.b && m.areEqual(this.f2591c, transportInfo.f2591c);
         }
 
         public int hashCode() {
             String str = this.a;
             int i = 0;
             int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.b) * 31;
-            Protocol protocol = this.f2593c;
+            Protocol protocol = this.f2591c;
             if (protocol != null) {
                 i = protocol.hashCode();
             }
@@ -127,7 +127,7 @@ public interface MediaEngineConnection {
             O.append(", port=");
             O.append(this.b);
             O.append(", protocol=");
-            O.append(this.f2593c);
+            O.append(this.f2591c);
             O.append(")");
             return O.toString();
         }
@@ -204,7 +204,7 @@ public interface MediaEngineConnection {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2594c;
+        public final int f2592c;
         public final int d;
         public final int e;
         public final int f;
@@ -212,7 +212,7 @@ public interface MediaEngineConnection {
         public b(int i, int i2, int i3, int i4, int i5, int i6) {
             this.a = i;
             this.b = i2;
-            this.f2594c = i3;
+            this.f2592c = i3;
             this.d = i4;
             this.e = i5;
             this.f = i6;
@@ -226,11 +226,11 @@ public interface MediaEngineConnection {
                 return false;
             }
             b bVar = (b) obj;
-            return this.a == bVar.a && this.b == bVar.b && this.f2594c == bVar.f2594c && this.d == bVar.d && this.e == bVar.e && this.f == bVar.f;
+            return this.a == bVar.a && this.b == bVar.b && this.f2592c == bVar.f2592c && this.d == bVar.d && this.e == bVar.e && this.f == bVar.f;
         }
 
         public int hashCode() {
-            return (((((((((this.a * 31) + this.b) * 31) + this.f2594c) * 31) + this.d) * 31) + this.e) * 31) + this.f;
+            return (((((((((this.a * 31) + this.b) * 31) + this.f2592c) * 31) + this.d) * 31) + this.e) * 31) + this.f;
         }
 
         public String toString() {
@@ -239,7 +239,7 @@ public interface MediaEngineConnection {
             O.append(", maxBitrate=");
             O.append(this.b);
             O.append(", width=");
-            O.append(this.f2594c);
+            O.append(this.f2592c);
             O.append(", height=");
             O.append(this.d);
             O.append(", mutedFramerate=");
@@ -255,7 +255,7 @@ public interface MediaEngineConnection {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2595c;
+        public final int f2593c;
         public final boolean d;
         public final boolean e;
         public final int f;
@@ -267,7 +267,7 @@ public interface MediaEngineConnection {
         public c(int i, int i2, int i3, boolean z2, boolean z3, int i4) {
             this.a = i;
             this.b = i2;
-            this.f2595c = i3;
+            this.f2593c = i3;
             this.d = z2;
             this.e = z3;
             this.f = i4;
@@ -282,7 +282,7 @@ public interface MediaEngineConnection {
             i4 = (i5 & 32) != 0 ? 5 : i4;
             this.a = i;
             this.b = i2;
-            this.f2595c = i3;
+            this.f2593c = i3;
             this.d = z2;
             this.e = z3;
             this.f = i4;
@@ -296,11 +296,11 @@ public interface MediaEngineConnection {
                 return false;
             }
             c cVar = (c) obj;
-            return this.a == cVar.a && this.b == cVar.b && this.f2595c == cVar.f2595c && this.d == cVar.d && this.e == cVar.e && this.f == cVar.f;
+            return this.a == cVar.a && this.b == cVar.b && this.f2593c == cVar.f2593c && this.d == cVar.d && this.e == cVar.e && this.f == cVar.f;
         }
 
         public int hashCode() {
-            int i = ((((this.a * 31) + this.b) * 31) + this.f2595c) * 31;
+            int i = ((((this.a * 31) + this.b) * 31) + this.f2593c) * 31;
             boolean z2 = this.d;
             int i2 = 1;
             if (z2) {
@@ -323,7 +323,7 @@ public interface MediaEngineConnection {
             O.append(", vadLeadingFrames=");
             O.append(this.b);
             O.append(", vadTrailingFrames=");
-            O.append(this.f2595c);
+            O.append(this.f2593c);
             O.append(", vadAutoThreshold=");
             O.append(this.d);
             O.append(", vadUseKrisp=");
diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java
index c00fd9b688..342d197689 100644
--- a/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java
+++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java
@@ -22,7 +22,7 @@ public final class ThumbnailEmitter {
     public final ByteBuffer b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final GlRectDrawer f2596c;
+    public final GlRectDrawer f2594c;
     public final VideoFrameDrawer d;
     public final long e;
     public final Matrix f;
@@ -47,7 +47,7 @@ public final class ThumbnailEmitter {
         long j3 = (long) 1000;
         this.a = -(j * j3 * j3);
         this.b = JniCommon.nativeAllocateByteBuffer(i * i2 * 4);
-        this.f2596c = new GlRectDrawer();
+        this.f2594c = new GlRectDrawer();
         this.d = new VideoFrameDrawer();
         this.e = clock2.currentTimeMillis();
         Matrix matrix = new Matrix();
@@ -66,10 +66,10 @@ public final class ThumbnailEmitter {
         GLES20.glClear(16384);
         if (((float) videoFrame.getRotatedWidth()) / ((float) videoFrame.getRotatedHeight()) < ((float) this.g) / ((float) this.h)) {
             float rotatedHeight = (((float) this.h) / ((float) videoFrame.getRotatedHeight())) * ((float) videoFrame.getRotatedWidth());
-            this.d.drawFrame(videoFrame, this.f2596c, this.f, a.roundToInt((((float) this.g) - rotatedHeight) / 2.0f), 0, a.roundToInt(rotatedHeight), this.h);
+            this.d.drawFrame(videoFrame, this.f2594c, this.f, a.roundToInt((((float) this.g) - rotatedHeight) / 2.0f), 0, a.roundToInt(rotatedHeight), this.h);
         } else {
             float rotatedWidth = (((float) this.g) / ((float) videoFrame.getRotatedWidth())) * ((float) videoFrame.getRotatedHeight());
-            this.d.drawFrame(videoFrame, this.f2596c, this.f, 0, a.roundToInt((((float) this.h) - rotatedWidth) / 2.0f), this.g, a.roundToInt(rotatedWidth));
+            this.d.drawFrame(videoFrame, this.f2594c, this.f, 0, a.roundToInt((((float) this.h) - rotatedWidth) / 2.0f), this.g, a.roundToInt(rotatedWidth));
         }
         this.b.rewind();
         GLES20.glReadPixels(0, 0, glTextureFrameBuffer.getWidth(), glTextureFrameBuffer.getHeight(), 6408, 5121, this.b);
diff --git a/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java b/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
index 66dcf075c1..8013a8523e 100644
--- a/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
+++ b/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
@@ -18,7 +18,7 @@ public final class ScreenshotDetector {
     public final PublishSubject<Screenshot> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b f2597c;
+    public final b f2595c;
     public final c.a.s.a d;
     public boolean e;
     public final Logger f;
@@ -99,13 +99,13 @@ public final class ScreenshotDetector {
         m.checkNotNullParameter(sharedPreferences, "cache");
         this.f = logger;
         this.g = sharedPreferences;
-        PublishSubject<Screenshot> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.b = j0;
+        PublishSubject<Screenshot> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.b = k0;
         ContentResolver contentResolver = application.getContentResolver();
         m.checkNotNullExpressionValue(contentResolver, "applicationContext.contentResolver");
         b bVar = new b(logger, contentResolver, null, new a(this), 4);
-        this.f2597c = bVar;
+        this.f2595c = bVar;
         c.a.s.a aVar = new c.a.s.a(bVar);
         this.d = aVar;
         a(sharedPreferences.getBoolean("screenshot_detection_enabled", false));
diff --git a/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java b/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java
index d4bebc194c..618b5ecae2 100644
--- a/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java
+++ b/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java
@@ -8,20 +8,20 @@ public final class ParseSpec<R, S> {
     public final boolean b = true;
 
     /* renamed from: c  reason: collision with root package name */
-    public final S f2598c;
+    public final S f2596c;
     public int d;
     public int e;
 
     public ParseSpec(Node<R> node, S s) {
         m.checkNotNullParameter(node, "root");
         this.a = node;
-        this.f2598c = s;
+        this.f2596c = s;
     }
 
     public ParseSpec(Node<R> node, S s, int i, int i2) {
         m.checkNotNullParameter(node, "root");
         this.a = node;
-        this.f2598c = s;
+        this.f2596c = s;
         this.d = i;
         this.e = i2;
     }
diff --git a/app/src/main/java/com/discord/simpleast/core/parser/Parser.java b/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
index 70ac85d928..045dc3da9b 100644
--- a/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
+++ b/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
@@ -136,7 +136,7 @@ public class Parser<R, T extends Node<R>, S> {
                     break;
                 }
                 Rule<R, T, S> rule = (Rule) it.next();
-                Matcher match = rule.match(subSequence, str, parseSpec.f2598c);
+                Matcher match = rule.match(subSequence, str, parseSpec.f2596c);
                 if (match == null) {
                     logMiss(rule, subSequence);
                     pair = null;
@@ -153,12 +153,12 @@ public class Parser<R, T extends Node<R>, S> {
             if (pair != null) {
                 Matcher matcher = (Matcher) pair.component2();
                 int end = matcher.end() + i3;
-                ParseSpec<R, S> parse = ((Rule) pair.component1()).parse(matcher, this, parseSpec.f2598c);
+                ParseSpec<R, S> parse = ((Rule) pair.component1()).parse(matcher, this, parseSpec.f2596c);
                 Node<R> node2 = parseSpec.a;
                 node2.addChild(parse.a);
                 int i4 = parseSpec.e;
                 if (end != i4) {
-                    S s2 = parseSpec.f2598c;
+                    S s2 = parseSpec.f2596c;
                     m.checkNotNullParameter(node2, "node");
                     stack.push(new ParseSpec(node2, s2, end, i4));
                 }
diff --git a/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java b/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java
index fc9a25f9fa..fcff82c133 100644
--- a/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java
+++ b/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java
@@ -174,9 +174,9 @@ public final class ArchivedThreadsStore extends StoreV2 {
                 try {
                     return RestAPI.Companion.getApi().getAllPrivateArchivedThreads(j, Companion.access$getLastArchiveTimestamp(ThreadListingType.Companion, list));
                 } catch (IllegalStateException e) {
-                    Observable<ThreadListing> v = Observable.v(e);
-                    m.checkNotNullExpressionValue(v, "Observable.error(e)");
-                    return v;
+                    Observable<ThreadListing> w2 = Observable.w(e);
+                    m.checkNotNullExpressionValue(w2, "Observable.error(e)");
+                    return w2;
                 }
             }
         }
@@ -193,9 +193,9 @@ public final class ArchivedThreadsStore extends StoreV2 {
                 try {
                     return RestAPI.Companion.getApi().getAllPublicArchivedThreads(j, Companion.access$getLastArchiveTimestamp(ThreadListingType.Companion, list));
                 } catch (IllegalStateException e) {
-                    Observable<ThreadListing> v = Observable.v(e);
-                    m.checkNotNullExpressionValue(v, "Observable.error(e)");
-                    return v;
+                    Observable<ThreadListing> w2 = Observable.w(e);
+                    m.checkNotNullExpressionValue(w2, "Observable.error(e)");
+                    return w2;
                 }
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java b/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java
index 96b9e9e488..a862dc86c9 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java
@@ -26,6 +26,6 @@ public final class StoreAnalytics$init$3<T, R> implements b<StoreAnalytics.Scree
     }
 
     public final Observable<? extends StoreAnalytics.ScreenViewed> call(StoreAnalytics.ScreenViewed screenViewed) {
-        return m.areEqual(screenViewed.getScreen(), WidgetHome.class) ? Observable.c0(2, TimeUnit.SECONDS).E(new AnonymousClass1(screenViewed)) : new j(screenViewed);
+        return m.areEqual(screenViewed.getScreen(), WidgetHome.class) ? Observable.d0(2, TimeUnit.SECONDS).F(new AnonymousClass1(screenViewed)) : new j(screenViewed);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics.java b/app/src/main/java/com/discord/stores/StoreAnalytics.java
index d3065bb434..273fc50d58 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics.java
@@ -69,7 +69,7 @@ public final class StoreAnalytics extends Store {
     private String fingerprint;
     private AtomicBoolean hasTrackedAppUiShown = new AtomicBoolean(false);
     private String inputMode;
-    private final PublishSubject<ScreenViewed> screenViewedSubject = PublishSubject.j0();
+    private final PublishSubject<ScreenViewed> screenViewedSubject = PublishSubject.k0();
     private Channel selectedVoiceChannel;
     private final StoreStream stores;
 
@@ -651,9 +651,9 @@ public final class StoreAnalytics extends Store {
         super.init(context);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(this.stores.getMediaSettings$app_productionGoogleRelease().getInputMode()), StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(this.stores.getVoiceChannelSelected$app_productionGoogleRelease().observeSelectedChannel()), StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$2(this), 62, (Object) null);
-        Observable x2 = this.screenViewedSubject.X(StoreAnalytics$init$3.INSTANCE).x();
-        m.checkNotNullExpressionValue(x2, "screenViewedSubject\n    …       }\n        .first()");
-        ObservableExtensionsKt.appSubscribe$default(x2, StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$4(this), 62, (Object) null);
+        Observable y2 = this.screenViewedSubject.Y(StoreAnalytics$init$3.INSTANCE).y();
+        m.checkNotNullExpressionValue(y2, "screenViewedSubject\n    …       }\n        .first()");
+        ObservableExtensionsKt.appSubscribe$default(y2, StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$4(this), 62, (Object) null);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0042: APUT  
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$onCommandUsed$1.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$onCommandUsed$1.java
new file mode 100644
index 0000000000..a2c664eee9
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$onCommandUsed$1.java
@@ -0,0 +1,33 @@
+package com.discord.stores;
+
+import c0.z.d.o;
+import com.discord.utilities.frecency.FrecencyTracker;
+import java.util.Map;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreApplicationCommandFrecency.kt */
+public final class StoreApplicationCommandFrecency$onCommandUsed$1 extends o implements Function0<Unit> {
+    public final /* synthetic */ String $commandId;
+    public final /* synthetic */ Long $guildId;
+    public final /* synthetic */ StoreApplicationCommandFrecency this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreApplicationCommandFrecency$onCommandUsed$1(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Long l, String str) {
+        super(0);
+        this.this$0 = storeApplicationCommandFrecency;
+        this.$guildId = l;
+        this.$commandId = str;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo17invoke() {
+        FrecencyTracker.track$default(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), StoreApplicationCommandFrecency.access$getKey(this.this$0, this.$guildId, this.$commandId), 0, 2, null);
+        StoreApplicationCommandFrecency.access$getFrecencyCache$p(this.this$0).set(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), true);
+        Map access$getTopCommandIds$p = StoreApplicationCommandFrecency.access$getTopCommandIds$p(this.this$0);
+        Long l = this.$guildId;
+        access$getTopCommandIds$p.put(Long.valueOf(l != null ? l.longValue() : 0), StoreApplicationCommandFrecency.access$getAllTopCommandIds(this.this$0, this.$guildId));
+        StoreApplicationCommandFrecency storeApplicationCommandFrecency = this.this$0;
+        storeApplicationCommandFrecency.markChanged(storeApplicationCommandFrecency);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java
new file mode 100644
index 0000000000..c06b8d4ef0
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java
@@ -0,0 +1,59 @@
+package com.discord.stores;
+
+import c0.g0.s;
+import c0.g0.w;
+import c0.t.g0;
+import c0.t.h0;
+import c0.t.u;
+import c0.z.d.o;
+import com.discord.utilities.frecency.FrecencyTracker;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreApplicationCommandFrecency.kt */
+public final class StoreApplicationCommandFrecency$populateStore$1 extends o implements Function0<Unit> {
+    public final /* synthetic */ StoreApplicationCommandFrecency this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreApplicationCommandFrecency$populateStore$1(StoreApplicationCommandFrecency storeApplicationCommandFrecency) {
+        super(0);
+        this.this$0 = storeApplicationCommandFrecency;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo17invoke() {
+        LinkedHashMap linkedHashMap = new LinkedHashMap();
+        for (String str : FrecencyTracker.getSortedKeys$default(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), 0, 1, null)) {
+            if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) {
+                List split$default = w.split$default((CharSequence) str, new String[]{":"}, false, 0, 6, (Object) null);
+                Long longOrNull = s.toLongOrNull((String) split$default.get(1));
+                long longValue = longOrNull != null ? longOrNull.longValue() : 0;
+                String str2 = (String) split$default.get(0);
+                List list = (List) linkedHashMap.get(Long.valueOf(longValue));
+                if (list == null) {
+                    list = new ArrayList();
+                    linkedHashMap.put(Long.valueOf(longValue), list);
+                }
+                list.add(str2);
+            } else {
+                List list2 = (List) linkedHashMap.get(0L);
+                if (list2 == null) {
+                    list2 = new ArrayList();
+                    linkedHashMap.put(0L, list2);
+                }
+                list2.add(str);
+            }
+        }
+        StoreApplicationCommandFrecency storeApplicationCommandFrecency = this.this$0;
+        LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size()));
+        for (Map.Entry entry : linkedHashMap.entrySet()) {
+            linkedHashMap2.put(entry.getKey(), u.toList((Iterable) entry.getValue()));
+        }
+        StoreApplicationCommandFrecency.access$setTopCommandIds$p(storeApplicationCommandFrecency, h0.toMutableMap(linkedHashMap2));
+        StoreApplicationCommandFrecency.access$setTopCommandIdsSnapshot$p(this.this$0, linkedHashMap);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java
index b58a47addf..3d0f7fb778 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java
@@ -1,12 +1,9 @@
 package com.discord.stores;
 
-import c0.g0.s;
 import c0.g0.w;
-import c0.t.g0;
 import c0.t.h0;
 import c0.t.n;
 import c0.t.o;
-import c0.t.u;
 import c0.z.d.m;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
@@ -25,18 +22,17 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 import rx.Observable;
 /* compiled from: StoreApplicationCommandFrecency.kt */
 public final class StoreApplicationCommandFrecency extends StoreV2 {
+    private final Dispatcher dispatcher;
     private final ApplicationCommandFrecencyTracker frecency;
     private final Persister<ApplicationCommandFrecencyTracker> frecencyCache;
     private final ObservationDeck observationDeck;
     private Map<Long, List<String>> topCommandIds;
     private Map<Long, ? extends List<String>> topCommandIdsSnapshot;
 
-    public StoreApplicationCommandFrecency() {
-        this(null, 1, null);
-    }
-
-    public StoreApplicationCommandFrecency(ObservationDeck observationDeck) {
+    public StoreApplicationCommandFrecency(Dispatcher dispatcher, ObservationDeck observationDeck) {
+        m.checkNotNullParameter(dispatcher, "dispatcher");
         m.checkNotNullParameter(observationDeck, "observationDeck");
+        this.dispatcher = dispatcher;
         this.observationDeck = observationDeck;
         Persister<ApplicationCommandFrecencyTracker> persister = new Persister<>("CACHE_KEY_APPLICATION_COMMANDS", new ApplicationCommandFrecencyTracker(0, 0, 3, null));
         this.frecencyCache = persister;
@@ -47,8 +43,40 @@ public final class StoreApplicationCommandFrecency extends StoreV2 {
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ StoreApplicationCommandFrecency(ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i & 1) != 0 ? ObservationDeckProvider.get() : observationDeck);
+    public /* synthetic */ StoreApplicationCommandFrecency(Dispatcher dispatcher, ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(dispatcher, (i & 2) != 0 ? ObservationDeckProvider.get() : observationDeck);
+    }
+
+    public static final /* synthetic */ List access$getAllTopCommandIds(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Long l) {
+        return storeApplicationCommandFrecency.getAllTopCommandIds(l);
+    }
+
+    public static final /* synthetic */ ApplicationCommandFrecencyTracker access$getFrecency$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) {
+        return storeApplicationCommandFrecency.frecency;
+    }
+
+    public static final /* synthetic */ Persister access$getFrecencyCache$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) {
+        return storeApplicationCommandFrecency.frecencyCache;
+    }
+
+    public static final /* synthetic */ String access$getKey(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Long l, String str) {
+        return storeApplicationCommandFrecency.getKey(l, str);
+    }
+
+    public static final /* synthetic */ Map access$getTopCommandIds$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) {
+        return storeApplicationCommandFrecency.topCommandIds;
+    }
+
+    public static final /* synthetic */ Map access$getTopCommandIdsSnapshot$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) {
+        return storeApplicationCommandFrecency.topCommandIdsSnapshot;
+    }
+
+    public static final /* synthetic */ void access$setTopCommandIds$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Map map) {
+        storeApplicationCommandFrecency.topCommandIds = map;
+    }
+
+    public static final /* synthetic */ void access$setTopCommandIdsSnapshot$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Map map) {
+        storeApplicationCommandFrecency.topCommandIdsSnapshot = map;
     }
 
     private final List<String> getAllTopCommandIds(Long l) {
@@ -99,48 +127,18 @@ public final class StoreApplicationCommandFrecency extends StoreV2 {
     }
 
     public final Observable<List<String>> observeTopCommandIds(Long l) {
-        Observable<List<String>> S = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationCommandFrecency$observeTopCommandIds$1(this, l), 14, null).S(getTopCommandIds(l));
-        m.checkNotNullExpressionValue(S, "observationDeck.connectR…etTopCommandIds(guildId))");
-        return S;
+        Observable<List<String>> T = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationCommandFrecency$observeTopCommandIds$1(this, l), 14, null).T(getTopCommandIds(l));
+        m.checkNotNullExpressionValue(T, "observationDeck.connectR…etTopCommandIds(guildId))");
+        return T;
     }
 
     public final void onCommandUsed(Long l, String str) {
         m.checkNotNullParameter(str, "commandId");
-        FrecencyTracker.track$default(this.frecency, getKey(l, str), 0, 2, null);
-        this.frecencyCache.set(this.frecency, true);
-        this.topCommandIds.put(Long.valueOf(l != null ? l.longValue() : 0), getAllTopCommandIds(l));
-        markChanged(this);
+        this.dispatcher.schedule(new StoreApplicationCommandFrecency$onCommandUsed$1(this, l, str));
     }
 
     public final void populateStore() {
-        LinkedHashMap linkedHashMap = new LinkedHashMap();
-        for (String str : FrecencyTracker.getSortedKeys$default(this.frecency, 0, 1, null)) {
-            if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) {
-                List split$default = w.split$default((CharSequence) str, new String[]{":"}, false, 0, 6, (Object) null);
-                Long longOrNull = s.toLongOrNull((String) split$default.get(1));
-                long longValue = longOrNull != null ? longOrNull.longValue() : 0;
-                String str2 = (String) split$default.get(0);
-                List list = (List) linkedHashMap.get(Long.valueOf(longValue));
-                if (list == null) {
-                    list = new ArrayList();
-                    linkedHashMap.put(Long.valueOf(longValue), list);
-                }
-                list.add(str2);
-            } else {
-                List list2 = (List) linkedHashMap.get(0L);
-                if (list2 == null) {
-                    list2 = new ArrayList();
-                    linkedHashMap.put(0L, list2);
-                }
-                list2.add(str);
-            }
-        }
-        LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size()));
-        for (Map.Entry entry : linkedHashMap.entrySet()) {
-            linkedHashMap2.put(entry.getKey(), u.toList((Iterable) entry.getValue()));
-        }
-        this.topCommandIds = h0.toMutableMap(linkedHashMap2);
-        this.topCommandIdsSnapshot = linkedHashMap;
+        this.dispatcher.schedule(new StoreApplicationCommandFrecency$populateStore$1(this));
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
index 66706007fb..102d7d11d1 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
@@ -772,9 +772,9 @@ public final class StoreApplicationCommands extends StoreV2 {
     }
 
     public final Observable<Map<String, Map<String, CommandAutocompleteState>>> observeAutocompleteResults() {
-        Observable<Map<String, Map<String, CommandAutocompleteState>>> S = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{AutocompleteResultsUpdate}, false, null, null, new StoreApplicationCommands$observeAutocompleteResults$1(this), 14, null).S(h0.emptyMap());
-        m.checkNotNullExpressionValue(S, "observationDeck.connectR…  }.startWith(emptyMap())");
-        return S;
+        Observable<Map<String, Map<String, CommandAutocompleteState>>> T = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{AutocompleteResultsUpdate}, false, null, null, new StoreApplicationCommands$observeAutocompleteResults$1(this), 14, null).T(h0.emptyMap());
+        m.checkNotNullExpressionValue(T, "observationDeck.connectR…  }.startWith(emptyMap())");
+        return T;
     }
 
     public final Observable<DiscoverCommands> observeDiscoverCommands(long j) {
@@ -784,9 +784,9 @@ public final class StoreApplicationCommands extends StoreV2 {
     }
 
     public final Observable<List<ApplicationCommand>> observeFrecencyCommands(long j) {
-        Observable<List<ApplicationCommand>> S = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{FrecencyCommandsUpdate, this.storeExperiments}, false, null, null, new StoreApplicationCommands$observeFrecencyCommands$1(this, j), 14, null).S(n.emptyList());
-        m.checkNotNullExpressionValue(S, "observationDeck.connectR…st<ApplicationCommand>())");
-        return S;
+        Observable<List<ApplicationCommand>> T = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{FrecencyCommandsUpdate, this.storeExperiments}, false, null, null, new StoreApplicationCommands$observeFrecencyCommands$1(this, j), 14, null).T(n.emptyList());
+        m.checkNotNullExpressionValue(T, "observationDeck.connectR…st<ApplicationCommand>())");
+        return T;
     }
 
     public final Observable<List<Application>> observeGuildApplications(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java
index 5622c17565..727ce4cb21 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java
@@ -212,9 +212,9 @@ public final class StoreApplicationStreamPreviews extends StoreV2 {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            Observable<Long> c02 = Observable.c0(l.longValue(), TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable.timer(retryAf…s, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(c02, StoreApplicationStreamPreviews.class, (Context) null, new StoreApplicationStreamPreviews$handleFetchFailed$1(this, str), (Function1) null, new StoreApplicationStreamPreviews$handleFetchFailed$2(this, str), (Function0) null, new StoreApplicationStreamPreviews$handleFetchFailed$3(this, str), 42, (Object) null);
+            Observable<Long> d02 = Observable.d0(l.longValue(), TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(retryAf…s, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, StoreApplicationStreamPreviews.class, (Context) null, new StoreApplicationStreamPreviews$handleFetchFailed$1(this, str), (Function1) null, new StoreApplicationStreamPreviews$handleFetchFailed$2(this, str), (Function0) null, new StoreApplicationStreamPreviews$handleFetchFailed$3(this, str), 42, (Object) null);
         }
         this.fetchAttempts.put(str, Integer.valueOf(intValue));
         markChanged();
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java
index b608abd944..dfcc516abd 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java
@@ -161,7 +161,7 @@ public final class StoreAudioManagerV2$init$1 implements Runnable {
         Observable<DiscordAudioManager.DeviceTypes> q2 = DiscordAudioManager.d().u.q();
         m.checkNotNullExpressionValue(q2, "activeAudioDeviceSubject.distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(q2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
-        Observable<Integer> q3 = DiscordAudioManager.d().f2585y.q();
+        Observable<Integer> q3 = DiscordAudioManager.d().f2583y.q();
         m.checkNotNullExpressionValue(q3, "currentMediaVolumeSubject.distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(q3, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java
index 602ba01033..11092309a4 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java
@@ -33,7 +33,7 @@ public final class StoreAudioManagerV2$selectOutputDevice$1 implements Runnable
         }
         d.c1("DiscordAudioManager", "setDevice(deviceType=" + deviceTypes + ')');
         synchronized (d.i) {
-            List<DiscordAudioManager.AudioDevice> list = d.f2582r;
+            List<DiscordAudioManager.AudioDevice> list = d.f2580r;
             arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
             for (DiscordAudioManager.AudioDevice audioDevice : list) {
                 arrayList.add(DiscordAudioManager.AudioDevice.a(audioDevice, null, false, null, null, 15));
@@ -42,7 +42,7 @@ public final class StoreAudioManagerV2$selectOutputDevice$1 implements Runnable
         DiscordAudioManager.DeviceTypes deviceTypes2 = DiscordAudioManager.DeviceTypes.DEFAULT;
         if (deviceTypes == deviceTypes2) {
             synchronized (d.i) {
-                d.f2586z = deviceTypes2;
+                d.f2584z = deviceTypes2;
             }
             d.a(arrayList);
             return;
@@ -57,11 +57,11 @@ public final class StoreAudioManagerV2$selectOutputDevice$1 implements Runnable
         }
         if (z2) {
             synchronized (d.i) {
-                z3 = true ^ d.f2582r.get(deviceTypes.getValue()).b;
+                z3 = true ^ d.f2580r.get(deviceTypes.getValue()).b;
             }
             if (!z3) {
                 synchronized (d.i) {
-                    d.f2586z = deviceTypes;
+                    d.f2584z = deviceTypes;
                 }
                 d.b(deviceTypes);
             }
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$toggleSpeakerOutput$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$toggleSpeakerOutput$1.java
index 9812e616a5..e9d32c54df 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$toggleSpeakerOutput$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$toggleSpeakerOutput$1.java
@@ -27,7 +27,7 @@ public final class StoreAudioManagerV2$toggleSpeakerOutput$1 extends o implement
             return;
         }
         DiscordAudioManager discordAudioManager = DiscordAudioManager.d;
-        List<DiscordAudioManager.DeviceTypes> list = DiscordAudioManager.f2581c;
+        List<DiscordAudioManager.DeviceTypes> list = DiscordAudioManager.f2579c;
         ListIterator<DiscordAudioManager.DeviceTypes> listIterator = list.listIterator(list.size());
         while (true) {
             if (!listIterator.hasPrevious()) {
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$updateMediaVolume$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$updateMediaVolume$1.java
index 517703a7f0..3b21b867c8 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$updateMediaVolume$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$updateMediaVolume$1.java
@@ -22,7 +22,7 @@ public final class StoreAudioManagerV2$updateMediaVolume$1 implements Runnable {
             return;
         }
         try {
-            d.e.setStreamVolume(3, a.roundToInt(f * ((float) d.f2584x)), 0);
+            d.e.setStreamVolume(3, a.roundToInt(f * ((float) d.f2582x)), 0);
         } catch (SecurityException e) {
             d.g1("DiscordAudioManager", "Failed to set stream volume: " + e);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java
index bb219a1b6a..3f0f3897fb 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java
@@ -284,7 +284,7 @@ public final class StoreAudioManagerV2 extends StoreV2 {
 
     private final void updateCurrentMediaVolume(int i) {
         DiscordAudioManager discordAudioManager = DiscordAudioManager.d;
-        this.streamRtcConnectionStore.updateStreamVolume(PerceptualVolumeUtils.INSTANCE.perceptualToAmplitude((((float) i) / ((float) DiscordAudioManager.d().f2584x)) * 300.0f, 300.0f));
+        this.streamRtcConnectionStore.updateStreamVolume(PerceptualVolumeUtils.INSTANCE.perceptualToAmplitude((((float) i) / ((float) DiscordAudioManager.d().f2582x)) * 300.0f, 300.0f));
     }
 
     public final DiscordAudioManager.AudioDevice getLastActiveAudioDevice$app_productionGoogleRelease() {
@@ -321,13 +321,13 @@ public final class StoreAudioManagerV2 extends StoreV2 {
                 DiscordAudioManager discordAudioManager = DiscordAudioManager.d;
                 DiscordAudioManager d = DiscordAudioManager.d();
                 synchronized (d) {
-                    if (d.f2582r.get(DiscordAudioManager.DeviceTypes.EARPIECE.getValue()).b) {
-                        List<DiscordAudioManager.AudioDevice> list = d.f2582r;
+                    if (d.f2580r.get(DiscordAudioManager.DeviceTypes.EARPIECE.getValue()).b) {
+                        List<DiscordAudioManager.AudioDevice> list = d.f2580r;
                         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                         for (DiscordAudioManager.AudioDevice audioDevice : list) {
                             arrayList.add(audioDevice.a.ordinal() != 4 ? DiscordAudioManager.AudioDevice.a(audioDevice, null, false, null, null, 15) : DiscordAudioManager.AudioDevice.a(audioDevice, null, false, null, null, 13));
                         }
-                        d.f2582r = arrayList;
+                        d.f2580r = arrayList;
                         d.s.j.onNext(arrayList);
                         d.l();
                     }
@@ -336,13 +336,13 @@ public final class StoreAudioManagerV2 extends StoreV2 {
                 DiscordAudioManager discordAudioManager2 = DiscordAudioManager.d;
                 DiscordAudioManager d2 = DiscordAudioManager.d();
                 synchronized (d2) {
-                    if (d2.f2582r.get(DiscordAudioManager.DeviceTypes.EARPIECE.getValue()).b != d2.h) {
-                        List<DiscordAudioManager.AudioDevice> list2 = d2.f2582r;
+                    if (d2.f2580r.get(DiscordAudioManager.DeviceTypes.EARPIECE.getValue()).b != d2.h) {
+                        List<DiscordAudioManager.AudioDevice> list2 = d2.f2580r;
                         ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(list2, 10));
                         for (DiscordAudioManager.AudioDevice audioDevice2 : list2) {
                             arrayList2.add(audioDevice2.a.ordinal() != 4 ? DiscordAudioManager.AudioDevice.a(audioDevice2, null, false, null, null, 15) : DiscordAudioManager.AudioDevice.a(audioDevice2, null, d2.h, null, null, 13));
                         }
-                        d2.f2582r = arrayList2;
+                        d2.f2580r = arrayList2;
                         d2.s.j.onNext(arrayList2);
                         d2.l();
                     }
diff --git a/app/src/main/java/com/discord/stores/StoreAuditLog.java b/app/src/main/java/com/discord/stores/StoreAuditLog.java
index c60779bfe8..4a24be01d1 100644
--- a/app/src/main/java/com/discord/stores/StoreAuditLog.java
+++ b/app/src/main/java/com/discord/stores/StoreAuditLog.java
@@ -593,11 +593,11 @@ public final class StoreAuditLog extends StoreV2 {
     }
 
     public final Observable<AuditLogState> observeAuditLogState(long j) {
-        Observable s = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAuditLog$observeAuditLogState$1(this, j), 14, null).q().s(new StoreAuditLog$observeAuditLogState$2(this, j));
-        m.checkNotNullExpressionValue(s, "observationDeck.connectR…ditLogIfNeeded(guildId) }");
-        Observable<AuditLogState> E = s.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        return E;
+        Observable t = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAuditLog$observeAuditLogState$1(this, j), 14, null).q().t(new StoreAuditLog$observeAuditLogState$2(this, j));
+        m.checkNotNullExpressionValue(t, "observationDeck.connectR…ditLogIfNeeded(guildId) }");
+        Observable<AuditLogState> F = t.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return F;
     }
 
     public final void setAuditLogFilterActionId(int i) {
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java
index 832728220c..cb4e559f14 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java
@@ -22,6 +22,6 @@ public final class StoreAuthentication$getFingerprintSnapshotOrGenerate$1<T, R>
     }
 
     public final Observable<? extends String> call(String str) {
-        return str != null ? new j(str) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthFingerprint(new RestAPIParams.EmptyBody()), false, 1, null).E(AnonymousClass2.INSTANCE);
+        return str != null ? new j(str) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthFingerprint(new RestAPIParams.EmptyBody()), false, 1, null).F(AnonymousClass2.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java
index df49b6db62..d1ea3a6e50 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java
@@ -31,8 +31,8 @@ public final class StoreAuthentication$login$1<T, R> implements b<String, Observ
         }
 
         public final TrackNetworkMetadataReceiver invoke(ModelLoginResult modelLoginResult) {
-            Observable<T> K = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getInviteSettings().getInvite(), 250, false, 2, null).K(StoreAuthentication$login$1$1$invite$1.INSTANCE);
-            ModelInvite modelInvite = (ModelInvite) new a(K).a(K.x());
+            Observable<T> L = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getInviteSettings().getInvite(), 250, false, 2, null).L(StoreAuthentication$login$1$1$invite$1.INSTANCE);
+            ModelInvite modelInvite = (ModelInvite) new a(L).a(L.y());
             return new TrackNetworkActionUserLogin(modelInvite != null ? modelInvite.code : null);
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java
index eb63931dae..ace3829353 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java
@@ -139,8 +139,8 @@ public final class StoreAuthentication$register$1<T, R> implements b<String, Obs
         }
         Observable j = Observable.j(inviteCode, observeDynamicLinkGuildTemplateCode, (Func2) r2);
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…RequestParams\n          )");
-        Observable<R> y2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j, 500, false, 2, null).y(new AnonymousClass2(this, str));
-        m.checkNotNullExpressionValue(y2, "Observable.combineLatest…        }\n              }");
-        return ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn$default(y2, false, 1, null), 0, false, 3, null).s(new AnonymousClass3(this));
+        Observable<R> z2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j, 500, false, 2, null).z(new AnonymousClass2(this, str));
+        m.checkNotNullExpressionValue(z2, "Observable.combineLatest…        }\n              }");
+        return ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null), 0, false, 3, null).t(new AnonymousClass3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication.java b/app/src/main/java/com/discord/stores/StoreAuthentication.java
index 20ceacdd32..db3565f99c 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication.java
@@ -43,13 +43,13 @@ public final class StoreAuthentication extends Store {
     private String authToken;
     private final Dispatcher dispatcher;
     private String fingerprint;
-    private final SerializedSubject<String, String> fingerprintSubject = new SerializedSubject<>(BehaviorSubject.j0());
+    private final SerializedSubject<String, String> fingerprintSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private Subscription isConsentRequiredSubscription;
     private final SerializedSubject<Uri, Uri> oauthUriSubject;
     private String savedLogin;
     private final StoreStream storeStream;
-    private final SerializedSubject<String, String> tokenSubject = new SerializedSubject<>(BehaviorSubject.j0());
-    private final PublishSubject<Boolean> userInitiatedAuthEventSubject = PublishSubject.j0();
+    private final SerializedSubject<String, String> tokenSubject = new SerializedSubject<>(BehaviorSubject.k0());
+    private final PublishSubject<Boolean> userInitiatedAuthEventSubject = PublishSubject.k0();
 
     /* compiled from: StoreAuthentication.kt */
     public static final class AuthRequestParams {
@@ -169,10 +169,10 @@ public final class StoreAuthentication extends Store {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         this.storeStream = storeStream;
         this.dispatcher = dispatcher;
-        BehaviorSubject<String> j0 = BehaviorSubject.j0();
-        m.checkNotNullExpressionValue(j0, "BehaviorSubject.create()");
-        this.ageGateError = j0;
-        this.oauthUriSubject = new SerializedSubject<>(BehaviorSubject.k0(Uri.EMPTY));
+        BehaviorSubject<String> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.ageGateError = k0;
+        this.oauthUriSubject = new SerializedSubject<>(BehaviorSubject.l0(Uri.EMPTY));
     }
 
     public static final /* synthetic */ void access$dispatchLogin(StoreAuthentication storeAuthentication, ModelLoginResult modelLoginResult) {
@@ -208,9 +208,9 @@ public final class StoreAuthentication extends Store {
     }
 
     private final Observable<String> getFingerprintSnapshotOrGenerate() {
-        Observable<String> s = this.fingerprintSubject.Y(1).X(StoreAuthentication$getFingerprintSnapshotOrGenerate$1.INSTANCE).s(new StoreAuthentication$getFingerprintSnapshotOrGenerate$2(this));
-        m.checkNotNullExpressionValue(s, "fingerprintSubject\n     …int(fingerprint, false) }");
-        return s;
+        Observable<String> t = this.fingerprintSubject.Z(1).Y(StoreAuthentication$getFingerprintSnapshotOrGenerate$1.INSTANCE).t(new StoreAuthentication$getFingerprintSnapshotOrGenerate$2(this));
+        m.checkNotNullExpressionValue(t, "fingerprintSubject\n     …int(fingerprint, false) }");
+        return t;
     }
 
     public static /* synthetic */ Observable login$default(StoreAuthentication storeAuthentication, String str, String str2, String str3, boolean z2, String str4, int i, Object obj) {
@@ -246,9 +246,9 @@ public final class StoreAuthentication extends Store {
     public final Observable<ModelLoginResult> authMFA(String str, String str2) {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         m.checkNotNullParameter(str2, "ticket");
-        Observable<ModelLoginResult> s = ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().postMFACode(new RestAPIParams.MFALogin(str2, str)), StoreAuthentication$authMFA$1.INSTANCE), false, 1, null).s(new StoreAuthentication$authMFA$2(this));
-        m.checkNotNullExpressionValue(s, "RestAPI\n        .api\n   …in(loginResult)\n        }");
-        return s;
+        Observable<ModelLoginResult> t = ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().postMFACode(new RestAPIParams.MFALogin(str2, str)), StoreAuthentication$authMFA$1.INSTANCE), false, 1, null).t(new StoreAuthentication$authMFA$2(this));
+        m.checkNotNullExpressionValue(t, "RestAPI\n        .api\n   …in(loginResult)\n        }");
+        return t;
     }
 
     public final Observable<Void> authorizeIP(String str) {
@@ -294,9 +294,9 @@ public final class StoreAuthentication extends Store {
     }
 
     public final Observable<Boolean> getPreLogoutSignal$app_productionGoogleRelease() {
-        Observable<Boolean> w2 = this.userInitiatedAuthEventSubject.w(StoreAuthentication$getPreLogoutSignal$1.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "userInitiatedAuthEventSu…LoggedIn -> !isLoggedIn }");
-        return w2;
+        Observable<Boolean> x2 = this.userInitiatedAuthEventSubject.x(StoreAuthentication$getPreLogoutSignal$1.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "userInitiatedAuthEventSu…LoggedIn -> !isLoggedIn }");
+        return x2;
     }
 
     public final String getSavedLogin() {
@@ -379,32 +379,32 @@ public final class StoreAuthentication extends Store {
         m.checkNotNullParameter(str, "login");
         m.checkNotNullParameter(str2, "password");
         setSavedLogin(str);
-        Observable<ModelLoginResult> s = getFingerprintSnapshotOrGenerate().y(new StoreAuthentication$login$1(str, str2, str3, z2, str4)).s(new StoreAuthentication$login$2(this));
-        m.checkNotNullExpressionValue(s, "getFingerprintSnapshotOr…lt)\n          }\n        }");
-        return s;
+        Observable<ModelLoginResult> t = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$login$1(str, str2, str3, z2, str4)).t(new StoreAuthentication$login$2(this));
+        m.checkNotNullExpressionValue(t, "getFingerprintSnapshotOr…lt)\n          }\n        }");
+        return t;
     }
 
     public final void logout() {
         PublishSubject<Boolean> publishSubject = this.userInitiatedAuthEventSubject;
         publishSubject.j.onNext(Boolean.FALSE);
-        Observable y2 = ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().logout(new RestAPIParams.UserDevices(StoreStream.Companion.getNotifications().getPushToken())), StoreAuthentication$logout$1.INSTANCE), false, 1, null).y(new StoreAuthentication$logout$2(this));
-        m.checkNotNullExpressionValue(y2, "RestAPI\n        .api\n   …intSnapshotOrGenerate() }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 0, false, 3, null), (Context) null, "logout", (Function1) null, new StoreAuthentication$logout$3(this), new StoreAuthentication$logout$4(this), (Function0) null, (Function0) null, 101, (Object) null);
+        Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().logout(new RestAPIParams.UserDevices(StoreStream.Companion.getNotifications().getPushToken())), StoreAuthentication$logout$1.INSTANCE), false, 1, null).z(new StoreAuthentication$logout$2(this));
+        m.checkNotNullExpressionValue(z2, "RestAPI\n        .api\n   …intSnapshotOrGenerate() }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(z2, 0, false, 3, null), (Context) null, "logout", (Function1) null, new StoreAuthentication$logout$3(this), new StoreAuthentication$logout$4(this), (Function0) null, (Function0) null, 101, (Object) null);
     }
 
     public final Observable<Boolean> observeIsAuthed$app_productionGoogleRelease() {
-        Observable<R> E = getAuthedToken$app_productionGoogleRelease().E(StoreAuthentication$observeIsAuthed$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "getAuthedToken()\n      .… -> authedToken != null }");
-        return E;
+        Observable<R> F = getAuthedToken$app_productionGoogleRelease().F(StoreAuthentication$observeIsAuthed$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "getAuthedToken()\n      .… -> authedToken != null }");
+        return F;
     }
 
     public final Observable<RegisterResponse> register(String str, String str2, String str3, String str4, String str5, boolean z2, String str6) {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(str4, "password");
         setSavedLogin(str2);
-        Observable<R> y2 = getFingerprintSnapshotOrGenerate().y(new StoreAuthentication$register$1(this, str, str2, str3, str4, str5, z2, str6));
-        m.checkNotNullExpressionValue(y2, "getFingerprintSnapshotOr…              }\n        }");
-        return y2;
+        Observable<R> z3 = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$register$1(this, str, str2, str3, str4, str5, z2, str6));
+        m.checkNotNullExpressionValue(z3, "getFingerprintSnapshotOr…              }\n        }");
+        return z3;
     }
 
     public final synchronized void requestConsentRequired() {
diff --git a/app/src/main/java/com/discord/stores/StoreCalls$call$2.java b/app/src/main/java/com/discord/stores/StoreCalls$call$2.java
index 39aa307cc0..abb6c63277 100644
--- a/app/src/main/java/com/discord/stores/StoreCalls$call$2.java
+++ b/app/src/main/java/com/discord/stores/StoreCalls$call$2.java
@@ -47,7 +47,7 @@ public final class StoreCalls$call$2 extends o implements Function1<Long, Unit>
         }
 
         public final Observable<? extends Boolean> call(Integer num) {
-            return (num != null && num.intValue() == 1) ? new j(Boolean.TRUE) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().call(this.this$0.$channelId), false, 1, null).E(AnonymousClass1.INSTANCE);
+            return (num != null && num.intValue() == 1) ? new j(Boolean.TRUE) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().call(this.this$0.$channelId), false, 1, null).F(AnonymousClass1.INSTANCE);
         }
     }
 
@@ -134,9 +134,9 @@ public final class StoreCalls$call$2 extends o implements Function1<Long, Unit>
     }
 
     public final void invoke(long j) {
-        Observable<R> y2 = StoreStream.Companion.getUserRelationships().observe(j).y(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(y2, "StoreStream\n          .g…            }\n          }");
-        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 0, false, 3, null), this.$appComponent, null, 2, null);
+        Observable<R> z2 = StoreStream.Companion.getUserRelationships().observe(j).z(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(z2, "StoreStream\n          .g…            }\n          }");
+        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(z2, 0, false, 3, null), this.$appComponent, null, 2, null);
         Context context = this.$context;
         ObservableExtensionsKt.appSubscribe$default(ui$default, this.this$0.getClass(), context, (Function1) null, new AnonymousClass3(this, j), (Function0) null, (Function0) null, new AnonymousClass2(this), 52, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreCalls.java b/app/src/main/java/com/discord/stores/StoreCalls.java
index 1844181be9..eb5fe724c5 100644
--- a/app/src/main/java/com/discord/stores/StoreCalls.java
+++ b/app/src/main/java/com/discord/stores/StoreCalls.java
@@ -21,7 +21,7 @@ import rx.subjects.SerializedSubject;
 /* compiled from: StoreCalls.kt */
 public final class StoreCalls {
     private final HashMap<Long, ModelCall> calls = new HashMap<>();
-    private final SerializedSubject<HashMap<Long, ModelCall>, HashMap<Long, ModelCall>> callsSubject = new SerializedSubject<>(BehaviorSubject.j0());
+    private final SerializedSubject<HashMap<Long, ModelCall>, HashMap<Long, ModelCall>> callsSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private boolean connectionReady;
     private long selectedChannelId;
     private long selectedGuildId;
@@ -100,15 +100,15 @@ public final class StoreCalls {
         StoreCalls$call$1 storeCalls$call$1 = new StoreCalls$call$1(this, j);
         StoreCalls$call$2 storeCalls$call$2 = new StoreCalls$call$2(this, j, appComponent, context, storeCalls$call$1, function0, fragmentManager);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable Y = Observable.i0(companion.getChannels().observeChannel(j).k(o.c(StoreCalls$call$3.INSTANCE, null, 5000, TimeUnit.MILLISECONDS)), companion.getVoiceStates().observeForPrivateChannels(j), StoreCalls$call$4.INSTANCE).Y(1);
-        m.checkNotNullExpressionValue(Y, "Observable\n        .zip(…tates) }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(Y, StoreCalls.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreCalls$call$5(storeCalls$call$2, storeCalls$call$1), 62, (Object) null);
+        Observable Z = Observable.j0(companion.getChannels().observeChannel(j).k(o.c(StoreCalls$call$3.INSTANCE, null, 5000, TimeUnit.MILLISECONDS)), companion.getVoiceStates().observeForPrivateChannels(j), StoreCalls$call$4.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable\n        .zip(…tates) }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StoreCalls.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreCalls$call$5(storeCalls$call$2, storeCalls$call$1), 62, (Object) null);
     }
 
     public final Observable<ModelCall> get(long j) {
-        Observable<HashMap<Long, ModelCall>> E = this.callsSubject.E(new StoreCalls$get$1(j));
-        m.checkNotNullExpressionValue(E, "callsSubject\n          .…lls -> calls[channelId] }");
-        Observable<ModelCall> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<HashMap<Long, ModelCall>> F = this.callsSubject.F(new StoreCalls$get$1(j));
+        m.checkNotNullExpressionValue(F, "callsSubject\n          .…lls -> calls[channelId] }");
+        Observable<ModelCall> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "callsSubject\n          .…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreCallsIncoming.java b/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
index 3f598faf09..ad07f48887 100644
--- a/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
+++ b/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
@@ -64,7 +64,7 @@ public final class StoreCallsIncoming extends StoreV2 {
     }
 
     public final Observable<Boolean> observeHasIncoming() {
-        Observable<Boolean> q = observeIncoming().E(StoreCallsIncoming$observeHasIncoming$1.INSTANCE).q();
+        Observable<Boolean> q = observeIncoming().F(StoreCallsIncoming$observeHasIncoming$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeIncoming()\n      …  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelMembers.java b/app/src/main/java/com/discord/stores/StoreChannelMembers.java
index c299681e35..9f60cc308e 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelMembers.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelMembers.java
@@ -310,10 +310,10 @@ public final class StoreChannelMembers extends StoreV2 {
         this.getGuildMemberCount = function12;
         this.getPresence = function13;
         this.isUserStreaming = function14;
-        PublishSubject<Unit> j0 = PublishSubject.j0();
-        this.markChangedTrigger = j0;
-        m.checkNotNullExpressionValue(j0, "markChangedTrigger");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.leadingEdgeThrottle(j0, 1, TimeUnit.SECONDS), StoreChannelMembers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        PublishSubject<Unit> k0 = PublishSubject.k0();
+        this.markChangedTrigger = k0;
+        m.checkNotNullExpressionValue(k0, "markChangedTrigger");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.leadingEdgeThrottle(k0, 1, TimeUnit.SECONDS), StoreChannelMembers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     public static final /* synthetic */ Dispatcher access$getDispatcher$p(StoreChannelMembers storeChannelMembers) {
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
index fb7e8c5932..b0af3fffdc 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
@@ -76,6 +76,6 @@ public final class StoreChannels$observeDefaultChannel$1<T, R> implements b<Map<
     }
 
     public final Observable<? extends Channel> call(Map<Long, Long> map) {
-        return this.this$0.observeChannelsForGuild(this.$guildId, 0).E(new AnonymousClass1(map));
+        return this.this$0.observeChannelsForGuild(this.$guildId, 0).F(new AnonymousClass1(map));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels.java b/app/src/main/java/com/discord/stores/StoreChannels.java
index 6bcb7502a7..5d9bf36897 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels.java
@@ -645,7 +645,7 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<List<Channel>> observeChannelCategories(long j) {
-        Observable<List<Channel>> q = observeChannelsForGuild$default(this, j, null, 2, null).E(StoreChannels$observeChannelCategories$1.INSTANCE).q();
+        Observable<List<Channel>> q = observeChannelsForGuild$default(this, j, null, 2, null).F(StoreChannels$observeChannelCategories$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeChannelsForGuild(…  .distinctUntilChanged()");
         return q;
     }
@@ -655,28 +655,28 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, Channel>> observeChannelsForGuild(long j, Integer num) {
-        Observable<Map<Long, Channel>> q = observeGuildAndPrivateChannels().X(new StoreChannels$observeChannelsForGuild$1(j, num)).q();
+        Observable<Map<Long, Channel>> q = observeGuildAndPrivateChannels().Y(new StoreChannels$observeChannelsForGuild$1(j, num)).q();
         m.checkNotNullExpressionValue(q, "observeGuildAndPrivateCh…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<List<Channel>> observeDMs() {
-        Observable<R> E = observePrivateChannels().E(StoreChannels$observeDMs$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "observePrivateChannels()…nel -> channel.isDM() } }");
-        return E;
+        Observable<R> F = observePrivateChannels().F(StoreChannels$observeDMs$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "observePrivateChannels()…nel -> channel.isDM() } }");
+        return F;
     }
 
     public final Observable<Channel> observeDefaultChannel(long j) {
-        Observable<Channel> q = this.observeChannelPermissionsForGuild.invoke(Long.valueOf(j)).X(new StoreChannels$observeDefaultChannel$1(this, j)).q();
+        Observable<Channel> q = this.observeChannelPermissionsForGuild.invoke(Long.valueOf(j)).Y(new StoreChannels$observeDefaultChannel$1(this, j)).q();
         m.checkNotNullExpressionValue(q, "observeChannelPermission…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<List<Channel>> observeDirectShareCandidates(Context context) {
         m.checkNotNullParameter(context, "context");
-        Observable<R> E = observeGuildAndPrivateChannels().w(StoreChannels$observeDirectShareCandidates$1.INSTANCE).E(new StoreChannels$observeDirectShareCandidates$2(context));
-        m.checkNotNullExpressionValue(E, "observeGuildAndPrivateCh…ity(context))\n          }");
-        return E;
+        Observable<R> F = observeGuildAndPrivateChannels().x(StoreChannels$observeDirectShareCandidates$1.INSTANCE).F(new StoreChannels$observeDirectShareCandidates$2(context));
+        m.checkNotNullExpressionValue(F, "observeGuildAndPrivateCh…ity(context))\n          }");
+        return F;
     }
 
     public final Observable<Map<Long, Channel>> observeGuildAndPrivateChannels() {
@@ -684,7 +684,7 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, List<Long>>> observeIds(boolean z2) {
-        Observable<Map<Long, List<Long>>> q = (z2 ? observeAllChannels() : observeGuildAndPrivateChannels()).E(StoreChannels$observeIds$1.INSTANCE).q();
+        Observable<Map<Long, List<Long>>> q = (z2 ? observeAllChannels() : observeGuildAndPrivateChannels()).F(StoreChannels$observeIds$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "channelsObservable\n     …  .distinctUntilChanged()");
         return q;
     }
@@ -707,7 +707,7 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Channel> observePrivateChannel(long j) {
-        Observable<Channel> q = observePrivateChannels().E(new StoreChannels$observePrivateChannel$1(j)).q();
+        Observable<Channel> q = observePrivateChannels().F(new StoreChannels$observePrivateChannel$1(j)).q();
         m.checkNotNullExpressionValue(q, "observePrivateChannels()…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
index 54ed5a76cd..d7169da848 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
@@ -851,9 +851,9 @@ public final class StoreChannelsSelected extends StoreV2 {
     }
 
     public final Observable<Boolean> observeInitializedForAuthedUser() {
-        Observable<R> X = this.storeChannels.observeInitializedForAuthedUser().X(new StoreChannelsSelected$observeInitializedForAuthedUser$1(this));
-        m.checkNotNullExpressionValue(X, "storeChannels.observeIni…            }\n          }");
-        return X;
+        Observable<R> Y = this.storeChannels.observeInitializedForAuthedUser().Y(new StoreChannelsSelected$observeInitializedForAuthedUser$1(this));
+        m.checkNotNullExpressionValue(Y, "storeChannels.observeIni…            }\n          }");
+        return Y;
     }
 
     public final Observable<Long> observePreviousId() {
diff --git a/app/src/main/java/com/discord/stores/StoreChat.java b/app/src/main/java/com/discord/stores/StoreChat.java
index b3017173c7..4557c3196e 100644
--- a/app/src/main/java/com/discord/stores/StoreChat.java
+++ b/app/src/main/java/com/discord/stores/StoreChat.java
@@ -388,7 +388,7 @@ public final class StoreChat extends StoreV2 {
         this.observationDeck = observationDeck;
         this.expandedBlockedMessageGroups = new ArrayList();
         this.expandedBlockedMessageGroupsSnapshot = n.emptyList();
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -461,9 +461,9 @@ public final class StoreChat extends StoreV2 {
     }
 
     public final Observable<InteractionState> observeInteractionState() {
-        Observable E = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeInteractionState$1(this), 14, null).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable<InteractionState> q = E.q();
+        Observable F = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeInteractionState$1(this), 14, null).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable<InteractionState> q = F.q();
         m.checkNotNullExpressionValue(q, "observationDeck.connectR…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java
index a2cd95c4ee..f1b6f0d720 100644
--- a/app/src/main/java/com/discord/stores/StoreClientVersion.java
+++ b/app/src/main/java/com/discord/stores/StoreClientVersion.java
@@ -15,7 +15,7 @@ import rx.subjects.SerializedSubject;
 public final class StoreClientVersion extends Store {
     private int clientMinVersion;
     private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY";
-    private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.k0(Boolean.FALSE));
+    private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
     private final int clientVersion = BuildConfig.VERSION_CODE;
 
     public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
@@ -46,8 +46,8 @@ public final class StoreClientVersion extends Store {
         int i = getPrefs().getInt(this.clientMinVersionKey, 0);
         this.clientMinVersion = i;
         setClientMinVersion(i);
-        Observable<R> y2 = Observable.C(0, 1, TimeUnit.HOURS).y(StoreClientVersion$init$1.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "Observable\n        .inte…ClientVersion()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(y2), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreClientVersion$init$2(this), 62, (Object) null);
+        Observable<R> z2 = Observable.D(0, 1, TimeUnit.HOURS).z(StoreClientVersion$init$1.INSTANCE);
+        m.checkNotNullExpressionValue(z2, "Observable\n        .inte…ClientVersion()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(z2), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreClientVersion$init$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreDirectories.java b/app/src/main/java/com/discord/stores/StoreDirectories.java
index d5c3a5d9d0..19176e6edd 100644
--- a/app/src/main/java/com/discord/stores/StoreDirectories.java
+++ b/app/src/main/java/com/discord/stores/StoreDirectories.java
@@ -108,9 +108,9 @@ public final class StoreDirectories extends StoreV2 {
     }
 
     public final void fetchDirectoriesForChannel(long j) {
-        Observable<R> E = this.restApi.getDirectoryEntries(j).E(StoreDirectories$fetchDirectoriesForChannel$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "restApi\n        .getDire…pproximateMemberCount } }");
-        RestCallStateKt.executeRequest(E, new StoreDirectories$fetchDirectoriesForChannel$2(this, j));
+        Observable<R> F = this.restApi.getDirectoryEntries(j).F(StoreDirectories$fetchDirectoriesForChannel$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restApi\n        .getDire…pproximateMemberCount } }");
+        RestCallStateKt.executeRequest(F, new StoreDirectories$fetchDirectoriesForChannel$2(this, j));
     }
 
     public final void fetchEntryCountsForChannel(long j) {
@@ -136,7 +136,7 @@ public final class StoreDirectories extends StoreV2 {
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        Observable q = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(this.guildStore.observeGuilds(), 1, TimeUnit.SECONDS)).E(StoreDirectories$init$1.INSTANCE).q();
+        Observable q = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(this.guildStore.observeGuilds(), 1, TimeUnit.SECONDS)).F(StoreDirectories$init$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "guildStore\n        .obse…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(q, StoreDirectories.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreDirectories$init$2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreDynamicLink.java b/app/src/main/java/com/discord/stores/StoreDynamicLink.java
index f68479a9db..c0d846a237 100644
--- a/app/src/main/java/com/discord/stores/StoreDynamicLink.java
+++ b/app/src/main/java/com/discord/stores/StoreDynamicLink.java
@@ -191,9 +191,9 @@ public final class StoreDynamicLink {
     private final Observable<Uri> getDynamicLinkObservable(Intent intent) {
         Observable n = Observable.n(new StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1(intent), Emitter.BackpressureMode.BUFFER);
         m.checkNotNullExpressionValue(n, "Observable.create({\n    ….BackpressureMode.BUFFER)");
-        Observable<Uri> K = Observable.G(new j(Uri.EMPTY).p(1000, TimeUnit.MILLISECONDS), n).K(StoreDynamicLink$getDynamicLinkObservable$1.INSTANCE);
-        m.checkNotNullExpressionValue(K, "Observable\n        .merg…ErrorReturn { Uri.EMPTY }");
-        return K;
+        Observable<Uri> L = Observable.H(new j(Uri.EMPTY).p(1000, TimeUnit.MILLISECONDS), n).L(StoreDynamicLink$getDynamicLinkObservable$1.INSTANCE);
+        m.checkNotNullExpressionValue(L, "Observable\n        .merg…ErrorReturn { Uri.EMPTY }");
+        return L;
     }
 
     private final void handleDataReceived(DynamicLinkData dynamicLinkData, Context context) {
@@ -222,10 +222,10 @@ public final class StoreDynamicLink {
     public final void storeLinkIfExists(Intent intent, Context context) {
         m.checkNotNullParameter(intent, "intent");
         m.checkNotNullParameter(context, "context");
-        Observable<R> E = getDynamicLinkObservable(intent).E(StoreDynamicLink$storeLinkIfExists$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "getDynamicLinkObservable…ode, authToken)\n        }");
-        Observable s = ObservableExtensionsKt.computationBuffered(E).q().s(StoreDynamicLink$storeLinkIfExists$2.INSTANCE);
-        m.checkNotNullExpressionValue(s, "getDynamicLinkObservable…  )\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(s, StoreDynamicLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreDynamicLink$storeLinkIfExists$3(this, context), 62, (Object) null);
+        Observable<R> F = getDynamicLinkObservable(intent).F(StoreDynamicLink$storeLinkIfExists$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "getDynamicLinkObservable…ode, authToken)\n        }");
+        Observable t = ObservableExtensionsKt.computationBuffered(F).q().t(StoreDynamicLink$storeLinkIfExists$2.INSTANCE);
+        m.checkNotNullExpressionValue(t, "getDynamicLinkObservable…  )\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(t, StoreDynamicLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreDynamicLink$storeLinkIfExists$3(this, context), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java b/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java
index 01ecbec7ad..703a7becac 100644
--- a/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java
+++ b/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java
@@ -72,6 +72,6 @@ public final class StoreEmoji$getEmojiSet$4<T, R> implements b<Quad<? extends Bo
     }
 
     public final Observable<? extends EmojiSet> call(Quad<Boolean, Boolean, ? extends List<Long>, ? extends Set<? extends StoreMediaFavorites.Favorite>> quad) {
-        return ObservableExtensionsKt.computationLatest(StoreEmoji.access$getCustomEmojiStore$p(this.this$0).observeAllowedGuildEmoji()).E(new AnonymousClass1(this, (List) quad.component3(), quad.component1(), quad.component2(), (Set) quad.component4()));
+        return ObservableExtensionsKt.computationLatest(StoreEmoji.access$getCustomEmojiStore$p(this.this$0).observeAllowedGuildEmoji()).F(new AnonymousClass1(this, (List) quad.component3(), quad.component1(), quad.component2(), (Set) quad.component4()));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreEmoji.java b/app/src/main/java/com/discord/stores/StoreEmoji.java
index 55766b0ac7..40314bbf28 100644
--- a/app/src/main/java/com/discord/stores/StoreEmoji.java
+++ b/app/src/main/java/com/discord/stores/StoreEmoji.java
@@ -461,16 +461,16 @@ public final class StoreEmoji implements Rules.EmojiDataProvider {
         if (emojiContext instanceof EmojiContext.Chat) {
             EmojiContext.Chat chat = (EmojiContext.Chat) emojiContext;
             if (chat.getGuildId() != 0) {
-                observable = this.permissionsStore.observePermissionsForChannel(chat.getChannelId()).E(StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.INSTANCE);
-                Observable<EmojiSet> X = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).E(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().E(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).q().X(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
-                m.checkNotNullExpressionValue(X, "Observable\n        .comb…              }\n        }");
-                return X;
+                observable = this.permissionsStore.observePermissionsForChannel(chat.getChannelId()).F(StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.INSTANCE);
+                Observable<EmojiSet> Y = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).F(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().F(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).q().Y(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
+                m.checkNotNullExpressionValue(Y, "Observable\n        .comb…              }\n        }");
+                return Y;
             }
         }
         observable = emojiContext instanceof EmojiContext.Guild ? new j(Boolean.FALSE) : new j(Boolean.TRUE);
-        Observable<EmojiSet> X = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).E(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().E(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).q().X(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
-        m.checkNotNullExpressionValue(X, "Observable\n        .comb…              }\n        }");
-        return X;
+        Observable<EmojiSet> Y = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).F(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().F(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).q().Y(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
+        m.checkNotNullExpressionValue(Y, "Observable\n        .comb…              }\n        }");
+        return Y;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map<java.lang.String, ? extends com.discord.models.domain.emoji.ModelEmojiUnicode>, java.util.Map<java.lang.String, com.discord.models.domain.emoji.ModelEmojiUnicode> */
diff --git a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java
index 155ae60512..8ff4051800 100644
--- a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java
+++ b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java
@@ -33,7 +33,7 @@ public final class StoreEmojiCustom extends StoreV2 {
     private final Map<Long, Map<Long, Map<Long, ModelEmojiCustom>>> allowedGuildEmojis = new LinkedHashMap();
 
     /* renamed from: me  reason: collision with root package name */
-    private long f2599me;
+    private long f2597me;
     private final StoreStream stream;
 
     /* compiled from: StoreEmojiCustom.kt */
@@ -125,7 +125,7 @@ public final class StoreEmojiCustom extends StoreV2 {
     @StoreThread
     public final void handleConnectionOpen(ModelPayload modelPayload) {
         m.checkNotNullParameter(modelPayload, "payload");
-        this.f2599me = modelPayload.getMe().i();
+        this.f2597me = modelPayload.getMe().i();
         for (Guild guild : modelPayload.getGuilds()) {
             m.checkNotNullExpressionValue(guild, "guild");
             handleGuildAdd(guild);
@@ -143,7 +143,7 @@ public final class StoreEmojiCustom extends StoreV2 {
         for (GuildEmoji guildEmoji : a) {
             arrayList.add(new ModelEmojiCustom(guildEmoji, c2));
         }
-        if (!(map == null || (guildMember = map.get(Long.valueOf(this.f2599me))) == null)) {
+        if (!(map == null || (guildMember = map.get(Long.valueOf(this.f2597me))) == null)) {
             updateGlobalEmojis(c2, arrayList);
             updateAllowedGuildEmojis(c2, guildMember.getRoles(), arrayList);
         }
@@ -166,7 +166,7 @@ public final class StoreEmojiCustom extends StoreV2 {
                 break;
             }
             obj = it.next();
-            if (((com.discord.api.guildmember.GuildMember) obj).j().i() == this.f2599me) {
+            if (((com.discord.api.guildmember.GuildMember) obj).j().i() == this.f2597me) {
                 z2 = true;
                 continue;
             } else {
@@ -200,7 +200,7 @@ public final class StoreEmojiCustom extends StoreV2 {
     public final void handleGuildMemberAdd(com.discord.api.guildmember.GuildMember guildMember) {
         Collection<ModelEmojiCustom> values;
         m.checkNotNullParameter(guildMember, "member");
-        if (guildMember.j().i() == this.f2599me) {
+        if (guildMember.j().i() == this.f2597me) {
             long c2 = guildMember.c();
             Map<Long, ModelEmojiCustom> map = this.allGuildEmoji.get(Long.valueOf(c2));
             if (map != null && (values = map.values()) != null) {
diff --git a/app/src/main/java/com/discord/stores/StoreExperiments.java b/app/src/main/java/com/discord/stores/StoreExperiments.java
index 6b914bff54..1d059dcc20 100644
--- a/app/src/main/java/com/discord/stores/StoreExperiments.java
+++ b/app/src/main/java/com/discord/stores/StoreExperiments.java
@@ -350,9 +350,9 @@ public final class StoreExperiments extends StoreV2 {
                 setInitialized();
                 return;
             }
-            Observable b02 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getExperiments(), false, 1, null).b0(2000, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(b02, "RestAPI\n          .api\n …0, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(b02, StoreExperiments.class, (Context) null, (Function1) null, new StoreExperiments$tryInitializeExperiments$2(this), (Function0) null, (Function0) null, new StoreExperiments$tryInitializeExperiments$1(this), 54, (Object) null);
+            Observable c02 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getExperiments(), false, 1, null).c0(2000, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(c02, "RestAPI\n          .api\n …0, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(c02, StoreExperiments.class, (Context) null, (Function1) null, new StoreExperiments$tryInitializeExperiments$2(this), (Function0) null, (Function0) null, new StoreExperiments$tryInitializeExperiments$1(this), 54, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
index 24f685fc65..8263427505 100644
--- a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
@@ -221,13 +221,13 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
                 Observable<String> authedToken$app_productionGoogleRelease = storeStream.getAuthentication$app_productionGoogleRelease().getAuthedToken$app_productionGoogleRelease();
                 Observable<Long> observeSelectedVoiceChannelId = storeStream.getVoiceChannelSelected$app_productionGoogleRelease().observeSelectedVoiceChannelId();
                 l lVar = l.f48c;
-                Observable q = l.b.E(k.i).q();
+                Observable q = l.b.F(k.i).q();
                 m.checkNotNullExpressionValue(q, "numGatewayConnectionCons…  .distinctUntilChanged()");
                 Observable g = Observable.g(a, authedToken$app_productionGoogleRelease, observeSelectedVoiceChannelId, q, storeStream.getClientDataState$app_productionGoogleRelease().observeClientState(), new StoreGatewayConnection$sam$rx_functions_Func5$0(new StoreGatewayConnection$ClientState$Companion$initialize$1(this)));
                 m.checkNotNullExpressionValue(g, "Observable\n            .…   ::create\n            )");
-                Observable H = ObservableExtensionsKt.computationLatest(g).H(scheduler);
-                m.checkNotNullExpressionValue(H, "Observable\n            .…    .observeOn(scheduler)");
-                ObservableExtensionsKt.appSubscribe$default(H, (Context) null, "clientState", (Function1) null, function1, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+                Observable I = ObservableExtensionsKt.computationLatest(g).I(scheduler);
+                m.checkNotNullExpressionValue(I, "Observable\n            .…    .observeOn(scheduler)");
+                ObservableExtensionsKt.appSubscribe$default(I, (Context) null, "clientState", (Function1) null, function1, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
             }
         }
 
@@ -354,81 +354,81 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
         BatchManager batchManager = new BatchManager(v0Var, null, 2, null);
         this.batches = batchManager;
         Boolean bool = Boolean.FALSE;
-        this.connected = new SerializedSubject<>(BehaviorSubject.k0(bool));
-        this.connectionReady = new SerializedSubject<>(BehaviorSubject.k0(bool));
-        this.callCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.callDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.channelCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.channelDeleted = new SerializedSubject<>(BehaviorSubject.j0());
-        this.channelRecipientAdd = new SerializedSubject<>(BehaviorSubject.j0());
-        this.channelRecipientRemove = new SerializedSubject<>(BehaviorSubject.j0());
-        this.channelUnreadUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildApplicationCommands = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildBanAdd = new SerializedSubject<>(PublishSubject.j0());
-        this.guildBanRemove = new SerializedSubject<>(PublishSubject.j0());
-        this.guildCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildEmojisUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildStickersUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildDeleted = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildMembersAdd = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildMembersChunk = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildMemberRemove = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildJoinRequestCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildRoleCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildRoleUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildRoleDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildIntegrationsUpdate = new SerializedSubject<>(PublishSubject.j0());
-        this.messageAck = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageReactionAdd = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageReactionRemove = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageReactionRemoveEmoji = new SerializedSubject<>(BehaviorSubject.j0());
-        this.messageReactionRemoveAll = new SerializedSubject<>(BehaviorSubject.j0());
-        this.presenceUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.presenceReplace = new SerializedSubject<>(BehaviorSubject.j0());
-        this.ready = new SerializedSubject<>(BehaviorSubject.j0());
-        this.relationshipAdd = new SerializedSubject<>(BehaviorSubject.j0());
-        this.relationshipRemove = new SerializedSubject<>(BehaviorSubject.j0());
-        this.typingStart = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userConnectionUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userSettingsUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userGuildSettingsUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userNoteUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userRequiredActionUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.sessionsReplace = new SerializedSubject<>(BehaviorSubject.j0());
+        this.connected = new SerializedSubject<>(BehaviorSubject.l0(bool));
+        this.connectionReady = new SerializedSubject<>(BehaviorSubject.l0(bool));
+        this.callCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.callDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelDeleted = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelRecipientAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelRecipientRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelUnreadUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildApplicationCommands = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildBanAdd = new SerializedSubject<>(PublishSubject.k0());
+        this.guildBanRemove = new SerializedSubject<>(PublishSubject.k0());
+        this.guildCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildEmojisUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildStickersUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildDeleted = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMembersAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMembersChunk = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMemberRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildJoinRequestCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildRoleCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildRoleUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildRoleDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildIntegrationsUpdate = new SerializedSubject<>(PublishSubject.k0());
+        this.messageAck = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionRemoveEmoji = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionRemoveAll = new SerializedSubject<>(BehaviorSubject.k0());
+        this.presenceUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.presenceReplace = new SerializedSubject<>(BehaviorSubject.k0());
+        this.ready = new SerializedSubject<>(BehaviorSubject.k0());
+        this.relationshipAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.relationshipRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.typingStart = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userConnectionUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userSettingsUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userGuildSettingsUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userNoteUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userRequiredActionUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.sessionsReplace = new SerializedSubject<>(BehaviorSubject.k0());
         this.voiceStateUpdate = BatchManager.createBatched$default(batchManager, "VOICE_STATE_UPDATE", 0, 0, 6, null);
-        this.voiceServerUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildMemberListUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userPaymentSourcesUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.userSubscriptionsUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.streamCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.streamUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.streamServerUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.streamDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.threadCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.threadDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.threadListSync = new SerializedSubject<>(BehaviorSubject.j0());
-        this.threadMemberUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.threadMembersUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.threadMemberListUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.interactionCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.interactionSuccess = new SerializedSubject<>(BehaviorSubject.j0());
-        this.interactionFailure = new SerializedSubject<>(BehaviorSubject.j0());
-        this.applicationCommandAutocompleteResult = new SerializedSubject<>(BehaviorSubject.j0());
-        this.stageInstanceCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.stageInstanceUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.stageInstanceDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.friendSuggestionCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.friendSuggestionDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildScheduledEventCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildScheduledEventUpdate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildScheduledEventDelete = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildScheduledEventUserCreate = new SerializedSubject<>(BehaviorSubject.j0());
-        this.guildScheduledEventUserDelete = new SerializedSubject<>(BehaviorSubject.j0());
+        this.voiceServerUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMemberListUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userPaymentSourcesUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userSubscriptionsUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamServerUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadListSync = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadMemberUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadMembersUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadMemberListUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.interactionCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.interactionSuccess = new SerializedSubject<>(BehaviorSubject.k0());
+        this.interactionFailure = new SerializedSubject<>(BehaviorSubject.k0());
+        this.applicationCommandAutocompleteResult = new SerializedSubject<>(BehaviorSubject.k0());
+        this.stageInstanceCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.stageInstanceUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.stageInstanceDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.friendSuggestionCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.friendSuggestionDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildScheduledEventCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildScheduledEventUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildScheduledEventDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildScheduledEventUserCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildScheduledEventUserDelete = new SerializedSubject<>(BehaviorSubject.k0());
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/com/discord/stores/StoreGifPicker.java b/app/src/main/java/com/discord/stores/StoreGifPicker.java
index 928853c625..8d5a9622b5 100644
--- a/app/src/main/java/com/discord/stores/StoreGifPicker.java
+++ b/app/src/main/java/com/discord/stores/StoreGifPicker.java
@@ -286,24 +286,24 @@ public final class StoreGifPicker extends StoreV2 {
     }
 
     private final void fetchGifsForSearchQuery(String str) {
-        Observable<R> E = this.restAPI.getGifSearchResults(str, "tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).E(StoreGifPicker$fetchGifsForSearchQuery$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "restAPI.getGifSearchResu…to)\n          }\n        }");
-        Observable r2 = ObservableExtensionsKt.restSubscribeOn$default(E, false, 1, null).r(new StoreGifPicker$fetchGifsForSearchQuery$2(this, str));
-        m.checkNotNullExpressionValue(r2, "restAPI.getGifSearchResu…y, emptyList())\n        }");
-        ObservableExtensionsKt.appSubscribe$default(r2, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchGifsForSearchQuery$3(this, str), 62, (Object) null);
+        Observable<R> F = this.restAPI.getGifSearchResults(str, "tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).F(StoreGifPicker$fetchGifsForSearchQuery$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restAPI.getGifSearchResu…to)\n          }\n        }");
+        Observable s = ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null).s(new StoreGifPicker$fetchGifsForSearchQuery$2(this, str));
+        m.checkNotNullExpressionValue(s, "restAPI.getGifSearchResu…y, emptyList())\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchGifsForSearchQuery$3(this, str), 62, (Object) null);
     }
 
     private final void fetchSuggestedSearchTerms(String str) {
-        Observable r2 = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGifSuggestedSearchTerms("tenor", str, this.storeUserSettingsSystem.getLocale(), 5), false, 1, null).r(new StoreGifPicker$fetchSuggestedSearchTerms$1(this, str));
-        m.checkNotNullExpressionValue(r2, "restAPI.getGifSuggestedS…y, emptyList())\n        }");
-        ObservableExtensionsKt.appSubscribe$default(r2, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchSuggestedSearchTerms$2(this, str), 62, (Object) null);
+        Observable s = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGifSuggestedSearchTerms("tenor", str, this.storeUserSettingsSystem.getLocale(), 5), false, 1, null).s(new StoreGifPicker$fetchSuggestedSearchTerms$1(this, str));
+        m.checkNotNullExpressionValue(s, "restAPI.getGifSuggestedS…y, emptyList())\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchSuggestedSearchTerms$2(this, str), 62, (Object) null);
     }
 
     private final void fetchTrendingCategoryGifs() {
         this.isFetchingTrendingCategoryGifs = true;
-        Observable<R> E = this.restAPI.getTrendingGifCategory("tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).E(StoreGifPicker$fetchTrendingCategoryGifs$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "restAPI.getTrendingGifCa…to)\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(E, false, 1, null), StoreGifPicker.class, (Context) null, (Function1) null, new StoreGifPicker$fetchTrendingCategoryGifs$2(this), (Function0) null, (Function0) null, new StoreGifPicker$fetchTrendingCategoryGifs$3(this), 54, (Object) null);
+        Observable<R> F = this.restAPI.getTrendingGifCategory("tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).F(StoreGifPicker$fetchTrendingCategoryGifs$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restAPI.getTrendingGifCa…to)\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null), StoreGifPicker.class, (Context) null, (Function1) null, new StoreGifPicker$fetchTrendingCategoryGifs$2(this), (Function0) null, (Function0) null, new StoreGifPicker$fetchTrendingCategoryGifs$3(this), 54, (Object) null);
     }
 
     private final List<ModelGifCategory> getGifCategories() {
@@ -427,21 +427,21 @@ public final class StoreGifPicker extends StoreV2 {
     public final Observable<List<ModelGif>> observeGifsForSearchQuery(String str) {
         m.checkNotNullParameter(str, "query");
         this.dispatcher.schedule(new StoreGifPicker$observeGifsForSearchQuery$1(this, str));
-        Observable<R> E = observeSearchHistory().E(new StoreGifPicker$observeGifsForSearchQuery$2(str));
-        m.checkNotNullExpressionValue(E, "observeSearchHistory().m…gifSearchHistory[query] }");
-        Observable<List<ModelGif>> E2 = E.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E2, "filter { it != null }.map { it!! }");
-        return E2;
+        Observable<R> F = observeSearchHistory().F(new StoreGifPicker$observeGifsForSearchQuery$2(str));
+        m.checkNotNullExpressionValue(F, "observeSearchHistory().m…gifSearchHistory[query] }");
+        Observable<List<ModelGif>> F2 = F.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "filter { it != null }.map { it!! }");
+        return F2;
     }
 
     public final Observable<List<String>> observeSuggestedSearchTerms(String str) {
         m.checkNotNullParameter(str, "query");
         this.dispatcher.schedule(new StoreGifPicker$observeSuggestedSearchTerms$2(this, str));
-        Observable<R> E = observeSuggestedSearchTerms().E(new StoreGifPicker$observeSuggestedSearchTerms$3(str));
-        m.checkNotNullExpressionValue(E, "observeSuggestedSearchTe…archTermsHistory[query] }");
-        Observable<List<String>> E2 = E.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E2, "filter { it != null }.map { it!! }");
-        return E2;
+        Observable<R> F = observeSuggestedSearchTerms().F(new StoreGifPicker$observeSuggestedSearchTerms$3(str));
+        m.checkNotNullExpressionValue(F, "observeSuggestedSearchTe…archTermsHistory[query] }");
+        Observable<List<String>> F2 = F.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "filter { it != null }.map { it!! }");
+        return F2;
     }
 
     public final Observable<List<ModelGif>> observeTrendingCategoryGifs() {
diff --git a/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java b/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
index 6652dce7dc..e345dc0969 100644
--- a/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
@@ -149,8 +149,8 @@ public final class StoreGifting$acceptGift$1 extends o implements Function0<Unit
     /* renamed from: invoke */
     public final void mo17invoke() {
         StoreGifting.access$setGifts(this.this$0, this.$gift.getCode(), new StoreGifting.GiftState.Redeeming(this.$gift));
-        Observable<Void> W = RestAPI.Companion.getApi().acceptGift(this.$gift.getCode()).W(a.c());
-        m.checkNotNullExpressionValue(W, "RestAPI\n        .api\n   …scribeOn(Schedulers.io())");
-        ObservableExtensionsKt.appSubscribe$default(W, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass1(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
+        Observable<Void> X = RestAPI.Companion.getApi().acceptGift(this.$gift.getCode()).X(a.c());
+        m.checkNotNullExpressionValue(X, "RestAPI\n        .api\n   …scribeOn(Schedulers.io())");
+        ObservableExtensionsKt.appSubscribe$default(X, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass1(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGifting.java b/app/src/main/java/com/discord/stores/StoreGifting.java
index a469da7d79..300aca880c 100644
--- a/app/src/main/java/com/discord/stores/StoreGifting.java
+++ b/app/src/main/java/com/discord/stores/StoreGifting.java
@@ -26,7 +26,7 @@ public final class StoreGifting {
     public static final Companion Companion = new Companion(null);
     private final Dispatcher dispatcher;
     private HashMap<String, GiftState> knownGifts = new HashMap<>();
-    private final BehaviorSubject<Map<String, GiftState>> knownGiftsSubject = BehaviorSubject.k0(h0.emptyMap());
+    private final BehaviorSubject<Map<String, GiftState>> knownGiftsSubject = BehaviorSubject.l0(h0.emptyMap());
 
     /* compiled from: StoreGifting.kt */
     public static final class Companion {
@@ -475,9 +475,9 @@ public final class StoreGifting {
     }
 
     public final Observable<List<ModelGift>> getMyResolvedGifts(long j) {
-        Observable<R> E = this.knownGiftsSubject.E(new StoreGifting$getMyResolvedGifts$1(j));
-        m.checkNotNullExpressionValue(E, "knownGiftsSubject\n      …              }\n        }");
-        return E;
+        Observable<R> F = this.knownGiftsSubject.F(new StoreGifting$getMyResolvedGifts$1(j));
+        m.checkNotNullExpressionValue(F, "knownGiftsSubject\n      …              }\n        }");
+        return F;
     }
 
     @StoreThread
@@ -488,7 +488,7 @@ public final class StoreGifting {
     public final Observable<GiftState> requestGift(String str) {
         m.checkNotNullParameter(str, "giftCode");
         this.dispatcher.schedule(new StoreGifting$requestGift$1(this, str));
-        Observable<GiftState> q = this.knownGiftsSubject.E(new StoreGifting$requestGift$2(str)).q();
+        Observable<GiftState> q = this.knownGiftsSubject.F(new StoreGifting$requestGift$2(str)).q();
         m.checkNotNullExpressionValue(q, "knownGiftsSubject\n      …  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java b/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
index b66163dcce..3c1135a5e1 100644
--- a/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
+++ b/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
@@ -37,7 +37,7 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
     private final AnalyticsTracker analyticsTracker;
     private final Clock clock;
     private final Dispatcher dispatcher;
-    private final PublishSubject<Event> eventSubject = PublishSubject.j0();
+    private final PublishSubject<Event> eventSubject = PublishSubject.k0();
     private final Gson gson;
     private final ObservationDeck observationDeck;
     private QueryState queryState;
@@ -636,9 +636,9 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
         String component3 = pendingDowngrade.component3();
         RestAPIParams.DowngradeSubscriptionBody downgradeSubscriptionBody = new RestAPIParams.DowngradeSubscriptionBody(component2, component1, component3);
         RetryWithDelay retryWithDelay = RetryWithDelay.INSTANCE;
-        Observable<Object> W = this.restAPI.downgradeSubscription(downgradeSubscriptionBody).W(i0.p.a.c());
-        m.checkNotNullExpressionValue(W, "restAPI\n        .downgra…scribeOn(Schedulers.io())");
-        ObservableExtensionsKt.appSubscribe$default(RetryWithDelay.restRetry$default(retryWithDelay, W, 0, null, null, new StoreGooglePlayPurchases$doDowngrade$1(this), 1, null), StoreGooglePlayPurchases.class, (Context) null, (Function1) null, new StoreGooglePlayPurchases$doDowngrade$3(this, component3), (Function0) null, (Function0) null, new StoreGooglePlayPurchases$doDowngrade$2(this, component3), 54, (Object) null);
+        Observable<Object> X = this.restAPI.downgradeSubscription(downgradeSubscriptionBody).X(i0.p.a.c());
+        m.checkNotNullExpressionValue(X, "restAPI\n        .downgra…scribeOn(Schedulers.io())");
+        ObservableExtensionsKt.appSubscribe$default(RetryWithDelay.restRetry$default(retryWithDelay, X, 0, null, null, new StoreGooglePlayPurchases$doDowngrade$1(this), 1, null), StoreGooglePlayPurchases.class, (Context) null, (Function1) null, new StoreGooglePlayPurchases$doDowngrade$3(this, component3), (Function0) null, (Function0) null, new StoreGooglePlayPurchases$doDowngrade$2(this, component3), 54, (Object) null);
     }
 
     private final Map<String, AnalyticsTrait> getCachedAnalyticsTraitsMap() {
diff --git a/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java b/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java
index baa49086e9..162bc797c5 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java
@@ -23,7 +23,7 @@ public final class StoreGuildIntegrations {
     private final HashMap<Long, Map<Long, ModelGuildIntegration>> allIntegrations = new HashMap<>();
     private Subscription closeIntegrationScreenSubscription;
     private final Dispatcher dispatcher;
-    private final BehaviorSubject<Map<Long, Map<Long, ModelGuildIntegration>>> integrationsSubject = BehaviorSubject.k0(new HashMap());
+    private final BehaviorSubject<Map<Long, Map<Long, ModelGuildIntegration>>> integrationsSubject = BehaviorSubject.l0(new HashMap());
     private boolean isOnIntegrationsScreen;
 
     public StoreGuildIntegrations(Dispatcher dispatcher) {
@@ -85,13 +85,13 @@ public final class StoreGuildIntegrations {
     }
 
     public final Observable<Map<Long, ModelGuildIntegration>> get(long j) {
-        Observable<Map<Long, ModelGuildIntegration>> q = this.integrationsSubject.E(new StoreGuildIntegrations$get$1(j)).q();
+        Observable<Map<Long, ModelGuildIntegration>> q = this.integrationsSubject.F(new StoreGuildIntegrations$get$1(j)).q();
         m.checkNotNullExpressionValue(q, "integrationsSubject\n    …  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<ModelGuildIntegration> get(long j, long j2) {
-        Observable<ModelGuildIntegration> q = get(j).E(new StoreGuildIntegrations$get$2(j2)).q();
+        Observable<ModelGuildIntegration> q = get(j).F(new StoreGuildIntegrations$get$2(j2)).q();
         m.checkNotNullExpressionValue(q, "get(guildId)\n          .…  .distinctUntilChanged()");
         return q;
     }
@@ -108,9 +108,9 @@ public final class StoreGuildIntegrations {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        Observable<Long> c02 = Observable.c0(1000, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(c02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(c02, getClass(), (Context) null, new StoreGuildIntegrations$onIntegrationScreenClosed$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreGuildIntegrations$onIntegrationScreenClosed$1(this), 58, (Object) null);
+        Observable<Long> d02 = Observable.d0(1000, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(d02, getClass(), (Context) null, new StoreGuildIntegrations$onIntegrationScreenClosed$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreGuildIntegrations$onIntegrationScreenClosed$1(this), 58, (Object) null);
     }
 
     public final synchronized void onIntegrationScreenOpened(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreGuildStickers.java b/app/src/main/java/com/discord/stores/StoreGuildStickers.java
index a0b25cec12..6f5b797158 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildStickers.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildStickers.java
@@ -34,7 +34,7 @@ public final class StoreGuildStickers extends StoreV2 {
     private final Dispatcher dispatcher;
 
     /* renamed from: me  reason: collision with root package name */
-    private long f2600me;
+    private long f2598me;
     private final ObservationDeck observationDeck;
     private final Function1<List<Long>, Unit> onStickersDeleted;
 
@@ -131,7 +131,7 @@ public final class StoreGuildStickers extends StoreV2 {
     @StoreThread
     public final void handleConnectionOpen(ModelPayload modelPayload) {
         m.checkNotNullParameter(modelPayload, "payload");
-        this.f2600me = modelPayload.getMe().i();
+        this.f2598me = modelPayload.getMe().i();
         for (Guild guild : modelPayload.getGuilds()) {
             m.checkNotNullExpressionValue(guild, "guild");
             handleGuildCreateOrUpdate(guild);
@@ -161,7 +161,7 @@ public final class StoreGuildStickers extends StoreV2 {
                 break;
             }
             obj = it.next();
-            if (((GuildMember) obj).j().i() == this.f2600me) {
+            if (((GuildMember) obj).j().i() == this.f2598me) {
                 z2 = true;
                 continue;
             } else {
diff --git a/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java b/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java
index 0ec4aebde3..2ea0b75eeb 100644
--- a/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java
+++ b/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java
@@ -25,6 +25,6 @@ public final class StoreGuilds$Actions$requestMembers$3<T, R> implements b<Strin
     }
 
     public final Observable<? extends Long> call(String str) {
-        return StoreStream.Companion.getGuildSelected().observeSelectedGuildId().s(new AnonymousClass1(str));
+        return StoreStream.Companion.getGuildSelected().observeSelectedGuildId().t(new AnonymousClass1(str));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGuilds.java b/app/src/main/java/com/discord/stores/StoreGuilds.java
index 30fc863f6e..4d0470d001 100644
--- a/app/src/main/java/com/discord/stores/StoreGuilds.java
+++ b/app/src/main/java/com/discord/stores/StoreGuilds.java
@@ -75,9 +75,9 @@ public final class StoreGuilds extends StoreV2 {
         public static final void requestMembers(AppComponent appComponent, Observable<String> observable, boolean z2) {
             m.checkNotNullParameter(appComponent, "fragment");
             m.checkNotNullParameter(observable, "partialUserNameTokenEmitted");
-            Observable X = observable.o(1000, TimeUnit.MILLISECONDS).E(new StoreGuilds$Actions$requestMembers$1(z2)).w(StoreGuilds$Actions$requestMembers$2.INSTANCE).q().X(StoreGuilds$Actions$requestMembers$3.INSTANCE);
-            m.checkNotNullExpressionValue(X, "partialUserNameTokenEmit…            }\n          }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(X), appComponent, null, 2, null), (Context) null, "requestGuildMembers", (Function1) null, StoreGuilds$Actions$requestMembers$4.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+            Observable Y = observable.o(1000, TimeUnit.MILLISECONDS).F(new StoreGuilds$Actions$requestMembers$1(z2)).x(StoreGuilds$Actions$requestMembers$2.INSTANCE).q().Y(StoreGuilds$Actions$requestMembers$3.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "partialUserNameTokenEmit…            }\n          }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Y), appComponent, null, 2, null), (Context) null, "requestGuildMembers", (Function1) null, StoreGuilds$Actions$requestMembers$4.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
         }
 
         public static final void requestRoleMembers(long j, long j2, AppComponent appComponent, RestAPI restAPI, StoreGatewayConnection storeGatewayConnection) {
@@ -491,7 +491,7 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Map<Long, GuildMember>> observeComputed(long j) {
-        Observable<Map<Long, GuildMember>> q = observeComputed().E(new StoreGuilds$observeComputed$2(j)).q();
+        Observable<Map<Long, GuildMember>> q = observeComputed().F(new StoreGuilds$observeComputed$2(j)).q();
         m.checkNotNullExpressionValue(q, "observeComputed()\n      …  .distinctUntilChanged()");
         return q;
     }
@@ -508,29 +508,29 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Guild> observeFromChannelId(long j) {
-        Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new StoreGuilds$observeFromChannelId$1(this));
-        m.checkNotNullExpressionValue(X, "StoreStream\n        .get…ll)\n          }\n        }");
-        return X;
+        Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new StoreGuilds$observeFromChannelId$1(this));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…ll)\n          }\n        }");
+        return Y;
     }
 
     public final Observable<Guild> observeGuild(long j) {
-        Observable<Guild> q = observeGuilds().E(new StoreGuilds$observeGuild$1(j)).q();
+        Observable<Guild> q = observeGuilds().F(new StoreGuilds$observeGuild$1(j)).q();
         m.checkNotNullExpressionValue(q, "observeGuilds()\n        …  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Set<Long>> observeGuildIds() {
-        Observable<Set<Long>> q = observeGuilds().X(StoreGuilds$observeGuildIds$1.INSTANCE).q();
+        Observable<Set<Long>> q = observeGuilds().Y(StoreGuilds$observeGuildIds$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeGuilds()\n        …  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<GuildMember> observeGuildMember(long j, long j2) {
-        return observeComputed().E(new StoreGuilds$observeGuildMember$1(j, j2)).q();
+        return observeComputed().F(new StoreGuilds$observeGuildMember$1(j, j2)).q();
     }
 
     public final Observable<Map<Long, GuildMember>> observeGuildMembers(long j) {
-        return observeComputed().E(new StoreGuilds$observeGuildMembers$1(j)).q();
+        return observeComputed().F(new StoreGuilds$observeGuildMembers$1(j)).q();
     }
 
     public final Observable<Map<Long, Guild>> observeGuilds() {
@@ -544,7 +544,7 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Long> observeJoinedAt(long j) {
-        Observable<Long> q = observeJoinedAt().E(new StoreGuilds$observeJoinedAt$2(j)).q();
+        Observable<Long> q = observeJoinedAt().F(new StoreGuilds$observeJoinedAt$2(j)).q();
         m.checkNotNullExpressionValue(q, "observeJoinedAt()\n      …  .distinctUntilChanged()");
         return q;
     }
@@ -554,7 +554,7 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Map<Long, GuildRole>> observeRoles(long j) {
-        Observable<Map<Long, GuildRole>> q = observeRoles().E(new StoreGuilds$observeRoles$2(j)).q();
+        Observable<Map<Long, GuildRole>> q = observeRoles().F(new StoreGuilds$observeRoles$2(j)).q();
         m.checkNotNullExpressionValue(q, "observeRoles()\n        .…  .distinctUntilChanged()");
         return q;
     }
@@ -567,7 +567,7 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<List<GuildRole>> observeSortedRoles(long j) {
-        Observable<List<GuildRole>> q = observeRoles(j).X(StoreGuilds$observeSortedRoles$1.INSTANCE).q();
+        Observable<List<GuildRole>> q = observeRoles(j).Y(StoreGuilds$observeSortedRoles$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeRoles(guildId)\n  …  .distinctUntilChanged()");
         return q;
     }
@@ -579,7 +579,7 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<GuildVerificationLevel> observeVerificationLevel(long j) {
-        Observable<GuildVerificationLevel> q = observeGuild(j).E(StoreGuilds$observeVerificationLevel$1.INSTANCE).q();
+        Observable<GuildVerificationLevel> q = observeGuild(j).F(StoreGuilds$observeVerificationLevel$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeGuild(guildId)\n  …  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreGuildsSorted.java b/app/src/main/java/com/discord/stores/StoreGuildsSorted.java
index 3f69278b5f..a012fdb83a 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildsSorted.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildsSorted.java
@@ -43,14 +43,14 @@ public final class StoreGuildsSorted extends StoreV2 {
             private final List<Guild> guilds;
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2601id;
+            private final long f2599id;
             private final String name;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Folder(long j, List<Guild> list, Integer num, String str) {
                 super(null);
                 m.checkNotNullParameter(list, "guilds");
-                this.f2601id = j;
+                this.f2599id = j;
                 this.guilds = list;
                 this.color = num;
                 this.name = str;
@@ -60,7 +60,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             /* JADX WARN: Multi-variable type inference failed */
             public static /* synthetic */ Folder copy$default(Folder folder, long j, List list, Integer num, String str, int i, Object obj) {
                 if ((i & 1) != 0) {
-                    j = folder.f2601id;
+                    j = folder.f2599id;
                 }
                 if ((i & 2) != 0) {
                     list = folder.guilds;
@@ -76,7 +76,7 @@ public final class StoreGuildsSorted extends StoreV2 {
 
             @Override // com.discord.stores.StoreGuildsSorted.Entry
             public ModelGuildFolder asModelGuildFolder() {
-                Long valueOf = Long.valueOf(this.f2601id);
+                Long valueOf = Long.valueOf(this.f2599id);
                 List<Guild> list = this.guilds;
                 ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                 for (Guild guild : list) {
@@ -86,7 +86,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             }
 
             public final long component1() {
-                return this.f2601id;
+                return this.f2599id;
             }
 
             public final List<Guild> component2() {
@@ -114,7 +114,7 @@ public final class StoreGuildsSorted extends StoreV2 {
                     return false;
                 }
                 Folder folder = (Folder) obj;
-                return this.f2601id == folder.f2601id && m.areEqual(this.guilds, folder.guilds) && m.areEqual(this.color, folder.color) && m.areEqual(this.name, folder.name);
+                return this.f2599id == folder.f2599id && m.areEqual(this.guilds, folder.guilds) && m.areEqual(this.color, folder.color) && m.areEqual(this.name, folder.name);
             }
 
             public final Integer getColor() {
@@ -126,7 +126,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             }
 
             public final long getId() {
-                return this.f2601id;
+                return this.f2599id;
             }
 
             public final String getName() {
@@ -134,7 +134,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             }
 
             public int hashCode() {
-                int a = b.a(this.f2601id) * 31;
+                int a = b.a(this.f2599id) * 31;
                 List<Guild> list = this.guilds;
                 int i = 0;
                 int hashCode = (a + (list != null ? list.hashCode() : 0)) * 31;
@@ -149,7 +149,7 @@ public final class StoreGuildsSorted extends StoreV2 {
 
             public String toString() {
                 StringBuilder O = a.O("Folder(id=");
-                O.append(this.f2601id);
+                O.append(this.f2599id);
                 O.append(", guilds=");
                 O.append(this.guilds);
                 O.append(", color=");
@@ -415,7 +415,7 @@ public final class StoreGuildsSorted extends StoreV2 {
 
     private final Observable<State> observeStores() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<State> h = Observable.h(companion.getGuilds().observeGuilds(), companion.getUserGuildSettings().observeMutedGuildIds().E(StoreGuildsSorted$observeStores$1.INSTANCE), companion.getGuilds().observeJoinedAt(), companion.getUserSettings().observeGuildFolders(), StoreGuildsSorted$observeStores$2.INSTANCE);
+        Observable<State> h = Observable.h(companion.getGuilds().observeGuilds(), companion.getUserGuildSettings().observeMutedGuildIds().F(StoreGuildsSorted$observeStores$1.INSTANCE), companion.getGuilds().observeJoinedAt(), companion.getUserSettings().observeGuildFolders(), StoreGuildsSorted$observeStores$2.INSTANCE);
         m.checkNotNullExpressionValue(h, "Observable.combineLatest…lds, joinedAt, folders) }");
         return h;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites.java b/app/src/main/java/com/discord/stores/StoreInstantInvites.java
index 6094ac444c..6e38387284 100644
--- a/app/src/main/java/com/discord/stores/StoreInstantInvites.java
+++ b/app/src/main/java/com/discord/stores/StoreInstantInvites.java
@@ -253,7 +253,7 @@ public final class StoreInstantInvites extends StoreV2 {
             m.checkNotNullExpressionValue(jVar, "Observable.just(InviteState.LoadFailed)");
             return jVar;
         }
-        Observable<InviteState> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvite$1(this), 14, null).E(new StoreInstantInvites$observeInvite$2(str)).q();
+        Observable<InviteState> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvite$1(this), 14, null).F(new StoreInstantInvites$observeInvite$2(str)).q();
         m.checkNotNullExpressionValue(q, "observationDeck.connectR…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings.java b/app/src/main/java/com/discord/stores/StoreInviteSettings.java
index 0eebc8d7a8..8f6a480da4 100644
--- a/app/src/main/java/com/discord/stores/StoreInviteSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreInviteSettings.java
@@ -25,8 +25,8 @@ public final class StoreInviteSettings extends Store {
     public static final String LOCATION_DEEPLINK = "Deeplink";
     public static final String LOCATION_JOIN = "Join Guild Modal";
     private ModelInvite.Settings inviteSettings = new ModelInvite.Settings(86400);
-    private final BehaviorSubject<ModelInvite.Settings> inviteSettingsSubject = BehaviorSubject.k0(this.inviteSettings);
-    private final BehaviorSubject<InviteCode> pendingInviteCodeSubject = BehaviorSubject.k0(null);
+    private final BehaviorSubject<ModelInvite.Settings> inviteSettingsSubject = BehaviorSubject.l0(this.inviteSettings);
+    private final BehaviorSubject<InviteCode> pendingInviteCodeSubject = BehaviorSubject.l0(null);
 
     /* compiled from: StoreInviteSettings.kt */
     public static final class Companion {
@@ -200,9 +200,9 @@ public final class StoreInviteSettings extends Store {
     }
 
     public final Observable<ModelInvite> generateInviteDefaultChannel(long j) {
-        Observable<ModelInvite> y2 = getInvitableChannels(j).E(StoreInviteSettings$generateInviteDefaultChannel$1.INSTANCE).E(StoreInviteSettings$generateInviteDefaultChannel$2.INSTANCE).E(StoreInviteSettings$generateInviteDefaultChannel$3.INSTANCE).Y(1).y(new StoreInviteSettings$generateInviteDefaultChannel$4(this, j));
-        m.checkNotNullExpressionValue(y2, "getInvitableChannels(gui…le.just(null)\n          }");
-        return y2;
+        Observable<ModelInvite> z2 = getInvitableChannels(j).F(StoreInviteSettings$generateInviteDefaultChannel$1.INSTANCE).F(StoreInviteSettings$generateInviteDefaultChannel$2.INSTANCE).F(StoreInviteSettings$generateInviteDefaultChannel$3.INSTANCE).Z(1).z(new StoreInviteSettings$generateInviteDefaultChannel$4(this, j));
+        m.checkNotNullExpressionValue(z2, "getInvitableChannels(gui…le.just(null)\n          }");
+        return z2;
     }
 
     public final Observable<Map<Long, Channel>> getInvitableChannels(long j) {
@@ -213,9 +213,9 @@ public final class StoreInviteSettings extends Store {
     }
 
     public final Observable<ModelInvite> getInvite() {
-        Observable<ModelInvite> E = getInviteCode().y(StoreInviteSettings$getInvite$1.INSTANCE).E(StoreInviteSettings$getInvite$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "getInviteCode()\n      .f…-> null\n        }\n      }");
-        return E;
+        Observable<ModelInvite> F = getInviteCode().z(StoreInviteSettings$getInvite$1.INSTANCE).F(StoreInviteSettings$getInvite$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "getInviteCode()\n      .f…-> null\n        }\n      }");
+        return F;
     }
 
     public final Observable<InviteCode> getInviteCode() {
@@ -260,8 +260,8 @@ public final class StoreInviteSettings extends Store {
     public final void trackWithInvite$app_productionGoogleRelease(Class<?> cls, Function1<? super ModelInvite, Unit> function1) {
         m.checkNotNullParameter(cls, "clazz");
         m.checkNotNullParameter(function1, "trackBlock");
-        Observable<ModelInvite> w2 = getInvite().w(StoreInviteSettings$trackWithInvite$1.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "getInvite()\n        .filter { it != null }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(w2, 250, false, 2, null)), cls, (Context) null, (Function1) null, new StoreInviteSettings$trackWithInvite$2(function1), (Function0) null, (Function0) null, function1, 54, (Object) null);
+        Observable<ModelInvite> x2 = getInvite().x(StoreInviteSettings$trackWithInvite$1.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "getInvite()\n        .filter { it != null }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 250, false, 2, null)), cls, (Context) null, (Function1) null, new StoreInviteSettings$trackWithInvite$2(function1), (Function0) null, (Function0) null, function1, 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java
index ddaa5439e4..a90be918c3 100644
--- a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java
+++ b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java
@@ -33,7 +33,7 @@ public final class StoreLocalMessagesHolder {
     private Map<Long, ? extends List<Message>> cacheSnapshot = h0.emptyMap();
     private final Gson gson;
     private final HashMap<Long, TreeMap<Long, Message>> messages = new HashMap<>();
-    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.j0());
+    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.k0());
     private Map<Long, ? extends List<Message>> messagesSnapshot = h0.emptyMap();
     private SharedPreferences sharedPreferences;
     private final Set<Long> updatedChannels = new HashSet();
diff --git a/app/src/main/java/com/discord/stores/StoreLurking.java b/app/src/main/java/com/discord/stores/StoreLurking.java
index 3254bc5f62..e69282eeab 100644
--- a/app/src/main/java/com/discord/stores/StoreLurking.java
+++ b/app/src/main/java/com/discord/stores/StoreLurking.java
@@ -32,7 +32,7 @@ public final class StoreLurking {
     private final StoreGuilds guildsStore;
     private LurkRequest lurkRequest;
     private final Map<Long, LurkContext> lurkedGuilds = new LinkedHashMap();
-    private final BehaviorSubject<Map<Long, LurkContext>> lurkedGuildsSubject = BehaviorSubject.k0(new LinkedHashMap());
+    private final BehaviorSubject<Map<Long, LurkContext>> lurkedGuildsSubject = BehaviorSubject.l0(new LinkedHashMap());
     private String sessionId;
     private final StoreStream stream;
 
@@ -306,9 +306,9 @@ public final class StoreLurking {
     }
 
     public final Observable<Set<Long>> getLurkingGuildIds() {
-        Observable<R> E = this.lurkedGuildsSubject.E(StoreLurking$getLurkingGuildIds$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "lurkedGuildsSubject.map { it.keys }");
-        return E;
+        Observable<R> F = this.lurkedGuildsSubject.F(StoreLurking$getLurkingGuildIds$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "lurkedGuildsSubject.map { it.keys }");
+        return F;
     }
 
     public final Set<Long> getLurkingGuildIdsSync() {
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine.java b/app/src/main/java/com/discord/stores/StoreMediaEngine.java
index 5290a0837e..3533f9d92e 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine.java
@@ -81,7 +81,7 @@ public final class StoreMediaEngine extends Store {
     private Long previousVoiceChannelId;
     private final SerializedSubject<Boolean, Boolean> pttActiveSubject;
     private VideoInputDeviceDescription selectedVideoInputDevice;
-    private final BehaviorSubject<VideoInputDeviceDescription> selectedVideoInputDeviceSubject = BehaviorSubject.k0(this.selectedVideoInputDevice);
+    private final BehaviorSubject<VideoInputDeviceDescription> selectedVideoInputDeviceSubject = BehaviorSubject.l0(this.selectedVideoInputDevice);
     private final StoreStream storeStream;
     private long userId;
     private VideoInputDeviceDescription[] videoInputDevices;
@@ -215,21 +215,21 @@ public final class StoreMediaEngine extends Store {
         ListenerCollectionSubject<Listener> listenerCollectionSubject = new ListenerCollectionSubject<>();
         this.listenerSubject = listenerCollectionSubject;
         this.listeners = listenerCollectionSubject;
-        SerializedSubject<MediaEngine.LocalVoiceStatus, MediaEngine.LocalVoiceStatus> serializedSubject = new SerializedSubject<>(BehaviorSubject.k0(LOCAL_VOICE_STATUS_DEFAULT));
+        SerializedSubject<MediaEngine.LocalVoiceStatus, MediaEngine.LocalVoiceStatus> serializedSubject = new SerializedSubject<>(BehaviorSubject.l0(LOCAL_VOICE_STATUS_DEFAULT));
         this.localVoiceStatusSubject = serializedSubject;
         Boolean bool = Boolean.FALSE;
-        this.pttActiveSubject = new SerializedSubject<>(BehaviorSubject.k0(bool));
+        this.pttActiveSubject = new SerializedSubject<>(BehaviorSubject.l0(bool));
         VideoInputDeviceDescription[] videoInputDeviceDescriptionArr = new VideoInputDeviceDescription[0];
         this.videoInputDevices = videoInputDeviceDescriptionArr;
-        this.videoInputDevicesSubject = BehaviorSubject.k0(j.asList(videoInputDeviceDescriptionArr));
-        this.openSLESConfigSubject = new SerializedSubject<>(BehaviorSubject.j0());
-        this.isNativeEngineInitializedSubject = new SerializedSubject<>(BehaviorSubject.k0(bool));
+        this.videoInputDevicesSubject = BehaviorSubject.l0(j.asList(videoInputDeviceDescriptionArr));
+        this.openSLESConfigSubject = new SerializedSubject<>(BehaviorSubject.k0());
+        this.isNativeEngineInitializedSubject = new SerializedSubject<>(BehaviorSubject.l0(bool));
         this.userId = -1;
         this.hasNativeEngineEverInitializedCache = new Persister<>("CACHE_KEY_NATIVE_ENGINE_EVER_INITIALIZED", Boolean.valueOf(this.hasNativeEngineEverInitialized));
-        this.onKrispStatusSubject = PublishSubject.j0();
-        Observable<MediaEngine.LocalVoiceStatus> P = ObservableExtensionsKt.computationLatest(serializedSubject).q().t(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$1(this))).u(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$2(this))).P();
-        m.checkNotNullExpressionValue(P, "localVoiceStatusSubject\n…ening)\n          .share()");
-        this.localVoiceStatus = P;
+        this.onKrispStatusSubject = PublishSubject.k0();
+        Observable<MediaEngine.LocalVoiceStatus> Q = ObservableExtensionsKt.computationLatest(serializedSubject).q().u(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$1(this))).v(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$2(this))).Q();
+        m.checkNotNullExpressionValue(Q, "localVoiceStatusSubject\n…ening)\n          .share()");
+        this.localVoiceStatus = Q;
     }
 
     public static final /* synthetic */ void access$disableLocalVoiceStatusListening(StoreMediaEngine storeMediaEngine) {
@@ -635,9 +635,9 @@ public final class StoreMediaEngine extends Store {
     }
 
     public final void handleMicrophonePermissionGranted() {
-        Observable<Boolean> Y = this.isNativeEngineInitializedSubject.Y(1);
-        m.checkNotNullExpressionValue(Y, "isNativeEngineInitializedSubject\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(Y, StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$handleMicrophonePermissionGranted$1(this), 62, (Object) null);
+        Observable<Boolean> Z = this.isNativeEngineInitializedSubject.Z(1);
+        m.checkNotNullExpressionValue(Z, "isNativeEngineInitializedSubject\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$handleMicrophonePermissionGranted$1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:8:0x0010, code lost:
@@ -689,11 +689,11 @@ public final class StoreMediaEngine extends Store {
         m.checkNotNullParameter(gVar, "echoCancellation");
         m.checkNotNullParameter(storeMediaEngine$init$echoCancellationCallback$1, "echoCancellationCallback");
         this.mediaEngine = new c.a.q.m0.c.k(context, engineListener, new c.a.q.c(newSingleThreadExecutor, false), valueOf, appLog, gVar, storeMediaEngine$init$echoCancellationCallback$1, null, null, 384);
-        Observable<R> E = this.storeStream.getExperiments$app_productionGoogleRelease().observeUserExperiment("2021-05_opensl_default_enable_android", true).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable Y = E.Y(1);
-        m.checkNotNullExpressionValue(Y, "storeStream.experiments.…erNull()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(Y), StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$init$1(this), 62, (Object) null);
+        Observable<R> F = this.storeStream.getExperiments$app_productionGoogleRelease().observeUserExperiment("2021-05_opensl_default_enable_android", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "storeStream.experiments.…erNull()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(Z), StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$init$1(this), 62, (Object) null);
     }
 
     public final Observable<KrispOveruseDetector.Status> onKrispStatusEvent() {
diff --git a/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java b/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
index 206a4e319a..f744d24c79 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
@@ -41,7 +41,7 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
             StorePermissions access$getStorePermissions$p = StoreMediaSettings.access$getStorePermissions$p(this.this$0.this$0);
             Long l = this.$id;
             m.checkNotNullExpressionValue(l, ModelAuditLogEntry.CHANGE_KEY_ID);
-            return access$getStorePermissions$p.observePermissionsForChannel(l.longValue()).E(AnonymousClass1.INSTANCE);
+            return access$getStorePermissions$p.observePermissionsForChannel(l.longValue()).F(AnonymousClass1.INSTANCE);
         }
     }
 
@@ -52,6 +52,6 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
     public final Observable<? extends Boolean> call(Long l) {
         StoreChannels access$getStoreChannels$p = StoreMediaSettings.access$getStoreChannels$p(this.this$0);
         m.checkNotNullExpressionValue(l, ModelAuditLogEntry.CHANGE_KEY_ID);
-        return access$getStoreChannels$p.observeChannel(l.longValue()).X(new AnonymousClass1(this, l));
+        return access$getStoreChannels$p.observeChannel(l.longValue()).Y(new AnonymousClass1(this, l));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMediaSettings.java b/app/src/main/java/com/discord/stores/StoreMediaSettings.java
index 79d0852205..336f31f858 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaSettings.java
@@ -429,7 +429,7 @@ public final class StoreMediaSettings extends Store {
         this.appSoundManager = appSoundManager;
         VoiceConfiguration default_voice_config = VoiceConfiguration.Companion.getDEFAULT_VOICE_CONFIG();
         this.voiceConfiguration = default_voice_config;
-        this.voiceConfigurationSubject = new SerializedSubject<>(BehaviorSubject.k0(default_voice_config));
+        this.voiceConfigurationSubject = new SerializedSubject<>(BehaviorSubject.l0(default_voice_config));
         this.canUseVad = true;
     }
 
@@ -472,9 +472,9 @@ public final class StoreMediaSettings extends Store {
     }
 
     public final Observable<MediaEngineConnection.InputMode> getInputMode() {
-        Observable<VoiceConfiguration> E = this.voiceConfigurationSubject.E(StoreMediaSettings$getInputMode$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "voiceConfigurationSubjec…    .map { it.inputMode }");
-        Observable<MediaEngineConnection.InputMode> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getInputMode$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…    .map { it.inputMode }");
+        Observable<MediaEngineConnection.InputMode> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "voiceConfigurationSubjec…  .distinctUntilChanged()");
         return q;
     }
@@ -484,25 +484,25 @@ public final class StoreMediaSettings extends Store {
     }
 
     public final Observable<Map<Long, Boolean>> getUsersMuted() {
-        Observable<VoiceConfiguration> E = this.voiceConfigurationSubject.E(StoreMediaSettings$getUsersMuted$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "voiceConfigurationSubjec…   .map { it.mutedUsers }");
-        Observable<Map<Long, Boolean>> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getUsersMuted$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…   .map { it.mutedUsers }");
+        Observable<Map<Long, Boolean>> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "voiceConfigurationSubjec…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Map<Long, Boolean>> getUsersOffScreen() {
-        Observable<VoiceConfiguration> E = this.voiceConfigurationSubject.E(StoreMediaSettings$getUsersOffScreen$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "voiceConfigurationSubjec…map { it.offScreenUsers }");
-        Observable<Map<Long, Boolean>> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getUsersOffScreen$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…map { it.offScreenUsers }");
+        Observable<Map<Long, Boolean>> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "voiceConfigurationSubjec…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Map<Long, Float>> getUsersVolume() {
-        Observable<VoiceConfiguration> E = this.voiceConfigurationSubject.E(StoreMediaSettings$getUsersVolume$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "voiceConfigurationSubjec… { it.userOutputVolumes }");
-        Observable<Map<Long, Float>> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getUsersVolume$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec… { it.userOutputVolumes }");
+        Observable<Map<Long, Float>> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "voiceConfigurationSubjec…  .distinctUntilChanged()");
         return q;
     }
@@ -535,23 +535,23 @@ public final class StoreMediaSettings extends Store {
 
     public final void init() {
         setVoiceConfiguration(this.voiceConfigurationCache.read());
-        Observable<R> X = this.storeVoiceChannelSelected.observeSelectedVoiceChannelId().X(new StoreMediaSettings$init$1(this));
-        m.checkNotNullExpressionValue(X, "storeVoiceChannelSelecte…              }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(X, StoreMediaSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaSettings$init$2(this), 62, (Object) null);
+        Observable<R> Y = this.storeVoiceChannelSelected.observeSelectedVoiceChannelId().Y(new StoreMediaSettings$init$1(this));
+        m.checkNotNullExpressionValue(Y, "storeVoiceChannelSelecte…              }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(Y, StoreMediaSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaSettings$init$2(this), 62, (Object) null);
     }
 
     public final Observable<Boolean> isSelfDeafened() {
-        Observable<VoiceConfiguration> E = this.voiceConfigurationSubject.E(StoreMediaSettings$isSelfDeafened$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "voiceConfigurationSubjec…map { it.isSelfDeafened }");
-        Observable<Boolean> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$isSelfDeafened$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…map { it.isSelfDeafened }");
+        Observable<Boolean> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "voiceConfigurationSubjec…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Boolean> isSelfMuted() {
-        Observable<VoiceConfiguration> E = this.voiceConfigurationSubject.E(StoreMediaSettings$isSelfMuted$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "voiceConfigurationSubjec….map { it.isSelfMuted() }");
-        Observable<Boolean> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$isSelfMuted$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec….map { it.isSelfMuted() }");
+        Observable<Boolean> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "voiceConfigurationSubjec…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMentions.java b/app/src/main/java/com/discord/stores/StoreMentions.java
index 94c3bb683d..d1fd9cb2ae 100644
--- a/app/src/main/java/com/discord/stores/StoreMentions.java
+++ b/app/src/main/java/com/discord/stores/StoreMentions.java
@@ -426,9 +426,9 @@ public final class StoreMentions extends StoreV2 {
     }
 
     public final Observable<Integer> observeTotalMentions() {
-        Observable<R> E = observeMentionCounts().E(StoreMentions$observeTotalMentions$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "observeMentionCounts()\n … .map { it.values.sum() }");
-        return E;
+        Observable<R> F = observeMentionCounts().F(StoreMentions$observeTotalMentions$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "observeMentionCounts()\n … .map { it.values.sum() }");
+        return F;
     }
 
     @StoreThread
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java
index e2f9a3e404..f6e65bac31 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java
@@ -73,6 +73,6 @@ public final class StoreMessageAck$init$1<T, R> implements b<Long, Observable<?
         Observable<Set<Long>> o = StoreMessageAck.access$getStream$p(this.this$0).getMessages$app_productionGoogleRelease().getAllDetached().o(50, TimeUnit.MILLISECONDS);
         StoreMessagesLoader messagesLoader$app_productionGoogleRelease = StoreMessageAck.access$getStream$p(this.this$0).getMessagesLoader$app_productionGoogleRelease();
         m.checkNotNullExpressionValue(l, "selectedChannelId");
-        return Observable.h(o, messagesLoader$app_productionGoogleRelease.getMessagesLoadedState(l.longValue()).E(AnonymousClass1.INSTANCE).q(), StoreMessageAck.access$getStream$p(this.this$0).getChat$app_productionGoogleRelease().observeInteractionState().w(new AnonymousClass2(l)), StoreMessageAck.access$getStream$p(this.this$0).getMessageAck$app_productionGoogleRelease().observeForChannel(l.longValue()), AnonymousClass3.INSTANCE);
+        return Observable.h(o, messagesLoader$app_productionGoogleRelease.getMessagesLoadedState(l.longValue()).F(AnonymousClass1.INSTANCE).q(), StoreMessageAck.access$getStream$p(this.this$0).getChat$app_productionGoogleRelease().observeInteractionState().x(new AnonymousClass2(l)), StoreMessageAck.access$getStream$p(this.this$0).getMessageAck$app_productionGoogleRelease().observeForChannel(l.longValue()), AnonymousClass3.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java
index 4d45fea4e8..4ca8ca3b92 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java
@@ -42,6 +42,6 @@ public final class StoreMessageAck$observeThreadState$1<T, R> implements b<Chann
     }
 
     public final Observable<? extends StoreMessageAck.ThreadState> call(Channel channel) {
-        return (channel == null || !ChannelUtils.B(channel)) ? new j(StoreMessageAck.ThreadState.NotThread.INSTANCE) : StoreMessageAck.access$getStream$p(this.this$0).getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().E(new AnonymousClass1(this));
+        return (channel == null || !ChannelUtils.B(channel)) ? new j(StoreMessageAck.ThreadState.NotThread.INSTANCE) : StoreMessageAck.access$getStream$p(this.this$0).getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().F(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java
index 71e72621de..3188d55e5c 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java
@@ -93,8 +93,8 @@ public final class StoreMessageAck$postPendingAck$1 extends o implements Functio
         long component1 = pendingAck.component1();
         StoreMessageAck.Ack component2 = pendingAck.component2();
         StoreMessageAck.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, component1, component2));
-        Observable s = ObservableExtensionsKt.restSubscribeOn$default(StoreMessageAck.access$getRestAPI$p(this.this$0).postChannelMessagesAck(component1, Long.valueOf(component2.getMessageId()), new RestAPIParams.ChannelMessagesAck(Boolean.valueOf(component2.isLockedAck()), Integer.valueOf(this.$mentionCount))), false, 1, null).s(new AnonymousClass2(component1));
-        m.checkNotNullExpressionValue(s, "restAPI\n          .postC…).ackMessage(channelId) }");
-        ObservableExtensionsKt.appSubscribe$default(s, (Context) null, "REST: ack", (Function1) null, AnonymousClass3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable t = ObservableExtensionsKt.restSubscribeOn$default(StoreMessageAck.access$getRestAPI$p(this.this$0).postChannelMessagesAck(component1, Long.valueOf(component2.getMessageId()), new RestAPIParams.ChannelMessagesAck(Boolean.valueOf(component2.isLockedAck()), Integer.valueOf(this.$mentionCount))), false, 1, null).t(new AnonymousClass2(component1));
+        m.checkNotNullExpressionValue(t, "restAPI\n          .postC…).ackMessage(channelId) }");
+        ObservableExtensionsKt.appSubscribe$default(t, (Context) null, "REST: ack", (Function1) null, AnonymousClass3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java
index 02a0339cb3..4a1e522958 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java
@@ -384,9 +384,9 @@ public final class StoreMessageAck extends StoreV2 {
     }
 
     private final Observable<PendingAck> getPendingAck(Observable<Long> observable, boolean z2, boolean z3) {
-        Observable<R> X = observable.X(new StoreMessageAck$getPendingAck$2(this, z2, new StoreMessageAck$getPendingAck$1(z3)));
-        m.checkNotNullExpressionValue(X, "switchMap { channelId ->…gAck.EMPTY)\n      }\n    }");
-        return X;
+        Observable<R> Y = observable.Y(new StoreMessageAck$getPendingAck$2(this, z2, new StoreMessageAck$getPendingAck$1(z3)));
+        m.checkNotNullExpressionValue(Y, "switchMap { channelId ->…gAck.EMPTY)\n      }\n    }");
+        return Y;
     }
 
     @StoreThread
@@ -401,22 +401,22 @@ public final class StoreMessageAck extends StoreV2 {
     }
 
     private final Observable<Pair<Set<Long>, Set<Long>>> observeActiveJoinedThreadIdsWithPrevious() {
-        Observable<Pair<Set<Long>, Set<Long>>> O = this.stream.getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().E(StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$1.INSTANCE).q().O(new Pair(n0.emptySet(), n0.emptySet()), StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$2.INSTANCE);
-        m.checkNotNullExpressionValue(O, "stream\n        .threadsA…oinedThreadIds)\n        }");
-        return O;
+        Observable<Pair<Set<Long>, Set<Long>>> P = this.stream.getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().F(StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$1.INSTANCE).q().P(new Pair(n0.emptySet(), n0.emptySet()), StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$2.INSTANCE);
+        m.checkNotNullExpressionValue(P, "stream\n        .threadsA…oinedThreadIds)\n        }");
+        return P;
     }
 
     private final Observable<ThreadState> observeThreadState(long j) {
-        Observable<ThreadState> q = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j).X(new StoreMessageAck$observeThreadState$1(this, j)).q();
+        Observable<ThreadState> q = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j).Y(new StoreMessageAck$observeThreadState$1(this, j)).q();
         m.checkNotNullExpressionValue(q, "stream\n          .channe…  .distinctUntilChanged()");
         return q;
     }
 
     private final void postPendingAck(Observable<PendingAck> observable, int i) {
         StoreMessageAck$postPendingAck$1 storeMessageAck$postPendingAck$1 = new StoreMessageAck$postPendingAck$1(this, i);
-        Observable<PendingAck> w2 = observable.w(StoreMessageAck$postPendingAck$2.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "filter { it != PendingAck.EMPTY }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(w2), observable.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessageAck$postPendingAck$3(storeMessageAck$postPendingAck$1), 62, (Object) null);
+        Observable<PendingAck> x2 = observable.x(StoreMessageAck$postPendingAck$2.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "filter { it != PendingAck.EMPTY }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(x2), observable.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessageAck$postPendingAck$3(storeMessageAck$postPendingAck$1), 62, (Object) null);
     }
 
     public static /* synthetic */ void postPendingAck$default(StoreMessageAck storeMessageAck, Observable observable, int i, int i2, Object obj) {
@@ -635,15 +635,15 @@ public final class StoreMessageAck extends StoreV2 {
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        Observable<R> X = StoreStream.Companion.getChannelsSelected().observeId().q().X(new StoreMessageAck$init$1(this));
-        m.checkNotNullExpressionValue(X, "StoreStream\n        .get… 0L\n          }\n        }");
-        Observable<Long> o = ObservableExtensionsKt.computationLatest(X).o(500, TimeUnit.MILLISECONDS);
+        Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeId().q().Y(new StoreMessageAck$init$1(this));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get… 0L\n          }\n        }");
+        Observable<Long> o = ObservableExtensionsKt.computationLatest(Y).o(500, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "StoreStream\n        .get…0, TimeUnit.MILLISECONDS)");
         postPendingAck$default(this, getPendingAck(o, false, false), 0, 1, null);
     }
 
     public final void markUnread(long j, long j2) {
-        Observable j3 = Observable.j(this.stream.getMessages$app_productionGoogleRelease().observeMessagesForChannel(j).w(StoreMessageAck$markUnread$1.INSTANCE), observeThreadState(j), StoreMessageAck$markUnread$2.INSTANCE);
+        Observable j3 = Observable.j(this.stream.getMessages$app_productionGoogleRelease().observeMessagesForChannel(j).x(StoreMessageAck$markUnread$1.INSTANCE), observeThreadState(j), StoreMessageAck$markUnread$2.INSTANCE);
         m.checkNotNullExpressionValue(j3, "Observable\n        .comb…lMessages, threadState) }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout(j3, 10, false), StoreMessageAck.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessageAck$markUnread$3(this, j2, j), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageState.java b/app/src/main/java/com/discord/stores/StoreMessageState.java
index 56d821aa3f..cf5b60551a 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageState.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageState.java
@@ -110,9 +110,9 @@ public final class StoreMessageState {
     public StoreMessageState(Dispatcher dispatcher) {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         this.dispatcher = dispatcher;
-        BehaviorSubject<Map<Long, State>> k0 = BehaviorSubject.k0(h0.emptyMap());
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(emptyMap())");
-        this.messageStateSubject = k0;
+        BehaviorSubject<Map<Long, State>> l0 = BehaviorSubject.l0(h0.emptyMap());
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(emptyMap())");
+        this.messageStateSubject = l0;
     }
 
     public static final /* synthetic */ void access$updateState(StoreMessageState storeMessageState, long j, Function1 function1) {
@@ -121,32 +121,32 @@ public final class StoreMessageState {
 
     @StoreThread
     private final void resetState(List<Long> list) {
-        Map<Long, State> m0 = this.messageStateSubject.m0();
+        Map<Long, State> n0 = this.messageStateSubject.n0();
         ArrayList arrayList = new ArrayList();
         for (Object obj : list) {
             long longValue = ((Number) obj).longValue();
-            m.checkNotNullExpressionValue(m0, "messageStateMap");
-            if (m0.containsKey(Long.valueOf(longValue))) {
+            m.checkNotNullExpressionValue(n0, "messageStateMap");
+            if (n0.containsKey(Long.valueOf(longValue))) {
                 arrayList.add(obj);
             }
         }
         if (!arrayList.isEmpty()) {
             BehaviorSubject<Map<Long, State>> behaviorSubject = this.messageStateSubject;
-            m.checkNotNullExpressionValue(m0, "messageStateMap");
-            behaviorSubject.onNext(h0.minus((Map) m0, (Iterable) arrayList));
+            m.checkNotNullExpressionValue(n0, "messageStateMap");
+            behaviorSubject.onNext(h0.minus((Map) n0, (Iterable) arrayList));
         }
     }
 
     @StoreThread
     private final void updateState(long j, Function1<? super State, State> function1) {
-        Map<Long, State> m0 = this.messageStateSubject.m0();
-        State state = m0.get(Long.valueOf(j));
+        Map<Long, State> n0 = this.messageStateSubject.n0();
+        State state = n0.get(Long.valueOf(j));
         if (state == null) {
             state = new State(null, null, 3, null);
         }
         BehaviorSubject<Map<Long, State>> behaviorSubject = this.messageStateSubject;
-        m.checkNotNullExpressionValue(m0, "messageStateMap");
-        behaviorSubject.onNext(h0.plus(m0, o.to(Long.valueOf(j), function1.invoke(state))));
+        m.checkNotNullExpressionValue(n0, "messageStateMap");
+        behaviorSubject.onNext(h0.plus(n0, o.to(Long.valueOf(j), function1.invoke(state))));
     }
 
     public final Observable<Map<Long, State>> getMessageState() {
diff --git a/app/src/main/java/com/discord/stores/StoreMessages.java b/app/src/main/java/com/discord/stores/StoreMessages.java
index 1e1c728b93..00e9d7ca8e 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages.java
@@ -41,7 +41,6 @@ import com.discord.utilities.user.UserUtils;
 import com.lytefast.flexinput.model.Attachment;
 import i0.l.a.q;
 import i0.l.a.r;
-import i0.l.a.u0;
 import i0.l.a.x0;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -67,7 +66,7 @@ public final class StoreMessages extends Store {
     private Context context;
     private final Dispatcher dispatcher;
     private final StoreMessagesHolder holder = new StoreMessagesHolder();
-    private final BehaviorSubject<Boolean> initResendFinished = BehaviorSubject.k0(Boolean.FALSE);
+    private final BehaviorSubject<Boolean> initResendFinished = BehaviorSubject.l0(Boolean.FALSE);
     private final StoreLocalMessagesHolder localMessagesHolder = new StoreLocalMessagesHolder();
     private final HashMap<Long, MessageQueue> messageQueues = new HashMap<>();
     private final ExecutorService queueExecutor = Executors.newSingleThreadExecutor();
@@ -225,21 +224,19 @@ public final class StoreMessages extends Store {
     }
 
     private final Observable<List<Message>> observeLocalMessagesForChannel(long j) {
-        Observable<R> E = this.localMessagesHolder.getMessagesPublisher().E(new StoreMessages$observeLocalMessagesForChannel$1(j));
-        m.checkNotNullExpressionValue(E, "localMessagesHolder\n    …annelId] ?: emptyList() }");
-        Observable computationBuffered = ObservableExtensionsKt.computationBuffered(E);
-        Observable<List<Message>> g02 = Observable.g0(new r(computationBuffered.i, new u0(StoreMessages$observeLocalMessagesForChannel$2.INSTANCE)));
-        m.checkNotNullExpressionValue(g02, "localMessagesHolder\n    …messages1 === messages2 }");
-        return g02;
+        Observable<R> F = this.localMessagesHolder.getMessagesPublisher().F(new StoreMessages$observeLocalMessagesForChannel$1(j));
+        m.checkNotNullExpressionValue(F, "localMessagesHolder\n    …annelId] ?: emptyList() }");
+        Observable<List<Message>> r2 = ObservableExtensionsKt.computationBuffered(F).r(StoreMessages$observeLocalMessagesForChannel$2.INSTANCE);
+        m.checkNotNullExpressionValue(r2, "localMessagesHolder\n    …messages1 === messages2 }");
+        return r2;
     }
 
     private final Observable<List<Message>> observeSyncedMessagesForChannel(long j) {
-        Observable<R> E = this.holder.getMessagesPublisher().E(new StoreMessages$observeSyncedMessagesForChannel$1(j));
-        m.checkNotNullExpressionValue(E, "holder\n          .messag…annelId] ?: emptyList() }");
-        Observable computationBuffered = ObservableExtensionsKt.computationBuffered(E);
-        Observable<List<Message>> g02 = Observable.g0(new r(computationBuffered.i, new u0(StoreMessages$observeSyncedMessagesForChannel$2.INSTANCE)));
-        m.checkNotNullExpressionValue(g02, "holder\n          .messag…messages1 === messages2 }");
-        return g02;
+        Observable<R> F = this.holder.getMessagesPublisher().F(new StoreMessages$observeSyncedMessagesForChannel$1(j));
+        m.checkNotNullExpressionValue(F, "holder\n          .messag…annelId] ?: emptyList() }");
+        Observable<List<Message>> r2 = ObservableExtensionsKt.computationBuffered(F).r(StoreMessages$observeSyncedMessagesForChannel$2.INSTANCE);
+        m.checkNotNullExpressionValue(r2, "holder\n          .messag…messages1 === messages2 }");
+        return r2;
     }
 
     @StoreThread
@@ -265,10 +262,10 @@ public final class StoreMessages extends Store {
         for (Message message : arrayList) {
             arrayList2.add(resendMessage(message, true));
         }
-        Observable g02 = Observable.g0(new q(arrayList2));
-        Observable g03 = Observable.g0(new r(g02.i, x0.a.a));
-        m.checkNotNullExpressionValue(g03, "Observable\n        .mergeDelayError(observables)");
-        ObservableExtensionsKt.appSubscribe$default(g03, StoreMessages.class, (Context) null, (Function1) null, (Function1) null, new StoreMessages$resendAllLocalMessages$1(this), (Function0) null, StoreMessages$resendAllLocalMessages$2.INSTANCE, 46, (Object) null);
+        Observable h02 = Observable.h0(new q(arrayList2));
+        Observable h03 = Observable.h0(new r(h02.i, x0.a.a));
+        m.checkNotNullExpressionValue(h03, "Observable\n        .mergeDelayError(observables)");
+        ObservableExtensionsKt.appSubscribe$default(h03, StoreMessages.class, (Context) null, (Function1) null, (Function1) null, new StoreMessages$resendAllLocalMessages$1(this), (Function0) null, StoreMessages$resendAllLocalMessages$2.INSTANCE, 46, (Object) null);
     }
 
     public static /* synthetic */ Observable resendMessage$default(StoreMessages storeMessages, Message message, boolean z2, int i, Object obj) {
@@ -568,7 +565,7 @@ public final class StoreMessages extends Store {
     }
 
     public final Observable<Boolean> observeIsDetached(long j) {
-        Observable<Boolean> q = getAllDetached().E(new StoreMessages$observeIsDetached$1(j)).q();
+        Observable<Boolean> q = getAllDetached().F(new StoreMessages$observeIsDetached$1(j)).q();
         m.checkNotNullExpressionValue(q, "allDetached\n          .m…  .distinctUntilChanged()");
         return q;
     }
@@ -580,7 +577,7 @@ public final class StoreMessages extends Store {
     }
 
     public final Observable<Message> observeMessagesForChannel(long j, long j2) {
-        Observable<Message> q = observeMessagesForChannel(j).E(new StoreMessages$observeMessagesForChannel$2(j2)).q();
+        Observable<Message> q = observeMessagesForChannel(j).F(new StoreMessages$observeMessagesForChannel$2(j2)).q();
         m.checkNotNullExpressionValue(q, "observeMessagesForChanne…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java
index a471a73af1..1b529ebeea 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java
@@ -47,7 +47,7 @@ public class StoreMessagesHolder {
     private final Subject<Set<Long>, Set<Long>> detachedChannelsSubject;
     private final Map<String, Long> messageNonceIds = new HashMap();
     private final LinkedHashMap<Long, TreeMap<Long, Message>> messages = new LinkedHashMap<>();
-    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.j0());
+    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.k0());
     private Map<Long, List<Message>> messagesSnapshot = Collections.emptyMap();
     private long myUserId;
     private long selectedChannelId;
@@ -57,7 +57,7 @@ public class StoreMessagesHolder {
     public StoreMessagesHolder() {
         HashSet hashSet = new HashSet();
         this.detachedChannels = hashSet;
-        this.detachedChannelsSubject = new SerializedSubject(BehaviorSubject.k0(new HashSet(hashSet)));
+        this.detachedChannelsSubject = new SerializedSubject(BehaviorSubject.l0(new HashSet(hashSet)));
     }
 
     private static Message addReaction(Message message, MessageReactionEmoji messageReactionEmoji, boolean z2) {
@@ -129,7 +129,7 @@ public class StoreMessagesHolder {
                 if (subscription != null) {
                     subscription.unsubscribe();
                 }
-                this.cachePersistSubscription = new j(null).p(j2, TimeUnit.MILLISECONDS).V(new b(this), a.i);
+                this.cachePersistSubscription = new j(null).p(j2, TimeUnit.MILLISECONDS).W(new b(this), a.i);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java
index 4dcab5fe86..116b14cbd3 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java
@@ -20,8 +20,8 @@ public final class StoreMessagesLoader$jumpToMessage$6<T, R> implements b<Boolea
     public final Observable<? extends Channel> call(Boolean bool) {
         m.checkNotNullExpressionValue(bool, "isConnected");
         int i = bool.booleanValue() ? 1 : 3;
-        Observable<R> E = StoreMessagesLoader.access$getStream$p(this.this$0).getChannels$app_productionGoogleRelease().observeChannel(this.$channelId).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        return ObservableExtensionsKt.takeSingleUntilTimeout$default(E, 1000 * ((long) i), false, 2, null);
+        Observable<R> F = StoreMessagesLoader.access$getStream$p(this.this$0).getChannels$app_productionGoogleRelease().observeChannel(this.$channelId).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 1000 * ((long) i), false, 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java
index ade20fa404..d35442f7d3 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java
@@ -175,9 +175,9 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
                 observable = RestAPI.Companion.getApi().getChannelMessages(j, l2, l3, Integer.valueOf(StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0)));
                 SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
                 access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-                Observable E = ObservableExtensionsKt.restSubscribeOn(observable, false).E(AnonymousClass2.INSTANCE);
-                m.checkNotNullExpressionValue(E, "messagesRequest\n        …messages.map(::Message) }");
-                Observable computationLatest = ObservableExtensionsKt.computationLatest(E);
+                Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+                Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
                 Class<?> cls = this.this$0.getClass();
                 AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
                 ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
@@ -188,9 +188,9 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
                 observable = RestAPI.Companion.getApi().getChannelMessages(j, l2, l3, Integer.valueOf(StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0)));
                 SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
                 access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-                Observable E = ObservableExtensionsKt.restSubscribeOn(observable, false).E(AnonymousClass2.INSTANCE);
-                m.checkNotNullExpressionValue(E, "messagesRequest\n        …messages.map(::Message) }");
-                Observable computationLatest = ObservableExtensionsKt.computationLatest(E);
+                Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+                Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
                 Class<?> cls = this.this$0.getClass();
                 AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
                 ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
@@ -200,9 +200,9 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
             observable = RestAPI.Companion.getApi().getChannelMessagesAround(j, StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0), l.longValue());
             SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
             access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-            Observable E = ObservableExtensionsKt.restSubscribeOn(observable, false).E(AnonymousClass2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "messagesRequest\n        …messages.map(::Message) }");
-            Observable computationLatest = ObservableExtensionsKt.computationLatest(E);
+            Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+            Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
             Class<?> cls = this.this$0.getClass();
             AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
             ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
@@ -210,9 +210,9 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
         observable = RestAPI.Companion.getApi().getChannelMessages(j, l2, l3, Integer.valueOf(StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0)));
         SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
         access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-        Observable E = ObservableExtensionsKt.restSubscribeOn(observable, false).E(AnonymousClass2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "messagesRequest\n        …messages.map(::Message) }");
-        Observable computationLatest = ObservableExtensionsKt.computationLatest(E);
+        Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+        Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
         Class<?> cls = this.this$0.getClass();
         AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
         ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader.java
index 74ca97213d..b1580bc2b9 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader.java
@@ -35,7 +35,7 @@ public final class StoreMessagesLoader extends Store {
     private boolean backgrounded;
     private final SerializedSubject<Map<Long, ChannelLoadedState>, Map<Long, ChannelLoadedState>> channelLoadedStateSubject;
     private final HashMap<Long, ChannelLoadedState> channelLoadedStates;
-    private final SerializedSubject<ChannelChunk, ChannelChunk> channelMessageChunksSubject = new SerializedSubject<>(BehaviorSubject.j0());
+    private final SerializedSubject<ChannelChunk, ChannelChunk> channelMessageChunksSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final SerializedSubject<Boolean, Boolean> channelMessagesLoadingSubject;
     private Subscription delayLoadingMessagesSubscription;
     private Set<Long> detachedChannels;
@@ -360,9 +360,9 @@ public final class StoreMessagesLoader extends Store {
         this.dispatcher = dispatcher;
         HashMap<Long, ChannelLoadedState> hashMap = new HashMap<>();
         this.channelLoadedStates = hashMap;
-        this.channelLoadedStateSubject = new SerializedSubject<>(BehaviorSubject.k0(new HashMap(hashMap)));
-        this.scrollToSubject = new SerializedSubject<>(BehaviorSubject.k0(null));
-        this.channelMessagesLoadingSubject = new SerializedSubject<>(BehaviorSubject.k0(Boolean.FALSE));
+        this.channelLoadedStateSubject = new SerializedSubject<>(BehaviorSubject.l0(new HashMap(hashMap)));
+        this.scrollToSubject = new SerializedSubject<>(BehaviorSubject.l0(null));
+        this.channelMessagesLoadingSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
         this.detachedChannels = n0.emptySet();
         this.backgrounded = true;
         this.loadingMessagesRetryDelayDefault = 1500;
@@ -594,9 +594,9 @@ public final class StoreMessagesLoader extends Store {
             return;
         }
         if (j > 0) {
-            Observable<Long> c02 = Observable.c0(j, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable\n          .ti…y, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(c02), getClass(), (Context) null, new StoreMessagesLoader$tryLoadMessages$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$tryLoadMessages$1(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(j, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…y, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(d02), getClass(), (Context) null, new StoreMessagesLoader$tryLoadMessages$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$tryLoadMessages$1(this), 58, (Object) null);
             return;
         }
         if (z3) {
@@ -659,17 +659,17 @@ public final class StoreMessagesLoader extends Store {
     }
 
     public final Observable<ChannelLoadedState> getMessagesLoadedState(long j) {
-        Observable<Map<Long, ChannelLoadedState>> E = this.channelLoadedStateSubject.E(new StoreMessagesLoader$getMessagesLoadedState$1(j));
-        m.checkNotNullExpressionValue(E, "channelLoadedStateSubjec…?: ChannelLoadedState() }");
-        Observable<ChannelLoadedState> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<Map<Long, ChannelLoadedState>> F = this.channelLoadedStateSubject.F(new StoreMessagesLoader$getMessagesLoadedState$1(j));
+        m.checkNotNullExpressionValue(F, "channelLoadedStateSubjec…?: ChannelLoadedState() }");
+        Observable<ChannelLoadedState> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "channelLoadedStateSubjec…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Long> getScrollTo() {
-        Observable<R> E = this.scrollToSubject.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        return ObservableExtensionsKt.computationLatest(E);
+        Observable<R> F = this.scrollToSubject.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return ObservableExtensionsKt.computationLatest(F);
     }
 
     public final synchronized void handleAuthToken(String str) {
@@ -710,12 +710,12 @@ public final class StoreMessagesLoader extends Store {
         if (j2 > 0) {
             StoreMessagesLoader$jumpToMessage$1 storeMessagesLoader$jumpToMessage$1 = new StoreMessagesLoader$jumpToMessage$1(this, j, j2);
             StoreMessagesLoader$jumpToMessage$2 storeMessagesLoader$jumpToMessage$2 = new StoreMessagesLoader$jumpToMessage$2(this, j);
-            Observable X = this.stream.getChannelsSelected$app_productionGoogleRelease().observeId().k(o.c(new StoreMessagesLoader$jumpToMessage$3(j), -1L, 1000, TimeUnit.MILLISECONDS)).X(new StoreMessagesLoader$jumpToMessage$4(this, j, j2));
-            m.checkNotNullExpressionValue(X, "stream\n        .channels…lId, messageId)\n        }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(X, 0, false, 3, null)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$5(this, storeMessagesLoader$jumpToMessage$1), 62, (Object) null);
-            Observable y2 = StoreConnectionOpen.observeConnectionOpen$default(this.stream.getConnectionOpen$app_productionGoogleRelease(), false, 1, null).Y(1).y(new StoreMessagesLoader$jumpToMessage$6(this, j));
-            m.checkNotNullExpressionValue(y2, "stream\n        .connecti…mes.ONE_SECOND)\n        }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(y2), getClass(), (Context) null, (Function1) null, StoreMessagesLoader$jumpToMessage$7.INSTANCE, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$8(storeMessagesLoader$jumpToMessage$2), 54, (Object) null);
+            Observable Y = this.stream.getChannelsSelected$app_productionGoogleRelease().observeId().k(o.c(new StoreMessagesLoader$jumpToMessage$3(j), -1L, 1000, TimeUnit.MILLISECONDS)).Y(new StoreMessagesLoader$jumpToMessage$4(this, j, j2));
+            m.checkNotNullExpressionValue(Y, "stream\n        .channels…lId, messageId)\n        }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$5(this, storeMessagesLoader$jumpToMessage$1), 62, (Object) null);
+            Observable z2 = StoreConnectionOpen.observeConnectionOpen$default(this.stream.getConnectionOpen$app_productionGoogleRelease(), false, 1, null).Z(1).z(new StoreMessagesLoader$jumpToMessage$6(this, j));
+            m.checkNotNullExpressionValue(z2, "stream\n        .connecti…mes.ONE_SECOND)\n        }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(z2), getClass(), (Context) null, (Function1) null, StoreMessagesLoader$jumpToMessage$7.INSTANCE, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$8(storeMessagesLoader$jumpToMessage$2), 54, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java
index 302f594b4f..c1201c6a08 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java
@@ -175,7 +175,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
     }
 
     public final Observable<Long> observeRecentMessageIds(long j) {
-        Observable<Long> q = observeRecentMessageIds().E(new StoreMessagesMostRecent$observeRecentMessageIds$2(j)).q();
+        Observable<Long> q = observeRecentMessageIds().F(new StoreMessagesMostRecent$observeRecentMessageIds$2(j)).q();
         m.checkNotNullExpressionValue(q, "observeRecentMessageIds(…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation.java b/app/src/main/java/com/discord/stores/StoreNavigation.java
index 0c9a845b2b..004f735bda 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation.java
@@ -32,7 +32,7 @@ import rx.subjects.SerializedSubject;
 /* compiled from: StoreNavigation.kt */
 public final class StoreNavigation {
     private final BehaviorSubject<PanelState> leftPanelStateSubject;
-    private final SerializedSubject<PanelAction, PanelAction> navigationPanelActionSubject = new SerializedSubject<>(BehaviorSubject.k0(PanelAction.NOOP));
+    private final SerializedSubject<PanelAction, PanelAction> navigationPanelActionSubject = new SerializedSubject<>(BehaviorSubject.l0(PanelAction.NOOP));
     private final BehaviorSubject<PanelState> rightPanelStateSubject;
     private final StoreStream stream;
 
@@ -347,9 +347,9 @@ public final class StoreNavigation {
             Observable<AgeGate> shouldShowAgeGate = this.stream.getAuthentication$app_productionGoogleRelease().getShouldShowAgeGate();
             Observable<Uri> oAuthUriObservable = this.stream.getAuthentication$app_productionGoogleRelease().getOAuthUriObservable();
             Observable<NavigationTab> observeSelectedTab = this.stream.getTabsNavigation$app_productionGoogleRelease().observeSelectedTab();
-            Observable<R> E = this.stream.getUsers$app_productionGoogleRelease().observeMe(true).E(StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "stream\n              .us….hasPhone\n              }");
-            Observable<ModelGlobalNavigation> q = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(ObservableCombineLatestOverloadsKt.combineLatest(nuxState, isInitializedObservable, authedToken$app_productionGoogleRelease, observeInitializedForAuthedUser, observeHasIncoming, observeUserRequiredAction, clientOutdated, inviteCode, observeDynamicLinkGuildTemplateCode, notices, shouldShowAgeGate, oAuthUriObservable, observeSelectedTab, E, StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$2.INSTANCE), 500, TimeUnit.MILLISECONDS)).q();
+            Observable<R> F = this.stream.getUsers$app_productionGoogleRelease().observeMe(true).F(StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "stream\n              .us….hasPhone\n              }");
+            Observable<ModelGlobalNavigation> q = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(ObservableCombineLatestOverloadsKt.combineLatest(nuxState, isInitializedObservable, authedToken$app_productionGoogleRelease, observeInitializedForAuthedUser, observeHasIncoming, observeUserRequiredAction, clientOutdated, inviteCode, observeDynamicLinkGuildTemplateCode, notices, shouldShowAgeGate, oAuthUriObservable, observeSelectedTab, F, StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$2.INSTANCE), 500, TimeUnit.MILLISECONDS)).q();
             m.checkNotNullExpressionValue(q, "combineLatest(\n         …  .distinctUntilChanged()");
             return q;
         }
@@ -465,8 +465,8 @@ public final class StoreNavigation {
         m.checkNotNullParameter(storeStream, "stream");
         this.stream = storeStream;
         PanelState.a aVar = PanelState.a.a;
-        this.leftPanelStateSubject = BehaviorSubject.k0(aVar);
-        this.rightPanelStateSubject = BehaviorSubject.k0(aVar);
+        this.leftPanelStateSubject = BehaviorSubject.l0(aVar);
+        this.rightPanelStateSubject = BehaviorSubject.l0(aVar);
     }
 
     public static /* synthetic */ void setNavigationPanelAction$default(StoreNavigation storeNavigation, PanelAction panelAction, PanelLayout panelLayout, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/stores/StoreNotices$init$1.java b/app/src/main/java/com/discord/stores/StoreNotices$init$1.java
index 62b159be10..d57d427972 100644
--- a/app/src/main/java/com/discord/stores/StoreNotices$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNotices$init$1.java
@@ -13,6 +13,6 @@ public final class StoreNotices$init$1<T, R> implements b<Unit, Observable<? ext
     }
 
     public final Observable<? extends Long> call(Unit unit) {
-        return Observable.C(0, StoreNotices.access$getPollRateMs$p(this.this$0), TimeUnit.MILLISECONDS);
+        return Observable.D(0, StoreNotices.access$getPollRateMs$p(this.this$0), TimeUnit.MILLISECONDS);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreNotices.java b/app/src/main/java/com/discord/stores/StoreNotices.java
index 5376366dcb..f4be5c92cf 100644
--- a/app/src/main/java/com/discord/stores/StoreNotices.java
+++ b/app/src/main/java/com/discord/stores/StoreNotices.java
@@ -344,12 +344,12 @@ public final class StoreNotices extends Store {
         m.checkNotNullParameter(storeStream, "stream");
         this.clock = clock;
         this.stream = storeStream;
-        BehaviorSubject<Unit> j0 = BehaviorSubject.j0();
-        m.checkNotNullExpressionValue(j0, "BehaviorSubject.create()");
-        this.processTrigger = j0;
-        BehaviorSubject<Notice> k0 = BehaviorSubject.k0(null);
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(null as Notice?)");
-        this.noticePublisher = k0;
+        BehaviorSubject<Unit> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.processTrigger = k0;
+        BehaviorSubject<Notice> l0 = BehaviorSubject.l0(null);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(null as Notice?)");
+        this.noticePublisher = l0;
         this.firstUseTimestamp$delegate = g.lazy(new StoreNotices$firstUseTimestamp$2(this));
     }
 
@@ -431,7 +431,7 @@ public final class StoreNotices extends Store {
         AppLog appLog = AppLog.g;
         Logger.d$default(appLog, "Notices init", null, 2, null);
         Logger.d$default(appLog, "Notices prev seen: " + this.noticesSeenCache.get().entrySet(), null, 2, null);
-        Observable o = this.processTrigger.X(new StoreNotices$init$1(this)).o(50, TimeUnit.MILLISECONDS);
+        Observable o = this.processTrigger.Y(new StoreNotices$init$1(this)).o(50, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "processTrigger\n        .…S, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(o), StoreNotices.class, (Context) null, (Function1) null, new StoreNotices$init$3(this), (Function0) null, (Function0) null, new StoreNotices$init$2(this), 54, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreNotifications.java b/app/src/main/java/com/discord/stores/StoreNotifications.java
index fd55c3af88..792b93ddcd 100644
--- a/app/src/main/java/com/discord/stores/StoreNotifications.java
+++ b/app/src/main/java/com/discord/stores/StoreNotifications.java
@@ -90,7 +90,7 @@ public final class StoreNotifications extends Store {
         NotificationClient.INSTANCE.setRegistrationIdReceived(new StoreNotifications$configureNotificationClient$1(this));
         Observable<NotificationClient.SettingsV2> settings = getSettings();
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable j = Observable.j(Observable.h(settings, companion.getAuthentication().getAuthedToken$app_productionGoogleRelease(), companion.getUserSettingsSystem().observeSettings(false), ObservableExtensionsKt.leadingEdgeThrottle(companion.getPermissions().observePermissionsForAllChannels(), 1, TimeUnit.SECONDS).E(StoreNotifications$configureNotificationClient$completedSettings$1.INSTANCE), StoreNotifications$configureNotificationClient$completedSettings$2.INSTANCE).q(), d.d.a(), StoreNotifications$configureNotificationClient$2.INSTANCE);
+        Observable j = Observable.j(Observable.h(settings, companion.getAuthentication().getAuthedToken$app_productionGoogleRelease(), companion.getUserSettingsSystem().observeSettings(false), ObservableExtensionsKt.leadingEdgeThrottle(companion.getPermissions().observePermissionsForAllChannels(), 1, TimeUnit.SECONDS).F(StoreNotifications$configureNotificationClient$completedSettings$1.INSTANCE), StoreNotifications$configureNotificationClient$completedSettings$2.INSTANCE).q(), d.d.a(), StoreNotifications$configureNotificationClient$2.INSTANCE);
         m.checkNotNullExpressionValue(j, "Observable\n        .comb… isBackgrounded\n        }");
         Observable q = ObservableExtensionsKt.computationBuffered(j).q();
         m.checkNotNullExpressionValue(q, "Observable\n        .comb…  .distinctUntilChanged()");
diff --git a/app/src/main/java/com/discord/stores/StoreNux.java b/app/src/main/java/com/discord/stores/StoreNux.java
index 62c4d7911a..6769fc2538 100644
--- a/app/src/main/java/com/discord/stores/StoreNux.java
+++ b/app/src/main/java/com/discord/stores/StoreNux.java
@@ -188,7 +188,7 @@ public final class StoreNux extends Store {
         this.dispatcher = dispatcher;
         NuxState nuxState = new NuxState(false, false, false, false, false, null, 63, null);
         this.nuxState = nuxState;
-        this.nuxStateSubject = BehaviorSubject.k0(nuxState);
+        this.nuxStateSubject = BehaviorSubject.l0(nuxState);
     }
 
     public static final /* synthetic */ NuxState access$getNuxState$p(StoreNux storeNux) {
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java
index 3a40ba19e4..380749be82 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java
@@ -137,9 +137,9 @@ public final class StoreOutboundPromotions$handleConnectionOpen$2<T, R> implemen
 
     public final Observable<? extends List<OutboundPromotion>> call(List<OutboundPromotion> list) {
         if (this.this$0.getPrefs().contains("CONSUMED_ENTITLEMENT_CODE")) {
-            return Observable.B(new AnonymousClass1(this, list));
+            return Observable.C(new AnonymousClass1(this, list));
         }
         m.checkNotNullExpressionValue(list, "activePromos");
-        return list.isEmpty() ^ true ? ObservableExtensionsKt.restSubscribeOn$default(StoreOutboundPromotions.access$getRestAPI$p(this.this$0).getMyEntitlements(521842831262875670L, false), false, 1, null).E(AnonymousClass2.INSTANCE).s(new AnonymousClass3(this)).E(new AnonymousClass4(list)) : new j(list);
+        return list.isEmpty() ^ true ? ObservableExtensionsKt.restSubscribeOn$default(StoreOutboundPromotions.access$getRestAPI$p(this.this$0).getMyEntitlements(521842831262875670L, false), false, 1, null).F(AnonymousClass2.INSTANCE).t(new AnonymousClass3(this)).F(new AnonymousClass4(list)) : new j(list);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
index af00011633..3e6773bdad 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
@@ -241,9 +241,9 @@ public final class StoreOutboundPromotions extends StoreV2 {
             this.state = State.Loading.INSTANCE;
             markChanged();
             RestAPI restAPI = this.restAPI;
-            Observable y2 = ObservableExtensionsKt.restSubscribeOn$default(this.previewFeatureFlag.isEnabled() ? restAPI.getAllPreviewPromotions() : restAPI.getAllActiveOutboundPromotions(), false, 1, null).y(new StoreOutboundPromotions$handleConnectionOpen$2(this));
-            m.checkNotNullExpressionValue(y2, "restAPI.run {\n        if…            }\n          }");
-            ObservableExtensionsKt.appSubscribe$default(y2, StoreOutboundPromotions.class, (Context) null, (Function1) null, new StoreOutboundPromotions$handleConnectionOpen$3(this), (Function0) null, (Function0) null, new StoreOutboundPromotions$handleConnectionOpen$4(this), 54, (Object) null);
+            Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(this.previewFeatureFlag.isEnabled() ? restAPI.getAllPreviewPromotions() : restAPI.getAllActiveOutboundPromotions(), false, 1, null).z(new StoreOutboundPromotions$handleConnectionOpen$2(this));
+            m.checkNotNullExpressionValue(z2, "restAPI.run {\n        if…            }\n          }");
+            ObservableExtensionsKt.appSubscribe$default(z2, StoreOutboundPromotions.class, (Context) null, (Function1) null, new StoreOutboundPromotions$handleConnectionOpen$3(this), (Function0) null, (Function0) null, new StoreOutboundPromotions$handleConnectionOpen$4(this), 54, (Object) null);
             return;
         }
         this.state = new State.Loaded(n.emptyList(), 0);
diff --git a/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java b/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java
index 1216a4fd47..1e3429b1a7 100644
--- a/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java
+++ b/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java
@@ -142,9 +142,9 @@ public final class StorePaymentSources$fetchPaymentSources$1 extends o implement
     public final void mo17invoke() {
         if (!(StorePaymentSources.access$getPaymentSourcesState$p(this.this$0) instanceof StorePaymentSources.PaymentSourcesState.Loading)) {
             StorePaymentSources.access$handlePaymentSourcesFetchStart(this.this$0);
-            Observable E = ObservableExtensionsKt.restSubscribeOn$default(StorePaymentSources.access$getRestAPI$p(this.this$0).getPaymentSources(), false, 1, null).E(new AnonymousClass1(this));
-            m.checkNotNullExpressionValue(E, "restAPI\n          .getPa…efaultPaymentSource(it) }");
-            ObservableExtensionsKt.appSubscribe$default(E, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
+            Observable F = ObservableExtensionsKt.restSubscribeOn$default(StorePaymentSources.access$getRestAPI$p(this.this$0).getPaymentSources(), false, 1, null).F(new AnonymousClass1(this));
+            m.checkNotNullExpressionValue(F, "restAPI\n          .getPa…efaultPaymentSource(it) }");
+            ObservableExtensionsKt.appSubscribe$default(F, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StorePermissions.java b/app/src/main/java/com/discord/stores/StorePermissions.java
index 7c32782ca0..fb92a84172 100644
--- a/app/src/main/java/com/discord/stores/StorePermissions.java
+++ b/app/src/main/java/com/discord/stores/StorePermissions.java
@@ -374,7 +374,7 @@ public final class StorePermissions extends StoreV2 {
     }
 
     public final Observable<Map<Long, Long>> observeChannelPermissionsForGuild(long j) {
-        Observable<Map<Long, Long>> q = observeAllPermissions().E(new StorePermissions$observeChannelPermissionsForGuild$1(j)).q();
+        Observable<Map<Long, Long>> q = observeAllPermissions().F(new StorePermissions$observeChannelPermissionsForGuild$1(j)).q();
         m.checkNotNullExpressionValue(q, "observeAllPermissions()\n…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages.java b/app/src/main/java/com/discord/stores/StorePinnedMessages.java
index ef6fbbda36..5ff7e3d854 100644
--- a/app/src/main/java/com/discord/stores/StorePinnedMessages.java
+++ b/app/src/main/java/com/discord/stores/StorePinnedMessages.java
@@ -110,9 +110,9 @@ public final class StorePinnedMessages extends StoreV2 {
 
     private final void loadPinnedMessages(long j) {
         if (!this.pinnedMessagesSnapshot.containsKey(Long.valueOf(j))) {
-            Observable E = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getChannelPins(j), false, 1, null).E(StorePinnedMessages$loadPinnedMessages$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "api\n        .getChannelP…messages.map(::Message) }");
-            ObservableExtensionsKt.appSubscribe$default(E, StorePinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StorePinnedMessages$loadPinnedMessages$2(this, j), 62, (Object) null);
+            Observable F = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getChannelPins(j), false, 1, null).F(StorePinnedMessages$loadPinnedMessages$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "api\n        .getChannelP…messages.map(::Message) }");
+            ObservableExtensionsKt.appSubscribe$default(F, StorePinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StorePinnedMessages$loadPinnedMessages$2(this, j), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java
index 7bb3de30da..a037ca3ae9 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java
@@ -82,6 +82,6 @@ public final class StoreReadStates$computeUnreadMarker$1 extends o implements Fu
 
     public final Observable<Unread.Marker> invoke(long j) {
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(companion.getMessageAck().observeAll().E(new AnonymousClass1(j)).Y(1), companion.getMessageAck().observeAll().E(new AnonymousClass2(j)), companion.getMessagesMostRecent().observeRecentMessageIds(j).Y(1), new AnonymousClass3(j));
+        return Observable.i(companion.getMessageAck().observeAll().F(new AnonymousClass1(j)).Z(1), companion.getMessageAck().observeAll().F(new AnonymousClass2(j)), companion.getMessagesMostRecent().observeRecentMessageIds(j).Z(1), new AnonymousClass3(j));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java
index ed83c78d00..f704b2ee10 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java
@@ -67,9 +67,9 @@ public final class StoreReadStates$computeUnreadMarker$4<T, R> implements b<Unre
 
     public final Observable<? extends Unread> call(Unread.Marker marker) {
         m.checkNotNullParameter(marker, "marker");
-        Observable<R> Z = StoreStream.Companion.getMessages().observeMessagesForChannel(marker.getChannelId()).E(new AnonymousClass1(marker)).Z(StoreReadStates.access$getMarkAsRead$p(this.this$0).w(AnonymousClass2.INSTANCE));
+        Observable<R> a02 = StoreStream.Companion.getMessages().observeMessagesForChannel(marker.getChannelId()).F(new AnonymousClass1(marker)).a0(StoreReadStates.access$getMarkAsRead$p(this.this$0).x(AnonymousClass2.INSTANCE));
         AnonymousClass3 r0 = new AnonymousClass3(this);
         a.C0323a aVar = a.a;
-        return Observable.g0(new k(Z, new i0.l.e.a(aVar, aVar, r0)));
+        return Observable.h0(new k(a02, new i0.l.e.a(aVar, aVar, r0)));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates.java b/app/src/main/java/com/discord/stores/StoreReadStates.java
index fbf7b052e1..dbcdbf62f0 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates.java
@@ -32,9 +32,9 @@ import rx.subjects.SerializedSubject;
 /* compiled from: StoreReadStates.kt */
 public final class StoreReadStates extends Store {
     private final Clock clock;
-    private final SerializedSubject<Boolean, Boolean> markAsRead = new SerializedSubject<>(BehaviorSubject.k0(Boolean.FALSE));
-    private final SerializedSubject<Set<Long>, Set<Long>> unreadChannelIds = new SerializedSubject<>(BehaviorSubject.k0(new HashSet()));
-    private final SerializedSubject<Set<Long>, Set<Long>> unreadGuildIds = new SerializedSubject<>(BehaviorSubject.k0(new HashSet()));
+    private final SerializedSubject<Boolean, Boolean> markAsRead = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
+    private final SerializedSubject<Set<Long>, Set<Long>> unreadChannelIds = new SerializedSubject<>(BehaviorSubject.l0(new HashSet()));
+    private final SerializedSubject<Set<Long>, Set<Long>> unreadGuildIds = new SerializedSubject<>(BehaviorSubject.l0(new HashSet()));
     private final Persister<Unread> unreadMessageMarker = new Persister<>("UNREAD_MESSAGE_MARKER_V3", new Unread(null, 0, 3, null));
 
     public StoreReadStates(Clock clock) {
@@ -67,9 +67,9 @@ public final class StoreReadStates extends Store {
     }
 
     private final void clearMarker() {
-        Observable Y = this.unreadMessageMarker.getObservable().E(StoreReadStates$clearMarker$1.INSTANCE).Y(1);
-        m.checkNotNullExpressionValue(Y, "unreadMessageMarker\n    …ount() }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(Y, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$clearMarker$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable Z = this.unreadMessageMarker.getObservable().F(StoreReadStates$clearMarker$1.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "unreadMessageMarker\n    …ount() }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$clearMarker$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final void computeUnreadChannelIds() {
@@ -141,9 +141,9 @@ public final class StoreReadStates extends Store {
         m.checkNotNullParameter(storeReadStates$computeUnreadMarker$2, "observableCondition");
         m.checkNotNullParameter(b0Var, "switchedObservableFunc");
         m.checkNotNullParameter(storeReadStates$computeUnreadMarker$3, "defaultObservableFunc");
-        Observable X = observeId.k(new a0(storeReadStates$computeUnreadMarker$2, b0Var, storeReadStates$computeUnreadMarker$3)).X(new StoreReadStates$computeUnreadMarker$4(this));
-        m.checkNotNullExpressionValue(X, "getChannelsSelected()\n  …clearMarker() }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(X, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$computeUnreadMarker$5(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable Y = observeId.k(new a0(storeReadStates$computeUnreadMarker$2, b0Var, storeReadStates$computeUnreadMarker$3)).Y(new StoreReadStates$computeUnreadMarker$4(this));
+        m.checkNotNullExpressionValue(Y, "getChannelsSelected()\n  …clearMarker() }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(Y, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$computeUnreadMarker$5(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final boolean isChannelMuted(Channel channel, Map<Long, ? extends ModelNotificationSettings> map) {
@@ -157,7 +157,7 @@ public final class StoreReadStates extends Store {
     }
 
     public final Observable<Boolean> getIsUnread(long j) {
-        Observable<Boolean> q = getUnreadGuildIds().E(new StoreReadStates$getIsUnread$1(j)).q();
+        Observable<Boolean> q = getUnreadGuildIds().F(new StoreReadStates$getIsUnread$1(j)).q();
         m.checkNotNullExpressionValue(q, "getUnreadGuildIds()\n    …  .distinctUntilChanged()");
         return q;
     }
@@ -171,7 +171,7 @@ public final class StoreReadStates extends Store {
     }
 
     public final Observable<Unread> getUnreadMarker(long j) {
-        Observable<Unread> q = getUnreadMarkerForSelectedChannel().w(new StoreReadStates$getUnreadMarker$1(j)).q();
+        Observable<Unread> q = getUnreadMarkerForSelectedChannel().x(new StoreReadStates$getUnreadMarker$1(j)).q();
         m.checkNotNullExpressionValue(q, "unreadMarkerForSelectedC…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java
index 6968d8634c..5c901e69c1 100644
--- a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java
+++ b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java
@@ -242,9 +242,9 @@ public final class StoreRequestedStageChannels extends StoreV2 {
     }
 
     public final Observable<StageInstanceState> observeRequestedStageChannel(long j) {
-        Observable<R> E = observeRequestedStageChannels().E(new StoreRequestedStageChannels$observeRequestedStageChannel$1(j));
-        m.checkNotNullExpressionValue(E, "observeRequestedStageCha…s().map { it[channelId] }");
-        return E;
+        Observable<R> F = observeRequestedStageChannels().F(new StoreRequestedStageChannels$observeRequestedStageChannel$1(j));
+        m.checkNotNullExpressionValue(F, "observeRequestedStageCha…s().map { it[channelId] }");
+        return F;
     }
 
     public final Observable<Map<Long, StageInstanceState>> observeRequestedStageChannels() {
diff --git a/app/src/main/java/com/discord/stores/StoreRtcConnection.java b/app/src/main/java/com/discord/stores/StoreRtcConnection.java
index 0e55508603..1a22347b5b 100644
--- a/app/src/main/java/com/discord/stores/StoreRtcConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreRtcConnection.java
@@ -234,22 +234,22 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         ListenerCollectionSubject<Listener> listenerCollectionSubject = new ListenerCollectionSubject<>();
         this.listenerSubject = listenerCollectionSubject;
         this.listeners = listenerCollectionSubject;
-        PublishSubject<SpeakingUserUpdate> j0 = PublishSubject.j0();
-        this.speakingUsersSubject = j0;
-        BehaviorSubject<RtcConnection.Quality> k0 = BehaviorSubject.k0(RtcConnection.Quality.UNKNOWN);
-        this.qualitySubject = k0;
+        PublishSubject<SpeakingUserUpdate> k0 = PublishSubject.k0();
+        this.speakingUsersSubject = k0;
+        BehaviorSubject<RtcConnection.Quality> l0 = BehaviorSubject.l0(RtcConnection.Quality.UNKNOWN);
+        this.qualitySubject = l0;
         this.currentVoiceState = new OutgoingPayload.VoiceStateUpdate(null, null, false, false, false, null, 32, null);
-        SerializedSubject<RtcConnection.StateChange, RtcConnection.StateChange> serializedSubject = new SerializedSubject<>(BehaviorSubject.k0(new RtcConnection.StateChange(new RtcConnection.State.d(false), null)));
+        SerializedSubject<RtcConnection.StateChange, RtcConnection.StateChange> serializedSubject = new SerializedSubject<>(BehaviorSubject.l0(new RtcConnection.StateChange(new RtcConnection.State.d(false), null)));
         this.connectionStateSubject = serializedSubject;
-        this.rtcConnectionMetadataSubject = BehaviorSubject.k0(null);
+        this.rtcConnectionMetadataSubject = BehaviorSubject.l0(null);
         Observable<RtcConnection.StateChange> q = ObservableExtensionsKt.computationLatest(serializedSubject).q();
         m.checkNotNullExpressionValue(q, "connectionStateSubject\n …  .distinctUntilChanged()");
         this.connectionState = q;
-        m.checkNotNullExpressionValue(k0, "qualitySubject");
-        Observable<RtcConnection.Quality> q2 = ObservableExtensionsKt.computationLatest(k0).q();
+        m.checkNotNullExpressionValue(l0, "qualitySubject");
+        Observable<RtcConnection.Quality> q2 = ObservableExtensionsKt.computationLatest(l0).q();
         m.checkNotNullExpressionValue(q2, "qualitySubject\n         …  .distinctUntilChanged()");
         this.quality = q2;
-        Observable<List<SpeakingUserUpdate>> a = j0.a(300, TimeUnit.MILLISECONDS);
+        Observable<List<SpeakingUserUpdate>> a = k0.a(300, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(a, "speakingUsersSubject\n   …S, TimeUnit.MILLISECONDS)");
         Observable<List<SpeakingUserUpdate>> q3 = ObservableExtensionsKt.computationLatest(a).q();
         m.checkNotNullExpressionValue(q3, "speakingUsersSubject\n   …  .distinctUntilChanged()");
@@ -330,7 +330,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             boolean booleanValue = entry2.getValue().booleanValue();
             if (l == null || longValue2 == l.longValue()) {
                 rtcConnection.X.put(Long.valueOf(longValue2), Boolean.valueOf(booleanValue));
-                MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+                MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
                 if (mediaEngineConnection != null) {
                     mediaEngineConnection.w(longValue2, booleanValue);
                 }
@@ -340,7 +340,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             long longValue3 = entry3.getKey().longValue();
             boolean booleanValue2 = entry3.getValue().booleanValue();
             if (l == null || longValue3 == l.longValue()) {
-                MediaEngineConnection mediaEngineConnection2 = rtcConnection.f2575w;
+                MediaEngineConnection mediaEngineConnection2 = rtcConnection.f2573w;
                 if (mediaEngineConnection2 == null) {
                     Log.e("RtcConnection", "MediaEngine not connected for setLocalVideoOffscreen.");
                 } else {
@@ -500,7 +500,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             RtcConnection rtcConnection = this.rtcConnection;
             if (rtcConnection != null) {
                 rtcConnection.X.put(Long.valueOf(longValue), Boolean.valueOf(booleanValue));
-                MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+                MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
                 if (mediaEngineConnection != null) {
                     mediaEngineConnection.w(longValue, booleanValue);
                 }
@@ -515,7 +515,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             boolean booleanValue = entry.getValue().booleanValue();
             RtcConnection rtcConnection = this.rtcConnection;
             if (rtcConnection != null) {
-                MediaEngineConnection mediaEngineConnection = rtcConnection.f2575w;
+                MediaEngineConnection mediaEngineConnection = rtcConnection.f2573w;
                 if (mediaEngineConnection == null) {
                     Log.e("RtcConnection", "MediaEngine not connected for setLocalVideoOffscreen.");
                 } else {
@@ -800,9 +800,9 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         StoreStream.Companion companion = StoreStream.Companion;
         ObservableExtensionsKt.appSubscribe$default(companion.getMediaSettings().isSelfMuted(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(companion.getMediaSettings().isSelfDeafened(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$2(this), 62, (Object) null);
-        Observable<R> E = companion.getMediaEngine().getSelectedVideoInputDevice().E(StoreRtcConnection$init$3.INSTANCE);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get…viceDescription != null }");
-        ObservableExtensionsKt.appSubscribe$default(E, StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$4(this), 62, (Object) null);
+        Observable<R> F = companion.getMediaEngine().getSelectedVideoInputDevice().F(StoreRtcConnection$init$3.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…viceDescription != null }");
+        ObservableExtensionsKt.appSubscribe$default(F, StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$4(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(this.stream.getMediaSettings$app_productionGoogleRelease().getUsersVolume(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$5(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(this.stream.getMediaSettings$app_productionGoogleRelease().getUsersMuted(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$6(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(this.stream.getMediaSettings$app_productionGoogleRelease().getUsersOffScreen(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$7(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/stores/StoreRtcRegion.java b/app/src/main/java/com/discord/stores/StoreRtcRegion.java
index 5c6066406b..587d7befca 100644
--- a/app/src/main/java/com/discord/stores/StoreRtcRegion.java
+++ b/app/src/main/java/com/discord/stores/StoreRtcRegion.java
@@ -125,9 +125,9 @@ public final class StoreRtcRegion {
 
     @StoreThread
     public final void handleConnectionOpen$app_productionGoogleRelease() {
-        Observable<Long> c02 = Observable.c0((long) (new Random().nextInt(29000) + 1000), TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(c02, "Observable.timer(fetchJi…), TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(c02, StoreRtcRegion.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcRegion$handleConnectionOpen$1(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0((long) (new Random().nextInt(29000) + 1000), TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable.timer(fetchJi…), TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(d02, StoreRtcRegion.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcRegion$handleConnectionOpen$1(this), 62, (Object) null);
     }
 
     public final void init() {
diff --git a/app/src/main/java/com/discord/stores/StoreSearch.java b/app/src/main/java/com/discord/stores/StoreSearch.java
index 8ea131c1e1..6aa4d96197 100644
--- a/app/src/main/java/com/discord/stores/StoreSearch.java
+++ b/app/src/main/java/com/discord/stores/StoreSearch.java
@@ -47,7 +47,7 @@ public final class StoreSearch {
     public static final class SearchTarget {
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2602id;
+        private final long f2600id;
         private final Type type;
 
         /* compiled from: StoreSearch.kt */
@@ -59,7 +59,7 @@ public final class StoreSearch {
         public SearchTarget(Type type, long j) {
             m.checkNotNullParameter(type, "type");
             this.type = type;
-            this.f2602id = j;
+            this.f2600id = j;
         }
 
         public static /* synthetic */ SearchTarget copy$default(SearchTarget searchTarget, Type type, long j, int i, Object obj) {
@@ -67,7 +67,7 @@ public final class StoreSearch {
                 type = searchTarget.type;
             }
             if ((i & 2) != 0) {
-                j = searchTarget.f2602id;
+                j = searchTarget.f2600id;
             }
             return searchTarget.copy(type, j);
         }
@@ -77,7 +77,7 @@ public final class StoreSearch {
         }
 
         public final long component2() {
-            return this.f2602id;
+            return this.f2600id;
         }
 
         public final SearchTarget copy(Type type, long j) {
@@ -93,11 +93,11 @@ public final class StoreSearch {
                 return false;
             }
             SearchTarget searchTarget = (SearchTarget) obj;
-            return m.areEqual(this.type, searchTarget.type) && this.f2602id == searchTarget.f2602id;
+            return m.areEqual(this.type, searchTarget.type) && this.f2600id == searchTarget.f2600id;
         }
 
         public final long getId() {
-            return this.f2602id;
+            return this.f2600id;
         }
 
         public final Type getType() {
@@ -106,14 +106,14 @@ public final class StoreSearch {
 
         public int hashCode() {
             Type type = this.type;
-            return b.a(this.f2602id) + ((type != null ? type.hashCode() : 0) * 31);
+            return b.a(this.f2600id) + ((type != null ? type.hashCode() : 0) * 31);
         }
 
         public String toString() {
             StringBuilder O = a.O("SearchTarget(type=");
             O.append(this.type);
             O.append(", id=");
-            return a.A(O, this.f2602id, ")");
+            return a.A(O, this.f2600id, ")");
         }
     }
 
@@ -146,8 +146,8 @@ public final class StoreSearch {
         this.storeGuildsNsfw = storeGuildsNsfw;
         this.storeUser = storeUser;
         this.historyCache = searchHistoryCache;
-        this.displayStateSubject = new SerializedSubject<>(BehaviorSubject.k0(DisplayState.SUGGESTIONS));
-        this.searchTargetSubject = new SerializedSubject<>(BehaviorSubject.j0());
+        this.displayStateSubject = new SerializedSubject<>(BehaviorSubject.l0(DisplayState.SUGGESTIONS));
+        this.searchTargetSubject = new SerializedSubject<>(BehaviorSubject.k0());
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -209,9 +209,9 @@ public final class StoreSearch {
             updateTarget(searchTarget);
             this.storeSearchData.init(searchTarget);
             this.storeSearchInput.init(searchStringProvider);
-            Observable G = Observable.G(this.storeSearchQuery.getState().w(StoreSearch$init$1.INSTANCE).E(StoreSearch$init$2.INSTANCE), this.storeSearchInput.getCurrentParsedInput().E(StoreSearch$init$3.INSTANCE));
-            m.checkNotNullExpressionValue(G, "Observable\n        .merg…splayState.SUGGESTIONS })");
-            ObservableExtensionsKt.appSubscribe$default(G, getClass(), (Context) null, new StoreSearch$init$4(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearch$init$5(this), 58, (Object) null);
+            Observable H = Observable.H(this.storeSearchQuery.getState().x(StoreSearch$init$1.INSTANCE).F(StoreSearch$init$2.INSTANCE), this.storeSearchInput.getCurrentParsedInput().F(StoreSearch$init$3.INSTANCE));
+            m.checkNotNullExpressionValue(H, "Observable\n        .merg…splayState.SUGGESTIONS })");
+            ObservableExtensionsKt.appSubscribe$default(H, getClass(), (Context) null, new StoreSearch$init$4(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearch$init$5(this), 58, (Object) null);
             ObservableExtensionsKt.appSubscribe$default(this.storeSearchQuery.getState(), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreSearch$init$6(this), 62, (Object) null);
         }
     }
@@ -249,9 +249,9 @@ public final class StoreSearch {
     }
 
     public final Observable<Collection<List<QueryNode>>> getHistory() {
-        Observable<R> X = this.searchTargetSubject.X(new StoreSearch$getHistory$1(this));
-        m.checkNotNullExpressionValue(X, "searchTargetSubject\n    …())\n          }\n        }");
-        return X;
+        Observable<R> Y = this.searchTargetSubject.Y(new StoreSearch$getHistory$1(this));
+        m.checkNotNullExpressionValue(Y, "searchTargetSubject\n    …())\n          }\n        }");
+        return Y;
     }
 
     public final StoreSearchData getStoreSearchData() {
diff --git a/app/src/main/java/com/discord/stores/StoreSearchData.java b/app/src/main/java/com/discord/stores/StoreSearchData.java
index f7a837f3f4..3743efe3f3 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchData.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchData.java
@@ -46,9 +46,9 @@ public final class StoreSearchData {
         this.storeChannels = storeChannels;
         this.storeUser = storeUser;
         this.storeGuilds = storeGuilds;
-        BehaviorSubject k0 = BehaviorSubject.k0(new SearchData(null, null, null, null, null, 31, null));
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(SearchData())");
-        this.searchDataSubject = k0;
+        BehaviorSubject l0 = BehaviorSubject.l0(new SearchData(null, null, null, null, null, 31, null));
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(SearchData())");
+        this.searchDataSubject = l0;
     }
 
     public static final /* synthetic */ StoreChannels access$getStoreChannels$p(StoreSearchData storeSearchData) {
@@ -77,7 +77,7 @@ public final class StoreSearchData {
 
     private final Observable<SearchData> getGuildSearchData(long j) {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<SearchData> combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getGuilds().observeComputed(j), companion.getUsers().observeAllUsers(), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null).E(StoreSearchData$getGuildSearchData$1.INSTANCE), companion.getPermissions().observeChannelPermissionsForGuild(j), new StoreSearchData$sam$rx_functions_Func4$0(new StoreSearchData$getGuildSearchData$2(new SearchData.Builder())), 3, TimeUnit.SECONDS);
+        Observable<SearchData> combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getGuilds().observeComputed(j), companion.getUsers().observeAllUsers(), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null).F(StoreSearchData$getGuildSearchData$1.INSTANCE), companion.getPermissions().observeChannelPermissionsForGuild(j), new StoreSearchData$sam$rx_functions_Func4$0(new StoreSearchData$getGuildSearchData$2(new SearchData.Builder())), 3, TimeUnit.SECONDS);
         m.checkNotNullExpressionValue(combineLatest, "ObservableWithLeadingEdg…3, TimeUnit.SECONDS\n    )");
         return combineLatest;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreSearchInput.java b/app/src/main/java/com/discord/stores/StoreSearchInput.java
index 668dd3223b..aeb303436a 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchInput.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchInput.java
@@ -40,7 +40,7 @@ public final class StoreSearchInput {
     private final Observable<List<QueryNode>> currentParsedInput;
     private final Observable<List<QueryNode>> forcedInput;
     private final PublishSubject<List<QueryNode>> forcedInputSubject;
-    private final SerializedSubject<String, String> inputSubject = new SerializedSubject<>(BehaviorSubject.k0(""));
+    private final SerializedSubject<String, String> inputSubject = new SerializedSubject<>(BehaviorSubject.l0(""));
     private Subscription inputSubscription;
     private final Observable<Boolean> isInputValid;
     private final SerializedSubject<Boolean, Boolean> isInputValidSubject;
@@ -109,19 +109,19 @@ public final class StoreSearchInput {
     }
 
     public StoreSearchInput() {
-        SerializedSubject<List<QueryNode>, List<QueryNode>> serializedSubject = new SerializedSubject<>(BehaviorSubject.j0());
+        SerializedSubject<List<QueryNode>, List<QueryNode>> serializedSubject = new SerializedSubject<>(BehaviorSubject.k0());
         this.astSubject = serializedSubject;
-        SerializedSubject<Boolean, Boolean> serializedSubject2 = new SerializedSubject<>(BehaviorSubject.k0(Boolean.FALSE));
+        SerializedSubject<Boolean, Boolean> serializedSubject2 = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
         this.isInputValidSubject = serializedSubject2;
-        PublishSubject<List<QueryNode>> j0 = PublishSubject.j0();
-        this.forcedInputSubject = j0;
+        PublishSubject<List<QueryNode>> k0 = PublishSubject.k0();
+        this.forcedInputSubject = k0;
         this.isInputValid = serializedSubject2;
         this.currentParsedInput = serializedSubject;
-        m.checkNotNullExpressionValue(j0, "forcedInputSubject");
-        this.forcedInput = j0;
-        Observable W = ObservableExtensionsKt.leadingEdgeThrottle(serializedSubject, 50, TimeUnit.MILLISECONDS).E(AnonymousClass1.INSTANCE).W(a.a());
-        m.checkNotNullExpressionValue(W, "astSubject\n        .lead…Schedulers.computation())");
-        ObservableExtensionsKt.appSubscribe$default(W, (Context) null, "validateSearchInput", (Function1) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        m.checkNotNullExpressionValue(k0, "forcedInputSubject");
+        this.forcedInput = k0;
+        Observable X = ObservableExtensionsKt.leadingEdgeThrottle(serializedSubject, 50, TimeUnit.MILLISECONDS).F(AnonymousClass1.INSTANCE).X(a.a());
+        m.checkNotNullExpressionValue(X, "astSubject\n        .lead…Schedulers.computation())");
+        ObservableExtensionsKt.appSubscribe$default(X, (Context) null, "validateSearchInput", (Function1) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     public static final /* synthetic */ void access$handleInputSubscription(StoreSearchInput storeSearchInput, Subscription subscription) {
@@ -180,9 +180,9 @@ public final class StoreSearchInput {
 
     public final void init(SearchStringProvider searchStringProvider) {
         m.checkNotNullParameter(searchStringProvider, "searchStringProvider");
-        Observable W = ObservableExtensionsKt.leadingEdgeThrottle(this.inputSubject, 100, TimeUnit.MILLISECONDS).q().E(new StoreSearchInput$init$1(new QueryParser(searchStringProvider))).W(a.a());
-        m.checkNotNullExpressionValue(W, "inputSubject\n        .le…Schedulers.computation())");
-        ObservableExtensionsKt.appSubscribe$default(W, StoreSearchInput.class, (Context) null, new StoreSearchInput$init$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearchInput$init$3(this.astSubject), 58, (Object) null);
+        Observable X = ObservableExtensionsKt.leadingEdgeThrottle(this.inputSubject, 100, TimeUnit.MILLISECONDS).q().F(new StoreSearchInput$init$1(new QueryParser(searchStringProvider))).X(a.a());
+        m.checkNotNullExpressionValue(X, "inputSubject\n        .le…Schedulers.computation())");
+        ObservableExtensionsKt.appSubscribe$default(X, StoreSearchInput.class, (Context) null, new StoreSearchInput$init$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearchInput$init$3(this.astSubject), 58, (Object) null);
     }
 
     public final Observable<Boolean> isInputValid() {
diff --git a/app/src/main/java/com/discord/stores/StoreSearchQuery.java b/app/src/main/java/com/discord/stores/StoreSearchQuery.java
index fdbb19d7a1..db79eeba97 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchQuery.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchQuery.java
@@ -49,7 +49,7 @@ public final class StoreSearchQuery {
         m.checkNotNullParameter(searchFetcher, "searchFetcher");
         this.searchFetcher = searchFetcher;
         SearchState searchState = SEARCH_STATE_NONE;
-        this.searchStateSubject = new SerializedSubject<>(BehaviorSubject.k0(searchState));
+        this.searchStateSubject = new SerializedSubject<>(BehaviorSubject.l0(searchState));
         this.currentSearchState = searchState;
     }
 
@@ -171,9 +171,9 @@ public final class StoreSearchQuery {
         unsubscribe();
         if (!t.isBlank(str)) {
             updateAndPublish(new SearchState(QueryFetchState.IN_PROGRESS, null, null, null, null, false, 0, 126, null));
-            Observable Y = Observable.i0(new j(str).E(new StoreSearchQuery$parseAndQuery$1(searchStringProvider)), storeSearch.getStoreSearchData().get(), new StoreSearchQuery$parseAndQuery$2(storeSearch, searchTarget, z2)).k(c.a.d.o.c(StoreSearchQuery$parseAndQuery$3.INSTANCE, null, 1, TimeUnit.SECONDS)).Y(1);
-            m.checkNotNullExpressionValue(Y, "Observable\n            .…   )\n            .take(1)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(Y), (Context) null, "parseAndQuery", (Function1) null, new StoreSearchQuery$parseAndQuery$4(this, searchTarget), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+            Observable Z = Observable.j0(new j(str).F(new StoreSearchQuery$parseAndQuery$1(searchStringProvider)), storeSearch.getStoreSearchData().get(), new StoreSearchQuery$parseAndQuery$2(storeSearch, searchTarget, z2)).k(c.a.d.o.c(StoreSearchQuery$parseAndQuery$3.INSTANCE, null, 1, TimeUnit.SECONDS)).Z(1);
+            m.checkNotNullExpressionValue(Z, "Observable\n            .…   )\n            .take(1)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(Z), (Context) null, "parseAndQuery", (Function1) null, new StoreSearchQuery$parseAndQuery$4(this, searchTarget), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
             return;
         }
         updateAndPublish(new SearchState(QueryFetchState.NONE, null, null, null, null, false, 0, 126, null));
diff --git a/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java b/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java
index b952df7571..41ccf275e2 100644
--- a/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java
+++ b/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java
@@ -69,8 +69,8 @@ public final class StoreSlowMode$getChannelCooldownObservable$newObservable$2<T,
             if (l == null || l.longValue() <= currentTimeMillis) {
                 return new j(0L);
             }
-            Observable<R> E = Observable.C(0, 1, TimeUnit.SECONDS).E(new AnonymousClass1(l, currentTimeMillis));
-            return Observable.g0(new r(E.i, new i2(AnonymousClass2.INSTANCE)));
+            Observable<R> F = Observable.D(0, 1, TimeUnit.SECONDS).F(new AnonymousClass1(l, currentTimeMillis));
+            return Observable.h0(new r(F.i, new i2(AnonymousClass2.INSTANCE)));
         }
     }
 
@@ -85,6 +85,6 @@ public final class StoreSlowMode$getChannelCooldownObservable$newObservable$2<T,
         if (bool.booleanValue()) {
             return new j(0L);
         }
-        return (m.areEqual(this.$type, StoreSlowMode.Type.MessageSend.INSTANCE) ? StoreSlowMode.access$getMessageSendNextSendTimesSubject$p(this.this$0) : StoreSlowMode.access$getThreadCreateNextSendTimesSubject$p(this.this$0)).E(new AnonymousClass1(this)).X(new AnonymousClass2(this));
+        return (m.areEqual(this.$type, StoreSlowMode.Type.MessageSend.INSTANCE) ? StoreSlowMode.access$getMessageSendNextSendTimesSubject$p(this.this$0) : StoreSlowMode.access$getThreadCreateNextSendTimesSubject$p(this.this$0)).F(new AnonymousClass1(this)).Y(new AnonymousClass2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSlowMode.java b/app/src/main/java/com/discord/stores/StoreSlowMode.java
index ec7b540c32..8c4444c241 100644
--- a/app/src/main/java/com/discord/stores/StoreSlowMode.java
+++ b/app/src/main/java/com/discord/stores/StoreSlowMode.java
@@ -69,10 +69,10 @@ public final class StoreSlowMode extends Store {
         this.stream = storeStream;
         HashMap<Long, Long> hashMap = new HashMap<>();
         this.messageSendNextSendTimes = hashMap;
-        this.messageSendNextSendTimesSubject = BehaviorSubject.k0(new HashMap(hashMap));
+        this.messageSendNextSendTimesSubject = BehaviorSubject.l0(new HashMap(hashMap));
         HashMap<Long, Long> hashMap2 = new HashMap<>();
         this.threadCreateNextSendTimes = hashMap2;
-        this.threadCreateNextSendTimesSubject = BehaviorSubject.k0(new HashMap(hashMap2));
+        this.threadCreateNextSendTimesSubject = BehaviorSubject.l0(new HashMap(hashMap2));
     }
 
     public static final /* synthetic */ Clock access$getClock$p(StoreSlowMode storeSlowMode) {
@@ -97,19 +97,19 @@ public final class StoreSlowMode extends Store {
         if (observable != null) {
             return observable;
         }
-        Observable<Integer> g02 = Observable.g0(new c0(this.stream.getPermissions$app_productionGoogleRelease().observePermissionsForChannel(j).E(new StoreSlowMode$getChannelCooldownObservable$newObservable$1(type)).q().X(new StoreSlowMode$getChannelCooldownObservable$newObservable$2(this, type, j)).E(StoreSlowMode$getChannelCooldownObservable$newObservable$3.INSTANCE).u(new StoreSlowMode$getChannelCooldownObservable$newObservable$4(this, j, type)).L(1)));
+        Observable<Integer> h02 = Observable.h0(new c0(this.stream.getPermissions$app_productionGoogleRelease().observePermissionsForChannel(j).F(new StoreSlowMode$getChannelCooldownObservable$newObservable$1(type)).q().Y(new StoreSlowMode$getChannelCooldownObservable$newObservable$2(this, type, j)).F(StoreSlowMode$getChannelCooldownObservable$newObservable$3.INSTANCE).v(new StoreSlowMode$getChannelCooldownObservable$newObservable$4(this, j, type)).M(1)));
         if (m.areEqual(type, messageSend)) {
             HashMap<Long, Observable<Integer>> hashMap = this.channelMessageSendCooldownObservables;
             Long valueOf = Long.valueOf(j);
-            m.checkNotNullExpressionValue(g02, "newObservable");
-            hashMap.put(valueOf, g02);
+            m.checkNotNullExpressionValue(h02, "newObservable");
+            hashMap.put(valueOf, h02);
         } else {
             HashMap<Long, Observable<Integer>> hashMap2 = this.channelThreadCreateCooldownObservables;
             Long valueOf2 = Long.valueOf(j);
-            m.checkNotNullExpressionValue(g02, "newObservable");
-            hashMap2.put(valueOf2, g02);
+            m.checkNotNullExpressionValue(h02, "newObservable");
+            hashMap2.put(valueOf2, h02);
         }
-        return g02;
+        return h02;
     }
 
     @StoreThread
diff --git a/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java b/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java
index 29a932e75b..0c15357378 100644
--- a/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java
@@ -20,6 +20,6 @@ public final class StoreSpotify$init$1<T, R> implements b<ModelSpotifyTrack, Obs
     }
 
     public final Observable<? extends ModelSpotifyTrack> call(ModelSpotifyTrack modelSpotifyTrack) {
-        return modelSpotifyTrack != null ? new j(modelSpotifyTrack) : Observable.c0(1, TimeUnit.SECONDS).E(AnonymousClass1.INSTANCE);
+        return modelSpotifyTrack != null ? new j(modelSpotifyTrack) : Observable.d0(1, TimeUnit.SECONDS).F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSpotify.java b/app/src/main/java/com/discord/stores/StoreSpotify.java
index a0fa41c24a..0f395ed99b 100644
--- a/app/src/main/java/com/discord/stores/StoreSpotify.java
+++ b/app/src/main/java/com/discord/stores/StoreSpotify.java
@@ -37,7 +37,7 @@ public final class StoreSpotify {
     private final Clock clock;
     private final Dispatcher dispatcher;
     private Subscription expireStateSub;
-    private final BehaviorSubject<Unit> publishStateTrigger = BehaviorSubject.j0();
+    private final BehaviorSubject<Unit> publishStateTrigger = BehaviorSubject.k0();
     private final SpotifyApiClient spotifyApiClient;
     private SpotifyState spotifyState;
     private final StoreStream stream;
@@ -282,9 +282,9 @@ public final class StoreSpotify {
 
     @StoreThread
     private final void startStateExpiration(long j) {
-        Observable<Long> c02 = Observable.c0(j + 5000, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(c02, "Observable\n        .time…), TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(c02, StoreSpotify.class, (Context) null, new StoreSpotify$startStateExpiration$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreSpotify$startStateExpiration$2(this), 58, (Object) null);
+        Observable<Long> d02 = Observable.d0(j + 5000, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…), TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(d02, StoreSpotify.class, (Context) null, new StoreSpotify$startStateExpiration$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreSpotify$startStateExpiration$2(this), 58, (Object) null);
     }
 
     @StoreThread
@@ -336,7 +336,7 @@ public final class StoreSpotify {
     public final void init(Context context) {
         m.checkNotNullParameter(context, "context");
         SpotifyHelper.registerSpotifyBroadcastReceivers(context);
-        Observable o = Observable.j(this.publishStateTrigger, this.spotifyApiClient.getSpotifyTrack().X(StoreSpotify$init$1.INSTANCE).q(), StoreSpotify$init$2.INSTANCE).o(2, TimeUnit.SECONDS);
+        Observable o = Observable.j(this.publishStateTrigger, this.spotifyApiClient.getSpotifyTrack().Y(StoreSpotify$init$1.INSTANCE).q(), StoreSpotify$init$2.INSTANCE).o(2, TimeUnit.SECONDS);
         m.checkNotNullExpressionValue(o, "Observable.combineLatest…unce(2, TimeUnit.SECONDS)");
         ObservableExtensionsKt.appSubscribe$default(o, StoreSpotify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreSpotify$init$3(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java b/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java
index 707d077edf..909993a168 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java
@@ -40,9 +40,9 @@ public final class StoreStageChannelSelfPresence extends StoreV2 {
         this.voiceChannelSelected = storeVoiceChannelSelected;
         this.userSettings = storeUserSettings;
         this.dispatcher = dispatcher;
-        BehaviorSubject<Unit> j0 = BehaviorSubject.j0();
-        m.checkNotNullExpressionValue(j0, "BehaviorSubject.create()");
-        this.publishStateTrigger = j0;
+        BehaviorSubject<Unit> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.publishStateTrigger = k0;
     }
 
     @StoreThread
@@ -132,9 +132,9 @@ public final class StoreStageChannelSelfPresence extends StoreV2 {
     }
 
     public final void init() {
-        Observable X = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stageChannels, this.voiceChannelSelected}, false, null, null, new StoreStageChannelSelfPresence$init$1(this), 14, null).q().X(new StoreStageChannelSelfPresence$init$2(this));
-        m.checkNotNullExpressionValue(X, "observationDeck.connectR…bled -> isEnabled }\n    }");
-        ObservableExtensionsKt.appSubscribe$default(X, StoreStageChannelSelfPresence.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStageChannelSelfPresence$init$3(this), 62, (Object) null);
+        Observable Y = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stageChannels, this.voiceChannelSelected}, false, null, null, new StoreStageChannelSelfPresence$init$1(this), 14, null).q().Y(new StoreStageChannelSelfPresence$init$2(this));
+        m.checkNotNullExpressionValue(Y, "observationDeck.connectR…bled -> isEnabled }\n    }");
+        ObservableExtensionsKt.appSubscribe$default(Y, StoreStageChannelSelfPresence.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStageChannelSelfPresence$init$3(this), 62, (Object) null);
     }
 
     public final void setStageChannelActivity(Activity activity) {
diff --git a/app/src/main/java/com/discord/stores/StoreStickers.java b/app/src/main/java/com/discord/stores/StoreStickers.java
index 4bd38f49ce..376ab3ac0d 100644
--- a/app/src/main/java/com/discord/stores/StoreStickers.java
+++ b/app/src/main/java/com/discord/stores/StoreStickers.java
@@ -301,9 +301,9 @@ public final class StoreStickers extends StoreV2 {
     }
 
     public final Observable<List<Long>> observeFrequentlyUsedStickerIds() {
-        Observable<R> E = this.frecencyCache.getObservable().E(StoreStickers$observeFrequentlyUsedStickerIds$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "frecencyCache.getObserva…ckerId.toLong() }\n      }");
-        return E;
+        Observable<R> F = this.frecencyCache.getObservable().F(StoreStickers$observeFrequentlyUsedStickerIds$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "frecencyCache.getObserva…ckerId.toLong() }\n      }");
+        return F;
     }
 
     public final Observable<StickerPackState> observeStickerPack(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java
index 0ae671c54a..067773a174 100644
--- a/app/src/main/java/com/discord/stores/StoreStream.java
+++ b/app/src/main/java/com/discord/stores/StoreStream.java
@@ -176,7 +176,7 @@ public final class StoreStream {
     private final StoreGuilds guilds;
     private final StoreGuildsNsfw guildsNsfw;
     private final StoreGuildsSorted guildsSorted;
-    private final BehaviorSubject<Boolean> initialized = BehaviorSubject.k0(Boolean.FALSE);
+    private final BehaviorSubject<Boolean> initialized = BehaviorSubject.l0(Boolean.FALSE);
     private final StoreInstantInvites instantInvites;
     private final StoreGuildIntegrations integrations;
     private final StoreChannelMembers lazyChannelMembersStore;
@@ -969,7 +969,7 @@ public final class StoreStream {
         this.expressionPickerNavigation = storeExpressionPickerNavigation;
         StoreChannelFollowerStats storeChannelFollowerStats = new StoreChannelFollowerStats(this.dispatcher, ObservationDeckProvider.get());
         this.channelFollowerStats = storeChannelFollowerStats;
-        StoreApplicationCommandFrecency storeApplicationCommandFrecency = new StoreApplicationCommandFrecency(null, 1, null);
+        StoreApplicationCommandFrecency storeApplicationCommandFrecency = new StoreApplicationCommandFrecency(this.dispatcher, null, 2, null);
         this.applicationCommandFrecency = storeApplicationCommandFrecency;
         StorePendingReplies storePendingReplies = new StorePendingReplies(this.dispatcher, null, 2, null);
         this.pendingReplies = storePendingReplies;
@@ -1399,9 +1399,9 @@ public final class StoreStream {
     }
 
     private final <T> void dispatchSubscribe(Observable<T> observable, String str, Function1<? super T, Unit> function1) {
-        Observable<T> I = observable.I();
-        m.checkNotNullExpressionValue(I, "onBackpressureBuffer()");
-        ObservableExtensionsKt.appSubscribe$default(I, (Context) null, str, (Function1) null, new StoreStream$dispatchSubscribe$1(this, function1), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<T> J = observable.J();
+        m.checkNotNullExpressionValue(J, "onBackpressureBuffer()");
+        ObservableExtensionsKt.appSubscribe$default(J, (Context) null, str, (Function1) null, new StoreStream$dispatchSubscribe$1(this, function1), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     public static final StoreAnalytics getAnalytics() {
@@ -2622,9 +2622,9 @@ public final class StoreStream {
         SharedPreferences sharedPreferences = SharedPreferencesProvider.INSTANCE.get();
         long currentTimeMillis = clock.currentTimeMillis();
         if (currentTimeMillis - sharedPreferences.getLong(LAST_LOGGED_NOTIFICATION_PERMISSIONS_KEY, 0) > DAY_IN_MILLS) {
-            Observable<NotificationClient.SettingsV2> Y = this.notifications.getSettings().Y(1);
-            m.checkNotNullExpressionValue(Y, "notifications.getSettings().take(1)");
-            ObservableExtensionsKt.appSubscribe$default(Y, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$maybeLogNotificationPermissionStatus$1(sharedPreferences, currentTimeMillis, application), 62, (Object) null);
+            Observable<NotificationClient.SettingsV2> Z = this.notifications.getSettings().Z(1);
+            m.checkNotNullExpressionValue(Z, "notifications.getSettings().take(1)");
+            ObservableExtensionsKt.appSubscribe$default(Z, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$maybeLogNotificationPermissionStatus$1(sharedPreferences, currentTimeMillis, application), 62, (Object) null);
         }
     }
 
@@ -2640,9 +2640,9 @@ public final class StoreStream {
     }
 
     private final void startStoreInitializationTimer(NetworkMonitor networkMonitor) {
-        Observable Y = Observable.G(networkMonitor.observeIsConnected().w(StoreStream$startStoreInitializationTimer$isOfflineObservable$1.INSTANCE), Observable.c0(6000, TimeUnit.MILLISECONDS)).Y(1);
-        m.checkNotNullExpressionValue(Y, "Observable.merge(\n      …le\n    )\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(Y, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$startStoreInitializationTimer$1(this), 62, (Object) null);
+        Observable Z = Observable.H(networkMonitor.observeIsConnected().x(StoreStream$startStoreInitializationTimer$isOfflineObservable$1.INSTANCE), Observable.d0(6000, TimeUnit.MILLISECONDS)).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable.merge(\n      …le\n    )\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$startStoreInitializationTimer$1(this), 62, (Object) null);
     }
 
     public static /* synthetic */ void streamCreate$default(StoreStream storeStream, String str, String str2, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
index 7674dd1301..4389b31d1f 100644
--- a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
@@ -380,7 +380,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin
         destroyRtcConnection();
         RtcConnection.Metadata rtcConnectionMetadata = this.storeRtcConnection.getRtcConnectionMetadata();
         String str4 = null;
-        Long l2 = rtcConnectionMetadata != null ? rtcConnectionMetadata.f2579c : null;
+        Long l2 = rtcConnectionMetadata != null ? rtcConnectionMetadata.f2577c : null;
         if (l2 != null && l2.longValue() == j2) {
             str4 = rtcConnectionMetadata.b;
         }
diff --git a/app/src/main/java/com/discord/stores/StoreTabsNavigation.java b/app/src/main/java/com/discord/stores/StoreTabsNavigation.java
index c984d2bd33..6d483f2d54 100644
--- a/app/src/main/java/com/discord/stores/StoreTabsNavigation.java
+++ b/app/src/main/java/com/discord/stores/StoreTabsNavigation.java
@@ -25,7 +25,7 @@ public final class StoreTabsNavigation extends StoreV2 {
         this.storeStream = storeStream;
         this.observationDeck = observationDeck;
         this.selectedTab = NavigationTab.HOME;
-        this.dismissTabsDialogEventSubject = PublishSubject.j0();
+        this.dismissTabsDialogEventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java b/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java
index 15e5abcddb..567b57452b 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java
@@ -22,6 +22,6 @@ public final class StoreThreadDraft$setDraftSending$1 extends o implements Funct
         BehaviorSubject access$getDraftStateSubject$p = StoreThreadDraft.access$getDraftStateSubject$p(this.this$0);
         BehaviorSubject access$getDraftStateSubject$p2 = StoreThreadDraft.access$getDraftStateSubject$p(this.this$0);
         m.checkNotNullExpressionValue(access$getDraftStateSubject$p2, "draftStateSubject");
-        access$getDraftStateSubject$p.onNext(StoreThreadDraft.ThreadDraftState.copy$default((StoreThreadDraft.ThreadDraftState) access$getDraftStateSubject$p2.m0(), false, null, null, true, false, 23, null));
+        access$getDraftStateSubject$p.onNext(StoreThreadDraft.ThreadDraftState.copy$default((StoreThreadDraft.ThreadDraftState) access$getDraftStateSubject$p2.n0(), false, null, null, true, false, 23, null));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreThreadDraft.java b/app/src/main/java/com/discord/stores/StoreThreadDraft.java
index 21627ebdb4..b89d84a781 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadDraft.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadDraft.java
@@ -8,7 +8,7 @@ import rx.subjects.BehaviorSubject;
 /* compiled from: StoreThreadDraft.kt */
 public final class StoreThreadDraft extends StoreV2 {
     private final Dispatcher dispatcher;
-    private final BehaviorSubject<ThreadDraftState> draftStateSubject = BehaviorSubject.k0(new ThreadDraftState(false, null, null, false, false, 31, null));
+    private final BehaviorSubject<ThreadDraftState> draftStateSubject = BehaviorSubject.l0(new ThreadDraftState(false, null, null, false, false, 31, null));
 
     /* compiled from: StoreThreadDraft.kt */
     public static final class ThreadDraftState {
diff --git a/app/src/main/java/com/discord/stores/StoreUser.java b/app/src/main/java/com/discord/stores/StoreUser.java
index 59cde9bbf0..fa077ed064 100644
--- a/app/src/main/java/com/discord/stores/StoreUser.java
+++ b/app/src/main/java/com/discord/stores/StoreUser.java
@@ -54,7 +54,7 @@ public final class StoreUser extends StoreV2 {
     private final Dispatcher dispatcher;
 
     /* renamed from: me  reason: collision with root package name */
-    private MeUser f2603me;
+    private MeUser f2601me;
     private final Persister<MeUser> meCache;
     private MeUser meSnapshot;
     private final Function1<User, Unit> notifyUserUpdated;
@@ -93,7 +93,7 @@ public final class StoreUser extends StoreV2 {
         this.observationDeck = observationDeck;
         this.meCache = persister;
         MeUser meUser = EMPTY_ME_USER;
-        this.f2603me = meUser;
+        this.f2601me = meUser;
         this.users = new SnowflakePartitionMap.CopiablePartitionMap<>(0, 1, null);
         this.meSnapshot = meUser;
         this.usersSnapshot = h0.emptyMap();
@@ -118,7 +118,7 @@ public final class StoreUser extends StoreV2 {
     }
 
     public static final /* synthetic */ MeUser access$getMe$p(StoreUser storeUser) {
-        return storeUser.f2603me;
+        return storeUser.f2601me;
     }
 
     public static final /* synthetic */ ObservationDeck.UpdateSource access$getMeUpdate$cp() {
@@ -134,7 +134,7 @@ public final class StoreUser extends StoreV2 {
     }
 
     public static final /* synthetic */ void access$setMe$p(StoreUser storeUser, MeUser meUser) {
-        storeUser.f2603me = meUser;
+        storeUser.f2601me = meUser;
     }
 
     @StoreThread
@@ -176,7 +176,7 @@ public final class StoreUser extends StoreV2 {
 
     @StoreThread
     public final MeUser getMeInternal$app_productionGoogleRelease() {
-        return this.f2603me;
+        return this.f2601me;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map<java.lang.Long, ? extends com.discord.models.user.User>, java.util.Map<java.lang.Long, com.discord.models.user.User> */
@@ -213,7 +213,7 @@ public final class StoreUser extends StoreV2 {
     public final void handleAuthToken(String str) {
         if (str == null) {
             markChanged(MeUpdate);
-            this.f2603me = EMPTY_ME_USER;
+            this.f2601me = EMPTY_ME_USER;
         }
     }
 
@@ -235,7 +235,7 @@ public final class StoreUser extends StoreV2 {
         User me2 = modelPayload.getMe();
         m.checkNotNullExpressionValue(me2, "payload.me");
         MeUser meUser = new MeUser(me2);
-        this.f2603me = meUser;
+        this.f2601me = meUser;
         this.users.put(Long.valueOf(meUser.getId()), meUser);
         for (Channel channel : modelPayload.getPrivateChannels()) {
             m.checkNotNullExpressionValue(channel, "channel");
@@ -321,7 +321,7 @@ public final class StoreUser extends StoreV2 {
         }
         Long l = message.l();
         if (((l != null ? l.longValue() : 0) & 16) != 0) {
-            this.f2603me = MeUser.copy$default(this.f2603me, 0, null, null, null, false, false, 0, null, null, false, false, null, this.f2603me.getFlags() | 8192, 0, null, null, null, null, 258047, null);
+            this.f2601me = MeUser.copy$default(this.f2601me, 0, null, null, null, false, false, 0, null, null, false, false, null, this.f2601me.getFlags() | 8192, 0, null, null, null, null, 258047, null);
             markChanged(MeUpdate);
         }
     }
@@ -402,8 +402,8 @@ public final class StoreUser extends StoreV2 {
     public final void handleUserUpdated(User user) {
         m.checkNotNullParameter(user, "user");
         updateUser(user);
-        if (this.f2603me.getId() == user.i()) {
-            this.f2603me = MeUser.Companion.merge(this.f2603me, user);
+        if (this.f2601me.getId() == user.i()) {
+            this.f2601me = MeUser.Companion.merge(this.f2601me, user);
             markChanged(MeUpdate);
         }
     }
@@ -412,7 +412,7 @@ public final class StoreUser extends StoreV2 {
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        this.f2603me = this.meCache.get();
+        this.f2601me = this.meCache.get();
         markChanged(MeUpdate);
     }
 
@@ -425,7 +425,7 @@ public final class StoreUser extends StoreV2 {
     }
 
     public final Observable<MeUser> observeMe(boolean z2) {
-        Observable<MeUser> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{MeUpdate}, false, null, null, new StoreUser$observeMe$1(this), 14, null).w(new StoreUser$observeMe$2(z2)).q();
+        Observable<MeUser> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{MeUpdate}, false, null, null, new StoreUser$observeMe$1(this), 14, null).x(new StoreUser$observeMe$2(z2)).q();
         m.checkNotNullExpressionValue(q, "observationDeck.connectR…  .distinctUntilChanged()");
         return q;
     }
@@ -437,7 +437,7 @@ public final class StoreUser extends StoreV2 {
     }
 
     public final Observable<com.discord.models.user.User> observeUser(long j) {
-        Observable<com.discord.models.user.User> q = observeAllUsers().E(new StoreUser$observeUser$1(j)).q();
+        Observable<com.discord.models.user.User> q = observeAllUsers().F(new StoreUser$observeUser$1(j)).q();
         m.checkNotNullExpressionValue(q, "observeAllUsers()\n      …  .distinctUntilChanged()");
         return q;
     }
@@ -456,9 +456,9 @@ public final class StoreUser extends StoreV2 {
 
     public final Observable<Map<Long, com.discord.models.user.User>> observeUsers(Collection<Long> collection, boolean z2) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, com.discord.models.user.User>> s = observeAllUsers().k(c.a.d.o.a(collection)).s(new StoreUser$observeUsers$1(this, z2, collection));
-        m.checkNotNullExpressionValue(s, "observeAllUsers()\n      …ys)\n          }\n        }");
-        return s;
+        Observable<Map<Long, com.discord.models.user.User>> t = observeAllUsers().k(c.a.d.o.a(collection)).t(new StoreUser$observeUsers$1(this, z2, collection));
+        m.checkNotNullExpressionValue(t, "observeAllUsers()\n      …ys)\n          }\n        }");
+        return t;
     }
 
     @Override // com.discord.stores.StoreV2
@@ -468,7 +468,7 @@ public final class StoreUser extends StoreV2 {
             this.usersSnapshot = this.users.fastCopy();
         }
         if (getUpdateSources().contains(MeUpdate)) {
-            MeUser meUser = this.f2603me;
+            MeUser meUser = this.f2601me;
             this.meSnapshot = meUser;
             Persister.set$default(this.meCache, meUser, false, 2, null);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreUserAffinities.java b/app/src/main/java/com/discord/stores/StoreUserAffinities.java
index d328aad6db..5baefa4107 100644
--- a/app/src/main/java/com/discord/stores/StoreUserAffinities.java
+++ b/app/src/main/java/com/discord/stores/StoreUserAffinities.java
@@ -72,7 +72,7 @@ public final class StoreUserAffinities extends StoreV2 {
     }
 
     public final Observable<List<Long>> observeAffinityUserIds() {
-        Observable<List<Long>> q = observeUserAffinities().E(StoreUserAffinities$observeAffinityUserIds$1.INSTANCE).q();
+        Observable<List<Long>> q = observeUserAffinities().F(StoreUserAffinities$observeAffinityUserIds$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeUserAffinities()\n…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java b/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
index fbe00cde66..4c91dafe68 100644
--- a/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
@@ -146,7 +146,7 @@ public final class StoreUserGuildSettings extends StoreV2 {
         this.guildsToHideMutedChannelsInSnapshot = n0.emptySet();
         this.guildSettingsCache = new Persister<>("STORE_SETTINGS_USER_GUILD_V5", new HashMap());
         this.guildsToHideMutedChannelsInCache = new Persister<>("STORE_SHOW_HIDE_MUTED_CHANNELS_V2", new HashSet());
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -226,9 +226,9 @@ public final class StoreUserGuildSettings extends StoreV2 {
             j = Math.min(j, modelNotificationSettings2.getNextMuteEndTimeMs(this.clock));
         }
         if (j < RecyclerView.FOREVER_NS) {
-            Observable<Long> d02 = Observable.d0(j - this.clock.currentTimeMillis(), TimeUnit.MILLISECONDS, this.dispatcher.getScheduler());
-            m.checkNotNullExpressionValue(d02, "Observable.timer(\n      …patcher.scheduler\n      )");
-            ObservableExtensionsKt.appSubscribe$default(d02, StoreUserGuildSettings.class, (Context) null, new StoreUserGuildSettings$handleGuildSettings$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserGuildSettings$handleGuildSettings$2(this), 58, (Object) null);
+            Observable<Long> e02 = Observable.e0(j - this.clock.currentTimeMillis(), TimeUnit.MILLISECONDS, this.dispatcher.getScheduler());
+            m.checkNotNullExpressionValue(e02, "Observable.timer(\n      …patcher.scheduler\n      )");
+            ObservableExtensionsKt.appSubscribe$default(e02, StoreUserGuildSettings.class, (Context) null, new StoreUserGuildSettings$handleGuildSettings$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserGuildSettings$handleGuildSettings$2(this), 58, (Object) null);
         }
     }
 
@@ -321,19 +321,19 @@ public final class StoreUserGuildSettings extends StoreV2 {
     }
 
     public final Observable<ModelNotificationSettings> observeGuildSettings(long j) {
-        Observable<ModelNotificationSettings> q = observeGuildSettings().E(new StoreUserGuildSettings$observeGuildSettings$2(j)).q();
+        Observable<ModelNotificationSettings> q = observeGuildSettings().F(new StoreUserGuildSettings$observeGuildSettings$2(j)).q();
         m.checkNotNullExpressionValue(q, "observeGuildSettings()\n …  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Boolean> observeHideMutedChannels(long j) {
-        Observable<Boolean> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserGuildSettings$observeHideMutedChannels$1(this), 14, null).E(new StoreUserGuildSettings$observeHideMutedChannels$2(j)).q();
+        Observable<Boolean> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserGuildSettings$observeHideMutedChannels$1(this), 14, null).F(new StoreUserGuildSettings$observeHideMutedChannels$2(j)).q();
         m.checkNotNullExpressionValue(q, "observationDeck.connectR…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<List<Long>> observeMutedGuildIds() {
-        Observable<List<Long>> q = observeGuildSettings().E(StoreUserGuildSettings$observeMutedGuildIds$1.INSTANCE).q();
+        Observable<List<Long>> q = observeGuildSettings().F(StoreUserGuildSettings$observeMutedGuildIds$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeGuildSettings()\n …  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreUserPresence.java b/app/src/main/java/com/discord/stores/StoreUserPresence.java
index 1d07e4092e..4f64b58a67 100644
--- a/app/src/main/java/com/discord/stores/StoreUserPresence.java
+++ b/app/src/main/java/com/discord/stores/StoreUserPresence.java
@@ -585,7 +585,7 @@ public final class StoreUserPresence extends StoreV2 {
     }
 
     public final Observable<Activity> observeApplicationActivity(long j, long j2) {
-        Observable<Activity> q = observePresenceForUser(j).E(new StoreUserPresence$observeApplicationActivity$1(j2)).q();
+        Observable<Activity> q = observePresenceForUser(j).F(new StoreUserPresence$observeApplicationActivity$1(j2)).q();
         m.checkNotNullExpressionValue(q, "observePresenceForUser(u…  .distinctUntilChanged()");
         return q;
     }
@@ -597,14 +597,14 @@ public final class StoreUserPresence extends StoreV2 {
     }
 
     public final Observable<Presence> observePresenceForUser(long j) {
-        Observable<Presence> q = observeAllPresences().E(new StoreUserPresence$observePresenceForUser$1(j)).q();
+        Observable<Presence> q = observeAllPresences().F(new StoreUserPresence$observePresenceForUser$1(j)).q();
         m.checkNotNullExpressionValue(q, "observeAllPresences()\n  …  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Map<Long, Presence>> observePresencesForUsers(Collection<Long> collection) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, Presence>> q = observeAllPresences().E(new StoreUserPresence$observePresencesForUsers$1(collection)).q();
+        Observable<Map<Long, Presence>> q = observeAllPresences().F(new StoreUserPresence$observePresencesForUsers$1(collection)).q();
         m.checkNotNullExpressionValue(q, "observeAllPresences()\n  …  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreUserRelationships.java b/app/src/main/java/com/discord/stores/StoreUserRelationships.java
index 7aa274e77a..ab3a9b3cc1 100644
--- a/app/src/main/java/com/discord/stores/StoreUserRelationships.java
+++ b/app/src/main/java/com/discord/stores/StoreUserRelationships.java
@@ -212,20 +212,20 @@ public final class StoreUserRelationships extends StoreV2 {
     }
 
     public final Observable<Integer> observe(long j) {
-        Observable<R> E = observe().E(new StoreUserRelationships$observe$3(j));
-        m.checkNotNullExpressionValue(E, "observe()\n          .map…> relationships[userId] }");
-        return E;
+        Observable<R> F = observe().F(new StoreUserRelationships$observe$3(j));
+        m.checkNotNullExpressionValue(F, "observe()\n          .map…> relationships[userId] }");
+        return F;
     }
 
     public final Observable<Map<Long, Integer>> observe(Collection<Long> collection) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, Integer>> q = observe().E(new StoreUserRelationships$observe$2(collection)).q();
+        Observable<Map<Long, Integer>> q = observe().F(new StoreUserRelationships$observe$2(collection)).q();
         m.checkNotNullExpressionValue(q, "observe()\n          .map…  .distinctUntilChanged()");
         return q;
     }
 
     public final Observable<Map<Long, Integer>> observeForType(int i) {
-        Observable<Map<Long, Integer>> q = observe().E(new StoreUserRelationships$observeForType$1(i)).q();
+        Observable<Map<Long, Integer>> q = observe().F(new StoreUserRelationships$observeForType$1(i)).q();
         m.checkNotNullExpressionValue(q, "observe()\n          .map…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings.java b/app/src/main/java/com/discord/stores/StoreUserSettings.java
index 211a92551e..a3b109719c 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettings.java
@@ -36,16 +36,16 @@ public final class StoreUserSettings extends Store {
     private final Persister<Boolean> allowAccessibilityDetectionPublisher;
     private final Persister<Boolean> allowAnimatedEmojisPublisher;
     private final Persister<Boolean> autoPlayGifsPublisher;
-    private final SerializedSubject<ModelCustomStatusSetting, ModelCustomStatusSetting> customStatusSubject = new SerializedSubject<>(BehaviorSubject.j0());
-    private final SerializedSubject<Boolean, Boolean> defaultGuildsRestrictedSubject = new SerializedSubject<>(BehaviorSubject.j0());
+    private final SerializedSubject<ModelCustomStatusSetting, ModelCustomStatusSetting> customStatusSubject = new SerializedSubject<>(BehaviorSubject.k0());
+    private final SerializedSubject<Boolean, Boolean> defaultGuildsRestrictedSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Dispatcher dispatcher;
     private Subscription expireCustomStatusSubscription;
-    private final SerializedSubject<Integer, Integer> explicitContentFilterSubject = new SerializedSubject<>(BehaviorSubject.j0());
-    private final SerializedSubject<Integer, Integer> friendDiscoveryFlagsSubject = new SerializedSubject<>(BehaviorSubject.k0(0));
-    private final SerializedSubject<ModelUserSettings.FriendSourceFlags, ModelUserSettings.FriendSourceFlags> friendSourceFlagsSubject = new SerializedSubject<>(BehaviorSubject.j0());
+    private final SerializedSubject<Integer, Integer> explicitContentFilterSubject = new SerializedSubject<>(BehaviorSubject.k0());
+    private final SerializedSubject<Integer, Integer> friendDiscoveryFlagsSubject = new SerializedSubject<>(BehaviorSubject.l0(0));
+    private final SerializedSubject<ModelUserSettings.FriendSourceFlags, ModelUserSettings.FriendSourceFlags> friendSourceFlagsSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Persister<List<ModelGuildFolder>> guildFoldersPublisher = new Persister<>("STORE_SETTINGS_FOLDERS_V1", new ArrayList());
     private final Persister<List<Long>> restrictedGuildIdsPublisher = new Persister<>("RESTRICTED_GUILD_IDS", new ArrayList());
-    private final SerializedSubject<Boolean, Boolean> shouldRenderEmbedsSubject = new SerializedSubject<>(BehaviorSubject.j0());
+    private final SerializedSubject<Boolean, Boolean> shouldRenderEmbedsSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Persister<Boolean> showCurrentGame;
     private final Persister<Integer> stickerAnimationSettingsPublisher;
     private final Persister<Boolean> stickerSuggestionsPublisher;
@@ -221,9 +221,9 @@ public final class StoreUserSettings extends Store {
         if (!m.areEqual(modelCustomStatusSetting, ModelCustomStatusSetting.Companion.getCLEAR())) {
             m.checkNotNull(modelCustomStatusSetting);
             if (modelCustomStatusSetting.getExpiresAt() != null) {
-                Observable<Long> c02 = Observable.c0(f.coerceAtLeast(TimeUtils.parseUTCDate(modelCustomStatusSetting.getExpiresAt()) - ClockFactory.get().currentTimeMillis(), 0), TimeUnit.MILLISECONDS);
-                m.checkNotNullExpressionValue(c02, "Observable\n            .…l, TimeUnit.MILLISECONDS)");
-                ObservableExtensionsKt.appSubscribe$default(c02, getClass(), (Context) null, new StoreUserSettings$updateLocalCustomStatus$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserSettings$updateLocalCustomStatus$2(this), 58, (Object) null);
+                Observable<Long> d02 = Observable.d0(f.coerceAtLeast(TimeUtils.parseUTCDate(modelCustomStatusSetting.getExpiresAt()) - ClockFactory.get().currentTimeMillis(), 0), TimeUnit.MILLISECONDS);
+                m.checkNotNullExpressionValue(d02, "Observable\n            .…l, TimeUnit.MILLISECONDS)");
+                ObservableExtensionsKt.appSubscribe$default(d02, getClass(), (Context) null, new StoreUserSettings$updateLocalCustomStatus$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserSettings$updateLocalCustomStatus$2(this), 58, (Object) null);
             }
         }
     }
@@ -308,9 +308,9 @@ public final class StoreUserSettings extends Store {
     }
 
     public final Observable<Consents> observeConsents() {
-        Observable<Consents> K = RestAPI.Companion.getApi().getConsents().K(StoreUserSettings$observeConsents$1.INSTANCE);
-        m.checkNotNullExpressionValue(K, "RestAPI\n          .api\n …turn { Consents.DEFAULT }");
-        return ObservableExtensionsKt.restSubscribeOn$default(K, false, 1, null);
+        Observable<Consents> L = RestAPI.Companion.getApi().getConsents().L(StoreUserSettings$observeConsents$1.INSTANCE);
+        m.checkNotNullExpressionValue(L, "RestAPI\n          .api\n …turn { Consents.DEFAULT }");
+        return ObservableExtensionsKt.restSubscribeOn$default(L, false, 1, null);
     }
 
     public final Observable<ModelCustomStatusSetting> observeCustomStatus() {
@@ -430,9 +430,9 @@ public final class StoreUserSettings extends Store {
     }
 
     public final Observable<ModelUserSettings> setIsAccessibilityDetectionAllowed(boolean z2) {
-        Observable<ModelUserSettings> s = RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithAllowAccessibilityDetection(Boolean.valueOf(z2))).s(new StoreUserSettings$setIsAccessibilityDetectionAllowed$1(this, z2));
-        m.checkNotNullExpressionValue(s, "RestAPI\n          .api\n …AccessibilityDetection) }");
-        return s;
+        Observable<ModelUserSettings> t = RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithAllowAccessibilityDetection(Boolean.valueOf(z2))).t(new StoreUserSettings$setIsAccessibilityDetectionAllowed$1(this, z2));
+        m.checkNotNullExpressionValue(t, "RestAPI\n          .api\n …AccessibilityDetection) }");
+        return t;
     }
 
     public final void setIsAnimatedEmojisEnabled(AppActivity appActivity, boolean z2) {
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
index e57786d506..1c265c646a 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
@@ -268,7 +268,7 @@ public final class StoreUserSettingsSystem extends StoreV2 {
     public final Observable<Settings> observeSettings(boolean z2) {
         Observable connectRx$default = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserSettingsSystem$observeSettings$1(this), 14, null);
         if (z2) {
-            connectRx$default = connectRx$default.N(1500, TimeUnit.MILLISECONDS);
+            connectRx$default = connectRx$default.O(1500, TimeUnit.MILLISECONDS);
         }
         Observable<Settings> q = connectRx$default.q();
         m.checkNotNullExpressionValue(q, "ObservationDeckProvider\n…  .distinctUntilChanged()");
diff --git a/app/src/main/java/com/discord/stores/StoreUserTyping.java b/app/src/main/java/com/discord/stores/StoreUserTyping.java
index 49c8ffb67e..26be9c195c 100644
--- a/app/src/main/java/com/discord/stores/StoreUserTyping.java
+++ b/app/src/main/java/com/discord/stores/StoreUserTyping.java
@@ -134,7 +134,7 @@ public final class StoreUserTyping extends StoreV2 {
     }
 
     public final Observable<Set<Long>> observeTypingUsers(long j) {
-        Observable<Set<Long>> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserTyping$observeTypingUsers$1(this), 14, null).E(new StoreUserTyping$observeTypingUsers$2(j)).q();
+        Observable<Set<Long>> q = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserTyping$observeTypingUsers$1(this), 14, null).F(new StoreUserTyping$observeTypingUsers$2(j)).q();
         m.checkNotNullExpressionValue(q, "observationDeck.connectR…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java b/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java
index 39c2d6c8a6..8a7d551d0a 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java
@@ -422,10 +422,10 @@ public final class StoreVoiceChannelSelected extends StoreV2 implements Dispatch
         if (channel != null && ChannelUtils.y(channel)) {
             StoreStream.Companion.getMediaEngine().setAudioInputEnabled(false);
         }
-        PublishSubject j0 = PublishSubject.j0();
-        this.dispatcher.schedule(new StoreVoiceChannelSelected$selectVoiceChannel$1(this, j, j0));
-        m.checkNotNullExpressionValue(j0, "resultSubject");
-        return j0;
+        PublishSubject k0 = PublishSubject.k0();
+        this.dispatcher.schedule(new StoreVoiceChannelSelected$selectVoiceChannel$1(this, j, k0));
+        m.checkNotNullExpressionValue(k0, "resultSubject");
+        return k0;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java
index 25ee234c6e..5de54d2528 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java
@@ -127,7 +127,7 @@ public final class StoreVoiceParticipants$get$1<T, R> implements b<Channel, Obse
                 for (T t : collection) {
                     arrayList.add(Long.valueOf(t.getId()));
                 }
-                return Observable.e(ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getVoiceSpeaking$app_productionGoogleRelease().observeSpeakingUsers(), 250, TimeUnit.MILLISECONDS), this.this$0.this$0.this$0.getStream().getCalls$app_productionGoogleRelease().get(this.this$0.this$0.$channelId).E(AnonymousClass1.INSTANCE), this.this$0.this$0.this$0.getStream().getVideoStreams$app_productionGoogleRelease().observeUserStreams(), ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getGuilds$app_productionGoogleRelease().observeComputed(this.this$0.$guildId), 1, TimeUnit.SECONDS), this.this$0.this$0.this$0.getStream().getApplicationStreaming$app_productionGoogleRelease().observeStreamSpectators(), this.this$0.this$0.this$0.getStream().getMediaSettings$app_productionGoogleRelease().getVoiceConfig(), StoreVoiceParticipants.access$getStreamContextsForUsers(this.this$0.this$0.this$0, u.plus((Collection<? extends Long>) arrayList, Long.valueOf(component1.getId()))), new AnonymousClass2(this, component1, collection));
+                return Observable.e(ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getVoiceSpeaking$app_productionGoogleRelease().observeSpeakingUsers(), 250, TimeUnit.MILLISECONDS), this.this$0.this$0.this$0.getStream().getCalls$app_productionGoogleRelease().get(this.this$0.this$0.$channelId).F(AnonymousClass1.INSTANCE), this.this$0.this$0.this$0.getStream().getVideoStreams$app_productionGoogleRelease().observeUserStreams(), ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getGuilds$app_productionGoogleRelease().observeComputed(this.this$0.$guildId), 1, TimeUnit.SECONDS), this.this$0.this$0.this$0.getStream().getApplicationStreaming$app_productionGoogleRelease().observeStreamSpectators(), this.this$0.this$0.this$0.getStream().getMediaSettings$app_productionGoogleRelease().getVoiceConfig(), StoreVoiceParticipants.access$getStreamContextsForUsers(this.this$0.this$0.this$0, u.plus((Collection<? extends Long>) arrayList, Long.valueOf(component1.getId()))), new AnonymousClass2(this, component1, collection));
             }
         }
 
@@ -149,7 +149,7 @@ public final class StoreVoiceParticipants$get$1<T, R> implements b<Channel, Obse
             StoreVoiceParticipants storeVoiceParticipants = this.this$0.this$0;
             Channel channel = this.$channel;
             m.checkNotNullExpressionValue(map, "voiceStates");
-            return Observable.j(observeMe$default, StoreVoiceParticipants.access$getOtherVoiceUsers(storeVoiceParticipants, channel, map), AnonymousClass1.INSTANCE).X(new AnonymousClass2(this, map));
+            return Observable.j(observeMe$default, StoreVoiceParticipants.access$getOtherVoiceUsers(storeVoiceParticipants, channel, map), AnonymousClass1.INSTANCE).Y(new AnonymousClass2(this, map));
         }
     }
 
@@ -163,6 +163,6 @@ public final class StoreVoiceParticipants$get$1<T, R> implements b<Channel, Obse
             return new j(h0.emptyMap());
         }
         long f = ChannelUtils.w(channel) ? 0 : channel.f();
-        return this.this$0.getStream().getVoiceStates$app_productionGoogleRelease().observe(f, channel.h()).X(new AnonymousClass1(this, channel, f));
+        return this.this$0.getStream().getVoiceStates$app_productionGoogleRelease().observe(f, channel.h()).Y(new AnonymousClass1(this, channel, f));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java
index 60abf479b3..637fc61d9d 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java
@@ -125,7 +125,7 @@ public final class StoreVoiceParticipants$getOtherVoiceUsers$1<T, R> implements
         public final Observable<? extends Collection<User>> call(List<Long> list) {
             StoreUser users = StoreStream.Companion.getUsers();
             m.checkNotNullExpressionValue(list, "otherMemberIds");
-            return users.observeUsers(list).s(new AnonymousClass1(this)).E(AnonymousClass2.INSTANCE);
+            return users.observeUsers(list).t(new AnonymousClass1(this)).F(AnonymousClass2.INSTANCE);
         }
     }
 
@@ -135,6 +135,6 @@ public final class StoreVoiceParticipants$getOtherVoiceUsers$1<T, R> implements
     }
 
     public final Observable<? extends Collection<User>> call(Long l) {
-        return StoreStream.Companion.getGuilds().observeComputed(this.$channel.f()).E(AnonymousClass1.INSTANCE).E(new AnonymousClass2(this, l)).X(new AnonymousClass3(this));
+        return StoreStream.Companion.getGuilds().observeComputed(this.$channel.f()).F(AnonymousClass1.INSTANCE).F(new AnonymousClass2(this, l)).Y(new AnonymousClass3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java b/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java
index b011293093..d2fdb93d56 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java
@@ -34,7 +34,7 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: StoreVoiceParticipants.kt */
 public final class StoreVoiceParticipants extends Store {
-    private final BehaviorSubject<Long> selectedParticipantSubject = BehaviorSubject.k0(0L);
+    private final BehaviorSubject<Long> selectedParticipantSubject = BehaviorSubject.l0(0L);
     private final StoreStream stream;
 
     /* compiled from: StoreVoiceParticipants.kt */
@@ -444,9 +444,9 @@ public final class StoreVoiceParticipants extends Store {
             m.checkNotNullExpressionValue(jVar, "Observable.just(channel.getRecipients())");
             return jVar;
         } else if (ChannelUtils.s(channel)) {
-            Observable<R> X = StoreStream.Companion.getUsers().observeMeId().X(new StoreVoiceParticipants$getOtherVoiceUsers$1(channel, map));
-            m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getUsers().observeMeId().Y(new StoreVoiceParticipants$getOtherVoiceUsers$1(channel, map));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+            return Y;
         } else {
             j jVar2 = new j(n.emptyList());
             m.checkNotNullExpressionValue(jVar2, "Observable.just(emptyList())");
@@ -465,9 +465,9 @@ public final class StoreVoiceParticipants extends Store {
     }
 
     public final Observable<Map<Long, VoiceUser>> get(long j) {
-        Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new StoreVoiceParticipants$get$1(this, j));
-        m.checkNotNullExpressionValue(X, "StoreStream\n        .get…  }\n          }\n        }");
-        Observable<Map<Long, VoiceUser>> q = ObservableExtensionsKt.computationLatest(X).q();
+        Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new StoreVoiceParticipants$get$1(this, j));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…  }\n          }\n        }");
+        Observable<Map<Long, VoiceUser>> q = ObservableExtensionsKt.computationLatest(Y).q();
         m.checkNotNullExpressionValue(q, "StoreStream\n        .get…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java b/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java
index 3ac4e97270..f6193cc4cc 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java
@@ -47,6 +47,6 @@ public final class StoreVoiceStates$observe$2<T, R> implements b<Map<Long, ? ext
     }
 
     public final Observable<? extends Map<Long, VoiceState>> call(Map<Long, VoiceState> map) {
-        return Observable.g0(new l0(Observable.z(map.values()).w(new AnonymousClass1(this)), AnonymousClass2.INSTANCE, l.INSTANCE));
+        return Observable.h0(new l0(Observable.A(map.values()).x(new AnonymousClass1(this)), AnonymousClass2.INSTANCE, l.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceStates.java b/app/src/main/java/com/discord/stores/StoreVoiceStates.java
index 69502e6f8c..2bfe16fcb4 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceStates.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceStates.java
@@ -195,7 +195,7 @@ public final class StoreVoiceStates extends StoreV2 {
     }
 
     public final Observable<Map<Long, VoiceState>> observe(long j, long j2) {
-        Observable<Map<Long, VoiceState>> q = observe(j).X(new StoreVoiceStates$observe$2(j2)).q();
+        Observable<Map<Long, VoiceState>> q = observe(j).Y(new StoreVoiceStates$observe$2(j2)).q();
         m.checkNotNullExpressionValue(q, "observe(guildId)\n       …  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/stores/updates/ObservationDeck.java b/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
index 3b10b5f34f..b95f960313 100644
--- a/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
+++ b/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
@@ -231,14 +231,14 @@ public final class ObservationDeck {
     }
 
     public final synchronized Observable<Unit> connectRx(UpdateSource[] updateSourceArr, boolean z2, Emitter.BackpressureMode backpressureMode, String str) {
-        Observable<Unit> u;
+        Observable<Unit> v;
         m.checkNotNullParameter(updateSourceArr, "updateSources");
         m.checkNotNullParameter(backpressureMode, "backpressureMode");
         Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
         ref$ObjectRef.element = null;
-        u = Observable.n(new ObservationDeck$connectRx$1(this, ref$ObjectRef, z2, str, updateSourceArr), backpressureMode).u(new ObservationDeck$connectRx$2(this, ref$ObjectRef));
-        m.checkNotNullExpressionValue(u, "Observable.create<Unit>(…rver?.let(::disconnect) }");
-        return u;
+        v = Observable.n(new ObservationDeck$connectRx$1(this, ref$ObjectRef, z2, str, updateSourceArr), backpressureMode).v(new ObservationDeck$connectRx$2(this, ref$ObjectRef));
+        m.checkNotNullExpressionValue(v, "Observable.create<Unit>(…rver?.let(::disconnect) }");
+        return v;
     }
 
     public final synchronized <T> Observable<T> connectRx(UpdateSource[] updateSourceArr, boolean z2, Emitter.BackpressureMode backpressureMode, String str, Function0<? extends T> function0) {
@@ -246,7 +246,7 @@ public final class ObservationDeck {
         m.checkNotNullParameter(updateSourceArr, "updateSources");
         m.checkNotNullParameter(backpressureMode, "backpressureMode");
         m.checkNotNullParameter(function0, "generator");
-        observable = (Observable<T>) connectRx((UpdateSource[]) Arrays.copyOf(updateSourceArr, updateSourceArr.length), z2, backpressureMode, str).E(new ObservationDeck$connectRx$3(function0));
+        observable = (Observable<T>) connectRx((UpdateSource[]) Arrays.copyOf(updateSourceArr, updateSourceArr.length), z2, backpressureMode, str).F(new ObservationDeck$connectRx$3(function0));
         m.checkNotNullExpressionValue(observable, "connectRx(\n        *upda…    ).map { generator() }");
         return observable;
     }
diff --git a/app/src/main/java/com/discord/stores/utilities/Batched.java b/app/src/main/java/com/discord/stores/utilities/Batched.java
index b10a8d67f7..04b144f4d8 100644
--- a/app/src/main/java/com/discord/stores/utilities/Batched.java
+++ b/app/src/main/java/com/discord/stores/utilities/Batched.java
@@ -48,7 +48,7 @@ public final class Batched<T> {
         this.maxDebounceDelayMs = j2;
         this.scope = coroutineScope;
         this.clock = clock;
-        this.subject = new SerializedSubject<>(BehaviorSubject.j0());
+        this.subject = new SerializedSubject<>(BehaviorSubject.k0());
         this.queue = new ArrayList();
         this.queueStartTime = -1;
     }
diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$2.java b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$2.java
index 140a289f80..b282863202 100644
--- a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$2.java
+++ b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$2.java
@@ -30,7 +30,7 @@ public final class RestCallStateKt$logNetworkAction$2<T> implements Action1<Resp
         m.checkNotNullExpressionValue(response, "response");
         if (response.a()) {
             Request request = RestCallStateKt.getRequest(response);
-            if (GrowthTeamFeatures.INSTANCE.isNetworkActionLoggingEnabled() && (schema = RestCallStateKt.getSchema(this.$networkActionProvider, new TrackNetworkMetadata(request.b.l, request.f3127c, Long.valueOf((long) response.a.l), null, null, 24), response.b)) != null) {
+            if (GrowthTeamFeatures.INSTANCE.isNetworkActionLoggingEnabled() && (schema = RestCallStateKt.getSchema(this.$networkActionProvider, new TrackNetworkMetadata(request.b.l, request.f3125c, Long.valueOf((long) response.a.l), null, null, 24), response.b)) != null) {
                 this.$tracker.track(schema);
                 return;
             }
diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$3.java b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$3.java
index 6db9733b37..849210247c 100644
--- a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$3.java
+++ b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$logNetworkAction$3.java
@@ -32,7 +32,7 @@ public final class RestCallStateKt$logNetworkAction$3<T> implements Action1<Thro
                 Response<?> response = httpException.i;
                 if (!(response == null || (request = RestCallStateKt.getRequest(response)) == null)) {
                     String str = request.b.l;
-                    String str2 = request.f3127c;
+                    String str2 = request.f3125c;
                     Response<?> response2 = httpException.i;
                     Long valueOf = response2 != null ? Long.valueOf((long) response2.a.l) : null;
                     Response<?> response3 = httpException.i;
diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java
index 949e3c064e..57d892c26e 100644
--- a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java
+++ b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java
@@ -81,12 +81,12 @@ public final class RestCallStateKt {
         m.checkNotNullParameter(observable, "$this$logNetworkAction");
         m.checkNotNullParameter(function1, "networkActionProvider");
         if (TestUtilsKt.getIS_JUNIT_TEST()) {
-            Observable<T> observable2 = (Observable<T>) observable.E(RestCallStateKt$logNetworkAction$1.INSTANCE);
+            Observable<T> observable2 = (Observable<T>) observable.F(RestCallStateKt$logNetworkAction$1.INSTANCE);
             m.checkNotNullExpressionValue(observable2, "map { it.body() }");
             return observable2;
         }
         AnalyticsUtils.Tracker tracker = AnalyticsTracker.INSTANCE.getTracker();
-        Observable<T> observable3 = (Observable<T>) observable.s(new RestCallStateKt$logNetworkAction$2(function1, tracker)).r(new RestCallStateKt$logNetworkAction$3(function1, tracker)).E(RestCallStateKt$logNetworkAction$4.INSTANCE);
+        Observable<T> observable3 = (Observable<T>) observable.t(new RestCallStateKt$logNetworkAction$2(function1, tracker)).s(new RestCallStateKt$logNetworkAction$3(function1, tracker)).F(RestCallStateKt$logNetworkAction$4.INSTANCE);
         m.checkNotNullExpressionValue(observable3, "doOnNext { response ->\n …rectly.\n    it.body()\n  }");
         return observable3;
     }
diff --git a/app/src/main/java/com/discord/tooltips/TooltipManager.java b/app/src/main/java/com/discord/tooltips/TooltipManager.java
index bba3e1bb6a..67bd39fa1f 100644
--- a/app/src/main/java/com/discord/tooltips/TooltipManager.java
+++ b/app/src/main/java/com/discord/tooltips/TooltipManager.java
@@ -31,7 +31,7 @@ public class TooltipManager {
     public final c.a.v.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<String> f2604c;
+    public final Set<String> f2602c;
     public final int d;
     public final c.a.j.a e;
 
@@ -41,7 +41,7 @@ public class TooltipManager {
         public static final Lazy b = g.lazy(C0292a.i);
 
         /* renamed from: c  reason: collision with root package name */
-        public static final Lazy f2605c = g.lazy(b.i);
+        public static final Lazy f2603c = g.lazy(b.i);
         public static final a d = null;
 
         /* compiled from: TooltipManager.kt */
@@ -109,7 +109,7 @@ public class TooltipManager {
         m.checkNotNullParameter(set, "shownTooltipNames");
         m.checkNotNullParameter(aVar2, "floatingViewManager");
         this.b = aVar;
-        this.f2604c = set;
+        this.f2602c = set;
         this.d = i;
         this.e = aVar2;
         aVar2.a = new e(this);
@@ -146,8 +146,8 @@ public class TooltipManager {
             Objects.requireNonNull(aVar);
             m.checkNotNullParameter(cacheKey, "tooltipCacheKey");
             boolean z3 = aVar.a.getBoolean(cacheKey, false);
-            boolean contains = this.f2604c.contains(bVar.getTooltipName());
-            int size = this.f2604c.size();
+            boolean contains = this.f2602c.contains(bVar.getTooltipName());
+            int size = this.f2602c.size();
             if (z3) {
                 return false;
             }
@@ -176,7 +176,7 @@ public class TooltipManager {
         m.checkNotNullParameter(observable, "componentPausedObservable");
         if (b(bVar, z2)) {
             c(bVar);
-            this.f2604c.add(bVar.getTooltipName());
+            this.f2602c.add(bVar.getTooltipName());
             this.a.put(bVar.getTooltipName(), Integer.valueOf(view2.getId()));
             c.a.j.a aVar = this.e;
             Objects.requireNonNull(aVar);
@@ -202,7 +202,7 @@ public class TooltipManager {
             f fVar = new f(aVar, view2, view, floatingViewGravity, i, i2);
             viewGroup.getViewTreeObserver().addOnPreDrawListener(fVar);
             aVar.b.put(Integer.valueOf(view2.getId()), new a.C0028a(view2, viewGroup, fVar));
-            observable.Y(1).V(new d(aVar, view2), new c.a.j.e(aVar));
+            observable.Z(1).W(new d(aVar, view2), new c.a.j.e(aVar));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java b/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java
index 9b229c5d46..aa6bb713ee 100644
--- a/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java
+++ b/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java
@@ -77,6 +77,6 @@ public final class ShareUtils$updateDirectShareTargets$4<T, R> implements b<List
         while (it.hasNext()) {
             linkedHashSet.add(new MGImagesBitmap.ImageRequest((String) it.next().getSecond(), false));
         }
-        return MGImagesBitmap.getBitmaps(linkedHashSet).E(new AnonymousClass2(this)).E(new AnonymousClass3(list));
+        return MGImagesBitmap.getBitmaps(linkedHashSet).F(new AnonymousClass2(this)).F(new AnonymousClass3(list));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/ShareUtils.java b/app/src/main/java/com/discord/utilities/ShareUtils.java
index 2d5436eeaf..17726c1226 100644
--- a/app/src/main/java/com/discord/utilities/ShareUtils.java
+++ b/app/src/main/java/com/discord/utilities/ShareUtils.java
@@ -219,18 +219,18 @@ public final class ShareUtils {
         int dpToPixels = DimenUtils.dpToPixels(72);
         int dpToPixels2 = DimenUtils.dpToPixels(108);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable E = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getChannels().observeDirectShareCandidates(context), 0, false, 1, null).E(ShareUtils$updateDirectShareTargets$1.INSTANCE);
-        Observable<Map<Long, Channel>> w2 = companion.getChannels().observeGuildAndPrivateChannels().w(ShareUtils$updateDirectShareTargets$2.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "StoreStream\n            …ilter { it.isNotEmpty() }");
-        Observable j = Observable.j(E, ObservableExtensionsKt.takeSingleUntilTimeout$default(w2, 0, false, 1, null), new ShareUtils$updateDirectShareTargets$3(context));
+        Observable F = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getChannels().observeDirectShareCandidates(context), 0, false, 1, null).F(ShareUtils$updateDirectShareTargets$1.INSTANCE);
+        Observable<Map<Long, Channel>> x2 = companion.getChannels().observeGuildAndPrivateChannels().x(ShareUtils$updateDirectShareTargets$2.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "StoreStream\n            …ilter { it.isNotEmpty() }");
+        Observable j = Observable.j(F, ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, false, 1, null), new ShareUtils$updateDirectShareTargets$3(context));
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…o to icon }\n      }\n    }");
-        Observable y2 = ObservableExtensionsKt.computationLatest(j).y(new ShareUtils$updateDirectShareTargets$4(dpToPixels, dpToPixels2));
-        m.checkNotNullExpressionValue(y2, "Observable.combineLatest…riPairs to it }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(y2), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$5(context), 60, (Object) null);
+        Observable z2 = ObservableExtensionsKt.computationLatest(j).z(new ShareUtils$updateDirectShareTargets$4(dpToPixels, dpToPixels2));
+        m.checkNotNullExpressionValue(z2, "Observable.combineLatest…riPairs to it }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(z2), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$5(context), 60, (Object) null);
         if (Build.VERSION.SDK_INT >= 25) {
-            Observable<Map<Long, Channel>> w3 = companion.getChannels().observeGuildAndPrivateChannels().w(ShareUtils$updateDirectShareTargets$6.INSTANCE);
-            m.checkNotNullExpressionValue(w3, "StoreStream.getChannels(…ilter { it.isNotEmpty() }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(w3, 0, false, 1, null)), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$7((ShortcutManager) context.getSystemService(ShortcutManager.class), context), 60, (Object) null);
+            Observable<Map<Long, Channel>> x3 = companion.getChannels().observeGuildAndPrivateChannels().x(ShareUtils$updateDirectShareTargets$6.INSTANCE);
+            m.checkNotNullExpressionValue(x3, "StoreStream.getChannels(…ilter { it.isNotEmpty() }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(x3, 0, false, 1, null)), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$7((ShortcutManager) context.getSystemService(ShortcutManager.class), context), 60, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java
index ff070cd496..8448a71924 100644
--- a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java
+++ b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java
@@ -31,6 +31,6 @@ public final class AccessibilityMonitor$handleInitialState$1 implements Accessib
 
     @Override // android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener
     public final void onAccessibilityStateChanged(boolean z2) {
-        new j(Unit.a).p(200, TimeUnit.MILLISECONDS).U(new AnonymousClass1(this, z2));
+        new j(Unit.a).p(200, TimeUnit.MILLISECONDS).V(new AnonymousClass1(this, z2));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java
index 9a926ebff5..9415248595 100644
--- a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java
+++ b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java
@@ -54,7 +54,7 @@ public final class AccessibilityMonitor {
     public AccessibilityMonitor() {
         AccessibilityState accessibilityState = new AccessibilityState(null, 1, null);
         this.accessibilityState = accessibilityState;
-        this.accessibilityStateSubject = new SerializedSubject<>(BehaviorSubject.k0(accessibilityState));
+        this.accessibilityStateSubject = new SerializedSubject<>(BehaviorSubject.l0(accessibilityState));
     }
 
     public static final /* synthetic */ Lazy access$getINSTANCE$cp() {
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 e8de52f017..de516778dc 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
@@ -271,13 +271,13 @@ public final class AnalyticsTracker {
     public static final void addAttachment(String str, String str2, int i) {
         m.checkNotNullParameter(str, "source");
         m.checkNotNullParameter(str2, "mimeType");
-        Observable<Channel> Y = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().Y(1);
-        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…hannel()\n        .take(1)");
-        Observable<R> E = Y.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable E2 = E.E(new AnalyticsTracker$addAttachment$1(str, str2, i));
-        m.checkNotNullExpressionValue(E2, "StoreStream\n        .get…+ it.properties\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(E2), INSTANCE.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnalyticsTracker$addAttachment$2.INSTANCE, 62, (Object) null);
+        Observable<Channel> Z = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().Z(1);
+        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…hannel()\n        .take(1)");
+        Observable<R> F = Z.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable F2 = F.F(new AnalyticsTracker$addAttachment$1(str, str2, i));
+        m.checkNotNullExpressionValue(F2, "StoreStream\n        .get…+ it.properties\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(F2), INSTANCE.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnalyticsTracker$addAttachment$2.INSTANCE, 62, (Object) null);
     }
 
     private final void addVoiceConnectionProperties(Map<String, Object> map, Channel channel, String str) {
@@ -452,13 +452,13 @@ public final class AnalyticsTracker {
     private final Observable<Map<String, Object>> getGameProperties(long j) {
         StoreStream.Companion companion = StoreStream.Companion;
         Observable<Presence> observeLocalPresence = companion.getPresences().observeLocalPresence();
-        Observable<R> E = companion.getPresences().observePresenceForUser(j).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable j2 = Observable.j(observeLocalPresence, E, AnalyticsTracker$getGameProperties$1.INSTANCE);
+        Observable<R> F = companion.getPresences().observePresenceForUser(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable j2 = Observable.j(observeLocalPresence, F, AnalyticsTracker$getGameProperties$1.INSTANCE);
         m.checkNotNullExpressionValue(j2, "Observable\n        .comb…\n            })\n        )");
-        Observable<Map<String, Object>> E2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j2, 0, false, 3, null).E(AnalyticsTracker$getGameProperties$2.INSTANCE);
-        m.checkNotNullExpressionValue(E2, "Observable\n        .comb…NonNullValues()\n        }");
-        return E2;
+        Observable<Map<String, Object>> F2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j2, 0, false, 3, null).F(AnalyticsTracker$getGameProperties$2.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "Observable\n        .comb…NonNullValues()\n        }");
+        return F2;
     }
 
     private final String getNetworkTypeAnalyticsValue(Integer num) {
@@ -1223,7 +1223,7 @@ public final class AnalyticsTracker {
 
     public final void echoCancellationConfigured(MediaEngine.EchoCancellationInfo echoCancellationInfo) {
         m.checkNotNullParameter(echoCancellationInfo, "info");
-        tracker.track("native_echo_cancellation_configured", h0.mapOf(o.to("builtin_aec_supported_java", Boolean.valueOf(echoCancellationInfo.f2590c)), o.to("builtin_aec_supported_native", Boolean.valueOf(echoCancellationInfo.b)), o.to("builtin_aec_requested", Boolean.valueOf(echoCancellationInfo.a)), o.to("builtin_aec_enabled", Boolean.valueOf(echoCancellationInfo.d)), o.to("aec_enabled_in_settings", Boolean.valueOf(echoCancellationInfo.e)), o.to("aec_enabled_in_native_config", Boolean.valueOf(echoCancellationInfo.f)), o.to("aec_mobile_mode", Boolean.valueOf(echoCancellationInfo.g)), o.to("aec_enabled_by_default", Boolean.valueOf(echoCancellationInfo.h)), o.to("aec_mobile_mode_by_default", Boolean.valueOf(echoCancellationInfo.i))));
+        tracker.track("native_echo_cancellation_configured", h0.mapOf(o.to("builtin_aec_supported_java", Boolean.valueOf(echoCancellationInfo.f2588c)), o.to("builtin_aec_supported_native", Boolean.valueOf(echoCancellationInfo.b)), o.to("builtin_aec_requested", Boolean.valueOf(echoCancellationInfo.a)), o.to("builtin_aec_enabled", Boolean.valueOf(echoCancellationInfo.d)), o.to("aec_enabled_in_settings", Boolean.valueOf(echoCancellationInfo.e)), o.to("aec_enabled_in_native_config", Boolean.valueOf(echoCancellationInfo.f)), o.to("aec_mobile_mode", Boolean.valueOf(echoCancellationInfo.g)), o.to("aec_enabled_by_default", Boolean.valueOf(echoCancellationInfo.h)), o.to("aec_mobile_mode_by_default", Boolean.valueOf(echoCancellationInfo.i))));
     }
 
     public final void emojiCategorySelected(long j) {
@@ -1503,9 +1503,9 @@ public final class AnalyticsTracker {
             arrayList2.add(Long.valueOf(user2.getId()));
         }
         listArr[1] = arrayList2;
-        Observable<R> E = StoreStream.Companion.getUserRelationships().observe(u.distinct(c0.t.o.flatten(n.listOf((Object[]) listArr)))).E(AnalyticsTracker$inviteSuggestionOpened$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get…         }.keys\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(E, 0, false, 3, null)), AnalyticsTracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsTracker$inviteSuggestionOpened$2(list, list2, j), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getUserRelationships().observe(u.distinct(c0.t.o.flatten(n.listOf((Object[]) listArr)))).F(AnalyticsTracker$inviteSuggestionOpened$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…         }.keys\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null)), AnalyticsTracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsTracker$inviteSuggestionOpened$2(list, list2, j), 62, (Object) null);
     }
 
     public final void joinGuildViewed() {
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
index f706bbd35c..14be2c2bca 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
@@ -171,9 +171,9 @@ public final class AnalyticsUtils {
         public final void track(Science.Event event) {
             m.checkNotNullParameter(event, "event");
             this.eventsQueue.add(event);
-            Observable<Long> c02 = Observable.c0(1500, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable\n          .ti…0, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(c02, Tracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsUtils$Tracker$track$1(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(1500, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…0, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, Tracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsUtils$Tracker$track$1(this), 62, (Object) null);
         }
 
         public final void track(String str, Map<String, ? extends Object> map) {
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java
index dc064df32e..f11176167f 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java
@@ -80,7 +80,7 @@ public final class GoogleSmartLockManager$saveCredentials$1 extends o implements
         UserUtils userUtils = UserUtils.INSTANCE;
         m.checkNotNullExpressionValue(meUser, "it");
         aVar.b = UserUtils.getUserNameWithDiscriminator$default(userUtils, meUser, null, null, 3, null).toString();
-        aVar.f2792c = Uri.parse(forUser$default);
+        aVar.f2790c = Uri.parse(forUser$default);
         Credential a = aVar.a();
         CredentialsClient access$getCredentialsClient$p = GoogleSmartLockManager.access$getCredentialsClient$p(this.this$0);
         Objects.requireNonNull(access$getCredentialsClient$p);
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
index 226dce7aa1..086cc88fce 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
@@ -78,19 +78,19 @@ public final class GoogleSmartLockManager {
     public static final class SmartLockCredentials {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2606id;
+        private final String f2604id;
         private final String password;
 
         public SmartLockCredentials(String str, String str2) {
             m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(str2, "password");
-            this.f2606id = str;
+            this.f2604id = str;
             this.password = str2;
         }
 
         public static /* synthetic */ SmartLockCredentials copy$default(SmartLockCredentials smartLockCredentials, String str, String str2, int i, Object obj) {
             if ((i & 1) != 0) {
-                str = smartLockCredentials.f2606id;
+                str = smartLockCredentials.f2604id;
             }
             if ((i & 2) != 0) {
                 str2 = smartLockCredentials.password;
@@ -99,7 +99,7 @@ public final class GoogleSmartLockManager {
         }
 
         public final String component1() {
-            return this.f2606id;
+            return this.f2604id;
         }
 
         public final String component2() {
@@ -120,11 +120,11 @@ public final class GoogleSmartLockManager {
                 return false;
             }
             SmartLockCredentials smartLockCredentials = (SmartLockCredentials) obj;
-            return m.areEqual(this.f2606id, smartLockCredentials.f2606id) && m.areEqual(this.password, smartLockCredentials.password);
+            return m.areEqual(this.f2604id, smartLockCredentials.f2604id) && m.areEqual(this.password, smartLockCredentials.password);
         }
 
         public final String getId() {
-            return this.f2606id;
+            return this.f2604id;
         }
 
         public final String getPassword() {
@@ -132,7 +132,7 @@ public final class GoogleSmartLockManager {
         }
 
         public int hashCode() {
-            String str = this.f2606id;
+            String str = this.f2604id;
             int i = 0;
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.password;
@@ -144,7 +144,7 @@ public final class GoogleSmartLockManager {
 
         public String toString() {
             StringBuilder O = a.O("SmartLockCredentials(id=");
-            O.append(this.f2606id);
+            O.append(this.f2604id);
             O.append(", password=");
             return a.G(O, this.password, ")");
         }
@@ -266,9 +266,9 @@ public final class GoogleSmartLockManager {
         m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "password");
         if (this.smartLockRepo.getEnabled()) {
-            Observable Y = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Y(1);
-            m.checkNotNullExpressionValue(Y, "StoreStream.getUsers().observeMe().take(1)");
-            ObservableExtensionsKt.appSubscribe$default(Y, GoogleSmartLockManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GoogleSmartLockManager$saveCredentials$1(this, str, str2), 62, (Object) null);
+            Observable Z = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Z(1);
+            m.checkNotNullExpressionValue(Z, "StoreStream.getUsers().observeMe().take(1)");
+            ObservableExtensionsKt.appSubscribe$default(Z, GoogleSmartLockManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GoogleSmartLockManager$saveCredentials$1(this, str, str2), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
index 91f518e370..da12f7300d 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
@@ -121,16 +121,16 @@ public final class GoogleSmartLockRepo {
     public GoogleSmartLockRepo(StoreExperiments storeExperiments, StoreAuthentication storeAuthentication) {
         m.checkNotNullParameter(storeExperiments, "storeExperiments");
         m.checkNotNullParameter(storeAuthentication, "storeAuth");
-        PublishSubject<GoogleSmartLockManager.SmartLockCredentials> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.smartLockLogin = j0;
+        PublishSubject<GoogleSmartLockManager.SmartLockCredentials> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.smartLockLogin = k0;
         this.smartLockLoginAttempt = new SmartLockSignInAttempt(false, false, 3, null);
         this.enabled = true;
-        Observable<R> E = storeExperiments.observeUserExperiment("2021-01_google_smart_lock", true).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable E2 = E.E(AnonymousClass1.INSTANCE);
-        m.checkNotNullExpressionValue(E2, "storeExperiments.observe…experiment?.bucket == 1 }");
-        ObservableExtensionsKt.appSubscribe$default(E2, GoogleSmartLockRepo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable<R> F = storeExperiments.observeUserExperiment("2021-01_google_smart_lock", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable F2 = F.F(AnonymousClass1.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "storeExperiments.observe…experiment?.bucket == 1 }");
+        ObservableExtensionsKt.appSubscribe$default(F2, GoogleSmartLockRepo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(storeAuthentication.getPreLogoutSignal$app_productionGoogleRelease(), GoogleSmartLockRepo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java b/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
index 61a76fe594..9a9a5bf1d7 100644
--- a/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
+++ b/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
@@ -308,9 +308,9 @@ public final class GooglePlayBillingManager implements e, b, g, d {
     private final void reconnect() {
         if (isReconnecting.compareAndSet(false, true)) {
             long j = backoffTimeMs.get();
-            Observable<Long> c02 = Observable.c0(j, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable\n          .ti…s, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(c02, GooglePlayBillingManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GooglePlayBillingManager$reconnect$1(j), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(j, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…s, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, GooglePlayBillingManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GooglePlayBillingManager$reconnect$1(j), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java b/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
index dbdb150305..4c0a034e95 100644
--- a/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
+++ b/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
@@ -119,7 +119,7 @@ public final class BugReportManager {
     }
 
     public final void setupSubscriptions() {
-        Observable q = this.storeUser.observeMe(true).E(BugReportManager$setupSubscriptions$1.INSTANCE).q();
+        Observable q = this.storeUser.observeMe(true).F(BugReportManager$setupSubscriptions$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "storeUser.observeMe(emit… }.distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(q, BugReportManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportManager$setupSubscriptions$2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
index 74b3ef5e06..2bc7d9368c 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
@@ -145,7 +145,7 @@ public final class CaptchaHelper$tryShowCaptcha$1<T> implements Action1<Emitter<
             builder.a = siteKey;
             builder.l = StoreStream.Companion.getUserSettingsSystem().getLocale();
             builder.k = true;
-            Boolean bool = builder.f2899c;
+            Boolean bool = builder.f2897c;
             if (!builder.b) {
                 bool = HCaptchaConfig.access$000();
             }
@@ -182,7 +182,7 @@ public final class CaptchaHelper$tryShowCaptcha$1<T> implements Action1<Emitter<
         } else if (captchaRequest instanceof CaptchaHelper.CaptchaRequest.ReCaptcha) {
             Activity activity2 = ((CaptchaHelper.CaptchaRequest.ReCaptcha) captchaRequest).getActivity();
             CaptchaHelper captchaHelper = CaptchaHelper.INSTANCE;
-            Object obj = GoogleApiAvailability.f2799c;
+            Object obj = GoogleApiAvailability.f2797c;
             GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
             m.checkNotNullExpressionValue(googleApiAvailability, "GoogleApiAvailability\n              .getInstance()");
             CaptchaHelper.access$ensurePlayServicesAvailable(captchaHelper, googleApiAvailability, activity2, new AnonymousClass3(activity2, emitter, captchaHelper$tryShowCaptcha$1$errorHandler$1), captchaHelper$tryShowCaptcha$1$errorHandler$1);
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java
index f06f102981..84114adf21 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java
@@ -113,9 +113,9 @@ public final class ChannelSelector {
 
     public final void findAndSet(Context context, long j) {
         if (j > 0) {
-            Observable w2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stream.getChannels$app_productionGoogleRelease(), this.stream.getPermissions$app_productionGoogleRelease()}, false, null, null, new ChannelSelector$findAndSet$1(this, j, context), 14, null).w(ChannelSelector$findAndSet$2.INSTANCE);
-            m.checkNotNullExpressionValue(w2, "observationDeck\n        …   .filter { it != null }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(w2, 0, true, 1, null)), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$findAndSet$3(this), 62, (Object) null);
+            Observable x2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stream.getChannels$app_productionGoogleRelease(), this.stream.getPermissions$app_productionGoogleRelease()}, false, null, null, new ChannelSelector$findAndSet$1(this, j, context), 14, null).x(ChannelSelector$findAndSet$2.INSTANCE);
+            m.checkNotNullExpressionValue(x2, "observationDeck\n        …   .filter { it != null }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, true, 1, null)), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$findAndSet$3(this), 62, (Object) null);
         }
     }
 
@@ -150,9 +150,9 @@ public final class ChannelSelector {
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(jVar), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$selectChannel$1(this, j, j2, l, selectedChannelAnalyticsLocation), 62, (Object) null);
             return;
         }
-        Observable<R> E = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j2).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(E, 0, false, 3, null), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$selectChannel$2(this, j, j2, l, selectedChannelAnalyticsLocation), 62, (Object) null);
+        Observable<R> F = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j2).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$selectChannel$2(this, j, j2, l, selectedChannelAnalyticsLocation), 62, (Object) null);
     }
 
     public final void selectChannel(Channel channel, Long l, SelectedChannelAnalyticsLocation selectedChannelAnalyticsLocation) {
diff --git a/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java b/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java
index 3ac4bb3e6d..2a86c0f5b7 100644
--- a/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java
+++ b/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java
@@ -57,8 +57,8 @@ public final class ChannelPermissionsAddMemberUtils {
             }
             arrayList.add(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updatePermissionOverwrites(j, longValue, channelPermissionOverwrites), false, 1, null));
         }
-        Observable<List<Void>> e02 = Observable.l(Observable.g0(new q(arrayList))).e0();
-        m.checkNotNullExpressionValue(e02, "Observable.concat(overwr…quests)\n        .toList()");
-        return e02;
+        Observable<List<Void>> f02 = Observable.l(Observable.h0(new q(arrayList))).f0();
+        m.checkNotNullExpressionValue(f02, "Observable.concat(overwr…quests)\n        .toList()");
+        return f02;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java b/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java
index d4e4d94383..71fc8758c7 100644
--- a/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java
+++ b/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java
@@ -47,23 +47,23 @@ public final class ColorPickerUtils {
         m.checkNotNullExpressionValue(resources, "context.resources");
         kVar.g = getColorsToDisplayForPicker(resources, i2);
         kVar.a = i;
-        kVar.f2907r = ColorCompat.getThemedColor(context, (int) R.attr.colorHeaderPrimary);
+        kVar.f2905r = ColorCompat.getThemedColor(context, (int) R.attr.colorHeaderPrimary);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f2909x = fontUtils.getThemedFontResId(context, R.attr.font_display_bold);
+        kVar.f2907x = fontUtils.getThemedFontResId(context, R.attr.font_display_bold);
         kVar.o = ColorCompat.getThemedColor(context, (int) R.attr.colorBackgroundAccent);
-        kVar.f2906c = R.string.color_picker_custom;
+        kVar.f2904c = R.string.color_picker_custom;
         kVar.v = ColorCompat.getColor(context, (int) R.color.white);
         kVar.b = R.string.color_picker_presets;
         kVar.p = ColorCompat.getThemedColor(context, (int) R.attr.color_brand);
         kVar.d = R.string.select;
         kVar.l = true;
         kVar.e = R.string.reset;
-        kVar.f2908w = ColorCompat.getColor(context, (int) R.color.white);
-        kVar.f2910y = fontUtils.getThemedFontResId(context, R.attr.font_primary_semibold);
+        kVar.f2906w = ColorCompat.getColor(context, (int) R.color.white);
+        kVar.f2908y = fontUtils.getThemedFontResId(context, R.attr.font_primary_semibold);
         kVar.q = ColorCompat.getThemedColor(context, (int) R.attr.colorBackgroundModifierAccent);
         kVar.t = ColorCompat.getThemedColor(context, (int) R.attr.colorTextMuted);
         kVar.u = R.drawable.drawable_cpv_edit_text_background;
-        kVar.f2911z = fontUtils.getThemedFontResId(context, R.attr.font_primary_normal);
+        kVar.f2909z = fontUtils.getThemedFontResId(context, R.attr.font_primary_normal);
         ColorPickerDialog a = kVar.a();
         m.checkNotNullExpressionValue(a, "ColorPickerDialog.newBui…mal))\n          .create()");
         return a;
diff --git a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java
index ece61c23ee..09d56e2359 100644
--- a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java
+++ b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java
@@ -25,7 +25,7 @@ public final class RepresentativeColors<T> {
     private static final int BLURPLE = Color.parseColor("#5865f2");
     public static final Companion Companion = new Companion(null);
     private final HashMap<T, Integer> representativeColors = new HashMap<>();
-    private final BehaviorSubject<Map<T, Integer>> representativeColorsSubject = BehaviorSubject.j0();
+    private final BehaviorSubject<Map<T, Integer>> representativeColorsSubject = BehaviorSubject.k0();
 
     /* compiled from: RepresentativeColors.kt */
     public static final class Companion {
@@ -222,7 +222,7 @@ public final class RepresentativeColors<T> {
     }
 
     public final Observable<Integer> observeRepresentativeColor(T t) {
-        Observable<Integer> q = this.representativeColorsSubject.E(new RepresentativeColors$observeRepresentativeColor$1(t)).q();
+        Observable<Integer> q = this.representativeColorsSubject.F(new RepresentativeColors$observeRepresentativeColor$1(t)).q();
         m.checkNotNullExpressionValue(q, "representativeColorsSubj…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java
index d79bf18418..11045fe7a5 100644
--- a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java
@@ -11,9 +11,9 @@ import rx.Observable;
 /* compiled from: RxCoroutineExtensions.kt */
 public final class RxCoroutineExtensionsKt {
     public static final <T> Object appAwaitFirst(Observable<T> observable, Context context, Continuation<? super T> continuation) {
-        Observable<T> x2 = observable.x();
-        m.checkNotNullExpressionValue(x2, "first()");
-        return appAwaitSingle(x2, context, continuation);
+        Observable<T> y2 = observable.y();
+        m.checkNotNullExpressionValue(y2, "first()");
+        return appAwaitSingle(y2, context, continuation);
     }
 
     public static /* synthetic */ Object appAwaitFirst$default(Observable observable, Context context, Continuation continuation, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java b/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java
index d2d1151116..8e4ef2d9f0 100644
--- a/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java
+++ b/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java
@@ -22,11 +22,11 @@ public final class RtcCameraConfig {
     }
 
     private final Observable<Experiment> observeExperiment(StoreExperiments storeExperiments) {
-        Observable<R> E = storeExperiments.observeUserExperiment("2021-02_android_webrtc_camera2", true).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable Y = E.Y(1);
-        m.checkNotNullExpressionValue(Y, "storeExperiments.observe…Null()\n          .take(1)");
-        return ObservableExtensionsKt.computationLatest(Y);
+        Observable<R> F = storeExperiments.observeUserExperiment("2021-02_android_webrtc_camera2", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "storeExperiments.observe…Null()\n          .take(1)");
+        return ObservableExtensionsKt.computationLatest(Z);
     }
 
     @AnyThread
diff --git a/app/src/main/java/com/discord/utilities/error/Error.java b/app/src/main/java/com/discord/utilities/error/Error.java
index 0a9bc280c6..94490d04d5 100644
--- a/app/src/main/java/com/discord/utilities/error/Error.java
+++ b/app/src/main/java/com/discord/utilities/error/Error.java
@@ -564,7 +564,7 @@ public class Error {
             retrofit2.Response<?> response2 = httpException.i;
             if (response2 != null) {
                 headers = response2.a.n;
-                ResponseBody responseBody = response2.f3151c;
+                ResponseBody responseBody = response2.f3149c;
                 if (responseBody != null) {
                     MediaType b = responseBody.b();
                     str2 = b != null ? b.d : str5;
diff --git a/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java b/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java
index bbdb5506f8..a47ba4f888 100644
--- a/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java
+++ b/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java
@@ -15,7 +15,7 @@ public final class ExperimentRegistry {
         registeredExperiments = linkedHashMap;
         RegisteredExperiment.Type type = RegisteredExperiment.Type.USER;
         RegisteredExperiment.Type type2 = RegisteredExperiment.Type.GUILD;
-        for (Object obj : n.listOf((Object[]) new RegisteredExperiment[]{new RegisteredExperiment("Compact Invite Widget", "2020-01_mobile_invite_suggestion_compact", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Use compact view"}), true), new RegisteredExperiment("Guild Invite Sheet", "2020-12_android_guild_channel_invite_sheet", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen guild invite UI", "Treatment 1: Use the bottom sheet guild invite UI"}), true), new RegisteredExperiment("Disable mentions in landscape", "2020-12_android_disable_landscape_mentions", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hide mentions in landscape"}), true), new RegisteredExperiment("Invite to GDM Sheet", "2020-12_invite_to_gdm", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen GDM invite UI", "Treatment 1: Use the bottom sheet GDM invite UI"}), true), new RegisteredExperiment("Guild Delete Feedback", "2020-12_guild_delete_feedback", type, n.listOf((Object[]) new String[]{"Control: Do not show the feedback modal", "Treatment 1: Show the feedback modal"}), true), new RegisteredExperiment("View Threads", "2021-02_view_threads", type, n.listOf((Object[]) new String[]{"Control: Do not display anything threads-related, except if receiving a notification", "Treatment 1: Show view-only threads features in channel list, in chat view, etc."}), true), new RegisteredExperiment("Create Threads", "2020-09_threads", type2, n.listOf((Object[]) new String[]{"Control: Do not show thread creation entrypoints, or Thread Browser", "Treatment 1: Show thread creation buttons, and show button to open Thread Browser"}), true), new RegisteredExperiment("Disable Camera 2", "2021-02_android_webrtc_camera2", type, n.listOf((Object[]) new String[]{"Control: Use Camera 2 API if supported", "Treatment 1: Force Camera 1 API"}), true), new RegisteredExperiment("MediaSinkWants", "2021-03_android_media_sink_wants", type, n.listOf((Object[]) new String[]{"Control: disabled", "Treatment 1: use MediaSinkWants"}), true), new RegisteredExperiment("Default Invite Expiration", "2021-03_android_extend_invite_expiration", type2, n.listOf((Object[]) new String[]{"Control: Default Invite Expiration is 1 day", "Treatment 1: Default Invite Expiration is 7 days"}), true), new RegisteredExperiment("Emoji Autocomplete Upsell", "2021-03_nitro_emoji_autocomplete_upsell_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Emoji Autocomplete Upsell"}), true), new RegisteredExperiment("Application Command Frecency", "2021-09_android_app_commands_frecency", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show frecent application commands"}), true), new RegisteredExperiment("Bot UI Kit Components", "2021-03_bot_ui_kit_components_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Bot UI Kit Components"}), true), new RegisteredExperiment("Select Bot UI Component", "2021-05_bot_ui_kit_select", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Select Bot Ui Component"}), true), new RegisteredExperiment("Stage Events Guilds", "2021-06_stage_events", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to see events in guilds"}), true), new RegisteredExperiment("Contact Sync: Base Experiment", "2021-04_contact_sync_android_main", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable core Contact Sync features"}), true), new RegisteredExperiment("Contact Sync: Existing Users w/ Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users with a phone number"}), true), new RegisteredExperiment("Contact Sync: Existing Users without Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_without_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users without a phone number"}), true), new RegisteredExperiment("Contact Sync: Empty states", "2021-05_contact_sync_android_empty_states", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync in empty friend lists"}), true), new RegisteredExperiment("Stop Offscreen Video Streams", "2021-03_stop_offscreen_video_streams", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Stop offscreen video streams"}), true), new RegisteredExperiment("Hub Multiple Domains", "2021-08_hub_multi_domain_mobile", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable multiple domains for hubs"}), true), new RegisteredExperiment("Enabled Discord Hub Directories", "2021-06_desktop_school_hubs", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Directories"}), true), new RegisteredExperiment("Enabled Discord Hub Emails", "2021-06_hub_email_connection", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Emails"}), true), new RegisteredExperiment("Enabled Discord Hub Reporting", "2021-08_hub_reporting", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hub Reporting Enabled"}), true), new RegisteredExperiment("Enable Impression Logging", "2021-08_impression_logging_enabled_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable Impression Logging"}), true), new RegisteredExperiment("AudioManager V2 and OpenSL ES", "2021-05_opensl_default_enable_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Default enable OpenSL", "Treatment 2: Use StoreAudioManagerV2 for output routing"}), true), new RegisteredExperiment("Phone Registration - Bailout to Email", "2021-06_reg_bailout_to_email_android", type, n.listOf((Object[]) new String[]{"Control: Just the back button", "Treatment 1: Static button to bailout to the email tab"}), true), new RegisteredExperiment("Enable Network Action Logging", "2021-07_network_action_logging_android", type, n.listOf((Object[]) new String[]{"Off: No Action logging", "On: Enable Action Logging"}), true), new RegisteredExperiment("Preview Promotions", "2021-06_preview_promotions", type, n.listOf((Object[]) new String[]{"Off: Hit normal endpoint", "On: Hit preview endpoint"}), true), new RegisteredExperiment("Live Stage Notifications", "2021-07_live_stage_notifications", type2, n.listOf((Object[]) new String[]{"Control: No notification surfaces", "Treatment 1: Show notification surfaces"}), true), new RegisteredExperiment("Show welcome CTA button", "2021-06_welcome_cta", type2, n.listOf((Object[]) new String[]{"Control: No CTA", "Treatment 1: Show welcome CTA button"}), true), new RegisteredExperiment("Guild Events Sharing", "2021-08_guild_scheduled_events_sharing", type, n.listOf((Object[]) new String[]{"Control: No sharing", "Treatment 1: Can share"}), true), new RegisteredExperiment("Route audio to speakerphone by default", "2021-08_android_speakerphone_default", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Always default to speakerphone"}), true), new RegisteredExperiment("New Thread Perms", "2021-08_threads_permissions", type2, n.listOf((Object[]) new String[]{"Control: Use old threads permissions.", "Treatment 1: Use new threads permissions."}), true), new RegisteredExperiment("Per Guild Avatars", "2021-05_per_guild_avatars", type, n.listOf((Object[]) new String[]{"Control: Cannot edit per-guild avatars.", "Treatment 1: Can edit per-guild avatars."}), true), new RegisteredExperiment("Longer billing grace periods", "2021-09_longer_billing_grace_periods", type, n.listOf((Object[]) new String[]{"Control: 3-day grace period", "Treatment 1: 7-day grace period"}), true), new RegisteredExperiment("SMS Autofill", "2021-09_android_sms_autofill", type, n.listOf((Object[]) new String[]{"Control: No SMS Autofill", "Treatment 1: SMS Code autofills"}), true)})) {
+        for (Object obj : n.listOf((Object[]) new RegisteredExperiment[]{new RegisteredExperiment("Compact Invite Widget", "2020-01_mobile_invite_suggestion_compact", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Use compact view"}), true), new RegisteredExperiment("Guild Invite Sheet", "2020-12_android_guild_channel_invite_sheet", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen guild invite UI", "Treatment 1: Use the bottom sheet guild invite UI"}), true), new RegisteredExperiment("Disable mentions in landscape", "2020-12_android_disable_landscape_mentions", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hide mentions in landscape"}), true), new RegisteredExperiment("Invite to GDM Sheet", "2020-12_invite_to_gdm", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen GDM invite UI", "Treatment 1: Use the bottom sheet GDM invite UI"}), true), new RegisteredExperiment("Guild Delete Feedback", "2020-12_guild_delete_feedback", type, n.listOf((Object[]) new String[]{"Control: Do not show the feedback modal", "Treatment 1: Show the feedback modal"}), true), new RegisteredExperiment("View Threads", "2021-02_view_threads", type, n.listOf((Object[]) new String[]{"Control: Do not display anything threads-related, except if receiving a notification", "Treatment 1: Show view-only threads features in channel list, in chat view, etc."}), true), new RegisteredExperiment("Create Threads", "2020-09_threads", type2, n.listOf((Object[]) new String[]{"Control: Do not show thread creation entrypoints, or Thread Browser", "Treatment 1: Show thread creation buttons, and show button to open Thread Browser"}), true), new RegisteredExperiment("Disable Camera 2", "2021-02_android_webrtc_camera2", type, n.listOf((Object[]) new String[]{"Control: Use Camera 2 API if supported", "Treatment 1: Force Camera 1 API"}), true), new RegisteredExperiment("MediaSinkWants", "2021-03_android_media_sink_wants", type, n.listOf((Object[]) new String[]{"Control: disabled", "Treatment 1: use MediaSinkWants"}), true), new RegisteredExperiment("Default Invite Expiration", "2021-03_android_extend_invite_expiration", type2, n.listOf((Object[]) new String[]{"Control: Default Invite Expiration is 1 day", "Treatment 1: Default Invite Expiration is 7 days"}), true), new RegisteredExperiment("Emoji Autocomplete Upsell", "2021-03_nitro_emoji_autocomplete_upsell_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Emoji Autocomplete Upsell"}), true), new RegisteredExperiment("Application Command Frecency", "2021-09_android_app_commands_frecency", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show frecent application commands"}), true), new RegisteredExperiment("Bot UI Kit Components", "2021-03_bot_ui_kit_components_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Bot UI Kit Components"}), true), new RegisteredExperiment("Select Bot UI Component", "2021-05_bot_ui_kit_select", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Select Bot Ui Component"}), true), new RegisteredExperiment("Stage Events Guilds", "2021-06_stage_events", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to see events in guilds"}), true), new RegisteredExperiment("Contact Sync: Base Experiment", "2021-04_contact_sync_android_main", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable core Contact Sync features"}), true), new RegisteredExperiment("Contact Sync: Existing Users w/ Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users with a phone number"}), true), new RegisteredExperiment("Contact Sync: Existing Users without Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_without_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users without a phone number"}), true), new RegisteredExperiment("Contact Sync: Empty states", "2021-05_contact_sync_android_empty_states", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync in empty friend lists"}), true), new RegisteredExperiment("Stop Offscreen Video Streams", "2021-03_stop_offscreen_video_streams", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Stop offscreen video streams"}), true), new RegisteredExperiment("Hub Multiple Domains", "2021-08_hub_multi_domain_mobile", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable multiple domains for hubs"}), true), new RegisteredExperiment("Enabled Discord Hub Directories", "2021-06_desktop_school_hubs", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Directories"}), true), new RegisteredExperiment("Enabled Discord Hub Emails", "2021-06_hub_email_connection", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Emails"}), true), new RegisteredExperiment("Enabled Discord Hub Reporting", "2021-08_hub_reporting", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hub Reporting Enabled"}), true), new RegisteredExperiment("Enable Impression Logging", "2021-08_impression_logging_enabled_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable Impression Logging"}), true), new RegisteredExperiment("AudioManager V2 and OpenSL ES", "2021-05_opensl_default_enable_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Default enable OpenSL", "Treatment 2: Use StoreAudioManagerV2 for output routing"}), true), new RegisteredExperiment("Phone Registration - Bailout to Email", "2021-06_reg_bailout_to_email_android", type, n.listOf((Object[]) new String[]{"Control: Just the back button", "Treatment 1: Static button to bailout to the email tab"}), true), new RegisteredExperiment("Enable Network Action Logging", "2021-07_network_action_logging_android", type, n.listOf((Object[]) new String[]{"Off: No Action logging", "On: Enable Action Logging"}), true), new RegisteredExperiment("Preview Promotions", "2021-06_preview_promotions", type, n.listOf((Object[]) new String[]{"Off: Hit normal endpoint", "On: Hit preview endpoint"}), true), new RegisteredExperiment("Live Stage Notifications", "2021-07_live_stage_notifications", type2, n.listOf((Object[]) new String[]{"Control: No notification surfaces", "Treatment 1: Show notification surfaces"}), true), new RegisteredExperiment("Show welcome CTA button", "2021-06_welcome_cta", type2, n.listOf((Object[]) new String[]{"Control: No CTA", "Treatment 1: Show welcome CTA button"}), true), new RegisteredExperiment("Guild Events Sharing", "2021-08_guild_scheduled_events_sharing", type, n.listOf((Object[]) new String[]{"Control: No sharing", "Treatment 1: Can share"}), true), new RegisteredExperiment("Route audio to speakerphone by default", "2021-08_android_speakerphone_default", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Always default to speakerphone"}), true), new RegisteredExperiment("New Thread Perms", "2021-08_threads_permissions", type2, n.listOf((Object[]) new String[]{"Control: Use old threads permissions.", "Treatment 1: Use new threads permissions."}), true), new RegisteredExperiment("Longer billing grace periods", "2021-09_longer_billing_grace_periods", type, n.listOf((Object[]) new String[]{"Control: 3-day grace period", "Treatment 1: 7-day grace period"}), true), new RegisteredExperiment("SMS Autofill", "2021-09_android_sms_autofill", type, n.listOf((Object[]) new String[]{"Control: No SMS Autofill", "Treatment 1: SMS Code autofills"}), true)})) {
             linkedHashMap.put(((RegisteredExperiment) obj).getName(), obj);
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
index 07080d6d17..f52fb7d806 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
@@ -211,7 +211,7 @@ public final class NotificationData {
         private final LinkedHashMap<Long, NotificationData> extras;
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f2607id;
+        private final int f2605id;
         private boolean ignoreNextClearForAck;
 
         public DisplayPayload() {
@@ -221,7 +221,7 @@ public final class NotificationData {
         public DisplayPayload(NotificationData notificationData) {
             m.checkNotNullParameter(notificationData, "data");
             this.data = notificationData;
-            this.f2607id = new Random().nextInt(Integer.MAX_VALUE);
+            this.f2605id = new Random().nextInt(Integer.MAX_VALUE);
             this.extras = new LinkedHashMap<>();
         }
 
@@ -258,7 +258,7 @@ public final class NotificationData {
         }
 
         public final int getId() {
-            return this.f2607id;
+            return this.f2605id;
         }
 
         public final boolean getIgnoreNextClearForAck() {
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
index aa3c002764..8dbefe0508 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
@@ -174,13 +174,13 @@ public final class NotificationRenderer {
             arrayList2.add(new MGImagesBitmap.ImageRequest(str, true));
         }
         Set mutableSet = u.toMutableSet(arrayList2);
-        Observable<MGImagesBitmap.CloseableBitmaps> P = MGImagesBitmap.getBitmaps(mutableSet).P();
+        Observable<MGImagesBitmap.CloseableBitmaps> Q = MGImagesBitmap.getBitmaps(mutableSet).Q();
         CompositeSubscription compositeSubscription = new CompositeSubscription();
-        Observable<Long> Z = Observable.c0(NOTIFICATION_ICON_FETCH_DELAY_MS, TimeUnit.MILLISECONDS).Z(Observable.g0(new r(P.i, new f1(new d1(d.j)))));
-        m.checkNotNullExpressionValue(Z, "Observable\n        .time…Next(Observable.never()))");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), (Context) null, "Unable to display notification, timeout.", new NotificationRenderer$displayAndUpdateCache$4(compositeSubscription), new NotificationRenderer$displayAndUpdateCache$5(context, andUpdate, contentIntent, notificationData), (Function1) null, (Function0) null, (Function0) null, 112, (Object) null);
-        m.checkNotNullExpressionValue(P, "bitmapsObservable");
-        Observable ui = ObservableExtensionsKt.ui(P);
+        Observable<Long> a02 = Observable.d0(NOTIFICATION_ICON_FETCH_DELAY_MS, TimeUnit.MILLISECONDS).a0(Observable.h0(new r(Q.i, new f1(new d1(d.j)))));
+        m.checkNotNullExpressionValue(a02, "Observable\n        .time…Next(Observable.never()))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), (Context) null, "Unable to display notification, timeout.", new NotificationRenderer$displayAndUpdateCache$4(compositeSubscription), new NotificationRenderer$displayAndUpdateCache$5(context, andUpdate, contentIntent, notificationData), (Function1) null, (Function0) null, (Function0) null, 112, (Object) null);
+        m.checkNotNullExpressionValue(Q, "bitmapsObservable");
+        Observable ui = ObservableExtensionsKt.ui(Q);
         StringBuilder O = a.O("Unable to display notification multi-fetch ");
         O.append(mutableSet.size());
         O.append(" bitmaps.");
@@ -197,7 +197,7 @@ public final class NotificationRenderer {
     }
 
     private final NotificationCompat.MessagingStyle getMessageStyle(Context context, NotificationData notificationData, List<NotificationData> list, Map<String, Bitmap> map) {
-        Person build = new Person.Builder().setName(context.getString(R.string.f3156me)).setKey("me").build();
+        Person build = new Person.Builder().setName(context.getString(R.string.f3154me)).setKey("me").build();
         m.checkNotNullExpressionValue(build, "Person.Builder()\n       …ey(\"me\")\n        .build()");
         NotificationCompat.MessagingStyle groupConversation = new NotificationCompat.MessagingStyle(build).setConversationTitle(notificationData.getConversationTitle(context)).setGroupConversation(notificationData.isGroupConversation());
         m.checkNotNullExpressionValue(groupConversation, "NotificationCompat.Messa…tion.isGroupConversation)");
diff --git a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
index ed933b0103..29fe0de0d0 100644
--- a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
+++ b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
@@ -44,14 +44,14 @@ public final class GiftingUtils {
         
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f2608id;
+        private final int f2606id;
 
         private SkuTypes(int i) {
-            this.f2608id = i;
+            this.f2606id = i;
         }
 
         public final int getId() {
-            return this.f2608id;
+            return this.f2606id;
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java
index 57134ce8b5..20a96feda4 100644
--- a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java
+++ b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java
@@ -107,7 +107,7 @@ public final class GuildVerificationLevelUtils {
         Observable<Guild> observeGuild = storeGuilds.observeGuild(j);
         Observable<GuildVerificationLevel> observeVerificationLevel = storeGuilds.observeVerificationLevel(j);
         Observable<Map<Long, GuildMember>> observeComputed = storeGuilds.observeComputed(j);
-        Observable<GuildVerificationLevel> q = Observable.g(observeJoinedAt, observeGuild, observeVerificationLevel, Observable.g0(new r(observeComputed.i, new LeadingEdgeThrottle(1500, TimeUnit.MILLISECONDS))), storeUser.observeMe(true), new GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(clock)).q();
+        Observable<GuildVerificationLevel> q = Observable.g(observeJoinedAt, observeGuild, observeVerificationLevel, Observable.h0(new r(observeComputed.i, new LeadingEdgeThrottle(1500, TimeUnit.MILLISECONDS))), storeUser.observeMe(true), new GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(clock)).q();
         m.checkNotNullExpressionValue(q, "Observable\n        .comb…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImages.java b/app/src/main/java/com/discord/utilities/images/MGImages.java
index b2a1f0ee38..974fe7d1a3 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImages.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImages.java
@@ -122,7 +122,7 @@ public final class MGImages {
             z3 = true;
         }
         if (z3) {
-            b.f2683c = new e(i, i2);
+            b.f2681c = new e(i, i2);
         }
         return b;
     }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java
index 3d63dff42f..d7b7107a54 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java
@@ -25,6 +25,6 @@ public final class MGImagesBitmap$getBitmaps$1<T, R> implements b<MGImagesBitmap
     }
 
     public final Observable<? extends Pair<String, Bitmap>> call(MGImagesBitmap.ImageRequest imageRequest) {
-        return MGImagesBitmap.INSTANCE.getBitmap(imageRequest.getImageUri(), imageRequest.getRoundAsCircle()).E(new AnonymousClass1(imageRequest));
+        return MGImagesBitmap.INSTANCE.getBitmap(imageRequest.getImageUri(), imageRequest.getRoundAsCircle()).F(new AnonymousClass1(imageRequest));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
index 597ead91bf..5bbaa0a120 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
@@ -357,9 +357,9 @@ public final class MGImagesBitmap {
                 arrayList.add(obj);
             }
         }
-        Observable<CloseableBitmaps> W = Observable.g0(new q(arrayList)).y(MGImagesBitmap$getBitmaps$1.INSTANCE).f0(MGImagesBitmap$getBitmaps$2.INSTANCE, MGImagesBitmap$getBitmaps$3.INSTANCE).E(MGImagesBitmap$getBitmaps$4.INSTANCE).W(i0.p.a.a());
-        m.checkNotNullExpressionValue(W, "Observable\n        .from…Schedulers.computation())");
-        return W;
+        Observable<CloseableBitmaps> X = Observable.h0(new q(arrayList)).z(MGImagesBitmap$getBitmaps$1.INSTANCE).g0(MGImagesBitmap$getBitmaps$2.INSTANCE, MGImagesBitmap$getBitmaps$3.INSTANCE).F(MGImagesBitmap$getBitmaps$4.INSTANCE).X(i0.p.a.a());
+        m.checkNotNullExpressionValue(X, "Observable\n        .from…Schedulers.computation())");
+        return X;
     }
 
     private final boolean isValidUri(String str) {
@@ -380,9 +380,9 @@ public final class MGImagesBitmap {
     public final Observable<Bitmap> getBitmap(String str, boolean z2) {
         m.checkNotNullParameter(str, "imageUri");
         if (!isValidUri(str)) {
-            Observable<Bitmap> v = Observable.v(new IllegalArgumentException("invalid uri"));
-            m.checkNotNullExpressionValue(v, "Observable.error(Illegal…Exception(\"invalid uri\"))");
-            return v;
+            Observable<Bitmap> w2 = Observable.w(new IllegalArgumentException("invalid uri"));
+            m.checkNotNullExpressionValue(w2, "Observable.error(Illegal…Exception(\"invalid uri\"))");
+            return w2;
         }
         l lVar = l.a;
         d.y(lVar, "ImagePipelineFactory was not initialized!");
@@ -394,8 +394,8 @@ public final class MGImagesBitmap {
         if (z2) {
             imageRequest.j = new RoundAsCirclePostprocessor(str);
         }
-        Observable<Bitmap> g02 = Observable.g0(new MGImagesBitmap$getBitmap$1(hVar.a(imageRequest.a(), null, ImageRequest.c.FULL_FETCH, null, null), str));
-        m.checkNotNullExpressionValue(g02, "Observable.unsafeCreate …y emits the bitmap.\n    }");
-        return g02;
+        Observable<Bitmap> h02 = Observable.h0(new MGImagesBitmap$getBitmap$1(hVar.a(imageRequest.a(), null, ImageRequest.c.FULL_FETCH, null, null), str));
+        m.checkNotNullExpressionValue(h02, "Observable.unsafeCreate …y emits the bitmap.\n    }");
+        return h02;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java b/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java
index 778bb7bb74..e3c14ebaa8 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java
@@ -18,6 +18,6 @@ public final class MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1 extend
     public MemoryCacheParams get() {
         MemoryCacheParams memoryCacheParams = super.get();
         int i = memoryCacheParams.a;
-        return new MemoryCacheParams(i, memoryCacheParams.b, memoryCacheParams.f2674c, memoryCacheParams.d, i / 3, TimeUnit.MINUTES.toMillis(5));
+        return new MemoryCacheParams(i, memoryCacheParams.b, memoryCacheParams.f2672c, memoryCacheParams.d, i / 3, TimeUnit.MINUTES.toMillis(5));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java b/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
index 61faeb35dd..bde747deff 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
@@ -43,7 +43,7 @@ public final class MGImagesConfig {
         DiskCacheConfig.b bVar = new DiskCacheConfig.b(context, null);
         bVar.b = new k(context.getCacheDir());
         bVar.a = str;
-        bVar.f2662c = MAX_DISK_CACHE_SIZE;
+        bVar.f2660c = MAX_DISK_CACHE_SIZE;
         DiskCacheConfig diskCacheConfig = new DiskCacheConfig(bVar);
         m.checkNotNullExpressionValue(diskCacheConfig, "DiskCacheConfig\n        …HE_SIZE)\n        .build()");
         return diskCacheConfig;
diff --git a/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java b/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
index 6d050816d8..8e64555981 100644
--- a/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
+++ b/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
@@ -398,9 +398,9 @@ public final class RouteHandlers {
         long longValue = (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = groupValues.get(1)) == null || (longOrNull = s.toLongOrNull(str)) == null) ? 0 : longOrNull.longValue();
         boolean booleanQueryParameter = uri.getBooleanQueryParameter("service_denied", false);
         WeakReference weakReference = new WeakReference(context);
-        Observable<R> E = StoreStream.Companion.getChannels().observeChannel(longValue).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(E, 0, false, 3, null)), RouteHandlers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new RouteHandlers$voiceConnect$1(weakReference, longValue, booleanQueryParameter), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getChannels().observeChannel(longValue).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null)), RouteHandlers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new RouteHandlers$voiceConnect$1(weakReference, longValue, booleanQueryParameter), 62, (Object) null);
         return new AnalyticsMetadata("voice", null, Long.valueOf(longValue), 2, null);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
index bdf2e2c75b..f691808ffd 100644
--- a/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
+++ b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
@@ -335,14 +335,14 @@ public abstract class MemberListRow {
             
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2609id;
+            private final long f2607id;
 
             private Type(long j) {
-                this.f2609id = j;
+                this.f2607id = j;
             }
 
             public final long getId() {
-                return this.f2609id;
+                return this.f2607id;
             }
         }
 
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java
index 5d3e48c95c..1e30d05177 100644
--- a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java
@@ -105,9 +105,9 @@ public final class GuildMemberSubscriptionsManager {
 
     private final void triggerUnsubscribe() {
         if (this.delayedFlushSubscription == null) {
-            Observable<Long> d02 = Observable.d0(20, TimeUnit.SECONDS, this.delayScheduler);
-            m.checkNotNullExpressionValue(d02, "Observable\n          .ti….SECONDS, delayScheduler)");
-            ObservableExtensionsKt.appSubscribe$default(d02, GuildMemberSubscriptionsManager.class, (Context) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$1(this), (Function1) null, (Function0) null, (Function0) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$2(this), 58, (Object) null);
+            Observable<Long> e02 = Observable.e0(20, TimeUnit.SECONDS, this.delayScheduler);
+            m.checkNotNullExpressionValue(e02, "Observable\n          .ti….SECONDS, delayScheduler)");
+            ObservableExtensionsKt.appSubscribe$default(e02, GuildMemberSubscriptionsManager.class, (Context) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$1(this), (Function1) null, (Function0) null, (Function0) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$2(this), 58, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java
index 0684262ba1..4010fa7a31 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java
@@ -171,9 +171,9 @@ public final class MessageQueue$processNextRequest$listener$1 extends o implemen
     public final void invoke(MessageResult messageResult) {
         m.checkNotNullParameter(messageResult, "result");
         if (messageResult instanceof MessageResult.RateLimited) {
-            Observable<Long> c02 = Observable.c0(((MessageResult.RateLimited) messageResult).getRetryAfterMs(), TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable\n             …s, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(c02, this.this$0.getClass(), (Context) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(((MessageResult.RateLimited) messageResult).getRetryAfterMs(), TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n             …s, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, this.this$0.getClass(), (Context) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 58, (Object) null);
         } else if (messageResult instanceof MessageResult.NetworkFailure) {
             MessageQueue.access$getExecutorService$p(this.this$0).submit(new AnonymousClass3(this));
         } else {
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
index 286412bc5e..53bc81446f 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
@@ -219,13 +219,13 @@ public final class MessageQueue {
                 }
             }
         }
-        Observable<SendUtils.SendPayload> s = SendUtils.INSTANCE.getSendPayload(this.contentResolver, new RestAPIParams.Message(content, nonce, valueOf, activity, arrayList, messageReference, create), send.getAttachments()).s(new MessageQueue$doSend$1(send));
-        m.checkNotNullExpressionValue(s, "SendUtils\n        .getSe…  }\n          }\n        }");
-        Observable<R> E = s.w(MessageQueue$doSend$$inlined$filterIs$1.INSTANCE).E(MessageQueue$doSend$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        Observable y2 = E.Y(1).y(new MessageQueue$doSend$2(message));
-        m.checkNotNullExpressionValue(y2, "SendUtils\n        .getSe…ge)\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn(y2, z2), MessageQueue.class, (Context) null, new MessageQueue$doSend$5(this, send, drainListener), new MessageQueue$doSend$4(this, drainListener), (Function0) null, (Function0) null, new MessageQueue$doSend$3(this, drainListener), 50, (Object) null);
+        Observable<SendUtils.SendPayload> t = SendUtils.INSTANCE.getSendPayload(this.contentResolver, new RestAPIParams.Message(content, nonce, valueOf, activity, arrayList, messageReference, create), send.getAttachments()).t(new MessageQueue$doSend$1(send));
+        m.checkNotNullExpressionValue(t, "SendUtils\n        .getSe…  }\n          }\n        }");
+        Observable<R> F = t.x(MessageQueue$doSend$$inlined$filterIs$1.INSTANCE).F(MessageQueue$doSend$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        Observable z3 = F.Z(1).z(new MessageQueue$doSend$2(message));
+        m.checkNotNullExpressionValue(z3, "SendUtils\n        .getSe…ge)\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn(z3, z2), MessageQueue.class, (Context) null, new MessageQueue$doSend$5(this, send, drainListener), new MessageQueue$doSend$4(this, drainListener), (Function0) null, (Function0) null, new MessageQueue$doSend$3(this, drainListener), 50, (Object) null);
     }
 
     private final void doSendApplicationCommand(MessageRequest.SendApplicationCommand sendApplicationCommand, DrainListener drainListener) {
diff --git a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java
index 0df2c9e7c5..ba590178a9 100644
--- a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java
+++ b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java
@@ -113,9 +113,9 @@ public abstract class MGRecyclerAdapterSimple<D extends MGRecyclerDataPayload> e
         if (list2.isEmpty()) {
             dispatchUpdates(null, list2, list);
         } else if (this.deferredDiffs) {
-            Observable W = Observable.B(new MGRecyclerAdapterSimple$setData$1(this, list2, list)).W(a.a());
-            m.checkNotNullExpressionValue(W, "Observable\n            .…Schedulers.computation())");
-            Observable ui = ObservableExtensionsKt.ui(W);
+            Observable X = Observable.C(new MGRecyclerAdapterSimple$setData$1(this, list2, list)).X(a.a());
+            m.checkNotNullExpressionValue(X, "Observable\n            .…Schedulers.computation())");
+            Observable ui = ObservableExtensionsKt.ui(X);
             Class<?> cls = getClass();
             MGRecyclerAdapterSimple$setData$2 mGRecyclerAdapterSimple$setData$2 = new MGRecyclerAdapterSimple$setData$2(this, list2, list);
             ObservableExtensionsKt.appSubscribe$default(ui, cls, (Context) null, new MGRecyclerAdapterSimple$setData$4(this), new MGRecyclerAdapterSimple$setData$3(this), (Function0) null, (Function0) null, mGRecyclerAdapterSimple$setData$2, 50, (Object) null);
diff --git a/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java b/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java
index 9d1fabe8cc..dd22a36ddf 100644
--- a/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java
+++ b/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java
@@ -26,7 +26,7 @@ public final class NetworkMonitor {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(logger, "logger");
         this.logger = logger;
-        this.networkStateSubject = BehaviorSubject.k0(getState$default(this, context, null, 2, null));
+        this.networkStateSubject = BehaviorSubject.l0(getState$default(this, context, null, 2, null));
         registerConnectivityNetworkMonitor(context);
     }
 
@@ -100,13 +100,13 @@ public final class NetworkMonitor {
     }
 
     public final Observable<Boolean> observeIsConnected() {
-        Observable<Boolean> q = observeState().E(NetworkMonitor$observeIsConnected$1.INSTANCE).q();
+        Observable<Boolean> q = observeState().F(NetworkMonitor$observeIsConnected$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeState().map { sta… }.distinctUntilChanged()");
         return q;
     }
 
     public final Observable<State> observeState() {
-        Observable<State> q = this.networkStateSubject.I().q();
+        Observable<State> q = this.networkStateSubject.J().q();
         m.checkNotNullExpressionValue(q, "networkStateSubject.onBa…().distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java b/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java
index 9244eae7e5..8daf3ff85a 100644
--- a/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java
+++ b/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java
@@ -49,7 +49,7 @@ public final class Persister$getObservable$1 extends o implements Function0<Subj
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Subject<T, T> mo17invoke() {
-        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.j0());
+        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.k0());
         j jVar = new j(null);
         m.checkNotNullExpressionValue(jVar, "Observable\n          .just(null)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(jVar), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this, serializedSubject), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/utilities/persister/Persister.java b/app/src/main/java/com/discord/utilities/persister/Persister.java
index 57d35e6f97..bbda078093 100644
--- a/app/src/main/java/com/discord/utilities/persister/Persister.java
+++ b/app/src/main/java/com/discord/utilities/persister/Persister.java
@@ -112,9 +112,9 @@ public final class Persister<T> {
                 Persister.access$setContext$cp(context);
                 Persister.access$setClock$cp(clock);
                 Persister.access$setPreferencesPreloader$cp(new Preloader(clock));
-                Observable<Boolean> w2 = observable.w(Persister$Companion$init$1.INSTANCE);
-                m.checkNotNullExpressionValue(w2, "persistenceStrategy\n    …er { persist -> persist }");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(w2), Persister.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, Persister$Companion$init$2.INSTANCE, 62, (Object) null);
+                Observable<Boolean> x2 = observable.x(Persister$Companion$init$1.INSTANCE);
+                m.checkNotNullExpressionValue(x2, "persistenceStrategy\n    …er { persist -> persist }");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(x2), Persister.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, Persister$Companion$init$2.INSTANCE, 62, (Object) null);
             }
         }
 
@@ -191,11 +191,11 @@ public final class Persister<T> {
         public Preloader(Clock clock) {
             m.checkNotNullParameter(clock, "clock");
             this.preloadTime = new TimeElapsed(clock, 0, 2, null);
-            SerializedSubject<Persister<?>, Persister<?>> serializedSubject = new SerializedSubject<>(BehaviorSubject.j0());
+            SerializedSubject<Persister<?>, Persister<?>> serializedSubject = new SerializedSubject<>(BehaviorSubject.k0());
             this.preloadSubject = serializedSubject;
-            Observable<Persister<?>> a02 = serializedSubject.a0(AnonymousClass1.INSTANCE);
-            m.checkNotNullExpressionValue(a02, "preloadSubject\n          .takeUntil { it == null }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(a02), Preloader.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+            Observable<Persister<?>> b02 = serializedSubject.b0(AnonymousClass1.INSTANCE);
+            m.checkNotNullExpressionValue(b02, "preloadSubject\n          .takeUntil { it == null }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(b02), Preloader.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         }
 
         public static final /* synthetic */ void access$handlePreload(Preloader preloader, Persister persister) {
@@ -216,7 +216,7 @@ public final class Persister<T> {
 
         /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: rx.Observable<com.discord.utilities.persister.Persister<?>>, java.lang.Object, rx.Observable<java.lang.Boolean> */
         public final Observable<Boolean> isPreloaded() {
-            Observable q = this.preloadSubject.E(Persister$Preloader$isPreloaded$1.INSTANCE).q();
+            Observable q = this.preloadSubject.F(Persister$Preloader$isPreloaded$1.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "preloadSubject\n         …  .distinctUntilChanged()");
             return q;
         }
diff --git a/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java b/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java
index ed4c938b9d..1ea2b11a02 100644
--- a/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java
+++ b/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java
@@ -20,17 +20,17 @@ public final class PersisterConfig {
     }
 
     private final Observable<Boolean> getPersistenceStrategy() {
-        Observable<Boolean> G = Observable.G(isNotActive(), Observable.c0(1, TimeUnit.MINUTES).E(PersisterConfig$persistenceStrategy$1.INSTANCE));
-        m.checkNotNullExpressionValue(G, "Observable\n        .merg…  .map { true }\n        )");
-        return G;
+        Observable<Boolean> H = Observable.H(isNotActive(), Observable.d0(1, TimeUnit.MINUTES).F(PersisterConfig$persistenceStrategy$1.INSTANCE));
+        m.checkNotNullExpressionValue(H, "Observable\n        .merg…  .map { true }\n        )");
+        return H;
     }
 
     private final Observable<Boolean> isNotActive() {
-        Observable<Boolean> R = d.d.a().R(1);
+        Observable<Boolean> S = d.d.a().S(1);
         l lVar = l.f48c;
-        Observable q = l.b.E(k.i).q();
+        Observable q = l.b.F(k.i).q();
         m.checkNotNullExpressionValue(q, "numGatewayConnectionCons…  .distinctUntilChanged()");
-        return Observable.j(R, q, PersisterConfig$isNotActive$1.INSTANCE).q();
+        return Observable.j(S, q, PersisterConfig$isNotActive$1.INSTANCE).q();
     }
 
     public final void init(Context context, Clock clock) {
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java
index ce0c5bf40a..0b843f9c2d 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java
@@ -43,6 +43,6 @@ public final class PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4<T, R>
         if (!bool.booleanValue()) {
             return new j(PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult.FAILURE_MODIFYING_SLOT);
         }
-        return this.$api.updateSubscription(this.$subscription.getId(), new RestAPIParams.UpdateSubscription(null, null, null, PremiumGuildSubscriptionUtils.INSTANCE.calculateAdditionalPlansWithPremiumGuildAdjustment(this.$subscription, this.$cancel ? -1 : 1), 7, null)).E(AnonymousClass1.INSTANCE).K(AnonymousClass2.INSTANCE);
+        return this.$api.updateSubscription(this.$subscription.getId(), new RestAPIParams.UpdateSubscription(null, null, null, PremiumGuildSubscriptionUtils.INSTANCE.calculateAdditionalPlansWithPremiumGuildAdjustment(this.$subscription, this.$cancel ? -1 : 1), 7, null)).F(AnonymousClass1.INSTANCE).L(AnonymousClass2.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
index 71e1d9b077..06d4fcad6a 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
@@ -56,9 +56,9 @@ public final class PremiumGuildSubscriptionUtils {
     }
 
     private final Observable<ModifySubscriptionSlotResult> modifySubscriptionSlot(RestAPI restAPI, long j, ModelSubscription modelSubscription, boolean z2, StorePremiumGuildSubscription storePremiumGuildSubscription) {
-        Observable<ModifySubscriptionSlotResult> y2 = (z2 ? restAPI.cancelSubscriptionSlot(j) : restAPI.uncancelSubscriptionSlot(j)).W(a.c()).s(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1(storePremiumGuildSubscription)).E(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.INSTANCE).K(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.INSTANCE).y(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4(restAPI, modelSubscription, z2));
-        m.checkNotNullExpressionValue(y2, "apiObs\n        .subscrib…N }\n          }\n        }");
-        return y2;
+        Observable<ModifySubscriptionSlotResult> z3 = (z2 ? restAPI.cancelSubscriptionSlot(j) : restAPI.uncancelSubscriptionSlot(j)).X(a.c()).t(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1(storePremiumGuildSubscription)).F(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.INSTANCE).L(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.INSTANCE).z(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4(restAPI, modelSubscription, z2));
+        m.checkNotNullExpressionValue(z3, "apiObs\n        .subscrib…N }\n          }\n        }");
+        return z3;
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r5v8, resolved type: java.lang.Object */
diff --git a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java
index 5ffbb003d6..2c31c3e8a0 100644
--- a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java
+++ b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java
@@ -13,6 +13,6 @@ public final class RepeatingOnTouchListener$subscribe$1<T, R> implements b<Long,
 
     public final Observable<? extends Long> call(Long l) {
         long repeatRate = this.this$0.getRepeatRate();
-        return Observable.D(repeatRate, repeatRate, this.this$0.getTimeUnit(), a.a());
+        return Observable.E(repeatRate, repeatRate, this.this$0.getTimeUnit(), a.a());
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java
index 1f1d0ae0f1..cccb225d24 100644
--- a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java
+++ b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java
@@ -39,7 +39,7 @@ public final class RepeatingOnTouchListener implements View.OnTouchListener {
     }
 
     private final void subscribe() {
-        this.subscription = Observable.c0(this.initialDelay, this.timeUnit).y(new RepeatingOnTouchListener$subscribe$1(this)).H(a.a()).V(new RepeatingOnTouchListener$subscribe$2(this), RepeatingOnTouchListener$subscribe$3.INSTANCE);
+        this.subscription = Observable.d0(this.initialDelay, this.timeUnit).z(new RepeatingOnTouchListener$subscribe$1(this)).I(a.a()).W(new RepeatingOnTouchListener$subscribe$2(this), RepeatingOnTouchListener$subscribe$3.INSTANCE);
     }
 
     public final Action0 getAction() {
diff --git a/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java b/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java
index 7c287771c0..63ec818f7a 100644
--- a/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java
+++ b/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java
@@ -27,7 +27,7 @@ public final class DiffCreator<T extends List<? extends DiffKeyProvider>, VH ext
     private static final int EXPENSIVE_DIFF_THRESHOLD = 225;
     private Subscription asyncDiffSubscription;
     private final AppComponent asyncDiffSubscriptionScope;
-    private final PublishSubject<UpdateRequest<T, VH>> updateRequestsSubject = PublishSubject.j0();
+    private final PublishSubject<UpdateRequest<T, VH>> updateRequestsSubject = PublishSubject.k0();
 
     /* compiled from: DiffCreator.kt */
     public static final class Companion {
@@ -210,9 +210,9 @@ public final class DiffCreator<T extends List<? extends DiffKeyProvider>, VH ext
     private final void subscribeToAsyncUpdateRequests(AppComponent appComponent) {
         PublishSubject<UpdateRequest<T, VH>> publishSubject = this.updateRequestsSubject;
         m.checkNotNullExpressionValue(publishSubject, "updateRequestsSubject");
-        Observable E = ObservableExtensionsKt.computationBuffered(publishSubject).E(new DiffCreator$subscribeToAsyncUpdateRequests$1(this));
-        m.checkNotNullExpressionValue(E, "updateRequestsSubject\n  …ms)\n          )\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(E, appComponent, null, 2, null), DiffCreator.class, (Context) null, new DiffCreator$subscribeToAsyncUpdateRequests$2(this), (Function1) null, (Function0) null, (Function0) null, new DiffCreator$subscribeToAsyncUpdateRequests$3(this), 58, (Object) null);
+        Observable F = ObservableExtensionsKt.computationBuffered(publishSubject).F(new DiffCreator$subscribeToAsyncUpdateRequests$1(this));
+        m.checkNotNullExpressionValue(F, "updateRequestsSubject\n  …ms)\n          )\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(F, appComponent, null, 2, null), DiffCreator.class, (Context) null, new DiffCreator$subscribeToAsyncUpdateRequests$2(this), (Function1) null, (Function0) null, (Function0) null, new DiffCreator$subscribeToAsyncUpdateRequests$3(this), 58, (Object) null);
     }
 
     public final DiffUtil.DiffResult calculateDiffResult(T t, T t2) {
diff --git a/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java b/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java
index d0b8529542..3435db7eb4 100644
--- a/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java
+++ b/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java
@@ -38,7 +38,7 @@ public final class AttachmentRequestBody extends RequestBody {
 
     @Override // okhttp3.RequestBody
     public MediaType contentType() {
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
         return MediaType.a.b(AttachmentUtilsKt.getMimeType(this.attachment, this.contentResolver));
     }
 
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
index 9c3f9eafb6..fb7c5d3467 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
@@ -24,7 +24,7 @@ public final class RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1
         m.checkParameterIsNotNull(c2, "request");
         new LinkedHashMap();
         w wVar = c2.b;
-        String str = c2.f3127c;
+        String str = c2.f3125c;
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java
index e41e359872..5a078f9d47 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java
@@ -52,7 +52,7 @@ public final class RestAPI$addGroupRecipients$3<T, R> implements b<Channel, Obse
         }
 
         public final Observable<? extends Channel> call(List<Observable<Void>> list) {
-            return Observable.F(Observable.g0(new q(list))).e0().E(new AnonymousClass1(this));
+            return Observable.G(Observable.h0(new q(list))).f0().F(new AnonymousClass1(this));
         }
     }
 
@@ -70,6 +70,6 @@ public final class RestAPI$addGroupRecipients$3<T, R> implements b<Channel, Obse
             List list2 = this.$recipients;
             list = list2.subList(1, list2.size());
         }
-        return Observable.z(list).E(new AnonymousClass1(this, channel)).e0().X(new AnonymousClass2(channel));
+        return Observable.A(list).F(new AnonymousClass1(this, channel)).f0().Y(new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java
index fe0f5f00e8..2361a718c6 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java
@@ -12,8 +12,8 @@ public final class RestAPI$addGroupRecipients$4<T, R> implements b<Channel, Obse
     public static final RestAPI$addGroupRecipients$4 INSTANCE = new RestAPI$addGroupRecipients$4();
 
     public final Observable<? extends Channel> call(Channel channel) {
-        Observable<R> E = StoreStream.Companion.getChannels().observeChannel(channel.h()).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        return E;
+        Observable<R> F = StoreStream.Companion.getChannels().observeChannel(channel.h()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return F;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java
index 7d4e74684a..c3e24be3f9 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java
@@ -62,6 +62,6 @@ public final class RestAPI$createOrFetchDM$1<T, R> implements b<Map<Long, ? exte
             }
         }
         T t2 = t;
-        return t2 != null ? new j(t2) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.access$get_api$p(this.this$0).userCreateChannel(new RestAPIParams.CreateChannel(this.$userId)), false, 1, null).s(AnonymousClass1.INSTANCE);
+        return t2 != null ? new j(t2) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.access$get_api$p(this.this$0).userCreateChannel(new RestAPIParams.CreateChannel(this.$userId)), false, 1, null).t(AnonymousClass1.INSTANCE);
     }
 }
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 df3720acf3..7f9b8932d5 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java
@@ -223,7 +223,7 @@ public final class RestAPI implements RestAPIInterface {
             a aVar = new a(new RestAPI$Companion$buildLoggingInterceptor$1());
             a.EnumC0314a aVar2 = a.EnumC0314a.BASIC;
             m.checkParameterIsNotNull(aVar2, "<set-?>");
-            aVar.f3009c = aVar2;
+            aVar.f3007c = aVar2;
             return aVar;
         }
 
@@ -574,11 +574,11 @@ public final class RestAPI implements RestAPIInterface {
 
     public final Observable<Channel> addGroupRecipients(long j, List<? extends User> list) {
         m.checkNotNullParameter(list, "recipients");
-        Observable<Channel> w2 = StoreStream.Companion.getChannels().observePrivateChannel(j).w(RestAPI$addGroupRecipients$1.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "StoreStream\n          .g…nnel -> channel != null }");
-        Observable X = ObservableExtensionsKt.takeSingleUntilTimeout$default(w2, 0, false, 3, null).X(new RestAPI$addGroupRecipients$2(this, j, list)).X(new RestAPI$addGroupRecipients$3(this, j, list)).X(RestAPI$addGroupRecipients$4.INSTANCE);
-        m.checkNotNullExpressionValue(X, "StoreStream\n          .g….filterNull()\n          }");
-        return ObservableExtensionsKt.takeSingleUntilTimeout$default(X, 0, false, 3, null);
+        Observable<Channel> x2 = StoreStream.Companion.getChannels().observePrivateChannel(j).x(RestAPI$addGroupRecipients$1.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "StoreStream\n          .g…nnel -> channel != null }");
+        Observable Y = ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, false, 3, null).Y(new RestAPI$addGroupRecipients$2(this, j, list)).Y(new RestAPI$addGroupRecipients$3(this, j, list)).Y(RestAPI$addGroupRecipients$4.INSTANCE);
+        m.checkNotNullExpressionValue(Y, "StoreStream\n          .g….filterNull()\n          }");
+        return ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -710,9 +710,9 @@ public final class RestAPI implements RestAPIInterface {
 
     public final Observable<Channel> createGroupDM(List<Long> list) {
         m.checkNotNullParameter(list, "userIds");
-        Observable<Channel> s = ObservableExtensionsKt.restSubscribeOn$default(this._api.userCreateChannel(new RestAPIParams.CreateChannel(list)), false, 1, null).s(RestAPI$createGroupDM$1.INSTANCE);
-        m.checkNotNullExpressionValue(s, "_api\n      .userCreateCh…pCreated(channel)\n      }");
-        return s;
+        Observable<Channel> t = ObservableExtensionsKt.restSubscribeOn$default(this._api.userCreateChannel(new RestAPIParams.CreateChannel(list)), false, 1, null).t(RestAPI$createGroupDM$1.INSTANCE);
+        m.checkNotNullExpressionValue(t, "_api\n      .userCreateCh…pCreated(channel)\n      }");
+        return t;
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -772,9 +772,9 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     public final Observable<Channel> createOrFetchDM(long j) {
-        Observable<Channel> X = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observePrivateChannels(), 0, false, 3, null).X(new RestAPI$createOrFetchDM$1(this, j));
-        m.checkNotNullExpressionValue(X, "StoreStream\n          .g…            }\n          }");
-        return X;
+        Observable<Channel> Y = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observePrivateChannels(), 0, false, 3, null).Y(new RestAPI$createOrFetchDM$1(this, j));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+        return Y;
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1149,9 +1149,9 @@ public final class RestAPI implements RestAPIInterface {
         if (dynamic == null) {
             m.throwUninitializedPropertyAccessException("apiClientVersions");
         }
-        Observable<R> E = dynamic.get("https://dl.discordapp.net/apps/android/versions.json").E(RestAPI$getClientVersion$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "apiClientVersions\n      …n_version\")?.asInt ?: 0 }");
-        return ObservableExtensionsKt.restSubscribeOn$default(E, false, 1, null);
+        Observable<R> F = dynamic.get("https://dl.discordapp.net/apps/android/versions.json").F(RestAPI$getClientVersion$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "apiClientVersions\n      …n_version\")?.asInt ?: 0 }");
+        return ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1329,9 +1329,9 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     public final Observable<HarvestState> getHarvestStatusGuarded() {
-        Observable<R> E = this._api.getHarvestStatus().E(RestAPI$getHarvestStatusGuarded$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "_api.getHarvestStatus()\n…erRequested()\n          }");
-        return ObservableExtensionsKt.restSubscribeOn(E, false);
+        Observable<R> F = this._api.getHarvestStatus().F(RestAPI$getHarvestStatusGuarded$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "_api.getHarvestStatus()\n…erRequested()\n          }");
+        return ObservableExtensionsKt.restSubscribeOn(F, false);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils.java b/app/src/main/java/com/discord/utilities/rest/SendUtils.java
index e305a912a8..b953c68108 100644
--- a/app/src/main/java/com/discord/utilities/rest/SendUtils.java
+++ b/app/src/main/java/com/discord/utilities/rest/SendUtils.java
@@ -439,7 +439,7 @@ public final class SendUtils {
                 arrayList.add(INSTANCE.getPart((Attachment) obj, contentResolver, a.l("file", i)));
                 i = i2;
             }
-            Observable<SendPayload> m = Observable.m(jVar2, Observable.l(Observable.g0(new q(arrayList))).e0().E(new SendUtils$getSendPayload$2(message2)));
+            Observable<SendPayload> m = Observable.m(jVar2, Observable.l(Observable.h0(new q(arrayList))).f0().F(new SendUtils$getSendPayload$2(message2)));
             m.checkNotNullExpressionValue(m, "Observable.concat(\n     …)\n              }\n      )");
             return m;
         }
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
index 45b8857ee7..1809834020 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
@@ -33,10 +33,10 @@ public final class ObservableExtensionsKt {
         ObservableExtensionsKt$appSubscribe$subscription$1 observableExtensionsKt$appSubscribe$subscription$1 = new ObservableExtensionsKt$appSubscribe$subscription$1(str, function13, weakReference, function02);
         ObservableExtensionsKt$appSubscribe$subscription$2 observableExtensionsKt$appSubscribe$subscription$2 = new ObservableExtensionsKt$appSubscribe$subscription$2(function0, function02);
         Objects.requireNonNull(observable);
-        Subscription T = observable.T(new b(observableExtensionsKt$sam$rx_functions_Action1$0, observableExtensionsKt$appSubscribe$subscription$1, observableExtensionsKt$appSubscribe$subscription$2));
+        Subscription U = observable.U(new b(observableExtensionsKt$sam$rx_functions_Action1$0, observableExtensionsKt$appSubscribe$subscription$1, observableExtensionsKt$appSubscribe$subscription$2));
         if (function1 != null) {
-            m.checkNotNullExpressionValue(T, Traits.Payment.Type.SUBSCRIPTION);
-            function1.invoke(T);
+            m.checkNotNullExpressionValue(U, Traits.Payment.Type.SUBSCRIPTION);
+            function1.invoke(U);
         }
     }
 
@@ -62,13 +62,13 @@ public final class ObservableExtensionsKt {
     public static final <T> Observable<T> bindToComponentLifecycle(Observable<T> observable, AppComponent appComponent, MGRecyclerAdapterSimple<?> mGRecyclerAdapterSimple) {
         m.checkNotNullParameter(observable, "$this$bindToComponentLifecycle");
         m.checkNotNullParameter(appComponent, "appComponent");
-        Observable<T> Z = observable.Z(appComponent.getUnsubscribeSignal());
+        Observable<T> a02 = observable.a0(appComponent.getUnsubscribeSignal());
         if (appComponent instanceof Fragment) {
-            Z = Z.w(new ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1(appComponent));
+            a02 = a02.x(new ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1(appComponent));
         }
-        Observable<T> u = Z.u(new ObservableExtensionsKt$bindToComponentLifecycle$2(mGRecyclerAdapterSimple));
-        m.checkNotNullExpressionValue(u, "takeUntil(appComponent.u…beFromUpdates()\n        }");
-        return u;
+        Observable<T> v = a02.v(new ObservableExtensionsKt$bindToComponentLifecycle$2(mGRecyclerAdapterSimple));
+        m.checkNotNullExpressionValue(v, "takeUntil(appComponent.u…beFromUpdates()\n        }");
+        return v;
     }
 
     public static /* synthetic */ Observable bindToComponentLifecycle$default(Observable observable, AppComponent appComponent, MGRecyclerAdapterSimple mGRecyclerAdapterSimple, int i, Object obj) {
@@ -80,31 +80,31 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> computationBuffered(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$computationBuffered");
-        Observable<T> H = observable.I().W(a.a()).H(a.a());
-        m.checkNotNullExpressionValue(H, "onBackpressureBuffer()\n …Schedulers.computation())");
-        return H;
+        Observable<T> I = observable.J().X(a.a()).I(a.a());
+        m.checkNotNullExpressionValue(I, "onBackpressureBuffer()\n …Schedulers.computation())");
+        return I;
     }
 
     public static final <T> Observable<T> computationLatest(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$computationLatest");
-        Observable<T> H = observable.J().W(a.a()).H(a.a());
-        m.checkNotNullExpressionValue(H, "onBackpressureLatest()\n …Schedulers.computation())");
-        return H;
+        Observable<T> I = observable.K().X(a.a()).I(a.a());
+        m.checkNotNullExpressionValue(I, "onBackpressureLatest()\n …Schedulers.computation())");
+        return I;
     }
 
     public static final /* synthetic */ <T> Observable<T> filterIs(Observable<?> observable) {
         m.checkNotNullParameter(observable, "$this$filterIs");
         m.needClassReification();
-        Observable<?> w2 = observable.w(ObservableExtensionsKt$filterIs$1.INSTANCE);
+        Observable<?> x2 = observable.x(ObservableExtensionsKt$filterIs$1.INSTANCE);
         m.needClassReification();
-        Observable<T> observable2 = (Observable<T>) w2.E(ObservableExtensionsKt$filterIs$2.INSTANCE);
+        Observable<T> observable2 = (Observable<T>) x2.F(ObservableExtensionsKt$filterIs$2.INSTANCE);
         m.checkNotNullExpressionValue(observable2, "filter { it is T }.map { it as T }");
         return observable2;
     }
 
     public static final /* synthetic */ <T> Observable<T> filterNull(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$filterNull");
-        Observable<T> observable2 = (Observable<T>) observable.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        Observable<T> observable2 = (Observable<T>) observable.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
         m.checkNotNullExpressionValue(observable2, "filter { it != null }.map { it!! }");
         return observable2;
     }
@@ -112,21 +112,21 @@ public final class ObservableExtensionsKt {
     public static final <T> Observable<T> leadingEdgeThrottle(Observable<T> observable, long j, TimeUnit timeUnit) {
         m.checkNotNullParameter(observable, "$this$leadingEdgeThrottle");
         m.checkNotNullParameter(timeUnit, "timeUnit");
-        Observable<T> g02 = Observable.g0(new r(observable.i, new LeadingEdgeThrottle(j, timeUnit)));
-        m.checkNotNullExpressionValue(g02, "lift(LeadingEdgeThrottle…indowDuration, timeUnit))");
-        return g02;
+        Observable<T> h02 = Observable.h0(new r(observable.i, new LeadingEdgeThrottle(j, timeUnit)));
+        m.checkNotNullExpressionValue(h02, "lift(LeadingEdgeThrottle…indowDuration, timeUnit))");
+        return h02;
     }
 
     public static final <T> Observable<T> restSubscribeOn(Observable<T> observable, boolean z2) {
         m.checkNotNullParameter(observable, "$this$restSubscribeOn");
-        Observable<T> W = observable.W(a.c());
+        Observable<T> X = observable.X(a.c());
         if (z2) {
             RetryWithDelay retryWithDelay = RetryWithDelay.INSTANCE;
-            m.checkNotNullExpressionValue(W, "observable");
-            W = RetryWithDelay.restRetry$default(retryWithDelay, W, 0, null, null, 7, null);
+            m.checkNotNullExpressionValue(X, "observable");
+            X = RetryWithDelay.restRetry$default(retryWithDelay, X, 0, null, null, 7, null);
         }
-        m.checkNotNullExpressionValue(W, "subscribeOn(Schedulers.i… observable\n      }\n    }");
-        return W;
+        m.checkNotNullExpressionValue(X, "subscribeOn(Schedulers.i… observable\n      }\n    }");
+        return X;
     }
 
     public static /* synthetic */ Observable restSubscribeOn$default(Observable observable, boolean z2, int i, Object obj) {
@@ -138,10 +138,10 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> takeSingleUntilTimeout(Observable<T> observable, long j, boolean z2) {
         m.checkNotNullParameter(observable, "$this$takeSingleUntilTimeout");
-        Observable<T> Y = observable.Y(1);
-        Observable<T> b02 = z2 ? Y.b0(j, TimeUnit.MILLISECONDS) : Y.Z(Observable.c0(j, TimeUnit.MILLISECONDS));
-        m.checkNotNullExpressionValue(b02, "take(1).let {\n      if (…LISECONDS))\n      }\n    }");
-        return computationLatest(b02);
+        Observable<T> Z = observable.Z(1);
+        Observable<T> c02 = z2 ? Z.c0(j, TimeUnit.MILLISECONDS) : Z.a0(Observable.d0(j, TimeUnit.MILLISECONDS));
+        m.checkNotNullExpressionValue(c02, "take(1).let {\n      if (…LISECONDS))\n      }\n    }");
+        return computationLatest(c02);
     }
 
     public static /* synthetic */ Observable takeSingleUntilTimeout$default(Observable observable, long j, boolean z2, int i, Object obj) {
@@ -156,9 +156,9 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> ui(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$ui");
-        Observable<T> H = observable.H(i0.j.b.a.a());
-        m.checkNotNullExpressionValue(H, "observeOn(AndroidSchedulers.mainThread())");
-        return H;
+        Observable<T> I = observable.I(i0.j.b.a.a());
+        m.checkNotNullExpressionValue(I, "observeOn(AndroidSchedulers.mainThread())");
+        return I;
     }
 
     public static final <T> Observable<T> ui(Observable<T> observable, AppComponent appComponent, MGRecyclerAdapterSimple<?> mGRecyclerAdapterSimple) {
@@ -176,9 +176,9 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> withDimmer(Observable<T> observable, DimmerView dimmerView, long j) {
         m.checkNotNullParameter(observable, "$this$withDimmer");
-        Observable<T> g02 = Observable.g0(new r(observable.i, new OnDelayedEmissionHandler(new ObservableExtensionsKt$withDimmer$1(dimmerView), j, TimeUnit.MILLISECONDS, null, 8, null)));
-        m.checkNotNullExpressionValue(g02, "lift(\n        OnDelayedE…LISECONDS\n        )\n    )");
-        return g02;
+        Observable<T> h02 = Observable.h0(new r(observable.i, new OnDelayedEmissionHandler(new ObservableExtensionsKt$withDimmer$1(dimmerView), j, TimeUnit.MILLISECONDS, null, 8, null)));
+        m.checkNotNullExpressionValue(h02, "lift(\n        OnDelayedE…LISECONDS\n        )\n    )");
+        return h02;
     }
 
     public static /* synthetic */ Observable withDimmer$default(Observable observable, DimmerView dimmerView, long j, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java b/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java
index 8aac25b61e..4d8d84a55d 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java
@@ -56,7 +56,7 @@ public class ObservableWithLeadingEdgeThrottle {
 
     private static <T, R> Observable<R> combineLatest(List<? extends Observable<? extends T>> list, FuncN<? extends R> funcN, long j, TimeUnit timeUnit, Scheduler scheduler) {
         Observable b = Observable.b(list, IDENTITY_FUNC_N);
-        return Observable.g0(new r(b.i, new LeadingEdgeThrottle(j, timeUnit, scheduler))).E(new AnonymousClass2(funcN));
+        return Observable.h0(new r(b.i, new LeadingEdgeThrottle(j, timeUnit, scheduler))).F(new AnonymousClass2(funcN));
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLatest(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Observable<? extends T8> observable8, Observable<? extends T9> observable9, Func9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> func9, long j, TimeUnit timeUnit) {
diff --git a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
index 45cc7cb11c..8a8b12589f 100644
--- a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
+++ b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
@@ -23,9 +23,9 @@ public final class OnDelayedEmissionHandler$call$wrappedSubscriber$1 extends Sub
         if (access$getDelaySubscription$p != null) {
             access$getDelaySubscription$p.unsubscribe();
         }
-        Observable<T> H = new j(null).H(OnDelayedEmissionHandler.access$getScheduler$p(this.this$0));
-        m.checkNotNullExpressionValue(H, "Observable\n            .…    .observeOn(scheduler)");
-        ObservableExtensionsKt.appSubscribe$default(H, OnDelayedEmissionHandler$call$wrappedSubscriber$1.class, (Context) null, (Function1) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2(this), (Function0) null, (Function0) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1(this), 54, (Object) null);
+        Observable<T> I = new j(null).I(OnDelayedEmissionHandler.access$getScheduler$p(this.this$0));
+        m.checkNotNullExpressionValue(I, "Observable\n            .…    .observeOn(scheduler)");
+        ObservableExtensionsKt.appSubscribe$default(I, OnDelayedEmissionHandler$call$wrappedSubscriber$1.class, (Context) null, (Function1) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2(this), (Function0) null, (Function0) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1(this), 54, (Object) null);
     }
 
     @Override // i0.g
diff --git a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java
index fd771d7380..94282abdd6 100644
--- a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java
+++ b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java
@@ -74,10 +74,10 @@ public final class OnDelayedEmissionHandler<T> implements Observable.b<T, T> {
     public Subscriber<? super T> call(Subscriber<? super T> subscriber) {
         m.checkNotNullParameter(subscriber, "subscriber");
         OnDelayedEmissionHandler$call$wrappedSubscriber$1 onDelayedEmissionHandler$call$wrappedSubscriber$1 = new OnDelayedEmissionHandler$call$wrappedSubscriber$1(this, subscriber);
-        Observable<Long> H = Observable.c0(this.timeout, this.unit).H(this.scheduler);
-        m.checkNotNullExpressionValue(H, "Observable\n        .time…    .observeOn(scheduler)");
+        Observable<Long> I = Observable.d0(this.timeout, this.unit).I(this.scheduler);
+        m.checkNotNullExpressionValue(I, "Observable\n        .time…    .observeOn(scheduler)");
         OnDelayedEmissionHandler$call$1 onDelayedEmissionHandler$call$1 = new OnDelayedEmissionHandler$call$1(this);
-        ObservableExtensionsKt.appSubscribe$default(H, OnDelayedEmissionHandler.class, (Context) null, new OnDelayedEmissionHandler$call$3(this), new OnDelayedEmissionHandler$call$2(onDelayedEmissionHandler$call$wrappedSubscriber$1), (Function0) null, (Function0) null, onDelayedEmissionHandler$call$1, 50, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(I, OnDelayedEmissionHandler.class, (Context) null, new OnDelayedEmissionHandler$call$3(this), new OnDelayedEmissionHandler$call$2(onDelayedEmissionHandler$call$wrappedSubscriber$1), (Function0) null, (Function0) null, onDelayedEmissionHandler$call$1, 50, (Object) null);
         return onDelayedEmissionHandler$call$wrappedSubscriber$1;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java b/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java
index 9dd559fa18..93e429112a 100644
--- a/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java
+++ b/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java
@@ -44,9 +44,9 @@ public final class OperatorBufferedDelay<T> implements Observable.b<List<? exten
             m.checkNotNullParameter(observable, "$this$bufferedDelay");
             m.checkNotNullParameter(timeUnit, "timeUnit");
             m.checkNotNullParameter(scheduler, "scheduler");
-            Observable<List<T>> g02 = Observable.g0(new r(observable.i, new OperatorBufferedDelay(j, timeUnit, i, scheduler)));
-            m.checkNotNullExpressionValue(g02, "this.lift(OperatorBuffer…meUnit, size, scheduler))");
-            return g02;
+            Observable<List<T>> h02 = Observable.h0(new r(observable.i, new OperatorBufferedDelay(j, timeUnit, i, scheduler)));
+            m.checkNotNullExpressionValue(h02, "this.lift(OperatorBuffer…meUnit, size, scheduler))");
+            return h02;
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java b/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java
index adf5cbeb46..bca5652aeb 100644
--- a/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java
@@ -10,15 +10,15 @@ import rx.Observable;
 /* compiled from: RxCoroutineUtils.kt */
 public final class RxCoroutineUtilsKt {
     public static final <T> Object awaitFirst(Observable<T> observable, Continuation<? super T> continuation) {
-        Observable<T> x2 = observable.x();
-        m.checkNotNullExpressionValue(x2, "first()");
-        return awaitSingle(x2, continuation);
+        Observable<T> y2 = observable.y();
+        m.checkNotNullExpressionValue(y2, "first()");
+        return awaitSingle(y2, continuation);
     }
 
     public static final <T> Object awaitSingle(Observable<T> observable, Continuation<? super T> continuation) {
         k kVar = new k(b.intercepted(continuation), 1);
         kVar.A();
-        kVar.e(new RxCoroutineUtilsKt$awaitSingle$2$1(observable.Q().V(new RxCoroutineUtilsKt$awaitSingle$2$subscription$1(kVar), new RxCoroutineUtilsKt$awaitSingle$2$subscription$2(kVar))));
+        kVar.e(new RxCoroutineUtilsKt$awaitSingle$2$1(observable.R().W(new RxCoroutineUtilsKt$awaitSingle$2$subscription$1(kVar), new RxCoroutineUtilsKt$awaitSingle$2$subscription$2(kVar))));
         Object u = kVar.u();
         if (u == c.getCOROUTINE_SUSPENDED()) {
             g.probeCoroutineSuspended(continuation);
diff --git a/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java b/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java
index 47cd034786..540dc1d09c 100644
--- a/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java
+++ b/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java
@@ -183,25 +183,25 @@ public final class MGPreferenceSearchHistoryCache implements SearchHistoryCache
     @Override // com.discord.utilities.search.history.SearchHistoryCache
     public void clear(StoreSearch.SearchTarget searchTarget) {
         m.checkNotNullParameter(searchTarget, "searchTarget");
-        Observable<R> E = this.backingCache.getObservable().Y(1).E(new MGPreferenceSearchHistoryCache$clear$1(this, searchTarget));
-        m.checkNotNullExpressionValue(E, "backingCache\n        .ge…veAndCopy(searchTarget) }");
-        ObservableExtensionsKt.appSubscribe$default(E, (Context) null, "clear history", (Function1) null, new MGPreferenceSearchHistoryCache$clear$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<R> F = this.backingCache.getObservable().Z(1).F(new MGPreferenceSearchHistoryCache$clear$1(this, searchTarget));
+        m.checkNotNullExpressionValue(F, "backingCache\n        .ge…veAndCopy(searchTarget) }");
+        ObservableExtensionsKt.appSubscribe$default(F, (Context) null, "clear history", (Function1) null, new MGPreferenceSearchHistoryCache$clear$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     @Override // com.discord.utilities.search.history.SearchHistoryCache
     public Observable<Collection<List<QueryNode>>> getHistory(StoreSearch.SearchTarget searchTarget) {
         m.checkNotNullParameter(searchTarget, "searchTarget");
-        Observable<R> E = this.backingCache.getObservable().E(new MGPreferenceSearchHistoryCache$getHistory$1(this, searchTarget));
-        m.checkNotNullExpressionValue(E, "backingCache\n        .ge…{ it.find(searchTarget) }");
-        return E;
+        Observable<R> F = this.backingCache.getObservable().F(new MGPreferenceSearchHistoryCache$getHistory$1(this, searchTarget));
+        m.checkNotNullExpressionValue(F, "backingCache\n        .ge…{ it.find(searchTarget) }");
+        return F;
     }
 
     @Override // com.discord.utilities.search.history.SearchHistoryCache
     public void persistQuery(StoreSearch.SearchTarget searchTarget, List<? extends QueryNode> list) {
         m.checkNotNullParameter(searchTarget, "searchTarget");
         m.checkNotNullParameter(list, "query");
-        Observable<R> E = this.backingCache.getObservable().Y(1).E(new MGPreferenceSearchHistoryCache$persistQuery$1(this, searchTarget, list));
-        m.checkNotNullExpressionValue(E, "backingCache\n        .ge…py(searchTarget, query) }");
-        ObservableExtensionsKt.appSubscribe$default(E, (Context) null, "persist query", (Function1) null, new MGPreferenceSearchHistoryCache$persistQuery$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<R> F = this.backingCache.getObservable().Z(1).F(new MGPreferenceSearchHistoryCache$persistQuery$1(this, searchTarget, list));
+        m.checkNotNullExpressionValue(F, "backingCache\n        .ge…py(searchTarget, query) }");
+        ObservableExtensionsKt.appSubscribe$default(F, (Context) null, "persist query", (Function1) null, new MGPreferenceSearchHistoryCache$persistQuery$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java
index 3a67baf191..46c78e30d1 100644
--- a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java
+++ b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java
@@ -18,7 +18,7 @@ public final class SearchFetcher$makeQuery$2<T, R> implements b<Observable<? ext
         }
 
         public final Observable<? extends Long> call(Void r3) {
-            return Observable.c0(this.this$0.$resubscribeDelayMillis.get(), TimeUnit.MILLISECONDS);
+            return Observable.d0(this.this$0.$resubscribeDelayMillis.get(), TimeUnit.MILLISECONDS);
         }
     }
 
@@ -28,6 +28,6 @@ public final class SearchFetcher$makeQuery$2<T, R> implements b<Observable<? ext
 
     /* JADX DEBUG: Type inference failed for r2v1. Raw type applied. Possible types: rx.Observable<R>, rx.Observable<?> */
     public final Observable<?> call(Observable<? extends Void> observable) {
-        return (Observable<R>) observable.y(new AnonymousClass1(this));
+        return (Observable<R>) observable.z(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java
index fdf3c90e80..2a60f9e354 100644
--- a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java
+++ b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java
@@ -42,9 +42,9 @@ public class SearchFetcher {
 
     private final Observable<ModelSearchResponse> getRestObservable(StoreSearch.SearchTarget searchTarget, Long l, SearchQuery searchQuery) {
         SearchFetcher$getRestObservable$1 searchFetcher$getRestObservable$1 = SearchFetcher$getRestObservable$1.INSTANCE;
-        Observable y2 = Observable.g0(new j(new SearchFetcher$getRestObservable$2(this))).y(new SearchFetcher$getRestObservable$3(searchTarget, l, searchQuery.getParams(), searchQuery));
-        m.checkNotNullExpressionValue(y2, "Observable\n        .defe…  )\n          }\n        }");
-        return ObservableExtensionsKt.restSubscribeOn$default(y2, false, 1, null);
+        Observable z2 = Observable.h0(new j(new SearchFetcher$getRestObservable$2(this))).z(new SearchFetcher$getRestObservable$3(searchTarget, l, searchQuery.getParams(), searchQuery));
+        m.checkNotNullExpressionValue(z2, "Observable\n        .defe…  )\n          }\n        }");
+        return ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null);
     }
 
     private final boolean isIndexing(ModelSearchResponse modelSearchResponse) {
@@ -56,11 +56,11 @@ public class SearchFetcher {
         m.checkNotNullParameter(searchTarget, "searchTarget");
         m.checkNotNullParameter(searchQuery, "searchQuery");
         AtomicLong atomicLong = new AtomicLong();
-        Observable<ModelSearchResponse> s = getRestObservable(searchTarget, l, searchQuery).s(new SearchFetcher$makeQuery$1(this, atomicLong));
+        Observable<ModelSearchResponse> t = getRestObservable(searchTarget, l, searchQuery).t(new SearchFetcher$makeQuery$1(this, atomicLong));
         e.c cVar = new e.c(new SearchFetcher$makeQuery$2(atomicLong));
         AtomicReference<a> atomicReference = a.a;
-        Observable<ModelSearchResponse> a02 = Observable.g0(new y(s, cVar, false, true, i0.l.c.m.a)).a0(new SearchFetcher$makeQuery$3(this));
-        m.checkNotNullExpressionValue(a02, "getRestObservable(search…ntil { !it.isIndexing() }");
-        return a02;
+        Observable<ModelSearchResponse> b02 = Observable.h0(new y(t, cVar, false, true, i0.l.c.m.a)).b0(new SearchFetcher$makeQuery$3(this));
+        m.checkNotNullExpressionValue(b02, "getRestObservable(search…ntil { !it.isIndexing() }");
+        return b02;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java b/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
index 78ff056bb9..d9a5c4bb33 100644
--- a/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
+++ b/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
@@ -47,7 +47,7 @@ public final class SearchSuggestionEngine {
     public static final SearchSuggestionEngine INSTANCE;
     private static final int MAX_ENTRY_TYPE_COUNT = 10;
     private static final int MAX_USER_SORTING_THRESHOLD = 100;
-    private static final SerializedSubject<CharSequence, CharSequence> membersRequestSubject = new SerializedSubject<>(PublishSubject.j0());
+    private static final SerializedSubject<CharSequence, CharSequence> membersRequestSubject = new SerializedSubject<>(PublishSubject.k0());
     private static Long targetGuildId;
 
     public final /* synthetic */ class WhenMappings {
@@ -233,12 +233,12 @@ public final class SearchSuggestionEngine {
     /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: rx.Observable<R>, rx.Observable */
     /* JADX WARNING: Unknown variable types count: 1 */
     private final void setupMemberRequestSubscription() {
-        Observable E = membersRequestSubject.N(750, TimeUnit.MILLISECONDS).E(SearchSuggestionEngine$setupMemberRequestSubscription$1.INSTANCE);
+        Observable F = membersRequestSubject.O(750, TimeUnit.MILLISECONDS).F(SearchSuggestionEngine$setupMemberRequestSubscription$1.INSTANCE);
         SearchSuggestionEngine$setupMemberRequestSubscription$2 searchSuggestionEngine$setupMemberRequestSubscription$2 = SearchSuggestionEngine$setupMemberRequestSubscription$2.INSTANCE;
         if (searchSuggestionEngine$setupMemberRequestSubscription$2 != null) {
             searchSuggestionEngine$setupMemberRequestSubscription$2 = new SearchSuggestionEngine$sam$rx_functions_Func1$0(searchSuggestionEngine$setupMemberRequestSubscription$2);
         }
-        Observable q = E.w((b) searchSuggestionEngine$setupMemberRequestSubscription$2).q();
+        Observable q = F.x((b) searchSuggestionEngine$setupMemberRequestSubscription$2).q();
         m.checkNotNullExpressionValue(q, "membersRequestSubject\n  …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(q, SearchSuggestionEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, SearchSuggestionEngine$setupMemberRequestSubscription$3.INSTANCE, 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java b/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java
index d4a32ff968..0e9eb0efdf 100644
--- a/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java
+++ b/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java
@@ -19,7 +19,7 @@ import rx.subjects.BehaviorSubject;
 public final class SpotifyApiClient {
     private final Clock clock;
     private String spotifyAccountId;
-    private final BehaviorSubject<ModelSpotifyTrack> spotifyTrackSubject = BehaviorSubject.j0();
+    private final BehaviorSubject<ModelSpotifyTrack> spotifyTrackSubject = BehaviorSubject.k0();
     private final HashMap<String, ModelSpotifyTrack> spotifyTracks = new HashMap<>();
     private long tokenExpiresAt;
     private Subscription tokenSubscription;
diff --git a/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java b/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java
index 96e9477cb6..97b85ee56c 100644
--- a/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java
+++ b/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java
@@ -357,9 +357,9 @@ public final class StickerUtils {
             m.checkNotNullExpressionValue(jVar3, "Observable.just(null)");
             return jVar3;
         } else {
-            Observable<Sticker> s = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getSticker(j), false, 1, null).s(StickerUtils$getGuildOrStandardSticker$1.INSTANCE);
-            m.checkNotNullExpressionValue(s, "RestAPI\n        .api\n   …fetchedSticker)\n        }");
-            return s;
+            Observable<Sticker> t = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getSticker(j), false, 1, null).t(StickerUtils$getGuildOrStandardSticker$1.INSTANCE);
+            m.checkNotNullExpressionValue(t, "RestAPI\n        .api\n   …fetchedSticker)\n        }");
+            return t;
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java b/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
index baf1434b68..9e9b064584 100644
--- a/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
+++ b/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
@@ -115,7 +115,7 @@ public final class StreamContextService$getForUser$1<T, R> implements b<ModelApp
         Observable<Long> observePermissionsForChannel = StreamContextService.access$getPermissionsStore$p(this.this$0).observePermissionsForChannel(modelApplicationStream.getChannelId());
         Observable<User> observeUser = StreamContextService.access$getUserStore$p(this.this$0).observeUser(this.$userId);
         Observable observeMe$default = StoreUser.observeMe$default(StreamContextService.access$getUserStore$p(this.this$0), false, 1, null);
-        Observable<R> q = StreamContextService.access$getGuildStore$p(this.this$0).observeComputed(j).E(new AnonymousClass1(this)).E(AnonymousClass2.INSTANCE).q();
+        Observable<R> q = StreamContextService.access$getGuildStore$p(this.this$0).observeComputed(j).F(new AnonymousClass1(this)).F(AnonymousClass2.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "guildStore\n             …  .distinctUntilChanged()");
         return ObservableCombineLatestOverloadsKt.combineLatest(observeGuild, access$getPreviewObservable, observePermissionsForChannel, observeUser, observeMe$default, q, StreamContextService.access$getVoiceStateStore$p(this.this$0).observe(j, modelApplicationStream.getChannelId()), StreamContextService.access$getChannelStore$p(this.this$0).observeChannel(modelApplicationStream.getChannelId()), StreamContextService.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId(), StreamContextService.access$getApplicationStreamingStore$p(this.this$0).observeActiveStream(), new AnonymousClass3(modelApplicationStream));
     }
diff --git a/app/src/main/java/com/discord/utilities/streams/StreamContextService.java b/app/src/main/java/com/discord/utilities/streams/StreamContextService.java
index cf6d196c62..a8ff028c76 100644
--- a/app/src/main/java/com/discord/utilities/streams/StreamContextService.java
+++ b/app/src/main/java/com/discord/utilities/streams/StreamContextService.java
@@ -100,20 +100,20 @@ public final class StreamContextService {
     }
 
     public final Observable<StreamContext> getForActiveStream() {
-        Observable<R> X = this.applicationStreamingStore.observeActiveStream().X(new StreamContextService$getForActiveStream$1(this));
-        m.checkNotNullExpressionValue(X, "applicationStreamingStor…  )\n          }\n        }");
-        return X;
+        Observable<R> Y = this.applicationStreamingStore.observeActiveStream().Y(new StreamContextService$getForActiveStream$1(this));
+        m.checkNotNullExpressionValue(Y, "applicationStreamingStor…  )\n          }\n        }");
+        return Y;
     }
 
     public final Observable<Map<Long, StreamContext>> getForAllStreamingUsers() {
-        Observable<Map<Long, StreamContext>> X = this.applicationStreamingStore.observeStreamsByUser().E(StreamContextService$getForAllStreamingUsers$1.INSTANCE).X(new StreamContextService$getForAllStreamingUsers$2(this));
-        m.checkNotNullExpressionValue(X, "applicationStreamingStor…  }\n          }\n        }");
-        return X;
+        Observable<Map<Long, StreamContext>> Y = this.applicationStreamingStore.observeStreamsByUser().F(StreamContextService$getForAllStreamingUsers$1.INSTANCE).Y(new StreamContextService$getForAllStreamingUsers$2(this));
+        m.checkNotNullExpressionValue(Y, "applicationStreamingStor…  }\n          }\n        }");
+        return Y;
     }
 
     public final Observable<StreamContext> getForUser(long j, boolean z2) {
-        Observable<R> X = this.applicationStreamingStore.observeStreamsForUser(j).X(new StreamContextService$getForUser$1(this, z2, j));
-        m.checkNotNullExpressionValue(X, "applicationStreamingStor…  }\n          }\n        }");
-        return X;
+        Observable<R> Y = this.applicationStreamingStore.observeStreamsForUser(j).Y(new StreamContextService$getForUser$1(this, z2, j));
+        m.checkNotNullExpressionValue(Y, "applicationStreamingStor…  }\n          }\n        }");
+        return Y;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java b/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
index faad986894..f51825a856 100644
--- a/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
+++ b/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
@@ -90,9 +90,9 @@ public final class SurveyUtils {
             m.checkNotNullExpressionValue(jVar, "Observable.just(Survey.None)");
             return jVar;
         }
-        Observable<R> E = StoreStream.Companion.getUserSurvey().observeUserSurvey().E(SurveyUtils$getSurveyToShow$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get…  )\n          }\n        }");
-        return E;
+        Observable<R> F = StoreStream.Companion.getUserSurvey().observeUserSurvey().F(SurveyUtils$getSurveyToShow$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…  )\n          }\n        }");
+        return F;
     }
 
     public final void init(Application application) {
diff --git a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
index 4f001420ed..5d6b36138c 100644
--- a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
+++ b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
@@ -212,9 +212,9 @@ public final class SystemLogUtils {
             m.checkNotNullExpressionValue(jVar, "Observable.just(output)");
             return jVar;
         }
-        Observable<LinkedList<String>> W = Observable.B(new SystemLogUtils$fetch$1(linkedList, regex, z2)).W(i0.p.a.b().d);
-        m.checkNotNullExpressionValue(W, "Observable.fromCallable …n(Schedulers.newThread())");
-        return W;
+        Observable<LinkedList<String>> X = Observable.C(new SystemLogUtils$fetch$1(linkedList, regex, z2)).X(i0.p.a.b().d);
+        m.checkNotNullExpressionValue(X, "Observable.fromCallable …n(Schedulers.newThread())");
+        return X;
     }
 
     private final String hashString(String str) {
@@ -252,9 +252,9 @@ public final class SystemLogUtils {
     }
 
     public final Observable<Tombstone> fetchLastTombstone() {
-        Observable<R> y2 = fetch(regexExtractTombstone).y(SystemLogUtils$fetchLastTombstone$1.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "fetch(regexExtractTombst…ble.just(tombstone)\n    }");
-        return y2;
+        Observable<R> z2 = fetch(regexExtractTombstone).z(SystemLogUtils$fetchLastTombstone$1.INSTANCE);
+        m.checkNotNullExpressionValue(z2, "fetch(regexExtractTombst…ble.just(tombstone)\n    }");
+        return z2;
     }
 
     public final Tombstone fetchLastTombstone$app_productionGoogleRelease(Collection<String> collection) {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
index 22ef211ca5..90f8d12e07 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
@@ -226,7 +226,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
         public static final class Custom extends EmojiIdAndType {
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2610id;
+            private final long f2608id;
             private final boolean isAnimated;
             private final String name;
 
@@ -234,14 +234,14 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             public Custom(long j, boolean z2, String str) {
                 super(null);
                 m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
-                this.f2610id = j;
+                this.f2608id = j;
                 this.isAnimated = z2;
                 this.name = str;
             }
 
             public static /* synthetic */ Custom copy$default(Custom custom, long j, boolean z2, String str, int i, Object obj) {
                 if ((i & 1) != 0) {
-                    j = custom.f2610id;
+                    j = custom.f2608id;
                 }
                 if ((i & 2) != 0) {
                     z2 = custom.isAnimated;
@@ -253,7 +253,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             }
 
             public final long component1() {
-                return this.f2610id;
+                return this.f2608id;
             }
 
             public final boolean component2() {
@@ -278,11 +278,11 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
                     return false;
                 }
                 Custom custom = (Custom) obj;
-                return this.f2610id == custom.f2610id && this.isAnimated == custom.isAnimated && m.areEqual(this.name, custom.name);
+                return this.f2608id == custom.f2608id && this.isAnimated == custom.isAnimated && m.areEqual(this.name, custom.name);
             }
 
             public final long getId() {
-                return this.f2610id;
+                return this.f2608id;
             }
 
             public final String getName() {
@@ -291,7 +291,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
 
             @Override // java.lang.Object
             public int hashCode() {
-                int a = b.a(this.f2610id) * 31;
+                int a = b.a(this.f2608id) * 31;
                 boolean z2 = this.isAnimated;
                 if (z2) {
                     z2 = true;
@@ -311,7 +311,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             @Override // java.lang.Object
             public String toString() {
                 StringBuilder O = c.d.b.a.a.O("Custom(id=");
-                O.append(this.f2610id);
+                O.append(this.f2608id);
                 O.append(", isAnimated=");
                 O.append(this.isAnimated);
                 O.append(", name=");
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
index e78b680a21..083af12c87 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
@@ -17,7 +17,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
     private final String content;
 
     /* renamed from: id  reason: collision with root package name */
-    private int f2611id = -1;
+    private int f2609id = -1;
     private boolean isRevealed;
 
     /* compiled from: SpoilerNode.kt */
@@ -59,7 +59,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
     }
 
     public final int getId() {
-        return this.f2611id;
+        return this.f2609id;
     }
 
     @Override // com.discord.utilities.textprocessing.node.Spoilerable
@@ -102,7 +102,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
     }
 
     public final void updateState(int i, boolean z2) {
-        this.f2611id = i;
+        this.f2609id = i;
         setRevealed(z2);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java b/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java
index 3eda1d0f67..e7c94ca208 100644
--- a/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java
+++ b/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java
@@ -61,9 +61,9 @@ public final class VideoPlayerIdleDetector {
 
     private final void beginIdleDetectionTimer() {
         cancelIdleDetectionTimer();
-        Observable<Long> H = Observable.d0(this.idleDetectionMs, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler).H(this.idleDetectionScheduler);
-        m.checkNotNullExpressionValue(H, "Observable\n        .time…n(idleDetectionScheduler)");
-        ObservableExtensionsKt.appSubscribe$default(H, VideoPlayerIdleDetector.class, (Context) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$2(this), (Function1) null, (Function0) null, (Function0) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$1(this), 58, (Object) null);
+        Observable<Long> I = Observable.e0(this.idleDetectionMs, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler).I(this.idleDetectionScheduler);
+        m.checkNotNullExpressionValue(I, "Observable\n        .time…n(idleDetectionScheduler)");
+        ObservableExtensionsKt.appSubscribe$default(I, VideoPlayerIdleDetector.class, (Context) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$2(this), (Function1) null, (Function0) null, (Function0) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$1(this), 58, (Object) null);
     }
 
     private final void cancelIdleDetectionTimer() {
diff --git a/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java b/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java
index 0143e7c580..41e46e6b20 100644
--- a/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java
+++ b/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java
@@ -24,11 +24,11 @@ public abstract class RxViewController<V extends View, T> {
     private final <T> Subscription connectViewRx(View view, Observable<T> observable, Function1<? super T, Unit> function1) {
         Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
         ref$ObjectRef.element = null;
-        Observable<T> Z = observable.Z(new ViewDetachedFromWindowObservable(view).observe());
-        m.checkNotNullExpressionValue(Z, "observable\n        .take…servable(view).observe())");
-        Observable<T> w2 = ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(Z)).w(new RxViewController$connectViewRx$1(view));
-        m.checkNotNullExpressionValue(w2, "observable\n        .take…view.isAttachedToWindow }");
-        ObservableExtensionsKt.appSubscribe$default(w2, getClass(), (Context) null, new RxViewController$connectViewRx$2(ref$ObjectRef), (Function1) null, (Function0) null, (Function0) null, new RxViewController$connectViewRx$3(function1), 58, (Object) null);
+        Observable<T> a02 = observable.a0(new ViewDetachedFromWindowObservable(view).observe());
+        m.checkNotNullExpressionValue(a02, "observable\n        .take…servable(view).observe())");
+        Observable<T> x2 = ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(a02)).x(new RxViewController$connectViewRx$1(view));
+        m.checkNotNullExpressionValue(x2, "observable\n        .take…view.isAttachedToWindow }");
+        ObservableExtensionsKt.appSubscribe$default(x2, getClass(), (Context) null, new RxViewController$connectViewRx$2(ref$ObjectRef), (Function1) null, (Function0) null, (Function0) null, new RxViewController$connectViewRx$3(function1), 58, (Object) null);
         T t = ref$ObjectRef.element;
         if (t == null) {
             m.throwUninitializedPropertyAccessException("subscriptionResult");
diff --git a/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java b/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java
index eea222869b..7eab1e6a4b 100644
--- a/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java
+++ b/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java
@@ -7,7 +7,7 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: ViewDetachedFromWindowObservable.kt */
 public final class ViewDetachedFromWindowObservable implements View.OnAttachStateChangeListener {
-    private final BehaviorSubject<Unit> onDetachSubject = BehaviorSubject.j0();
+    private final BehaviorSubject<Unit> onDetachSubject = BehaviorSubject.k0();
 
     public ViewDetachedFromWindowObservable(View view) {
         m.checkNotNullParameter(view, "view");
diff --git a/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java b/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java
index d55fdf556c..1e81767980 100644
--- a/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java
+++ b/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java
@@ -5,7 +5,7 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: ViewVisibilityObserver.kt */
 public final class ViewVisibilityObserver {
-    private final BehaviorSubject<Boolean> isVisibleSubject = BehaviorSubject.j0();
+    private final BehaviorSubject<Boolean> isVisibleSubject = BehaviorSubject.k0();
 
     public final Observable<Boolean> observeIsVisible() {
         Observable<Boolean> q = this.isVisibleSubject.q();
diff --git a/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java b/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
index 7ccc8ad218..86f13cbb76 100644
--- a/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
+++ b/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
@@ -66,7 +66,7 @@ public final class CallSoundManager {
         private final StoreApplicationStreaming.ActiveApplicationStream activeApplicationStream;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2612me;
+        private final MeUser f2610me;
         private final RtcConnection.State rtcConnectionState;
         private final Channel selectedVoiceChannel;
         private final Map<String, List<Long>> streamSpectators;
@@ -87,7 +87,7 @@ public final class CallSoundManager {
             this.streamsByUser = map2;
             this.streamSpectators = map3;
             this.activeApplicationStream = activeApplicationStream;
-            this.f2612me = meUser;
+            this.f2610me = meUser;
             this.selectedVoiceChannel = channel;
         }
 
@@ -110,7 +110,7 @@ public final class CallSoundManager {
                 activeApplicationStream = storeState.activeApplicationStream;
             }
             if ((i & 32) != 0) {
-                meUser = storeState.f2612me;
+                meUser = storeState.f2610me;
             }
             if ((i & 64) != 0) {
                 channel = storeState.selectedVoiceChannel;
@@ -139,7 +139,7 @@ public final class CallSoundManager {
         }
 
         public final MeUser component6() {
-            return this.f2612me;
+            return this.f2610me;
         }
 
         public final Channel component7() {
@@ -163,7 +163,7 @@ public final class CallSoundManager {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.voiceParticipants, storeState.voiceParticipants) && m.areEqual(this.rtcConnectionState, storeState.rtcConnectionState) && m.areEqual(this.streamsByUser, storeState.streamsByUser) && m.areEqual(this.streamSpectators, storeState.streamSpectators) && m.areEqual(this.activeApplicationStream, storeState.activeApplicationStream) && m.areEqual(this.f2612me, storeState.f2612me) && m.areEqual(this.selectedVoiceChannel, storeState.selectedVoiceChannel);
+            return m.areEqual(this.voiceParticipants, storeState.voiceParticipants) && m.areEqual(this.rtcConnectionState, storeState.rtcConnectionState) && m.areEqual(this.streamsByUser, storeState.streamsByUser) && m.areEqual(this.streamSpectators, storeState.streamSpectators) && m.areEqual(this.activeApplicationStream, storeState.activeApplicationStream) && m.areEqual(this.f2610me, storeState.f2610me) && m.areEqual(this.selectedVoiceChannel, storeState.selectedVoiceChannel);
         }
 
         public final StoreApplicationStreaming.ActiveApplicationStream getActiveApplicationStream() {
@@ -171,7 +171,7 @@ public final class CallSoundManager {
         }
 
         public final MeUser getMe() {
-            return this.f2612me;
+            return this.f2610me;
         }
 
         public final RtcConnection.State getRtcConnectionState() {
@@ -206,7 +206,7 @@ public final class CallSoundManager {
             int hashCode4 = (hashCode3 + (map3 != null ? map3.hashCode() : 0)) * 31;
             StoreApplicationStreaming.ActiveApplicationStream activeApplicationStream = this.activeApplicationStream;
             int hashCode5 = (hashCode4 + (activeApplicationStream != null ? activeApplicationStream.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2612me;
+            MeUser meUser = this.f2610me;
             int hashCode6 = (hashCode5 + (meUser != null ? meUser.hashCode() : 0)) * 31;
             Channel channel = this.selectedVoiceChannel;
             if (channel != null) {
@@ -227,7 +227,7 @@ public final class CallSoundManager {
             O.append(", activeApplicationStream=");
             O.append(this.activeApplicationStream);
             O.append(", me=");
-            O.append(this.f2612me);
+            O.append(this.f2610me);
             O.append(", selectedVoiceChannel=");
             O.append(this.selectedVoiceChannel);
             O.append(")");
diff --git a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
index f5dada6167..b9cca9daa7 100644
--- a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
+++ b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
@@ -87,9 +87,9 @@ public final class DiscordOverlayService extends OverlayService {
             StoreStream.Companion companion = StoreStream.Companion;
             if (companion.getUserSettings().getIsMobileOverlayEnabled()) {
                 WeakReference weakReference = new WeakReference(context);
-                Observable E = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getRtcConnection().getConnectionState(), 1000, false, 2, null).E(DiscordOverlayService$Companion$launchForConnect$1.INSTANCE);
-                m.checkNotNullExpressionValue(E, "StoreStream\n            …          }\n            }");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(E), DiscordOverlayService.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$Companion$launchForConnect$2(weakReference), 60, (Object) null);
+                Observable F = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getRtcConnection().getConnectionState(), 1000, false, 2, null).F(DiscordOverlayService$Companion$launchForConnect$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "StoreStream\n            …          }\n            }");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(F), DiscordOverlayService.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$Companion$launchForConnect$2(weakReference), 60, (Object) null);
                 return;
             }
             c.a.d.m.g(context, R.string.overlay_mobile_required, 1, null, 8);
@@ -261,9 +261,9 @@ public final class DiscordOverlayService extends OverlayService {
             stopSelf(i2);
             return 2;
         }
-        Observable<Boolean> Y = StoreStream.Companion.isInitializedObservable().w(DiscordOverlayService$onStartCommand$1.INSTANCE).Y(1);
-        m.checkNotNullExpressionValue(Y, "StoreStream.isInitialize….takeFirst { it == true }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Y), DiscordOverlayService.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$onStartCommand$2(this, i2, intent), 62, (Object) null);
+        Observable<Boolean> Z = StoreStream.Companion.isInitializedObservable().x(DiscordOverlayService$onStartCommand$1.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "StoreStream.isInitialize….takeFirst { it == true }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), DiscordOverlayService.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$onStartCommand$2(this, i2, intent), 62, (Object) null);
         return 3;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java
index 360bb31779..5162a954d9 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java
@@ -12,7 +12,7 @@ public final class ScreenShareManager$startStream$1<T, R> implements b<RtcConnec
     }
 
     public final Boolean call(RtcConnection.Metadata metadata) {
-        Long l = metadata != null ? metadata.f2579c : null;
+        Long l = metadata != null ? metadata.f2577c : null;
         return Boolean.valueOf(l != null && l.longValue() == this.this$0.getChannelId() && m.areEqual(metadata.d, this.this$0.getGuildId()));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
index 9fdd9963de..705ac3664c 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
@@ -190,9 +190,9 @@ public final class ScreenShareManager {
         this.restAPI = restAPI;
         this.imageEncoder = imageEncoder;
         this.tooltipManager = tooltipManager;
-        BehaviorSubject<Bitmap> j0 = BehaviorSubject.j0();
-        m.checkNotNullExpressionValue(j0, "BehaviorSubject.create()");
-        this.thumbnailBitmapSubject = j0;
+        BehaviorSubject<Bitmap> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.thumbnailBitmapSubject = k0;
         this.compositeSubscription = new CompositeSubscription();
         subscribeToStores();
     }
@@ -222,7 +222,7 @@ public final class ScreenShareManager {
             WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
             tooltipManager3 = weakReference2 != null ? weakReference2.get() : tooltipManager3;
             if (tooltipManager3 == null) {
-                TooltipManager tooltipManager4 = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2605c.getValue(), 0, aVar, 4);
+                TooltipManager tooltipManager4 = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2603c.getValue(), 0, aVar, 4);
                 TooltipManager.a.a = new WeakReference<>(tooltipManager4);
                 tooltipManager3 = tooltipManager4;
             }
@@ -346,9 +346,9 @@ public final class ScreenShareManager {
     }
 
     private final void uploadScreenSharePreviews() {
-        Observable<R> y2 = this.thumbnailBitmapSubject.y(new ScreenShareManager$uploadScreenSharePreviews$1(this));
-        m.checkNotNullExpressionValue(y2, "thumbnailBitmapSubject\n …>()\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.bindToComponentLifecycle$default(y2, this.appComponent, null, 2, null), false, 1, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$uploadScreenSharePreviews$2(this), (Function1) null, (Function0) null, (Function0) null, ScreenShareManager$uploadScreenSharePreviews$3.INSTANCE, 58, (Object) null);
+        Observable<R> z2 = this.thumbnailBitmapSubject.z(new ScreenShareManager$uploadScreenSharePreviews$1(this));
+        m.checkNotNullExpressionValue(z2, "thumbnailBitmapSubject\n …>()\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.bindToComponentLifecycle$default(z2, this.appComponent, null, 2, null), false, 1, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$uploadScreenSharePreviews$2(this), (Function1) null, (Function0) null, (Function0) null, ScreenShareManager$uploadScreenSharePreviews$3.INSTANCE, 58, (Object) null);
     }
 
     public final long getChannelId() {
@@ -365,9 +365,9 @@ public final class ScreenShareManager {
 
     public final void startStream(Intent intent) {
         m.checkNotNullParameter(intent, "intent");
-        Observable<RtcConnection.Metadata> Y = this.storeRtcConnection.observeRtcConnectionMetadata().w(new ScreenShareManager$startStream$1(this)).Y(1);
-        m.checkNotNullExpressionValue(Y, "storeRtcConnection.obser…       }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Y, this.appComponent, null, 2, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$startStream$2(this), (Function1) null, (Function0) null, (Function0) null, new ScreenShareManager$startStream$3(this, intent), 58, (Object) null);
+        Observable<RtcConnection.Metadata> Z = this.storeRtcConnection.observeRtcConnectionMetadata().x(new ScreenShareManager$startStream$1(this)).Z(1);
+        m.checkNotNullExpressionValue(Z, "storeRtcConnection.obser…       }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Z, this.appComponent, null, 2, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$startStream$2(this), (Function1) null, (Function0) null, (Function0) null, new ScreenShareManager$startStream$3(this, intent), 58, (Object) null);
     }
 
     public final void stopStream() {
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
index 38982a47e3..77df6fb5fc 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
@@ -128,8 +128,8 @@ public final class VoiceChannelJoinabilityUtils {
         m.checkNotNullParameter(storeVoiceStates, "voiceStatesStore");
         m.checkNotNullParameter(storeVoiceChannelSelected, "voiceChannelSelectedStore");
         m.checkNotNullParameter(storeStageInstances, "stageInstancesStore");
-        Observable<R> X = storeChannels.observeChannel(j).X(new VoiceChannelJoinabilityUtils$observeJoinability$1(storeVoiceStates, j, storePermissions, storeGuilds, storeVoiceChannelSelected, storeStageInstances));
-        m.checkNotNullExpressionValue(X, "channelsStore\n        .o…  }\n          }\n        }");
-        return X;
+        Observable<R> Y = storeChannels.observeChannel(j).Y(new VoiceChannelJoinabilityUtils$observeJoinability$1(storeVoiceStates, j, storePermissions, storeGuilds, storeVoiceChannelSelected, storeStageInstances));
+        m.checkNotNullExpressionValue(Y, "channelsStore\n        .o…  }\n          }\n        }");
+        return Y;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
index 3c7c4f7cdc..bc21e2f60d 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
@@ -291,9 +291,9 @@ public final class VoiceEngineForegroundService extends IntentService implements
 
     public VoiceEngineForegroundService() {
         super("VoiceEngineForegroundService");
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public static final /* synthetic */ Function0 access$getOnDisconnect$cp() {
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java
index 189a9d0de0..3cae58a037 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java
@@ -82,6 +82,6 @@ public final class VoiceEngineServiceController$notificationDataObservable$1<T,
 
     public final Observable<? extends VoiceEngineServiceController.NotificationData> call(RtcConnection.StateChange stateChange) {
         RtcConnection.State state = stateChange.a;
-        return m.areEqual(state, RtcConnection.State.h.a) ? new j(VoiceEngineServiceController.access$getNOTIFICATION_DATA_DISCONNECTED$cp()) : VoiceEngineServiceController.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId().X(new AnonymousClass1(this, state));
+        return m.areEqual(state, RtcConnection.State.h.a) ? new j(VoiceEngineServiceController.access$getNOTIFICATION_DATA_DISCONNECTED$cp()) : VoiceEngineServiceController.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId().Y(new AnonymousClass1(this, state));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
index edd3533843..e773d8f6e8 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
@@ -306,9 +306,9 @@ public final class VoiceEngineServiceController {
         this.audioManagerStore = storeAudioManagerV2;
         this.mediaSettingsStore = storeMediaSettings;
         this.voiceChannelSelectedStore = storeVoiceChannelSelected;
-        Observable<R> X = storeRtcConnection.getConnectionState().X(new VoiceEngineServiceController$notificationDataObservable$1(this));
-        m.checkNotNullExpressionValue(X, "rtcConnectionStore\n     …            }\n          }");
-        this.notificationDataObservable = ObservableExtensionsKt.computationLatest(X).q();
+        Observable<R> Y = storeRtcConnection.getConnectionState().Y(new VoiceEngineServiceController$notificationDataObservable$1(this));
+        m.checkNotNullExpressionValue(Y, "rtcConnectionStore\n     …            }\n          }");
+        this.notificationDataObservable = ObservableExtensionsKt.computationLatest(Y).q();
     }
 
     public static final /* synthetic */ StoreAudioManagerV2 access$getAudioManagerStore$p(VoiceEngineServiceController voiceEngineServiceController) {
diff --git a/app/src/main/java/com/discord/utilities/websocket/WebSocket.java b/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
index 7916a6e6d9..86701d3ea8 100644
--- a/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
+++ b/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
@@ -147,14 +147,14 @@ public final class WebSocket {
         m.checkNotNullParameter(function3, "errorLogger");
         this.errorLogger = function3;
         this.socketFactory = sSLSocketFactory;
-        PublishSubject<Function0<Unit>> j0 = PublishSubject.j0();
-        this.schedulerSubject = j0;
-        Observable<Function0<Unit>> I = j0.I();
+        PublishSubject<Function0<Unit>> k0 = PublishSubject.k0();
+        this.schedulerSubject = k0;
+        Observable<Function0<Unit>> J = k0.J();
         if (scheduler == null) {
             AtomicReference<a> atomicReference = a.a;
             scheduler = i0.l.c.m.a;
         }
-        I.H(scheduler).V(AnonymousClass1.INSTANCE, new AnonymousClass2(this));
+        J.I(scheduler).W(AnonymousClass1.INSTANCE, new AnonymousClass2(this));
     }
 
     public static final /* synthetic */ okhttp3.WebSocket access$getClient$p(WebSocket webSocket) {
@@ -188,7 +188,7 @@ public final class WebSocket {
     private final okhttp3.WebSocket createWebSocket(String str, SSLSocketFactory sSLSocketFactory, WebSocketListener webSocketListener) {
         x.a aVar = new x.a();
         if (sSLSocketFactory != null) {
-            h.a aVar2 = h.f2993c;
+            h.a aVar2 = h.f2991c;
             aVar.b(sSLSocketFactory, h.a.n());
         }
         aVar.a(1, TimeUnit.MINUTES);
diff --git a/app/src/main/java/com/discord/views/CheckedSetting.java b/app/src/main/java/com/discord/views/CheckedSetting.java
index b7648ce0bb..e3938d773d 100644
--- a/app/src/main/java/com/discord/views/CheckedSetting.java
+++ b/app/src/main/java/com/discord/views/CheckedSetting.java
@@ -160,7 +160,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             public final TextView b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final LinkifiedTextView f2613c;
+            public final LinkifiedTextView f2611c;
             public final ImageView d;
 
             public c(ViewGroup viewGroup, m3 m3Var, int i) {
@@ -197,7 +197,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
                 this.b = textView4;
                 LinkifiedTextView linkifiedTextView2 = m3Var2.d;
                 m.checkNotNullExpressionValue(linkifiedTextView2, "binding.settingSubtext");
-                this.f2613c = linkifiedTextView2;
+                this.f2611c = linkifiedTextView2;
                 ImageView imageView2 = m3Var2.b;
                 m.checkNotNullExpressionValue(imageView2, "binding.settingDrawableLeft");
                 this.d = imageView2;
@@ -220,7 +220,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
 
             @Override // com.discord.views.CheckedSetting.b
             public TextView f() {
-                return this.f2613c;
+                return this.f2611c;
             }
         }
 
diff --git a/app/src/main/java/com/discord/views/FailedUploadList.java b/app/src/main/java/com/discord/views/FailedUploadList.java
index 338becc3f7..1383ed8bc7 100644
--- a/app/src/main/java/com/discord/views/FailedUploadList.java
+++ b/app/src/main/java/com/discord/views/FailedUploadList.java
@@ -36,14 +36,14 @@ public final class FailedUploadList extends LinearLayout {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f2614c;
+        public final String f2612c;
 
         public a(String str, long j, String str2) {
             m.checkNotNullParameter(str, "displayName");
             m.checkNotNullParameter(str2, "mimeType");
             this.a = str;
             this.b = j;
-            this.f2614c = str2;
+            this.f2612c = str2;
         }
 
         public boolean equals(Object obj) {
@@ -54,14 +54,14 @@ public final class FailedUploadList extends LinearLayout {
                 return false;
             }
             a aVar = (a) obj;
-            return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f2614c, aVar.f2614c);
+            return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f2612c, aVar.f2612c);
         }
 
         public int hashCode() {
             String str = this.a;
             int i = 0;
             int a = (z.a.a.b.a(this.b) + ((str != null ? str.hashCode() : 0) * 31)) * 31;
-            String str2 = this.f2614c;
+            String str2 = this.f2612c;
             if (str2 != null) {
                 i = str2.hashCode();
             }
@@ -74,7 +74,7 @@ public final class FailedUploadList extends LinearLayout {
             O.append(", sizeBytes=");
             O.append(this.b);
             O.append(", mimeType=");
-            return c.d.b.a.a.G(O, this.f2614c, ")");
+            return c.d.b.a.a.G(O, this.f2612c, ")");
         }
     }
 
@@ -235,7 +235,7 @@ public final class FailedUploadList extends LinearLayout {
                     String str = aVar.a;
                     Context context4 = failedUploadView2.getContext();
                     m.checkNotNullExpressionValue(context4, "context");
-                    failedUploadView2.a(str, FileUtilsKt.getIconForFiletype(context4, aVar.f2614c), FileUtilsKt.getSizeSubtitle(aVar.b));
+                    failedUploadView2.a(str, FileUtilsKt.getIconForFiletype(context4, aVar.f2612c), FileUtilsKt.getSizeSubtitle(aVar.b));
                 }
             } else if (obj instanceof b.C0298b) {
                 b.C0298b bVar = (b.C0298b) obj;
diff --git a/app/src/main/java/com/discord/views/NumericBadgingView.java b/app/src/main/java/com/discord/views/NumericBadgingView.java
index e468f34e80..44df0b708d 100644
--- a/app/src/main/java/com/discord/views/NumericBadgingView.java
+++ b/app/src/main/java/com/discord/views/NumericBadgingView.java
@@ -20,7 +20,7 @@ public final class NumericBadgingView extends CutoutView {
     public int q = DimenUtils.dpToPixels(8);
 
     /* renamed from: r  reason: collision with root package name */
-    public float f2615r = ((float) DimenUtils.dpToPixels(4));
+    public float f2613r = ((float) DimenUtils.dpToPixels(4));
     public RectF s = new RectF();
     public String t = "";
     public final Paint u;
@@ -154,7 +154,7 @@ public final class NumericBadgingView extends CutoutView {
         float f = textSize / 2.0f;
         float measureText = i >= 10 ? (this.v.measureText(this.t) + textSize) / 2.0f : f;
         this.s.set(-measureText, -f, measureText, f);
-        setStyle(new a(this.s, this.f2615r));
+        setStyle(new a(this.s, this.f2613r));
         invalidate();
     }
 }
diff --git a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
index 406cf7d763..3a905ca718 100644
--- a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
+++ b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
@@ -38,10 +38,10 @@ import rx.Observable;
 public final class OverlayMenuBubbleDialog extends l implements AppComponent {
 
     /* renamed from: y  reason: collision with root package name */
-    public final q0 f2616y;
+    public final q0 f2614y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final SimpleRecyclerAdapter<StoreVoiceParticipants.VoiceUser, a> f2617z;
+    public final SimpleRecyclerAdapter<StoreVoiceParticipants.VoiceUser, a> f2615z;
 
     /* compiled from: OverlayMenuBubbleDialog.kt */
     public static final class a extends SimpleRecyclerAdapter.ViewHolder<StoreVoiceParticipants.VoiceUser> {
@@ -76,7 +76,7 @@ public final class OverlayMenuBubbleDialog extends l implements AppComponent {
             Long l2 = l;
             StoreChannels channels = StoreStream.Companion.getChannels();
             m.checkNotNullExpressionValue(l2, "channelId");
-            return channels.observeChannel(l2.longValue()).X(new p(l2));
+            return channels.observeChannel(l2.longValue()).Y(new p(l2));
         }
     }
 
@@ -119,7 +119,7 @@ public final class OverlayMenuBubbleDialog extends l implements AppComponent {
             Pair<? extends List<? extends StoreVoiceParticipants.VoiceUser>, ? extends Integer> pair2 = pair;
             int intValue = ((Number) pair2.component2()).intValue();
             OverlayMenuBubbleDialog overlayMenuBubbleDialog = this.this$0;
-            overlayMenuBubbleDialog.f2617z.setData((List) pair2.component1());
+            overlayMenuBubbleDialog.f2615z.setData((List) pair2.component1());
             if (intValue == 0) {
                 str = null;
             } else {
@@ -128,7 +128,7 @@ public final class OverlayMenuBubbleDialog extends l implements AppComponent {
                 sb.append(intValue);
                 str = sb.toString();
             }
-            TextView textView = overlayMenuBubbleDialog.f2616y.d;
+            TextView textView = overlayMenuBubbleDialog.f2614y.d;
             m.checkNotNullExpressionValue(textView, "binding.overlayMembersOverflowTv");
             ViewExtensions.setTextAndVisibilityBy(textView, str);
             return Unit.a;
@@ -158,8 +158,8 @@ public final class OverlayMenuBubbleDialog extends l implements AppComponent {
                         if (overlayMenuView != null) {
                             q0 q0Var = new q0((LinearLayout) inflate, linearLayout, findViewById, textView, recyclerView, overlayMenuView);
                             m.checkNotNullExpressionValue(q0Var, "OverlayBubbleMenuBinding…rom(context), this, true)");
-                            this.f2616y = q0Var;
-                            this.f2617z = new SimpleRecyclerAdapter<>(null, n.i, 1, null);
+                            this.f2614y = q0Var;
+                            this.f2615z = new SimpleRecyclerAdapter<>(null, n.i, 1, null);
                             overlayMenuView.setOnDismissRequested$app_productionGoogleRelease(new p(0, this));
                             setClipChildren(false);
                             return;
@@ -175,18 +175,18 @@ public final class OverlayMenuBubbleDialog extends l implements AppComponent {
     public Animator getClosingAnimator() {
         AnimatorSet animatorSet = new AnimatorSet();
         animatorSet.setStartDelay((long) getResources().getInteger(17694720));
-        OverlayMenuView overlayMenuView = this.f2616y.f;
+        OverlayMenuView overlayMenuView = this.f2614y.f;
         m.checkNotNullExpressionValue(overlayMenuView, "binding.overlayMenu");
         Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView.getContext(), R.animator.overlay_slide_down_fade_out);
-        loadAnimator.setTarget(this.f2616y.f);
+        loadAnimator.setTarget(this.f2614y.f);
         Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), R.animator.overlay_slide_up_fade_out);
-        loadAnimator2.setTarget(this.f2616y.b);
+        loadAnimator2.setTarget(this.f2614y.b);
         animatorSet.playTogether(loadAnimator, loadAnimator2);
         return animatorSet;
     }
 
     public final View getLinkedAnchorView() {
-        View view = this.f2616y.f148c;
+        View view = this.f2614y.f148c;
         m.checkNotNullExpressionValue(view, "binding.overlayLinkedAnchorView");
         return view;
     }
@@ -194,28 +194,28 @@ public final class OverlayMenuBubbleDialog extends l implements AppComponent {
     @Override // android.view.View, android.view.ViewGroup
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        OverlayMenuView overlayMenuView = this.f2616y.f;
+        OverlayMenuView overlayMenuView = this.f2614y.f;
         m.checkNotNullExpressionValue(overlayMenuView, "binding.overlayMenu");
         overlayMenuView.setAlpha(0.0f);
-        LinearLayout linearLayout = this.f2616y.b;
+        LinearLayout linearLayout = this.f2614y.b;
         m.checkNotNullExpressionValue(linearLayout, "binding.overlayHeader");
         linearLayout.setAlpha(0.0f);
         AnimatorSet animatorSet = new AnimatorSet();
-        OverlayMenuView overlayMenuView2 = this.f2616y.f;
+        OverlayMenuView overlayMenuView2 = this.f2614y.f;
         m.checkNotNullExpressionValue(overlayMenuView2, "binding.overlayMenu");
         Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView2.getContext(), R.animator.overlay_slide_up_fade_in);
-        loadAnimator.setTarget(this.f2616y.f);
+        loadAnimator.setTarget(this.f2614y.f);
         Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), R.animator.overlay_slide_down_fade_in);
-        loadAnimator2.setTarget(this.f2616y.b);
+        loadAnimator2.setTarget(this.f2614y.b);
         animatorSet.playTogether(loadAnimator, loadAnimator2);
         animatorSet.setStartDelay((long) getResources().getInteger(17694720));
         animatorSet.start();
-        RecyclerView recyclerView = this.f2616y.e;
+        RecyclerView recyclerView = this.f2614y.e;
         m.checkNotNullExpressionValue(recyclerView, "binding.overlayMembersRv");
-        recyclerView.setAdapter(this.f2617z);
-        Observable E = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().X(b.i).E(c.i);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get…- 3\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(E), this, null, 2, null), OverlayMenuBubbleDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
+        recyclerView.setAdapter(this.f2615z);
+        Observable F = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().Y(b.i).F(c.i);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…- 3\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(F), this, null, 2, null), OverlayMenuBubbleDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 
     @Override // com.discord.overlay.views.OverlayDialog, com.discord.overlay.views.OverlayBubbleWrap, android.view.View
diff --git a/app/src/main/java/com/discord/views/OverlayMenuView.java b/app/src/main/java/com/discord/views/OverlayMenuView.java
index 0225172037..0a426158f8 100644
--- a/app/src/main/java/com/discord/views/OverlayMenuView.java
+++ b/app/src/main/java/com/discord/views/OverlayMenuView.java
@@ -46,14 +46,14 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
         public final Guild b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final CallModel f2618c;
+        public final CallModel f2616c;
         public final RtcConnection.Quality d;
 
         public a(Long l, Guild guild, CallModel callModel, RtcConnection.Quality quality) {
             m.checkNotNullParameter(quality, "rtcQuality");
             this.a = l;
             this.b = guild;
-            this.f2618c = callModel;
+            this.f2616c = callModel;
             this.d = quality;
         }
     }
@@ -77,7 +77,7 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                 OverlayMenuView overlayMenuView = this.this$0;
                 int i = OverlayMenuView.i;
                 Objects.requireNonNull(overlayMenuView);
-                if (aVar2.f2618c != null) {
+                if (aVar2.f2616c != null) {
                     overlayMenuView.j.b.d.setOnClickListener(new e(0, overlayMenuView, aVar2));
                     TextView textView = overlayMenuView.j.b.d;
                     m.checkNotNullExpressionValue(textView, "binding.content.overlayInviteLink");
@@ -86,13 +86,13 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                     overlayMenuView.j.b.f.setOnClickListener(new e(1, overlayMenuView, aVar2));
                     ImageView imageView = overlayMenuView.j.e;
                     m.checkNotNullExpressionValue(imageView, "binding.srcToggle");
-                    ColorStateList valueOf = aVar2.f2618c.getAudioManagerState().getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.SPEAKERPHONE ? ColorStateList.valueOf(-1) : ColorStateList.valueOf(ColorCompat.getColor(overlayMenuView.getContext(), (int) R.color.primary_dark_400));
+                    ColorStateList valueOf = aVar2.f2616c.getAudioManagerState().getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.SPEAKERPHONE ? ColorStateList.valueOf(-1) : ColorStateList.valueOf(ColorCompat.getColor(overlayMenuView.getContext(), (int) R.color.primary_dark_400));
                     m.checkNotNullExpressionValue(valueOf, "if (selectedOutputDevice…rimary_dark_400))\n      }");
                     imageView.setImageTintList(valueOf);
                     overlayMenuView.j.e.setOnClickListener(new h(1, aVar2));
                     ImageView imageView2 = overlayMenuView.j.d;
                     m.checkNotNullExpressionValue(imageView2, "binding.muteToggle");
-                    imageView2.setActivated(aVar2.f2618c.isMeMutedByAnySource());
+                    imageView2.setActivated(aVar2.f2616c.isMeMutedByAnySource());
                     overlayMenuView.j.d.setOnClickListener(new h(2, aVar2));
                     overlayMenuView.j.f129c.setOnClickListener(new h(3, overlayMenuView));
                     overlayMenuView.j.b.e.setImageResource(VoiceViewUtils.INSTANCE.getQualityIndicator(aVar2.d));
@@ -106,7 +106,7 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                     textView2.setText(name);
                     TextView textView3 = overlayMenuView.j.b.b;
                     m.checkNotNullExpressionValue(textView3, "binding.content.overlayChannelName");
-                    textView3.setText(ChannelUtils.c(aVar2.f2618c.getChannel()));
+                    textView3.setText(ChannelUtils.c(aVar2.f2616c.getChannel()));
                 }
             }
             return Unit.a;
@@ -152,9 +152,9 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                                                 m2 m2Var = new m2(this, n2Var, imageView2, imageView3, imageView4);
                                                 m.checkNotNullExpressionValue(m2Var, "ViewOverlayMenuBinding.i…ater.from(context), this)");
                                                 this.j = m2Var;
-                                                PublishSubject j0 = PublishSubject.j0();
-                                                m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-                                                this.k = j0;
+                                                PublishSubject k0 = PublishSubject.k0();
+                                                m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+                                                this.k = k0;
                                                 this.l = q.i;
                                                 return;
                                             }
@@ -183,9 +183,9 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
     @Override // android.view.View, android.view.ViewGroup
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        Observable<R> X = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().X(r.i);
-        m.checkNotNullExpressionValue(X, "StoreStream\n            …        }\n              }");
-        Observable q = ObservableExtensionsKt.computationLatest(X).q();
+        Observable<R> Y = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().Y(r.i);
+        m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+        Observable q = ObservableExtensionsKt.computationLatest(Y).q();
         m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(q, this, null, 2, null), OverlayMenuView.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/views/PileView.java b/app/src/main/java/com/discord/views/PileView.java
index e88dc94b3b..82fe6437f9 100644
--- a/app/src/main/java/com/discord/views/PileView.java
+++ b/app/src/main/java/com/discord/views/PileView.java
@@ -44,7 +44,7 @@ public final class PileView extends FrameLayout {
     public int q = DimenUtils.dpToPixels(2);
 
     /* renamed from: r  reason: collision with root package name */
-    public final CutoutView.a f2619r;
+    public final CutoutView.a f2617r;
     public int s = DimenUtils.dpToPixels(14);
     public boolean t;
     @ColorInt
@@ -147,7 +147,7 @@ public final class PileView extends FrameLayout {
         obtainStyledAttributes.recycle();
         int i = this.m;
         int i2 = this.q;
-        this.f2619r = new CutoutView.a.b((this.l / 2) + i2, i + i2);
+        this.f2617r = new CutoutView.a.b((this.l / 2) + i2, i + i2);
         if (isInEditMode()) {
             setItems(n.listOf((Object[]) new c[]{new c(a.i, b.i), new c(a.j, b.j), new c(a.k, b.k)}));
         }
@@ -210,7 +210,7 @@ public final class PileView extends FrameLayout {
                             simpleDraweeView.setVisibility(0);
                         }
                         if (i2 != i || size > 0) {
-                            cutoutView.setStyle(this.f2619r);
+                            cutoutView.setStyle(this.f2617r);
                         }
                         String invoke = cVar.a.invoke(Integer.valueOf(IconUtils.getMediaProxySize(this.l)));
                         Function0<String> function0 = cVar.b;
diff --git a/app/src/main/java/com/discord/views/VoiceUserView.java b/app/src/main/java/com/discord/views/VoiceUserView.java
index 5313f6f919..197ac1ab95 100644
--- a/app/src/main/java/com/discord/views/VoiceUserView.java
+++ b/app/src/main/java/com/discord/views/VoiceUserView.java
@@ -46,7 +46,7 @@ public final class VoiceUserView extends FrameLayout {
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2620r;
+    public boolean f2618r;
 
     /* compiled from: VoiceUserView.kt */
     public enum a {
@@ -201,7 +201,7 @@ public final class VoiceUserView extends FrameLayout {
 
     @MainThread
     public final void setAnimateAvatarWhenRinging(boolean z2) {
-        this.f2620r = z2;
+        this.f2618r = z2;
     }
 
     @MainThread
diff --git a/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java b/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java
index b9501280e6..50f0ce9d8e 100644
--- a/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java
+++ b/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java
@@ -29,10 +29,10 @@ import rx.subjects.BehaviorSubject;
 /* compiled from: AppVideoStreamRenderer.kt */
 public final class AppVideoStreamRenderer extends VideoStreamRenderer {
     public boolean i;
-    public final BehaviorSubject<Unit> j = BehaviorSubject.k0(Unit.a);
+    public final BehaviorSubject<Unit> j = BehaviorSubject.l0(Unit.a);
     public Subscription k;
     public Integer l;
-    public BehaviorSubject<Point> m = BehaviorSubject.k0(null);
+    public BehaviorSubject<Point> m = BehaviorSubject.l0(null);
     public Function1<? super Point, Unit> n;
     public RendererCommon.ScalingType o;
     public RendererCommon.ScalingType p;
@@ -84,11 +84,11 @@ public final class AppVideoStreamRenderer extends VideoStreamRenderer {
                 if (subscription != null) {
                     subscription.unsubscribe();
                 }
-                Observable<R> y2 = this.j.y(new a(eVar));
-                m.checkNotNullExpressionValue(y2, "onSizeChangedSubject\n   …rameResolutionSampled() }");
-                Observable E = y2.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-                m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-                Observable ui = ObservableExtensionsKt.ui(E);
+                Observable<R> z4 = this.j.z(new a(eVar));
+                m.checkNotNullExpressionValue(z4, "onSizeChangedSubject\n   …rameResolutionSampled() }");
+                Observable F = z4.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+                Observable ui = ObservableExtensionsKt.ui(F);
                 b bVar = new b(this);
                 String simpleName = AppVideoStreamRenderer.class.getSimpleName();
                 m.checkNotNullExpressionValue(simpleName, "javaClass.simpleName");
diff --git a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
index 2773ded64f..20e2e30b56 100644
--- a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
+++ b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
@@ -69,17 +69,17 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
     public DisplayCutoutCompat q;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2621r;
+    public boolean f2619r;
     public VideoCallGridAdapter.CallUiInsets s;
     public boolean t;
     public Drawable u;
     public Drawable v;
 
     /* renamed from: w  reason: collision with root package name */
-    public Function2<? super StreamResolution, ? super StreamFps, Unit> f2622w;
+    public Function2<? super StreamResolution, ? super StreamFps, Unit> f2620w;
 
     /* renamed from: x  reason: collision with root package name */
-    public Function2<? super StreamResolution, ? super StreamFps, Unit> f2623x;
+    public Function2<? super StreamResolution, ? super StreamFps, Unit> f2621x;
 
     /* compiled from: VideoCallParticipantView.kt */
     public static final class ParticipantData implements FrameGridLayout.Data {
@@ -87,7 +87,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         public final StoreVoiceParticipants.VoiceUser b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2624c;
+        public final boolean f2622c;
         public final RendererCommon.ScalingType d;
         public final RendererCommon.ScalingType e;
         public final ApplicationStreamState f;
@@ -117,14 +117,14 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             public final StreamResolution b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final StreamFps f2625c;
+            public final StreamFps f2623c;
             public final boolean d;
 
             public a(boolean z2, StreamResolution streamResolution, StreamFps streamFps, boolean z3) {
                 m.checkNotNullParameter(streamResolution, "resolution");
                 this.a = z2;
                 this.b = streamResolution;
-                this.f2625c = streamFps;
+                this.f2623c = streamFps;
                 this.d = z3;
             }
 
@@ -136,7 +136,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                     return false;
                 }
                 a aVar = (a) obj;
-                return this.a == aVar.a && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2625c, aVar.f2625c) && this.d == aVar.d;
+                return this.a == aVar.a && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2623c, aVar.f2623c) && this.d == aVar.d;
             }
 
             public int hashCode() {
@@ -152,7 +152,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 StreamResolution streamResolution = this.b;
                 int i6 = 0;
                 int hashCode = (i5 + (streamResolution != null ? streamResolution.hashCode() : 0)) * 31;
-                StreamFps streamFps = this.f2625c;
+                StreamFps streamFps = this.f2623c;
                 if (streamFps != null) {
                     i6 = streamFps.hashCode();
                 }
@@ -170,7 +170,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 O.append(", resolution=");
                 O.append(this.b);
                 O.append(", fps=");
-                O.append(this.f2625c);
+                O.append(this.f2623c);
                 O.append(", isBadQuality=");
                 return c.d.b.a.a.K(O, this.d, ")");
             }
@@ -183,7 +183,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             m.checkNotNullParameter(voiceUser, "participant");
             m.checkNotNullParameter(type, "type");
             this.b = voiceUser;
-            this.f2624c = z2;
+            this.f2622c = z2;
             this.d = scalingType;
             this.e = scalingType2;
             this.f = applicationStreamState;
@@ -206,7 +206,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         public static ParticipantData a(ParticipantData participantData, StoreVoiceParticipants.VoiceUser voiceUser, boolean z2, RendererCommon.ScalingType scalingType, RendererCommon.ScalingType scalingType2, ApplicationStreamState applicationStreamState, Type type, boolean z3, boolean z4, a aVar, int i) {
             Type type2 = null;
             StoreVoiceParticipants.VoiceUser voiceUser2 = (i & 1) != 0 ? participantData.b : null;
-            boolean z5 = (i & 2) != 0 ? participantData.f2624c : z2;
+            boolean z5 = (i & 2) != 0 ? participantData.f2622c : z2;
             RendererCommon.ScalingType scalingType3 = (i & 4) != 0 ? participantData.d : scalingType;
             RendererCommon.ScalingType scalingType4 = (i & 8) != 0 ? participantData.e : scalingType2;
             ApplicationStreamState applicationStreamState2 = (i & 16) != 0 ? participantData.f : null;
@@ -255,7 +255,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 return false;
             }
             ParticipantData participantData = (ParticipantData) obj;
-            return m.areEqual(this.b, participantData.b) && this.f2624c == participantData.f2624c && m.areEqual(this.d, participantData.d) && m.areEqual(this.e, participantData.e) && m.areEqual(this.f, participantData.f) && m.areEqual(this.g, participantData.g) && this.h == participantData.h && this.i == participantData.i && m.areEqual(this.j, participantData.j);
+            return m.areEqual(this.b, participantData.b) && this.f2622c == participantData.f2622c && m.areEqual(this.d, participantData.d) && m.areEqual(this.e, participantData.e) && m.areEqual(this.f, participantData.f) && m.areEqual(this.g, participantData.g) && this.h == participantData.h && this.i == participantData.i && m.areEqual(this.j, participantData.j);
         }
 
         @Override // com.discord.utilities.view.grid.FrameGridLayout.Data
@@ -267,7 +267,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             StoreVoiceParticipants.VoiceUser voiceUser = this.b;
             int i = 0;
             int hashCode = (voiceUser != null ? voiceUser.hashCode() : 0) * 31;
-            boolean z2 = this.f2624c;
+            boolean z2 = this.f2622c;
             int i2 = 1;
             if (z2) {
                 z2 = true;
@@ -308,7 +308,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             StringBuilder O = c.d.b.a.a.O("ParticipantData(participant=");
             O.append(this.b);
             O.append(", mirrorVideo=");
-            O.append(this.f2624c);
+            O.append(this.f2622c);
             O.append(", scalingType=");
             O.append(this.d);
             O.append(", scalingTypeMismatchOrientation=");
@@ -430,9 +430,9 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
 
         @Override // android.view.View.OnClickListener
         public final void onClick(View view) {
-            Function2<? super StreamResolution, ? super StreamFps, Unit> function2 = this.i.f2622w;
+            Function2<? super StreamResolution, ? super StreamFps, Unit> function2 = this.i.f2620w;
             ParticipantData.a aVar = this.j;
-            function2.invoke(aVar.b, aVar.f2625c);
+            function2.invoke(aVar.b, aVar.f2623c);
         }
     }
 
@@ -522,8 +522,8 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                                                                                                 this.s = new VideoCallGridAdapter.CallUiInsets(0, 0, 0, 0);
                                                                                                 this.u = ContextCompat.getDrawable(context, R.drawable.bg_stream_live_indicator);
                                                                                                 this.v = ContextCompat.getDrawable(context, R.drawable.bg_stream_live_indicator_split_pill);
-                                                                                                this.f2622w = s.i;
-                                                                                                this.f2623x = s.j;
+                                                                                                this.f2620w = s.i;
+                                                                                                this.f2621x = s.j;
                                                                                                 if (attributeSet2 != null) {
                                                                                                     TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet2, R.a.VideoCallParticipantView, 0, 0);
                                                                                                     m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…            0\n          )");
@@ -568,7 +568,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         VideoCallGridAdapter.CallUiInsets callUiInsets2 = null;
         DisplayCutoutCompat displayCutoutCompat2 = (i & 2) != 0 ? videoCallParticipantView.q : null;
         if ((i & 4) != 0) {
-            z2 = videoCallParticipantView.f2621r;
+            z2 = videoCallParticipantView.f2619r;
         }
         if ((i & 8) != 0) {
             callUiInsets2 = videoCallParticipantView.s;
@@ -599,7 +599,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
         CharSequence a2 = streamResolution.a(context);
-        StreamFps streamFps = aVar.f2625c;
+        StreamFps streamFps = aVar.f2623c;
         if (streamFps != null) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
@@ -630,7 +630,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         textView2.setVisibility(i);
         textView2.setTextColor(ContextCompat.getColor(textView2.getContext(), i2));
         textView2.requestLayout();
-        this.f2623x.invoke(aVar.b, aVar.f2625c);
+        this.f2621x.invoke(aVar.b, aVar.f2623c);
         b(true);
     }
 
@@ -661,7 +661,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         boolean z6;
         m.checkNotNullParameter(callUiInsets, "callUiInsets");
         this.q = displayCutoutCompat;
-        this.f2621r = z2;
+        this.f2619r = z2;
         this.s = callUiInsets;
         this.t = z3;
         StoreVoiceParticipants.VoiceUser voiceUser = participantData != null ? participantData.b : null;
@@ -673,9 +673,9 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             if (subscription2 != null) {
                 subscription2.unsubscribe();
             }
-            Observable<Integer> a02 = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(colorId).a0(l.i);
-            m.checkNotNullExpressionValue(a02, "UserRepresentativeColors….takeUntil { it != null }");
-            ObservableExtensionsKt.appSubscribe$default(a02, VideoCallParticipantView.class, (Context) null, new n(0, this), (Function1) null, (Function0) null, (Function0) null, new c.a.y.j0.m(this), 58, (Object) null);
+            Observable<Integer> b02 = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(colorId).b0(l.i);
+            m.checkNotNullExpressionValue(b02, "UserRepresentativeColors….takeUntil { it != null }");
+            ObservableExtensionsKt.appSubscribe$default(b02, VideoCallParticipantView.class, (Context) null, new n(0, this), (Function1) null, (Function0) null, (Function0) null, new c.a.y.j0.m(this), 58, (Object) null);
         }
         String forUser$default = IconUtils.getForUser$default(voiceUser != null ? voiceUser.getUser() : null, false, null, 6, null);
         if (!m.areEqual(forUser$default, this.l)) {
@@ -897,7 +897,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         ConstraintSet constraintSet = new ConstraintSet();
         constraintSet.clone(this);
         DisplayCutoutCompat displayCutoutCompat2 = this.q;
-        if ((displayCutoutCompat2 != null ? displayCutoutCompat2.getSafeInsetTop() : 0) > 0 && this.f2621r) {
+        if ((displayCutoutCompat2 != null ? displayCutoutCompat2.getSafeInsetTop() : 0) > 0 && this.f2619r) {
             LinearLayout linearLayout3 = this.i.f79r;
             m.checkNotNullExpressionValue(linearLayout3, "binding.participantVoiceIndicators");
             if (!(linearLayout3.getVisibility() == 0)) {
@@ -914,7 +914,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 RendererCommon.ScalingType scalingType = participantData == null ? participantData.d : null;
                 RendererCommon.ScalingType scalingType2 = participantData == null ? participantData.e : null;
                 if (participantData == null) {
-                    z5 = participantData.f2624c;
+                    z5 = participantData.f2622c;
                     num = b2;
                 } else {
                     num = b2;
@@ -928,9 +928,9 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 if (num != null) {
                     BehaviorSubject<Point> behaviorSubject = this.i.q.m;
                     m.checkNotNullExpressionValue(behaviorSubject, "currentFrameResolutionSubject");
-                    Observable<R> E = behaviorSubject.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-                    m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-                    ObservableExtensionsKt.appSubscribe$default(E, VideoCallParticipantView.class, (Context) null, new n(1, this), (Function1) null, (Function0) null, (Function0) null, new o(this), 58, (Object) null);
+                    Observable<R> F = behaviorSubject.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                    m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+                    ObservableExtensionsKt.appSubscribe$default(F, VideoCallParticipantView.class, (Context) null, new n(1, this), (Function1) null, (Function0) null, (Function0) null, new o(this), 58, (Object) null);
                 }
                 ParticipantData participantData3 = this.k;
                 type2 = participantData3 == null ? participantData3.g : null;
diff --git a/app/src/main/java/com/discord/views/steps/StepsView.java b/app/src/main/java/com/discord/views/steps/StepsView.java
index edc522df20..4350ee413c 100644
--- a/app/src/main/java/com/discord/views/steps/StepsView.java
+++ b/app/src/main/java/com/discord/views/steps/StepsView.java
@@ -88,7 +88,7 @@ public final class StepsView extends RelativeLayout {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2626c;
+        public final int f2624c;
         public final Function1<View, Unit> d;
         public final Function1<View, Unit> e;
         public final Function1<View, Unit> f;
@@ -108,7 +108,7 @@ public final class StepsView extends RelativeLayout {
             public final Function1<View, Unit> q;
 
             /* renamed from: r  reason: collision with root package name */
-            public final boolean f2627r;
+            public final boolean f2625r;
             public final boolean s;
             public final boolean t;
 
@@ -136,7 +136,7 @@ public final class StepsView extends RelativeLayout {
                 this.o = function15;
                 this.p = null;
                 this.q = function14;
-                this.f2627r = z6;
+                this.f2625r = z6;
                 this.s = z7;
                 this.t = z5;
             }
@@ -149,7 +149,7 @@ public final class StepsView extends RelativeLayout {
                     return false;
                 }
                 a aVar = (a) obj;
-                return m.areEqual(this.j, aVar.j) && this.k == aVar.k && this.l == aVar.l && this.m == aVar.m && m.areEqual(this.n, aVar.n) && m.areEqual(this.o, aVar.o) && m.areEqual(this.p, aVar.p) && m.areEqual(this.q, aVar.q) && this.f2627r == aVar.f2627r && this.s == aVar.s && this.t == aVar.t;
+                return m.areEqual(this.j, aVar.j) && this.k == aVar.k && this.l == aVar.l && this.m == aVar.m && m.areEqual(this.n, aVar.n) && m.areEqual(this.o, aVar.o) && m.areEqual(this.p, aVar.p) && m.areEqual(this.q, aVar.q) && this.f2625r == aVar.f2625r && this.s == aVar.s && this.t == aVar.t;
             }
 
             public int hashCode() {
@@ -167,7 +167,7 @@ public final class StepsView extends RelativeLayout {
                     i = function13.hashCode();
                 }
                 int i2 = (hashCode4 + i) * 31;
-                boolean z2 = this.f2627r;
+                boolean z2 = this.f2625r;
                 int i3 = 1;
                 if (z2) {
                     z2 = true;
@@ -209,7 +209,7 @@ public final class StepsView extends RelativeLayout {
                 O.append(", onDone=");
                 O.append(this.q);
                 O.append(", canNext=");
-                O.append(this.f2627r);
+                O.append(this.f2625r);
                 O.append(", canCancel=");
                 O.append(this.s);
                 O.append(", allowScroll=");
@@ -243,7 +243,7 @@ public final class StepsView extends RelativeLayout {
         public b(int i, int i2, int i3, Function1 function1, Function1 function12, Function1 function13, boolean z2, boolean z3, boolean z4, DefaultConstructorMarker defaultConstructorMarker) {
             this.a = i;
             this.b = i2;
-            this.f2626c = i3;
+            this.f2624c = i3;
             this.d = function1;
             this.e = function12;
             this.f = function13;
@@ -302,19 +302,19 @@ public final class StepsView extends RelativeLayout {
         public final /* synthetic */ Function1 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ Function0 f2628c;
+        public final /* synthetic */ Function0 f2626c;
 
         public e(StepsView stepsView, Function1 function1, Function0 function0) {
             this.a = stepsView;
             this.b = function1;
-            this.f2628c = function0;
+            this.f2626c = function0;
         }
 
         @Override // androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
         public void onPageSelected(int i) {
             this.b.invoke(Integer.valueOf(i));
             StepsView stepsView = this.a;
-            Function0<Unit> function0 = this.f2628c;
+            Function0<Unit> function0 = this.f2626c;
             int i2 = StepsView.i;
             stepsView.c(i, function0);
             this.a.j.g.setCurrentStepIndex(i);
@@ -460,7 +460,7 @@ public final class StepsView extends RelativeLayout {
             TextView textView = this.j.f165c;
             m.checkNotNullExpressionValue(textView, "binding.stepsCancel");
             textView.setText(getContext().getString(((b) list.get(i2)).b));
-            this.j.e.setText(getContext().getString(((b) list.get(i2)).f2626c));
+            this.j.e.setText(getContext().getString(((b) list.get(i2)).f2624c));
             MaterialButton materialButton = this.j.f;
             m.checkNotNullExpressionValue(materialButton, "binding.stepsNext");
             materialButton.setText(getContext().getString(((b) list.get(i2)).a));
diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
index eb71d9edda..a3dc2e915b 100644
--- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
+++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
@@ -47,7 +47,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
         public final Presence b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final StreamContext f2629c;
+        public final StreamContext f2627c;
         public final boolean d;
         public final GuildMember e;
 
@@ -55,7 +55,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             m.checkNotNullParameter(user, "user");
             this.a = user;
             this.b = presence;
-            this.f2629c = streamContext;
+            this.f2627c = streamContext;
             this.d = z2;
             this.e = guildMember;
         }
@@ -65,7 +65,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             m.checkNotNullParameter(user, "user");
             this.a = user;
             this.b = presence;
-            this.f2629c = streamContext;
+            this.f2627c = streamContext;
             this.d = z2;
             this.e = null;
         }
@@ -78,7 +78,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
                 return false;
             }
             a aVar = (a) obj;
-            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2629c, aVar.f2629c) && this.d == aVar.d && m.areEqual(this.e, aVar.e);
+            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2627c, aVar.f2627c) && this.d == aVar.d && m.areEqual(this.e, aVar.e);
         }
 
         public int hashCode() {
@@ -87,7 +87,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             int hashCode = (user != null ? user.hashCode() : 0) * 31;
             Presence presence = this.b;
             int hashCode2 = (hashCode + (presence != null ? presence.hashCode() : 0)) * 31;
-            StreamContext streamContext = this.f2629c;
+            StreamContext streamContext = this.f2627c;
             int hashCode3 = (hashCode2 + (streamContext != null ? streamContext.hashCode() : 0)) * 31;
             boolean z2 = this.d;
             if (z2) {
@@ -110,7 +110,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             O.append(", presence=");
             O.append(this.b);
             O.append(", streamContext=");
-            O.append(this.f2629c);
+            O.append(this.f2627c);
             O.append(", showPresence=");
             O.append(this.d);
             O.append(", guildMember=");
diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java
index 64a57f7fe1..79eb3b871a 100644
--- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java
+++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java
@@ -20,7 +20,7 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
     public final StoreUser b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final StoreUserPresence f2630c;
+    public final StoreUserPresence f2628c;
     public final StreamContextService d;
 
     /* compiled from: UserAvatarPresenceViewController.kt */
@@ -51,7 +51,7 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
         m.checkNotNullParameter(presences, "storeUserPresence");
         m.checkNotNullParameter(streamContextService2, "streamContextService");
         this.b = users;
-        this.f2630c = presences;
+        this.f2628c = presences;
         this.d = streamContextService2;
     }
 
@@ -65,9 +65,9 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
 
     @Override // com.discord.utilities.viewcontroller.RxViewController
     public Observable<UserAvatarPresenceView.a> observeState() {
-        Observable<R> E = this.b.observeUser(this.a).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable<UserAvatarPresenceView.a> i = Observable.i(E, ModelRichPresence.Companion.get(this.a, this.f2630c), this.d.getForUser(this.a, false), a.a);
+        Observable<R> F = this.b.observeUser(this.a).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable<UserAvatarPresenceView.a> i = Observable.i(F, ModelRichPresence.Companion.get(this.a, this.f2628c), this.d.getForUser(this.a, false), a.a);
         m.checkNotNullExpressionValue(i, "Observable.combineLatest…nce = true,\n      )\n    }");
         return i;
     }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
index 575660b902..6d4c25de3c 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
@@ -271,9 +271,9 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
         super.onResume();
         Observable<WidgetChannelFollowSheetViewModel.ViewState> q = getViewModel().observeViewState().q();
         m.checkNotNullExpressionValue(q, "viewModel\n        .obser…  .distinctUntilChanged()");
-        Observable<R> E = q.w(WidgetChannelFollowSheet$onResume$$inlined$filterIs$1.INSTANCE).E(WidgetChannelFollowSheet$onResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(E, this, null, 2, null), WidgetChannelFollowSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelFollowSheet$onResume$1(this), 62, (Object) null);
+        Observable<R> F = q.x(WidgetChannelFollowSheet$onResume$$inlined$filterIs$1.INSTANCE).F(WidgetChannelFollowSheet$onResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(F, this, null, 2, null), WidgetChannelFollowSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelFollowSheet$onResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeEvents(), this, null, 2, null), WidgetChannelFollowSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelFollowSheet$onResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
index 24ced3a9e2..96584a0fda 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
@@ -80,6 +80,6 @@ public final class WidgetChannelFollowSheetViewModel$calculateChannelsWithPermis
     }
 
     public final Observable<? extends Map<Long, List<Channel>>> call(Map<Long, Long> map) {
-        return this.this$0.getStoreChannels().observeGuildAndPrivateChannels().q().E(new AnonymousClass1(map));
+        return this.this$0.getStoreChannels().observeGuildAndPrivateChannels().q().F(new AnonymousClass1(map));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
index ae5faee5d9..5cce5dd4ba 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
@@ -283,9 +283,9 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel<ViewSt
         this.storeGuilds = storeGuilds;
         this.storeChannels = storeChannels;
         this.storePermissions = storePermissions;
-        this.selectedGuildSubject = BehaviorSubject.k0(null);
-        this.selectedChannelSubject = BehaviorSubject.k0(null);
-        this.eventSubject = PublishSubject.j0();
+        this.selectedGuildSubject = BehaviorSubject.l0(null);
+        this.selectedChannelSubject = BehaviorSubject.l0(null);
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observeViewStateFromStores()), this, null, 2, null), WidgetChannelFollowSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -307,7 +307,7 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel<ViewSt
     }
 
     private final Observable<Map<Long, List<Channel>>> calculateChannelsWithPermissions() {
-        return this.storePermissions.observePermissionsForAllChannels().q().X(new WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1(this));
+        return this.storePermissions.observePermissionsForAllChannels().q().Y(new WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1(this));
     }
 
     private final void handleChannelFollowError(Error error) {
@@ -320,7 +320,7 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel<ViewSt
     }
 
     private final Observable<ViewState.Loaded> observeViewStateFromStores() {
-        Observable<ViewState.Loaded> g = Observable.g(this.storeGuilds.observeGuild(this.sourceGuildId), this.storeChannels.observeChannel(this.sourceChannelId), calculateChannelsWithPermissions(), this.selectedGuildSubject.X(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1(this)), this.selectedChannelSubject.X(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2(this)), WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.INSTANCE);
+        Observable<ViewState.Loaded> g = Observable.g(this.storeGuilds.observeGuild(this.sourceGuildId), this.storeChannels.observeChannel(this.sourceChannelId), calculateChannelsWithPermissions(), this.selectedGuildSubject.Y(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1(this)), this.selectedChannelSubject.Y(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2(this)), WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.INSTANCE);
         m.checkNotNullExpressionValue(g, "Observable.combineLatest…  )\n\n      expected\n    }");
         return g;
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java
index f34d906975..1c76f7a485 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java
@@ -25,6 +25,6 @@ public final class WidgetAgeVerifyViewModel$Companion$observeStores$1<T, R> impl
 
     public final Observable<? extends Channel> call(Channel channel) {
         Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
-        return valueOf == null ? new j(null) : ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observeDefaultChannel(valueOf.longValue()), 0, false, 3, null).E(AnonymousClass1.INSTANCE);
+        return valueOf == null ? new j(null) : ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observeDefaultChannel(valueOf.longValue()), 0, false, 3, null).F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
index 86c61c2a9f..e2dd5f493b 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
@@ -74,7 +74,7 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
 
         public final Observable<StoreState> observeStores() {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<StoreState> i = Observable.i(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getAuthentication().observeIsAuthed$app_productionGoogleRelease(), companion.getChannelsSelected().observeSelectedChannel().X(WidgetAgeVerifyViewModel$Companion$observeStores$1.INSTANCE), WidgetAgeVerifyViewModel$Companion$observeStores$2.INSTANCE);
+            Observable<StoreState> i = Observable.i(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getAuthentication().observeIsAuthed$app_productionGoogleRelease(), companion.getChannelsSelected().observeSelectedChannel().Y(WidgetAgeVerifyViewModel$Companion$observeStores$1.INSTANCE), WidgetAgeVerifyViewModel$Companion$observeStores$2.INSTANCE);
             m.checkNotNullExpressionValue(i, "Observable.combineLatest…hed\n          )\n        }");
             return i;
         }
@@ -389,7 +389,7 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(observable, "storeObservable");
         this.restAPI = restAPI;
         this.storeAuth = storeAuthentication;
-        this.eventsSubject = PublishSubject.j0();
+        this.eventsSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetAgeVerifyViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
index ea3150d410..71a298d79c 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
@@ -171,11 +171,11 @@ public final class WidgetAuthLanding extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<R> E = StoreStream.Companion.getExperiments().observeUserExperiment("2021-01_google_smart_lock", true).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable E2 = E.Y(1).E(WidgetAuthLanding$onViewBoundOrOnResume$1.INSTANCE);
-        m.checkNotNullExpressionValue(E2, "StoreStream.getExperimen…experiment?.bucket == 1 }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(E2, this, null, 2, null), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getExperiments().observeUserExperiment("2021-01_google_smart_lock", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable F2 = F.Z(1).F(WidgetAuthLanding$onViewBoundOrOnResume$1.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "StoreStream.getExperimen…experiment?.bucket == 1 }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(F2, this, null, 2, null), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBoundOrOnResume$2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeEvents(), this, null, 2, null), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBoundOrOnResume$3(this), 62, (Object) null);
         GrowthTeamFeatures.INSTANCE.imbalancedAndroidSplashNoop();
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java
index dbf9650dfa..6549a2cf52 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java
@@ -31,6 +31,6 @@ public final class WidgetAuthLandingViewModel$Companion$observeStoreState$1<T, R
     }
 
     public final Observable<? extends StoreGuildTemplates.GuildTemplateState> call(String str) {
-        return str != null ? this.$storeGuildTemplates.observeGuildTemplate(str).t(new AnonymousClass1(this, str)) : new j(StoreGuildTemplates.GuildTemplateState.None.INSTANCE);
+        return str != null ? this.$storeGuildTemplates.observeGuildTemplate(str).u(new AnonymousClass1(this, str)) : new j(StoreGuildTemplates.GuildTemplateState.None.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java
index 87982b8897..d75a805fe0 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java
@@ -96,7 +96,7 @@ public final class WidgetAuthLandingViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreInviteSettings storeInviteSettings, StoreGuildTemplates storeGuildTemplates, StoreAuthentication storeAuthentication) {
-            Observable<StoreState> h = Observable.h(storeInviteSettings.getInviteCode(), storeInviteSettings.getInvite(), storeGuildTemplates.observeDynamicLinkGuildTemplateCode().X(new WidgetAuthLandingViewModel$Companion$observeStoreState$1(storeGuildTemplates)), storeAuthentication.getAgeGateError(), WidgetAuthLandingViewModel$Companion$observeStoreState$2.INSTANCE);
+            Observable<StoreState> h = Observable.h(storeInviteSettings.getInviteCode(), storeInviteSettings.getInvite(), storeGuildTemplates.observeDynamicLinkGuildTemplateCode().Y(new WidgetAuthLandingViewModel$Companion$observeStoreState$1(storeGuildTemplates)), storeAuthentication.getAgeGateError(), WidgetAuthLandingViewModel$Companion$observeStoreState$2.INSTANCE);
             m.checkNotNullExpressionValue(h, "Observable.combineLatest…eError,\n        )\n      }");
             return h;
         }
@@ -507,7 +507,7 @@ public final class WidgetAuthLandingViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(googleSmartLockManager, "googleSmartLockManager");
         this.storeInstantInvites = storeInstantInvites;
         this.googleSmartLockManager = googleSmartLockManager;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetAuthLandingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(googleSmartLockManager.getSmartLockRepo().getSmartLockLoginObservable(), this, null, 2, null), WidgetAuthLandingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         storeAuthentication.requestConsentRequired();
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
index 4d23f339b2..12393fef00 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
@@ -16,10 +16,10 @@ public final class WidgetAuthMfa$onViewBound$1<T1, T2> implements Action2<MenuIt
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_auth_mfa_backup_codes /* 2131364162 */:
+            case R.id.menu_auth_mfa_backup_codes /* 2131364157 */:
                 WidgetAuthMfa.access$showBackupCodesDialog(this.this$0);
                 return;
-            case R.id.menu_auth_mfa_info /* 2131364163 */:
+            case R.id.menu_auth_mfa_info /* 2131364158 */:
                 WidgetAuthMfa.access$showInfoDialog(this.this$0);
                 return;
             default:
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
index 5ad82d4870..2b85dcc4af 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
@@ -201,9 +201,9 @@ public final class WidgetAuthMfa extends AppFragment {
                         m.checkNotNullExpressionValue(coerceToText, "clipboardText");
                         codeVerificationView.setCode(coerceToText);
                         getBinding().b.setOnCodeEntered(new WidgetAuthMfa$tryPasteCodeFromClipboard$2(this));
-                        Observable<Long> c02 = Observable.c0(500, TimeUnit.MILLISECONDS);
-                        m.checkNotNullExpressionValue(c02, "Observable\n            .…L, TimeUnit.MILLISECONDS)");
-                        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), WidgetAuthMfa.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthMfa$tryPasteCodeFromClipboard$3(this), 62, (Object) null);
+                        Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+                        m.checkNotNullExpressionValue(d02, "Observable\n            .…L, TimeUnit.MILLISECONDS)");
+                        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthMfa.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthMfa$tryPasteCodeFromClipboard$3(this), 62, (Object) null);
                     }
                 }
             }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
index da1b1dece2..ca7337bc88 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
@@ -218,9 +218,9 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         getBinding().f2112c.setOnCodeEntered(WidgetAuthPhoneVerify$inputCode$1.INSTANCE);
         getBinding().f2112c.setCode(str);
         getBinding().f2112c.setOnCodeEntered(new WidgetAuthPhoneVerify$inputCode$2(this));
-        Observable<Long> c02 = Observable.c0(500, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(c02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
     }
 
     private final void resendCode() {
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 d13081fb5b..23f474a270 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;
         c0.z.d.m.checkNotNullExpressionValue(textView2, "binding.oauthAuthorizePermissionsLabelTv");
         b.n(textView2, R.string.oauth2_scopes_label, new Object[]{application.g()}, null, 4);
-        SimpleDraweeView simpleDraweeView2 = getBinding().f2326c;
+        SimpleDraweeView simpleDraweeView2 = getBinding().f2324c;
         c0.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/auth/WidgetRemoteAuth.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
index 60dd9ca172..13fd4a1504 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
@@ -81,7 +81,7 @@ public final class WidgetRemoteAuth extends AppFragment {
             AppViewFlipper appViewFlipper2 = getBinding().e;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.remoteAuthViewFlipper");
             appViewFlipper2.setDisplayedChild(1);
-            getBinding().f2337c.b.setOnClickListener(new WidgetRemoteAuth$configureUI$1(this));
+            getBinding().f2335c.b.setOnClickListener(new WidgetRemoteAuth$configureUI$1(this));
         } else if (m.areEqual(viewState, WidgetRemoteAuthViewModel.ViewState.Succeeded.INSTANCE)) {
             AppViewFlipper appViewFlipper3 = getBinding().e;
             m.checkNotNullExpressionValue(appViewFlipper3, "binding.remoteAuthViewFlipper");
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java
index e19ae919ea..384245d689 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java
@@ -81,9 +81,9 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel<ViewState> {
                 String handshakeToken = this.$handshakeData.getHandshakeToken();
                 BehaviorSubject access$getTemporaryBehaviorSubject$p = WidgetRemoteAuthViewModel.access$getTemporaryBehaviorSubject$p(this.this$0.this$0);
                 m.checkNotNullExpressionValue(access$getTemporaryBehaviorSubject$p, "temporaryBehaviorSubject");
-                Object m0 = access$getTemporaryBehaviorSubject$p.m0();
-                m.checkNotNullExpressionValue(m0, "temporaryBehaviorSubject.value");
-                WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) m0).booleanValue(), true));
+                Object n0 = access$getTemporaryBehaviorSubject$p.n0();
+                m.checkNotNullExpressionValue(n0, "temporaryBehaviorSubject.value");
+                WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) n0).booleanValue(), true));
                 return Unit.a;
             }
         }
@@ -108,9 +108,9 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel<ViewState> {
             String handshakeToken = modelRemoteAuthHandshake.getHandshakeToken();
             BehaviorSubject access$getTemporaryBehaviorSubject$p = WidgetRemoteAuthViewModel.access$getTemporaryBehaviorSubject$p(this.this$0);
             m.checkNotNullExpressionValue(access$getTemporaryBehaviorSubject$p, "temporaryBehaviorSubject");
-            Object m0 = access$getTemporaryBehaviorSubject$p.m0();
-            m.checkNotNullExpressionValue(m0, "temporaryBehaviorSubject.value");
-            WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) m0).booleanValue(), false));
+            Object n0 = access$getTemporaryBehaviorSubject$p.n0();
+            m.checkNotNullExpressionValue(n0, "temporaryBehaviorSubject.value");
+            WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) n0).booleanValue(), false));
             a.H(ViewModelKt.getViewModelScope(this.this$0), null, null, new AnonymousClass1(this, modelRemoteAuthHandshake, null), 3, null);
         }
     }
@@ -285,7 +285,7 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(str, "fingerprint");
         m.checkNotNullParameter(restAPI, "restAPI");
         this.restAPI = restAPI;
-        this.temporaryBehaviorSubject = BehaviorSubject.k0(Boolean.TRUE);
+        this.temporaryBehaviorSubject = BehaviorSubject.l0(Boolean.TRUE);
         if (t.isBlank(str)) {
             updateViewState(ViewState.Failed.INSTANCE);
             return;
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
index efb74a1135..28b9d78652 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
@@ -112,7 +112,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo
         MaterialButton materialButton = a.b;
         m.checkNotNullExpressionValue(materialButton, "binding.button");
         configureStyle(materialButton, buttonMessageComponent.getStyle());
-        SimpleDraweeView simpleDraweeView = a.f2200c;
+        SimpleDraweeView simpleDraweeView = a.f2199c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.emoji");
         configureEmoji(simpleDraweeView, buttonMessageComponent.getEmoji(), buttonMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Loading, buttonMessageComponent.getEmojiAnimationsEnabled());
         AppCompatImageView appCompatImageView = a.e;
@@ -124,7 +124,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo
         MaterialTextView materialTextView2 = a.d;
         m.checkNotNullExpressionValue(materialTextView2, "binding.label");
         ViewExtensions.setEnabledAlpha(materialTextView2, !(buttonMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Disabled), 0.5f);
-        SimpleDraweeView simpleDraweeView2 = a.f2200c;
+        SimpleDraweeView simpleDraweeView2 = a.f2199c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.emoji");
         ViewExtensions.setEnabledAlpha$default(simpleDraweeView2, !(buttonMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Disabled), 0.0f, 2, null);
         AppCompatImageView appCompatImageView2 = a.e;
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
index 40afcf26c8..d2b83257b1 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
@@ -157,7 +157,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         setBottomSheetCollapsedStateDisabled();
-        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f2344c;
+        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f2342c;
         m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.widgetSheetComponentBottomSheetRecycler");
         maxHeightRecyclerView.setAdapter(this.adapter);
     }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java
index b095897604..0e38ecfb9a 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java
@@ -76,7 +76,7 @@ public final class SelectComponentBottomSheetItemViewHolder extends RecyclerView
         View view = this.binding.d;
         m.checkNotNullExpressionValue(view, "binding.selectComponentSheetItemDividerIcon");
         view.setVisibility(z3 && !z5 ? 0 : 8);
-        View view2 = this.binding.f2345c;
+        View view2 = this.binding.f2343c;
         m.checkNotNullExpressionValue(view2, "binding.selectComponentSheetItemDivider");
         if (z3 || z5) {
             z8 = false;
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java
index f1d904e215..2024d856eb 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java
@@ -127,7 +127,7 @@ public final class SelectComponentBottomSheetViewModel extends AppViewModel<View
         this.isMultiSelect = i3 <= 1 ? false : z3;
         this.selectedItems = u.toMutableSet(list2);
         updateViewState();
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     private final boolean isValidSelection() {
diff --git a/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java b/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
index 7f6d912f9a..d28707ff6e 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
@@ -517,7 +517,7 @@ public final class BugReportViewModel extends AppViewModel<ViewState> {
         this.sendingSticker = list.get(random);
         this.successSticker = successStickers.get(random);
         this.useScreenshot = true;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         loadFeatures();
     }
 
@@ -559,9 +559,9 @@ public final class BugReportViewModel extends AppViewModel<ViewState> {
     }
 
     private final void dismissAfterDelay() {
-        Observable<Long> c02 = Observable.c0(1500, TimeUnit.MILLISECONDS);
-        c0.z.d.m.checkNotNullExpressionValue(c02, "Observable.timer(1500, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), BugReportViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportViewModel$dismissAfterDelay$1(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(1500, TimeUnit.MILLISECONDS);
+        c0.z.d.m.checkNotNullExpressionValue(d02, "Observable.timer(1500, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), BugReportViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportViewModel$dismissAfterDelay$1(this), 62, (Object) null);
     }
 
     private final List<Feature> filterFeatures(String str) {
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
index c1466654a3..ec1563e16f 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
@@ -163,7 +163,7 @@ public final class WidgetBugReport extends AppFragment {
                 RequestBody.Companion companion = RequestBody.Companion;
                 String type = requireContext().getContentResolver().getType(screenshotUri);
                 if (type != null) {
-                    MediaType.a aVar = MediaType.f3124c;
+                    MediaType.a aVar = MediaType.f3122c;
                     mediaType = MediaType.a.a(type);
                 }
                 requestBody = RequestBody.Companion.d(companion, readBytes, mediaType, 0, 0, 6);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
index 594f18a5db..f46bee9969 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
@@ -272,9 +272,9 @@ public final class WidgetChannelSelector extends AppBottomSheet {
 
             public final Observable<List<Item>> get(long j, boolean z2, FilterFunction filterFunction) {
                 m.checkNotNullParameter(filterFunction, "filterFunction");
-                Observable E = StoreChannels.observeChannelsForGuild$default(StoreStream.Companion.getChannels(), j, null, 2, null).E(new WidgetChannelSelector$Model$Companion$get$1(filterFunction, z2));
-                m.checkNotNullExpressionValue(E, "StoreStream.getChannels(… { Item(it) }\n          }");
-                Observable<List<Item>> q = ObservableExtensionsKt.computationLatest(E).q();
+                Observable F = StoreChannels.observeChannelsForGuild$default(StoreStream.Companion.getChannels(), j, null, 2, null).F(new WidgetChannelSelector$Model$Companion$get$1(filterFunction, z2));
+                m.checkNotNullExpressionValue(F, "StoreStream.getChannels(… { Item(it) }\n          }");
+                Observable<List<Item>> q = ObservableExtensionsKt.computationLatest(F).q();
                 m.checkNotNullExpressionValue(q, "StoreStream.getChannels(…  .distinctUntilChanged()");
                 return q;
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java
index a1cd9c728e..3a42678099 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java
@@ -31,7 +31,7 @@ public final class WidgetChannelSidebarActionsViewModel$Companion$observeStoreSt
 
         public final Observable<? extends WidgetChannelSidebarActionsViewModel.StoreState> call(Channel channel) {
             Observable<? extends WidgetChannelSidebarActionsViewModel.StoreState> jVar = channel == null ? new j<>(WidgetChannelSidebarActionsViewModel.StoreState.ChannelNotFound.INSTANCE) : Observable.j(this.this$0.$storeUserGuildSettings.observeGuildSettings(), StoreUser.observeMe$default(this.this$0.$storeUser, false, 1, null), new WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1$1$storeState$1(this, channel));
-            return m.areEqual(this.$panelState, PanelState.c.a) ? jVar : jVar.Y(1);
+            return m.areEqual(this.$panelState, PanelState.c.a) ? jVar : jVar.Z(1);
         }
     }
 
@@ -43,6 +43,6 @@ public final class WidgetChannelSidebarActionsViewModel$Companion$observeStoreSt
     }
 
     public final Observable<? extends WidgetChannelSidebarActionsViewModel.StoreState> call(PanelState panelState) {
-        return this.$storeChannelsSelected.observeSelectedChannel().X(new AnonymousClass1(this, panelState));
+        return this.$storeChannelsSelected.observeSelectedChannel().Y(new AnonymousClass1(this, panelState));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java
index dd2335ed01..607ad995e0 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java
@@ -63,9 +63,9 @@ public final class WidgetChannelSidebarActionsViewModel extends AppViewModel<Vie
         }
 
         private final Observable<StoreState> observeStoreState(StoreNavigation storeNavigation, StoreChannelsSelected storeChannelsSelected, StoreUserGuildSettings storeUserGuildSettings, StoreGuildsNsfw storeGuildsNsfw, StoreUser storeUser) {
-            Observable<R> X = storeNavigation.observeRightPanelState().X(new WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1(storeChannelsSelected, storeUserGuildSettings, storeUser, storeGuildsNsfw));
-            m.checkNotNullExpressionValue(X, "storeNavigation\n        …          }\n            }");
-            return X;
+            Observable<R> Y = storeNavigation.observeRightPanelState().Y(new WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1(storeChannelsSelected, storeUserGuildSettings, storeUser, storeGuildsNsfw));
+            m.checkNotNullExpressionValue(Y, "storeNavigation\n        …          }\n            }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreNavigation storeNavigation, StoreChannelsSelected storeChannelsSelected, StoreUserGuildSettings storeUserGuildSettings, StoreGuildsNsfw storeGuildsNsfw, StoreUser storeUser, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java
index dd7cbfa75e..ca886a669d 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java
@@ -73,7 +73,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
             }
             Companion companion2 = WidgetChannelTopicViewModel.Companion;
             m.checkNotNullExpressionValue(navState, "navState");
-            return Companion.observeStoreState$default(companion2, navState, null, null, null, null, null, 62, null).Y(1);
+            return Companion.observeStoreState$default(companion2, navState, null, null, null, null, null, 62, null).Z(1);
         }
     }
 
@@ -209,13 +209,13 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
                 m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …            )\n          )");
                 return jVar;
             }
-            Observable<R> E = storeGuilds.observeComputed().E(new WidgetChannelTopicViewModel$Companion$mapChannelToPrivateStoreState$1(channel, storeUserSettings, navState));
-            m.checkNotNullExpressionValue(E, "storeGuilds.observeCompu…            )\n          }");
-            return E;
+            Observable<R> F = storeGuilds.observeComputed().F(new WidgetChannelTopicViewModel$Companion$mapChannelToPrivateStoreState$1(channel, storeUserSettings, navState));
+            m.checkNotNullExpressionValue(F, "storeGuilds.observeCompu…            )\n          }");
+            return F;
         }
 
         private final Observable<NavState> observeNavState(StoreNavigation storeNavigation, StoreTabsNavigation storeTabsNavigation) {
-            Observable<NavState> j = Observable.j(storeNavigation.observeRightPanelState().E(WidgetChannelTopicViewModel$Companion$observeNavState$1.INSTANCE), storeTabsNavigation.observeSelectedTab().E(WidgetChannelTopicViewModel$Companion$observeNavState$2.INSTANCE), WidgetChannelTopicViewModel$Companion$observeNavState$3.INSTANCE);
+            Observable<NavState> j = Observable.j(storeNavigation.observeRightPanelState().F(WidgetChannelTopicViewModel$Companion$observeNavState$1.INSTANCE), storeTabsNavigation.observeSelectedTab().F(WidgetChannelTopicViewModel$Companion$observeNavState$2.INSTANCE), WidgetChannelTopicViewModel$Companion$observeNavState$3.INSTANCE);
             m.checkNotNullExpressionValue(j, "Observable.combineLatest…sOpen, isOnHomeTab)\n    }");
             return j;
         }
@@ -231,9 +231,9 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(NavState navState, StoreChannelsSelected storeChannelsSelected, StoreChannels storeChannels, StoreUser storeUser, StoreGuilds storeGuilds, StoreUserSettings storeUserSettings) {
-            Observable<R> X = storeChannelsSelected.observeSelectedChannel().X(new WidgetChannelTopicViewModel$Companion$observeStoreState$1(navState, storeGuilds, storeUserSettings, storeChannels, storeUser));
-            m.checkNotNullExpressionValue(X, "storeChannelsSelected\n  …            }\n          }");
-            return X;
+            Observable<R> Y = storeChannelsSelected.observeSelectedChannel().Y(new WidgetChannelTopicViewModel$Companion$observeStoreState$1(navState, storeGuilds, storeUserSettings, storeChannels, storeUser));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected\n  …            }\n          }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, NavState navState, StoreChannelsSelected storeChannelsSelected, StoreChannels storeChannels, StoreUser storeUser, StoreGuilds storeGuilds, StoreUserSettings storeUserSettings, int i, Object obj) {
@@ -1817,7 +1817,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
         this.topicParser = parser;
         this.revealedIndices = n0.emptySet();
         this.previousChannelId = 0L;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetChannelTopicViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
@@ -1825,7 +1825,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
     public /* synthetic */ WidgetChannelTopicViewModel(Observable observable, Parser parser, int i, DefaultConstructorMarker defaultConstructorMarker) {
         this(observable, (i & 2) != 0 ? DiscordParser.createParser$default(false, true, false, 4, null) : parser);
         if ((i & 1) != 0) {
-            observable = Companion.observeNavState$default(Companion, null, null, 3, null).X(AnonymousClass1.INSTANCE);
+            observable = Companion.observeNavState$default(Companion, null, null, 3, null).Y(AnonymousClass1.INSTANCE);
             m.checkNotNullExpressionValue(observable, "observeNavState().switch…avState\n    ).take(1)\n  }");
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$3.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$3.java
index fda65f4942..0b8b6d8505 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$3.java
@@ -17,7 +17,7 @@ public final class WidgetCreateChannel$onViewBoundOrOnResume$3 implements View.O
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         RadioManager radioManager = this.$radioManager;
-        RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f2211r;
+        RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f2210r;
         m.checkNotNullExpressionValue(radioButton, "binding.createChannelVoiceRadio");
         radioManager.a(radioButton);
         WidgetCreateChannel.access$configurePrivateRoles(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java
index 84d994802d..0f76cde014 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java
@@ -17,7 +17,7 @@ public final class WidgetCreateChannel$onViewBoundOrOnResume$4 implements View.O
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         RadioManager radioManager = this.$radioManager;
-        RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f2210c;
+        RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f2209c;
         m.checkNotNullExpressionValue(radioButton, "binding.createChannelAnnouncementsRadio");
         radioManager.a(radioButton);
         WidgetCreateChannel.access$configurePrivateRoles(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
index 3f990013d0..c46c508842 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
@@ -396,12 +396,12 @@ public final class WidgetCreateChannel extends AppFragment {
         if (getType() == 4) {
             return 4;
         }
-        RadioButton radioButton = getBinding().f2211r;
+        RadioButton radioButton = getBinding().f2210r;
         m.checkNotNullExpressionValue(radioButton, "binding.createChannelVoiceRadio");
         if (radioButton.isChecked()) {
             return 2;
         }
-        RadioButton radioButton2 = getBinding().f2210c;
+        RadioButton radioButton2 = getBinding().f2209c;
         m.checkNotNullExpressionValue(radioButton2, "binding.createChannelAnnouncementsRadio");
         if (radioButton2.isChecked()) {
             return 5;
@@ -505,7 +505,7 @@ public final class WidgetCreateChannel extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getGuildId(), getCategoryId()), this, null, 2, null), WidgetCreateChannel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCreateChannel$onViewBoundOrOnResume$1(this), 62, (Object) null);
         int i = 0;
         boolean z2 = true;
-        RadioManager radioManager = new RadioManager(n.listOf((Object[]) new RadioButton[]{getBinding().o, getBinding().f2211r, getBinding().f2210c, getBinding().m}));
+        RadioManager radioManager = new RadioManager(n.listOf((Object[]) new RadioButton[]{getBinding().o, getBinding().f2210r, getBinding().f2209c, getBinding().m}));
         getBinding().n.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$2(this, radioManager));
         getBinding().q.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$3(this, radioManager));
         getBinding().b.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$4(this, radioManager));
@@ -516,11 +516,11 @@ public final class WidgetCreateChannel extends AppFragment {
             m.checkNotNullExpressionValue(radioButton, "binding.createChannelTextRadio");
             radioManager.a(radioButton);
         } else if (type == 2) {
-            RadioButton radioButton2 = getBinding().f2211r;
+            RadioButton radioButton2 = getBinding().f2210r;
             m.checkNotNullExpressionValue(radioButton2, "binding.createChannelVoiceRadio");
             radioManager.a(radioButton2);
         } else if (type == 5) {
-            RadioButton radioButton3 = getBinding().f2210c;
+            RadioButton radioButton3 = getBinding().f2209c;
             m.checkNotNullExpressionValue(radioButton3, "binding.createChannelAnnouncementsRadio");
             radioManager.a(radioButton3);
         } else if (type == 13) {
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java
index f78ee26570..ac3c8aa0f4 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java
@@ -113,7 +113,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2
             }
 
             public final Observable<? extends Map<Long, Integer>> call(Map<Long, ? extends User> map) {
-                return Observable.z(this.$relationships.entrySet()).w(new AnonymousClass1(this, map)).f0(AnonymousClass2.INSTANCE, AnonymousClass3.INSTANCE);
+                return Observable.A(this.$relationships.entrySet()).x(new AnonymousClass1(this, map)).g0(AnonymousClass2.INSTANCE, AnonymousClass3.INSTANCE);
             }
         }
 
@@ -130,7 +130,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2
         }
 
         public final Observable<? extends Map<Long, Integer>> call(Map<Long, Integer> map) {
-            return StoreStream.Companion.getUsers().observeUsers(map.keySet()).X(new AnonymousClass1(this, map));
+            return StoreStream.Companion.getUsers().observeUsers(map.keySet()).Y(new AnonymousClass1(this, map));
         }
     }
 
@@ -139,6 +139,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2
     }
 
     public final Observable<? extends Map<Long, Integer>> call(List<Long> list) {
-        return StoreStream.Companion.getUserRelationships().observeForType(1).X(new AnonymousClass1(this, list));
+        return StoreStream.Companion.getUserRelationships().observeForType(1).Y(new AnonymousClass1(this, list));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java
index 5a4ceefb22..b69bd176fa 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java
@@ -104,7 +104,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getForAdd$1<T, R> im
             } else {
                 arrayList = null;
             }
-            return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(companion, arrayList, addedUsersInput.getFilter()).E(new AnonymousClass2(addedUsersInput)).X(new AnonymousClass3(this, addedUsersInput));
+            return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(companion, arrayList, addedUsersInput.getFilter()).F(new AnonymousClass2(addedUsersInput)).Y(new AnonymousClass3(this, addedUsersInput));
         }
     }
 
@@ -125,6 +125,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getForAdd$1<T, R> im
         if (r2 != null) {
             r2 = new WidgetGroupInviteFriends$sam$rx_functions_Func2$0(r2);
         }
-        return Observable.j(observable, observable2, (Func2) r2).X(new AnonymousClass2(channel));
+        return Observable.j(observable, observable2, (Func2) r2).Y(new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java
index e00c5ff687..5e7d5b8ded 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java
@@ -55,6 +55,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getForCreate$2<T, R>
     }
 
     public final Observable<? extends WidgetGroupInviteFriends.Model> call(WidgetGroupInviteFriends.Model.Companion.AddedUsersInput addedUsersInput) {
-        return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(WidgetGroupInviteFriends.Model.Companion, null, addedUsersInput.getFilter()).E(new AnonymousClass1(addedUsersInput)).X(new AnonymousClass2(addedUsersInput));
+        return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(WidgetGroupInviteFriends.Model.Companion, null, addedUsersInput.getFilter()).F(new AnonymousClass1(addedUsersInput)).Y(new AnonymousClass2(addedUsersInput));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java
index 7f36118e53..08c1b8e979 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java
@@ -34,7 +34,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1<T
         }
 
         public final Observable<? extends List<User>> call(Collection<? extends User> collection) {
-            return Observable.z(collection).w(new AnonymousClass1(this)).e0();
+            return Observable.A(collection).x(new AnonymousClass1(this)).f0();
         }
     }
 
@@ -50,6 +50,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1<T
     }
 
     public final Observable<? extends List<User>> call(Map<Long, Integer> map) {
-        return this.$addedUsers.X(new AnonymousClass1(map));
+        return this.$addedUsers.Y(new AnonymousClass1(map));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
index 6632a63832..be3838e08c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
@@ -64,9 +64,9 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     private static final int VIEW_INDEX_NO_FRIENDS = 1;
     private WidgetGroupInviteFriendsAdapter adapter;
     private final LinkedTreeMap<Long, User> addedUsers = new LinkedTreeMap<>();
-    private final BehaviorSubject<Collection<User>> addedUsersPublisher = BehaviorSubject.k0(new ArrayList());
+    private final BehaviorSubject<Collection<User>> addedUsersPublisher = BehaviorSubject.l0(new ArrayList());
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGroupInviteFriends$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.k0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
 
     /* compiled from: WidgetGroupInviteFriends.kt */
     public static final class Companion {
@@ -203,15 +203,15 @@ public final class WidgetGroupInviteFriends extends AppFragment {
                 if (collection == null) {
                     collection = n.emptyList();
                 }
-                Observable<ModelAppUserRelationship> X = Observable.z(collection).E(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.INSTANCE).e0().y(new WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2(str)).X(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.INSTANCE);
-                m.checkNotNullExpressionValue(X, "Observable\n            .…          }\n            }");
-                return X;
+                Observable<ModelAppUserRelationship> Y = Observable.A(collection).F(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.INSTANCE).f0().z(new WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2(str)).Y(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "Observable\n            .…          }\n            }");
+                return Y;
             }
 
             private final Observable<Model> getForAdd(long j, Observable<Collection<User>> observable, Observable<String> observable2) {
-                Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new WidgetGroupInviteFriends$Model$Companion$getForAdd$1(observable, observable2));
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-                return X;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetGroupInviteFriends$Model$Companion$getForAdd$1(observable, observable2));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                return Y;
             }
 
             /* JADX WARN: Multi-variable type inference failed */
@@ -221,9 +221,9 @@ public final class WidgetGroupInviteFriends extends AppFragment {
                 if (widgetGroupInviteFriends$Model$Companion$getForCreate$1 != null) {
                     widgetGroupInviteFriends$Model$Companion$getForCreate$1 = new WidgetGroupInviteFriends$sam$rx_functions_Func2$0(widgetGroupInviteFriends$Model$Companion$getForCreate$1);
                 }
-                Observable<Model> X = Observable.j(observable, observable2, (Func2) widgetGroupInviteFriends$Model$Companion$getForCreate$1).X(WidgetGroupInviteFriends$Model$Companion$getForCreate$2.INSTANCE);
-                m.checkNotNullExpressionValue(X, "Observable\n            .…          }\n            }");
-                return X;
+                Observable<Model> Y = Observable.j(observable, observable2, (Func2) widgetGroupInviteFriends$Model$Companion$getForCreate$1).Y(WidgetGroupInviteFriends$Model$Companion$getForCreate$2.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "Observable\n            .…          }\n            }");
+                return Y;
             }
 
             public static /* synthetic */ void getMODE_CREATE$annotations() {
@@ -237,7 +237,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
 
             public final Observable<? extends Collection<User>> getFriendChanges(Observable<Collection<User>> observable) {
                 m.checkNotNullParameter(observable, "addedUsers");
-                Observable<? extends Collection<User>> q = StoreStream.Companion.getUserRelationships().observeForType(1).X(new WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1(observable)).q();
+                Observable<? extends Collection<User>> q = StoreStream.Companion.getUserRelationships().observeForType(1).Y(new WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1(observable)).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -807,7 +807,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
             if ((w2 != null ? w2.size() : 1) >= model.getMaxGroupMemberCount()) {
                 charSequence = getString(R.string.group_dm_invite_full_main);
                 m.checkNotNullExpressionValue(charSequence, "getString(R.string.group_dm_invite_full_main)");
-                RelativeLayout relativeLayout = getBinding().f2246c;
+                RelativeLayout relativeLayout = getBinding().f2245c;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.groupInviteFriendsRecipientsContainer");
                 relativeLayout.setVisibility(8);
                 setActionBarSubtitle(charSequence);
@@ -827,7 +827,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
             m.checkNotNullExpressionValue(resources2, "resources");
             charSequence = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.group_dm_invite_unselect_users_number, i, Integer.valueOf(i));
         }
-        RelativeLayout relativeLayout2 = getBinding().f2246c;
+        RelativeLayout relativeLayout2 = getBinding().f2245c;
         m.checkNotNullExpressionValue(relativeLayout2, "binding.groupInviteFriendsRecipientsContainer");
         relativeLayout2.setVisibility(0);
         setActionBarSubtitle(charSequence);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
index 7f04661c16..354fd2bd47 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
@@ -94,7 +94,7 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp
             SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemGame");
             PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null);
-            SimpleDraweeView simpleDraweeView = this.binding.f2247c;
+            SimpleDraweeView simpleDraweeView = this.binding.f2246c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, friendItem.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java
index d26c0a73c8..6ef3f50a2a 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java
@@ -121,16 +121,16 @@ public final class GroupInviteFriendsSheetViewModel extends AppViewModel<ViewSta
         }
 
         private final Observable<Map<Long, User>> observeFriends(StoreUserRelationships storeUserRelationships, StoreUser storeUser) {
-            Observable<R> X = storeUserRelationships.observeForType(1).X(new GroupInviteFriendsSheetViewModel$Companion$observeFriends$1(storeUser));
-            m.checkNotNullExpressionValue(X, "storeUserRelationships.o…ships.keys)\n            }");
-            return X;
+            Observable<R> Y = storeUserRelationships.observeForType(1).Y(new GroupInviteFriendsSheetViewModel$Companion$observeFriends$1(storeUser));
+            m.checkNotNullExpressionValue(Y, "storeUserRelationships.o…ships.keys)\n            }");
+            return Y;
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreUserRelationships storeUserRelationships, StoreUser storeUser, StoreChannels storeChannels) {
             if (j == -1) {
-                Observable<R> E = observeFriends(storeUserRelationships, storeUser).E(GroupInviteFriendsSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-                m.checkNotNullExpressionValue(E, "observeFriends(storeUser…          )\n            }");
-                return E;
+                Observable<R> F = observeFriends(storeUserRelationships, storeUser).F(GroupInviteFriendsSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "observeFriends(storeUser…          )\n            }");
+                return F;
             }
             Observable<StoreState> j2 = Observable.j(storeChannels.observeChannel(j), observeFriends(storeUserRelationships, storeUser), GroupInviteFriendsSheetViewModel$Companion$observeStoreState$2.INSTANCE);
             m.checkNotNullExpressionValue(j2, "Observable\n             …      )\n                }");
@@ -357,13 +357,13 @@ public final class GroupInviteFriendsSheetViewModel extends AppViewModel<ViewSta
         this.channelId = j;
         this.storeUser = storeUser;
         this.maxNumMembers = i;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.currentStoreState = new StoreState(null, null, 3, null);
         this.checkedUsers = new HashSet<>();
-        BehaviorSubject<CharSequence> j0 = BehaviorSubject.j0();
-        this.searchTextChangedPublisher = j0;
+        BehaviorSubject<CharSequence> k0 = BehaviorSubject.k0();
+        this.searchTextChangedPublisher = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), GroupInviteFriendsSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        Observable<CharSequence> o = j0.o(150, TimeUnit.MILLISECONDS);
+        Observable<CharSequence> o = k0.o(150, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "searchTextChangedPublish…S, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(o, this, null, 2, null), GroupInviteFriendsSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
index c8fad2f1fe..2956ab7169 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
@@ -471,9 +471,9 @@ public final class WidgetChannelListModel {
             StoreUserGuildSettings userGuildSettings = companion.getUserGuildSettings();
             StoreExperiments experiments = companion.getExperiments();
             StoreUserConnections userConnections = companion.getUserConnections();
-            Observable<WidgetChannelListModel> E = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels, channelsSelected, presences, messagesMostRecent, mentions, applicationStreaming, userGuildSettings, experiments, userConnections}, false, null, null, 14, null), 250, TimeUnit.MILLISECONDS).E(new WidgetChannelListModel$Companion$getPrivateChannelList$1(channels, messagesMostRecent, channelsSelected, presences, mentions, applicationStreaming, userGuildSettings, experiments, userConnections));
-            m.checkNotNullExpressionValue(E, "ObservationDeckProvider\n…            )\n          }");
-            return E;
+            Observable<WidgetChannelListModel> F = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels, channelsSelected, presences, messagesMostRecent, mentions, applicationStreaming, userGuildSettings, experiments, userConnections}, false, null, null, 14, null), 250, TimeUnit.MILLISECONDS).F(new WidgetChannelListModel$Companion$getPrivateChannelList$1(channels, messagesMostRecent, channelsSelected, presences, mentions, applicationStreaming, userGuildSettings, experiments, userConnections));
+            m.checkNotNullExpressionValue(F, "ObservationDeckProvider\n…            )\n          }");
+            return F;
         }
 
         private final Observable<WidgetChannelListModel> getSelectedGuildChannelList(long j) {
@@ -498,7 +498,7 @@ public final class WidgetChannelListModel {
         }
 
         public final Observable<WidgetChannelListModel> get() {
-            Observable<WidgetChannelListModel> q = StoreStream.Companion.getGuildSelected().observeSelectedGuildId().X(WidgetChannelListModel$Companion$get$1.INSTANCE).q();
+            Observable<WidgetChannelListModel> q = StoreStream.Companion.getGuildSelected().observeSelectedGuildId().Y(WidgetChannelListModel$Companion$get$1.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "StoreStream\n          .g…  .distinctUntilChanged()");
             return q;
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
index 7b3dbaa73c..69495b4b4a 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
@@ -418,7 +418,7 @@ public final class WidgetChannelListUnreads {
     }
 
     private final void onConfigureView(Model.Indicator indicator, boolean z2) {
-        getBinding().f2165c.setBackgroundResource(getIcon(indicator));
+        getBinding().f2164c.setBackgroundResource(getIcon(indicator));
         getBinding().b.setText(getText(indicator));
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.channelsListUnreads");
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
index d92d088d00..da10a46ed5 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
@@ -221,12 +221,12 @@ public final class WidgetChannelsList extends AppFragment {
         EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = getBinding().p;
         m.checkNotNullExpressionValue(emptyFriendsStateContactSyncView, "binding.widgetChannelsListEmptyFriendsStateCsView");
         emptyFriendsStateContactSyncView.setVisibility(widgetChannelListModel.getShowEmptyState() && widgetChannelListModel.getShowContactSyncEmptyState() ? 0 : 8);
-        RecyclerView recyclerView = getBinding().f2152c;
+        RecyclerView recyclerView = getBinding().f2151c;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelsList");
         recyclerView.setVisibility(widgetChannelListModel.getShowEmptyState() ? 4 : 0);
         if (!m.areEqual(this.selectedGuildId, selectedGuild != null ? Long.valueOf(selectedGuild.getId()) : null)) {
             if (z3) {
-                getBinding().f2152c.scrollToPosition(0);
+                getBinding().f2151c.scrollToPosition(0);
                 getBinding().b.setExpanded(true);
                 configureHeaderColors(widgetChannelListModel.getSelectedGuild(), true);
             }
@@ -334,7 +334,7 @@ public final class WidgetChannelsList extends AppFragment {
         getBinding().q.updateView(ANALYTICS_SOURCE);
         getBinding().p.updateView(true);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f2152c;
+        RecyclerView recyclerView = getBinding().f2151c;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelsList");
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -385,13 +385,13 @@ public final class WidgetChannelsList extends AppFragment {
         }
         widgetChannelsListAdapter9.setOnAddServer(new WidgetChannelsList$onViewBound$9(this));
         getBinding().k.setOnClickListener(new WidgetChannelsList$onViewBound$10(this));
-        getBinding().f2152c.setHasFixedSize(false);
-        RecyclerView recyclerView2 = getBinding().f2152c;
+        getBinding().f2151c.setHasFixedSize(false);
+        RecyclerView recyclerView2 = getBinding().f2151c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.channelsList");
         recyclerView2.setItemAnimator(null);
         ViewStub viewStub = getBinding().m;
         m.checkNotNullExpressionValue(viewStub, "binding.channelsListUnreadsStub");
-        RecyclerView recyclerView3 = getBinding().f2152c;
+        RecyclerView recyclerView3 = getBinding().f2151c;
         m.checkNotNullExpressionValue(recyclerView3, "binding.channelsList");
         this.channelListUnreads = new WidgetChannelListUnreads(viewStub, recyclerView3, getBinding().b, new WidgetChannelsList$onViewBound$11(this), 0, 0, false, 112, null);
         WidgetChannelsListAdapter widgetChannelsListAdapter10 = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
index ac3a96a0e5..3ee2c39a84 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
@@ -156,7 +156,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullParameter(channelListItem, "data");
             super.onConfigure(i, (int) channelListItem);
             if (channelListItem instanceof ChannelListItemAddServer) {
-                this.binding.f2160c.setText(R.string.hub_sidebar_add_servers);
+                this.binding.f2159c.setText(R.string.hub_sidebar_add_servers);
                 this.binding.b.setImageResource(R.drawable.ic_add_24dp);
                 this.binding.a.setOnClickListener(new WidgetChannelsListAdapter$ItemChannelAddServer$onConfigure$$inlined$apply$lambda$1(this));
             }
@@ -293,13 +293,13 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             int access$getChannelColor = Companion.access$getChannelColor(companion, channelListItemCategory, context);
             this.binding.d.setTextColor(access$getChannelColor);
             ViewCompat.setAccessibilityDelegate(this.binding.d, new WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$3());
-            this.binding.f2155c.setImageResource(Companion.access$getArrowDrawable(companion, channelListItemCategory));
-            ImageView imageView = this.binding.f2155c;
+            this.binding.f2154c.setImageResource(Companion.access$getArrowDrawable(companion, channelListItemCategory));
+            ImageView imageView = this.binding.f2154c;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemCategoryArrow");
             imageView.setImageTintList(ColorStateList.valueOf(access$getChannelColor));
             if (this.isCollapsed != channelListItemCategory.isCollapsed()) {
                 this.isCollapsed = channelListItemCategory.isCollapsed();
-                this.binding.f2155c.startAnimation(channelListItemCategory.isCollapsed() ? ARROW_ANIM_COLLAPSE : ARROW_ANIM_EXPAND);
+                this.binding.f2154c.startAnimation(channelListItemCategory.isCollapsed() ? ARROW_ANIM_COLLAPSE : ARROW_ANIM_EXPAND);
             }
             ImageView imageView2 = this.binding.b;
             m.checkNotNullExpressionValue(imageView2, "binding.channelsItemCategoryAdd");
@@ -337,7 +337,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             ChannelListItemDirectory channelListItemDirectory = (ChannelListItemDirectory) channelListItem;
             boolean t = ChannelUtils.t(channelListItemDirectory.getChannel());
             if (t) {
-                TextView textView = this.binding.f2160c;
+                TextView textView = this.binding.f2159c;
                 m.checkNotNullExpressionValue(textView, "binding.directoryChannelName");
                 String m = channelListItemDirectory.getChannel().m();
                 if (m == null) {
@@ -345,7 +345,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 }
                 textView.setText(m);
             } else {
-                this.binding.f2160c.setText(R.string.hub_sidebar_join_servers);
+                this.binding.f2159c.setText(R.string.hub_sidebar_join_servers);
             }
             this.binding.b.setImageResource(t ? R.drawable.ic_hub_24dp : R.drawable.ic_compass);
             LinearLayout linearLayout = this.binding.a;
@@ -499,7 +499,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             TextView textView3 = this.binding.g;
             m.checkNotNullExpressionValue(textView3, "binding.channelsListItemPrivateTag");
             textView3.setVisibility(ChannelUtils.z(component1) ? 0 : 8);
-            SimpleDraweeView simpleDraweeView = this.binding.f2157c;
+            SimpleDraweeView simpleDraweeView = this.binding.f2156c;
             m.checkNotNullExpressionValue(simpleDraweeView, "it");
             IconUtils.setIcon$default(simpleDraweeView, component1, (int) R.dimen.avatar_size_standard, (MGImages.ChangeDetector) null, 8, (Object) null);
             StatusView statusView = this.binding.b;
@@ -657,7 +657,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             RelativeLayout relativeLayout2 = this.binding.a;
             m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
             setBackground(relativeLayout2, component2, component1);
-            TextView textView = this.binding.f2158c;
+            TextView textView = this.binding.f2157c;
             textView.setText(ChannelUtils.c(component1));
             textView.setTextColor(access$getVoiceChannelColor);
             TextView textView2 = this.binding.d;
@@ -820,10 +820,10 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             ImageView imageView = this.binding.b;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemChannelHash");
             imageView.setImageTintList(ColorStateList.valueOf(getHashColor(channelListItemTextChannel)));
-            TextView textView2 = this.binding.f2156c;
+            TextView textView2 = this.binding.f2155c;
             m.checkNotNullExpressionValue(textView2, "binding.channelsItemChannelMentions");
             textView2.setVisibility(channelListItemTextChannel.getMentionCount() > 0 ? 0 : 8);
-            TextView textView3 = this.binding.f2156c;
+            TextView textView3 = this.binding.f2155c;
             m.checkNotNullExpressionValue(textView3, "binding.channelsItemChannelMentions");
             textView3.setText(String.valueOf(Math.min(99, channelListItemTextChannel.getMentionCount())));
             ImageView imageView2 = this.binding.e;
@@ -945,12 +945,12 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullExpressionValue(textView, "binding.channelsItemThreadName");
             textView.setText(channelListItemThread.getChannel().m());
             this.binding.d.setTextColor(getTextColor(channelListItemThread, channelListItemThread.getSelected()));
-            TextView textView2 = this.binding.f2163c;
+            TextView textView2 = this.binding.f2162c;
             m.checkNotNullExpressionValue(textView2, "binding.channelsItemThreadMentions");
             boolean z2 = true;
             int i2 = 0;
             textView2.setVisibility(channelListItemThread.getMentionCount() > 0 ? 0 : 8);
-            TextView textView3 = this.binding.f2163c;
+            TextView textView3 = this.binding.f2162c;
             m.checkNotNullExpressionValue(textView3, "binding.channelsItemThreadMentions");
             textView3.setText(String.valueOf(Math.min(99, channelListItemThread.getMentionCount())));
             ImageView imageView = this.binding.f;
@@ -1077,10 +1077,10 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             RelativeLayout relativeLayout2 = this.binding.a;
             m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
             setBackground(relativeLayout2, component2, component1);
-            TextView textView = this.binding.f2159c;
+            TextView textView = this.binding.f2158c;
             m.checkNotNullExpressionValue(textView, "binding.channelsItemVoiceChannelName");
             textView.setText(ChannelUtils.c(component1));
-            this.binding.f2159c.setTextColor(access$getVoiceChannelColor);
+            this.binding.f2158c.setTextColor(access$getVoiceChannelColor);
             TextView textView2 = this.binding.b;
             m.checkNotNullExpressionValue(textView2, "binding.channelsItemVoiceChannelEventTopic");
             ViewExtensions.setTextAndVisibilityBy(textView2, component8 != null ? component8.h() : null);
@@ -1168,7 +1168,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             LinearLayout linearLayout2 = this.binding.a;
             m.checkNotNullExpressionValue(linearLayout2, "binding.root");
             ViewExtensions.setBackgroundAndKeepPadding(linearLayout2, ContextCompat.getDrawable(context, themedDrawableRes$default));
-            this.binding.f2160c.setText(R.string.guild_role_subscriptions_channel_label);
+            this.binding.f2159c.setText(R.string.guild_role_subscriptions_channel_label);
             this.binding.a.setOnClickListener(new WidgetChannelsListAdapter$ItemGuildRoleSubscriptionsOverview$onConfigure$1(this));
         }
     }
@@ -1258,25 +1258,25 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             boolean component3 = channelListItemHeader.component3();
             long component4 = channelListItemHeader.component4();
             if (!component3) {
-                ImageView imageView = this.binding.f2161c;
+                ImageView imageView = this.binding.f2160c;
                 m.checkNotNullExpressionValue(imageView, "binding.channelsListNew");
                 imageView.setVisibility(4);
-                this.binding.f2161c.setOnClickListener(null);
+                this.binding.f2160c.setOnClickListener(null);
             } else if (component2 == R.string.others_online) {
-                ImageView imageView2 = this.binding.f2161c;
+                ImageView imageView2 = this.binding.f2160c;
                 m.checkNotNullExpressionValue(imageView2, "binding.channelsListNew");
                 imageView2.setVisibility(4);
-                this.binding.f2161c.setOnClickListener(null);
+                this.binding.f2160c.setOnClickListener(null);
             } else if (component2 == R.string.text_channels) {
-                ImageView imageView3 = this.binding.f2161c;
+                ImageView imageView3 = this.binding.f2160c;
                 m.checkNotNullExpressionValue(imageView3, "binding.channelsListNew");
                 imageView3.setVisibility(0);
-                this.binding.f2161c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$1(component4));
+                this.binding.f2160c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$1(component4));
             } else if (component2 == R.string.voice_channels) {
-                ImageView imageView4 = this.binding.f2161c;
+                ImageView imageView4 = this.binding.f2160c;
                 m.checkNotNullExpressionValue(imageView4, "binding.channelsListNew");
                 imageView4.setVisibility(0);
-                this.binding.f2161c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$2(component4));
+                this.binding.f2160c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$2(component4));
             }
             this.binding.b.setText(component2);
         }
@@ -1305,7 +1305,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 if (((ChannelListItemInvite) channelListItem).isHub()) {
                     WidgetChannelsListItemDirectoryBinding a = WidgetChannelsListItemDirectoryBinding.a(this.itemView);
                     m.checkNotNullExpressionValue(a, "WidgetChannelsListItemDi…oryBinding.bind(itemView)");
-                    a.f2160c.setText(R.string.invite_a_friend);
+                    a.f2159c.setText(R.string.invite_a_friend);
                     a.b.setImageResource(R.drawable.ic_guild_invite_24dp);
                 }
             }
@@ -1472,7 +1472,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             TextView textView = this.binding.e;
             m.checkNotNullExpressionValue(textView, "binding.eventTopic");
             textView.setText(data.getTopic());
-            TextView textView2 = this.binding.f2154c;
+            TextView textView2 = this.binding.f2153c;
             m.checkNotNullExpressionValue(textView2, "binding.eventChannel");
             if (channel != null) {
                 ConstraintLayout constraintLayout2 = this.binding.a;
@@ -1483,7 +1483,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             }
             str = data.getLocationInfo().getLocationName();
             textView2.setText(str);
-            this.binding.f2154c.setCompoundDrawablesWithIntrinsicBounds(drawable, (Drawable) null, (Drawable) null, (Drawable) null);
+            this.binding.f2153c.setCompoundDrawablesWithIntrinsicBounds(drawable, (Drawable) null, (Drawable) null, (Drawable) null);
             TextView textView3 = this.binding.g;
             m.checkNotNullExpressionValue(textView3, "binding.stageEventListeners");
             int i3 = 8;
@@ -1623,7 +1623,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             TextView textView = this.binding.g;
             m.checkNotNullExpressionValue(textView, "binding.channelsItemVoiceUserName");
             textView.setText(GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, component3, component4, component1, null, 8, null));
-            ImageView imageView = this.binding.f2164c;
+            ImageView imageView = this.binding.f2163c;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemVoiceUserCamera");
             int i2 = 8;
             imageView.setVisibility(component2.j() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
index cc80dc57f7..4d71cde393 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
@@ -81,9 +81,9 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new WidgetChannelsListItemChannelActions$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(X, "StoreStream.getChannels(…        }\n              }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetChannelsListItemChannelActions$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream.getChannels(…        }\n              }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream.getChannels(…  .distinctUntilChanged()");
                 return q;
             }
@@ -288,7 +288,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
         TextView textView5 = getBinding().l;
         textView5.setVisibility(ThreadUtils.INSTANCE.isThreadsEnabled(model.getChannel().f()) && ChannelUtils.C(model.getChannel()) && !model.getChannel().o() ? 0 : 8);
         setOnClickAndDismissListener(textView5, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4(textView5, this, model));
-        TextView textView6 = getBinding().f2153c;
+        TextView textView6 = getBinding().f2152c;
         textView6.setVisibility(model.getCanManageChannel() ? 0 : 8);
         setOnClickAndDismissListener(textView6, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$5(this, model));
         textView6.setText(getSettingsText(model.getChannel(), model.getCanManageChannel()));
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java
index cb2407fd9b..ed8117fb59 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java
@@ -77,6 +77,6 @@ public final class WidgetChannelsListItemThreadActions$Model$Companion$get$1<T,
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.e(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getChannels().observeChannel(channel.r()), companion.getGuilds().observeGuild(channel.f()), companion.getPermissions().observePermissionsForChannel(channel.r()), companion.getUserGuildSettings().observeGuildSettings(), companion.getThreadsJoined().observeJoinedThread(channel.h()), companion.getThreadsActive().observeActiveThreadsForGuild(channel.f()).E(new AnonymousClass1(channel)).q(), new AnonymousClass2(channel));
+        return Observable.e(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getChannels().observeChannel(channel.r()), companion.getGuilds().observeGuild(channel.f()), companion.getPermissions().observePermissionsForChannel(channel.r()), companion.getUserGuildSettings().observeGuildSettings(), companion.getThreadsJoined().observeJoinedThread(channel.h()), companion.getThreadsActive().observeActiveThreadsForGuild(channel.f()).F(new AnonymousClass1(channel)).q(), new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
index 30d72ff738..73ca4cfc70 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
@@ -91,9 +91,9 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(WidgetChannelsListItemThreadActions$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …        }\n              }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(WidgetChannelsListItemThreadActions$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -388,7 +388,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
             ThreadMetadata y4 = model.getChannel().y();
             m.checkNotNull(y4);
             String autoArchiveDurationName = threadUtils.autoArchiveDurationName(requireContext4, y4.c());
-            TextView textView8 = getBinding().f2162c;
+            TextView textView8 = getBinding().f2161c;
             m.checkNotNullExpressionValue(textView8, "binding.channelsListItem…sArchiveSettingsSubheader");
             Locale locale = Locale.getDefault();
             m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
index c51380d060..69a3ce0f5a 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
@@ -78,14 +78,14 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
                 sb.append(collapsedUser.getExtraCount());
                 ViewExtensions.setTextAndVisibilityBy(textView, sb.toString());
                 MGImages mGImages = MGImages.INSTANCE;
-                SimpleDraweeView simpleDraweeView = this.binding.f2206c;
+                SimpleDraweeView simpleDraweeView = this.binding.f2205c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetCollapsedUserImageview");
                 MGImages.setImage$default(mGImages, simpleDraweeView, (int) R.drawable.drawable_grey_user_icon, (MGImages.ChangeDetector) null, 4, (Object) null);
             } else if (!collapsedUser.getEmptySlot()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.widgetCollapsedUserCount");
                 textView2.setVisibility(8);
-                SimpleDraweeView simpleDraweeView2 = this.binding.f2206c;
+                SimpleDraweeView simpleDraweeView2 = this.binding.f2205c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.widgetCollapsedUserImageview");
                 IconUtils.setIcon$default(simpleDraweeView2, collapsedUser.getUser(), R.dimen.avatar_size_medium, null, null, null, 56, null);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
index fa2adec48b..0279073eb1 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
@@ -224,11 +224,11 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
                 this.hasFiredAnalytics = true;
             }
         }
-        LinearLayout linearLayout = getBinding().f2464c;
+        LinearLayout linearLayout = getBinding().f2462c;
         m.checkNotNullExpressionValue(linearLayout, "binding.autoArchiveHeader");
         linearLayout.setVisibility(0);
         long computeThreadAutoArchiveTimeMs = ThreadUtils.INSTANCE.computeThreadAutoArchiveTimeMs(channel);
-        TextView textView = getBinding().f2465r;
+        TextView textView = getBinding().f2463r;
         m.checkNotNullExpressionValue(textView, "binding.subtitle");
         Object[] objArr = {TimeUtils.toReadableTimeString$default(requireContext, computeThreadAutoArchiveTimeMs, null, 4, null)};
         Integer num = null;
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java
index d1f6ea3baf..399caaa864 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java
@@ -7,7 +7,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     private final boolean ableToManageChannel;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2631id;
+    private final long f2629id;
     private final String key;
     private final long selectedGuildId;
     private final int textResId;
@@ -15,7 +15,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0013: INVOKE  (r5v1 int) = (r0v0 'this' com.discord.widgets.channels.list.items.ChannelListItemHeader A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemHeader.getType():int), (r1v0 long), (r3v0 int)] */
     public ChannelListItemHeader(long j, int i, boolean z2, long j2) {
-        this.f2631id = j;
+        this.f2629id = j;
         this.textResId = i;
         this.ableToManageChannel = z2;
         this.selectedGuildId = j2;
@@ -28,7 +28,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
 
     public static /* synthetic */ ChannelListItemHeader copy$default(ChannelListItemHeader channelListItemHeader, long j, int i, boolean z2, long j2, int i2, Object obj) {
         if ((i2 & 1) != 0) {
-            j = channelListItemHeader.f2631id;
+            j = channelListItemHeader.f2629id;
         }
         if ((i2 & 2) != 0) {
             i = channelListItemHeader.textResId;
@@ -43,7 +43,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     }
 
     public final long component1() {
-        return this.f2631id;
+        return this.f2629id;
     }
 
     public final int component2() {
@@ -70,7 +70,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
             return false;
         }
         ChannelListItemHeader channelListItemHeader = (ChannelListItemHeader) obj;
-        return this.f2631id == channelListItemHeader.f2631id && this.textResId == channelListItemHeader.textResId && this.ableToManageChannel == channelListItemHeader.ableToManageChannel && this.selectedGuildId == channelListItemHeader.selectedGuildId;
+        return this.f2629id == channelListItemHeader.f2629id && this.textResId == channelListItemHeader.textResId && this.ableToManageChannel == channelListItemHeader.ableToManageChannel && this.selectedGuildId == channelListItemHeader.selectedGuildId;
     }
 
     public final boolean getAbleToManageChannel() {
@@ -78,7 +78,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     }
 
     public final long getId() {
-        return this.f2631id;
+        return this.f2629id;
     }
 
     @Override // com.discord.widgets.channels.list.items.ChannelListItem, com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -100,7 +100,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     }
 
     public int hashCode() {
-        int a = ((b.a(this.f2631id) * 31) + this.textResId) * 31;
+        int a = ((b.a(this.f2629id) * 31) + this.textResId) * 31;
         boolean z2 = this.ableToManageChannel;
         if (z2) {
             z2 = true;
@@ -113,7 +113,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
 
     public String toString() {
         StringBuilder O = a.O("ChannelListItemHeader(id=");
-        O.append(this.f2631id);
+        O.append(this.f2629id);
         O.append(", textResId=");
         O.append(this.textResId);
         O.append(", ableToManageChannel=");
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java
index 495e5ca86f..60a888a309 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java
@@ -169,8 +169,8 @@ public final class PrivateChannelMemberListService {
 
     public final Observable<State> observeStateForGroupDm(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        Observable<State> X = Observable.G(this.storeUser.observeMeId().Y(1).b0(5000, TimeUnit.MILLISECONDS), Observable.z(channel.w()).E(PrivateChannelMemberListService$observeStateForGroupDm$1.INSTANCE)).e0().X(new PrivateChannelMemberListService$observeStateForGroupDm$2(this, channel));
-        m.checkNotNullExpressionValue(X, "Observable.merge(\n      …            }\n          }");
-        return X;
+        Observable<State> Y = Observable.H(this.storeUser.observeMeId().Z(1).c0(5000, TimeUnit.MILLISECONDS), Observable.A(channel.w()).F(PrivateChannelMemberListService$observeStateForGroupDm$1.INSTANCE)).f0().Y(new PrivateChannelMemberListService$observeStateForGroupDm$2(this, channel));
+        m.checkNotNullExpressionValue(Y, "Observable.merge(\n      …            }\n          }");
+        return Y;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
index 959ee3e3ee..68df23f3e0 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
@@ -51,7 +51,7 @@ public final class WidgetChannelMembersList extends AppFragment {
 
     /* compiled from: WidgetChannelMembersList.kt */
     public static final class RxOnScrollListener extends RecyclerView.OnScrollListener {
-        private final PublishSubject<Unit> scrollYSubject = PublishSubject.j0();
+        private final PublishSubject<Unit> scrollYSubject = PublishSubject.k0();
 
         public final Observable<Unit> observeScrollChanges() {
             PublishSubject<Unit> publishSubject = this.scrollYSubject;
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java
index 18a7941af3..fbaf7ba17c 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java
@@ -150,7 +150,7 @@ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState
 
         public final Observable<? extends WidgetChannelMembersListViewModel.StoreState> call(Channel channel) {
             if (channel == null) {
-                return this.this$0.$isPanelOpenObservable.E(AnonymousClass1.INSTANCE);
+                return this.this$0.$isPanelOpenObservable.F(AnonymousClass1.INSTANCE);
             }
             if (ChannelUtils.i(channel)) {
                 Observable<Long> observePermissionsForChannel = this.this$0.$storePermissions.observePermissionsForChannel(channel.h());
@@ -206,6 +206,6 @@ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState
     }
 
     public final Observable<? extends WidgetChannelMembersListViewModel.StoreState> call(Channel channel) {
-        return channel == null ? this.$isPanelOpenObservable.E(AnonymousClass1.INSTANCE) : ChannelUtils.w(channel) ? Observable.j(this.$privateChannelMemberListService.observeStateForGroupDm(channel), this.$isPanelOpenObservable, new AnonymousClass2(this)) : ChannelUtils.B(channel) ? this.$storeChannels.observeChannel(channel.r()).X(new AnonymousClass3(this, channel)) : Observable.g(this.$storeGuilds.observeGuild(channel.f()), this.$storeGuilds.observeRoles(channel.f()), this.$storePermissions.observePermissionsForChannel(channel.h()), this.$storeChannelMembers.observeChannelMemberList(channel.f(), channel.h()), this.$isPanelOpenObservable, new AnonymousClass4(channel));
+        return channel == null ? this.$isPanelOpenObservable.F(AnonymousClass1.INSTANCE) : ChannelUtils.w(channel) ? Observable.j(this.$privateChannelMemberListService.observeStateForGroupDm(channel), this.$isPanelOpenObservable, new AnonymousClass2(this)) : ChannelUtils.B(channel) ? this.$storeChannels.observeChannel(channel.r()).Y(new AnonymousClass3(this, channel)) : Observable.g(this.$storeGuilds.observeGuild(channel.f()), this.$storeGuilds.observeRoles(channel.f()), this.$storePermissions.observePermissionsForChannel(channel.h()), this.$storeChannelMembers.observeChannelMemberList(channel.f(), channel.h()), this.$isPanelOpenObservable, new AnonymousClass4(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java
index 333b36cfa4..a3d03fc37b 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java
@@ -104,9 +104,9 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
         }
 
         private final Observable<StoreState> observeStoreState(StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreThreadMembers storeThreadMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, StoreChannels storeChannels, StoreUser storeUser, StoreUserPresence storeUserPresence, StoreApplicationStreaming storeApplicationStreaming, StoreThreadsJoined storeThreadsJoined) {
-            Observable<R> X = storeChannelsSelected.observeSelectedChannel().X(new WidgetChannelMembersListViewModel$Companion$observeStoreState$1(storeNavigation.observeRightPanelState().E(WidgetChannelMembersListViewModel$Companion$observeStoreState$isPanelOpenObservable$1.INSTANCE), privateChannelMemberListService, storeUserRelationships, storeChannels, storePermissions, storeChannelMembers, storeGuilds, storeThreadMembers, storeUser, storeUserPresence, storeApplicationStreaming, storeThreadsJoined));
-            m.checkNotNullExpressionValue(X, "storeChannelsSelected\n  …            }\n          }");
-            return X;
+            Observable<R> Y = storeChannelsSelected.observeSelectedChannel().Y(new WidgetChannelMembersListViewModel$Companion$observeStoreState$1(storeNavigation.observeRightPanelState().F(WidgetChannelMembersListViewModel$Companion$observeStoreState$isPanelOpenObservable$1.INSTANCE), privateChannelMemberListService, storeUserRelationships, storeChannels, storePermissions, storeChannelMembers, storeGuilds, storeThreadMembers, storeUser, storeUserPresence, storeApplicationStreaming, storeThreadsJoined));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected\n  …            }\n          }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreThreadMembers storeThreadMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, StoreChannels storeChannels, StoreUser storeUser, StoreUserPresence storeUserPresence, StoreApplicationStreaming storeApplicationStreaming, StoreThreadsJoined storeThreadsJoined, int i, Object obj) {
@@ -977,7 +977,7 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
         this.guildChannelSubscriber = guildChannelSubscriber;
         this.storeGuilds = storeGuilds;
         this.storeCustomEmojis = storeEmojiCustom;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetChannelMembersListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
index 9cf505e669..7a4a772fbd 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
@@ -1167,16 +1167,16 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
     }
 
     public ChannelMembersListAdapter() {
-        PublishSubject<ListUpdateRequest> j0 = PublishSubject.j0();
-        this.updatesSubject = j0;
+        PublishSubject<ListUpdateRequest> k0 = PublishSubject.k0();
+        this.updatesSubject = k0;
         WidgetChannelMembersListViewModel.MemberList empty = WidgetChannelMembersListViewModel.MemberList.Companion.getEMPTY();
         this.memberList = empty;
         ListUpdateOperation.OverwriteUpdate overwriteUpdate = new ListUpdateOperation.OverwriteUpdate(new ListUpdateRequest("", empty, false));
         AnonymousClass1 r1 = AnonymousClass1.INSTANCE;
-        m.checkNotNullExpressionValue(j0, "updatesSubject");
-        Observable R = ObservableExtensionsKt.computationLatest(j0).O(overwriteUpdate, AnonymousClass2.INSTANCE).R(1);
-        m.checkNotNullExpressionValue(R, "updatesSubject\n        .…      })\n        .skip(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(R), ChannelMembersListAdapter.class, (Context) null, new AnonymousClass4(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 58, (Object) null);
+        m.checkNotNullExpressionValue(k0, "updatesSubject");
+        Observable S = ObservableExtensionsKt.computationLatest(k0).P(overwriteUpdate, AnonymousClass2.INSTANCE).S(1);
+        m.checkNotNullExpressionValue(S, "updatesSubject\n        .…      })\n        .skip(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(S), ChannelMembersListAdapter.class, (Context) null, new AnonymousClass4(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 58, (Object) null);
     }
 
     public static final /* synthetic */ WidgetChannelMembersListViewModel.MemberList access$getMemberList$p(ChannelMembersListAdapter channelMembersListAdapter) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
index b252ffd7b4..11b7f68ce5 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
@@ -61,8 +61,8 @@ public final class WidgetChannelSettingsAddMemberFragment extends AppFragment {
         super(R.layout.widget_channel_settings_add_member);
         WidgetChannelSettingsAddMemberFragment$viewModel$2 widgetChannelSettingsAddMemberFragment$viewModel$2 = new WidgetChannelSettingsAddMemberFragment$viewModel$2(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSettingsAddMemberFragmentViewModel.class), new WidgetChannelSettingsAddMemberFragment$appViewModels$$inlined$viewModels$1(widgetChannelSettingsAddMemberFragment$viewModel$2), new h0(new WidgetChannelSettingsAddMemberFragment$viewModel$3(this)));
-        this.querySubject = BehaviorSubject.k0("");
-        this.selectedSubject = BehaviorSubject.k0(Collections.emptyMap());
+        this.querySubject = BehaviorSubject.l0("");
+        this.selectedSubject = BehaviorSubject.l0(Collections.emptyMap());
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelSettingsAddMemberFragment widgetChannelSettingsAddMemberFragment, WidgetChannelSettingsAddMemberFragmentViewModel.ViewState viewState) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java
index 974d6c1973..715bd9aabc 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java
@@ -92,11 +92,11 @@ public final class WidgetChannelSettingsAddMemberFragmentViewModel extends AppVi
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StoreGuilds storeGuilds, StoreUser storeUser) {
-            Observable<R> E = storeChannels.observeChannel(j).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable<StoreState> X = E.q().X(new WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1(storeGuilds, storeUser));
-            m.checkNotNullExpressionValue(X, "channelsStore.observeCha…          }\n            }");
-            return X;
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> Y = F.q().Y(new WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1(storeGuilds, storeUser));
+            m.checkNotNullExpressionValue(Y, "channelsStore.observeCha…          }\n            }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
index 715041f39d..a4fa2487ec 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
@@ -86,9 +86,9 @@ public final class WidgetChannelSettingsAddMemberSheet extends AppBottomSheet {
         }
         BehaviorSubject<Map<Long, PermissionOverwrite.Type>> selectedItemsSubject = widgetChannelSettingsAddMemberFragment.getSelectedItemsSubject();
         m.checkNotNullExpressionValue(selectedItemsSubject, "fragment.getSelectedItemsSubject()");
-        Map<Long, PermissionOverwrite.Type> m0 = selectedItemsSubject.m0();
-        m.checkNotNullExpressionValue(m0, "fragment.getSelectedItemsSubject().value");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(channelPermissionsAddMemberUtils.addPermissionOverwrites(channelId, m0, 20971536), this, null, 2, null), WidgetChannelSettingsAddMemberSheet.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberSheet$addPermissionOverwrites$1(this), 60, (Object) null);
+        Map<Long, PermissionOverwrite.Type> n0 = selectedItemsSubject.n0();
+        m.checkNotNullExpressionValue(n0, "fragment.getSelectedItemsSubject().value");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(channelPermissionsAddMemberUtils.addPermissionOverwrites(channelId, n0, 20971536), this, null, 2, null), WidgetChannelSettingsAddMemberSheet.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberSheet$addPermissionOverwrites$1(this), 60, (Object) null);
     }
 
     @SuppressLint({"SetTextI18n"})
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
index 0ed2c107e9..b03cdbfde0 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
@@ -47,7 +47,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     public static final /* synthetic */ int i = 0;
     private SimpleMembersAdapter membersAdapter;
     private RecyclerView membersRecycler;
-    private final Subject<String, String> nameFilterPublisher = BehaviorSubject.k0("");
+    private final Subject<String, String> nameFilterPublisher = BehaviorSubject.l0("");
     private TextInputLayout searchBox;
     private ViewFlipper viewFlipper;
 
@@ -76,11 +76,11 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
         }
 
         public static Observable<Model> get(long j, long j2, Observable<String> observable) {
-            return StoreStream.getChannels().observeChannel(j2).X(new e(j, j2, observable));
+            return StoreStream.getChannels().observeChannel(j2).Y(new e(j, j2, observable));
         }
 
         private static Observable<List<SimpleMembersAdapter.MemberItem>> getMemberItems(long j, @Nullable List<PermissionOverwrite> list, String str) {
-            return StoreStream.getGuilds().observeComputed(j).X(new i(list, str.toLowerCase(Locale.getDefault())));
+            return StoreStream.getGuilds().observeComputed(j).Y(new i(list, str.toLowerCase(Locale.getDefault())));
         }
 
         private static boolean isValid(MeUser meUser, Guild guild, Channel channel, List<SimpleMembersAdapter.MemberItem> list) {
@@ -201,7 +201,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
         long longExtra2 = getMostRecentIntent().getLongExtra(INTENT_EXTRA_CHANNEL_ID, -1);
         ViewExtensions.addBindedTextWatcher(this.searchBox, this, new n(this));
         this.nameFilterPublisher.onNext(ViewExtensions.getTextOrEmpty(this.searchBox));
-        this.nameFilterPublisher.o(750, TimeUnit.MILLISECONDS).w(o.i).k(c.a.d.o.e(new b(longExtra), getClass()));
+        this.nameFilterPublisher.o(750, TimeUnit.MILLISECONDS).x(o.i).k(c.a.d.o.e(new b(longExtra), getClass()));
         Observable<Model> observable = Model.get(longExtra, longExtra2, this.nameFilterPublisher);
         m.checkNotNullParameter(this, "appComponent");
         m.checkNotNullExpressionValue(observable, "it");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
index b9b2de737c..e190f6667c 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
@@ -57,7 +57,7 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
         }
 
         public static Observable<Model> get(long j) {
-            return StoreStream.getChannels().observeChannel(j).X(new q(j)).k(n.i);
+            return StoreStream.getChannels().observeChannel(j).Y(new q(j)).k(n.i);
         }
 
         private static boolean isValid(Guild guild, Channel channel) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
index f5542841c1..5517d86cdd 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
@@ -61,7 +61,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         private final Map<Long, GuildRole> guildRoles;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2632me;
+        private final MeUser f2630me;
         private final List<SimpleMembersAdapter.MemberItem> memberItems;
         private final long myPermissions;
         private final List<SimpleRolesAdapter.RoleItem> roleItems;
@@ -117,7 +117,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
             m.checkNotNullParameter(channel, "channel");
             m.checkNotNullParameter(map, "guildRoles");
             m.checkNotNullParameter(list, "memberItems");
-            this.f2632me = meUser;
+            this.f2630me = meUser;
             this.guild = guild;
             this.channel = channel;
             this.myPermissions = j;
@@ -145,7 +145,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, Guild guild, Channel channel, long j, Map map, List list, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = model.f2632me;
+                meUser = model.f2630me;
             }
             if ((i & 2) != 0) {
                 guild = model.guild;
@@ -166,7 +166,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         }
 
         public final MeUser component1() {
-            return this.f2632me;
+            return this.f2630me;
         }
 
         public final Guild component2() {
@@ -206,7 +206,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.f2632me, model.f2632me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles) && m.areEqual(this.memberItems, model.memberItems);
+            return m.areEqual(this.f2630me, model.f2630me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles) && m.areEqual(this.memberItems, model.memberItems);
         }
 
         public final boolean getCanAddRole() {
@@ -230,7 +230,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         }
 
         public final MeUser getMe() {
-            return this.f2632me;
+            return this.f2630me;
         }
 
         public final List<SimpleMembersAdapter.MemberItem> getMemberItems() {
@@ -246,7 +246,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2632me;
+            MeUser meUser = this.f2630me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             Guild guild = this.guild;
@@ -264,7 +264,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
 
         public String toString() {
             StringBuilder O = a.O("Model(me=");
-            O.append(this.f2632me);
+            O.append(this.f2630me);
             O.append(", guild=");
             O.append(this.guild);
             O.append(", channel=");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
index 83de832f49..1af6b46170 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
@@ -74,7 +74,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         private final Map<Long, GuildRole> guildRoles;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2633me;
+        private final MeUser f2631me;
         private final long myPermissions;
 
         /* compiled from: WidgetChannelSettingsPermissionsOverview.kt */
@@ -87,9 +87,9 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(X, "StoreStream.getChannels(…          }\n            }");
-                return X;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream.getChannels(…          }\n            }");
+                return Y;
             }
 
             public final boolean isValid(MeUser meUser, Guild guild, Channel channel, Long l) {
@@ -102,7 +102,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             m.checkNotNullParameter(guild, "guild");
             m.checkNotNullParameter(channel, "channel");
             m.checkNotNullParameter(map, "guildRoles");
-            this.f2633me = meUser;
+            this.f2631me = meUser;
             this.guild = guild;
             this.channel = channel;
             this.myPermissions = j;
@@ -114,7 +114,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, Guild guild, Channel channel, long j, Map map, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = model.f2633me;
+                meUser = model.f2631me;
             }
             if ((i & 2) != 0) {
                 guild = model.guild;
@@ -132,7 +132,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         }
 
         public final MeUser component1() {
-            return this.f2633me;
+            return this.f2631me;
         }
 
         public final Guild component2() {
@@ -167,7 +167,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.f2633me, model.f2633me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles);
+            return m.areEqual(this.f2631me, model.f2631me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles);
         }
 
         public final boolean getCanManage() {
@@ -187,7 +187,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         }
 
         public final MeUser getMe() {
-            return this.f2633me;
+            return this.f2631me;
         }
 
         public final long getMyPermissions() {
@@ -195,7 +195,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2633me;
+            MeUser meUser = this.f2631me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             Guild guild = this.guild;
@@ -211,7 +211,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
 
         public String toString() {
             StringBuilder O = a.O("Model(me=");
-            O.append(this.f2633me);
+            O.append(this.f2631me);
             O.append(", guild=");
             O.append(this.guild);
             O.append(", channel=");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
index f3fedfbe9a..c73db221aa 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
@@ -58,7 +58,7 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment {
             ViewExtensions.setEnabledAlpha$default(addPermissionOwnerView, valid.getCanEditModerators(), 0.0f, 2, null);
             getViewBinding().b.setOnClickListener(new WidgetStageChannelModeratorPermissions$configureUI$1(this, viewState));
             getViewBinding().d.setData(valid.getRoleItems(), new WidgetStageChannelModeratorPermissions$configureUI$2(this));
-            getViewBinding().f2451c.setData(valid.getMemberItems(), new WidgetStageChannelModeratorPermissions$configureUI$3(this));
+            getViewBinding().f2449c.setData(valid.getMemberItems(), new WidgetStageChannelModeratorPermissions$configureUI$3(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java
index 0b64c1568a..a1f561fbda 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java
@@ -419,7 +419,7 @@ public final class WidgetStageChannelModeratorPermissionsViewModel extends AppVi
 
     public WidgetStageChannelModeratorPermissionsViewModel(long j) {
         super(null, 1, null);
-        Observable q = Companion.observeStores$default(Companion, j, null, null, null, null, 30, null).W(i0.p.a.a()).q();
+        Observable q = Companion.observeStores$default(Companion, j, null, null, null, null, 30, null).X(i0.p.a.a()).q();
         m.checkNotNullExpressionValue(q, "observeStores(channelId)…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(q, this, null, 2, null), WidgetStageChannelModeratorPermissionsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/ChannelGroupDMSettingsViewModel.java b/app/src/main/java/com/discord/widgets/channels/settings/ChannelGroupDMSettingsViewModel.java
index a983cc7f63..6e2320e188 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/ChannelGroupDMSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/ChannelGroupDMSettingsViewModel.java
@@ -66,9 +66,9 @@ public final class ChannelGroupDMSettingsViewModel extends AppViewModel<ViewStat
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StoreUserGuildSettings storeUserGuildSettings) {
-            Observable<R> X = storeChannels.observeChannel(j).X(new ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1(storeUserGuildSettings));
-            m.checkNotNullExpressionValue(X, "storeChannels\n          …            }\n          }");
-            return X;
+            Observable<R> Y = storeChannels.observeChannel(j).Y(new ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1(storeUserGuildSettings));
+            m.checkNotNullExpressionValue(Y, "storeChannels\n          …            }\n          }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, long j, StoreChannels storeChannels, StoreUserGuildSettings storeUserGuildSettings, int i, Object obj) {
@@ -348,7 +348,7 @@ public final class ChannelGroupDMSettingsViewModel extends AppViewModel<ViewStat
         this.channelId = j;
         this.restApi = restAPI;
         this.storeUserGuildSettings = storeUserGuildSettings;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ChannelGroupDMSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java
index 75ce3221af..4402a8e73a 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java
@@ -84,9 +84,9 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(WidgetChannelNotificationSettings$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …ust(null)\n              }");
-                Observable<Model> q = ObservableExtensionsKt.computationBuffered(X).q();
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(WidgetChannelNotificationSettings$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …ust(null)\n              }");
+                Observable<Model> q = ObservableExtensionsKt.computationBuffered(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java
index 3873b8cc26..ff790d7231 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java
@@ -21,7 +21,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_channel_settings_delete /* 2131364168 */:
+            case R.id.menu_channel_settings_delete /* 2131364163 */:
                 if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) {
                     WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel());
                     return;
@@ -29,7 +29,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
                     WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel());
                     return;
                 }
-            case R.id.menu_channel_settings_reset /* 2131364169 */:
+            case R.id.menu_channel_settings_reset /* 2131364164 */:
                 StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings();
                 m.checkNotNullExpressionValue(context, "context");
                 userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel());
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java
index e7289e1a24..8fc161e75e 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java
@@ -22,7 +22,7 @@ public final class WidgetTextChannelSettings$configureUI$3 implements View.OnCli
         WidgetTextChannelSettings widgetTextChannelSettings = this.this$0;
         long h = this.$this_configureUI.getChannel().h();
         StatefulViews access$getState$p = WidgetTextChannelSettings.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f2462c;
+        TextInputLayout textInputLayout = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f2460c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         String str = (String) access$getState$p.getIfChanged(textInputLayout.getId());
         StatefulViews access$getState$p2 = WidgetTextChannelSettings.access$getState$p(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java
index 7e3cd35e66..07dee9ab00 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java
@@ -138,9 +138,9 @@ public final class WidgetTextChannelSettings extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new WidgetTextChannelSettings$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …        }\n              }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetTextChannelSettings$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -404,13 +404,13 @@ public final class WidgetTextChannelSettings extends AppFragment {
             AnalyticsTracker.INSTANCE.premiumGuildUpsellViewed(threadTypeForGuild, model.getGuild().getId(), Long.valueOf(model.getChannel().h()), new Traits.Location(Traits.Location.Page.CHANNEL_SETTINGS, null, null, null, null, 30, null));
             this.hasFiredAnalytics = true;
         }
-        TextInputLayout textInputLayout = getBinding().f2462c;
+        TextInputLayout textInputLayout = getBinding().f2460c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f2462c;
+        TextInputLayout textInputLayout2 = getBinding().f2460c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), ChannelUtils.c(model.getChannel())));
-        getBinding().f2462c.setHint(ChannelUtils.A(model.getChannel()) ? R.string.form_label_channel_name : R.string.category_name);
+        getBinding().f2460c.setHint(ChannelUtils.A(model.getChannel()) ? R.string.form_label_channel_name : R.string.category_name);
         TextInputLayout textInputLayout3 = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
         StatefulViews statefulViews2 = this.state;
@@ -503,9 +503,9 @@ public final class WidgetTextChannelSettings extends AppFragment {
         Integer num = (Integer) this.state.get(R.id.duration_selector, model.getChannel().d());
         int intValue2 = num != null ? num.intValue() : 1440;
         this.state.configureSaveActionView(getBinding().k);
-        Map<MaterialRadioButton, Integer> mapOf = h0.mapOf(o.to(getBinding().f2463r.e, 60), o.to(getBinding().f2463r.q, 1440), o.to(getBinding().f2463r.o, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES)), o.to(getBinding().f2463r.j, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES)));
-        getBinding().f2463r.d.setOnClickListener(new WidgetTextChannelSettings$configureUI$10(this, mapOf));
-        getBinding().f2463r.p.setOnClickListener(new WidgetTextChannelSettings$configureUI$11(this, mapOf));
+        Map<MaterialRadioButton, Integer> mapOf = h0.mapOf(o.to(getBinding().f2461r.e, 60), o.to(getBinding().f2461r.q, 1440), o.to(getBinding().f2461r.o, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES)), o.to(getBinding().f2461r.j, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES)));
+        getBinding().f2461r.d.setOnClickListener(new WidgetTextChannelSettings$configureUI$10(this, mapOf));
+        getBinding().f2461r.p.setOnClickListener(new WidgetTextChannelSettings$configureUI$11(this, mapOf));
         PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
         Guild guild = model.getGuild();
         Long valueOf = Long.valueOf(model.getChannel().h());
@@ -514,17 +514,17 @@ public final class WidgetTextChannelSettings extends AppFragment {
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature = premiumUtils.getBoostFeatureBadgeDataForGuildFeature(guild, valueOf, guildFeature, requireContext, parentFragmentManager, new WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1(this, mapOf), new Traits.Location(Traits.Location.Page.CHANNEL_SETTINGS, null, Traits.Location.Obj.LIST_ITEM, null, null, 26, null));
-        ConstraintLayout constraintLayout = getBinding().f2463r.k;
+        ConstraintLayout constraintLayout = getBinding().f2461r.k;
         Function1<View, Unit> onClickListener = boostFeatureBadgeDataForGuildFeature.getOnClickListener();
         if (onClickListener != null) {
             onClickListener = new WidgetTextChannelSettings$sam$android_view_View_OnClickListener$0(onClickListener);
         }
         constraintLayout.setOnClickListener((View.OnClickListener) onClickListener);
-        TextView textView4 = getBinding().f2463r.n;
+        TextView textView4 = getBinding().f2461r.n;
         m.checkNotNullExpressionValue(textView4, "binding.durationSelector.optionThreeDaysLabel");
         textView4.setText(boostFeatureBadgeDataForGuildFeature.getText());
-        getBinding().f2463r.l.setTextColor(boostFeatureBadgeDataForGuildFeature.getTextColor());
-        ImageView imageView = getBinding().f2463r.m;
+        getBinding().f2461r.l.setTextColor(boostFeatureBadgeDataForGuildFeature.getTextColor());
+        ImageView imageView = getBinding().f2461r.m;
         m.checkNotNullExpressionValue(imageView, "binding.durationSelector.optionThreeDaysIcon");
         ColorCompatKt.tintWithColor(imageView, boostFeatureBadgeDataForGuildFeature.getIconColor());
         Guild guild2 = model.getGuild();
@@ -534,17 +534,17 @@ public final class WidgetTextChannelSettings extends AppFragment {
         FragmentManager parentFragmentManager2 = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
         PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature2 = premiumUtils.getBoostFeatureBadgeDataForGuildFeature(guild2, valueOf2, guildFeature2, requireContext2, parentFragmentManager2, new WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1(this, mapOf), new Traits.Location(Traits.Location.Page.CHANNEL_SETTINGS, null, Traits.Location.Obj.LIST_ITEM, null, null, 26, null));
-        ConstraintLayout constraintLayout2 = getBinding().f2463r.f;
+        ConstraintLayout constraintLayout2 = getBinding().f2461r.f;
         Function1<View, Unit> onClickListener2 = boostFeatureBadgeDataForGuildFeature2.getOnClickListener();
         if (onClickListener2 != null) {
             onClickListener2 = new WidgetTextChannelSettings$sam$android_view_View_OnClickListener$0(onClickListener2);
         }
         constraintLayout2.setOnClickListener((View.OnClickListener) onClickListener2);
-        TextView textView5 = getBinding().f2463r.i;
+        TextView textView5 = getBinding().f2461r.i;
         m.checkNotNullExpressionValue(textView5, "binding.durationSelector.optionSevenDaysLabel");
         textView5.setText(boostFeatureBadgeDataForGuildFeature2.getText());
-        getBinding().f2463r.g.setTextColor(boostFeatureBadgeDataForGuildFeature2.getTextColor());
-        ImageView imageView2 = getBinding().f2463r.h;
+        getBinding().f2461r.g.setTextColor(boostFeatureBadgeDataForGuildFeature2.getTextColor());
+        ImageView imageView2 = getBinding().f2461r.h;
         m.checkNotNullExpressionValue(imageView2, "binding.durationSelector.optionSevenDaysIcon");
         ColorCompatKt.tintWithColor(imageView2, boostFeatureBadgeDataForGuildFeature2.getIconColor());
         updateRadioState(mapOf, intValue2);
@@ -607,7 +607,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         statefulViews.addOptionalFields(textInputLayout);
         StatefulViews statefulViews2 = this.state;
         FloatingActionButton floatingActionButton = getBinding().k;
-        TextInputLayout textInputLayout2 = getBinding().f2462c;
+        TextInputLayout textInputLayout2 = getBinding().f2460c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         TextInputLayout textInputLayout3 = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java
index 5ddce683f4..2edb62d06e 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java
@@ -145,10 +145,10 @@ public final class WidgetThreadSettings extends AppFragment {
         m.checkNotNullExpressionValue(textView2, "binding.channelSettingsPinnedMessages");
         textView2.setEnabled(valid.isPinsEnabled());
         getBinding().b.setOnClickListener(new WidgetThreadSettings$configureUI$3(viewState));
-        View view = getBinding().f2470c;
+        View view = getBinding().f2468c;
         m.checkNotNullExpressionValue(view, "binding.channelSettingsP…edMessagesDisabledOverlay");
         view.setVisibility(true ^ valid.isPinsEnabled() ? 0 : 8);
-        getBinding().f2470c.setOnClickListener(WidgetThreadSettings$configureUI$4.INSTANCE);
+        getBinding().f2468c.setOnClickListener(WidgetThreadSettings$configureUI$4.INSTANCE);
         FloatingActionButton floatingActionButton = getBinding().f;
         m.checkNotNullExpressionValue(floatingActionButton, "binding.threadSettingsSave");
         if (!valid.getHasUnsavedChanges()) {
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel.java
index 5e2fb2ae2f..bb0ea08348 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel.java
@@ -27,7 +27,7 @@ import rx.subjects.PublishSubject;
 /* compiled from: WidgetThreadSettingsViewModel.kt */
 public final class WidgetThreadSettingsViewModel extends AppViewModel<ViewState> {
     private final long channelId;
-    private final PublishSubject<Event> eventSubject = PublishSubject.j0();
+    private final PublishSubject<Event> eventSubject = PublishSubject.k0();
 
     /* compiled from: WidgetThreadSettingsViewModel.kt */
     /* renamed from: com.discord.widgets.channels.settings.WidgetThreadSettingsViewModel$1  reason: invalid class name */
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
index 9955d23c97..82ee05fefd 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
@@ -19,11 +19,11 @@ public final class WidgetThreadBrowser$updateMenu$1<T1, T2> implements Action2<M
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_thread_browser_create_thread /* 2131364213 */:
+            case R.id.menu_thread_browser_create_thread /* 2131364208 */:
                 ChannelSelector.openCreateThread$default(ChannelSelector.Companion.getInstance(), WidgetThreadBrowser.access$getGuildId$p(this.this$0), WidgetThreadBrowser.access$getChannelId$p(this.this$0), null, "Thread Browser Toolbar", 4, null);
                 this.this$0.requireAppActivity().finish();
                 return;
-            case R.id.menu_thread_browser_filters /* 2131364214 */:
+            case R.id.menu_thread_browser_filters /* 2131364209 */:
                 WidgetThreadBrowserFilterSheet.Companion companion = WidgetThreadBrowserFilterSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
index 10b9363dd9..1ca442d497 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
@@ -133,7 +133,7 @@ public final class WidgetThreadBrowser extends AppFragment {
     }
 
     private final void initializeAdapter(WidgetThreadBrowserViewModel.ViewState.Browser browser) {
-        SimplePager simplePager = getBinding().f2468c;
+        SimplePager simplePager = getBinding().f2466c;
         m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager");
         if (simplePager.getAdapter() == null) {
             ArrayList arrayList = new ArrayList();
@@ -145,7 +145,7 @@ public final class WidgetThreadBrowser extends AppFragment {
                 m.checkNotNullExpressionValue(string2, "getString(R.string.thread_browser_archived)");
                 arrayList.add(new SimplePager.Adapter.Item(string2, new WidgetThreadBrowser$initializeAdapter$2(this)));
             }
-            SimplePager simplePager2 = getBinding().f2468c;
+            SimplePager simplePager2 = getBinding().f2466c;
             m.checkNotNullExpressionValue(simplePager2, "binding.threadBrowserViewPager");
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -154,7 +154,7 @@ public final class WidgetThreadBrowser extends AppFragment {
             Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
             SimplePager.Adapter.Item[] itemArr = (SimplePager.Adapter.Item[]) array;
             simplePager2.setAdapter(new SimplePager.Adapter(parentFragmentManager, (SimplePager.Adapter.Item[]) Arrays.copyOf(itemArr, itemArr.length)));
-            getBinding().f2468c.addOnPageChangeListener(new WidgetThreadBrowser$initializeAdapter$3(this));
+            getBinding().f2466c.addOnPageChangeListener(new WidgetThreadBrowser$initializeAdapter$3(this));
             TabLayout tabLayout = getBinding().b;
             m.checkNotNullExpressionValue(tabLayout, "binding.actionBarTabs");
             if (!browser.getCanViewArchivedThreads()) {
@@ -185,7 +185,7 @@ public final class WidgetThreadBrowser extends AppFragment {
                 O.append(browser.getChannelName());
                 setActionBarSubtitle(O.toString());
             }
-            SimplePager simplePager = getBinding().f2468c;
+            SimplePager simplePager = getBinding().f2466c;
             m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager");
             updateMenu(simplePager.getCurrentItem(), Boolean.valueOf(browser.getCanCreateThread()));
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
index 7b5e5b0cad..f68c558e8f 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
@@ -130,7 +130,7 @@ public final class WidgetThreadBrowserActive extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f2466c;
+        RecyclerView recyclerView = getBinding().f2464c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         this.adapter = (WidgetThreadBrowserAdapter) companion.configure(new WidgetThreadBrowserAdapter(recyclerView, new WidgetThreadBrowserActive$onViewBound$1(getBrowserViewModel()), new WidgetThreadBrowserActive$onViewBound$2(this)));
         getBinding().b.f144c.setOnClickListener(new WidgetThreadBrowserActive$onViewBound$3(this));
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
index f91e9d9ceb..6d2495efe0 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
@@ -92,9 +92,9 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStoreState(long j, long j2, StoreUser storeUser, StoreThreadsActive storeThreadsActive, StoreThreadsActiveJoined storeThreadsActiveJoined, StoreThreadMessages storeThreadMessages, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions) {
-            Observable<StoreState> X = Observable.j(storeThreadsActiveJoined.observeActiveJoinedThreadsForChannel(j, j2).E(WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$1.INSTANCE), storeThreadsActive.observeActiveThreadsForChannel(j, Long.valueOf(j2)), WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$2.INSTANCE).X(new WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3(storeUser, storeThreadMessages, storeGuilds, j, storeChannels, storePermissions, j2));
-            m.checkNotNullExpressionValue(X, "Observable.combineLatest…            }\n          }");
-            return X;
+            Observable<StoreState> Y = Observable.j(storeThreadsActiveJoined.observeActiveJoinedThreadsForChannel(j, j2).F(WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$1.INSTANCE), storeThreadsActive.observeActiveThreadsForChannel(j, Long.valueOf(j2)), WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$2.INSTANCE).Y(new WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3(storeUser, storeThreadMessages, storeGuilds, j, storeChannels, storePermissions, j2));
+            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…            }\n          }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
index 45c2f98e1e..db0c7f2b73 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
@@ -133,10 +133,10 @@ public final class WidgetThreadBrowserArchived extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f2467c;
+        RecyclerView recyclerView = getBinding().f2465c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         this.adapter = (WidgetThreadBrowserAdapter) companion.configure(new WidgetThreadBrowserAdapter(recyclerView, new WidgetThreadBrowserArchived$onViewBound$1(getBrowserViewModel()), new WidgetThreadBrowserArchived$onViewBound$2(this)));
-        getBinding().f2467c.addOnScrollListener(new WidgetThreadBrowserArchived$onViewBound$3(this));
+        getBinding().f2465c.addOnScrollListener(new WidgetThreadBrowserArchived$onViewBound$3(this));
         getBinding().b.f144c.setOnClickListener(new WidgetThreadBrowserArchived$onViewBound$4(this));
         getBinding().e.setOnClickListener(new WidgetThreadBrowserArchived$onViewBound$5(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java
index d72d2f610a..053ba69169 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java
@@ -117,9 +117,9 @@ public final class WidgetThreadBrowserArchivedViewModel$Companion$observeStoreSt
         } else {
             observable = new j(h0.emptyMap());
         }
-        Observable<R> E = this.$storeGuilds.observeComputed().E(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(E, "storeGuilds\n            …[guildId] ?: emptyMap() }");
-        Observable<T> q = ObservableExtensionsKt.leadingEdgeThrottle(E, 1, TimeUnit.SECONDS).q();
+        Observable<R> F = this.$storeGuilds.observeComputed().F(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(F, "storeGuilds\n            …[guildId] ?: emptyMap() }");
+        Observable<T> q = ObservableExtensionsKt.leadingEdgeThrottle(F, 1, TimeUnit.SECONDS).q();
         Observable<Guild> observeGuild = this.$storeGuilds.observeGuild(this.$guildId);
         StorePermissions storePermissions = this.$storePermissions;
         Long valueOf = component2 != null ? Long.valueOf(component2.r()) : null;
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
index ffbf3bfa31..59de1b7cb0 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
@@ -86,9 +86,9 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
         }
 
         private final Observable<StoreState> observeStoreState(ViewMode viewMode, long j, long j2, StoreGuilds storeGuilds, StoreChannels storeChannels, StoreUser storeUser, ArchivedThreadsStore archivedThreadsStore, StorePermissions storePermissions) {
-            Observable<StoreState> X = Observable.j(archivedThreadsStore.loadAndObserveThreadListing(j2, viewMode.getThreadListingType()), storeChannels.observeChannel(j2), WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$1.INSTANCE).X(new WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2(storeUser, storeGuilds, j, storePermissions, viewMode));
-            m.checkNotNullExpressionValue(X, "Observable.combineLatest…            }\n          }");
-            return X;
+            Observable<StoreState> Y = Observable.j(archivedThreadsStore.loadAndObserveThreadListing(j2, viewMode.getThreadListingType()), storeChannels.observeChannel(j2), WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$1.INSTANCE).Y(new WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2(storeUser, storeGuilds, j, storePermissions, viewMode));
+            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…            }\n          }");
+            return Y;
         }
     }
 
@@ -546,13 +546,13 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
         this.storeArchivedThreads = archivedThreadsStore;
         this.storePermissions = storePermissions;
         this.storeGuildMemberRequester = storeGuildMemberRequester;
-        BehaviorSubject<ViewMode> k0 = BehaviorSubject.k0(new ViewMode(VisibilityMode.PublicThreads, false));
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(\n…rMode = false\n      )\n  )");
-        this.viewModeSubject = k0;
-        Observable<R> X = k0.X(new WidgetThreadBrowserArchivedViewModel$storeStateObservable$1(this));
-        m.checkNotNullExpressionValue(X, "viewModeSubject\n        …            )\n          }");
-        this.storeStateObservable = X;
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(X, this, null, 2, null), WidgetThreadBrowserArchivedViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        BehaviorSubject<ViewMode> l0 = BehaviorSubject.l0(new ViewMode(VisibilityMode.PublicThreads, false));
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\n…rMode = false\n      )\n  )");
+        this.viewModeSubject = l0;
+        Observable<R> Y = l0.Y(new WidgetThreadBrowserArchivedViewModel$storeStateObservable$1(this));
+        m.checkNotNullExpressionValue(Y, "viewModeSubject\n        …            )\n          }");
+        this.storeStateObservable = Y;
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Y, this, null, 2, null), WidgetThreadBrowserArchivedViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -660,14 +660,14 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
     @MainThread
     public final void maybeLoadMore(boolean z2) {
         if (this.canLoadMore || z2) {
-            ArchivedThreadsStore.fetchListing$default(this.storeArchivedThreads, this.channelId, this.viewModeSubject.m0().getThreadListingType(), false, 4, null);
+            ArchivedThreadsStore.fetchListing$default(this.storeArchivedThreads, this.channelId, this.viewModeSubject.n0().getThreadListingType(), false, 4, null);
         }
     }
 
     @MainThread
     public final void onModeratorModeChanged(boolean z2) {
         BehaviorSubject<ViewMode> behaviorSubject = this.viewModeSubject;
-        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.m0(), null, z2, 1, null));
+        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.n0(), null, z2, 1, null));
         trackTabChanged();
     }
 
@@ -675,15 +675,15 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
     public final void onVisibilityChanged(VisibilityMode visibilityMode) {
         m.checkNotNullParameter(visibilityMode, "visibility");
         BehaviorSubject<ViewMode> behaviorSubject = this.viewModeSubject;
-        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.m0(), visibilityMode, false, 2, null));
+        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.n0(), visibilityMode, false, 2, null));
         trackTabChanged();
     }
 
     public final void trackTabChanged() {
         String str;
-        ViewMode m0 = this.viewModeSubject.m0();
-        if (m0 != null) {
-            int ordinal = m0.getThreadListingType().ordinal();
+        ViewMode n0 = this.viewModeSubject.n0();
+        if (n0 != null) {
+            int ordinal = n0.getThreadListingType().ordinal();
             if (ordinal == 0) {
                 str = "My Private Archived Threads";
             } else if (ordinal == 1) {
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
index 3648491251..dcc2190c73 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
@@ -87,7 +87,7 @@ public final class WidgetThreadBrowserFilterSheet extends AppBottomSheet {
         CheckedSetting checkedSetting2 = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.threadBrowserVisibilityPrivate");
         checkedSetting2.setChecked(viewMode.getVisibility() == WidgetThreadBrowserArchivedViewModel.VisibilityMode.PrivateThreads);
-        CardView cardView = getBinding().f2469c;
+        CardView cardView = getBinding().f2467c;
         m.checkNotNullExpressionValue(cardView, "binding.threadBrowserModeratorViewCard");
         cardView.setVisibility(viewState.isModerator() ? 0 : 8);
         if (viewMode.getVisibility() == visibilityMode) {
diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager.java b/app/src/main/java/com/discord/widgets/chat/MessageManager.java
index 6fbc0bd0c6..2d287c854e 100644
--- a/app/src/main/java/com/discord/widgets/chat/MessageManager.java
+++ b/app/src/main/java/com/discord/widgets/chat/MessageManager.java
@@ -501,9 +501,9 @@ public final class MessageManager {
             }
         }
         StorePendingReplies.PendingReply pendingReply = z2 ? this.storePendingReplies.getPendingReply(longValue) : null;
-        Observable Y = Observable.j(this.storeSlowMode.observeCooldownSecs(l, StoreSlowMode.Type.MessageSend.INSTANCE).Y(1).X(new MessageManager$sendMessage$messageResultObservable$1(this, pendingReply, longValue, me2, str, list, attachments, list2, (pendingReply == null || pendingReply.getShouldMention()) ? null : new MessageAllowedMentions(k.toList(MessageAllowedMentionsTypes.values()), null, null, Boolean.FALSE, 6))), this.storeGuilds.observeFromChannelId(longValue), MessageManager$sendMessage$1.INSTANCE).Y(1);
-        m.checkNotNullExpressionValue(Y, "Observable.combineLatest…d)\n    }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(Y, false, 1, null)), MessageManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MessageManager$sendMessage$2(function1), 62, (Object) null);
+        Observable Z = Observable.j(this.storeSlowMode.observeCooldownSecs(l, StoreSlowMode.Type.MessageSend.INSTANCE).Z(1).Y(new MessageManager$sendMessage$messageResultObservable$1(this, pendingReply, longValue, me2, str, list, attachments, list2, (pendingReply == null || pendingReply.getShouldMention()) ? null : new MessageAllowedMentions(k.toList(MessageAllowedMentionsTypes.values()), null, null, Boolean.FALSE, 6))), this.storeGuilds.observeFromChannelId(longValue), MessageManager$sendMessage$1.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable.combineLatest…d)\n    }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(Z, false, 1, null)), MessageManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MessageManager$sendMessage$2(function1), 62, (Object) null);
         return true;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
index 347e136b44..3125c35d7e 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
@@ -117,7 +117,7 @@ public final class WidgetUrlActions extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView, "binding.dialogUrlActionsUrl");
         ViewExtensions.setTextAndVisibilityBy(textView, getUrl());
         getBinding().b.setOnClickListener(new WidgetUrlActions$onViewCreated$1(this));
-        getBinding().f2476c.setOnClickListener(new WidgetUrlActions$onViewCreated$2(this));
+        getBinding().f2474c.setOnClickListener(new WidgetUrlActions$onViewCreated$2(this));
         getBinding().d.setOnClickListener(new WidgetUrlActions$onViewCreated$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
index f255127269..ec8680f293 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
@@ -87,9 +87,9 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         }
 
         private final Observable<StoreState> observeStores() {
-            Observable<R> X = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().X(AppFlexInputViewModel$Companion$observeStores$1.INSTANCE);
-            m.checkNotNullExpressionValue(X, "StoreStream\n          .g…            }\n          }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Y(AppFlexInputViewModel$Companion$observeStores$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
@@ -275,7 +275,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         this.storeStickers = storeStickers;
         this.storeAnalytics = storeAnalytics;
         this.storeExpressionSuggestions = storeExpressionSuggestions;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         Observable q = ObservableExtensionsKt.computationLatest(observable).q();
         m.checkNotNullExpressionValue(q, "storeObservable\n        …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(q, this, null, 2, null), AppFlexInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -529,7 +529,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
     public void onSendButtonClicked(FlexInputListener flexInputListener) {
         FlexInputState viewState = getViewState();
         if (viewState != null && flexInputListener != null) {
-            flexInputListener.onSend(viewState.a, viewState.f2929c, new AppFlexInputViewModel$onSendButtonClicked$1(this));
+            flexInputListener.onSend(viewState.a, viewState.f2927c, new AppFlexInputViewModel$onSendButtonClicked$1(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java
index 67b11c63cc..991d8453a6 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java
@@ -44,7 +44,7 @@ public final class ChatInputViewModel$Companion$getPendingReplyStateObservable$1
         long i = author2.i();
         Long b = pendingReply.getMessageReference().b();
         if (b != null) {
-            observable = StoreStream.Companion.getGuilds().observeComputed(b.longValue()).E(new ChatInputViewModel$Companion$getPendingReplyStateObservable$1$$special$$inlined$let$lambda$1(i)).q();
+            observable = StoreStream.Companion.getGuilds().observeComputed(b.longValue()).F(new ChatInputViewModel$Companion$getPendingReplyStateObservable$1$$special$$inlined$let$lambda$1(i)).q();
         } else {
             observable = new j(null);
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
index 0de844ada8..9b4c95865c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
@@ -38,9 +38,9 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio
         }
 
         public final Observable<? extends Channel> call(Channel channel) {
-            Observable<R> E = ChatInputViewModel.access$getStoreChannels$p(this.this$0.this$0).observeChannel(channel.h()).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            return ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(E, 0, false, 3, null));
+            Observable<R> F = ChatInputViewModel.access$getStoreChannels$p(this.this$0.this$0).observeChannel(channel.h()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            return ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null));
         }
     }
 
@@ -154,8 +154,8 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio
         if (autoArchiveDuration == null) {
             autoArchiveDuration = this.$loadedViewState.getChannel().d();
         }
-        Observable y2 = ObservableExtensionsKt.restSubscribeOn$default(threadUtils.createThread(channelId, l, i, threadName, Integer.valueOf(autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440), str), false, 1, null).y(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(y2, "ThreadUtils.createThread…ationLatest()\n          }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(y2, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this, function1), 54, (Object) null);
+        Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(threadUtils.createThread(channelId, l, i, threadName, Integer.valueOf(autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440), str), false, 1, null).z(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(z2, "ThreadUtils.createThread…ationLatest()\n          }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(z2, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this, function1), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
index 5b5313fc5c..55e4593938 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
@@ -164,11 +164,11 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<Boolean> getIsOnCooldownObservable(long j, StoreSlowMode storeSlowMode) {
-            return storeSlowMode.observeCooldownSecs(Long.valueOf(j), StoreSlowMode.Type.MessageSend.INSTANCE).E(ChatInputViewModel$Companion$getIsOnCooldownObservable$1.INSTANCE).q();
+            return storeSlowMode.observeCooldownSecs(Long.valueOf(j), StoreSlowMode.Type.MessageSend.INSTANCE).F(ChatInputViewModel$Companion$getIsOnCooldownObservable$1.INSTANCE).q();
         }
 
         private final Observable<StoreState.Loaded.PendingReply> getPendingReplyStateObservable(long j, StorePendingReplies storePendingReplies) {
-            Observable<StoreState.Loaded.PendingReply> q = storePendingReplies.observePendingReply(j).X(ChatInputViewModel$Companion$getPendingReplyStateObservable$1.INSTANCE).q();
+            Observable<StoreState.Loaded.PendingReply> q = storePendingReplies.observePendingReply(j).Y(ChatInputViewModel$Companion$getPendingReplyStateObservable$1.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "storePendingReplies\n    …  .distinctUntilChanged()");
             return q;
         }
@@ -178,9 +178,9 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreChannelsSelected storeChannelsSelected, StoreUser storeUser, StoreChat storeChat, StoreUserRelationships storeUserRelationships, StorePermissions storePermissions, StoreLurking storeLurking, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, StorePendingReplies storePendingReplies, StoreGuildJoinRequest storeGuildJoinRequest, StoreThreadDraft storeThreadDraft) {
-            Observable<R> X = storeChannelsSelected.observeResolvedSelectedChannel().X(new ChatInputViewModel$Companion$observeStoreState$1(storeUser, storeChat, storeUserRelationships, storePermissions, storeGuilds, storeLurking, storeSlowMode, storePendingReplies, storeGuildJoinRequest, storeThreadDraft));
-            m.checkNotNullExpressionValue(X, "storeChannelsSelected.ob…      }\n        }\n      }");
-            return X;
+            Observable<R> Y = storeChannelsSelected.observeResolvedSelectedChannel().Y(new ChatInputViewModel$Companion$observeStoreState$1(storeUser, storeChat, storeUserRelationships, storePermissions, storeGuilds, storeLurking, storeSlowMode, storePendingReplies, storeGuildJoinRequest, storeThreadDraft));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected.ob…      }\n        }\n      }");
+            return Y;
         }
     }
 
@@ -726,7 +726,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             private final boolean isOnCooldown;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2634me;
+            private final MeUser f2632me;
             private final GuildMember meGuildMember;
             private final PendingReply pendingReply;
             private final Integer relationshipType;
@@ -833,7 +833,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 m.checkNotNullParameter(guildVerificationLevel, "verificationLevelTriggered");
                 m.checkNotNullParameter(threadDraftState, "threadDraftState");
                 this.channel = channel;
-                this.f2634me = meUser;
+                this.f2632me = meUser;
                 this.editingMessage = editingMessage;
                 this.relationshipType = num;
                 this.channelPermissions = l;
@@ -849,7 +849,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public static /* synthetic */ Loaded copy$default(Loaded loaded, Channel channel, MeUser meUser, StoreChat.EditingMessage editingMessage, Integer num, Long l, GuildVerificationLevel guildVerificationLevel, boolean z2, boolean z3, Guild guild, PendingReply pendingReply, StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft, GuildMember guildMember, GuildJoinRequest guildJoinRequest, StoreThreadDraft.ThreadDraftState threadDraftState, int i, Object obj) {
-                return loaded.copy((i & 1) != 0 ? loaded.channel : channel, (i & 2) != 0 ? loaded.f2634me : meUser, (i & 4) != 0 ? loaded.editingMessage : editingMessage, (i & 8) != 0 ? loaded.relationshipType : num, (i & 16) != 0 ? loaded.channelPermissions : l, (i & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i & 64) != 0 ? loaded.isLurking : z2, (i & 128) != 0 ? loaded.isOnCooldown : z3, (i & 256) != 0 ? loaded.guild : guild, (i & 512) != 0 ? loaded.pendingReply : pendingReply, (i & 1024) != 0 ? loaded.selectedThreadDraft : threadDraft, (i & 2048) != 0 ? loaded.meGuildMember : guildMember, (i & 4096) != 0 ? loaded.guildJoinRequest : guildJoinRequest, (i & 8192) != 0 ? loaded.threadDraftState : threadDraftState);
+                return loaded.copy((i & 1) != 0 ? loaded.channel : channel, (i & 2) != 0 ? loaded.f2632me : meUser, (i & 4) != 0 ? loaded.editingMessage : editingMessage, (i & 8) != 0 ? loaded.relationshipType : num, (i & 16) != 0 ? loaded.channelPermissions : l, (i & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i & 64) != 0 ? loaded.isLurking : z2, (i & 128) != 0 ? loaded.isOnCooldown : z3, (i & 256) != 0 ? loaded.guild : guild, (i & 512) != 0 ? loaded.pendingReply : pendingReply, (i & 1024) != 0 ? loaded.selectedThreadDraft : threadDraft, (i & 2048) != 0 ? loaded.meGuildMember : guildMember, (i & 4096) != 0 ? loaded.guildJoinRequest : guildJoinRequest, (i & 8192) != 0 ? loaded.threadDraftState : threadDraftState);
             }
 
             public final Channel component1() {
@@ -877,7 +877,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser component2() {
-                return this.f2634me;
+                return this.f2632me;
             }
 
             public final StoreChat.EditingMessage component3() {
@@ -924,7 +924,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.channel, loaded.channel) && m.areEqual(this.f2634me, loaded.f2634me) && m.areEqual(this.editingMessage, loaded.editingMessage) && m.areEqual(this.relationshipType, loaded.relationshipType) && m.areEqual(this.channelPermissions, loaded.channelPermissions) && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isOnCooldown == loaded.isOnCooldown && m.areEqual(this.guild, loaded.guild) && m.areEqual(this.pendingReply, loaded.pendingReply) && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && m.areEqual(this.meGuildMember, loaded.meGuildMember) && m.areEqual(this.guildJoinRequest, loaded.guildJoinRequest) && m.areEqual(this.threadDraftState, loaded.threadDraftState);
+                return m.areEqual(this.channel, loaded.channel) && m.areEqual(this.f2632me, loaded.f2632me) && m.areEqual(this.editingMessage, loaded.editingMessage) && m.areEqual(this.relationshipType, loaded.relationshipType) && m.areEqual(this.channelPermissions, loaded.channelPermissions) && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isOnCooldown == loaded.isOnCooldown && m.areEqual(this.guild, loaded.guild) && m.areEqual(this.pendingReply, loaded.pendingReply) && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && m.areEqual(this.meGuildMember, loaded.meGuildMember) && m.areEqual(this.guildJoinRequest, loaded.guildJoinRequest) && m.areEqual(this.threadDraftState, loaded.threadDraftState);
             }
 
             public final Channel getChannel() {
@@ -948,7 +948,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser getMe() {
-                return this.f2634me;
+                return this.f2632me;
             }
 
             public final GuildMember getMeGuildMember() {
@@ -979,7 +979,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 Channel channel = this.channel;
                 int i = 0;
                 int hashCode = (channel != null ? channel.hashCode() : 0) * 31;
-                MeUser meUser = this.f2634me;
+                MeUser meUser = this.f2632me;
                 int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 StoreChat.EditingMessage editingMessage = this.editingMessage;
                 int hashCode3 = (hashCode2 + (editingMessage != null ? editingMessage.hashCode() : 0)) * 31;
@@ -1032,7 +1032,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 StringBuilder O = a.O("Loaded(channel=");
                 O.append(this.channel);
                 O.append(", me=");
-                O.append(this.f2634me);
+                O.append(this.f2632me);
                 O.append(", editingMessage=");
                 O.append(this.editingMessage);
                 O.append(", relationshipType=");
@@ -1100,7 +1100,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             private final int maxFileSizeMB;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2635me;
+            private final MeUser f2633me;
             private final PendingReplyState pendingReplyState;
             private final StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft;
             private final boolean shouldBadgeChatInput;
@@ -1278,7 +1278,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 m.checkNotNullParameter(threadDraftState, "threadDraftState");
                 this.channel = channel;
                 this.channelId = j;
-                this.f2635me = meUser;
+                this.f2633me = meUser;
                 this.editingMessage = editingMessage;
                 this.ableToSendMessage = z2;
                 this.verificationLevelTriggered = guildVerificationLevel;
@@ -1302,7 +1302,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public static /* synthetic */ Loaded copy$default(Loaded loaded, Channel channel, long j, MeUser meUser, StoreChat.EditingMessage editingMessage, boolean z2, GuildVerificationLevel guildVerificationLevel, boolean z3, boolean z4, boolean z5, int i, boolean z6, PendingReplyState pendingReplyState, boolean z7, boolean z8, boolean z9, boolean z10, boolean z11, boolean z12, StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft, boolean z13, ApplicationStatus applicationStatus, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z14, int i2, Object obj) {
-                return loaded.copy((i2 & 1) != 0 ? loaded.channel : channel, (i2 & 2) != 0 ? loaded.channelId : j, (i2 & 4) != 0 ? loaded.f2635me : meUser, (i2 & 8) != 0 ? loaded.editingMessage : editingMessage, (i2 & 16) != 0 ? loaded.ableToSendMessage : z2, (i2 & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i2 & 64) != 0 ? loaded.isLurking : z3, (i2 & 128) != 0 ? loaded.isSystemDM : z4, (i2 & 256) != 0 ? loaded.isOnCooldown : z5, (i2 & 512) != 0 ? loaded.maxFileSizeMB : i, (i2 & 1024) != 0 ? loaded.shouldShowFollow : z6, (i2 & 2048) != 0 ? loaded.pendingReplyState : pendingReplyState, (i2 & 4096) != 0 ? loaded.shouldBadgeChatInput : z7, (i2 & 8192) != 0 ? loaded.isBlocked : z8, (i2 & 16384) != 0 ? loaded.isInputShowing : z9, (i2 & 32768) != 0 ? loaded.isVerificationLevelTriggered : z10, (i2 & 65536) != 0 ? loaded.isEditing : z11, (i2 & 131072) != 0 ? loaded.isReplying : z12, (i2 & 262144) != 0 ? loaded.selectedThreadDraft : threadDraft, (i2 & 524288) != 0 ? loaded.shouldShowVerificationGate : z13, (i2 & 1048576) != 0 ? loaded.joinRequestStatus : applicationStatus, (i2 & 2097152) != 0 ? loaded.threadDraftState : threadDraftState, (i2 & 4194304) != 0 ? loaded.showCreateThreadOption : z14);
+                return loaded.copy((i2 & 1) != 0 ? loaded.channel : channel, (i2 & 2) != 0 ? loaded.channelId : j, (i2 & 4) != 0 ? loaded.f2633me : meUser, (i2 & 8) != 0 ? loaded.editingMessage : editingMessage, (i2 & 16) != 0 ? loaded.ableToSendMessage : z2, (i2 & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i2 & 64) != 0 ? loaded.isLurking : z3, (i2 & 128) != 0 ? loaded.isSystemDM : z4, (i2 & 256) != 0 ? loaded.isOnCooldown : z5, (i2 & 512) != 0 ? loaded.maxFileSizeMB : i, (i2 & 1024) != 0 ? loaded.shouldShowFollow : z6, (i2 & 2048) != 0 ? loaded.pendingReplyState : pendingReplyState, (i2 & 4096) != 0 ? loaded.shouldBadgeChatInput : z7, (i2 & 8192) != 0 ? loaded.isBlocked : z8, (i2 & 16384) != 0 ? loaded.isInputShowing : z9, (i2 & 32768) != 0 ? loaded.isVerificationLevelTriggered : z10, (i2 & 65536) != 0 ? loaded.isEditing : z11, (i2 & 131072) != 0 ? loaded.isReplying : z12, (i2 & 262144) != 0 ? loaded.selectedThreadDraft : threadDraft, (i2 & 524288) != 0 ? loaded.shouldShowVerificationGate : z13, (i2 & 1048576) != 0 ? loaded.joinRequestStatus : applicationStatus, (i2 & 2097152) != 0 ? loaded.threadDraftState : threadDraftState, (i2 & 4194304) != 0 ? loaded.showCreateThreadOption : z14);
             }
 
             public final Channel component1() {
@@ -1370,7 +1370,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser component3() {
-                return this.f2635me;
+                return this.f2633me;
             }
 
             public final StoreChat.EditingMessage component4() {
@@ -1413,7 +1413,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.channel, loaded.channel) && this.channelId == loaded.channelId && m.areEqual(this.f2635me, loaded.f2635me) && m.areEqual(this.editingMessage, loaded.editingMessage) && this.ableToSendMessage == loaded.ableToSendMessage && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isSystemDM == loaded.isSystemDM && this.isOnCooldown == loaded.isOnCooldown && this.maxFileSizeMB == loaded.maxFileSizeMB && this.shouldShowFollow == loaded.shouldShowFollow && m.areEqual(this.pendingReplyState, loaded.pendingReplyState) && this.shouldBadgeChatInput == loaded.shouldBadgeChatInput && this.isBlocked == loaded.isBlocked && this.isInputShowing == loaded.isInputShowing && this.isVerificationLevelTriggered == loaded.isVerificationLevelTriggered && this.isEditing == loaded.isEditing && this.isReplying == loaded.isReplying && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && this.shouldShowVerificationGate == loaded.shouldShowVerificationGate && m.areEqual(this.joinRequestStatus, loaded.joinRequestStatus) && m.areEqual(this.threadDraftState, loaded.threadDraftState) && this.showCreateThreadOption == loaded.showCreateThreadOption;
+                return m.areEqual(this.channel, loaded.channel) && this.channelId == loaded.channelId && m.areEqual(this.f2633me, loaded.f2633me) && m.areEqual(this.editingMessage, loaded.editingMessage) && this.ableToSendMessage == loaded.ableToSendMessage && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isSystemDM == loaded.isSystemDM && this.isOnCooldown == loaded.isOnCooldown && this.maxFileSizeMB == loaded.maxFileSizeMB && this.shouldShowFollow == loaded.shouldShowFollow && m.areEqual(this.pendingReplyState, loaded.pendingReplyState) && this.shouldBadgeChatInput == loaded.shouldBadgeChatInput && this.isBlocked == loaded.isBlocked && this.isInputShowing == loaded.isInputShowing && this.isVerificationLevelTriggered == loaded.isVerificationLevelTriggered && this.isEditing == loaded.isEditing && this.isReplying == loaded.isReplying && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && this.shouldShowVerificationGate == loaded.shouldShowVerificationGate && m.areEqual(this.joinRequestStatus, loaded.joinRequestStatus) && m.areEqual(this.threadDraftState, loaded.threadDraftState) && this.showCreateThreadOption == loaded.showCreateThreadOption;
             }
 
             public final boolean getAbleToSendMessage() {
@@ -1441,7 +1441,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser getMe() {
-                return this.f2635me;
+                return this.f2633me;
             }
 
             public final PendingReplyState getPendingReplyState() {
@@ -1480,7 +1480,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 Channel channel = this.channel;
                 int i = 0;
                 int a = (b.a(this.channelId) + ((channel != null ? channel.hashCode() : 0) * 31)) * 31;
-                MeUser meUser = this.f2635me;
+                MeUser meUser = this.f2633me;
                 int hashCode = (a + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 StoreChat.EditingMessage editingMessage = this.editingMessage;
                 int hashCode2 = (hashCode + (editingMessage != null ? editingMessage.hashCode() : 0)) * 31;
@@ -1639,7 +1639,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 O.append(", channelId=");
                 O.append(this.channelId);
                 O.append(", me=");
-                O.append(this.f2635me);
+                O.append(this.f2633me);
                 O.append(", editingMessage=");
                 O.append(this.editingMessage);
                 O.append(", ableToSendMessage=");
@@ -1748,9 +1748,9 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         this.storeAnalytics = storeAnalytics;
         this.storeThreadDraft = storeThreadDraft;
         this.isEmojiAutocompleteUpsellEnabled = z2;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.eventSubject = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ChatInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeChat.observeEvents(), this, null, 2, null), ChatInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java
index 47e7d7e899..828231fa62 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java
@@ -29,7 +29,7 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0<
         m.checkNotNullExpressionValue(textView, "binding.chatInputEmojiMatchingHeader");
         RecyclerView recyclerView = WidgetChatInput.access$getBinding$p(this.this$0).l;
         m.checkNotNullExpressionValue(recyclerView, "binding.chatInputMentionsRecycler");
-        RecyclerView recyclerView2 = WidgetChatInput.access$getBinding$p(this.this$0).f2168c;
+        RecyclerView recyclerView2 = WidgetChatInput.access$getBinding$p(this.this$0).f2167c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.chatInputCategoriesRecycler");
         LinearLayout linearLayout = WidgetChatInput.access$getBinding$p(this.this$0).m;
         m.checkNotNullExpressionValue(linearLayout, "binding.chatInputStickersContainer");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java
index 2af986f201..da36187c59 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java
@@ -25,7 +25,7 @@ public final class WidgetChatInput$setWindowInsetsListeners$3 implements OnApply
         WindowInsetsCompat build = new WindowInsetsCompat.Builder().setSystemWindowInsets(Insets.of(0, 0, 0, this.$shouldApplyWindowInsets ? windowInsetsCompat.getSystemWindowInsetBottom() : 0)).build();
         m.checkNotNullExpressionValue(build, "WindowInsetsCompat.Build…        )\n      ).build()");
         ViewCompat.dispatchApplyWindowInsets(WidgetChatInput.access$getBinding$p(this.this$0).q, build);
-        n4 n4Var = WidgetChatInput.access$getBinding$p(this.this$0).f2169r;
+        n4 n4Var = WidgetChatInput.access$getBinding$p(this.this$0).f2168r;
         m.checkNotNullExpressionValue(n4Var, "binding.guard");
         ViewCompat.dispatchApplyWindowInsets(n4Var.a, build);
         o4 o4Var = WidgetChatInput.access$getBinding$p(this.this$0).s;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
index a524c0c9e3..b76a3d7fe9 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
@@ -199,7 +199,7 @@ public final class WidgetChatInput extends AppFragment {
     }
 
     private final void configureChatGuard(ChatInputViewModel.ViewState.Loaded loaded) {
-        n4 n4Var = getBinding().f2169r;
+        n4 n4Var = getBinding().f2168r;
         m.checkNotNullExpressionValue(n4Var, "binding.guard");
         LinearLayout linearLayout = n4Var.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.guard.root");
@@ -209,7 +209,7 @@ public final class WidgetChatInput extends AppFragment {
         m.checkNotNullExpressionValue(o4Var, "binding.guardMemberVerification");
         RelativeLayout relativeLayout = o4Var.a;
         m.checkNotNullExpressionValue(relativeLayout, "binding.guardMemberVerification.root");
-        n4 n4Var2 = getBinding().f2169r;
+        n4 n4Var2 = getBinding().f2168r;
         m.checkNotNullExpressionValue(n4Var2, "binding.guard");
         LinearLayout linearLayout2 = n4Var2.a;
         m.checkNotNullExpressionValue(linearLayout2, "binding.guard.root");
@@ -221,63 +221,63 @@ public final class WidgetChatInput extends AppFragment {
         m.checkNotNullExpressionValue(o4Var2, "binding.guardMemberVerification");
         o4Var2.a.setOnClickListener(new WidgetChatInput$configureChatGuard$1(this, loaded));
         if (loaded.isSystemDM()) {
-            getBinding().f2169r.e.setText(R.string.system_dm_channel_description);
-            TextView textView = getBinding().f2169r.d;
+            getBinding().f2168r.e.setText(R.string.system_dm_channel_description);
+            TextView textView = getBinding().f2168r.d;
             m.checkNotNullExpressionValue(textView, "binding.guard.chatInputGuardSubtext");
             ViewExtensions.setTextAndVisibilityBy(textView, getString(R.string.system_dm_channel_description_subtext));
-            MaterialButton materialButton = getBinding().f2169r.b;
+            MaterialButton materialButton = getBinding().f2168r.b;
             m.checkNotNullExpressionValue(materialButton, "binding.guard.chatInputGuardAction");
             materialButton.setVisibility(8);
-            MaterialButton materialButton2 = getBinding().f2169r.f136c;
+            MaterialButton materialButton2 = getBinding().f2168r.f136c;
             m.checkNotNullExpressionValue(materialButton2, "binding.guard.chatInputGuardActionSecondary");
             materialButton2.setVisibility(8);
         } else if (loaded.isLurking()) {
             if (loaded.getShouldShowFollow()) {
-                getBinding().f2169r.e.setText(R.string.follow_news_chat_input_message);
-                MaterialButton materialButton3 = getBinding().f2169r.b;
+                getBinding().f2168r.e.setText(R.string.follow_news_chat_input_message);
+                MaterialButton materialButton3 = getBinding().f2168r.b;
                 m.checkNotNullExpressionValue(materialButton3, "binding.guard.chatInputGuardAction");
                 ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(R.string.game_popout_follow));
-                getBinding().f2169r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$2(this, loaded));
-                MaterialButton materialButton4 = getBinding().f2169r.f136c;
+                getBinding().f2168r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$2(this, loaded));
+                MaterialButton materialButton4 = getBinding().f2168r.f136c;
                 m.checkNotNullExpressionValue(materialButton4, "binding.guard.chatInputGuardActionSecondary");
                 ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(R.string.lurker_mode_chat_input_button));
-                getBinding().f2169r.f136c.setOnClickListener(new WidgetChatInput$configureChatGuard$3(this));
+                getBinding().f2168r.f136c.setOnClickListener(new WidgetChatInput$configureChatGuard$3(this));
             } else {
-                getBinding().f2169r.e.setText(R.string.lurker_mode_chat_input_message);
-                MaterialButton materialButton5 = getBinding().f2169r.b;
+                getBinding().f2168r.e.setText(R.string.lurker_mode_chat_input_message);
+                MaterialButton materialButton5 = getBinding().f2168r.b;
                 m.checkNotNullExpressionValue(materialButton5, "binding.guard.chatInputGuardAction");
                 ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(R.string.lurker_mode_chat_input_button));
-                getBinding().f2169r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$4(this));
-                MaterialButton materialButton6 = getBinding().f2169r.f136c;
+                getBinding().f2168r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$4(this));
+                MaterialButton materialButton6 = getBinding().f2168r.f136c;
                 m.checkNotNullExpressionValue(materialButton6, "binding.guard.chatInputGuardActionSecondary");
                 materialButton6.setVisibility(8);
             }
         } else if (loaded.getShouldShowFollow()) {
-            getBinding().f2169r.e.setText(R.string.follow_news_chat_input_message);
-            MaterialButton materialButton7 = getBinding().f2169r.b;
+            getBinding().f2168r.e.setText(R.string.follow_news_chat_input_message);
+            MaterialButton materialButton7 = getBinding().f2168r.b;
             m.checkNotNullExpressionValue(materialButton7, "binding.guard.chatInputGuardAction");
             ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(R.string.game_popout_follow));
-            getBinding().f2169r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$5(this, loaded));
-            MaterialButton materialButton8 = getBinding().f2169r.f136c;
+            getBinding().f2168r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$5(this, loaded));
+            MaterialButton materialButton8 = getBinding().f2168r.f136c;
             m.checkNotNullExpressionValue(materialButton8, "binding.guard.chatInputGuardActionSecondary");
             materialButton8.setVisibility(8);
         } else {
-            TextView textView2 = getBinding().f2169r.e;
+            TextView textView2 = getBinding().f2168r.e;
             m.checkNotNullExpressionValue(textView2, "binding.guard.chatInputGuardText");
-            TextView textView3 = getBinding().f2169r.e;
+            TextView textView3 = getBinding().f2168r.e;
             m.checkNotNullExpressionValue(textView3, "binding.guard.chatInputGuardText");
             Context context = textView3.getContext();
             m.checkNotNullExpressionValue(context, "binding.guard.chatInputGuardText.context");
             textView2.setText(getVerificationText(context, loaded.getVerificationLevelTriggered()));
-            MaterialButton materialButton9 = getBinding().f2169r.b;
+            MaterialButton materialButton9 = getBinding().f2168r.b;
             m.checkNotNullExpressionValue(materialButton9, "binding.guard.chatInputGuardAction");
-            MaterialButton materialButton10 = getBinding().f2169r.b;
+            MaterialButton materialButton10 = getBinding().f2168r.b;
             m.checkNotNullExpressionValue(materialButton10, "binding.guard.chatInputGuardAction");
             Context context2 = materialButton10.getContext();
             m.checkNotNullExpressionValue(context2, "binding.guard.chatInputGuardAction.context");
             ViewExtensions.setTextAndVisibilityBy(materialButton9, getVerificationActionText(context2, loaded.getVerificationLevelTriggered()));
-            getBinding().f2169r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$6(this));
-            MaterialButton materialButton11 = getBinding().f2169r.f136c;
+            getBinding().f2168r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$6(this));
+            MaterialButton materialButton11 = getBinding().f2168r.f136c;
             m.checkNotNullExpressionValue(materialButton11, "binding.guard.chatInputGuardActionSecondary");
             materialButton11.setVisibility(8);
         }
@@ -416,7 +416,7 @@ public final class WidgetChatInput extends AppFragment {
             RelativeLayout relativeLayout = o4Var.a;
             m.checkNotNullExpressionValue(relativeLayout, "binding.guardMemberVerification.root");
             relativeLayout.setVisibility(8);
-            n4 n4Var = getBinding().f2169r;
+            n4 n4Var = getBinding().f2168r;
             m.checkNotNullExpressionValue(n4Var, "binding.guard");
             LinearLayout linearLayout2 = n4Var.a;
             m.checkNotNullExpressionValue(linearLayout2, "binding.guard.root");
@@ -427,7 +427,7 @@ public final class WidgetChatInput extends AppFragment {
                 m.throwUninitializedPropertyAccessException("chatAttachments");
             }
             ChatInputViewModel.ViewState.Loaded loaded = (ChatInputViewModel.ViewState.Loaded) viewState;
-            widgetChatInputAttachments.configureFlexInputFragment(this, loaded.getShowCreateThreadOption());
+            widgetChatInputAttachments.configureFlexInputContentPages(loaded.getShowCreateThreadOption());
             LinearLayout linearLayout3 = getBinding().q;
             m.checkNotNullExpressionValue(linearLayout3, "binding.chatInputWrap");
             if (loaded.isInputShowing()) {
@@ -609,7 +609,7 @@ public final class WidgetChatInput extends AppFragment {
         FragmentContainerView fragmentContainerView = getBinding().p;
         m.checkNotNullExpressionValue(fragmentContainerView, "binding.chatInputWidget");
         ViewExtensions.setForwardingWindowInsetsListener(fragmentContainerView);
-        n4 n4Var = getBinding().f2169r;
+        n4 n4Var = getBinding().f2168r;
         m.checkNotNullExpressionValue(n4Var, "binding.guard");
         ViewCompat.setOnApplyWindowInsetsListener(n4Var.a, WidgetChatInput$setWindowInsetsListeners$1.INSTANCE);
         o4 o4Var = getBinding().s;
@@ -637,7 +637,12 @@ public final class WidgetChatInput extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        this.chatAttachments = new WidgetChatInputAttachments(getFlexInputFragment());
+        WidgetChatInputAttachments widgetChatInputAttachments = new WidgetChatInputAttachments(getFlexInputFragment());
+        this.chatAttachments = widgetChatInputAttachments;
+        if (widgetChatInputAttachments == null) {
+            m.throwUninitializedPropertyAccessException("chatAttachments");
+        }
+        widgetChatInputAttachments.configureFlexInputFragment(this);
         getFlexInputFragment().i(new WidgetChatInput$onViewBound$1(this));
         getBinding().q.addOnLayoutChangeListener(b.C0034b.a());
         setWindowInsetsListeners$default(this, false, 1, null);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$page$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$page$1.java
similarity index 56%
rename from app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$page$1.java
rename to app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$page$1.java
index a37de727d5..a636741ce3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$page$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$page$1.java
@@ -1,16 +1,16 @@
 package com.discord.widgets.chat.input;
 
+import android.content.Context;
 import androidx.fragment.app.Fragment;
 import c.b.a.d.d;
-import com.lytefast.flexinput.fragment.FlexInputFragment;
 /* compiled from: WidgetChatInputAttachments.kt */
-public final class WidgetChatInputAttachments$configureFlexInputFragment$1$1$page$1 extends d.a {
-    public final /* synthetic */ FlexInputFragment $this_apply;
+public final class WidgetChatInputAttachments$configureFlexInputContentPages$1$page$1 extends d.a {
+    public final /* synthetic */ Context $context;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAttachments$configureFlexInputFragment$1$1$page$1(FlexInputFragment flexInputFragment, int i, int i2) {
+    public WidgetChatInputAttachments$configureFlexInputContentPages$1$page$1(Context context, int i, int i2) {
         super(i, i2);
-        this.$this_apply = flexInputFragment;
+        this.$context = context;
     }
 
     @Override // c.b.a.d.d.a
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$1.java
similarity index 61%
rename from app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$1.java
rename to app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$1.java
index 7ff5791e7f..f382ae2caf 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$1.java
@@ -1,16 +1,16 @@
 package com.discord.widgets.chat.input;
 
+import android.content.Context;
 import c.b.a.d.d;
 import com.discord.widgets.chat.input.WidgetChatInputAttachments;
-import com.lytefast.flexinput.fragment.FlexInputFragment;
 /* compiled from: WidgetChatInputAttachments.kt */
-public final class WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$1 extends d.a {
-    public final /* synthetic */ FlexInputFragment $this_apply;
+public final class WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$1 extends d.a {
+    public final /* synthetic */ Context $context;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$1(FlexInputFragment flexInputFragment, int i, int i2) {
+    public WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$1(Context context, int i, int i2) {
         super(i, i2);
-        this.$this_apply = flexInputFragment;
+        this.$context = context;
     }
 
     @Override // c.b.a.d.d.a
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$2.java
similarity index 61%
rename from app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$2.java
rename to app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$2.java
index 6cad7dc5e4..77e9a30d10 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$2.java
@@ -1,16 +1,16 @@
 package com.discord.widgets.chat.input;
 
+import android.content.Context;
 import c.b.a.d.d;
 import com.discord.widgets.chat.input.WidgetChatInputAttachments;
-import com.lytefast.flexinput.fragment.FlexInputFragment;
 /* compiled from: WidgetChatInputAttachments.kt */
-public final class WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$2 extends d.a {
-    public final /* synthetic */ FlexInputFragment $this_apply;
+public final class WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$2 extends d.a {
+    public final /* synthetic */ Context $context;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$2(FlexInputFragment flexInputFragment, int i, int i2) {
+    public WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$2(Context context, int i, int i2) {
         super(i, i2);
-        this.$this_apply = flexInputFragment;
+        this.$context = context;
     }
 
     @Override // c.b.a.d.d.a
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$3.java
similarity index 57%
rename from app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$3.java
rename to app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$3.java
index 0d85cb222d..ca9c9fb531 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$3.java
@@ -1,16 +1,16 @@
 package com.discord.widgets.chat.input;
 
+import android.content.Context;
 import c.b.a.d.d;
 import com.lytefast.flexinput.fragment.CameraFragment;
-import com.lytefast.flexinput.fragment.FlexInputFragment;
 /* compiled from: WidgetChatInputAttachments.kt */
-public final class WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$3 extends d.a {
-    public final /* synthetic */ FlexInputFragment $this_apply;
+public final class WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$3 extends d.a {
+    public final /* synthetic */ Context $context;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$3(FlexInputFragment flexInputFragment, int i, int i2) {
+    public WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$3(Context context, int i, int i2) {
         super(i, i2);
-        this.$this_apply = flexInputFragment;
+        this.$context = context;
     }
 
     @Override // c.b.a.d.d.a
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1.java
new file mode 100644
index 0000000000..6795d6741b
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputContentPages$1.java
@@ -0,0 +1,48 @@
+package com.discord.widgets.chat.input;
+
+import android.content.Context;
+import c.b.a.d.d;
+import c0.t.n;
+import c0.z.d.m;
+import c0.z.d.o;
+import com.discord.R;
+import com.discord.utilities.drawable.DrawableCompat;
+import com.lytefast.flexinput.fragment.FlexInputFragment;
+import java.util.List;
+import java.util.Objects;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetChatInputAttachments.kt */
+public final class WidgetChatInputAttachments$configureFlexInputContentPages$1 extends o implements Function0<Unit> {
+    public final /* synthetic */ boolean $canCreateThread;
+    public final /* synthetic */ WidgetChatInputAttachments this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetChatInputAttachments$configureFlexInputContentPages$1(WidgetChatInputAttachments widgetChatInputAttachments, boolean z2) {
+        super(0);
+        this.this$0 = widgetChatInputAttachments;
+        this.$canCreateThread = z2;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo17invoke() {
+        Context requireContext = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).requireContext();
+        m.checkNotNullExpressionValue(requireContext, "flexInputFragment.requireContext()");
+        List mutableListOf = n.mutableListOf(new WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$1(requireContext, DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.ic_flex_input_image, 0, 2, (Object) null), R.string.attachment_media), new WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$2(requireContext, DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.ic_flex_input_file, 0, 2, (Object) null), R.string.attachment_files), new WidgetChatInputAttachments$configureFlexInputContentPages$1$pageArray$3(requireContext, DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.ic_flex_input_add_a_photo, 0, 2, (Object) null), R.string.camera));
+        if (this.$canCreateThread) {
+            mutableListOf.add(new WidgetChatInputAttachments$configureFlexInputContentPages$1$page$1(requireContext, DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.ic_flex_input_create_thread, 0, 2, (Object) null), R.string.create_thread));
+        }
+        FlexInputFragment access$getFlexInputFragment$p = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0);
+        Object[] array = mutableListOf.toArray(new d.a[0]);
+        Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
+        d.a[] aVarArr = (d.a[]) array;
+        Objects.requireNonNull(access$getFlexInputFragment$p);
+        m.checkNotNullParameter(aVarArr, "pageSuppliers");
+        access$getFlexInputFragment$p.q = aVarArr;
+        for (Function0<Unit> function0 : access$getFlexInputFragment$p.f2923w) {
+            function0.mo17invoke();
+        }
+        access$getFlexInputFragment$p.f2923w.clear();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java
index cc5af9091c..26b617c552 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java
@@ -1,65 +1,39 @@
 package com.discord.widgets.chat.input;
 
-import android.content.Context;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
-import c.b.a.d.d;
-import c0.t.n;
 import c0.z.d.m;
 import c0.z.d.o;
-import com.discord.R;
 import com.discord.app.AppFragment;
-import com.discord.utilities.drawable.DrawableCompat;
+import com.lytefast.flexinput.R;
 import com.lytefast.flexinput.adapters.AttachmentPreviewAdapter;
 import com.lytefast.flexinput.fragment.FlexInputFragment;
 import com.lytefast.flexinput.managers.FileManager;
 import com.lytefast.flexinput.model.Attachment;
-import java.util.List;
 import java.util.Objects;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetChatInputAttachments.kt */
 public final class WidgetChatInputAttachments$configureFlexInputFragment$1 extends o implements Function0<Unit> {
-    public final /* synthetic */ boolean $canCreateThread;
     public final /* synthetic */ AppFragment $fragment;
     public final /* synthetic */ WidgetChatInputAttachments this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAttachments$configureFlexInputFragment$1(WidgetChatInputAttachments widgetChatInputAttachments, boolean z2, AppFragment appFragment) {
+    public WidgetChatInputAttachments$configureFlexInputFragment$1(WidgetChatInputAttachments widgetChatInputAttachments, AppFragment appFragment) {
         super(0);
         this.this$0 = widgetChatInputAttachments;
-        this.$canCreateThread = z2;
         this.$fragment = appFragment;
     }
 
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
+        this.this$0.configureFlexInputContentPages(false);
         FlexInputFragment access$getFlexInputFragment$p = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0);
-        Context requireContext = access$getFlexInputFragment$p.requireContext();
-        m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        Context requireContext2 = access$getFlexInputFragment$p.requireContext();
-        m.checkNotNullExpressionValue(requireContext2, "requireContext()");
-        Context requireContext3 = access$getFlexInputFragment$p.requireContext();
-        m.checkNotNullExpressionValue(requireContext3, "requireContext()");
-        List mutableListOf = n.mutableListOf(new WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$1(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.ic_flex_input_image, 0, 2, (Object) null), R.string.attachment_media), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$2(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext2, (int) R.attr.ic_flex_input_file, 0, 2, (Object) null), R.string.attachment_files), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$pageArray$3(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext3, (int) R.attr.ic_flex_input_add_a_photo, 0, 2, (Object) null), R.string.camera));
-        if (this.$canCreateThread) {
-            Context requireContext4 = access$getFlexInputFragment$p.requireContext();
-            m.checkNotNullExpressionValue(requireContext4, "requireContext()");
-            mutableListOf.add(new WidgetChatInputAttachments$configureFlexInputFragment$1$1$page$1(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext4, (int) R.attr.ic_flex_input_create_thread, 0, 2, (Object) null), R.string.create_thread));
-        }
-        Object[] array = mutableListOf.toArray(new d.a[0]);
-        Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
-        d.a[] aVarArr = (d.a[]) array;
-        m.checkNotNullParameter(aVarArr, "pageSuppliers");
-        access$getFlexInputFragment$p.q = aVarArr;
-        for (Function0<Unit> function0 : access$getFlexInputFragment$p.f2925w) {
-            function0.mo17invoke();
-        }
-        access$getFlexInputFragment$p.f2925w.clear();
         FileManager fileManager = this.$fragment.getFileManager();
+        Objects.requireNonNull(access$getFlexInputFragment$p);
         m.checkNotNullParameter(fileManager, "<set-?>");
         access$getFlexInputFragment$p.o = fileManager;
         access$getFlexInputFragment$p.m = new WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1(this);
@@ -80,7 +54,7 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1 exten
         m.checkNotNullExpressionValue(childFragmentManager, "fragment.childFragmentManager");
         Fragment access$createAndConfigureExpressionFragment = WidgetChatInputAttachments.access$createAndConfigureExpressionFragment(widgetChatInputAttachments, childFragmentManager, WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).l());
         if (access$createAndConfigureExpressionFragment != null) {
-            access$getFlexInputFragment$p.getChildFragmentManager().beginTransaction().replace(com.lytefast.flexinput.R.e.expression_tray_container, access$createAndConfigureExpressionFragment, access$createAndConfigureExpressionFragment.getClass().getSimpleName()).commit();
+            access$getFlexInputFragment$p.getChildFragmentManager().beginTransaction().replace(R.e.expression_tray_container, access$createAndConfigureExpressionFragment, access$createAndConfigureExpressionFragment.getClass().getSimpleName()).commit();
             AppCompatImageButton appCompatImageButton = access$getFlexInputFragment$p.j().i;
             m.checkNotNullExpressionValue(appCompatImageButton, "binding.expressionBtn");
             appCompatImageButton.setVisibility(0);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.java
index 30f819180c..4bc6da8736 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.java
@@ -12,7 +12,7 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$2<R> im
 
     @Override // rx.functions.Func0, java.util.concurrent.Callable
     public final Boolean call() {
-        FlexInputViewModel flexInputViewModel = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).f2924r;
+        FlexInputViewModel flexInputViewModel = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).f2922r;
         Boolean valueOf = flexInputViewModel != null ? Boolean.valueOf(flexInputViewModel.hideExpressionTray()) : null;
         return valueOf != null ? valueOf : Boolean.FALSE;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.java
index 234ccf0ca6..48cb99dd7c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.java
@@ -17,7 +17,7 @@ public final class WidgetChatInputAttachments$createAndConfigureExpressionFragme
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
-        FlexInputViewModel flexInputViewModel = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).f2924r;
+        FlexInputViewModel flexInputViewModel = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.hideExpressionTray();
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.java
index 28e270d251..bfbe70693f 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.java
@@ -22,7 +22,7 @@ public final class WidgetChatInputAttachments$createAndConfigureExpressionFragme
         m.checkNotNullExpressionValue(chatInputText, "emoji.chatInputText");
         Objects.requireNonNull(access$getFlexInputFragment$p);
         m.checkNotNullParameter(chatInputText, "emojiText");
-        FlexInputViewModel flexInputViewModel = access$getFlexInputFragment$p.f2924r;
+        FlexInputViewModel flexInputViewModel = access$getFlexInputFragment$p.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onInputTextAppended(chatInputText + ' ');
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1.java
index feecd34849..11b1ab928f 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1.java
@@ -15,7 +15,7 @@ public final class WidgetChatInputAttachments$createAndConfigureExpressionFragme
     @Override // com.discord.widgets.chat.input.sticker.StickerPickerListener
     public void onStickerPicked(Sticker sticker) {
         m.checkNotNullParameter(sticker, "sticker");
-        FlexInputViewModel flexInputViewModel = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).f2924r;
+        FlexInputViewModel flexInputViewModel = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.hideExpressionTray();
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
index e643264c6b..5ab1e535de 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
@@ -50,9 +50,9 @@ public final class WidgetChatInputAttachments$createPreviewAdapter$1 extends o i
         public void registerSelectionCoordinatorInternal(SelectionCoordinator<T, ?> selectionCoordinator) {
             m.checkNotNullParameter(selectionCoordinator, "selectionCoordinator");
             super.registerSelectionCoordinatorInternal(selectionCoordinator);
-            WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 = new WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1(this, selectionCoordinator.f2928c);
+            WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 = new WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1(this, selectionCoordinator.f2926c);
             m.checkNotNullParameter(widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1, "<set-?>");
-            selectionCoordinator.f2928c = widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;
+            selectionCoordinator.f2926c = widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
index 5b474fe42d..69eae6a3fd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
@@ -135,9 +135,13 @@ public final class WidgetChatInputAttachments {
         this.flexInputFragment.i(new WidgetChatInputAttachments$addExternalAttachment$1(this, attachment));
     }
 
-    public final void configureFlexInputFragment(AppFragment appFragment, boolean z2) {
+    public final void configureFlexInputContentPages(boolean z2) {
+        this.flexInputFragment.i(new WidgetChatInputAttachments$configureFlexInputContentPages$1(this, z2));
+    }
+
+    public final void configureFlexInputFragment(AppFragment appFragment) {
         m.checkNotNullParameter(appFragment, "fragment");
-        this.flexInputFragment.i(new WidgetChatInputAttachments$configureFlexInputFragment$1(this, z2, appFragment));
+        this.flexInputFragment.i(new WidgetChatInputAttachments$configureFlexInputFragment$1(this, appFragment));
         appFragment.setOnBackPressed(new WidgetChatInputAttachments$configureFlexInputFragment$2(this), 1);
     }
 
@@ -150,6 +154,6 @@ public final class WidgetChatInputAttachments {
     }
 
     public final void setViewModel(FlexInputViewModel flexInputViewModel) {
-        this.flexInputFragment.f2924r = flexInputViewModel;
+        this.flexInputFragment.f2922r = flexInputViewModel;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java
index 9166fba83a..f9f87240bd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java
@@ -43,9 +43,9 @@ public final class WidgetChatInputEditText {
         m.checkNotNullParameter(messageDraftsRepo, "messageDraftsRepo");
         this.editText = flexEditText;
         this.messageDraftsRepo = messageDraftsRepo;
-        BehaviorSubject k0 = BehaviorSubject.k0(Boolean.TRUE);
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(true)");
-        this.emptyTextSubject = k0;
+        BehaviorSubject l0 = BehaviorSubject.l0(Boolean.TRUE);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(true)");
+        this.emptyTextSubject = l0;
         setOnTextChangedListener();
         setSoftwareKeyboardSendBehavior();
         setHardwareKeyboardSendBehavior();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java
index c08f5e2f53..50e5d3c840 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java
@@ -17,7 +17,7 @@ public final class AutocompleteExtensionsKt {
         for (IntRange intRange : u.sortedWith(map.keySet(), new AutocompleteExtensionsKt$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1())) {
             Autocompletable autocompletable = (Autocompletable) map.get(intRange);
             if (autocompletable != null) {
-                if (intRange.getFirst() > str2.length()) {
+                if (intRange.getFirst() > str2.length() || intRange.getLast() > str2.length()) {
                     AppLog appLog = AppLog.g;
                     StringBuilder O = a.O("Invalid mention position to insert ");
                     O.append(autocompletable.getInputReplacement());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java
index 95c9dc67e2..dea8498fcb 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java
@@ -340,15 +340,15 @@ public final class AutocompleteViewModel extends AppViewModel<ViewState> {
         private final Observable<StoreState> observeStores(Long l, StoreApplicationCommands storeApplicationCommands, StoreApplicationCommandFrecency storeApplicationCommandFrecency) {
             Observable observable;
             if (l != null) {
-                observable = StoreStream.Companion.getChannels().observeChannel(l.longValue()).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                observable = StoreStream.Companion.getChannels().observeChannel(l.longValue()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
                 m.checkNotNullExpressionValue(observable, "filter { it != null }.map { it!! }");
             } else {
-                observable = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                observable = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
                 m.checkNotNullExpressionValue(observable, "filter { it != null }.map { it!! }");
             }
-            Observable<StoreState> X = observable.X(new AutocompleteViewModel$Companion$observeStores$1(storeApplicationCommands, storeApplicationCommandFrecency));
-            m.checkNotNullExpressionValue(X, "inputChannel.switchMap {…      )\n        }\n      }");
-            return X;
+            Observable<StoreState> Y = observable.Y(new AutocompleteViewModel$Companion$observeStores$1(storeApplicationCommands, storeApplicationCommandFrecency));
+            m.checkNotNullExpressionValue(Y, "inputChannel.switchMap {…      )\n        }\n      }");
+            return Y;
         }
     }
 
@@ -802,44 +802,44 @@ public final class AutocompleteViewModel extends AppViewModel<ViewState> {
         this.commandOptionErrorColor = i3;
         this.emojiAutocompleteUpsellEnabled = EmojiAutocompletePremiumUpsellFeatureFlag.Companion.getINSTANCE().isEnabled();
         this.logEmojiAutocompleteUpsellViewed = true;
-        BehaviorSubject<MentionInputModel> j0 = BehaviorSubject.j0();
-        this.inputMentionModelSubject = j0;
-        BehaviorSubject<AutocompleteInputSelectionModel> j02 = BehaviorSubject.j0();
-        this.autocompleteInputSelectionModelSubject = j02;
-        BehaviorSubject<SelectionState> j03 = BehaviorSubject.j0();
-        this.inputSelectionSubject = j03;
-        this.editTextAction = BehaviorSubject.j0();
-        this.events = BehaviorSubject.j0();
+        BehaviorSubject<MentionInputModel> k0 = BehaviorSubject.k0();
+        this.inputMentionModelSubject = k0;
+        BehaviorSubject<AutocompleteInputSelectionModel> k02 = BehaviorSubject.k0();
+        this.autocompleteInputSelectionModelSubject = k02;
+        BehaviorSubject<SelectionState> k03 = BehaviorSubject.k0();
+        this.inputSelectionSubject = k03;
+        this.editTextAction = BehaviorSubject.k0();
+        this.events = BehaviorSubject.k0();
         this.inputState = new InputState(null, null, null, null, null, 31, null);
-        Observable r2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).r(AnonymousClass1.INSTANCE);
-        m.checkNotNullExpressionValue(r2, "storeObservable\n        …ore Error\", it)\n        }");
-        ObservableExtensionsKt.appSubscribe$default(r2, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
-        Observable<SelectionState> q = j03.q();
-        m.checkNotNullExpressionValue(j0, "inputMentionModelSubject");
-        Observable j = Observable.j(q, ObservableExtensionsKt.computationLatest(j0), new AnonymousClass3(this));
+        Observable s = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).s(AnonymousClass1.INSTANCE);
+        m.checkNotNullExpressionValue(s, "storeObservable\n        …ore Error\", it)\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable<SelectionState> q = k03.q();
+        m.checkNotNullExpressionValue(k0, "inputMentionModelSubject");
+        Observable j = Observable.j(q, ObservableExtensionsKt.computationLatest(k0), new AnonymousClass3(this));
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…inputModel)\n      }\n    }");
         ObservableExtensionsKt$filterNull$1 observableExtensionsKt$filterNull$1 = ObservableExtensionsKt$filterNull$1.INSTANCE;
-        Observable w2 = j.w(observableExtensionsKt$filterNull$1);
+        Observable x2 = j.x(observableExtensionsKt$filterNull$1);
         ObservableExtensionsKt$filterNull$2 observableExtensionsKt$filterNull$2 = ObservableExtensionsKt$filterNull$2.INSTANCE;
-        Observable E = w2.E(observableExtensionsKt$filterNull$2);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable r3 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(E), this, null, 2, null).r(AnonymousClass4.INSTANCE);
-        m.checkNotNullExpressionValue(r3, "Observable.combineLatest…del Error\", it)\n        }");
-        ObservableExtensionsKt.appSubscribe$default(r3, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass5(this), 62, (Object) null);
-        m.checkNotNullExpressionValue(j02, "autocompleteInputSelectionModelSubject");
+        Observable F = x2.F(observableExtensionsKt$filterNull$2);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable s2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(F), this, null, 2, null).s(AnonymousClass4.INSTANCE);
+        m.checkNotNullExpressionValue(s2, "Observable.combineLatest…del Error\", it)\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s2, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass5(this), 62, (Object) null);
+        m.checkNotNullExpressionValue(k02, "autocompleteInputSelectionModelSubject");
         TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-        Observable r4 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(j02, 100, timeUnit)), this, null, 2, null).r(AnonymousClass6.INSTANCE);
-        m.checkNotNullExpressionValue(r4, "autocompleteInputSelecti…del Error\", it)\n        }");
-        ObservableExtensionsKt.appSubscribe$default(r4, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass7(this), 62, (Object) null);
-        m.checkNotNullExpressionValue(j02, "autocompleteInputSelectionModelSubject");
-        Observable q2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(j02), this, null, 2, null).r(AnonymousClass8.INSTANCE).E(AnonymousClass9.INSTANCE).q();
+        Observable s3 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(k02, 100, timeUnit)), this, null, 2, null).s(AnonymousClass6.INSTANCE);
+        m.checkNotNullExpressionValue(s3, "autocompleteInputSelecti…del Error\", it)\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s3, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass7(this), 62, (Object) null);
+        m.checkNotNullExpressionValue(k02, "autocompleteInputSelectionModelSubject");
+        Observable q2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(k02), this, null, 2, null).s(AnonymousClass8.INSTANCE).F(AnonymousClass9.INSTANCE).q();
         m.checkNotNullExpressionValue(q2, "autocompleteInputSelecti…  .distinctUntilChanged()");
-        Observable E2 = q2.w(observableExtensionsKt$filterNull$1).E(observableExtensionsKt$filterNull$2);
-        m.checkNotNullExpressionValue(E2, "filter { it != null }.map { it!! }");
-        Observable o = E2.s(new AnonymousClass10(this)).o(500, timeUnit);
+        Observable F2 = q2.x(observableExtensionsKt$filterNull$1).F(observableExtensionsKt$filterNull$2);
+        m.checkNotNullExpressionValue(F2, "filter { it != null }.map { it!! }");
+        Observable o = F2.t(new AnonymousClass10(this)).o(500, timeUnit);
         m.checkNotNullExpressionValue(o, "autocompleteInputSelecti…0, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(o, AutocompleteViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass11(this), 62, (Object) null);
-        Observable q3 = j02.E(AnonymousClass12.INSTANCE).q();
+        Observable q3 = k02.F(AnonymousClass12.INSTANCE).q();
         m.checkNotNullExpressionValue(q3, "autocompleteInputSelecti… }.distinctUntilChanged()");
         StoreGuilds.Actions.requestMembers(this, q3, true);
         this.lastJumpedSequenceId = -1;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java
index d949a88ed7..d42889f431 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java
@@ -42,10 +42,10 @@ public final class ChatInputAutocompletables {
     }
 
     public final Observable<Map<LeadingIdentifier, Set<Autocompletable>>> observeChannelAutocompletables(long j) {
-        Observable<R> E = StoreStream.Companion.getChannels().observeChannel(j).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable X = E.X(ChatInputAutocompletables$observeChannelAutocompletables$1.INSTANCE);
-        m.checkNotNullExpressionValue(X, "StoreStream.getChannels(…e>>\n          }\n        }");
-        return ObservableExtensionsKt.computationLatest(X);
+        Observable<R> F = StoreStream.Companion.getChannels().observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Y = F.Y(ChatInputAutocompletables$observeChannelAutocompletables$1.INSTANCE);
+        m.checkNotNullExpressionValue(Y, "StoreStream.getChannels(…e>>\n          }\n        }");
+        return ObservableExtensionsKt.computationLatest(Y);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java
index 75e844ba66..7f73719e9d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java
@@ -304,7 +304,7 @@ public final class InputAutocomplete {
         this.stickersAdapter = widgetChatInputAutocompleteStickerAdapter;
         recyclerView3.setLayoutManager(new SelfHealingLinearLayoutManager(recyclerView3, widgetChatInputAutocompleteStickerAdapter, 0, false, 8, null));
         recyclerView3.setAdapter(widgetChatInputAutocompleteStickerAdapter);
-        RecyclerView recyclerView4 = widgetChatInputApplicationCommandsBinding.f2166c;
+        RecyclerView recyclerView4 = widgetChatInputApplicationCommandsBinding.f2165c;
         m.checkNotNullExpressionValue(recyclerView4, "selectedApplicationComma…plicationCommandsRecycler");
         SelectedApplicationCommandAdapter selectedApplicationCommandAdapter = new SelectedApplicationCommandAdapter(recyclerView4, new AnonymousClass6(this));
         this.selectedApplicationCommandAdapter = selectedApplicationCommandAdapter;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
index e44c537ed9..5334389bf3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
@@ -174,10 +174,10 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         m.checkNotNullExpressionValue(resources, "binding.root.resources");
         String descriptionText = StoreApplicationCommandsKt.getDescriptionText(command, resources);
         if (descriptionText != null && (!t.isBlank(descriptionText))) {
-            TextView textView2 = this.binding.f2167c;
+            TextView textView2 = this.binding.f2166c;
             m.checkNotNullExpressionValue(textView2, "binding.chatInputItemDescription");
             textView2.setVisibility(0);
-            TextView textView3 = this.binding.f2167c;
+            TextView textView3 = this.binding.f2166c;
             m.checkNotNullExpressionValue(textView3, "binding.chatInputItemDescription");
             textView3.setText(w.trim(descriptionText).toString());
         }
@@ -199,7 +199,7 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
             textView5.setText(upperCase);
             ConstraintLayout constraintLayout4 = this.binding.a;
             m.checkNotNullExpressionValue(constraintLayout4, "binding.root");
-            TextView textView6 = this.binding.f2167c;
+            TextView textView6 = this.binding.f2166c;
             m.checkNotNullExpressionValue(textView6, "binding.chatInputItemDescription");
             CharSequence j = b.j(constraintLayout4, R.string.command_accessibility_desc_command_item, new Object[]{command.getName(), textView6.getText(), application.getName()}, null, 4);
             ConstraintLayout constraintLayout5 = this.binding.a;
@@ -382,10 +382,10 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         m.checkNotNullExpressionValue(textView3, "binding.chatInputItemName");
         textView3.setText((CharSequence) null);
         this.binding.e.setTextColor(this.defaultItemTextColor);
-        TextView textView4 = this.binding.f2167c;
+        TextView textView4 = this.binding.f2166c;
         m.checkNotNullExpressionValue(textView4, "binding.chatInputItemDescription");
         textView4.setText((CharSequence) null);
-        TextView textView5 = this.binding.f2167c;
+        TextView textView5 = this.binding.f2166c;
         m.checkNotNullExpressionValue(textView5, "binding.chatInputItemDescription");
         textView5.setVisibility(8);
         SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
index 2627a08291..23bd7563dd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
@@ -50,7 +50,7 @@ public final class CommandHeaderViewHolder extends RecyclerView.ViewHolder imple
             if (bot == null || (str = bot.r()) == null) {
                 str = applicationPlaceholder.getApplication().getName();
             }
-            TextView textView = this.binding.f2170c;
+            TextView textView = this.binding.f2169c;
             m.checkNotNullExpressionValue(textView, "binding.chatInputApplicationName");
             textView.setText(str);
             ImageView imageView = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
index b4028ba0b2..8fbb6d1106 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
@@ -51,7 +51,7 @@ public final class EmojiAutocompleteUpsellViewHolder extends RecyclerView.ViewHo
         m.checkNotNullExpressionValue(string, "resources.getString(R.st…utocomplete_emoji_upsell)");
         String quantityString = resources.getQuantityString(R.plurals.autocomplete_emoji_upsell_count, lockedTotal);
         m.checkNotNullExpressionValue(quantityString, "resources.getQuantityStr…moji_upsell_count, count)");
-        TextView textView = this.binding.f2171c;
+        TextView textView = this.binding.f2170c;
         m.checkNotNullExpressionValue(textView, "binding.chatInputEmojiUpsellText");
         b.o(textView, string, new Object[]{b.l(quantityString, new Object[]{Integer.valueOf(lockedTotal)}, null, 2)}, null, 4);
         List<Emoji> lockedFirstThree = emojiUpsellPlaceholder.getLockedFirstThree();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java
index 7dc2be7e5c..50ada69f30 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java
@@ -344,7 +344,7 @@ public final class AutocompleteCommandUtils {
     public final String getCommandPrefix(CharSequence charSequence) {
         List<String> groupValues;
         m.checkNotNullParameter(charSequence, "$this$getCommandPrefix");
-        MatchResult find$default = Regex.find$default(new Regex("^(/([\\p{L}0-9-]+\\s*){0,3})"), charSequence, 0, 2, null);
+        MatchResult find$default = Regex.find$default(new Regex("^(/([\\p{L}0-9-_]+\\s*){0,3})"), charSequence, 0, 2, null);
         if (find$default == null || (groupValues = find$default.getGroupValues()) == null) {
             return null;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
index 3e1c16cf05..f0f738f337 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
@@ -176,9 +176,9 @@ public final class UserAutocompletableSource {
         long f = channel.f();
         if (UserMentionableSourceKt.access$isGuildChannelOrThread(channel)) {
             Observable computationLatest = ObservableExtensionsKt.computationLatest(this.storeUsers.observeMeId());
-            Observable<R> E = this.storeGuilds.observeGuild(f).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable q = E.E(UserAutocompletableSource$observeUserAutocompletables$1.INSTANCE).q();
+            Observable<R> F = this.storeGuilds.observeGuild(f).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable q = F.F(UserAutocompletableSource$observeUserAutocompletables$1.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "storeGuilds.observeGuild… }.distinctUntilChanged()");
             Observable computationLatest2 = ObservableExtensionsKt.computationLatest(q);
             Observable computationLatest3 = ObservableExtensionsKt.computationLatest(this.storeGuilds.observeRoles(f));
@@ -194,7 +194,7 @@ public final class UserAutocompletableSource {
             m.checkNotNullExpressionValue(q3, "storeChannels.observeCha…d).distinctUntilChanged()");
             observable = Observable.d(computationLatest, computationLatest2, computationLatest3, computationLatest4, computationLatest5, computationLatest6, computationLatest7, ObservableExtensionsKt.computationLatest(q3), new UserAutocompletableSource$observeUserAutocompletables$2(this, channel));
         } else {
-            observable = UserMentionableSourceKt.access$isDmOrGroupDm(channel) ? Observable.j(Observable.z(ChannelUtils.g(channel)).E(UserAutocompletableSource$observeUserAutocompletables$3.INSTANCE).e0(), this.storeUsers.observeMeId(), UserAutocompletableSource$observeUserAutocompletables$4.INSTANCE).X(new UserAutocompletableSource$observeUserAutocompletables$5(this, channel)) : new j(h0.emptyMap());
+            observable = UserMentionableSourceKt.access$isDmOrGroupDm(channel) ? Observable.j(Observable.A(ChannelUtils.g(channel)).F(UserAutocompletableSource$observeUserAutocompletables$3.INSTANCE).f0(), this.storeUsers.observeMeId(), UserAutocompletableSource$observeUserAutocompletables$4.INSTANCE).Y(new UserAutocompletableSource$observeUserAutocompletables$5(this, channel)) : new j(h0.emptyMap());
         }
         m.checkNotNullExpressionValue(observable, "when {\n      // Guild Ch…vable.just(mapOf())\n    }");
         Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> q4 = ObservableExtensionsKt.computationLatest(observable).q();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
index f446cdda27..1865e40487 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
@@ -348,9 +348,9 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
                 m.checkNotNullExpressionValue(jVar2, "Observable.just(\n       …pe.guildId)\n            )");
                 return jVar2;
             } else {
-                Observable<R> E = storeChannelsSelected.observeResolvedSelectedChannel().E(EmojiPickerViewModel$Companion$getEmojiContextObservable$1.INSTANCE);
-                m.checkNotNullExpressionValue(E, "storeChannelsSelected.ob…      }\n                }");
-                return E;
+                Observable<R> F = storeChannelsSelected.observeResolvedSelectedChannel().F(EmojiPickerViewModel$Companion$getEmojiContextObservable$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "storeChannelsSelected.ob…      }\n                }");
+                return F;
             }
         }
 
@@ -373,9 +373,9 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(storeGuildsSorted, "storeGuildsSorted");
             m.checkNotNullParameter(storeUserSettings, "storeUserSettings");
             m.checkNotNullParameter(storeAccessibility, "storeAccessibility");
-            Observable<R> X = observable.X(new EmojiPickerViewModel$Companion$observeStoreState$1(storeEmoji, storeGuildsSorted, behaviorSubject, storeUserSettings, storeAccessibility, behaviorSubject2));
-            m.checkNotNullExpressionValue(X, "emojiContextObservable.s…  )\n          }\n        }");
-            return X;
+            Observable<R> Y = observable.Y(new EmojiPickerViewModel$Companion$observeStoreState$1(storeEmoji, storeGuildsSorted, behaviorSubject, storeUserSettings, storeAccessibility, behaviorSubject2));
+            m.checkNotNullExpressionValue(Y, "emojiContextObservable.s…  )\n          }\n        }");
+            return Y;
         }
     }
 
@@ -967,9 +967,9 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
         this.searchSubject = behaviorSubject;
         this.selectedCategoryItemIdSubject = behaviorSubject2;
         this.storeAnalytics = storeAnalytics;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.eventSubject = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -980,13 +980,13 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
         BehaviorSubject behaviorSubject4;
         Observable observable2;
         if ((i & 4) != 0) {
-            behaviorSubject3 = BehaviorSubject.k0("");
+            behaviorSubject3 = BehaviorSubject.l0("");
             m.checkNotNullExpressionValue(behaviorSubject3, "BehaviorSubject.create(\"\")");
         } else {
             behaviorSubject3 = behaviorSubject;
         }
         if ((i & 8) != 0) {
-            behaviorSubject4 = BehaviorSubject.k0(Long.valueOf(EmojiCategoryItem.Companion.mapEmojiCategoryToItemId(EmojiCategory.FAVORITE)));
+            behaviorSubject4 = BehaviorSubject.l0(Long.valueOf(EmojiCategoryItem.Companion.mapEmojiCategoryToItemId(EmojiCategory.FAVORITE)));
             m.checkNotNullExpressionValue(behaviorSubject4, "BehaviorSubject.create(\n…ojiCategory.FAVORITE)\n  )");
         } else {
             behaviorSubject4 = behaviorSubject2;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
index cf923af4e8..1b8639ca76 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
@@ -74,7 +74,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
     private EmojiCategoryAdapter categoryAdapter;
     private LinearLayoutManager categoryLayoutManager;
     private WidgetEmojiAdapter emojiAdapter;
-    private final PublishSubject<Unit> emojiCategoryScrollSubject = PublishSubject.j0();
+    private final PublishSubject<Unit> emojiCategoryScrollSubject = PublishSubject.k0();
     private EmojiPickerListener emojiPickerListener;
     private EmojiPickerMode emojiPickerMode;
     private boolean isNextCategoryScrollSmooth = true;
@@ -249,7 +249,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
         }
         if (viewState != null) {
             if (viewState instanceof EmojiPickerViewModel.ViewState.EmptySearch) {
-                AppViewFlipper appViewFlipper = getBinding().f2225c;
+                AppViewFlipper appViewFlipper = getBinding().f2224c;
                 m.checkNotNullExpressionValue(appViewFlipper, "binding.chatInputEmojiPickerViewFlipper");
                 appViewFlipper.setDisplayedChild(1);
                 setEmojiPickerBottomBarVisible(false);
@@ -257,7 +257,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
             } else if (viewState instanceof EmojiPickerViewModel.ViewState.Results) {
                 EmojiPickerViewModel.ViewState.Results results = (EmojiPickerViewModel.ViewState.Results) viewState;
                 setEmojiPickerBottomBarVisible(results.getShowBottomBar());
-                AppViewFlipper appViewFlipper2 = getBinding().f2225c;
+                AppViewFlipper appViewFlipper2 = getBinding().f2224c;
                 m.checkNotNullExpressionValue(appViewFlipper2, "binding.chatInputEmojiPickerViewFlipper");
                 appViewFlipper2.setDisplayedChild(0);
                 WidgetEmojiAdapter widgetEmojiAdapter = this.emojiAdapter;
@@ -624,9 +624,9 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
 
     private final void subscribeToCategoryRecyclerScrolls() {
         PublishSubject<Unit> publishSubject = this.emojiCategoryScrollSubject;
-        Observable g02 = Observable.g0(new r(publishSubject.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
-        m.checkNotNullExpressionValue(g02, "emojiCategoryScrollSubje…, TimeUnit.MILLISECONDS))");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(g02, this, null, 2, null), WidgetEmojiPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1(this), 62, (Object) null);
+        Observable h02 = Observable.h0(new r(publishSubject.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
+        m.checkNotNullExpressionValue(h02, "emojiCategoryScrollSubje…, TimeUnit.MILLISECONDS))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(h02, this, null, 2, null), WidgetEmojiPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1(this), 62, (Object) null);
     }
 
     public final void clearSearchInput() {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java
index e0d38a4167..84e41554c2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java
@@ -10,7 +10,7 @@ import rx.subjects.PublishSubject;
 public final class ExpressionPickerEventBus {
     public static final Companion Companion = new Companion(null);
     private static final Lazy INSTANCE$delegate = g.lazy(ExpressionPickerEventBus$Companion$INSTANCE$2.INSTANCE);
-    private final PublishSubject<ExpressionPickerEvent> expressionPickerEventSubject = PublishSubject.j0();
+    private final PublishSubject<ExpressionPickerEvent> expressionPickerEventSubject = PublishSubject.k0();
 
     /* compiled from: ExpressionPickerEventBus.kt */
     public static final class Companion {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java
index d5dee8f970..07c19123a5 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java
@@ -593,7 +593,7 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
         this.storeUser = storeUser;
         this.storeGuildStickers = storeGuildStickers;
         this.storeGuilds = storeGuilds;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), ExpressionTrayViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable2, this, null, 2, null), ExpressionTrayViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java
index 1b6e5570b0..ff8982f89c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java
@@ -140,9 +140,9 @@ public abstract class WidgetExpressionPickerAdapter extends MGRecyclerAdapterSim
 
     private final void setupScrollObservables() {
         Observable n = Observable.n(new WidgetExpressionPickerAdapter$setupScrollObservables$1(this), Emitter.BackpressureMode.LATEST);
-        Observable g02 = Observable.g0(new r(n.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
-        m.checkNotNullExpressionValue(g02, "Observable\n        .crea…, TimeUnit.MILLISECONDS))");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(g02), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetExpressionPickerAdapter$setupScrollObservables$2(this), 62, (Object) null);
+        Observable h02 = Observable.h0(new r(n.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
+        m.checkNotNullExpressionValue(h02, "Observable\n        .crea…, TimeUnit.MILLISECONDS))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(h02), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetExpressionPickerAdapter$setupScrollObservables$2(this), 62, (Object) null);
         RecyclerView.OnScrollListener onScrollListener = this.onScrollListener;
         if (onScrollListener != null) {
             getRecycler().addOnScrollListener(onScrollListener);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java
index 72166265b9..d7f8f95340 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java
@@ -14,6 +14,6 @@ public final class WidgetExpressionTray$setWindowInsetsListeners$2 implements On
 
     @Override // androidx.core.view.OnApplyWindowInsetsListener
     public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
-        return ViewCompat.dispatchApplyWindowInsets(WidgetExpressionTray.access$getBinding$p(this.this$0).f2230c, windowInsetsCompat);
+        return ViewCompat.dispatchApplyWindowInsets(WidgetExpressionTray.access$getBinding$p(this.this$0).f2229c, windowInsetsCompat);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
index a27c55d5fd..79fffc7af9 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
@@ -75,7 +75,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
     private final Lazy flexInputViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(AppFlexInputViewModel.class), new WidgetExpressionTray$appActivityViewModels$$inlined$activityViewModels$3(this), new e0(new WidgetExpressionTray$flexInputViewModel$2(this)));
     private WidgetGifPicker gifPickerFragment;
     private boolean gifPickerInitialized;
-    private final BehaviorSubject<Boolean> isAtInitialScrollPositionSubject = BehaviorSubject.k0(Boolean.TRUE);
+    private final BehaviorSubject<Boolean> isAtInitialScrollPositionSubject = BehaviorSubject.l0(Boolean.TRUE);
     private OnBackspacePressedListener onBackspacePressedListener;
     private Function0<Unit> onEmojiSearchOpenedListener;
     private WidgetStickerPicker stickerPickerFragment;
@@ -135,9 +135,9 @@ public final class WidgetExpressionTray extends AppFragment implements c {
     }
 
     static {
-        BehaviorSubject<Boolean> k0 = BehaviorSubject.k0(Boolean.FALSE);
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(false)");
-        isExpressionTrayActiveSubject = k0;
+        BehaviorSubject<Boolean> l0 = BehaviorSubject.l0(Boolean.FALSE);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(false)");
+        isExpressionTrayActiveSubject = l0;
     }
 
     public WidgetExpressionTray() {
@@ -469,7 +469,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         FragmentContainerView fragmentContainerView4 = getBinding().d;
         m.checkNotNullExpressionValue(fragmentContainerView4, "binding.expressionTrayDetailPage");
         ViewExtensions.setForwardingWindowInsetsListener(fragmentContainerView4);
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2230c, new WidgetExpressionTray$setWindowInsetsListeners$1(this));
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2229c, new WidgetExpressionTray$setWindowInsetsListeners$1(this));
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().h, new WidgetExpressionTray$setWindowInsetsListeners$2(this));
         FrameLayout frameLayout = getBinding().b;
         m.checkNotNullExpressionValue(frameLayout, "binding.expressionTrayContainer");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
index ca76e74fa7..7e1e5ab665 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
@@ -80,9 +80,9 @@ public final class GifCategoryViewModel extends AppViewModel<ViewState> {
             } else {
                 throw new NoWhenBranchMatchedException();
             }
-            Observable<R> E = observable.E(GifCategoryViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "gifsObservable.map { gifs -> StoreState(gifs) }");
-            return E;
+            Observable<R> F = observable.F(GifCategoryViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "gifsObservable.map { gifs -> StoreState(gifs) }");
+            return F;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java
index 5dc94b3a99..ae3ef23467 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java
@@ -63,6 +63,6 @@ public final class GifSearchViewModel$Companion$observeQueryState$2<T, R> implem
 
     public final Observable<? extends GifSearchViewModel.StoreState> call(String str) {
         m.checkNotNullExpressionValue(str, "query");
-        return str.length() == 0 ? new j(new GifSearchViewModel.StoreState.TrendingSearchTermsResults(this.$trendingSearchTerms)) : Observable.j(this.$storeGifPicker.observeGifsForSearchQuery(str).w(AnonymousClass1.INSTANCE), this.$storeGifPicker.observeSuggestedSearchTerms(str), new AnonymousClass2(this, str));
+        return str.length() == 0 ? new j(new GifSearchViewModel.StoreState.TrendingSearchTermsResults(this.$trendingSearchTerms)) : Observable.j(this.$storeGifPicker.observeGifsForSearchQuery(str).x(AnonymousClass1.INSTANCE), this.$storeGifPicker.observeSuggestedSearchTerms(str), new AnonymousClass2(this, str));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
index f621f1cd16..d4e6a59b73 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
@@ -79,16 +79,16 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeQueryState(BehaviorSubject<String> behaviorSubject, StoreAnalytics storeAnalytics, StoreGifPicker storeGifPicker, List<String> list) {
-            Observable<String> q = behaviorSubject.H(a.c()).q();
-            Observable<StoreState> X = Observable.g0(new r(q.i, new LeadingEdgeThrottle(1000, TimeUnit.MILLISECONDS, a.c()))).s(new GifSearchViewModel$Companion$observeQueryState$1(storeAnalytics)).X(new GifSearchViewModel$Companion$observeQueryState$2(list, storeGifPicker));
-            m.checkNotNullExpressionValue(X, "searchSubject\n          …          }\n            }");
-            return X;
+            Observable<String> q = behaviorSubject.I(a.c()).q();
+            Observable<StoreState> Y = Observable.h0(new r(q.i, new LeadingEdgeThrottle(1000, TimeUnit.MILLISECONDS, a.c()))).t(new GifSearchViewModel$Companion$observeQueryState$1(storeAnalytics)).Y(new GifSearchViewModel$Companion$observeQueryState$2(list, storeGifPicker));
+            m.checkNotNullExpressionValue(Y, "searchSubject\n          …          }\n            }");
+            return Y;
         }
 
         private final Observable<StoreState> observeStoreState(BehaviorSubject<String> behaviorSubject, StoreAnalytics storeAnalytics, StoreGifPicker storeGifPicker) {
-            Observable<R> X = storeGifPicker.observeGifTrendingSearchTerms().X(new GifSearchViewModel$Companion$observeStoreState$1(behaviorSubject, storeAnalytics, storeGifPicker));
-            m.checkNotNullExpressionValue(X, "storeGifPicker.observeGi…fPicker, terms)\n        }");
-            return X;
+            Observable<R> Y = storeGifPicker.observeGifTrendingSearchTerms().Y(new GifSearchViewModel$Companion$observeStoreState$1(behaviorSubject, storeAnalytics, storeGifPicker));
+            m.checkNotNullExpressionValue(Y, "storeGifPicker.observeGi…fPicker, terms)\n        }");
+            return Y;
         }
     }
 
@@ -377,7 +377,7 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
         this(context, r0, r1, r2, (i & 16) != 0 ? new MessageManager(context, null, null, null, null, null, null, null, 254, null) : messageManager, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, r0, r2, r1) : observable);
         BehaviorSubject behaviorSubject2;
         if ((i & 2) != 0) {
-            behaviorSubject2 = BehaviorSubject.k0("");
+            behaviorSubject2 = BehaviorSubject.l0("");
             m.checkNotNullExpressionValue(behaviorSubject2, "BehaviorSubject.create(\"\")");
         } else {
             behaviorSubject2 = behaviorSubject;
@@ -406,9 +406,9 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
             boolean z3 = true;
             boolean z4 = arrayList.size() > 0;
             boolean z5 = searchResults.getSuggested().size() > 0;
-            String m0 = this.searchSubject.m0();
-            m.checkNotNullExpressionValue(m0, "searchSubject.value");
-            if (m0.length() <= 0) {
+            String n0 = this.searchSubject.n0();
+            m.checkNotNullExpressionValue(n0, "searchSubject.value");
+            if (n0.length() <= 0) {
                 z3 = false;
             }
             arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, R.string.gif_picker_related_search) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, R.string.gif_picker_enter_search) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, R.string.no_gif_search_results_with_related_search) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, R.string.no_gif_search_results_without_related_search));
@@ -438,7 +438,7 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
     public final void setSearchText(String str) {
         m.checkNotNullParameter(str, "searchText");
         boolean z2 = true;
-        if (!m.areEqual(this.searchSubject.m0(), str)) {
+        if (!m.areEqual(this.searchSubject.n0(), str)) {
             if (str.length() <= 0) {
                 z2 = false;
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java
index d074591f41..b7e822b095 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java
@@ -14,7 +14,7 @@ public final class WidgetGifCategory$setWindowInsetsListeners$2 implements OnApp
 
     @Override // androidx.core.view.OnApplyWindowInsetsListener
     public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
-        ViewCompat.dispatchApplyWindowInsets(WidgetGifCategory.access$getBinding$p(this.this$0).f2240c, windowInsetsCompat);
+        ViewCompat.dispatchApplyWindowInsets(WidgetGifCategory.access$getBinding$p(this.this$0).f2239c, windowInsetsCompat);
         return windowInsetsCompat.consumeSystemWindowInsets();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
index d933a29c4c..05dd29c6c4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
@@ -106,7 +106,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     private final void handleViewState(GifCategoryViewModel.ViewState viewState) {
-        RecyclerView recyclerView = getBinding().f2240c;
+        RecyclerView recyclerView = getBinding().f2239c;
         m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler");
         recyclerView.setVisibility(0);
         GifLoadingView gifLoadingView = getBinding().d;
@@ -134,25 +134,25 @@ public final class WidgetGifCategory extends AppFragment {
 
     private final void setUpGifRecycler(int i) {
         StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(i, 1);
-        RecyclerView recyclerView = getBinding().f2240c;
+        RecyclerView recyclerView = getBinding().f2239c;
         m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler");
         recyclerView.setLayoutManager(staggeredGridLayoutManager);
-        RecyclerView recyclerView2 = getBinding().f2240c;
+        RecyclerView recyclerView2 = getBinding().f2239c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.gifCategoryGifRecycler");
         recyclerView2.setItemAnimator(null);
         int dpToPixels = DimenUtils.dpToPixels(8);
         GifAdapter.Companion companion = GifAdapter.Companion;
-        RecyclerView recyclerView3 = getBinding().f2240c;
+        RecyclerView recyclerView3 = getBinding().f2239c;
         m.checkNotNullExpressionValue(recyclerView3, "binding.gifCategoryGifRecycler");
         this.gifAdapter = new GifAdapter(this, new WidgetGifCategory$setUpGifRecycler$1(this), companion.calculateColumnWidth(recyclerView3, i, dpToPixels), null, null, 24, null);
-        RecyclerView recyclerView4 = getBinding().f2240c;
+        RecyclerView recyclerView4 = getBinding().f2239c;
         m.checkNotNullExpressionValue(recyclerView4, "binding.gifCategoryGifRecycler");
         GifAdapter gifAdapter = this.gifAdapter;
         if (gifAdapter == null) {
             m.throwUninitializedPropertyAccessException("gifAdapter");
         }
         recyclerView4.setAdapter(gifAdapter);
-        getBinding().f2240c.addItemDecoration(new t(dpToPixels, i));
+        getBinding().f2239c.addItemDecoration(new t(dpToPixels, i));
     }
 
     private final void setUpTitle() {
@@ -171,7 +171,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     private final void setWindowInsetsListeners() {
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2240c, WidgetGifCategory$setWindowInsetsListeners$1.INSTANCE);
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2239c, WidgetGifCategory$setWindowInsetsListeners$1.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, new WidgetGifCategory$setWindowInsetsListeners$2(this));
     }
 
@@ -180,7 +180,7 @@ public final class WidgetGifCategory extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         GifAdapter.Companion companion = GifAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f2240c;
+        RecyclerView recyclerView = getBinding().f2239c;
         m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler");
         int calculateColumnCount = companion.calculateColumnCount(recyclerView);
         setUpTitle();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
index 76d095b757..f766787cd3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
@@ -96,7 +96,7 @@ public final class WidgetGifPicker extends AppFragment {
     private final void setWindowInsetsListeners() {
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, WidgetGifPicker$setWindowInsetsListeners$1.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, WidgetGifPicker$setWindowInsetsListeners$2.INSTANCE);
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2241c, new WidgetGifPicker$setWindowInsetsListeners$3(this));
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2240c, new WidgetGifPicker$setWindowInsetsListeners$3(this));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
index 17039a7f8e..48e40f17e2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
@@ -129,7 +129,7 @@ public final class WidgetGifPickerSearch extends AppFragment {
         int calculateColumnCount = companion.calculateColumnCount(recyclerView);
         setUpGifRecycler(calculateColumnCount);
         setupSearchBar();
-        GifLoadingView.updateView$default(getBinding().f2242c, calculateColumnCount, 0, 2, null);
+        GifLoadingView.updateView$default(getBinding().f2241c, calculateColumnCount, 0, 2, null);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java
index 97a5306f61..0383f53653 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java
@@ -128,7 +128,7 @@ public final class StickerPickerViewModel$Companion$observeStoreState$1<T, R> im
         if (channelOrParent == null || (guild = this.$storeGuilds.getGuild(channelOrParent.f())) == null) {
             guild = null;
         }
-        Observable<R> q = this.$storeGuildsSorted.observeOrderedGuilds().E(new AnonymousClass1(guild)).q();
+        Observable<R> q = this.$storeGuildsSorted.observeOrderedGuilds().F(new AnonymousClass1(guild)).q();
         m.checkNotNullExpressionValue(q, "storeGuildsSorted.observ… }.distinctUntilChanged()");
         return ObservableCombineLatestOverloadsKt.combineLatest(q, this.$storeGuildStickers.observeGuildStickers(), this.$storeStickers.observeEnabledStickerPacks(), this.$storeStickers.observeFrequentlyUsedStickerIds(), this.$searchSubject, StoreUserSettings.observeStickerAnimationSettings$default(this.$storeUserSettings, false, 1, null), this.$selectedPackIdSubject, StoreUser.observeMe$default(this.$storeUser, false, 1, null), this.$storeExpressionPickerNavigation.observeSelectedTab(), this.$storePermissions.observePermissionsForAllChannels(), this.$storeSlowMode.observeCooldownSecs(Long.valueOf(resolvedSelectedChannel.getId()), StoreSlowMode.Type.MessageSend.INSTANCE), new AnonymousClass2(channelOrParent));
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
index fc7fb7b894..9b21fae06a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
@@ -168,9 +168,9 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(BehaviorSubject<String> behaviorSubject, BehaviorSubject<Long> behaviorSubject2, StoreGuildsSorted storeGuildsSorted, StoreGuildStickers storeGuildStickers, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds) {
-            Observable<R> X = storeChannelsSelected.observeResolvedSelectedChannel().X(new StickerPickerViewModel$Companion$observeStoreState$1(storeGuilds, storeGuildsSorted, storeGuildStickers, storeStickers, behaviorSubject, storeUserSettings, behaviorSubject2, storeUser, storeExpressionPickerNavigation, storePermissions, storeSlowMode));
-            m.checkNotNullExpressionValue(X, "storeChannelSelected.obs…      )\n        }\n      }");
-            return X;
+            Observable<R> Y = storeChannelsSelected.observeResolvedSelectedChannel().Y(new StickerPickerViewModel$Companion$observeStoreState$1(storeGuilds, storeGuildsSorted, storeGuildStickers, storeStickers, behaviorSubject, storeUserSettings, behaviorSubject2, storeUser, storeExpressionPickerNavigation, storePermissions, storeSlowMode));
+            m.checkNotNullExpressionValue(Y, "storeChannelSelected.obs…      )\n        }\n      }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, BehaviorSubject behaviorSubject, BehaviorSubject behaviorSubject2, StoreGuildsSorted storeGuildsSorted, StoreGuildStickers storeGuildStickers, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, int i, Object obj) {
@@ -850,9 +850,9 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         this.channelSelectedStore = storeChannelsSelected;
         this.permissionStore = storePermissions;
         this.userStore = storeUser;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.eventSubject = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         this.stickerCountToDisplayForStore = 4;
         storeStickers.fetchEnabledStickerDirectory();
         Observable q = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).q();
@@ -866,13 +866,13 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         BehaviorSubject behaviorSubject3;
         BehaviorSubject behaviorSubject4;
         if ((i & 1) != 0) {
-            behaviorSubject3 = BehaviorSubject.k0("");
+            behaviorSubject3 = BehaviorSubject.l0("");
             m.checkNotNullExpressionValue(behaviorSubject3, "BehaviorSubject.create(\"\")");
         } else {
             behaviorSubject3 = behaviorSubject;
         }
         if ((i & 2) != 0) {
-            behaviorSubject4 = BehaviorSubject.k0(null);
+            behaviorSubject4 = BehaviorSubject.l0(null);
             m.checkNotNullExpressionValue(behaviorSubject4, "BehaviorSubject.create(null as Long?)");
         } else {
             behaviorSubject4 = behaviorSubject2;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
index 6f9e8a1548..a87aaa25bc 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
@@ -191,7 +191,7 @@ public final class WidgetStickerPackStoreSheet extends AppBottomSheet {
         RelativeLayout relativeLayout = getBinding().b;
         m.checkNotNullExpressionValue(relativeLayout, "binding.stickerPackStoreSheetContainer");
         relativeLayout.setPadding(relativeLayout.getPaddingLeft(), relativeLayout.getPaddingTop(), relativeLayout.getPaddingRight(), getAdditionalBottomPaddingPx());
-        RecyclerView recyclerView = getBinding().f2457c;
+        RecyclerView recyclerView = getBinding().f2455c;
         m.checkNotNullExpressionValue(recyclerView, "binding.stickerPackStoreSheetRecycler");
         this.adapter = new WidgetStickerAdapter(recyclerView, new WidgetStickerPackStoreSheet$onViewCreated$1(this), new WidgetStickerPackStoreSheet$onViewCreated$2(this), null, this, true, 8, null);
         getViewModel().fetchStickersData();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$initializeSearchBar$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$initializeSearchBar$1.java
index a7af1929e4..9726a2cec7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$initializeSearchBar$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$initializeSearchBar$1.java
@@ -19,7 +19,7 @@ public final class WidgetStickerPicker$initializeSearchBar$1 extends o implement
         if (WidgetStickerPicker.access$getStickerPickerMode$p(this.this$0) == StickerPickerMode.INLINE) {
             WidgetStickerPicker.access$launchBottomSheet(this.this$0);
         } else {
-            WidgetStickerPicker.access$getBinding$p(this.this$0).f2459r.setText("");
+            WidgetStickerPicker.access$getBinding$p(this.this$0).f2457r.setText("");
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
index ec1bb9c15c..cc79c5aaa7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
@@ -80,12 +80,12 @@ public final class WidgetStickerPicker extends AppFragment implements c {
     private final Lazy initialStickerPackId$delegate = g.lazy(new WidgetStickerPicker$initialStickerPackId$2(this));
     private OnBackspacePressedListener onBackspacePressedListener;
     private StickerPickerViewModel.ViewState previousViewState;
-    private final BehaviorSubject<Boolean> recyclerScrollingWithinThresholdSubject = BehaviorSubject.k0(Boolean.TRUE);
+    private final BehaviorSubject<Boolean> recyclerScrollingWithinThresholdSubject = BehaviorSubject.l0(Boolean.TRUE);
     private boolean restoredSearchQueryFromViewModel;
     private Function0<Unit> scrollExpressionPickerToTop = WidgetStickerPicker$scrollExpressionPickerToTop$1.INSTANCE;
     private Function1<? super Boolean, Unit> showSearchBar;
     private WidgetStickerAdapter stickerAdapter;
-    private final PublishSubject<Unit> stickerCategoryScrollSubject = PublishSubject.j0();
+    private final PublishSubject<Unit> stickerCategoryScrollSubject = PublishSubject.k0();
     private StickerPickerListener stickerPickerListener;
     private StickerPickerMode stickerPickerMode;
     private final Lazy viewModelForInline$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(StickerPickerInlineViewModel.class), new WidgetStickerPicker$appActivityViewModels$$inlined$activityViewModels$1(this), new e0(new WidgetStickerPicker$viewModelForInline$2(this)));
@@ -194,7 +194,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         String searchQuery = viewState != null ? viewState.getSearchQuery() : null;
         if (!this.restoredSearchQueryFromViewModel && searchQuery != null) {
             this.restoredSearchQueryFromViewModel = true;
-            getBinding().f2459r.setText(searchQuery);
+            getBinding().f2457r.setText(searchQuery);
         }
         if (viewState != null) {
             int i = 0;
@@ -234,7 +234,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
                 TextView textView2 = getBinding().i;
                 m.checkNotNullExpressionValue(textView2, "binding.chatInputStickerPickerEmptySubtitle");
                 textView2.setText(getString(R.string.no_sticker_search_results));
-                LinkifiedTextView linkifiedTextView = getBinding().f2458c;
+                LinkifiedTextView linkifiedTextView = getBinding().f2456c;
                 m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatInputStickerPickerEmptyLink");
                 linkifiedTextView.setVisibility(8);
                 showCategoryBottomBar(true);
@@ -257,7 +257,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
                 }
                 StickerPickerViewModel.ViewState.Stickers stickers = (StickerPickerViewModel.ViewState.Stickers) viewState;
                 widgetStickerAdapter.setData(stickers.getStickerItems());
-                SearchInputView searchInputView = getBinding().f2459r;
+                SearchInputView searchInputView = getBinding().f2457r;
                 m.checkNotNullExpressionValue(searchInputView, "binding.stickerSearchInput");
                 if (!(this.stickerPickerMode != StickerPickerMode.INLINE)) {
                     i = 8;
@@ -375,21 +375,21 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         StickerPickerMode stickerPickerMode2 = StickerPickerMode.INLINE;
         int i = 0;
         appBarLayout.setVisibility(stickerPickerMode != stickerPickerMode2 ? 0 : 8);
-        SearchInputView searchInputView = getBinding().f2459r;
+        SearchInputView searchInputView = getBinding().f2457r;
         m.checkNotNullExpressionValue(searchInputView, "binding.stickerSearchInput");
         if (!(this.stickerPickerMode != stickerPickerMode2)) {
             i = 8;
         }
         searchInputView.setVisibility(i);
-        getBinding().f2459r.setOnClearClicked(new WidgetStickerPicker$initializeSearchBar$1(this));
+        getBinding().f2457r.setOnClearClicked(new WidgetStickerPicker$initializeSearchBar$1(this));
         if (this.stickerPickerMode == StickerPickerMode.BOTTOM_SHEET) {
-            getBinding().f2459r.j.f100c.requestFocus();
-            showKeyboard(getBinding().f2459r.getEditText());
+            getBinding().f2457r.j.f100c.requestFocus();
+            showKeyboard(getBinding().f2457r.getEditText());
         }
         Bundle arguments = getArguments();
         String string = arguments != null ? arguments.getString("com.discord.intent.extra.EXTRA_TEXT") : null;
         if (string != null) {
-            getBinding().f2459r.setText(string);
+            getBinding().f2457r.setText(string);
             getViewModel().setSearchText(string);
             this.restoredSearchQueryFromViewModel = true;
         }
@@ -602,7 +602,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         ((AppBarLayout.LayoutParams) layoutParams).setScrollFlags(this.stickerPickerMode == stickerPickerMode ? 5 : 0);
         setUpStickerRecycler();
         setUpCategoryRecycler();
-        getBinding().f2459r.a(this, new WidgetStickerPicker$onViewBound$1(this));
+        getBinding().f2457r.a(this, new WidgetStickerPicker$onViewBound$1(this));
         Bundle arguments = getArguments();
         Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("com.discord.intent.EXTRA_STICKER_PACK_ID")) : null;
         getViewModel().setSelectedCategoryId(valueOf != null ? valueOf.longValue() : -1);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java
index 9eeb003ce7..40f2d4ae48 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java
@@ -216,9 +216,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         this.featureTag = "";
         this.compositeSubscription = new CompositeSubscription();
         addOnAttachStateChangeListener(this);
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -232,9 +232,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         this.featureTag = "";
         this.compositeSubscription = new CompositeSubscription();
         addOnAttachStateChangeListener(this);
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -248,9 +248,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         this.featureTag = "";
         this.compositeSubscription = new CompositeSubscription();
         addOnAttachStateChangeListener(this);
-        PublishSubject j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.unsubscribeSignal = j0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -458,9 +458,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
             MediaSource R = d.R(embedType == embedType2 ? MediaType.GIFV : MediaType.VIDEO, str, str2);
             this.compositeSubscription = new CompositeSubscription();
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(appMediaPlayer.d, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$1(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$2(this, appMediaPlayer), 58, (Object) null);
-            Observable<AppMediaPlayer.Event> I = appMediaPlayer.a.I();
-            m.checkNotNullExpressionValue(I, "eventSubject.onBackpressureBuffer()");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(I, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$3(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$4(this), 58, (Object) null);
+            Observable<AppMediaPlayer.Event> J = appMediaPlayer.a.J();
+            m.checkNotNullExpressionValue(J, "eventSubject.onBackpressureBuffer()");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(J, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$3(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$4(this), 58, (Object) null);
             if (embedType == embedType2) {
                 PlayerView playerView2 = this.binding.f;
                 m.checkNotNullExpressionValue(playerView2, "binding.inlineMediaPlayerView");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
index b2f0265c15..35c5915dc3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
@@ -64,7 +64,7 @@ public final class PublishActionDialogViewModel extends AppViewModel<ViewState>
         }
 
         private final Observable<StoreState> observeChannelFollowerStatsStoreState(long j, StoreChannelFollowerStats storeChannelFollowerStats) {
-            Observable<StoreState> q = storeChannelFollowerStats.observeChannelFollowerStats(j).E(PublishActionDialogViewModel$Companion$observeChannelFollowerStatsStoreState$1.INSTANCE).q();
+            Observable<StoreState> q = storeChannelFollowerStats.observeChannelFollowerStats(j).F(PublishActionDialogViewModel$Companion$observeChannelFollowerStatsStoreState$1.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "storeChannelFollowerStat…  .distinctUntilChanged()");
             return q;
         }
@@ -274,7 +274,7 @@ public final class PublishActionDialogViewModel extends AppViewModel<ViewState>
         this.messageId = j;
         this.channelId = j2;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         storeChannelFollowerStats.fetchChannelFollowerStats(j2);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), PublishActionDialogViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java
index 39e99bc0b4..3710320eaf 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java
@@ -43,6 +43,6 @@ public final class ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1
     public final Observable<? extends Activity> call(Long l) {
         StoreUserPresence presences = StoreStream.Companion.getPresences();
         m.checkNotNullExpressionValue(l, "authorId");
-        return presences.observeApplicationActivity(l.longValue(), this.$applicationId.longValue()).w(new AnonymousClass1(this));
+        return presences.observeApplicationActivity(l.longValue(), this.$applicationId.longValue()).x(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
index b31a037fe4..f701dabf17 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
@@ -158,7 +158,7 @@ public final class ViewEmbedGameInvite extends LinearLayout {
                     MessageActivity messageActivity = new MessageActivity(MessageActivityType.Companion.a(intOrNull), queryParameter2);
                     j jVar2 = new j(activity);
                     StoreStream.Companion companion = StoreStream.Companion;
-                    Observable f = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), new j(Long.valueOf(clock.currentTimeMillis())), new j(messageActivity), Observable.m(jVar2, companion.getUsers().observeMeId().X(new ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1(longOrNull, queryParameter2))), companion.getGameParty().observeUsersForPartyId(messageActivity.a()), companion.getApplication().observeApplication(longOrNull), new ViewEmbedGameInvite$sam$rx_functions_Func6$0(new ViewEmbedGameInvite$Model$Companion$getForShare$1(this)));
+                    Observable f = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), new j(Long.valueOf(clock.currentTimeMillis())), new j(messageActivity), Observable.m(jVar2, companion.getUsers().observeMeId().Y(new ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1(longOrNull, queryParameter2))), companion.getGameParty().observeUsersForPartyId(messageActivity.a()), companion.getApplication().observeApplication(longOrNull), new ViewEmbedGameInvite$sam$rx_functions_Func6$0(new ViewEmbedGameInvite$Model$Companion$getForShare$1(this)));
                     m.checkNotNullExpressionValue(f, "Observable\n            .…ateForShare\n            )");
                     Observable<Model> q = ObservableExtensionsKt.computationLatest(f).q();
                     m.checkNotNullExpressionValue(q, "Observable\n            .…  .distinctUntilChanged()");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java
index 7cab765691..d2d0220a94 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java
@@ -93,6 +93,6 @@ public final class WidgetChatListActions$Model$Companion$get$2<T, R> implements
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.g(companion.getPermissions().observePermissionsForChannel(this.$channelId), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeComputed(component2.f(), c0.t.m.listOf(Long.valueOf(i))).E(new AnonymousClass1(i)), companion.getGuilds().observeGuild(component2.f()).q(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), component2.f(), component2.h(), false, false, 12, null), new AnonymousClass2(this, component1, component2));
+        return Observable.g(companion.getPermissions().observePermissionsForChannel(this.$channelId), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeComputed(component2.f(), c0.t.m.listOf(Long.valueOf(i))).F(new AnonymousClass1(i)), companion.getGuilds().observeGuild(component2.f()).q(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), component2.f(), component2.h(), false, false, 12, null), new AnonymousClass2(this, component1, component2));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
index cea74b2e9b..94a3ce5ecc 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
@@ -104,7 +104,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
         private final ManageMessageContext manageMessageContext;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2636me;
+        private final MeUser f2634me;
         private final Message message;
         private final String messageAuthorName;
         private final CharSequence messageContent;
@@ -151,9 +151,9 @@ public final class WidgetChatListActions extends AppBottomSheet {
             }
 
             public final Observable<Model> get(long j, long j2, CharSequence charSequence, int i) {
-                Observable<Model> X = Observable.j(i != 0 ? i != 1 ? new j<>(null) : StoreStream.Companion.getPinnedMessages().observePinnedMessage(j, j2) : StoreStream.Companion.getMessages().observeMessagesForChannel(j, j2), StoreStream.Companion.getChannels().observeChannel(j), WidgetChatListActions$Model$Companion$get$1.INSTANCE).X(new WidgetChatListActions$Model$Companion$get$2(j, charSequence, i));
-                m.checkNotNullExpressionValue(X, "Observable\n            .…          }\n            }");
-                return X;
+                Observable<Model> Y = Observable.j(i != 0 ? i != 1 ? new j<>(null) : StoreStream.Companion.getPinnedMessages().observePinnedMessage(j, j2) : StoreStream.Companion.getMessages().observeMessagesForChannel(j, j2), StoreStream.Companion.getChannels().observeChannel(j), WidgetChatListActions$Model$Companion$get$1.INSTANCE).Y(new WidgetChatListActions$Model$Companion$get$2(j, charSequence, i));
+                m.checkNotNullExpressionValue(Y, "Observable\n            .…          }\n            }");
+                return Y;
             }
         }
 
@@ -175,11 +175,11 @@ public final class WidgetChatListActions extends AppBottomSheet {
             this.recentEmojis = list;
             this.channel = channel;
             this.permissions = l;
-            this.f2636me = meUser;
+            this.f2634me = meUser;
         }
 
         public static /* synthetic */ Model copy$default(Model model, Message message, Guild guild, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser, int i2, Object obj) {
-            return model.copy((i2 & 1) != 0 ? model.message : message, (i2 & 2) != 0 ? model.guild : guild, (i2 & 4) != 0 ? model.messageAuthorName : str, (i2 & 8) != 0 ? model.messageContent : charSequence, (i2 & 16) != 0 ? model.manageMessageContext : manageMessageContext, (i2 & 32) != 0 ? model.type : i, (i2 & 64) != 0 ? model.isDeveloper : z2, (i2 & 128) != 0 ? model.recentEmojis : list, (i2 & 256) != 0 ? model.channel : channel, (i2 & 512) != 0 ? model.permissions : l, (i2 & 1024) != 0 ? model.f2636me : meUser);
+            return model.copy((i2 & 1) != 0 ? model.message : message, (i2 & 2) != 0 ? model.guild : guild, (i2 & 4) != 0 ? model.messageAuthorName : str, (i2 & 8) != 0 ? model.messageContent : charSequence, (i2 & 16) != 0 ? model.manageMessageContext : manageMessageContext, (i2 & 32) != 0 ? model.type : i, (i2 & 64) != 0 ? model.isDeveloper : z2, (i2 & 128) != 0 ? model.recentEmojis : list, (i2 & 256) != 0 ? model.channel : channel, (i2 & 512) != 0 ? model.permissions : l, (i2 & 1024) != 0 ? model.f2634me : meUser);
         }
 
         public final Message component1() {
@@ -191,7 +191,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
         }
 
         public final MeUser component11() {
-            return this.f2636me;
+            return this.f2634me;
         }
 
         public final Guild component2() {
@@ -243,7 +243,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.message, model.message) && m.areEqual(this.guild, model.guild) && m.areEqual(this.messageAuthorName, model.messageAuthorName) && m.areEqual(this.messageContent, model.messageContent) && m.areEqual(this.manageMessageContext, model.manageMessageContext) && this.type == model.type && this.isDeveloper == model.isDeveloper && m.areEqual(this.recentEmojis, model.recentEmojis) && m.areEqual(this.channel, model.channel) && m.areEqual(this.permissions, model.permissions) && m.areEqual(this.f2636me, model.f2636me);
+            return m.areEqual(this.message, model.message) && m.areEqual(this.guild, model.guild) && m.areEqual(this.messageAuthorName, model.messageAuthorName) && m.areEqual(this.messageContent, model.messageContent) && m.areEqual(this.manageMessageContext, model.manageMessageContext) && this.type == model.type && this.isDeveloper == model.isDeveloper && m.areEqual(this.recentEmojis, model.recentEmojis) && m.areEqual(this.channel, model.channel) && m.areEqual(this.permissions, model.permissions) && m.areEqual(this.f2634me, model.f2634me);
         }
 
         public final Channel getChannel() {
@@ -259,7 +259,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
         }
 
         public final MeUser getMe() {
-            return this.f2636me;
+            return this.f2634me;
         }
 
         public final Message getMessage() {
@@ -312,7 +312,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
             int hashCode7 = (hashCode6 + (channel != null ? channel.hashCode() : 0)) * 31;
             Long l = this.permissions;
             int hashCode8 = (hashCode7 + (l != null ? l.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2636me;
+            MeUser meUser = this.f2634me;
             if (meUser != null) {
                 i = meUser.hashCode();
             }
@@ -345,7 +345,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
             O.append(", permissions=");
             O.append(this.permissions);
             O.append(", me=");
-            O.append(this.f2636me);
+            O.append(this.f2634me);
             O.append(")");
             return O.toString();
         }
@@ -514,10 +514,10 @@ public final class WidgetChatListActions extends AppBottomSheet {
         getBinding().h.setOnClickListener(new WidgetChatListActions$configureUI$6(this, model));
         if (model.getMessageContent() != null) {
             if ((model.getMessageContent().length() > 0) && !model.getMessage().isLocalApplicationCommand()) {
-                TextView textView8 = getBinding().f2172c;
+                TextView textView8 = getBinding().f2171c;
                 m.checkNotNullExpressionValue(textView8, "binding.dialogChatActionsCopy");
                 textView8.setVisibility(0);
-                getBinding().f2172c.setOnClickListener(new WidgetChatListActions$configureUI$7(this, model));
+                getBinding().f2171c.setOnClickListener(new WidgetChatListActions$configureUI$7(this, model));
                 TextView textView9 = getBinding().d;
                 m.checkNotNullExpressionValue(textView9, "binding.dialogChatActionsCopyId");
                 textView9.setVisibility(!(!model.isDeveloper() && !isLocal) ? 0 : 8);
@@ -558,7 +558,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 getBinding().q.setOnClickListener(new WidgetChatListActions$configureUI$15(this, id2, model));
             }
         }
-        TextView textView16 = getBinding().f2172c;
+        TextView textView16 = getBinding().f2171c;
         m.checkNotNullExpressionValue(textView16, "binding.dialogChatActionsCopy");
         textView16.setVisibility(8);
         TextView textView9 = getBinding().d;
@@ -618,9 +618,9 @@ public final class WidgetChatListActions extends AppBottomSheet {
     }
 
     private final void editMessage(Message message) {
-        Observable<R> X = StoreStream.Companion.getChannels().observeGuildAndPrivateChannels().X(new WidgetChatListActions$editMessage$1(message));
-        m.checkNotNullExpressionValue(X, "StoreStream\n        .get…              }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationBuffered(X), 0, false, 3, null), (Context) null, "editMessage", (Function1) null, new WidgetChatListActions$editMessage$2(message), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<R> Y = StoreStream.Companion.getChannels().observeGuildAndPrivateChannels().Y(new WidgetChatListActions$editMessage$1(message));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…              }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationBuffered(Y), 0, false, 3, null), (Context) null, "editMessage", (Function1) null, new WidgetChatListActions$editMessage$2(message), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final WidgetChatListActionsBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
index 46441d3cdd..7b1d8a54de 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
@@ -224,14 +224,14 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
             this.host = appFragment;
             this.storeMessages = storeMessages;
             this.storeEmoji = storeEmoji;
-            PublishSubject j0 = PublishSubject.j0();
-            m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-            this.requestStream = j0;
+            PublishSubject k0 = PublishSubject.k0();
+            m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+            this.requestStream = k0;
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-            Objects.requireNonNull(j0);
-            Observable g02 = Observable.g0(new r(j0.i, new l2(REQUEST_RATE_LIMIT_MILLIS, timeUnit, i0.p.a.a())));
-            m.checkNotNullExpressionValue(g02, "requestStream\n          …S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(g02, appFragment.getClass(), appFragment.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+            Objects.requireNonNull(k0);
+            Observable h02 = Observable.h0(new r(k0.i, new l2(REQUEST_RATE_LIMIT_MILLIS, timeUnit, i0.p.a.a())));
+            m.checkNotNullExpressionValue(h02, "requestStream\n          …S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(h02, appFragment.getClass(), appFragment.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
         }
 
         public static final /* synthetic */ StoreEmoji access$getStoreEmoji$p(UserReactionHandler userReactionHandler) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
index 50e27ff50f..fa77e24269 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
@@ -144,7 +144,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
         textView4.setMaxLines(1);
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemApplicationCommand$onConfigure$2(this));
         boolean z2 = !t.isBlank(str2);
-        CardView cardView = this.binding.f2173c;
+        CardView cardView = this.binding.f2172c;
         m.checkNotNullExpressionValue(cardView, "binding.chatListAdapterItemTextDecorator");
         int i2 = 8;
         cardView.setVisibility(z2 ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
index 5ef56d60c3..ba43ad1815 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
@@ -426,7 +426,7 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte
         super.onConfigure(i, chatListEntry);
         AttachmentEntry attachmentEntry = (AttachmentEntry) chatListEntry;
         Message message = attachmentEntry.getMessage();
-        View view = this.binding.f2174c;
+        View view = this.binding.f2173c;
         m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemHighlightedBg");
         View view2 = this.binding.b;
         m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
index 892ed83ee8..9e342e9c1d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
@@ -90,7 +90,7 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi
             m.throwUninitializedPropertyAccessException("entry");
         }
         Message message = botUiComponentEntry.getMessage();
-        View view = this.binding.f2175c;
+        View view = this.binding.f2174c;
         m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemGutterBg");
         View view2 = this.binding.d;
         m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemHighlightedBg");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
index d1ab52c56d..fea7ec439a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
@@ -332,9 +332,9 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         if (ordinal == 0 || ordinal == 1) {
             UtcDateTime timestamp2 = message.getTimestamp();
             long g = timestamp2 != null ? timestamp2.g() : 0;
-            Observable<Long> C = Observable.C(0, 1, TimeUnit.SECONDS);
-            m.checkNotNullExpressionValue(C, "Observable\n            .…0L, 1L, TimeUnit.SECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(C), WidgetChatListAdapterItemCallMessage.class, (Context) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$1(this, g), 58, (Object) null);
+            Observable<Long> D = Observable.D(0, 1, TimeUnit.SECONDS);
+            m.checkNotNullExpressionValue(D, "Observable\n            .…0L, 1L, TimeUnit.SECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(D), WidgetChatListAdapterItemCallMessage.class, (Context) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$1(this, g), 58, (Object) null);
         } else if (ordinal == 2) {
             TextView textView2 = this.binding.d;
             m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemCallSubtitle");
@@ -491,9 +491,9 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
     }
 
     private final Observable<State> observeState(MessageEntry messageEntry) {
-        Observable<R> E = StoreStream.Companion.getVoiceParticipants().get(messageEntry.getMessage().getChannelId()).E(new WidgetChatListAdapterItemCallMessage$observeState$1(messageEntry));
-        m.checkNotNullExpressionValue(E, "StoreStream.getVoicePart…, messageEntry)\n        }");
-        return E;
+        Observable<R> F = StoreStream.Companion.getVoiceParticipants().get(messageEntry.getMessage().getChannelId()).F(new WidgetChatListAdapterItemCallMessage$observeState$1(messageEntry));
+        m.checkNotNullExpressionValue(F, "StoreStream.getVoicePart…, messageEntry)\n        }");
+        return F;
     }
 
     private final void onItemClick(CallStatus callStatus, long j) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
index ba019adb75..7bf2db1c2b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
@@ -850,7 +850,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         boolean shouldRenderMedia = shouldRenderMedia();
         Integer num2 = previewImage.b;
         boolean z2 = true;
-        boolean z3 = num2 != null && c0.a0.a.getSign(num2.intValue()) == 1 && (num = previewImage.f2503c) != null && c0.a0.a.getSign(num.intValue()) == 1;
+        boolean z3 = num2 != null && c0.a0.a.getSign(num2.intValue()) == 1 && (num = previewImage.f2501c) != null && c0.a0.a.getSign(num.intValue()) == 1;
         if (!shouldRenderMedia || !z3) {
             CardView cardView2 = this.binding.s;
             m.checkNotNullExpressionValue(cardView2, "binding.embedImageContainer");
@@ -862,7 +862,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             int i3 = i2 / 2;
             Integer num3 = previewImage.b;
             int intValue = num3 != null ? num3.intValue() : 0;
-            Integer num4 = previewImage.f2503c;
+            Integer num4 = previewImage.f2501c;
             configureEmbedImage(simpleDraweeView, i2, intValue, num4 != null ? num4.intValue() : 0, previewImage.a, i3);
             CardView cardView3 = this.binding.s;
             m.checkNotNullExpressionValue(cardView3, "binding.embedImageContainer");
@@ -940,28 +940,28 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             long myId = model.getMyId();
             StoreMessageState.State messageState = model.getEmbedEntry().getMessageState();
             new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, EMBED_TYPE_TITLE), null, false, null, 28, null).process(parse$default);
-            this.binding.f2178r.setDraweeSpanStringBuilder(AstRenderer.render(parse$default, MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedTitle$1(model, embedIndex), null, null, 14335, null)));
-            LinkifiedTextView linkifiedTextView = this.binding.f2178r;
+            this.binding.f2177r.setDraweeSpanStringBuilder(AstRenderer.render(parse$default, MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedTitle$1(model, embedIndex), null, null, 14335, null)));
+            LinkifiedTextView linkifiedTextView = this.binding.f2177r;
             if (embed.l() != null) {
-                LinkifiedTextView linkifiedTextView2 = this.binding.f2178r;
+                LinkifiedTextView linkifiedTextView2 = this.binding.f2177r;
                 m.checkNotNullExpressionValue(linkifiedTextView2, "binding.chatListItemEmbedTitle");
                 i = ColorCompat.getThemedColor(linkifiedTextView2, (int) R.attr.colorTextLink);
             } else {
-                LinkifiedTextView linkifiedTextView3 = this.binding.f2178r;
+                LinkifiedTextView linkifiedTextView3 = this.binding.f2177r;
                 m.checkNotNullExpressionValue(linkifiedTextView3, "binding.chatListItemEmbedTitle");
                 i = ColorCompat.getThemedColor(linkifiedTextView3, (int) R.attr.primary_100);
             }
             linkifiedTextView.setTextColor(i);
             Companion companion = Companion;
-            LinkifiedTextView linkifiedTextView4 = this.binding.f2178r;
+            LinkifiedTextView linkifiedTextView4 = this.binding.f2177r;
             m.checkNotNullExpressionValue(linkifiedTextView4, "binding.chatListItemEmbedTitle");
             Companion.access$bindUrlOnClick(companion, linkifiedTextView4, embed.l(), embed.j());
-            LinkifiedTextView linkifiedTextView5 = this.binding.f2178r;
+            LinkifiedTextView linkifiedTextView5 = this.binding.f2177r;
             m.checkNotNullExpressionValue(linkifiedTextView5, "binding.chatListItemEmbedTitle");
             linkifiedTextView5.setVisibility(0);
             return;
         }
-        LinkifiedTextView linkifiedTextView6 = this.binding.f2178r;
+        LinkifiedTextView linkifiedTextView6 = this.binding.f2177r;
         m.checkNotNullExpressionValue(linkifiedTextView6, "binding.chatListItemEmbedTitle");
         linkifiedTextView6.setVisibility(8);
     }
@@ -1041,14 +1041,14 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         if (renderableEmbedMedia != null) {
             Integer num = renderableEmbedMedia.b;
             if ((num != null ? num.intValue() : 0) <= 0) {
-                Integer num2 = renderableEmbedMedia.f2503c;
+                Integer num2 = renderableEmbedMedia.f2501c;
                 if ((num2 != null ? num2.intValue() : 0) <= 0) {
                     z3 = false;
                     if (!z3) {
                         EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE;
                         Integer num3 = renderableEmbedMedia.b;
                         int intValue = num3 != null ? num3.intValue() : 0;
-                        Integer num4 = renderableEmbedMedia.f2503c;
+                        Integer num4 = renderableEmbedMedia.f2501c;
                         int intValue2 = num4 != null ? num4.intValue() : 0;
                         int i = this.maxEmbedImageWidth;
                         int i2 = MAX_IMAGE_VIEW_HEIGHT_PX;
@@ -1186,7 +1186,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         ViewExtensions.setOnLongClickListenerConsumeClick(view, new WidgetChatListAdapterItemEmbed$onConfigure$1(this, chatListEntry));
         this.itemView.setOnClickListener(new WidgetChatListAdapterItemEmbed$onConfigure$2(this, chatListEntry));
         Message message = embedEntry.getMessage();
-        View view2 = this.binding.f2177c;
+        View view2 = this.binding.f2176c;
         m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemHighlightedBg");
         View view3 = this.binding.b;
         m.checkNotNullExpressionValue(view3, "binding.chatListAdapterItemGutterBg");
@@ -1194,9 +1194,9 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         String c2 = embedEntry.getEmbed().c();
         Model model = new Model(embedEntry, c2 != null ? Parser.parse$default(UI_THREAD_VALUES_PARSER, c2, MessageParseState.Companion.getInitialState(), null, 4, null) : null, parseFields(embedEntry.getEmbed().d(), UI_THREAD_TITLES_PARSER, UI_THREAD_VALUES_PARSER), null, null, null, 0, 120, null);
         configureUI(model);
-        Observable Y = Companion.access$getModel(Companion, model).Y(1);
-        m.checkNotNullExpressionValue(Y, "getModel(initialModel)\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Y), WidgetChatListAdapterItemEmbed.class, (Context) null, new WidgetChatListAdapterItemEmbed$onConfigure$3(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemEmbed$onConfigure$4(this), 58, (Object) null);
+        Observable Z = Companion.access$getModel(Companion, model).Z(1);
+        m.checkNotNullExpressionValue(Z, "getModel(initialModel)\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), WidgetChatListAdapterItemEmbed.class, (Context) null, new WidgetChatListAdapterItemEmbed$onConfigure$3(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemEmbed$onConfigure$4(this), 58, (Object) null);
     }
 
     @Override // com.discord.widgets.chat.list.FragmentLifecycleListener
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
index f4ca1e216e..c74e978604 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
@@ -70,7 +70,7 @@ public final class WidgetChatListAdapterItemEphemeralMessage$onConfigure$2 exten
             AnonymousClass1 r1 = new AnonymousClass1(this);
             Objects.requireNonNull(hook);
             m.checkNotNullParameter(r1, "onClick");
-            hook.f2505c = new Hook.a(valueOf, r1);
+            hook.f2503c = new Hook.a(valueOf, r1);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
index fb01f5e8bc..b1ae0bacdb 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
@@ -68,7 +68,7 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL
         Message message = ((EphemeralMessageEntry) chatListEntry).getMessage();
         View view = this.binding.b;
         m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemGutterBg");
-        View view2 = this.binding.f2179c;
+        View view2 = this.binding.f2178c;
         m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemHighlightedBg");
         configureCellHighlight(message, view2, view);
         this.binding.d.setOnClickListener(new WidgetChatListAdapterItemEphemeralMessage$onConfigure$1(this));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java
index 03c6eb0e0e..1874a5e3f8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java
@@ -19,6 +19,6 @@ public final class WidgetChatListAdapterItemGift$buttons$2 extends o implements
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final List<? extends View> mo17invoke() {
-        return n.listOf((Object[]) new View[]{WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).b, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).k, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).f2180c, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).h});
+        return n.listOf((Object[]) new View[]{WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).b, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).k, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).f2179c, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).h});
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
index 03c143ec25..d067db1192 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
@@ -312,9 +312,9 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
 
         public final Observable<Model> get(GiftEntry giftEntry) {
             m.checkNotNullParameter(giftEntry, "item");
-            Observable<R> X = StoreStream.Companion.getGifting().requestGift(giftEntry.getGiftCode()).X(new WidgetChatListAdapterItemGift$ModelProvider$get$1(giftEntry));
-            m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getGifting().requestGift(giftEntry.getGiftCode()).Y(new WidgetChatListAdapterItemGift$ModelProvider$get$1(giftEntry));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+            return Y;
         }
     }
 
@@ -441,7 +441,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         MaterialButton materialButton = this.binding.b;
         m.checkNotNullExpressionValue(materialButton, "binding.itemGiftAcceptButton");
         materialButton.setVisibility(8);
-        MaterialButton materialButton2 = this.binding.f2180c;
+        MaterialButton materialButton2 = this.binding.f2179c;
         m.checkNotNullExpressionValue(materialButton2, "binding.itemGiftCannotClaimButton");
         materialButton2.setVisibility(8);
         View view2 = this.binding.h;
@@ -473,7 +473,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         MaterialButton materialButton = this.binding.b;
         m.checkNotNullExpressionValue(materialButton, "binding.itemGiftAcceptButton");
         materialButton.setVisibility(8);
-        MaterialButton materialButton2 = this.binding.f2180c;
+        MaterialButton materialButton2 = this.binding.f2179c;
         m.checkNotNullExpressionValue(materialButton2, "binding.itemGiftCannotClaimButton");
         materialButton2.setVisibility(8);
         View view2 = this.binding.h;
@@ -583,7 +583,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             this.binding.k.setOnClickListener(WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.INSTANCE);
             materialButton = this.binding.k;
         } else {
-            MaterialButton materialButton2 = this.binding.f2180c;
+            MaterialButton materialButton2 = this.binding.f2179c;
             boolean redeeming = resolved.getRedeeming();
             int i = R.string.gift_embed_button_claimed;
             if (redeeming) {
@@ -592,7 +592,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
                 i = R.string.gift_embed_button_owned;
             }
             materialButton2.setText(i);
-            materialButton = this.binding.f2180c;
+            materialButton = this.binding.f2179c;
         }
         m.checkNotNullExpressionValue(materialButton, "if (canAccept) {\n      b…ftCannotClaimButton\n    }");
         for (View view3 : getButtons()) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
index 825d99d2ae..585fab1802 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
@@ -58,7 +58,7 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh
             int i2 = isOwner ? R.string.system_message_invite_users_owner : R.string.system_message_invite_users;
             int i3 = isOwner ? R.string.system_message_invite_users_description_owner : R.string.system_message_invite_users_description;
             this.binding.d.setText(i2);
-            this.binding.f2181c.setText(i3);
+            this.binding.f2180c.setText(i3);
             this.binding.b.setOnClickListener(new WidgetChatListAdapterItemGuildInviteReminder$onConfigure$1(this));
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
index 95157b0cd0..ac3ee3b464 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
@@ -121,9 +121,9 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
 
         public final Observable<Model> get(GuildTemplateEntry guildTemplateEntry) {
             m.checkNotNullParameter(guildTemplateEntry, "item");
-            Observable<R> X = StoreStream.Companion.getGuildTemplates().observeGuildTemplate(guildTemplateEntry.getGuildTemplateCode()).t(new WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1(guildTemplateEntry)).X(WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$2.INSTANCE);
-            m.checkNotNullExpressionValue(X, "StoreStream\n        .get…tes\n          }\n        }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getGuildTemplates().observeGuildTemplate(guildTemplateEntry.getGuildTemplateCode()).u(new WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1(guildTemplateEntry)).Y(WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$2.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…tes\n          }\n        }");
+            return Y;
         }
     }
 
@@ -181,7 +181,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
     }
 
     private final void configureInvalidUI() {
-        this.binding.f2182c.setText(R.string.guild_template_invalid_title);
+        this.binding.f2181c.setText(R.string.guild_template_invalid_title);
         this.binding.d.setText(R.string.guild_template_invalid_subtitle);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext");
@@ -192,7 +192,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
     }
 
     private final void configureLoadingUI() {
-        this.binding.f2182c.setText(R.string.guild_template_resolving_title);
+        this.binding.f2181c.setText(R.string.guild_template_resolving_title);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext");
         textView.setVisibility(8);
@@ -203,7 +203,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
 
     private final void configureResolvedUI(Model.Resolved resolved) {
         ModelGuildTemplate component1 = resolved.component1();
-        TextView textView = this.binding.f2182c;
+        TextView textView = this.binding.f2181c;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateName");
         textView.setText(component1.getName());
         TextView textView2 = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
index 782fce2062..7138b38a03 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
@@ -104,7 +104,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
                 i2 = 0;
             }
             linkifiedTextView2.setVisibility(i2);
-            LinkifiedTextView linkifiedTextView3 = this.binding.f2183c;
+            LinkifiedTextView linkifiedTextView3 = this.binding.f2182c;
             m.checkNotNullExpressionValue(linkifiedTextView3, "binding.itemGuildWelcomeSubheader");
             b.n(linkifiedTextView3, z3 ? R.string.welcome_cta_subtitle_existing_server : guildWelcomeEntry.isOwner() ? R.string.welcome_cta_subtitle_owner : R.string.welcome_cta_subtitle_member, new Object[0], null, 4);
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
index 63f393296c..de09bba306 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
@@ -351,9 +351,9 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
             StoreInstantInvites instantInvites = StoreStream.Companion.getInstantInvites();
             String inviteCode = inviteEntry.getInviteCode();
             String eventId = inviteEntry.getEventId();
-            Observable<R> X = instantInvites.observeInvite(ModelInvite.getInviteStoreKey(inviteCode, eventId != null ? SnowflakeUtils.INSTANCE.toSnowflake(eventId) : null)).X(new WidgetChatListAdapterItemInvite$ModelProvider$get$1(inviteEntry));
-            m.checkNotNullExpressionValue(X, "StoreStream\n        .get…tes\n          }\n        }");
-            return X;
+            Observable<R> Y = instantInvites.observeInvite(ModelInvite.getInviteStoreKey(inviteCode, eventId != null ? SnowflakeUtils.INSTANCE.toSnowflake(eventId) : null)).Y(new WidgetChatListAdapterItemInvite$ModelProvider$get$1(inviteEntry));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…tes\n          }\n        }");
+            return Y;
         }
     }
 
@@ -509,7 +509,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         Context context = view.getContext();
         Long l = null;
         boolean areEqual = m.areEqual((invalid == null || (authorUser = invalid.getAuthorUser()) == null) ? null : Long.valueOf(authorUser.getId()), invalid != null ? Long.valueOf(invalid.getMeId()) : null);
-        TextView textView = this.binding.f2184c;
+        TextView textView = this.binding.f2183c;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader");
         int i = 0;
         c.a.k.b.n(textView, areEqual ? R.string.invite_button_title_inviter_invalid : R.string.invite_button_title_invited_invalid, new Object[0], null, 4);
@@ -635,7 +635,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
         Context context = view.getContext();
-        this.binding.f2184c.setText(R.string.instant_invite_resolving);
+        this.binding.f2183c.setText(R.string.instant_invite_resolving);
         TextView textView = this.binding.m;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteName");
         textView.setText((CharSequence) null);
@@ -707,7 +707,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         Guild guild3 = component1.getGuild();
         boolean z6 = (guild3 == null || (l = guild3.l()) == null || !l.contains(GuildFeature.HUB)) ? false : true;
         boolean z7 = component1.getChannel() == null && component1.getGuild() == null && component1.getInviter() != null;
-        TextView textView = this.binding.f2184c;
+        TextView textView = this.binding.f2183c;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader");
         String str2 = null;
         if (v2 && z4) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
index 6ee6d3ed47..0071a49b7b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
@@ -45,7 +45,7 @@ public final class WidgetChatListAdapterItemMentionFooter extends WidgetChatList
     }
 
     private final void tileBackgroundBitmapDrawable(WidgetChatListAdapterItemMentionFooterBinding widgetChatListAdapterItemMentionFooterBinding) {
-        View view = widgetChatListAdapterItemMentionFooterBinding.f2185c;
+        View view = widgetChatListAdapterItemMentionFooterBinding.f2184c;
         m.checkNotNullExpressionValue(view, "tile");
         Drawable background = view.getBackground();
         Objects.requireNonNull(background, "null cannot be cast to non-null type android.graphics.drawable.BitmapDrawable");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
index 852d31de20..09a86d2dda 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
@@ -48,7 +48,7 @@ public final class WidgetChatListAdapterItemMessageHeader extends WidgetChatList
         MessageHeaderEntry messageHeaderEntry = (MessageHeaderEntry) chatListEntry;
         String component2 = messageHeaderEntry.component2();
         String component3 = messageHeaderEntry.component3();
-        View view = this.binding.f2186c;
+        View view = this.binding.f2185c;
         m.checkNotNullExpressionValue(view, "binding.chatListItemMessageHeaderDivider");
         boolean z2 = true;
         int i2 = 0;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
index 0fad32772b..d6fcf51fad 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
@@ -27,7 +27,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt
         View view2 = this.itemView;
         m.checkNotNullExpressionValue(view2, "itemView");
         view.setBackgroundColor(ColorCompat.getColor(view2.getContext(), (int) R.color.status_red_500));
-        View view3 = a.f2196c;
+        View view3 = a.f2195c;
         View view4 = this.itemView;
         m.checkNotNullExpressionValue(view4, "itemView");
         view3.setBackgroundColor(ColorCompat.getColor(view4.getContext(), (int) R.color.status_red_500));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
index 377fe3b823..11b967ebec 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
@@ -109,7 +109,7 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
         m.checkNotNullExpressionValue(linearLayout, "binding.mutualGuilds");
         linearLayout.setVisibility(z2 ? 0 : 8);
         if (z2) {
-            PileView pileView = this.binding.f2187c;
+            PileView pileView = this.binding.f2186c;
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(component6, 10));
             for (Guild guild : component6) {
                 arrayList.add(new PileView.c(new WidgetChatListAdapterItemPrivateChannelStart$onConfigure$1$1(IconUtils.getForGuild$default(guild, null, false, Integer.valueOf(DimenUtils.dpToPixels(24)), 2, null)), new WidgetChatListAdapterItemPrivateChannelStart$onConfigure$1$2(guild)));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
index f6baffb994..bff7624108 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
@@ -115,7 +115,7 @@ public final class WidgetChatListAdapterItemReactions extends WidgetChatListItem
 
     private final void processReactions(ReactionsEntry reactionsEntry) {
         Message message = reactionsEntry.getMessage();
-        View view = this.binding.f2188c;
+        View view = this.binding.f2187c;
         m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemHighlightedBg");
         View view2 = this.binding.b;
         m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
index 0922c4f86e..d6f936dadb 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
@@ -318,7 +318,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
         TextView textView5 = this.binding.h;
         m.checkNotNullExpressionValue(textView5, "binding.itemListenTogetherTrack");
         textView5.setVisibility(isDeadInvite ^ true ? 0 : 8);
-        TextView textView6 = this.binding.f2189c;
+        TextView textView6 = this.binding.f2188c;
         m.checkNotNullExpressionValue(textView6, "binding.itemListenTogetherArtist");
         textView6.setVisibility(isDeadInvite ^ true ? 0 : 8);
         SimpleDraweeView simpleDraweeView = this.binding.b;
@@ -335,7 +335,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
             TextView textView7 = this.binding.h;
             m.checkNotNullExpressionValue(textView7, "binding.itemListenTogetherTrack");
             textView7.setText(spotifyListeningActivity != null ? spotifyListeningActivity.e() : null);
-            TextView textView8 = this.binding.f2189c;
+            TextView textView8 = this.binding.f2188c;
             m.checkNotNullExpressionValue(textView8, "binding.itemListenTogetherArtist");
             Object[] objArr = new Object[1];
             objArr[0] = spotifyListeningActivity != null ? spotifyListeningActivity.l() : null;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
index 22dc67decc..8d259f98c8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
@@ -396,7 +396,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
                 TextView textView = this.binding.e;
                 m.checkNotNullExpressionValue(textView, "binding.itemInviteImageText");
                 ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (v = guild.v()) == null) ? null : GuildUtilsKt.computeShortName(v));
-                TextView textView2 = this.binding.f2190c;
+                TextView textView2 = this.binding.f2189c;
                 m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName");
                 Guild guild5 = model.getInvite().getGuild();
                 if (guild5 == null || (str = guild5.v()) == null) {
@@ -467,7 +467,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
         m.checkNotNullExpressionValue(textView, "binding.itemInviteImageText");
         if (z2) {
             ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (v = guild.v()) == null) ? null : GuildUtilsKt.computeShortName(v));
-            TextView textView2 = this.binding.f2190c;
+            TextView textView2 = this.binding.f2189c;
             m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName");
             Guild guild5 = model.getInvite().getGuild();
             Channel channel = model.getChannel();
@@ -509,7 +509,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
             this.binding.f.setOnClickListener(new WidgetChatListAdapterItemStageInvite$configureUI$2(this, model, context));
         }
         ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (v = guild.v()) == null) ? null : GuildUtilsKt.computeShortName(v));
-        TextView textView2 = this.binding.f2190c;
+        TextView textView2 = this.binding.f2189c;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName");
         Guild guild5 = model.getInvite().getGuild();
         Channel channel = model.getChannel();
@@ -581,8 +581,8 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
         if (stageInviteEntry2 == null) {
             m.throwUninitializedPropertyAccessException("item");
         }
-        Observable E = ObservableExtensionsKt.ui(Model.Companion.observe$default(companion, stageInviteEntry2, null, null, null, null, null, null, null, null, 510, null)).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(E, WidgetChatListAdapterItemStageInvite.class, (Context) null, new WidgetChatListAdapterItemStageInvite$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemStageInvite$onConfigure$1(this), 58, (Object) null);
+        Observable F = ObservableExtensionsKt.ui(Model.Companion.observe$default(companion, stageInviteEntry2, null, null, null, null, null, null, null, null, 510, null)).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetChatListAdapterItemStageInvite.class, (Context) null, new WidgetChatListAdapterItemStageInvite$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemStageInvite$onConfigure$1(this), 58, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
index a248d8df35..388f3d5c32 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
@@ -59,7 +59,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
     }
 
     private final void configureChannel(long j, String str, boolean z2, boolean z3) {
-        TextView textView = this.binding.f2191c;
+        TextView textView = this.binding.f2190c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader");
         int i = 0;
         b.n(textView, R.string.android_welcome_message_title_channel, new Object[]{str}, null, 4);
@@ -91,10 +91,10 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
     }
 
     private final void configureThread(long j, String str, boolean z2, boolean z3, GuildMember guildMember, String str2, Integer num) {
-        TextView textView = this.binding.f2191c;
+        TextView textView = this.binding.f2190c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader");
         Context context = textView.getContext();
-        TextView textView2 = this.binding.f2191c;
+        TextView textView2 = this.binding.f2190c;
         m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemHeader");
         textView2.setText(str);
         TextView textView3 = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
index 4effd1298d..5d5e9edabc 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
@@ -52,8 +52,8 @@ public final class WidgetChatListAdapterItemSticker extends WidgetChatListItem {
         m.checkNotNullParameter(chatListEntry, "data");
         super.onConfigure(i, chatListEntry);
         StickerEntry stickerEntry = (StickerEntry) chatListEntry;
-        Observable Y = StickerUtils.getGuildOrStandardSticker$default(StickerUtils.INSTANCE, stickerEntry.getSticker().d(), false, 2, null).Y(1);
-        m.checkNotNullExpressionValue(Y, "StickerUtils.getGuildOrS…kerId())\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(Y, WidgetChatListAdapterItemSticker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemSticker$onConfigure$1(this, stickerEntry, chatListEntry), 62, (Object) null);
+        Observable Z = StickerUtils.getGuildOrStandardSticker$default(StickerUtils.INSTANCE, stickerEntry.getSticker().d(), false, 2, null).Z(1);
+        m.checkNotNullExpressionValue(Z, "StickerUtils.getGuildOrS…kerId())\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, WidgetChatListAdapterItemSticker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemSticker$onConfigure$1(this, stickerEntry, chatListEntry), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
index 4909fb3f39..396f7d5099 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
@@ -55,8 +55,8 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI
         String component3 = stickerGreetEntry.component3();
         int component4 = stickerGreetEntry.component4();
         StickerView.e(this.binding.b, component1, null, 2);
-        this.binding.f2192c.setOnClickListener(new WidgetChatListAdapterItemStickerGreet$onConfigure$1(this, component2, component4, component1));
-        MaterialButton materialButton = this.binding.f2192c;
+        this.binding.f2191c.setOnClickListener(new WidgetChatListAdapterItemStickerGreet$onConfigure$1(this, component2, component4, component1));
+        MaterialButton materialButton = this.binding.f2191c;
         m.checkNotNullExpressionValue(materialButton, "binding.sendStickerGreetButton");
         b.n(materialButton, R.string.wave_to, new Object[]{component3}, null, 4);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
index 69c6b7b174..eaf327b0fd 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
@@ -61,7 +61,7 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh
         int component4 = stickerGreetCompactEntry.component4();
         StickerView.e(this.binding.b, component1, null, 2);
         this.binding.d.setOnClickListener(new WidgetChatListAdapterItemStickerGreetCompact$onConfigure$1(this, component2, component4, component1));
-        TextView textView = this.binding.f2193c;
+        TextView textView = this.binding.f2192c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemStickerGreetText");
         b.n(textView, R.string.wave_to, new Object[]{component3}, null, 4);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
index 89b0b75da6..e90137564e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
@@ -171,7 +171,7 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
         LinkifiedTextView linkifiedTextView3 = this.binding.d;
         m.checkNotNullExpressionValue(linkifiedTextView3, "binding.systemText");
         linkifiedTextView3.setText(systemMessage);
-        this.binding.f2194c.setImageResource(getIcon(component1));
+        this.binding.f2193c.setImageResource(getIcon(component1));
         AppCompatImageView appCompatImageView = this.binding.b;
         m.checkNotNullExpressionValue(appCompatImageView, "binding.chatListAdapterItemThreadEmbedSpine");
         boolean z2 = true;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
index 80960f2a8e..904c55f821 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
@@ -123,7 +123,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
             m.checkNotNullExpressionValue(textInputLayout6, "binding.threadNameInput");
             textInputLayout6.setErrorEnabled(false);
         }
-        ConstraintLayout constraintLayout = this.binding.f2197c;
+        ConstraintLayout constraintLayout = this.binding.f2196c;
         m.checkNotNullExpressionValue(constraintLayout, "binding.privateThreadToggle");
         if (threadDraftFormEntry.getParentMessageId() != null || !threadDraftFormEntry.getCanSeePrivateThreadOption()) {
             z2 = false;
@@ -131,11 +131,11 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         constraintLayout.setVisibility(z2 ? 0 : 8);
         if (!threadDraftFormEntry.getCanCreatePublicThread() && !threadDraftState.isPrivate()) {
             threadDraft.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, true, null, null, false, false, 30, null));
-            this.binding.f2197c.setOnClickListener(null);
+            this.binding.f2196c.setOnClickListener(null);
         } else if (!threadDraftFormEntry.getCanCreatePrivateThread()) {
-            this.binding.f2197c.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$2(this, threadDraftFormEntry));
+            this.binding.f2196c.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$2(this, threadDraftFormEntry));
         } else {
-            this.binding.f2197c.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(threadDraft, threadDraftState));
+            this.binding.f2196c.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(threadDraft, threadDraftState));
         }
         SwitchMaterial switchMaterial = this.binding.e;
         m.checkNotNullExpressionValue(switchMaterial, "binding.privateThreadToggleSwitch");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
index 5eee81c87c..f92f327ab6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
@@ -291,7 +291,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
             configureMessageCount(threadEmbedEntry.getThreadMessageCount());
             configureMostRecentMessageText(threadEmbedEntry);
             Message parentMessage = threadEmbedEntry.getParentMessage();
-            View view = this.binding.f2198c;
+            View view = this.binding.f2197c;
             m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemHighlightedBg");
             View view2 = this.binding.b;
             m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
index 4dfccd6c2a..80ffdd4811 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
@@ -24,7 +24,7 @@ public final class WidgetChatListAdapterItemTimestamp extends WidgetChatListItem
         View view = a.b;
         m.checkNotNullExpressionValue(view, "binding.dividerStrokeLeft");
         view.setBackgroundColor(ColorCompat.getThemedColor(view, (int) R.attr.colorTextMuted));
-        View view2 = a.f2196c;
+        View view2 = a.f2195c;
         m.checkNotNullExpressionValue(view2, "binding.dividerStrokeRight");
         view2.setBackgroundColor(ColorCompat.getThemedColor(view2, (int) R.attr.colorTextMuted));
         TextView textView = a.d;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
index 96f81b5e73..42c9b21507 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
@@ -466,9 +466,9 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             for (SendUtils.FileUpload fileUpload2 : list) {
                 arrayList.add(ObservableExtensionsKt.leadingEdgeThrottle(fileUpload2.getBytesWrittenObservable(), j, TimeUnit.MILLISECONDS));
             }
-            Observable<Model.Many> E = Observable.b(arrayList, WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.INSTANCE).E(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4(ref$LongRef)).q().E(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5(list, ref$LongRef));
-            m.checkNotNullExpressionValue(E, "Observable\n            .…essPercent)\n            }");
-            return E;
+            Observable<Model.Many> F = Observable.b(arrayList, WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.INSTANCE).F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4(ref$LongRef)).q().F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5(list, ref$LongRef));
+            m.checkNotNullExpressionValue(F, "Observable\n            .…essPercent)\n            }");
+            return F;
         }
 
         private final int getPercentage(long j, long j2) {
@@ -486,17 +486,17 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
                 m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …E\n            )\n        )");
                 return jVar;
             }
-            Observable<Model.Single> E = ObservableExtensionsKt.leadingEdgeThrottle(fileUpload.getBytesWrittenObservable(), j, TimeUnit.MILLISECONDS).E(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1(fileUpload)).q().E(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2(fileUpload));
-            m.checkNotNullExpressionValue(E, "upload\n            .byte…          )\n            }");
-            return E;
+            Observable<Model.Single> F = ObservableExtensionsKt.leadingEdgeThrottle(fileUpload.getBytesWrittenObservable(), j, TimeUnit.MILLISECONDS).F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1(fileUpload)).q().F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2(fileUpload));
+            m.checkNotNullExpressionValue(F, "upload\n            .byte…          )\n            }");
+            return F;
         }
 
         public final Observable<? extends Model> get(String str, long j) {
             m.checkNotNullParameter(str, "nonce");
             StoreMessageUploads messageUploads = StoreStream.Companion.getMessageUploads();
-            Observable<? extends Model> X = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{messageUploads}, false, null, null, new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1(messageUploads, str), 14, null).X(new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$2(j));
-            m.checkNotNullExpressionValue(X, "ObservationDeckProvider.…      }\n        }\n      }");
-            return X;
+            Observable<? extends Model> Y = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{messageUploads}, false, null, null, new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1(messageUploads, str), 14, null).Y(new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$2(j));
+            m.checkNotNullExpressionValue(Y, "ObservationDeckProvider.…      }\n        }\n      }");
+            return Y;
         }
     }
 
@@ -616,7 +616,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             if (!(model instanceof Model.Many) || ((Model.Many) model).getProgress() >= 100) {
                 z2 = false;
                 if (!z2) {
-                    ImageView imageView = this.binding.f2199c;
+                    ImageView imageView = this.binding.f2198c;
                     m.checkNotNullExpressionValue(imageView, "binding.progressCancelTop");
                     imageView.setVisibility(z5 ? 0 : 8);
                     ImageView imageView2 = this.binding.b;
@@ -627,7 +627,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
                     imageView2.setVisibility(i);
                     return;
                 }
-                ImageView imageView3 = this.binding.f2199c;
+                ImageView imageView3 = this.binding.f2198c;
                 m.checkNotNullExpressionValue(imageView3, "binding.progressCancelTop");
                 imageView3.setVisibility(8);
                 ImageView imageView4 = this.binding.b;
@@ -709,11 +709,11 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
     public void onConfigure(int i, ChatListEntry chatListEntry) {
         m.checkNotNullParameter(chatListEntry, "data");
         super.onConfigure(i, chatListEntry);
-        Observable<? extends Model> J = ModelProvider.INSTANCE.get(((UploadProgressEntry) chatListEntry).getMessageNonce(), 100).J();
-        m.checkNotNullExpressionValue(J, "ModelProvider.get(data.m…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(J), WidgetChatListAdapterItemUploadProgress.class, (Context) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$1(this), 58, (Object) null);
+        Observable<? extends Model> K = ModelProvider.INSTANCE.get(((UploadProgressEntry) chatListEntry).getMessageNonce(), 100).K();
+        m.checkNotNullExpressionValue(K, "ModelProvider.get(data.m…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(K), WidgetChatListAdapterItemUploadProgress.class, (Context) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$1(this), 58, (Object) null);
         WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1 widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1 = new WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1(chatListEntry);
-        this.binding.f2199c.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$3(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1));
+        this.binding.f2198c.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$3(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1));
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$4(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java
index f4cc8df52c..0181445ef8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java
@@ -32,6 +32,6 @@ public final class WidgetChatListModel$ChatListState$Companion$get$1<T, R> imple
     }
 
     public final Observable<? extends WidgetChatListModel.ChatListState> call(boolean z2) {
-        return z2 ? StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(this.$channelId).E(AnonymousClass1.INSTANCE).q() : new j(WidgetChatListModel.ChatListState.ATTACHED);
+        return z2 ? StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(this.$channelId).F(AnonymousClass1.INSTANCE).q() : new j(WidgetChatListModel.ChatListState.ATTACHED);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
index 7ff0ea988e..bec8ddf0ef 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
@@ -62,9 +62,9 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
             }
 
             public final Observable<ChatListState> get(long j) {
-                Observable<R> X = StoreStream.Companion.getMessages().observeIsDetached(j).X(new WidgetChatListModel$ChatListState$Companion$get$1(j));
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …        }\n              }");
-                return X;
+                Observable<R> Y = StoreStream.Companion.getMessages().observeIsDetached(j).Y(new WidgetChatListModel$ChatListState$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                return Y;
             }
         }
     }
@@ -165,9 +165,9 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
         }
 
         public final Observable<WidgetChatListModel> get() {
-            Observable<R> X = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().X(WidgetChatListModel$Companion$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(X, "StoreStream\n          .g…            }\n          }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Y(WidgetChatListModel$Companion$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
index 10923e6d30..9768e6087d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
@@ -154,9 +154,9 @@ public final class WidgetChatListModelMessages {
         }
 
         private final Observable<Long> observeUnreadMarkerMessageId(StoreReadStates storeReadStates, long j) {
-            Observable<R> E = storeReadStates.getUnreadMarker(j).E(WidgetChatListModelMessages$Companion$observeUnreadMarkerMessageId$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "getUnreadMarker(channelI… marker.messageId ?: 0L }");
-            return ObservableExtensionsKt.computationLatest(E).q();
+            Observable<R> F = storeReadStates.getUnreadMarker(j).F(WidgetChatListModelMessages$Companion$observeUnreadMarkerMessageId$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "getUnreadMarker(channelI… marker.messageId ?: 0L }");
+            return ObservableExtensionsKt.computationLatest(F).q();
         }
 
         private final MessageEntry.WelcomeCtaData parseWelcomeData(Message message, long j, Map<Long, GuildMember> map, Channel channel, Long l) {
@@ -282,9 +282,9 @@ public final class WidgetChatListModelMessages {
             Observable observeIsAutoPlayGifsEnabled$default = StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null);
             Observable<Boolean> observeIsRenderEmbedsEnabled = companion.getUserSettings().observeIsRenderEmbedsEnabled();
             Observable<Long> observeMeId = companion.getUsers().observeMeId();
-            Observable<R> E = companion.getExperiments().observeUserExperiment("2021-03_bot_ui_kit_components_android", false).E(WidgetChatListModelMessages$Companion$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "StoreStream\n            …experiment?.bucket == 1 }");
-            return ObservableCombineLatestOverloadsKt.combineLatest(observable, observeChannel, observeForType, observeExpandedBlockedMessageIds, observeGuildMembers, observeUnreadMarkerMessageId, observeRoles, observePermissionsForChannel, observeIsAnimatedEmojisEnabled$default, observeIsAutoPlayGifsEnabled$default, observeIsRenderEmbedsEnabled, observeMeId, E, ComponentChatListState.INSTANCE.observeChatListComponentState(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$get$2(channel));
+            Observable<R> F = companion.getExperiments().observeUserExperiment("2021-03_bot_ui_kit_components_android", false).F(WidgetChatListModelMessages$Companion$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "StoreStream\n            …experiment?.bucket == 1 }");
+            return ObservableCombineLatestOverloadsKt.combineLatest(observable, observeChannel, observeForType, observeExpandedBlockedMessageIds, observeGuildMembers, observeUnreadMarkerMessageId, observeRoles, observePermissionsForChannel, observeIsAnimatedEmojisEnabled$default, observeIsAutoPlayGifsEnabled$default, observeIsRenderEmbedsEnabled, observeMeId, F, ComponentChatListState.INSTANCE.observeChatListComponentState(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$get$2(channel));
         }
 
         public final List<ChatListEntry> getMessageItems(Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, Integer> map3, Channel channel2, StoreThreadMessages.ThreadState threadState, Message message, StoreMessageState.State state, Map<Long, ? extends StoreMessageReplies.MessageState> map4, boolean z2, boolean z3, Long l, boolean z4, boolean z5, boolean z6, long j, boolean z7, Map<Long, ComponentChatListState.ComponentStoreState> map5, InviteEmbedModel inviteEmbedModel, boolean z8) {
@@ -528,9 +528,9 @@ public final class WidgetChatListModelMessages {
 
             public final Observable<MessagesWithMetadata> get(Channel channel) {
                 m.checkNotNullParameter(channel, "channel");
-                Observable<R> X = StoreStream.Companion.getMessages().observeMessagesForChannel(channel.h()).X(new WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2(channel));
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …        )\n              }");
-                return X;
+                Observable<R> Y = StoreStream.Companion.getMessages().observeMessagesForChannel(channel.h()).Y(new WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2(channel));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        )\n              }");
+                return Y;
             }
 
             public final Observable<MessagesWithMetadata> get(List<Message> list) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java
index 6ff7c4f48c..f867e00cd9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java
@@ -36,6 +36,6 @@ public final class WidgetChatListModelTop$Companion$get$1<T, R> implements b<Sto
         } else {
             observable = (channelLoadedState.isTouchedSinceLastJump() || !channelLoadedState.isInitialMessagesLoaded()) ? new j(new LoadingEntry()) : new j(new SpacerEntry(this.$channel.h()));
         }
-        return observable.E(AnonymousClass1.INSTANCE);
+        return observable.F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java
index cff8fa6d06..d0eeaf2bb7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java
@@ -38,7 +38,7 @@ public final class WidgetChatListModelTop {
             Observable<Guild> observeGuild = companion.getGuilds().observeGuild(channel.f());
             Observable observeMe$default = StoreUser.observeMe$default(companion.getUsers(), false, 1, null);
             Observable<Long> observePermissionsForChannel = companion.getPermissions().observePermissionsForChannel(channel.h());
-            Observable q = companion.getChannels().observeDefaultChannel(channel.f()).E(WidgetChatListModelTop$Companion$getWelcomeEntry$1.INSTANCE).q();
+            Observable q = companion.getChannels().observeDefaultChannel(channel.f()).F(WidgetChatListModelTop$Companion$getWelcomeEntry$1.INSTANCE).q();
             Observable<GuildMember> observeGuildMember = observeGuildMember(channel.f(), channel.q());
             Observable<User> observeUser = companion.getUsers().observeUser(channel.q());
             UserMutualGuildsManager userMutualGuildsManager = new UserMutualGuildsManager(null, null, null, 7, null);
@@ -56,7 +56,7 @@ public final class WidgetChatListModelTop {
 
         public final Observable<WidgetChatListModelTop> get(Channel channel) {
             c0.z.d.m.checkNotNullParameter(channel, "channel");
-            Observable<WidgetChatListModelTop> q = StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(channel.h()).X(new WidgetChatListModelTop$Companion$get$1(channel)).q();
+            Observable<WidgetChatListModelTop> q = StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(channel.h()).Y(new WidgetChatListModelTop$Companion$get$1(channel)).q();
             c0.z.d.m.checkNotNullExpressionValue(q, "StoreStream\n          .g…  .distinctUntilChanged()");
             return q;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
index 5f8711434b..8fbea10d5b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
@@ -523,7 +523,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
             private final Map<Long, GuildRole> guildRoles;
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2637id;
+            private final long f2635id;
             private final GuildMember interactionUser;
             private final User user;
             private final Map<Long, String> usernamesOrNicks;
@@ -534,7 +534,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
                 m.checkNotNullParameter(applicationCommandData, "applicationCommandData");
                 m.checkNotNullParameter(map4, "usernamesOrNicks");
                 m.checkNotNullParameter(map5, "commandValues");
-                this.f2637id = j;
+                this.f2635id = j;
                 this.user = user;
                 this.interactionUser = guildMember;
                 this.application = application;
@@ -581,7 +581,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
             }
 
             public final long getId() {
-                return this.f2637id;
+                return this.f2635id;
             }
 
             public final GuildMember getInteractionUser() {
@@ -627,7 +627,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
         this.messageNonce = str;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetApplicationCommandBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         requestInteractionData();
-        Observable q = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).E(AnonymousClass2.INSTANCE).q();
+        Observable q = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).F(AnonymousClass2.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "storeObservable.computat…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(q, WidgetApplicationCommandBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) 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 9dac18d7a2..e6ea401174 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.f2309c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f2307c;
             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/ManageReactionsModelProvider$get$2.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java
index 96026e3b65..0ea162f042 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java
@@ -126,7 +126,7 @@ public final class ManageReactionsModelProvider$get$2<T, R> implements b<MeUser,
             public final Observable<? extends ManageReactionsModel> call(MessageReactionEmoji messageReactionEmoji) {
                 ManageReactionsModelProvider manageReactionsModelProvider = this.this$0.this$0.this$0;
                 m.checkNotNullExpressionValue(messageReactionEmoji, "targetedEmoji");
-                return ManageReactionsModelProvider.access$getUsersForReaction(manageReactionsModelProvider, messageReactionEmoji).E(new AnonymousClass1(this, messageReactionEmoji));
+                return ManageReactionsModelProvider.access$getUsersForReaction(manageReactionsModelProvider, messageReactionEmoji).F(new AnonymousClass1(this, messageReactionEmoji));
             }
         }
 
@@ -145,7 +145,7 @@ public final class ManageReactionsModelProvider$get$2<T, R> implements b<MeUser,
         public final Observable<? extends ManageReactionsModel> call(Triple<Boolean, ? extends List<MessageReaction>, ? extends Map<Long, GuildMember>> triple) {
             Boolean component1 = triple.component1();
             List list = (List) triple.component2();
-            return list.isEmpty() ? new j(null) : ManageReactionsModelProvider.access$getTargetedEmojiKeySubject$p(this.this$0.this$0).q().E(new AnonymousClass1(list)).X(new AnonymousClass2(this, list, component1, (Map) triple.component3()));
+            return list.isEmpty() ? new j(null) : ManageReactionsModelProvider.access$getTargetedEmojiKeySubject$p(this.this$0.this$0).q().F(new AnonymousClass1(list)).Y(new AnonymousClass2(this, list, component1, (Map) triple.component3()));
         }
     }
 
@@ -157,6 +157,6 @@ public final class ManageReactionsModelProvider$get$2<T, R> implements b<MeUser,
     }
 
     public final Observable<? extends ManageReactionsModel> call(MeUser meUser) {
-        return Observable.i(this.$getCanManageMessagesObs$1.invoke(meUser.getMfaEnabled()), this.$reactionsObs, this.$guildMembersObservable, AnonymousClass1.INSTANCE).X(new AnonymousClass2(this, meUser));
+        return Observable.i(this.$getCanManageMessagesObs$1.invoke(meUser.getMfaEnabled()), this.$reactionsObs, this.$guildMembersObservable, AnonymousClass1.INSTANCE).Y(new AnonymousClass2(this, meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java
index 3fc42677bd..38eb605ec9 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java
@@ -45,7 +45,7 @@ public final class ManageReactionsModelProvider {
         this.storeChannels = storeChannels;
         this.storeGuilds = storeGuilds;
         this.observationDeck = observationDeck;
-        this.targetedEmojiKeySubject = new SerializedSubject<>(BehaviorSubject.k0(str));
+        this.targetedEmojiKeySubject = new SerializedSubject<>(BehaviorSubject.l0(str));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -119,11 +119,11 @@ public final class ManageReactionsModelProvider {
     public final Observable<ManageReactionsModel> get() {
         ManageReactionsModelProvider$get$1 manageReactionsModelProvider$get$1 = new ManageReactionsModelProvider$get$1(this);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable E = companion.getMessages().observeMessagesForChannel(this.channelId, this.messageId).E(ManageReactionsModelProvider$get$reactionsObs$1.INSTANCE).E(ManageReactionsModelProvider$get$reactionsObs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get…ion -> reaction.count } }");
-        Observable X = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).X(new ManageReactionsModelProvider$get$2(this, manageReactionsModelProvider$get$1, E, ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeChannels, this.storeGuilds}, false, null, null, new ManageReactionsModelProvider$get$guildMembersObservable$1(this), 14, null)));
-        m.checkNotNullExpressionValue(X, "StoreStream\n        .get…              }\n        }");
-        Observable<ManageReactionsModel> q = ObservableExtensionsKt.computationLatest(X).q();
+        Observable F = companion.getMessages().observeMessagesForChannel(this.channelId, this.messageId).F(ManageReactionsModelProvider$get$reactionsObs$1.INSTANCE).F(ManageReactionsModelProvider$get$reactionsObs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…ion -> reaction.count } }");
+        Observable Y = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Y(new ManageReactionsModelProvider$get$2(this, manageReactionsModelProvider$get$1, F, ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeChannels, this.storeGuilds}, false, null, null, new ManageReactionsModelProvider$get$guildMembersObservable$1(this), 14, null)));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…              }\n        }");
+        Observable<ManageReactionsModel> q = ObservableExtensionsKt.computationLatest(Y).q();
         m.checkNotNullExpressionValue(q, "StoreStream\n        .get…  .distinctUntilChanged()");
         return q;
     }
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 92d0360cad..88e16671c9 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.f2310c;
+                SimpleDraweeView simpleDraweeView = this.binding.f2308c;
                 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 3b9e649b50..48609adf89 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().f2308c;
+        RecyclerView recyclerView2 = getBinding().f2306c;
         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/chat/overlay/ChatTypingModel$Companion$getTypingObservableForChannel$2.java b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingObservableForChannel$2.java
index de96820927..cf52fc195a 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingObservableForChannel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingObservableForChannel$2.java
@@ -48,6 +48,6 @@ public final class ChatTypingModel$Companion$getTypingObservableForChannel$2<T,
     }
 
     public final Observable<? extends ChatTypingModel> call(Channel channel) {
-        return channel == null ? new j(ChatTypingModel.Hide.INSTANCE) : GuildVerificationLevelUtils.observeVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.f(), null, null, null, 14, null).X(new AnonymousClass1(channel));
+        return channel == null ? new j(ChatTypingModel.Hide.INSTANCE) : GuildVerificationLevelUtils.observeVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.f(), null, null, null, 14, null).Y(new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java
index 3f4c8b57c1..45fc688336 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java
@@ -38,25 +38,25 @@ public abstract class ChatTypingModel {
 
         private final Observable<ChatTypingModel> getTypingObservableForChannel(Channel channel) {
             j jVar = new j(channel);
-            Observable<ChatTypingModel> X = Observable.g0(new r(jVar.i, new u0(ChatTypingModel$Companion$getTypingObservableForChannel$1.INSTANCE))).X(ChatTypingModel$Companion$getTypingObservableForChannel$2.INSTANCE);
-            m.checkNotNullExpressionValue(X, "Observable.just(resolved…          }\n            }");
-            return X;
+            Observable<ChatTypingModel> Y = Observable.h0(new r(jVar.i, new u0(ChatTypingModel$Companion$getTypingObservableForChannel$1.INSTANCE))).Y(ChatTypingModel$Companion$getTypingObservableForChannel$2.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "Observable.just(resolved…          }\n            }");
+            return Y;
         }
 
         private final Observable<ChatTypingModel> getTypingObservableForDraft(Channel channel) {
-            Observable<R> X = StoreStream.Companion.getSlowMode().observeCooldownSecs(Long.valueOf(channel.h()), StoreSlowMode.Type.ThreadCreate.INSTANCE).X(new ChatTypingModel$Companion$getTypingObservableForDraft$1(channel));
-            m.checkNotNullExpressionValue(X, "StoreStream\n            …ldownSecs))\n            }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getSlowMode().observeCooldownSecs(Long.valueOf(channel.h()), StoreSlowMode.Type.ThreadCreate.INSTANCE).Y(new ChatTypingModel$Companion$getTypingObservableForDraft$1(channel));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …ldownSecs))\n            }");
+            return Y;
         }
 
         private final Observable<List<CharSequence>> getTypingUsers(Channel channel) {
-            Observable<List<CharSequence>> q = StoreStream.Companion.getUsersTyping().observeTypingUsers(channel.h()).X(new ChatTypingModel$Companion$getTypingUsers$1(channel)).E(ChatTypingModel$Companion$getTypingUsers$2.INSTANCE).q();
+            Observable<List<CharSequence>> q = StoreStream.Companion.getUsersTyping().observeTypingUsers(channel.h()).Y(new ChatTypingModel$Companion$getTypingUsers$1(channel)).F(ChatTypingModel$Companion$getTypingUsers$2.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "StoreStream\n          .g…  .distinctUntilChanged()");
             return q;
         }
 
         public final Observable<ChatTypingModel> get() {
-            Observable<ChatTypingModel> q = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().X(ChatTypingModel$Companion$get$1.INSTANCE).q();
+            Observable<ChatTypingModel> q = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Y(ChatTypingModel$Companion$get$1.INSTANCE).q();
             m.checkNotNullExpressionValue(q, "StoreStream.getChannelsS…  .distinctUntilChanged()");
             return q;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java
index 67ec0c722f..1fcb353f4d 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java
@@ -38,8 +38,8 @@ public final class WidgetChatOverlay$OldMessageModel$Companion$get$1<T, R> imple
             StoreStream.Companion companion = StoreStream.Companion;
             StoreMessages messages = companion.getMessages();
             m.checkNotNullExpressionValue(l, "selectedChannelId");
-            observable = Observable.j(messages.observeIsDetached(l.longValue()), companion.getChat().observeInteractionState().w(new WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1(l)).o(200, TimeUnit.MILLISECONDS), WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.INSTANCE);
+            observable = Observable.j(messages.observeIsDetached(l.longValue()), companion.getChat().observeInteractionState().x(new WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1(l)).o(200, TimeUnit.MILLISECONDS), WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.INSTANCE);
         }
-        return Observable.m(new j(Boolean.FALSE), observable).q().E(new AnonymousClass1(l));
+        return Observable.m(new j(Boolean.FALSE), observable).q().F(new AnonymousClass1(l));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
index 94d6e89c54..5e3e2a11af 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
@@ -68,9 +68,9 @@ public final class WidgetChatOverlay extends AppFragment {
             }
 
             public final Observable<OldMessageModel> get() {
-                Observable<R> X = StoreStream.Companion.getChannelsSelected().observeId().q().X(WidgetChatOverlay$OldMessageModel$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-                return X;
+                Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeId().q().Y(WidgetChatOverlay$OldMessageModel$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                return Y;
             }
         }
 
@@ -152,7 +152,7 @@ public final class WidgetChatOverlay extends AppFragment {
         private final void configureTyping(ChatTypingModel.Typing typing) {
             int i = 8;
             if (!typing.getTypingUsers().isEmpty() || typing.getChannelRateLimit() > 0) {
-                RelativeLayout relativeLayout = this.binding.f2201c;
+                RelativeLayout relativeLayout = this.binding.f2200c;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.chatOverlayTyping");
                 relativeLayout.setVisibility(0);
                 ConstraintLayout constraintLayout = this.binding.a;
@@ -190,7 +190,7 @@ public final class WidgetChatOverlay extends AppFragment {
                 return;
             }
             this.binding.d.b();
-            RelativeLayout relativeLayout2 = this.binding.f2201c;
+            RelativeLayout relativeLayout2 = this.binding.f2200c;
             m.checkNotNullExpressionValue(relativeLayout2, "binding.chatOverlayTyping");
             relativeLayout2.setVisibility(8);
         }
@@ -217,7 +217,7 @@ public final class WidgetChatOverlay extends AppFragment {
         public final void configureUI(ChatTypingModel chatTypingModel) {
             m.checkNotNullParameter(chatTypingModel, "model");
             if (chatTypingModel instanceof ChatTypingModel.Hide) {
-                RelativeLayout relativeLayout = this.binding.f2201c;
+                RelativeLayout relativeLayout = this.binding.f2200c;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.chatOverlayTyping");
                 relativeLayout.setVisibility(8);
             } else if (chatTypingModel instanceof ChatTypingModel.Typing) {
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
index c5cfb8ad18..db436bd241 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
@@ -279,9 +279,9 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Channel findChannelByIdInternal$app_productionGoogleRelease = companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(j);
                 if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-                    Observable<R> X = companion.getPinnedMessages().observeForChannel(j).X(new WidgetChannelPinnedMessages$Model$Companion$get$1(findChannelByIdInternal$app_productionGoogleRelease, context));
-                    m.checkNotNullExpressionValue(X, "getPinnedMessages().obse…              }\n        }");
-                    return X;
+                    Observable<R> Y = companion.getPinnedMessages().observeForChannel(j).Y(new WidgetChannelPinnedMessages$Model$Companion$get$1(findChannelByIdInternal$app_productionGoogleRelease, context));
+                    m.checkNotNullExpressionValue(Y, "getPinnedMessages().obse…              }\n        }");
+                    return Y;
                 }
                 i0.l.e.j jVar = new i0.l.e.j(null);
                 m.checkNotNullExpressionValue(jVar, "Observable.just(null)");
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
index 50431d46cc..b8bae88369 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
@@ -165,7 +165,7 @@ public final class WidgetContactSync extends AppFragment {
         loadingButton.setEnabled(viewState.getLandingNextEnabled());
         getBinding().e.f82c.setIsLoading(viewState.isSubmitting());
         getBinding().f.d.setIsLoading(viewState.isSubmitting());
-        getBinding().f2209c.f93c.setIsLoading(viewState.isSubmitting());
+        getBinding().f2208c.f93c.setIsLoading(viewState.isSubmitting());
         if (viewState.getPermissionsDenied()) {
             TextView textView = getBinding().e.b;
             m.checkNotNullExpressionValue(textView, "binding.contactSyncLandi…ncLandingNeedsPermissions");
@@ -197,8 +197,8 @@ public final class WidgetContactSync extends AppFragment {
         if (contactSyncFriendSuggestionListAdapter != null) {
             contactSyncFriendSuggestionListAdapter.setData(viewState.getFriendSuggestions());
         }
-        getBinding().f2209c.f93c.setText(b.k(this, R.string.next, new Object[0], null, 4));
-        getBinding().f2209c.f93c.setOnClickListener(new WidgetContactSync$configureUI$6(this));
+        getBinding().f2208c.f93c.setText(b.k(this, R.string.next, new Object[0], null, 4));
+        getBinding().f2208c.f93c.setOnClickListener(new WidgetContactSync$configureUI$6(this));
         getBinding().b.b.b(this);
         getBinding().b.b.setCountryCode(viewState.getCountryCode());
         getBinding().b.f75c.setOnClickListener(new WidgetContactSync$configureUI$7(this));
@@ -351,7 +351,7 @@ public final class WidgetContactSync extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        RecyclerView recyclerView = getBinding().f2209c.b;
+        RecyclerView recyclerView = getBinding().f2208c.b;
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         m.checkNotNullExpressionValue(recyclerView, "it");
         ContactSyncFriendSuggestionListAdapter contactSyncFriendSuggestionListAdapter = (ContactSyncFriendSuggestionListAdapter) companion.configure(new ContactSyncFriendSuggestionListAdapter(recyclerView));
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
index 987c2034a7..18f0effc7e 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
@@ -97,9 +97,9 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
             StoreUser users = companion.getUsers();
             StorePhone phone = companion.getPhone();
             StoreUserConnections userConnections = companion.getUserConnections();
-            Observable<StoreState> E = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{users, phone, userConnections}, false, null, null, 14, null), 1, TimeUnit.SECONDS).E(new WidgetContactSyncViewModel$Companion$observeStores$1(users, phone, userConnections));
-            m.checkNotNullExpressionValue(E, "ObservationDeckProvider\n…            )\n          }");
-            return E;
+            Observable<StoreState> F = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{users, phone, userConnections}, false, null, null, 14, null), 1, TimeUnit.SECONDS).F(new WidgetContactSyncViewModel$Companion$observeStores$1(users, phone, userConnections));
+            m.checkNotNullExpressionValue(F, "ObservationDeckProvider\n…            )\n          }");
+            return F;
         }
     }
 
@@ -888,7 +888,7 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
         this.restAPI = restAPI;
         this.tracker = contactSyncFlowAnalytics;
         this.initialized = z4;
-        this.eventsSubject = PublishSubject.j0();
+        this.eventsSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetContactSyncViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
index 2065ca3593..1dc5a6a9b7 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
@@ -46,7 +46,7 @@ public final class WidgetDebugging extends AppFragment {
     private static final int COLLAPSED_MAX_LINES = 2;
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetDebugging$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<Boolean> filterSubject = BehaviorSubject.k0(Boolean.TRUE);
+    private final BehaviorSubject<Boolean> filterSubject = BehaviorSubject.l0(Boolean.TRUE);
     private Adapter logsAdapter;
 
     /* compiled from: WidgetDebugging.kt */
@@ -310,7 +310,7 @@ public final class WidgetDebugging extends AppFragment {
         Objects.requireNonNull(AppLog.g);
         Observable q = ObservableExtensionsKt.computationBuffered(AppLog.d).q();
         m.checkNotNullExpressionValue(q, "logsSubject\n          .c…  .distinctUntilChanged()");
-        Observable j = Observable.j(q.a(200, TimeUnit.MILLISECONDS).w(WidgetDebugging$onViewBoundOrOnResume$1.INSTANCE).O(new ArrayList(), WidgetDebugging$onViewBoundOrOnResume$2.INSTANCE), this.filterSubject.q(), WidgetDebugging$onViewBoundOrOnResume$3.INSTANCE);
+        Observable j = Observable.j(q.a(200, TimeUnit.MILLISECONDS).x(WidgetDebugging$onViewBoundOrOnResume$1.INSTANCE).P(new ArrayList(), WidgetDebugging$onViewBoundOrOnResume$2.INSTANCE), this.filterSubject.q(), WidgetDebugging$onViewBoundOrOnResume$3.INSTANCE);
         m.checkNotNullExpressionValue(j, "Observable\n        .comb…gs, isFiltered)\n        }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(j), this, null, 2, null), WidgetDebugging.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDebugging$onViewBoundOrOnResume$4(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
index 7adb1f492d..2bd6289e46 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
@@ -106,7 +106,7 @@ public final class WidgetFatalCrash extends AppFragment {
         TextView textView4 = getBinding().d;
         m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
         textView4.setText(b.k(this, R.string.crash_device_version, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
-        TextView textView5 = getBinding().f2231c;
+        TextView textView5 = getBinding().f2230c;
         m.checkNotNullExpressionValue(textView5, "binding.fatalCrashDevice");
         textView5.setText(b.k(this, R.string.crash_device, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4));
     }
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java
index 77f52fb8a0..a3b3303028 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java
@@ -121,7 +121,7 @@ public final class WidgetDirectoriesSearch extends AppFragment {
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         int i = 0;
         recyclerView.setVisibility(z2 ? 0 : 8);
-        LinearLayout linearLayout = getBinding().f2213c;
+        LinearLayout linearLayout = getBinding().f2212c;
         m.checkNotNullExpressionValue(linearLayout, "binding.emptyState");
         if (!(!z2)) {
             i = 8;
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java
index b373b025bf..4e2de558e1 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java
@@ -342,11 +342,11 @@ public final class WidgetDirectoriesViewModel extends AppViewModel<ViewState> {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetDirectoriesViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         Observable<Channel> q = storeChannelsSelected.observeSelectedChannel().q();
         m.checkNotNullExpressionValue(q, "channelsSelectedStore\n  …  .distinctUntilChanged()");
-        Observable<R> E = q.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable w2 = E.w(AnonymousClass2.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "channelsSelectedStore\n  …?.isDirectory() == true }");
-        ObservableExtensionsKt.appSubscribe$default(w2, WidgetDirectoriesViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
+        Observable<R> F = q.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable x2 = F.x(AnonymousClass2.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "channelsSelectedStore\n  …?.isDirectory() == true }");
+        ObservableExtensionsKt.appSubscribe$default(x2, WidgetDirectoriesViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java
index 0f4ec7cdbe..5d7f9b15f6 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java
@@ -96,6 +96,13 @@ public final class WidgetDirectoryChannel extends AppFragment {
         widgetDirectoryChannel.onViewBindingDestroy(widgetDirectoryChannelBinding);
     }
 
+    public static /* synthetic */ void bindGestureObservers$default(WidgetDirectoryChannel widgetDirectoryChannel, boolean z2, WidgetDirectoryChannelBinding widgetDirectoryChannelBinding, int i, Object obj) {
+        if ((i & 2) != 0) {
+            widgetDirectoryChannelBinding = null;
+        }
+        widgetDirectoryChannel.bindGestureObservers(z2, widgetDirectoryChannelBinding);
+    }
+
     private final void configureUi(WidgetDirectoriesViewModel.ViewState viewState) {
         Guild guild = viewState.getGuild();
         int i = 0;
@@ -105,11 +112,11 @@ public final class WidgetDirectoryChannel extends AppFragment {
             m.checkNotNullExpressionValue(textView, "binding.widgetDirectoryC….itemDirectoryEmptyHeader");
             textView.setText(b.k(this, R.string.hub_directory_channel_empty_title, new Object[]{guild.getName()}, null, 4));
         }
-        ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f2214c;
+        ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f2213c;
         serverDiscoveryHeader.setButtonOnClickListener(new WidgetDirectoryChannel$configureUi$$inlined$apply$lambda$1(serverDiscoveryHeader, viewState));
         List<DirectoryEntry> invoke = viewState.getDirectories().invoke();
         boolean z2 = invoke != null && (invoke.isEmpty() ^ true);
-        ServerDiscoveryHeader serverDiscoveryHeader2 = getBinding().f2214c;
+        ServerDiscoveryHeader serverDiscoveryHeader2 = getBinding().f2213c;
         m.checkNotNullExpressionValue(serverDiscoveryHeader2, "binding.header");
         serverDiscoveryHeader2.setVisibility(z2 ? 0 : 8);
         w4 w4Var = getBinding().f;
@@ -137,19 +144,12 @@ public final class WidgetDirectoryChannel extends AppFragment {
     }
 
     private final void onViewBindingDestroy(WidgetDirectoryChannelBinding widgetDirectoryChannelBinding) {
-        c.a.o.b a = b.C0034b.a();
-        TabLayout tabLayout = widgetDirectoryChannelBinding.d;
-        m.checkNotNullExpressionValue(tabLayout, "binding.tabs");
-        a.c(tabLayout);
-        c.a.o.b a2 = b.C0034b.a();
-        ViewPager2 viewPager2 = widgetDirectoryChannelBinding.e;
-        m.checkNotNullExpressionValue(viewPager2, "binding.viewPager");
-        a2.c(viewPager2);
+        bindGestureObservers(false, widgetDirectoryChannelBinding);
     }
 
     private final void toggleHeaderMargins(boolean z2) {
         int i = z2 ? TAB_LAYOUT_MARGINS : 0;
-        ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f2214c;
+        ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f2213c;
         m.checkNotNullExpressionValue(serverDiscoveryHeader, "binding.header");
         ViewGroup.LayoutParams layoutParams = serverDiscoveryHeader.getLayoutParams();
         Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams");
@@ -165,6 +165,31 @@ public final class WidgetDirectoryChannel extends AppFragment {
         toolbar.setLayoutParams(marginLayoutParams2);
     }
 
+    public final void bindGestureObservers(boolean z2, WidgetDirectoryChannelBinding widgetDirectoryChannelBinding) {
+        if (widgetDirectoryChannelBinding == null) {
+            widgetDirectoryChannelBinding = getBinding();
+        }
+        if (z2) {
+            c.a.o.b a = b.C0034b.a();
+            TabLayout tabLayout = widgetDirectoryChannelBinding.d;
+            m.checkNotNullExpressionValue(tabLayout, "nonNullBinding.tabs");
+            a.b(tabLayout);
+            c.a.o.b a2 = b.C0034b.a();
+            ViewPager2 viewPager2 = widgetDirectoryChannelBinding.e;
+            m.checkNotNullExpressionValue(viewPager2, "nonNullBinding.viewPager");
+            a2.b(viewPager2);
+            return;
+        }
+        c.a.o.b a3 = b.C0034b.a();
+        TabLayout tabLayout2 = widgetDirectoryChannelBinding.d;
+        m.checkNotNullExpressionValue(tabLayout2, "nonNullBinding.tabs");
+        a3.c(tabLayout2);
+        c.a.o.b a4 = b.C0034b.a();
+        ViewPager2 viewPager22 = widgetDirectoryChannelBinding.e;
+        m.checkNotNullExpressionValue(viewPager22, "nonNullBinding.viewPager");
+        a4.c(viewPager22);
+    }
+
     public final WidgetDirectoryChannelViewPagerAdapter getAdapter() {
         return (WidgetDirectoryChannelViewPagerAdapter) this.adapter$delegate.getValue();
     }
@@ -183,26 +208,20 @@ public final class WidgetDirectoryChannel extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         getBinding().f.f183c.setOnClickListener(new WidgetDirectoryChannel$onViewBound$1(this));
-        ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f2214c;
+        ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f2213c;
         serverDiscoveryHeader.setTitle(getString(R.string.hub_directory_search_title));
         serverDiscoveryHeader.setDescription(getString(R.string.hub_directory_search_subtitle));
-        ViewPager2 viewPager2 = getBinding().e;
-        viewPager2.setAdapter(getAdapter());
-        c.a.o.b a = b.C0034b.a();
-        m.checkNotNullExpressionValue(viewPager2, "this");
-        a.b(viewPager2);
+        getBinding().e.setAdapter(getAdapter());
         TabLayout tabLayout = getBinding().d;
-        c.a.o.b a2 = b.C0034b.a();
-        m.checkNotNullExpressionValue(tabLayout, "this");
-        a2.b(tabLayout);
-        ViewPager2 viewPager22 = getBinding().e;
-        m.checkNotNullExpressionValue(viewPager22, "binding.viewPager");
-        ViewPager2ExtensionsKt.setUpWithViewPager2(tabLayout, viewPager22, new WidgetDirectoryChannel$onViewBound$$inlined$apply$lambda$1(this));
+        ViewPager2 viewPager2 = getBinding().e;
+        m.checkNotNullExpressionValue(viewPager2, "binding.viewPager");
+        ViewPager2ExtensionsKt.setUpWithViewPager2(tabLayout, viewPager2, new WidgetDirectoryChannel$onViewBound$$inlined$apply$lambda$1(this));
+        bindGestureObservers$default(this, true, null, 2, null);
         Observable<Long> q = StoreStream.Companion.getGuildSelected().observeSelectedGuildId().q();
         m.checkNotNullExpressionValue(q, "StoreStream\n        .get…  .distinctUntilChanged()");
-        Observable<R> E = q.w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(E), WidgetDirectoryChannel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDirectoryChannel$onViewBound$5(this), 62, (Object) null);
+        Observable<R> F = q.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(F), WidgetDirectoryChannel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDirectoryChannel$onViewBound$5(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java
index 3e40520fd3..ac2125a00c 100644
--- a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java
+++ b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java
@@ -89,6 +89,6 @@ public final class EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2<T, R>
     }
 
     public final Observable<? extends EmojiSheetViewModel.Companion.CustomEmojGuildInfo> call(Guild guild) {
-        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getEmojiGuild(this.$emoji.getId()).E(AnonymousClass1.INSTANCE).E(AnonymousClass2.INSTANCE).K(new AnonymousClass3(guild)) : new j(new EmojiSheetViewModel.Companion.CustomEmojGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getEmojiGuild(this.$emoji.getId()).E(AnonymousClass4.INSTANCE).E(AnonymousClass5.INSTANCE).K(AnonymousClass6.INSTANCE);
+        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getEmojiGuild(this.$emoji.getId()).F(AnonymousClass1.INSTANCE).F(AnonymousClass2.INSTANCE).L(new AnonymousClass3(guild)) : new j(new EmojiSheetViewModel.Companion.CustomEmojGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getEmojiGuild(this.$emoji.getId()).F(AnonymousClass4.INSTANCE).F(AnonymousClass5.INSTANCE).L(AnonymousClass6.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java
index 3553e2aea6..86b0be4c95 100644
--- a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java
@@ -246,9 +246,9 @@ public final class EmojiSheetViewModel extends AppViewModel<ViewState> {
             }
             EmojiNode.EmojiIdAndType.Custom custom = (EmojiNode.EmojiIdAndType.Custom) emojiIdAndType;
             if (custom != null) {
-                Observable<CustomEmojGuildInfo> y2 = Observable.B(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$1(storeEmojiCustom, custom, storeGuilds)).y(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2(restAPI, custom));
-                m.checkNotNullExpressionValue(y2, "Observable.fromCallable …      }\n        }\n      }");
-                return y2;
+                Observable<CustomEmojGuildInfo> z2 = Observable.C(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$1(storeEmojiCustom, custom, storeGuilds)).z(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2(restAPI, custom));
+                m.checkNotNullExpressionValue(z2, "Observable.fromCallable …      }\n        }\n      }");
+                return z2;
             }
             j jVar = new j(null);
             m.checkNotNullExpressionValue(jVar, "Observable.just(null)");
diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
index a69ac56957..6157cc41b0 100644
--- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
+++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
@@ -197,7 +197,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         TextView textView = binding2.p;
         m.checkNotNullExpressionValue(textView, "nameTv");
         textView.setText(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + emojiCustom2.getName() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
-        TextView textView2 = binding2.f2226c;
+        TextView textView2 = binding2.f2225c;
         m.checkNotNullExpressionValue(textView2, "emojiInfoTv");
         textView2.setText(getString(getCustomEmojiInfoText(isCurrentGuild, isUserInGuild, isPublic, isUserPremium)));
         configureButtons(isUserPremium, isUserInGuild, known != null ? known.getGuild() : null);
@@ -279,7 +279,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         TextView textView = binding.p;
         m.checkNotNullExpressionValue(textView, "nameTv");
         textView.setText(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + emojiUnicode.getEmojiUnicode().getFirstName() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
-        TextView textView2 = binding.f2226c;
+        TextView textView2 = binding.f2225c;
         m.checkNotNullExpressionValue(textView2, "emojiInfoTv");
         textView2.setText(getString(R.string.emoji_popout_standard_emoji_description));
         FrameLayout frameLayout = binding.b;
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
index fcd51a471e..190eaf8b5f 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
@@ -168,9 +168,9 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
                 requireDialog().cancel();
                 return;
             }
-            Observable<Long> c02 = Observable.c0(SHEET_DISMISS_DELAY_MS, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable\n             …S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$handleEvent$1(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(SHEET_DISMISS_DELAY_MS, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n             …S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$handleEvent$1(this), 62, (Object) null);
         } else if (event instanceof FeedbackSheetViewModel.Event.NavigateToIssueDetails) {
             WidgetIssueDetailsForm.Companion companion = WidgetIssueDetailsForm.Companion;
             Context requireContext = requireContext();
@@ -188,7 +188,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
         }
         if (z2) {
             if (viewState.getShowFaceRatings()) {
-                NestedScrollView nestedScrollView = getBinding().f2232c;
+                NestedScrollView nestedScrollView = getBinding().f2231c;
                 m.checkNotNullExpressionValue(nestedScrollView, "binding.feedbackSheetContainer");
                 updatePeekHeightPx(nestedScrollView.getMeasuredHeight());
             }
@@ -206,9 +206,9 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(string2, "getString(viewState.issuesHeaderTextResId)");
         feedbackView.updateView(string, selectedFeedbackRating, widgetFeedbackSheet$updateView$2, widgetFeedbackSheet$updateView$3, widgetFeedbackSheet$updateView$4, string2, viewState.getFeedbackIssues(), new WidgetFeedbackSheet$updateView$5(this));
         if (z2) {
-            Observable<Long> c02 = Observable.c0(100, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable\n          .ti…S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$updateView$6(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(100, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$updateView$6(this), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
index f157b7a94f..71201bdd05 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
@@ -101,9 +101,9 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
             StoreUser users = companion.getUsers();
             StoreUserRelationships userRelationships = companion.getUserRelationships();
             StoreUserConnections userConnections = companion.getUserConnections();
-            Observable<StoreState> E = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{companion.getChannelsSelected(), companion.getPresences(), companion.getUsers(), companion.getUserRelationships(), companion.getApplicationStreaming(), companion.getUserConnections(), companion.getExperiments(), companion.getContactSync()}, false, null, null, 14, null), 1, TimeUnit.SECONDS).E(new FriendsListViewModel$Companion$observeStores$1(channelsSelected, presences, users, userRelationships, companion.getApplicationStreaming(), userConnections, companion.getExperiments(), companion.getContactSync(), companion.getFriendSuggestions()));
-            m.checkNotNullExpressionValue(E, "ObservationDeckProvider\n…            )\n          }");
-            return E;
+            Observable<StoreState> F = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{companion.getChannelsSelected(), companion.getPresences(), companion.getUsers(), companion.getUserRelationships(), companion.getApplicationStreaming(), companion.getUserConnections(), companion.getExperiments(), companion.getContactSync()}, false, null, null, 14, null), 1, TimeUnit.SECONDS).F(new FriendsListViewModel$Companion$observeStores$1(channelsSelected, presences, users, userRelationships, companion.getApplicationStreaming(), userConnections, companion.getExperiments(), companion.getContactSync(), companion.getFriendSuggestions()));
+            m.checkNotNullExpressionValue(F, "ObservationDeckProvider\n…            )\n          }");
+            return F;
         }
     }
 
@@ -1457,7 +1457,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
         this.storeChannels = storeChannels;
         this.restAPI = restAPI;
         this.listSections = new ListSections(null, n.emptyList(), null, n.emptyList(), n.emptyList(), null);
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -1493,9 +1493,9 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
     private final <T> Cancellable asyncComputeAndHandleOnUiThread(Function0<? extends T> function0, Function1<? super Error, Unit> function1, Function1<? super T, Unit> function12) {
         Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
         ref$ObjectRef.element = null;
-        Observable<T> W = Observable.n(new FriendsListViewModel$asyncComputeAndHandleOnUiThread$1(function0), Emitter.BackpressureMode.NONE).W(i0.p.a.a());
-        m.checkNotNullExpressionValue(W, "Observable\n        .crea…Schedulers.computation())");
-        Observable ui$default = ObservableExtensionsKt.ui$default(W, this, null, 2, null);
+        Observable<T> X = Observable.n(new FriendsListViewModel$asyncComputeAndHandleOnUiThread$1(function0), Emitter.BackpressureMode.NONE).X(i0.p.a.a());
+        m.checkNotNullExpressionValue(X, "Observable\n        .crea…Schedulers.computation())");
+        Observable ui$default = ObservableExtensionsKt.ui$default(X, this, null, 2, null);
         FriendsListViewModel$asyncComputeAndHandleOnUiThread$2 friendsListViewModel$asyncComputeAndHandleOnUiThread$2 = new FriendsListViewModel$asyncComputeAndHandleOnUiThread$2(function12);
         ObservableExtensionsKt.appSubscribe$default(ui$default, FriendsListViewModel.class, (Context) null, new FriendsListViewModel$asyncComputeAndHandleOnUiThread$4(ref$ObjectRef), new FriendsListViewModel$asyncComputeAndHandleOnUiThread$3(function1), (Function0) null, (Function0) null, friendsListViewModel$asyncComputeAndHandleOnUiThread$2, 50, (Object) null);
         return new FriendsListViewModel$asyncComputeAndHandleOnUiThread$5(ref$ObjectRef);
diff --git a/app/src/main/java/com/discord/widgets/friends/NearbyManager.java b/app/src/main/java/com/discord/widgets/friends/NearbyManager.java
index b8c5bdfbe0..382a5c3cb8 100644
--- a/app/src/main/java/com/discord/widgets/friends/NearbyManager.java
+++ b/app/src/main/java/com/discord/widgets/friends/NearbyManager.java
@@ -33,7 +33,7 @@ public final class NearbyManager {
     private MessageListener messageListener;
     private PublishOptions messagePublishOptions;
     private MessagesClient messagesClient;
-    private final BehaviorSubject<NearbyState> nearbyStateSubject = BehaviorSubject.k0(NearbyState.Uninitialized.INSTANCE);
+    private final BehaviorSubject<NearbyState> nearbyStateSubject = BehaviorSubject.l0(NearbyState.Uninitialized.INSTANCE);
     private final HashSet<Long> nearbyUserIds = new HashSet<>();
     private Message outboundMessage;
     private SubscribeOptions subscribeOptions;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
index f5115f27f6..9d7b8cc9b2 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
@@ -241,7 +241,7 @@ public final class WidgetFriendsAddById extends AppFragment {
         m.checkNotNullExpressionValue(textInputLayout2, "binding.friendsAddTextEditWrap");
         String str = null;
         ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetFriendsAddById$onViewBound$3(this), 1, null);
-        getBinding().f2234c.setOnClickListener(new WidgetFriendsAddById$onViewBound$4(this));
+        getBinding().f2233c.setOnClickListener(new WidgetFriendsAddById$onViewBound$4(this));
         Bundle extras = getMostRecentIntent().getExtras();
         if (extras != null) {
             str = extras.getString("android.intent.extra.TEXT");
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
index 5270773d66..a391c36663 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
@@ -194,9 +194,9 @@ public final class WidgetFriendsFindNearby extends AppFragment {
 
         public final Observable<Model> get(Observable<NearbyManager.NearbyState> observable) {
             m.checkNotNullParameter(observable, "nearbyStateObservable");
-            Observable<R> X = observable.X(WidgetFriendsFindNearby$ModelProvider$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(X, "nearbyStateObservable\n  …          }\n            }");
-            return X;
+            Observable<R> Y = observable.Y(WidgetFriendsFindNearby$ModelProvider$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "nearbyStateObservable\n  …          }\n            }");
+            return Y;
         }
     }
 
@@ -431,7 +431,7 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         }
         widgetFriendsAddUserAdapter4.setOnItemClick(new WidgetFriendsFindNearby$onViewBound$4(this));
         getBinding().b.setOnClickListener(new WidgetFriendsFindNearby$onViewBound$5(this));
-        getBinding().f2239c.setOnClickListener(WidgetFriendsFindNearby$onViewBound$6.INSTANCE);
+        getBinding().f2238c.setOnClickListener(WidgetFriendsFindNearby$onViewBound$6.INSTANCE);
         RLottieImageView rLottieImageView = getBinding().f;
         int dpToPixels = DimenUtils.dpToPixels(200);
         int dpToPixels2 = DimenUtils.dpToPixels(200);
@@ -461,13 +461,13 @@ public final class WidgetFriendsFindNearby extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable E = companion.getUserRelationships().observeForType(4).E(i.i);
-        Observable E2 = companion.getUserRelationships().observeForType(3).E(i.j);
+        Observable F = companion.getUserRelationships().observeForType(4).F(i.i);
+        Observable F2 = companion.getUserRelationships().observeForType(3).F(i.j);
         u uVar = u.i;
         if (uVar != null) {
             uVar = new v(uVar);
         }
-        Observable j = Observable.j(E, E2, (Func2) uVar);
+        Observable j = Observable.j(F, F2, (Func2) uVar);
         m.checkNotNullExpressionValue(j, "Observable\n        .comb…erRequestsModel\n        )");
         Observable q = ObservableExtensionsKt.computationLatest(j).q();
         m.checkNotNullExpressionValue(q, "Observable\n        .comb…  .distinctUntilChanged()");
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
index 6f38e40179..c681a43c1c 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
@@ -27,19 +27,19 @@ public final class WidgetFriendsList$configureToolbar$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_friends_add_friend /* 2131364188 */:
+            case R.id.menu_friends_add_friend /* 2131364183 */:
                 WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null);
                 return;
-            case R.id.menu_friends_contact_sync /* 2131364189 */:
+            case R.id.menu_friends_contact_sync /* 2131364184 */:
                 ContactSyncFlowAnalytics.Companion.trackStart$default(ContactSyncFlowAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null);
                 AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null));
                 WidgetContactSync.Companion companion2 = WidgetContactSync.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null);
                 return;
-            case R.id.menu_friends_start_group /* 2131364190 */:
+            case R.id.menu_friends_start_group /* 2131364185 */:
                 if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) {
                     GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion;
                     FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
index abbf0951a7..387bbe596c 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
@@ -207,7 +207,7 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
         if (widgetTabsHost != null) {
             widgetTabsHost.registerTabSelectionListener(NavigationTab.FRIENDS, this);
         }
-        getBinding().f2237c.updateView(ANALYTICS_SOURCE);
+        getBinding().f2236c.updateView(ANALYTICS_SOURCE);
         getBinding().b.updateView(false);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().f;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
index 13a1d4aee7..2fdd018bf3 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
@@ -165,7 +165,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             m.checkNotNullParameter(item, "data");
             super.onConfigure(i, (int) item);
             FriendsListViewModel.Item.PendingHeader pendingHeader = (FriendsListViewModel.Item.PendingHeader) item;
-            TextView textView = this.binding.f2238c;
+            TextView textView = this.binding.f2237c;
             m.checkNotNullExpressionValue(textView, "binding.friendsListPendingItemHeaderText");
             b.n(textView, pendingHeader.getTitleStringResId(), new Object[]{Integer.valueOf(pendingHeader.getCount())}, null, 4);
             if (pendingHeader.getShowExpandButton()) {
@@ -255,18 +255,18 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             this.binding.g.setPresence(pendingFriendRequest.getPresence());
             int relationshipType = pendingFriendRequest.getRelationshipType();
             if (relationshipType == 3) {
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f2236c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f2235c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemActivity");
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.f2236c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.f2235c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.friendsListItemActivity");
                 ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.j(simpleDraweeSpanTextView2, R.string.incoming_friend_request, new Object[0], null, 4));
                 AppCompatImageView appCompatImageView = this.binding.b;
                 m.checkNotNullExpressionValue(appCompatImageView, "binding.friendsListItemAcceptButton");
                 appCompatImageView.setVisibility(0);
             } else if (relationshipType == 4) {
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.binding.f2236c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.binding.f2235c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.friendsListItemActivity");
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.binding.f2236c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.binding.f2235c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.friendsListItemActivity");
                 ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView3, b.j(simpleDraweeSpanTextView4, R.string.outgoing_friend_request, new Object[0], null, 4));
                 AppCompatImageView appCompatImageView2 = this.binding.b;
@@ -332,7 +332,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             CharSequence charSequence;
             m.checkNotNullParameter(item, "data");
             FriendsListViewModel.Item.SuggestedFriendsHeader suggestedFriendsHeader = (FriendsListViewModel.Item.SuggestedFriendsHeader) item;
-            TextView textView = this.binding.f2238c;
+            TextView textView = this.binding.f2237c;
             m.checkNotNullExpressionValue(textView, "binding.friendsListPendingItemHeaderText");
             b.m(textView, R.string.friends_friend_suggestions_header, new Object[0], new WidgetFriendsListAdapter$ItemSuggestedFriendHeader$onConfigure$1(item));
             if (suggestedFriendsHeader.getShowExpandButton()) {
@@ -433,7 +433,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemActivity");
             PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null);
-            SimpleDraweeView simpleDraweeView = this.binding.f2235c;
+            SimpleDraweeView simpleDraweeView = this.binding.f2234c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, friend.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
             this.binding.d.setOnClickListener(new WidgetFriendsListAdapter$ItemUser$onConfigure$2(this, friend));
diff --git a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
index 02ff203e30..d8307fc785 100644
--- a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
@@ -18,7 +18,7 @@ import rx.subjects.PublishSubject;
 public final class GuildDeleteFeedbackSheetViewModel extends AppViewModel<FeedbackSheetViewModel.ViewState> implements FeedbackSheetViewModel {
     public static final Companion Companion = new Companion(null);
     private static final List<FeedbackIssue> REASONS = n.listOf((Object[]) new FeedbackIssue[]{FeedbackIssue.GUILD_DELETE_TOO_HARD, FeedbackIssue.GUILD_DELETE_TEST, FeedbackIssue.GUILD_DELETE_ACCIDENT, FeedbackIssue.GUILD_DELETE_TEMPLATE, FeedbackIssue.GUILD_DELETE_LONELY, FeedbackIssue.GUILD_DELETE_INACTIVE});
-    private final PublishSubject<FeedbackSheetViewModel.Event> eventSubject = PublishSubject.j0();
+    private final PublishSubject<FeedbackSheetViewModel.Event> eventSubject = PublishSubject.k0();
     private PendingFeedback.GuildDeleteFeedback pendingFeedback;
     private boolean submitted;
 
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtils.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtils.java
index 1b63481bc5..8eea35c23e 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtils.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtils.java
@@ -34,9 +34,9 @@ public final class GuildRoleSubscriptionUtils {
     }
 
     private final Observable<GuildRoleSubscriptionTierListing> updateGuildRoleSubscriptionDesign(RestAPI restAPI, long j, Integer num, String str, GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) {
-        Observable<R> E = restAPI.updateRole(j, guildRoleSubscriptionTierListing.h(), new RestAPIParams.Role(null, null, null, num, null, null, guildRoleSubscriptionTierListing.h(), str, 55, null)).E(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionDesign$1(guildRoleSubscriptionTierListing));
-        m.checkNotNullExpressionValue(E, "restApi\n          .updat…onTierListing\n          }");
-        return E;
+        Observable<R> F = restAPI.updateRole(j, guildRoleSubscriptionTierListing.h(), new RestAPIParams.Role(null, null, null, num, null, null, guildRoleSubscriptionTierListing.h(), str, 55, null)).F(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionDesign$1(guildRoleSubscriptionTierListing));
+        m.checkNotNullExpressionValue(F, "restApi\n          .updat…onTierListing\n          }");
+        return F;
     }
 
     public static /* synthetic */ Observable updateGuildRoleSubscriptionDesign$default(GuildRoleSubscriptionUtils guildRoleSubscriptionUtils, RestAPI restAPI, long j, Integer num, String str, GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing, int i, Object obj) {
@@ -53,9 +53,9 @@ public final class GuildRoleSubscriptionUtils {
         m.checkNotNullParameter(str3, "tierName");
         m.checkNotNullParameter(list, "channelBenefits");
         m.checkNotNullParameter(list2, "intangibleBenefits");
-        Observable<R> y2 = restAPI.createGuildRoleSubscriptionGroupListing(j, new RestAPIParams.CreateGuildRoleSubscriptionGroupListing(str, str2)).y(new GuildRoleSubscriptionUtils$createGuildRoleSubscriptionGroupListing$1(storeGuildRoleSubscriptions, j, restAPI, str3, str4, i, str5, i2, str6, list, list2));
-        m.checkNotNullExpressionValue(y2, "restApi\n        .createG…ts,\n          )\n        }");
-        return ObservableExtensionsKt.restSubscribeOn$default(y2, false, 1, null);
+        Observable<R> z2 = restAPI.createGuildRoleSubscriptionGroupListing(j, new RestAPIParams.CreateGuildRoleSubscriptionGroupListing(str, str2)).z(new GuildRoleSubscriptionUtils$createGuildRoleSubscriptionGroupListing$1(storeGuildRoleSubscriptions, j, restAPI, str3, str4, i, str5, i2, str6, list, list2));
+        m.checkNotNullExpressionValue(z2, "restApi\n        .createG…ts,\n          )\n        }");
+        return ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null);
     }
 
     public final Observable<GuildRoleSubscriptionTierListing> createGuildRoleSubscriptionTierListing(RestAPI restAPI, StoreGuildRoleSubscriptions storeGuildRoleSubscriptions, long j, long j2, String str, String str2, int i, String str3, int i2, String str4, List<? extends Benefit> list, List<? extends Benefit> list2) {
@@ -69,19 +69,19 @@ public final class GuildRoleSubscriptionUtils {
         for (Benefit benefit : plus) {
             arrayList.add(benefit.toGuildRoleSubscriptionBenefit());
         }
-        Observable<R> y2 = restAPI.createGuildRoleSubscriptionTier(j, j2, new RestAPIParams.CreateGuildRoleSubscriptionTierListing(str, str3, str2, arrayList, i)).y(new GuildRoleSubscriptionUtils$createGuildRoleSubscriptionTierListing$1(restAPI, j, i2, str4));
-        m.checkNotNullExpressionValue(y2, "restApi\n        .createG…ng,\n          )\n        }");
-        Observable<GuildRoleSubscriptionTierListing> s = ObservableExtensionsKt.restSubscribeOn$default(y2, false, 1, null).s(new GuildRoleSubscriptionUtils$createGuildRoleSubscriptionTierListing$2(storeGuildRoleSubscriptions, j, j2));
-        m.checkNotNullExpressionValue(s, "restApi\n        .createG…ing\n          )\n        }");
-        return s;
+        Observable<R> z2 = restAPI.createGuildRoleSubscriptionTier(j, j2, new RestAPIParams.CreateGuildRoleSubscriptionTierListing(str, str3, str2, arrayList, i)).z(new GuildRoleSubscriptionUtils$createGuildRoleSubscriptionTierListing$1(restAPI, j, i2, str4));
+        m.checkNotNullExpressionValue(z2, "restApi\n        .createG…ng,\n          )\n        }");
+        Observable<GuildRoleSubscriptionTierListing> t = ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null).t(new GuildRoleSubscriptionUtils$createGuildRoleSubscriptionTierListing$2(storeGuildRoleSubscriptions, j, j2));
+        m.checkNotNullExpressionValue(t, "restApi\n        .createG…ing\n          )\n        }");
+        return t;
     }
 
     public final Observable<GuildRoleSubscriptionGroupListing> updateGuildRoleSubscriptionGroupListing(RestAPI restAPI, StoreGuildRoleSubscriptions storeGuildRoleSubscriptions, long j, long j2, String str, String str2) {
         m.checkNotNullParameter(restAPI, "restApi");
         m.checkNotNullParameter(storeGuildRoleSubscriptions, "storeGuildRoleSubscriptions");
-        Observable<GuildRoleSubscriptionGroupListing> s = ObservableExtensionsKt.restSubscribeOn$default(restAPI.updateGuildRoleSubscriptionGroupListing(j, j2, new RestAPIParams.UpdateGuildRoleSubscriptionGroupListing(str, str2)), false, 1, null).s(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionGroupListing$1(storeGuildRoleSubscriptions, j));
-        m.checkNotNullExpressionValue(s, "restApi\n        .updateG…, groupListing)\n        }");
-        return s;
+        Observable<GuildRoleSubscriptionGroupListing> t = ObservableExtensionsKt.restSubscribeOn$default(restAPI.updateGuildRoleSubscriptionGroupListing(j, j2, new RestAPIParams.UpdateGuildRoleSubscriptionGroupListing(str, str2)), false, 1, null).t(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionGroupListing$1(storeGuildRoleSubscriptions, j));
+        m.checkNotNullExpressionValue(t, "restApi\n        .updateG…, groupListing)\n        }");
+        return t;
     }
 
     public final Observable<GuildRoleSubscriptionTierListing> updateGuildRoleSubscriptionTierListing(RestAPI restAPI, StoreGuildRoleSubscriptions storeGuildRoleSubscriptions, long j, long j2, long j3, String str, String str2, String str3, Integer num, String str4, List<? extends Benefit> list, List<? extends Benefit> list2, Boolean bool) {
@@ -98,10 +98,10 @@ public final class GuildRoleSubscriptionUtils {
         } else {
             arrayList = null;
         }
-        Observable<R> y2 = restAPI.updateGuildRoleSubscriptionTierListing(j, j2, j3, new RestAPIParams.UpdateGuildRoleSubscriptionTierListing(str, str3, str2, arrayList, bool)).y(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionTierListing$2(restAPI, j, num, str4));
-        m.checkNotNullExpressionValue(y2, "restApi\n        .updateG…ng,\n          )\n        }");
-        Observable<GuildRoleSubscriptionTierListing> s = ObservableExtensionsKt.restSubscribeOn$default(y2, false, 1, null).s(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionTierListing$3(storeGuildRoleSubscriptions, j));
-        m.checkNotNullExpressionValue(s, "restApi\n        .updateG…te(guildId, it)\n        }");
-        return s;
+        Observable<R> z2 = restAPI.updateGuildRoleSubscriptionTierListing(j, j2, j3, new RestAPIParams.UpdateGuildRoleSubscriptionTierListing(str, str3, str2, arrayList, bool)).z(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionTierListing$2(restAPI, j, num, str4));
+        m.checkNotNullExpressionValue(z2, "restApi\n        .updateG…ng,\n          )\n        }");
+        Observable<GuildRoleSubscriptionTierListing> t = ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null).t(new GuildRoleSubscriptionUtils$updateGuildRoleSubscriptionTierListing$3(storeGuildRoleSubscriptions, j));
+        m.checkNotNullExpressionValue(t, "restApi\n        .updateG…te(guildId, it)\n        }");
+        return t;
     }
 }
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 0178433fd1..9836a11c69 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().f2333c;
+        RecyclerView recyclerView = getBinding().f2331c;
         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().f2333c.addItemDecoration(new f(requireContext, 1, 0, dimensionPixelSize, dimensionPixelSize, 4));
+        getBinding().f2331c.addItemDecoration(new f(requireContext, 1, 0, dimensionPixelSize, dimensionPixelSize, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/entrypoint/WidgetGuildRoleSubscriptionEntryPoint.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/entrypoint/WidgetGuildRoleSubscriptionEntryPoint.java
index f68d1e4845..6a887feb9c 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/entrypoint/WidgetGuildRoleSubscriptionEntryPoint.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/entrypoint/WidgetGuildRoleSubscriptionEntryPoint.java
@@ -71,7 +71,7 @@ public final class WidgetGuildRoleSubscriptionEntryPoint extends AppFragment {
         } else if (viewState instanceof WidgetGuildRoleSubscriptionEntryPointViewModel.ViewState.Invalid) {
             requireActivity().onBackPressed();
         } else if (viewState instanceof WidgetGuildRoleSubscriptionEntryPointViewModel.ViewState.Valid) {
-            TextView textView2 = getViewBinding().f2272c;
+            TextView textView2 = getViewBinding().f2270c;
             m.checkNotNullExpressionValue(textView2, "viewBinding.title");
             b.m(textView2, R.string.guild_role_subscription_purchase_page_unavailable_cta_hook, new Object[0], new WidgetGuildRoleSubscriptionEntryPoint$configureUI$1(this, viewState));
             TextView textView3 = getViewBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java
index 832e5755a4..00b999f4c8 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java
@@ -284,7 +284,7 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel<
         this.guildId = j;
         this.restApi = restAPI;
         this.storeGuildRoleSubscriptions = storeGuildRoleSubscriptions;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java
index e2f5a6987c..29371edb90 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java
@@ -150,7 +150,7 @@ public final class WidgetGuildRoleSubscriptionPlanDetails extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        TextInputEditText textInputEditText = getBinding().f2273c;
+        TextInputEditText textInputEditText = getBinding().f2271c;
         m.checkNotNullExpressionValue(textInputEditText, "binding.guildRoleSubscriptionPlanDescription");
         TextWatcherKt.addLifecycleAwareTextWatcher(textInputEditText, this, new WidgetGuildRoleSubscriptionPlanDetails$onViewBound$1(this));
         getBinding().b.setOnClickListener(new WidgetGuildRoleSubscriptionPlanDetails$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanFormat.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanFormat.java
index 3ad343fcbb..c5e0e612eb 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanFormat.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanFormat.java
@@ -112,7 +112,7 @@ public final class WidgetGuildRoleSubscriptionPlanFormat extends AppFragment {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscriptionFormatTitle");
         textView.setVisibility(getHideHeader() ^ true ? 0 : 8);
-        TextView textView2 = getBinding().f2274c;
+        TextView textView2 = getBinding().f2272c;
         m.checkNotNullExpressionValue(textView2, "binding.guildRoleSubscriptionFormatSubtitle");
         textView2.setVisibility(getHideHeader() ^ true ? 0 : 8);
         View view2 = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java
index 4195534b69..13278451e2 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java
@@ -199,7 +199,7 @@ public final class CreateGuildRoleSubscriptionTierViewModel extends AppViewModel
         this.groupListingId = j2;
         this.restApi = restAPI;
         this.storeGuildRoleSubscriptions = storeGuildRoleSubscriptions;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java
index a204bf5d4f..5aa60c2476 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java
@@ -29,9 +29,9 @@ public final class GuildRoleSubscriptionMemberPreview extends FrameLayout {
         this.binding = b;
         this.defaultColor$delegate = g.lazy(new GuildRoleSubscriptionMemberPreview$defaultColor$2(this));
         if (isInEditMode()) {
-            b.f2195c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
+            b.f2194c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         } else {
-            b.f2195c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
+            b.f2194c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         }
         TextView textView = b.f;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextTag");
@@ -53,9 +53,9 @@ public final class GuildRoleSubscriptionMemberPreview extends FrameLayout {
         this.binding = b;
         this.defaultColor$delegate = g.lazy(new GuildRoleSubscriptionMemberPreview$defaultColor$2(this));
         if (isInEditMode()) {
-            b.f2195c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
+            b.f2194c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         } else {
-            b.f2195c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
+            b.f2194c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         }
         TextView textView = b.f;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextTag");
@@ -77,9 +77,9 @@ public final class GuildRoleSubscriptionMemberPreview extends FrameLayout {
         this.binding = b;
         this.defaultColor$delegate = g.lazy(new GuildRoleSubscriptionMemberPreview$defaultColor$2(this));
         if (isInEditMode()) {
-            b.f2195c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
+            b.f2194c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         } else {
-            b.f2195c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
+            b.f2194c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         }
         TextView textView = b.f;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextTag");
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 e5e4f929d1..5baebd6dcc 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
@@ -136,7 +136,7 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment {
         }
         if (drawable != null) {
             view.setBackground(drawable);
-            getBinding().f2277c.setOnClickListener(new WidgetGuildRoleSubscriptionTierDesign$setupMemberColor$2(this, i));
+            getBinding().f2275c.setOnClickListener(new WidgetGuildRoleSubscriptionTierDesign$setupMemberColor$2(this, i));
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscri…onTierAppearanceColorText");
             StringBuilder sb = new StringBuilder();
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 e5ae814422..50de888c88 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
@@ -90,7 +90,7 @@ public final class WidgetGuildRoleSubscriptionTierDetails extends AppFragment {
         TextInputLayout textInputLayout = getBinding().f;
         m.checkNotNullExpressionValue(textInputLayout, "binding.createSubscriptionTierNameLayout");
         ViewExtensions.setTextIfDifferent(textInputLayout, guildRoleSubscriptionTier.getName());
-        TextInputLayout textInputLayout2 = getBinding().f2271c;
+        TextInputLayout textInputLayout2 = getBinding().f2269c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.createSubscriptionTierDescriptionLayout");
         ViewExtensions.setTextIfDifferent(textInputLayout2, guildRoleSubscriptionTier.getDescription());
         getBinding().d.updateImage(guildRoleSubscriptionTier);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionTierBenefitViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionTierBenefitViewModel.java
index af68b29118..817c744bd9 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionTierBenefitViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionTierBenefitViewModel.java
@@ -285,7 +285,7 @@ public final class GuildRoleSubscriptionTierBenefitViewModel extends AppViewMode
         Benefit.ChannelBenefit channelBenefit2 = (Benefit.ChannelBenefit) (!z3 ? null : benefit);
         this.benefitType = guildRoleSubscriptionBenefitType;
         this.tierName = str;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java
index efe1a481ff..a16a3a53dd 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java
@@ -227,7 +227,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefit extends AppFragment {
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildRoleSubscri…tangibleBenefitNameLayout");
         textInputLayout.setVisibility(0);
-        TextView textView3 = getBinding().f2275c;
+        TextView textView3 = getBinding().f2273c;
         m.checkNotNullExpressionValue(textView3, "binding.guildRoleSubscri…ntangibleBenefitNameLabel");
         textView3.setVisibility(0);
         TextInputLayout textInputLayout2 = getBinding().d;
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 692ddb9575..2c45472fc1 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
@@ -187,7 +187,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscriptionTierBenefitsTitle");
         textView.setText(getString(R.string.guild_role_subscription_create_tier_channel_benefits_title));
-        TextView textView2 = getBinding().f2276c;
+        TextView textView2 = getBinding().f2274c;
         m.checkNotNullExpressionValue(textView2, "binding.guildRoleSubscriptionTierBenefitsSubTitle");
         textView2.setText(getString(R.string.guild_role_subscription_create_tier_channel_benefits_description));
         RadioGroup radioGroup = getBinding().e;
@@ -200,7 +200,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscriptionTierBenefitsTitle");
         textView.setText(getString(R.string.guild_role_subscription_create_tier_intangible_benefits_title));
-        TextView textView2 = getBinding().f2276c;
+        TextView textView2 = getBinding().f2274c;
         m.checkNotNullExpressionValue(textView2, "binding.guildRoleSubscriptionTierBenefitsSubTitle");
         textView2.setText(getString(R.string.guild_role_subscription_create_tier_intangible_benefits_description));
         RadioGroup radioGroup = getBinding().e;
@@ -217,7 +217,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscriptionTierBenefitsTitle");
         int i = 0;
         textView.setVisibility(getHideHeader() ^ true ? 0 : 8);
-        TextView textView2 = getBinding().f2276c;
+        TextView textView2 = getBinding().f2274c;
         m.checkNotNullExpressionValue(textView2, "binding.guildRoleSubscriptionTierBenefitsSubTitle");
         if (!(!getHideHeader())) {
             i = 8;
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
index cc5aea90fb..9d97a52624 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
@@ -147,7 +147,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
                     Selection.setSelection(text, ViewExtensions.getTextOrEmpty(textInputLayout5).length());
                 }
             }
-            TextView textView = getBinding().f2251c;
+            TextView textView = getBinding().f2250c;
             m.checkNotNullExpressionValue(textView, "binding.guildFolderColorName");
             StringBuilder sb = new StringBuilder();
             sb.append(MentionUtilsKt.CHANNELS_CHAR);
@@ -226,23 +226,23 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         kVar.i = false;
         kVar.g = getColorsToDisplay(intValue);
         kVar.a = R.string.guild_folder_color;
-        kVar.f2907r = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary);
+        kVar.f2905r = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f2909x = fontUtils.getThemedFontResId(getContext(), R.attr.font_display_bold);
+        kVar.f2907x = fontUtils.getThemedFontResId(getContext(), R.attr.font_display_bold);
         kVar.o = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundAccent);
-        kVar.f2906c = R.string.color_picker_custom;
+        kVar.f2904c = R.string.color_picker_custom;
         kVar.v = ColorCompat.getColor(getContext(), (int) R.color.white);
         kVar.b = R.string.color_picker_presets;
         kVar.p = ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand);
         kVar.d = R.string.select;
         kVar.l = true;
         kVar.e = R.string.reset;
-        kVar.f2908w = ColorCompat.getColor(getContext(), (int) R.color.white);
-        kVar.f2910y = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_semibold);
+        kVar.f2906w = ColorCompat.getColor(getContext(), (int) R.color.white);
+        kVar.f2908y = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_semibold);
         kVar.q = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundModifierAccent);
         kVar.t = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextMuted);
         kVar.u = R.drawable.drawable_cpv_edit_text_background;
-        kVar.f2911z = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_normal);
+        kVar.f2909z = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_normal);
         ColorPickerDialog a = kVar.a();
         a.j = new WidgetGuildFolderSettings$launchColorPicker$1(this);
         AppFragment.hideKeyboard$default(this, null, 1, null);
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
index 528adeb257..03d41954a2 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
@@ -449,7 +449,7 @@ public final class WidgetGuildFolderSettingsViewModel extends AppViewModel<ViewS
         this.folderId = j;
         this.storeUserSettings = storeUserSettings;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Companion.access$observeStoreState(Companion, j, storeUserSettings, storeGuildsSorted)), this, null, 2, null), WidgetGuildFolderSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
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 958a66369e..d829639670 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.f2284c;
+                SimpleDraweeView simpleDraweeView = this.binding.f2282c;
                 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.f2284c;
+                SimpleDraweeView simpleDraweeView2 = this.binding.f2282c;
                 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;
@@ -396,9 +396,9 @@ public final class WidgetGuildSelector extends AppBottomSheet {
     }
 
     private final Observable<List<Item>> get(boolean z2, FilterFunction filterFunction) {
-        Observable<R> E = StoreStream.Companion.getGuildsSorted().observeOrderedGuilds().E(new WidgetGuildSelector$get$1(filterFunction, z2));
-        m.checkNotNullExpressionValue(E, "StoreStream.getGuildsSor….map { Item(it) }\n      }");
-        Observable<List<Item>> q = ObservableExtensionsKt.computationLatest(E).q();
+        Observable<R> F = StoreStream.Companion.getGuildsSorted().observeOrderedGuilds().F(new WidgetGuildSelector$get$1(filterFunction, z2));
+        m.checkNotNullExpressionValue(F, "StoreStream.getGuildsSor….map { Item(it) }\n      }");
+        Observable<List<Item>> q = ObservableExtensionsKt.computationLatest(F).q();
         m.checkNotNullExpressionValue(q, "StoreStream.getGuildsSor…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java
index a9e628653f..6b230b92e3 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java
@@ -303,7 +303,7 @@ public final class FolderContextMenuViewModel extends AppViewModel<ViewState> {
         this.folderId = j;
         this.restAPI = restAPI;
         this.storeStateObservable = observable;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.guildIds = n.emptyList();
         this.unreadGuildIds = n0.emptySet();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), FolderContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -371,9 +371,9 @@ public final class FolderContextMenuViewModel extends AppViewModel<ViewState> {
         for (Number number : intersect) {
             arrayList.add(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.ackGuild(number.longValue()), false, 1, null));
         }
-        Observable e02 = Observable.F(Observable.g0(new q(arrayList))).e0();
-        m.checkNotNullExpressionValue(e02, "Observable\n        .merg…tCalls)\n        .toList()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), FolderContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new FolderContextMenuViewModel$onMarkAsReadClicked$1(this), 62, (Object) null);
+        Observable f02 = Observable.G(Observable.h0(new q(arrayList))).f0();
+        m.checkNotNullExpressionValue(f02, "Observable\n        .merg…tCalls)\n        .toList()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(f02, this, null, 2, null), FolderContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new FolderContextMenuViewModel$onMarkAsReadClicked$1(this), 62, (Object) null);
     }
 
     public final void onSettingsClicked() {
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java
index 3d22f326e6..1006d69c8d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java
@@ -364,7 +364,7 @@ public final class GuildContextMenuViewModel extends AppViewModel<ViewState> {
         this.guildId = j;
         this.restAPI = restAPI;
         this.storeStateObservable = observable;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), GuildContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
index 028e0a4385..cb2f957d56 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
@@ -203,7 +203,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
     }
 
     private final void configureValidUI(FolderContextMenuViewModel.ViewState.Valid valid) {
-        TextView textView = getBinding().f2233c;
+        TextView textView = getBinding().f2232c;
         m.checkNotNullExpressionValue(textView, "binding.folderContextMenuHeader");
         CharSequence name = valid.getFolder().getName();
         boolean z2 = false;
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
index 9c4672160f..ef41a8ec70 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
@@ -198,7 +198,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
     }
 
     private final void configureValidUI(GuildContextMenuViewModel.ViewState.Valid valid) {
-        TextView textView = getBinding().f2249c;
+        TextView textView = getBinding().f2248c;
         m.checkNotNullExpressionValue(textView, "binding.guildContextMenuHeader");
         textView.setText(valid.getGuild().getName());
         getBinding().e.setOnClickListener(new WidgetGuildContextMenu$configureValidUI$1(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java b/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
index 30f0d06a4e..da1be93339 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
@@ -7,7 +7,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public abstract class ChannelTemplate {
 
     /* renamed from: id  reason: collision with root package name */
-    private final Long f2638id;
+    private final Long f2636id;
     private final String name;
 
     /* compiled from: StockGuildTemplate.kt */
@@ -29,7 +29,7 @@ public abstract class ChannelTemplate {
     }
 
     private ChannelTemplate(Long l, String str) {
-        this.f2638id = l;
+        this.f2636id = l;
         this.name = str;
     }
 
@@ -38,7 +38,7 @@ public abstract class ChannelTemplate {
     }
 
     public final Long getId() {
-        return this.f2638id;
+        return this.f2636id;
     }
 
     public final String getName() {
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java b/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java
index 9219142e3b..c2648d2298 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java
@@ -134,7 +134,7 @@ public interface GuildCreateCloneViews {
             ConstraintLayout constraintLayout = j0Var.a;
             m.checkNotNullExpressionValue(constraintLayout, "binding.guildCreateIconUploader.root");
             this.guildCreateIconUploader = constraintLayout;
-            LinkifiedTextView linkifiedTextView = widgetGuildCreateBinding.f2250c;
+            LinkifiedTextView linkifiedTextView = widgetGuildCreateBinding.f2249c;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.guildCreateGuidelines");
             this.guidelinesTextView = linkifiedTextView;
             ScreenTitleView screenTitleView = widgetGuildCreateBinding.f;
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
index b6181014f7..41a6773b8d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
@@ -121,7 +121,7 @@ public final class WidgetCreationIntent extends AppFragment {
         if (IS_FRIENDS_FIRST) {
             MaterialCardView materialCardView = getBinding().b;
             m.checkNotNullExpressionValue(materialCardView, "binding.creationIntentFirstOption");
-            TextView textView = getBinding().f2212c;
+            TextView textView = getBinding().f2211c;
             m.checkNotNullExpressionValue(textView, "binding.creationIntentFirstOptionText");
             configureFriendsButton(materialCardView, textView);
             MaterialCardView materialCardView2 = getBinding().d;
@@ -132,7 +132,7 @@ public final class WidgetCreationIntent extends AppFragment {
         } else {
             MaterialCardView materialCardView3 = getBinding().b;
             m.checkNotNullExpressionValue(materialCardView3, "binding.creationIntentFirstOption");
-            TextView textView3 = getBinding().f2212c;
+            TextView textView3 = getBinding().f2211c;
             m.checkNotNullExpressionValue(textView3, "binding.creationIntentFirstOptionText");
             configureCommunityButton(materialCardView3, textView3);
             MaterialCardView materialCardView4 = getBinding().d;
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
index 3a2d04b9db..6fb1722dc7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
@@ -85,30 +85,30 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
         StoreStream.Companion.getGuildTemplates().clearDynamicLinkGuildTemplateCode();
         int i = 0;
         if (m.areEqual(viewState, WidgetGuildCreateViewModel.ViewState.Uninitialized.INSTANCE)) {
-            AppViewFlipper appViewFlipper = getBinding().f2248c;
+            AppViewFlipper appViewFlipper = getBinding().f2247c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.guildCreateFlipper");
             appViewFlipper.setDisplayedChild(0);
         } else if (viewState instanceof WidgetGuildCreateViewModel.ViewState.Initialized) {
             WidgetGuildCreateViewModel.ViewState.Initialized initialized = (WidgetGuildCreateViewModel.ViewState.Initialized) viewState;
             StoreGuildTemplates.GuildTemplateState guildTemplate = initialized.getGuildTemplate();
             if (m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.None.INSTANCE) || m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.Invalid.INSTANCE) || m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.LoadFailed.INSTANCE)) {
-                AppViewFlipper appViewFlipper2 = getBinding().f2248c;
+                AppViewFlipper appViewFlipper2 = getBinding().f2247c;
                 m.checkNotNullExpressionValue(appViewFlipper2, "binding.guildCreateFlipper");
                 appViewFlipper2.setDisplayedChild(1);
             } else if (m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.Loading.INSTANCE)) {
-                AppViewFlipper appViewFlipper3 = getBinding().f2248c;
+                AppViewFlipper appViewFlipper3 = getBinding().f2247c;
                 m.checkNotNullExpressionValue(appViewFlipper3, "binding.guildCreateFlipper");
                 appViewFlipper3.setDisplayedChild(0);
             } else if (guildTemplate instanceof StoreGuildTemplates.GuildTemplateState.Resolved) {
                 ModelGuildTemplate guildTemplate2 = ((StoreGuildTemplates.GuildTemplateState.Resolved) initialized.getGuildTemplate()).getGuildTemplate();
                 Guild serializedSourceGuild = guildTemplate2.getSerializedSourceGuild();
                 if (serializedSourceGuild == null) {
-                    AppViewFlipper appViewFlipper4 = getBinding().f2248c;
+                    AppViewFlipper appViewFlipper4 = getBinding().f2247c;
                     m.checkNotNullExpressionValue(appViewFlipper4, "binding.guildCreateFlipper");
                     appViewFlipper4.setDisplayedChild(1);
                     return;
                 }
-                AppViewFlipper appViewFlipper5 = getBinding().f2248c;
+                AppViewFlipper appViewFlipper5 = getBinding().f2247c;
                 m.checkNotNullExpressionValue(appViewFlipper5, "binding.guildCreateFlipper");
                 appViewFlipper5.setDisplayedChild(2);
                 TextView textView = getBinding().g;
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
index bbeeab9a93..076673aa17 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
@@ -562,7 +562,7 @@ public final class WidgetGuildCreateViewModel extends AppViewModel<ViewState> {
         this.closeWithResult = z3;
         this.selectedGuildStore = storeGuildSelected;
         this.restAPI = restAPI;
-        this.eventsSubject = PublishSubject.j0();
+        this.eventsSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetGuildCreateViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
 
@@ -578,10 +578,10 @@ public final class WidgetGuildCreateViewModel extends AppViewModel<ViewState> {
         RestAPI api = (i2 & 256) != 0 ? RestAPI.Companion.getApi() : restAPI;
         if ((i2 & 512) != 0) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable Y = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Y(1);
-            Observable<StoreGuildTemplates.GuildTemplateState> jVar = str == null ? new j<>(StoreGuildTemplates.GuildTemplateState.None.INSTANCE) : companion.getGuildTemplates().observeGuildTemplate(str).t(new AnonymousClass1(str));
+            Observable Z = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Z(1);
+            Observable<StoreGuildTemplates.GuildTemplateState> jVar = str == null ? new j<>(StoreGuildTemplates.GuildTemplateState.None.INSTANCE) : companion.getGuildTemplates().observeGuildTemplate(str).u(new AnonymousClass1(str));
             AnonymousClass2 r0 = AnonymousClass2.INSTANCE;
-            Observable j = Observable.j(Y, jVar, (Func2) (r0 != null ? new WidgetGuildCreateViewModel$sam$rx_functions_Func2$0(r0) : r0));
+            Observable j = Observable.j(Z, jVar, (Func2) (r0 != null ? new WidgetGuildCreateViewModel$sam$rx_functions_Func2$0(r0) : r0));
             m.checkNotNullExpressionValue(j, "Observable.combineLatest…},\n      ::StoreState\n  )");
             observable2 = j;
         } else {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java
index 497e8f9987..09bedb5ddd 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java
@@ -332,9 +332,9 @@ public final class GuildInviteSettingsViewModel extends AppViewModel<ViewState>
         this.guildId = j;
         this.storeInviteSettings = storeInviteSettings;
         this.targetChannelSelector = targetChannelSelector;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.eventSubject = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), GuildInviteSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
index 819ad7715d..0cb745117b 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
@@ -161,7 +161,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             private final List<InviteSuggestion> inviteSuggestions;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2639me;
+            private final MeUser f2637me;
 
             /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.List<? extends com.discord.widgets.guilds.invite.InviteSuggestion> */
             /* JADX WARN: Multi-variable type inference failed */
@@ -177,7 +177,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                 m.checkNotNullParameter(map2, "guildStageInstances");
                 this.inviteSettings = settings;
                 this.invitableChannels = map;
-                this.f2639me = meUser;
+                this.f2637me = meUser;
                 this.dms = list;
                 this.guild = guild;
                 this.inviteSuggestions = list2;
@@ -194,7 +194,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                     map = valid.invitableChannels;
                 }
                 if ((i & 4) != 0) {
-                    meUser = valid.f2639me;
+                    meUser = valid.f2637me;
                 }
                 if ((i & 8) != 0) {
                     list = valid.dms;
@@ -220,7 +220,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             }
 
             public final MeUser component3() {
-                return this.f2639me;
+                return this.f2637me;
             }
 
             public final List<Channel> component4() {
@@ -258,7 +258,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                     return false;
                 }
                 Valid valid = (Valid) obj;
-                return m.areEqual(this.inviteSettings, valid.inviteSettings) && m.areEqual(this.invitableChannels, valid.invitableChannels) && m.areEqual(this.f2639me, valid.f2639me) && m.areEqual(this.dms, valid.dms) && m.areEqual(this.guild, valid.guild) && m.areEqual(this.inviteSuggestions, valid.inviteSuggestions) && m.areEqual(this.guildStageInstances, valid.guildStageInstances);
+                return m.areEqual(this.inviteSettings, valid.inviteSettings) && m.areEqual(this.invitableChannels, valid.invitableChannels) && m.areEqual(this.f2637me, valid.f2637me) && m.areEqual(this.dms, valid.dms) && m.areEqual(this.guild, valid.guild) && m.areEqual(this.inviteSuggestions, valid.inviteSuggestions) && m.areEqual(this.guildStageInstances, valid.guildStageInstances);
             }
 
             public final List<Channel> getDms() {
@@ -286,7 +286,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             }
 
             public final MeUser getMe() {
-                return this.f2639me;
+                return this.f2637me;
             }
 
             public int hashCode() {
@@ -295,7 +295,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                 int hashCode = (settings != null ? settings.hashCode() : 0) * 31;
                 Map<Long, Channel> map = this.invitableChannels;
                 int hashCode2 = (hashCode + (map != null ? map.hashCode() : 0)) * 31;
-                MeUser meUser = this.f2639me;
+                MeUser meUser = this.f2637me;
                 int hashCode3 = (hashCode2 + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 List<Channel> list = this.dms;
                 int hashCode4 = (hashCode3 + (list != null ? list.hashCode() : 0)) * 31;
@@ -316,7 +316,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                 O.append(", invitableChannels=");
                 O.append(this.invitableChannels);
                 O.append(", me=");
-                O.append(this.f2639me);
+                O.append(this.f2637me);
                 O.append(", dms=");
                 O.append(this.dms);
                 O.append(", guild=");
@@ -531,9 +531,9 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
         this.storeMessages = storeMessages;
         this.targetChannelSelector = targetChannelSelector;
         this.logger = logger;
-        BehaviorSubject<String> k0 = BehaviorSubject.k0("");
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(\"\")");
-        this.searchQuerySubject = k0;
+        BehaviorSubject<String> l0 = BehaviorSubject.l0("");
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+        this.searchQuerySubject = l0;
         this.searchQuery = "";
         this.sentInvites = h0.emptyMap();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), GuildInviteShareSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java
index 4df781c96f..885a255719 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java
@@ -113,9 +113,9 @@ public final class InviteGenerator implements Closeable {
     }
 
     public InviteGenerator() {
-        BehaviorSubject<InviteGenerationState> k0 = BehaviorSubject.k0(new InviteGenerationState(null, null, 3, null));
-        this.generationStateSubject = k0;
-        Observable<InviteGenerationState> q = k0.q();
+        BehaviorSubject<InviteGenerationState> l0 = BehaviorSubject.l0(new InviteGenerationState(null, null, 3, null));
+        this.generationStateSubject = l0;
+        Observable<InviteGenerationState> q = l0.q();
         m.checkNotNullExpressionValue(q, "generationStateSubject.distinctUntilChanged()");
         this.generationState = q;
     }
@@ -135,7 +135,7 @@ public final class InviteGenerator implements Closeable {
     private final void handleRestCallFailed() {
         BehaviorSubject<InviteGenerationState> behaviorSubject = this.generationStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "generationStateSubject");
-        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.m0(), null, GenerationState.FAILURE, 1, null));
+        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.n0(), null, GenerationState.FAILURE, 1, null));
     }
 
     @Override // java.io.Closeable, java.lang.AutoCloseable
@@ -147,7 +147,7 @@ public final class InviteGenerator implements Closeable {
         m.checkNotNullParameter(appFragment, "fragment");
         BehaviorSubject<InviteGenerationState> behaviorSubject = this.generationStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "generationStateSubject");
-        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.m0(), null, GenerationState.GENERATING, 1, null));
+        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.n0(), null, GenerationState.GENERATING, 1, null));
         ObservableExtensionsKt.ui$default(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), j, null, 2, null), appFragment, null, 2, null).k(o.a.g(appFragment.getContext(), new InviteGenerator$generate$1(this), new InviteGenerator$generate$2(this)));
     }
 
@@ -155,7 +155,7 @@ public final class InviteGenerator implements Closeable {
         m.checkNotNullParameter(appComponent, "appComponent");
         BehaviorSubject<InviteGenerationState> behaviorSubject = this.generationStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "generationStateSubject");
-        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.m0(), null, GenerationState.GENERATING, 1, null));
+        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.n0(), null, GenerationState.GENERATING, 1, null));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), j, null, 2, null)), appComponent, null, 2, null), InviteGenerator.class, (Context) null, (Function1) null, new InviteGenerator$generateForAppComponent$2(this), (Function0) null, (Function0) null, new InviteGenerator$generateForAppComponent$1(this), 54, (Object) null);
     }
 
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 785ccd56e4..f80254def5 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<Invi
                 m.checkNotNullExpressionValue(materialButton, "binding.itemSent");
                 int i2 = 0;
                 materialButton.setVisibility(inviteSuggestionItemV2.hasSentInvite() ? 0 : 8);
-                MaterialButton materialButton2 = this.binding.f2260c;
+                MaterialButton materialButton2 = this.binding.f2258c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn");
                 if (!(!inviteSuggestionItemV2.hasSentInvite())) {
                     i2 = 8;
                 }
                 materialButton2.setVisibility(i2);
-                this.binding.f2260c.setOnClickListener(new InviteSuggestionsAdapter$InviteSuggestionViewHolder$onConfigure$1(this, inviteSuggestionItemV2));
+                this.binding.f2258c.setOnClickListener(new InviteSuggestionsAdapter$InviteSuggestionViewHolder$onConfigure$1(this, inviteSuggestionItemV2));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java
index 214c725f08..c64b8910ac 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java
@@ -149,7 +149,7 @@ public final class InviteSuggestionsManager {
     }
 
     public final Observable<List<InviteSuggestion>> observeInviteSuggestions() {
-        Observable<List<InviteSuggestion>> i = Observable.i(this.storeChannels.observePrivateChannels(), this.storeMessagesMostRecent.observeRecentMessageIds().Y(1), this.storeUserAffinities.observeAffinityUserIds().X(new InviteSuggestionsManager$observeInviteSuggestions$1(this)), InviteSuggestionsManager$observeInviteSuggestions$2.INSTANCE);
+        Observable<List<InviteSuggestion>> i = Observable.i(this.storeChannels.observePrivateChannels(), this.storeMessagesMostRecent.observeRecentMessageIds().Z(1), this.storeUserAffinities.observeAffinityUserIds().Y(new InviteSuggestionsManager$observeInviteSuggestions$1(this)), InviteSuggestionsManager$observeInviteSuggestions$2.INSTANCE);
         m.checkNotNullExpressionValue(i, "Observable.combineLatest… inviteSuggestionList\n  }");
         return i;
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
index 0b0060eccb..dd9e3766e4 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
@@ -69,13 +69,13 @@ public final class PrivateChannelAdapter extends MGRecyclerAdapterSimple<InviteS
                 m.checkNotNullExpressionValue(materialButton, "binding.itemSent");
                 int i2 = 0;
                 materialButton.setVisibility(inviteSuggestionItem.hasSentInvite() ? 0 : 8);
-                MaterialButton materialButton2 = this.binding.f2260c;
+                MaterialButton materialButton2 = this.binding.f2258c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn");
                 if (!(!inviteSuggestionItem.hasSentInvite())) {
                     i2 = 8;
                 }
                 materialButton2.setVisibility(i2);
-                this.binding.f2260c.setOnClickListener(new PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
+                this.binding.f2258c.setOnClickListener(new PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
index ff1154a2bb..de907500e1 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
@@ -94,7 +94,7 @@ public final class WidgetGuildInvite extends AppFragment {
             z2 = true;
         }
         guildScheduledEventItemView.setVisibility(z2 ? 0 : 8);
-        MaterialButton materialButton = getBinding().f2255c;
+        MaterialButton materialButton = getBinding().f2253c;
         m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel");
         materialButton.setVisibility(8);
         MaterialButton materialButton2 = getBinding().b;
@@ -104,7 +104,7 @@ public final class WidgetGuildInvite extends AppFragment {
     }
 
     private final void configureUIFailure(Error error) {
-        MaterialButton materialButton = getBinding().f2255c;
+        MaterialButton materialButton = getBinding().f2253c;
         m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel");
         materialButton.setVisibility(0);
         MaterialButton materialButton2 = getBinding().b;
@@ -128,7 +128,7 @@ public final class WidgetGuildInvite extends AppFragment {
         }
         StoreStream.Companion companion = StoreStream.Companion;
         companion.getInstantInvites().fetchInviteIfNotLoaded(inviteCode.getInviteCode(), inviteCode.getEventId(), inviteCode.getSource(), Boolean.valueOf(this.inviteResolved));
-        return companion.getInstantInvites().observeInvite(ModelInvite.getInviteStoreKey(inviteCode.getInviteCode(), inviteCode.getEventId())).w(WidgetGuildInvite$getResolvedInviteOrDefault$1.INSTANCE);
+        return companion.getInstantInvites().observeInvite(ModelInvite.getInviteStoreKey(inviteCode.getInviteCode(), inviteCode.getEventId())).x(WidgetGuildInvite$getResolvedInviteOrDefault$1.INSTANCE);
     }
 
     private final void trackAndConsumeDynamicLinkCache(ModelInvite modelInvite) {
@@ -169,7 +169,7 @@ public final class WidgetGuildInvite extends AppFragment {
             str = inviteCode.getInviteCode();
         }
         analyticsTracker.impressionInviteAccept(str);
-        getBinding().f2255c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
+        getBinding().f2253c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
index eb2c503c48..f6b7b3dd25 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
@@ -267,13 +267,13 @@ public final class WidgetGuildInviteSettings extends AppFragment {
         }
         getBinding().b.setSelection(Math.max(i, 0), false);
         ModelInvite.Settings inviteSettings = viewState.getInviteSettings();
-        RadioGroup radioGroup = getBinding().f2256c;
+        RadioGroup radioGroup = getBinding().f2254c;
         m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
         IntRange until = f.until(0, radioGroup.getChildCount());
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(until, 10));
         Iterator<Integer> it2 = until.iterator();
         while (it2.hasNext()) {
-            View childAt = getBinding().f2256c.getChildAt(((c0) it2).nextInt());
+            View childAt = getBinding().f2254c.getChildAt(((c0) it2).nextInt());
             Objects.requireNonNull(childAt, "null cannot be cast to non-null type android.widget.RadioButton");
             arrayList.add((RadioButton) childAt);
         }
@@ -300,7 +300,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
         if (radioButton != null) {
             radioButton.setChecked(true);
         }
-        getBinding().f2256c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings));
+        getBinding().f2254c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings));
         RadioGroup radioGroup2 = getBinding().e;
         m.checkNotNullExpressionValue(radioGroup2, "binding.guildInviteMaxUsesRadiogroup");
         IntRange until2 = f.until(0, radioGroup2.getChildCount());
@@ -370,7 +370,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
             m.throwUninitializedPropertyAccessException("channelsSpinnerAdapter");
         }
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
-        RadioGroup radioGroup = getBinding().f2256c;
+        RadioGroup radioGroup = getBinding().f2254c;
         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 9d0bbd6835..c69ded0132 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().f2257c;
+        TextView textView = getBinding().f2255c;
         m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults");
         textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8);
         RecyclerView recyclerView = getBinding().i;
@@ -309,14 +309,14 @@ public final class WidgetGuildInviteShare extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetGuildInviteShareViewModel.ViewState> I = getViewModel().observeViewState().I();
-        m.checkNotNullExpressionValue(I, "viewModel.observeViewSta…  .onBackpressureBuffer()");
-        Observable<R> E = I.w(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
+        Observable<WidgetGuildInviteShareViewModel.ViewState> J = getViewModel().observeViewState().J();
+        m.checkNotNullExpressionValue(J, "viewModel.observeViewSta…  .onBackpressureBuffer()");
+        Observable<R> F = J.x(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
         PrivateChannelAdapter privateChannelAdapter = this.adapter;
         if (privateChannelAdapter == null) {
             m.throwUninitializedPropertyAccessException("adapter");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(E, this, privateChannelAdapter), WidgetGuildInviteShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShare$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(F, this, privateChannelAdapter), WidgetGuildInviteShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShare$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
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 020985796d..bf10410d94 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.f2260c;
+                    MaterialButton materialButton2 = this.binding.f2258c;
                     m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn");
                     if (!(!inviteSuggestionItem.hasSentInvite())) {
                         i2 = 8;
                     }
                     materialButton2.setVisibility(i2);
-                    this.binding.f2260c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
+                    this.binding.f2258c.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().f2258c;
+        TextView textView = getBinding().f2256c;
         m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults");
         textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8);
         RecyclerView recyclerView = getBinding().h;
@@ -323,12 +323,12 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<R> E = getViewModel().observeViewState().w(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
+        Observable<R> F = getViewModel().observeViewState().x(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
         PrivateChannelAdapter privateChannelAdapter = this.adapter;
         if (privateChannelAdapter == null) {
             m.throwUninitializedPropertyAccessException("adapter");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(E, this, privateChannelAdapter), WidgetGuildInviteShareCompact.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(F, this, privateChannelAdapter), WidgetGuildInviteShareCompact.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
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 f09aa41b2a..85aa3581f9 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().f2259c;
+        TextView textView = getBinding().f2257c;
         m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptySuggestionsInviteLink");
         textView.setText(getInviteLink(invite));
-        getBinding().f2259c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite));
+        getBinding().f2257c.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();
@@ -205,10 +205,10 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetGuildInviteShareViewModel.ViewState> I = getViewModel().observeViewState().I();
-        m.checkNotNullExpressionValue(I, "viewModel.observeViewSta…  .onBackpressureBuffer()");
-        Observable<R> E = I.w(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(E, this, null, 2, null), WidgetGuildInviteShareEmptySuggestions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<WidgetGuildInviteShareViewModel.ViewState> J = getViewModel().observeViewState().J();
+        m.checkNotNullExpressionValue(J, "viewModel.observeViewSta…  .onBackpressureBuffer()");
+        Observable<R> F = J.x(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(F, this, null, 2, null), WidgetGuildInviteShareEmptySuggestions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
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 0f8f1a4e12..6068a2b5b0 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
@@ -260,7 +260,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
             Context requireContext2 = requireContext();
             m.checkNotNullExpressionValue(requireContext2, "requireContext()");
             CharSequence inviteSettingsText = GuildInviteUiHelperKt.getInviteSettingsText(requireContext2, expirationTimeMs);
-            TextView textView = binding.f2261c;
+            TextView textView = binding.f2259c;
             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/WidgetGuildInviteShareViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
index cb9bb3eae4..9056cd116d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
@@ -286,20 +286,20 @@ public final class WidgetGuildInviteShareViewModel extends AppViewModel<ViewStat
         this.guildId = j;
         this.eventId = l;
         this.inviteStoreKey = str;
-        BehaviorSubject<Map<String, Set<Long>>> k0 = BehaviorSubject.k0(h0.emptyMap());
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(emptyMap())");
-        this.sentInvitesSubject = k0;
-        this.filterPublisher = BehaviorSubject.k0("");
-        BehaviorSubject<Long> k02 = BehaviorSubject.k0(null);
-        m.checkNotNullExpressionValue(k02, "BehaviorSubject.create(null as ChannelId?)");
-        this.selectedChannelSubject = k02;
-        BehaviorSubject<Unit> k03 = BehaviorSubject.k0(Unit.a);
-        m.checkNotNullExpressionValue(k03, "BehaviorSubject.create(Unit)");
-        this.refreshUiSubject = k03;
+        BehaviorSubject<Map<String, Set<Long>>> l0 = BehaviorSubject.l0(h0.emptyMap());
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(emptyMap())");
+        this.sentInvitesSubject = l0;
+        this.filterPublisher = BehaviorSubject.l0("");
+        BehaviorSubject<Long> l02 = BehaviorSubject.l0(null);
+        m.checkNotNullExpressionValue(l02, "BehaviorSubject.create(null as ChannelId?)");
+        this.selectedChannelSubject = l02;
+        BehaviorSubject<Unit> l03 = BehaviorSubject.l0(Unit.a);
+        m.checkNotNullExpressionValue(l03, "BehaviorSubject.create(Unit)");
+        this.refreshUiSubject = l03;
         if (z2) {
-            Observable<ViewState.Loaded> s = observeViewStateFromStores$app_productionGoogleRelease(j, l, str).s(new AnonymousClass1(this));
-            m.checkNotNullExpressionValue(s, "observeViewStateFromStor…romViewState(viewState) }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(s), this, null, 2, null), WidgetGuildInviteShareViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+            Observable<ViewState.Loaded> t = observeViewStateFromStores$app_productionGoogleRelease(j, l, str).t(new AnonymousClass1(this));
+            m.checkNotNullExpressionValue(t, "observeViewStateFromStor…romViewState(viewState) }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(t), this, null, 2, null), WidgetGuildInviteShareViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.java
index 464c612216..7d728e19fb 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.java
@@ -30,7 +30,7 @@ public final class WidgetInviteInfo$parseAttributeSet$1 implements Runnable {
             guildView.setLayoutParams(layoutParams);
         }
         if (this.$userSize != 0) {
-            SimpleDraweeView simpleDraweeView = WidgetInviteInfo.access$getBinding$p(this.this$0).f2254c;
+            SimpleDraweeView simpleDraweeView = WidgetInviteInfo.access$getBinding$p(this.this$0).f2252c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
             ViewGroup.LayoutParams layoutParams2 = simpleDraweeView.getLayoutParams();
             Objects.requireNonNull(layoutParams2, "null cannot be cast to non-null type android.view.ViewGroup.LayoutParams");
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 895cb97e88..089cc68b25 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
@@ -128,7 +128,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         }
         sb.append(str2);
         String sb2 = sb.toString();
-        SimpleDraweeView simpleDraweeView = this.binding.f2254c;
+        SimpleDraweeView simpleDraweeView = this.binding.f2252c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
         simpleDraweeView.setVisibility(8);
         ServerMemberCount serverMemberCount = this.binding.d;
@@ -151,7 +151,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         Channel channel = modelInvite.getChannel();
         if (channel != null) {
             m.checkNotNullExpressionValue(channel, "model.channel ?: return");
-            SimpleDraweeView simpleDraweeView = this.binding.f2254c;
+            SimpleDraweeView simpleDraweeView = this.binding.f2252c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
             User inviter = modelInvite.getInviter();
             IconUtils.setIcon$default(simpleDraweeView, inviter != null ? new CoreUser(inviter) : null, R.dimen.avatar_size_hero, null, null, null, 56, null);
@@ -167,7 +167,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
             }
             z2 = false;
             this.binding.b.a(z2 ? IconUtils.getForChannel$default(channel, null, 2, null) : IconUtils.INSTANCE.getDefaultForGroupDM(channel.h()), null);
-            SimpleDraweeView simpleDraweeView2 = this.binding.f2254c;
+            SimpleDraweeView simpleDraweeView2 = this.binding.f2252c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
             if (!z2) {
                 i = 8;
@@ -197,14 +197,14 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         }
         String str = null;
         if (z2) {
-            SimpleDraweeView simpleDraweeView = this.binding.f2254c;
+            SimpleDraweeView simpleDraweeView = this.binding.f2252c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
             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_medium, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
         this.binding.d.setMembers(!z2 ? Integer.valueOf(modelInvite.getApproximateMemberCount()) : null);
         this.binding.d.setOnline(!z2 ? Integer.valueOf(modelInvite.getApproximatePresenceCount()) : null);
-        SimpleDraweeView simpleDraweeView2 = this.binding.f2254c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.f2252c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
         if (!z2) {
             i = 8;
@@ -314,7 +314,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         TextView textView3 = guildView.j.f95c;
         m.checkNotNullExpressionValue(textView3, "binding.guildText");
         textView3.setVisibility(8);
-        SimpleDraweeView simpleDraweeView2 = this.binding.f2254c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.f2252c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
         simpleDraweeView2.setVisibility(8);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java
index 45f63637e6..29c4f03171 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java
@@ -28,7 +28,7 @@ public final class WidgetInviteModel {
     private final boolean isValidInvite;
 
     /* renamed from: me  reason: collision with root package name */
-    private final MeUser f2640me;
+    private final MeUser f2638me;
     private final ModelInvite.Settings settings;
     private final Channel targetChannel;
 
@@ -104,7 +104,7 @@ public final class WidgetInviteModel {
         this.isGeneratingInvite = z2;
         this.isValidInvite = z3;
         this.invitableChannels = list;
-        this.f2640me = meUser;
+        this.f2638me = meUser;
         this.dms = list2;
         this.isInviteFromStore = z4;
     }
@@ -115,7 +115,7 @@ public final class WidgetInviteModel {
     }
 
     public static /* synthetic */ WidgetInviteModel copy$default(WidgetInviteModel widgetInviteModel, Channel channel, ModelInvite.Settings settings, ModelInvite modelInvite, boolean z2, boolean z3, List list, MeUser meUser, List list2, boolean z4, int i, Object obj) {
-        return widgetInviteModel.copy((i & 1) != 0 ? widgetInviteModel.targetChannel : channel, (i & 2) != 0 ? widgetInviteModel.settings : settings, (i & 4) != 0 ? widgetInviteModel.invite : modelInvite, (i & 8) != 0 ? widgetInviteModel.isGeneratingInvite : z2, (i & 16) != 0 ? widgetInviteModel.isValidInvite : z3, (i & 32) != 0 ? widgetInviteModel.invitableChannels : list, (i & 64) != 0 ? widgetInviteModel.f2640me : meUser, (i & 128) != 0 ? widgetInviteModel.dms : list2, (i & 256) != 0 ? widgetInviteModel.isInviteFromStore : z4);
+        return widgetInviteModel.copy((i & 1) != 0 ? widgetInviteModel.targetChannel : channel, (i & 2) != 0 ? widgetInviteModel.settings : settings, (i & 4) != 0 ? widgetInviteModel.invite : modelInvite, (i & 8) != 0 ? widgetInviteModel.isGeneratingInvite : z2, (i & 16) != 0 ? widgetInviteModel.isValidInvite : z3, (i & 32) != 0 ? widgetInviteModel.invitableChannels : list, (i & 64) != 0 ? widgetInviteModel.f2638me : meUser, (i & 128) != 0 ? widgetInviteModel.dms : list2, (i & 256) != 0 ? widgetInviteModel.isInviteFromStore : z4);
     }
 
     public final Channel component1() {
@@ -143,7 +143,7 @@ public final class WidgetInviteModel {
     }
 
     public final MeUser component7() {
-        return this.f2640me;
+        return this.f2638me;
     }
 
     public final List<Channel> component8() {
@@ -169,7 +169,7 @@ public final class WidgetInviteModel {
             return false;
         }
         WidgetInviteModel widgetInviteModel = (WidgetInviteModel) obj;
-        return m.areEqual(this.targetChannel, widgetInviteModel.targetChannel) && m.areEqual(this.settings, widgetInviteModel.settings) && m.areEqual(this.invite, widgetInviteModel.invite) && this.isGeneratingInvite == widgetInviteModel.isGeneratingInvite && this.isValidInvite == widgetInviteModel.isValidInvite && m.areEqual(this.invitableChannels, widgetInviteModel.invitableChannels) && m.areEqual(this.f2640me, widgetInviteModel.f2640me) && m.areEqual(this.dms, widgetInviteModel.dms) && this.isInviteFromStore == widgetInviteModel.isInviteFromStore;
+        return m.areEqual(this.targetChannel, widgetInviteModel.targetChannel) && m.areEqual(this.settings, widgetInviteModel.settings) && m.areEqual(this.invite, widgetInviteModel.invite) && this.isGeneratingInvite == widgetInviteModel.isGeneratingInvite && this.isValidInvite == widgetInviteModel.isValidInvite && m.areEqual(this.invitableChannels, widgetInviteModel.invitableChannels) && m.areEqual(this.f2638me, widgetInviteModel.f2638me) && m.areEqual(this.dms, widgetInviteModel.dms) && this.isInviteFromStore == widgetInviteModel.isInviteFromStore;
     }
 
     public final List<Channel> getDms() {
@@ -185,7 +185,7 @@ public final class WidgetInviteModel {
     }
 
     public final MeUser getMe() {
-        return this.f2640me;
+        return this.f2638me;
     }
 
     public final ModelInvite.Settings getSettings() {
@@ -223,7 +223,7 @@ public final class WidgetInviteModel {
         int i10 = (i6 + i7) * 31;
         List<Channel> list = this.invitableChannels;
         int hashCode4 = (i10 + (list != null ? list.hashCode() : 0)) * 31;
-        MeUser meUser = this.f2640me;
+        MeUser meUser = this.f2638me;
         int hashCode5 = (hashCode4 + (meUser != null ? meUser.hashCode() : 0)) * 31;
         List<Channel> list2 = this.dms;
         if (list2 != null) {
@@ -263,7 +263,7 @@ public final class WidgetInviteModel {
         O.append(", invitableChannels=");
         O.append(this.invitableChannels);
         O.append(", me=");
-        O.append(this.f2640me);
+        O.append(this.f2638me);
         O.append(", dms=");
         O.append(this.dms);
         O.append(", isInviteFromStore=");
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 388d74d4be..8f93d819e5 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.f2287c;
+        TextView textView = this.binding.f2285c;
         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 a0384d653d..456d29f47a 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
@@ -93,13 +93,13 @@ public class WidgetGuildJoin extends AppFragment {
     }
 
     public final void handleGuildJoin() {
-        TextInputLayout textInputLayout = getBinding().f2262c;
+        TextInputLayout textInputLayout = getBinding().f2260c;
         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().f2262c;
+            TextInputLayout textInputLayout2 = getBinding().f2260c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.guildJoinInvite");
             Context context = textInputLayout2.getContext();
             m.checkNotNullExpressionValue(context, "binding.guildJoinInvite.context");
@@ -112,7 +112,7 @@ public class WidgetGuildJoin extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        TextInputLayout textInputLayout = getBinding().f2262c;
+        TextInputLayout textInputLayout = getBinding().f2260c;
         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 cfa380f208..06f4729b17 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().f2288c;
+            TextView textView2 = getBinding().f2286c;
             m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeSheetDescription");
             ViewExtensions.setTextAndVisibilityBy(textView2, str2);
             return;
         }
-        TextView textView3 = getBinding().f2288c;
+        TextView textView3 = getBinding().f2286c;
         m.checkNotNullExpressionValue(textView3, "binding.guildWelcomeSheetDescription");
         textView3.setVisibility(8);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java b/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java
index c410bae76c..8516269884 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java
@@ -309,7 +309,7 @@ public final class LeaveGuildDialogViewModel extends AppViewModel<ViewState> {
         this.guildId = j;
         this.restAPI = restAPI;
         this.lurkingStore = storeLurking;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), LeaveGuildDialogViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
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 cad525fd22..f5c2f49774 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.f2294c.setBackgroundResource(R.drawable.drawable_squircle_brand_500);
-                FrameLayout frameLayout = this.binding.f2294c;
+                this.binding.f2292c.setBackgroundResource(R.drawable.drawable_squircle_brand_500);
+                FrameLayout frameLayout = this.binding.f2292c;
                 m.checkNotNullExpressionValue(frameLayout, "binding.guildsItemProfileAvatarWrap");
                 frameLayout.setBackgroundTintList(null);
             } else {
-                this.binding.f2294c.setBackgroundResource(R.drawable.drawable_circle_black);
-                FrameLayout frameLayout2 = this.binding.f2294c;
+                this.binding.f2292c.setBackgroundResource(R.drawable.drawable_circle_black);
+                FrameLayout frameLayout2 = this.binding.f2292c;
                 m.checkNotNullExpressionValue(frameLayout2, "binding.guildsItemProfileAvatarWrap");
                 int themedColor = ColorCompat.getThemedColor(frameLayout2, (int) R.attr.colorBackgroundSecondary);
-                FrameLayout frameLayout3 = this.binding.f2294c;
+                FrameLayout frameLayout3 = this.binding.f2292c;
                 m.checkNotNullExpressionValue(frameLayout3, "binding.guildsItemProfileAvatarWrap");
                 frameLayout3.setBackgroundTintList(ColorStateList.valueOf(themedColor));
             }
@@ -698,10 +698,10 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             ImageView imageView2 = this.bindingGuild.g;
             m.checkNotNullExpressionValue(imageView2, "bindingGuild.guildsItemEventStatus");
             imageView2.setVisibility(!guildItem.isConnectedToVoice() && guildItem.getHasActiveScheduledEvent() ? 0 : 8);
-            ImageView imageView3 = this.bindingGuild.f2292c;
+            ImageView imageView3 = this.bindingGuild.f2290c;
             m.checkNotNullExpressionValue(imageView3, "bindingGuild.guildsItemApplicationStream");
             imageView3.setVisibility(!guildItem.isConnectedToVoice() && guildItem.getHasOngoingApplicationStream() ? 0 : 8);
-            ImageView imageView4 = this.binding.f2293c;
+            ImageView imageView4 = this.binding.f2291c;
             m.checkNotNullExpressionValue(imageView4, "binding.guildsItemUnread");
             imageView4.setVisibility(guildItem.isUnread() ? 0 : 8);
             ImageView imageView5 = this.binding.b;
@@ -790,7 +790,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.f2290c;
+            TextView textView = this.binding.f2288c;
             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 737c47dfed..baf2a38445 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).f2289c;
+        ViewStub viewStub = WidgetGuildsList.access$getBinding$p(this.this$0).f2287c;
         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).f2289c;
+        ViewStub viewStub2 = WidgetGuildsList.access$getBinding$p(this.this$0).f2287c;
         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 a37b884113..2d16443671 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
@@ -83,17 +83,17 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
 
             public final Observable<AddGuildHint> get() {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable w2 = Observable.i(companion.getNux().getNuxState(), StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetGuildsList$AddGuildHint$Companion$get$1.INSTANCE).w(WidgetGuildsList$AddGuildHint$Companion$get$2.INSTANCE);
-                m.checkNotNullExpressionValue(w2, "Observable\n             ….filter { it.isEligible }");
-                Observable<AddGuildHint> K = ObservableExtensionsKt.takeSingleUntilTimeout$default(w2, 0, false, 3, null).K(WidgetGuildsList$AddGuildHint$Companion$get$3.INSTANCE);
-                m.checkNotNullExpressionValue(K, "Observable\n             … = false)\n              }");
-                return K;
+                Observable x2 = Observable.i(companion.getNux().getNuxState(), StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetGuildsList$AddGuildHint$Companion$get$1.INSTANCE).x(WidgetGuildsList$AddGuildHint$Companion$get$2.INSTANCE);
+                m.checkNotNullExpressionValue(x2, "Observable\n             ….filter { it.isEligible }");
+                Observable<AddGuildHint> L = ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, false, 3, null).L(WidgetGuildsList$AddGuildHint$Companion$get$3.INSTANCE);
+                m.checkNotNullExpressionValue(L, "Observable\n             … = false)\n              }");
+                return L;
             }
 
             public final Observable<Boolean> getDismissAction() {
-                Observable<R> E = StoreStream.Companion.getNavigation().observeLeftPanelState().E(WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.INSTANCE);
-                m.checkNotNullExpressionValue(E, "StoreStream\n            …te == PanelState.Closed }");
-                return E;
+                Observable<R> F = StoreStream.Companion.getNavigation().observeLeftPanelState().F(WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "StoreStream\n            …te == PanelState.Closed }");
+                return F;
             }
         }
 
@@ -487,7 +487,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setupRecycler();
-        ViewStub viewStub = getBinding().f2289c;
+        ViewStub viewStub = getBinding().f2287c;
         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/list/WidgetGuildsListViewModel.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
index a58d767935..8d0bc74bc3 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
@@ -461,7 +461,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             Observable<Chunk> invoke = widgetGuildsListViewModel$Companion$observeStores$1.mo17invoke();
             Observable<SecondChunk> invoke2 = widgetGuildsListViewModel$Companion$observeStores$2.mo17invoke();
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable c2 = Observable.c(invoke, invoke2, companion.getLurking().getLurkingGuildIds(), companion.getExpandedGuildFolders().observeOpenFolderIds(), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).q().E(new WidgetGuildsListViewModel$Companion$observeStores$3(clock)), new StreamContextService(null, null, null, null, null, null, null, null, 255, null).getForAllStreamingUsers(), companion.getPermissions().observePermissionsForAllChannels(), companion.getNavigation().observeLeftPanelState().E(WidgetGuildsListViewModel$Companion$observeStores$4.INSTANCE), companion.getTabsNavigation().observeSelectedTab().E(WidgetGuildsListViewModel$Companion$observeStores$5.INSTANCE), WidgetGuildsListViewModel$Companion$observeStores$6.INSTANCE);
+            Observable c2 = Observable.c(invoke, invoke2, companion.getLurking().getLurkingGuildIds(), companion.getExpandedGuildFolders().observeOpenFolderIds(), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).q().F(new WidgetGuildsListViewModel$Companion$observeStores$3(clock)), new StreamContextService(null, null, null, null, null, null, null, null, 255, null).getForAllStreamingUsers(), companion.getPermissions().observePermissionsForAllChannels(), companion.getNavigation().observeLeftPanelState().F(WidgetGuildsListViewModel$Companion$observeStores$4.INSTANCE), companion.getTabsNavigation().observeSelectedTab().F(WidgetGuildsListViewModel$Companion$observeStores$5.INSTANCE), WidgetGuildsListViewModel$Companion$observeStores$6.INSTANCE);
             m.checkNotNullExpressionValue(c2, "Observable.combineLatest…Sparkle\n        )\n      }");
             return ObservableExtensionsKt.leadingEdgeThrottle(c2, 100, TimeUnit.MILLISECONDS);
         }
@@ -1202,7 +1202,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(clock, "clock");
         m.checkNotNullParameter(observable, "storeObservable");
         this.clock = clock;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         Observable q = ObservableExtensionsKt.computationLatest(observable).q();
         m.checkNotNullExpressionValue(q, "storeObservable\n        …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(q, this, null, 2, null), WidgetGuildsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
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
deleted file mode 100644
index c878392299..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/GuildIdentityMarketingTooltipKt.java
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index a78128d630..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/GuildProfileMarketingTooltip.java
+++ /dev/null
@@ -1,11 +0,0 @@
-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/WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$1.java
index 817241892d..fcbc836233 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$1.java
@@ -37,6 +37,6 @@ public final class WidgetChangeGuildIdentityViewModel$Companion$observeStoreStat
     }
 
     public final Observable<? extends GuildMember> call(MeUser meUser) {
-        return StoreStream.Companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).E(new AnonymousClass1(meUser));
+        return StoreStream.Companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).F(new AnonymousClass1(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel.java
index 0b93df05f4..4515f77c1a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentityViewModel.java
@@ -71,7 +71,7 @@ public final class WidgetChangeGuildIdentityViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreGuilds storeGuilds, StoreUser storeUser) {
-            Observable<StoreState> h = Observable.h(GuildChannelsInfo.Companion.get(j), storeGuilds.observeGuild(j), StoreUser.observeMe$default(storeUser, false, 1, null), StoreUser.observeMe$default(storeUser, false, 1, null).X(new WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$1(j)), WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$2.INSTANCE);
+            Observable<StoreState> h = Observable.h(GuildChannelsInfo.Companion.get(j), storeGuilds.observeGuild(j), StoreUser.observeMe$default(storeUser, false, 1, null), StoreUser.observeMe$default(storeUser, false, 1, null).Y(new WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$1(j)), WidgetChangeGuildIdentityViewModel$Companion$observeStoreState$2.INSTANCE);
             m.checkNotNullExpressionValue(h, "Observable.combineLatest…uildChannelsInfo)\n      }");
             return h;
         }
@@ -515,9 +515,9 @@ public final class WidgetChangeGuildIdentityViewModel extends AppViewModel<ViewS
         this.guildId = j;
         this.sourceSection = str;
         this.restAPI = restAPI;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.eventSubject = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Companion.observeStoreState$default(Companion, j, null, null, 6, null)), this, null, 2, null), WidgetChangeGuildIdentityViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$binding$2.java
deleted file mode 100644
index 409a738b0f..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$binding$2.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.discord.widgets.guilds.profile;
-
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import c0.z.d.k;
-import c0.z.d.m;
-import com.discord.R;
-import com.discord.databinding.WidgetGuildIdentityMarketingSheetBinding;
-import com.google.android.material.button.MaterialButton;
-import kotlin.jvm.functions.Function1;
-/* compiled from: WidgetGuildIdentityMarketingSheet.kt */
-public final /* synthetic */ class WidgetGuildIdentityMarketingSheet$binding$2 extends k implements Function1<View, WidgetGuildIdentityMarketingSheetBinding> {
-    public static final WidgetGuildIdentityMarketingSheet$binding$2 INSTANCE = new WidgetGuildIdentityMarketingSheet$binding$2();
-
-    public WidgetGuildIdentityMarketingSheet$binding$2() {
-        super(1, WidgetGuildIdentityMarketingSheetBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetGuildIdentityMarketingSheetBinding;", 0);
-    }
-
-    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);
-        if (imageView != null) {
-            i = R.id.profile_marketing_skip_button;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.profile_marketing_skip_button);
-            if (materialButton != null) {
-                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 WidgetGuildIdentityMarketingSheetBinding((FrameLayout) view, imageView, materialButton, materialButton2);
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
-    }
-}
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
deleted file mode 100644
index 0ed41ed608..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$1.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 720b5f649d..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.discord.widgets.guilds.profile;
-
-import android.content.Context;
-import android.view.View;
-import c0.z.d.m;
-import com.discord.widgets.guilds.profile.WidgetChangeGuildIdentity;
-/* 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, "Marketing Bottom Sheet", requireContext);
-        this.this$0.dismiss();
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet.java
deleted file mode 100644
index 7285e5615e..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.discord.widgets.guilds.profile;
-
-import android.os.Bundle;
-import android.view.View;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import c.a.j.a;
-import c.d.b.a.a;
-import c0.z.d.m;
-import com.discord.R;
-import com.discord.app.AppBottomSheet;
-import com.discord.app.AppLog;
-import com.discord.databinding.WidgetGuildIdentityMarketingSheetBinding;
-import com.discord.tooltips.TooltipManager;
-import com.discord.utilities.analytics.AnalyticsTracker;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import java.lang.ref.WeakReference;
-import java.util.Set;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.reflect.KProperty;
-/* compiled from: WidgetGuildIdentityMarketingSheet.kt */
-public final class WidgetGuildIdentityMarketingSheet extends AppBottomSheet {
-    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.Z(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, WidgetGuildIdentityMarketingSheet$binding$2.INSTANCE, null, 2, null);
-    private final long guildId;
-    private final TooltipManager tooltipManager;
-
-    /* compiled from: WidgetGuildIdentityMarketingSheet.kt */
-    public static final class Companion {
-        private Companion() {
-        }
-
-        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
-            this();
-        }
-
-        public final void show(FragmentManager fragmentManager, long j) {
-            m.checkNotNullParameter(fragmentManager, "fragmentManager");
-            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 WidgetGuildIdentityMarketingSheet(long j) {
-        super(false, 1, null);
-        TooltipManager tooltipManager = null;
-        this.guildId = j;
-        AppLog appLog = AppLog.g;
-        m.checkNotNullParameter(appLog, "logger");
-        WeakReference<c.a.j.a> weakReference = a.b.a;
-        c.a.j.a aVar = weakReference != null ? weakReference.get() : null;
-        if (aVar == null) {
-            aVar = new c.a.j.a(appLog);
-            a.b.a = new WeakReference<>(aVar);
-        }
-        TooltipManager.a aVar2 = TooltipManager.a.d;
-        m.checkNotNullParameter(aVar, "floatingViewManager");
-        WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
-        tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
-        if (tooltipManager == null) {
-            tooltipManager = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2605c.getValue(), 0, aVar, 4);
-            TooltipManager.a.a = new WeakReference<>(tooltipManager);
-        }
-        this.tooltipManager = tooltipManager;
-    }
-
-    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_guild_identity_marketing_sheet;
-    }
-
-    public final long getGuildId() {
-        return this.guildId;
-    }
-
-    @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
-    public void onViewCreated(View view, Bundle bundle) {
-        m.checkNotNullParameter(view, "view");
-        super.onViewCreated(view, bundle);
-        setBottomSheetCollapsedStateDisabled();
-        this.tooltipManager.a(GuildProfileMarketingTooltip.INSTANCE);
-        getBinding().b.setOnClickListener(new WidgetGuildIdentityMarketingSheet$onViewCreated$1(this));
-        getBinding().f2253c.setOnClickListener(new WidgetGuildIdentityMarketingSheet$onViewCreated$2(this));
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4.java
index 4f085eeb97..d772a1908a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4.java
@@ -5,25 +5,18 @@ import android.view.View;
 import c0.z.d.m;
 import c0.z.d.o;
 import com.discord.widgets.guilds.profile.WidgetChangeGuildIdentity;
-import com.discord.widgets.guilds.profile.WidgetGuildProfileSheetViewModel;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetGuildProfileSheet.kt */
 public final class WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4 extends o implements Function1<View, Unit> {
-    public final /* synthetic */ WidgetGuildProfileSheetViewModel.Actions $actions$inlined;
-    public final /* synthetic */ boolean $canChangeNickname$inlined;
     public final /* synthetic */ long $guildId$inlined;
-    public final /* synthetic */ boolean $inPerGuildAvatarExperiment$inlined;
     public final /* synthetic */ WidgetGuildProfileSheet this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4(WidgetGuildProfileSheet widgetGuildProfileSheet, boolean z2, boolean z3, long j, WidgetGuildProfileSheetViewModel.Actions actions) {
+    public WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4(WidgetGuildProfileSheet widgetGuildProfileSheet, long j) {
         super(1);
         this.this$0 = widgetGuildProfileSheet;
-        this.$canChangeNickname$inlined = z2;
-        this.$inPerGuildAvatarExperiment$inlined = z3;
         this.$guildId$inlined = j;
-        this.$actions$inlined = actions;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -36,14 +29,10 @@ public final class WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        if (this.$inPerGuildAvatarExperiment$inlined) {
-            WidgetChangeGuildIdentity.Companion companion = WidgetChangeGuildIdentity.Companion;
-            long j = this.$guildId$inlined;
-            Context context = view.getContext();
-            m.checkNotNullExpressionValue(context, "it.context");
-            companion.launch(j, "Guild Bottom Sheet", context);
-            return;
-        }
-        WidgetGuildProfileSheet.access$showChangeNicknameDialog(this.this$0, this.$guildId$inlined, this.$actions$inlined.getNick(), false);
+        WidgetChangeGuildIdentity.Companion companion = WidgetChangeGuildIdentity.Companion;
+        long j = this.$guildId$inlined;
+        Context context = view.getContext();
+        m.checkNotNullExpressionValue(context, "it.context");
+        companion.launch(j, "Guild Bottom Sheet", context);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildHubActions$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildHubActions$2.java
index 3465a4b6d5..d1edbc39b4 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildHubActions$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildHubActions$2.java
@@ -5,23 +5,16 @@ import android.view.View;
 import c0.z.d.m;
 import c0.z.d.o;
 import com.discord.widgets.guilds.profile.WidgetChangeGuildIdentity;
-import com.discord.widgets.guilds.profile.WidgetGuildProfileSheetViewModel;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetGuildProfileSheet.kt */
 public final class WidgetGuildProfileSheet$configureGuildHubActions$2 extends o implements Function1<View, Unit> {
-    public final /* synthetic */ WidgetGuildProfileSheetViewModel.Actions $actions;
     public final /* synthetic */ long $guildId;
-    public final /* synthetic */ boolean $inPerGuildAvatarExperiment;
-    public final /* synthetic */ WidgetGuildProfileSheet this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetGuildProfileSheet$configureGuildHubActions$2(WidgetGuildProfileSheet widgetGuildProfileSheet, boolean z2, long j, WidgetGuildProfileSheetViewModel.Actions actions) {
+    public WidgetGuildProfileSheet$configureGuildHubActions$2(long j) {
         super(1);
-        this.this$0 = widgetGuildProfileSheet;
-        this.$inPerGuildAvatarExperiment = z2;
         this.$guildId = j;
-        this.$actions = actions;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -34,14 +27,10 @@ public final class WidgetGuildProfileSheet$configureGuildHubActions$2 extends o
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        if (this.$inPerGuildAvatarExperiment) {
-            WidgetChangeGuildIdentity.Companion companion = WidgetChangeGuildIdentity.Companion;
-            long j = this.$guildId;
-            Context context = view.getContext();
-            m.checkNotNullExpressionValue(context, "it.context");
-            companion.launch(j, "Guild Bottom Sheet", context);
-            return;
-        }
-        WidgetGuildProfileSheet.access$showChangeNicknameDialog(this.this$0, this.$guildId, this.$actions.getNick(), true);
+        WidgetChangeGuildIdentity.Companion companion = WidgetChangeGuildIdentity.Companion;
+        long j = this.$guildId;
+        Context context = view.getContext();
+        m.checkNotNullExpressionValue(context, "it.context");
+        companion.launch(j, "Guild Bottom Sheet", context);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1.java
deleted file mode 100644
index adafdde206..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.discord.widgets.guilds.profile;
-
-import android.view.View;
-import c0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-/* compiled from: WidgetGuildProfileSheet.kt */
-public final class WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1 implements View.OnClickListener {
-    public final /* synthetic */ long $guildId$inlined;
-    public final /* synthetic */ boolean $isGuildHub$inlined;
-    public final /* synthetic */ String $nickname$inlined;
-    public final /* synthetic */ WidgetGuildProfileSheet this$0;
-
-    /* compiled from: WidgetGuildProfileSheet.kt */
-    /* renamed from: com.discord.widgets.guilds.profile.WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function0<Unit> {
-        public final /* synthetic */ WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1 this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1 widgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1) {
-            super(0);
-            this.this$0 = widgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1;
-        }
-
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public final void mo17invoke() {
-            WidgetGuildProfileSheet.access$dismissAlert(this.this$0.this$0);
-        }
-    }
-
-    public WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1(WidgetGuildProfileSheet widgetGuildProfileSheet, String str, long j, boolean z2) {
-        this.this$0 = widgetGuildProfileSheet;
-        this.$nickname$inlined = str;
-        this.$guildId$inlined = j;
-        this.$isGuildHub$inlined = z2;
-    }
-
-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        WidgetGuildProfileSheet.access$getViewModel$p(this.this$0).onClickResetNickname(this.$guildId$inlined, new AnonymousClass1(this));
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$1.java
deleted file mode 100644
index fcaaba52d6..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$1.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.discord.widgets.guilds.profile;
-
-import android.view.View;
-/* compiled from: WidgetGuildProfileSheet.kt */
-public final class WidgetGuildProfileSheet$showChangeNicknameDialog$1 implements View.OnClickListener {
-    public final /* synthetic */ WidgetGuildProfileSheet this$0;
-
-    public WidgetGuildProfileSheet$showChangeNicknameDialog$1(WidgetGuildProfileSheet widgetGuildProfileSheet) {
-        this.this$0 = widgetGuildProfileSheet;
-    }
-
-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        WidgetGuildProfileSheet.access$dismissAlert(this.this$0);
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java
deleted file mode 100644
index 6d84fc0f73..0000000000
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.discord.widgets.guilds.profile;
-
-import android.view.View;
-import c0.z.d.m;
-import c0.z.d.o;
-import com.discord.databinding.WidgetChannelsListActionsChangeNicknameBinding;
-import com.discord.utilities.view.extensions.ViewExtensions;
-import com.google.android.material.textfield.TextInputLayout;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-/* compiled from: WidgetGuildProfileSheet.kt */
-public final class WidgetGuildProfileSheet$showChangeNicknameDialog$2 implements View.OnClickListener {
-    public final /* synthetic */ WidgetChannelsListActionsChangeNicknameBinding $binding;
-    public final /* synthetic */ long $guildId;
-    public final /* synthetic */ WidgetGuildProfileSheet this$0;
-
-    /* compiled from: WidgetGuildProfileSheet.kt */
-    /* renamed from: com.discord.widgets.guilds.profile.WidgetGuildProfileSheet$showChangeNicknameDialog$2$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function0<Unit> {
-        public final /* synthetic */ WidgetGuildProfileSheet$showChangeNicknameDialog$2 this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(WidgetGuildProfileSheet$showChangeNicknameDialog$2 widgetGuildProfileSheet$showChangeNicknameDialog$2) {
-            super(0);
-            this.this$0 = widgetGuildProfileSheet$showChangeNicknameDialog$2;
-        }
-
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public final void mo17invoke() {
-            WidgetGuildProfileSheet.access$dismissAlert(this.this$0.this$0);
-            WidgetGuildProfileSheet widgetGuildProfileSheet = this.this$0.this$0;
-            widgetGuildProfileSheet.hideKeyboard(widgetGuildProfileSheet.getView());
-        }
-    }
-
-    public WidgetGuildProfileSheet$showChangeNicknameDialog$2(WidgetGuildProfileSheet widgetGuildProfileSheet, long j, WidgetChannelsListActionsChangeNicknameBinding widgetChannelsListActionsChangeNicknameBinding) {
-        this.this$0 = widgetGuildProfileSheet;
-        this.$guildId = j;
-        this.$binding = widgetChannelsListActionsChangeNicknameBinding;
-    }
-
-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        WidgetGuildProfileSheetViewModel access$getViewModel$p = WidgetGuildProfileSheet.access$getViewModel$p(this.this$0);
-        long j = this.$guildId;
-        TextInputLayout textInputLayout = this.$binding.f2151c;
-        m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText");
-        access$getViewModel$p.onClickSaveNickname(j, ViewExtensions.getTextOrEmpty(textInputLayout), new AnonymousClass1(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 2c485f355f..78ea471fc9 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
@@ -22,13 +22,11 @@ import c.a.d.h0;
 import c.a.k.b;
 import c.d.b.a.a;
 import c0.g;
-import c0.g0.t;
 import c0.z.d.a0;
 import c0.z.d.m;
 import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
-import com.discord.databinding.WidgetChannelsListActionsChangeNicknameBinding;
 import com.discord.databinding.WidgetGuildHubProfileActionsBinding;
 import com.discord.databinding.WidgetGuildProfileActionsBinding;
 import com.discord.databinding.WidgetGuildProfileSheetBinding;
@@ -42,7 +40,6 @@ import com.discord.utilities.images.MGImages;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.string.StringUtilsKt;
-import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.views.CheckedSetting;
@@ -52,7 +49,6 @@ import com.discord.widgets.guilds.profile.WidgetGuildProfileSheetViewModel;
 import com.discord.widgets.stage.start.StageEventsGuildsFeatureFlag;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textfield.TextInputLayout;
 import java.util.List;
 import java.util.Objects;
 import kotlin.Lazy;
@@ -125,10 +121,6 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         this.emojisAdapter = new WidgetGuildProfileSheetEmojisAdapter();
     }
 
-    public static final /* synthetic */ Unit access$dismissAlert(WidgetGuildProfileSheet widgetGuildProfileSheet) {
-        return widgetGuildProfileSheet.dismissAlert();
-    }
-
     public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(WidgetGuildProfileSheet widgetGuildProfileSheet) {
         return widgetGuildProfileSheet.getArgumentsOrDefault();
     }
@@ -173,10 +165,6 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         widgetGuildProfileSheet.guildHubActionBinding = widgetGuildHubProfileActionsBinding;
     }
 
-    public static final /* synthetic */ void access$showChangeNicknameDialog(WidgetGuildProfileSheet widgetGuildProfileSheet, long j, String str, boolean z2) {
-        widgetGuildProfileSheet.showChangeNicknameDialog(j, str, z2);
-    }
-
     public static final /* synthetic */ void access$showLeaveServerDialog(WidgetGuildProfileSheet widgetGuildProfileSheet, long j) {
         widgetGuildProfileSheet.showLeaveServerDialog(j);
     }
@@ -191,28 +179,28 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             if (widgetGuildProfileActionsBinding == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            LinearLayout linearLayout = widgetGuildProfileActionsBinding.f;
+            LinearLayout linearLayout = widgetGuildProfileActionsBinding.e;
             m.checkNotNullExpressionValue(linearLayout, "guildActionBinding.guildProfileSheetBottomActions");
             linearLayout.setVisibility(0);
             WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding2 = this.guildActionBinding;
             if (widgetGuildProfileActionsBinding2 == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            MaterialButton materialButton = widgetGuildProfileActionsBinding2.A;
+            MaterialButton materialButton = widgetGuildProfileActionsBinding2.f2266z;
             materialButton.setVisibility(showUploadEmoji ? 0 : 8);
             setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1(this, showUploadEmoji, j));
             WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding;
             if (widgetGuildProfileActionsBinding3 == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            MaterialButton materialButton2 = widgetGuildProfileActionsBinding3.s;
+            MaterialButton materialButton2 = widgetGuildProfileActionsBinding3.f2262r;
             materialButton2.setVisibility(showJoinServer ? 0 : 8);
             setOnClickAndDismissListener(materialButton2, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2(this, showJoinServer, j));
             WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding4 = this.guildActionBinding;
             if (widgetGuildProfileActionsBinding4 == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            MaterialButton materialButton3 = widgetGuildProfileActionsBinding4.B;
+            MaterialButton materialButton3 = widgetGuildProfileActionsBinding4.A;
             if (showViewServer) {
                 i = 0;
             }
@@ -225,7 +213,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding5 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        LinearLayout linearLayout2 = widgetGuildProfileActionsBinding5.f;
+        LinearLayout linearLayout2 = widgetGuildProfileActionsBinding5.e;
         m.checkNotNullExpressionValue(linearLayout2, "guildActionBinding.guildProfileSheetBottomActions");
         linearLayout2.setVisibility(8);
     }
@@ -239,7 +227,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        TextView textView = widgetGuildProfileActionsBinding.p;
+        TextView textView = widgetGuildProfileActionsBinding.o;
         m.checkNotNullExpressionValue(textView, "guildActionBinding.guildProfileSheetEmojisCount");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
@@ -248,14 +236,14 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding2 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        ImageView imageView = widgetGuildProfileActionsBinding2.f2266x;
+        ImageView imageView = widgetGuildProfileActionsBinding2.f2263w;
         m.checkNotNullExpressionValue(imageView, "guildActionBinding.guild…PremiumUpsellDotSeparator");
         imageView.setVisibility(isPremium ^ true ? 0 : 8);
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding3 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        TextView textView2 = widgetGuildProfileActionsBinding3.f2267y;
+        TextView textView2 = widgetGuildProfileActionsBinding3.f2264x;
         m.checkNotNullExpressionValue(textView2, "guildActionBinding.guild…ileSheetPremiumUpsellText");
         textView2.setVisibility(isPremium ^ true ? 0 : 8);
         if (size != 0) {
@@ -263,7 +251,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             if (widgetGuildProfileActionsBinding4 == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            CardView cardView = widgetGuildProfileActionsBinding4.o;
+            CardView cardView = widgetGuildProfileActionsBinding4.n;
             m.checkNotNullExpressionValue(cardView, "guildActionBinding.guildProfileSheetEmojisCard");
             cardView.setVisibility(0);
             int maxEmojisPerRow = maxEmojisPerRow();
@@ -271,7 +259,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             if (widgetGuildProfileActionsBinding5 == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            RecyclerView recyclerView = widgetGuildProfileActionsBinding5.n;
+            RecyclerView recyclerView = widgetGuildProfileActionsBinding5.m;
             m.checkNotNullExpressionValue(recyclerView, "guildActionBinding.guildProfileSheetEmojis");
             RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
             Objects.requireNonNull(layoutManager, "null cannot be cast to non-null type androidx.recyclerview.widget.GridLayoutManager");
@@ -283,18 +271,18 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding6 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CardView cardView2 = widgetGuildProfileActionsBinding6.o;
+        CardView cardView2 = widgetGuildProfileActionsBinding6.n;
         m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetEmojisCard");
         cardView2.setVisibility(8);
     }
 
-    private final void configureGuildActions(long j, long j2, WidgetGuildProfileSheetViewModel.Actions actions, boolean z2) {
+    private final void configureGuildActions(long j, long j2, WidgetGuildProfileSheetViewModel.Actions actions) {
         if (actions == null) {
             WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding = this.guildActionBinding;
             if (widgetGuildProfileActionsBinding == null) {
                 m.throwUninitializedPropertyAccessException("guildActionBinding");
             }
-            LinearLayout linearLayout = widgetGuildProfileActionsBinding.d;
+            LinearLayout linearLayout = widgetGuildProfileActionsBinding.f2261c;
             m.checkNotNullExpressionValue(linearLayout, "guildActionBinding.guildProfileSheetActions");
             linearLayout.setVisibility(8);
             return;
@@ -303,58 +291,57 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding2 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        LinearLayout linearLayout2 = widgetGuildProfileActionsBinding2.d;
+        LinearLayout linearLayout2 = widgetGuildProfileActionsBinding2.f2261c;
         m.checkNotNullExpressionValue(linearLayout2, "guildActionBinding.guildProfileSheetActions");
         linearLayout2.setVisibility(0);
         boolean isUnread = actions.isUnread();
         boolean canManageChannels = actions.getCanManageChannels();
         boolean canManageEvents = actions.getCanManageEvents();
-        boolean canChangeNickname = actions.getCanChangeNickname();
         String nick = actions.getNick();
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding3 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CardView cardView = widgetGuildProfileActionsBinding3.v;
+        CardView cardView = widgetGuildProfileActionsBinding3.u;
         m.checkNotNullExpressionValue(cardView, "guildActionBinding.guild…fileSheetMarkAsReadAction");
         cardView.setVisibility(isUnread ? 0 : 8);
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding4 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding4 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        widgetGuildProfileActionsBinding4.u.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$1(this, j));
+        widgetGuildProfileActionsBinding4.t.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$1(this, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding5 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding5 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CardView cardView2 = widgetGuildProfileActionsBinding5.f2268z;
+        CardView cardView2 = widgetGuildProfileActionsBinding5.f2265y;
         m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetPrimaryActions");
         cardView2.setVisibility(canManageChannels || (canManageEvents && StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(j)) ? 0 : 8);
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding6 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding6 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        TextView textView = widgetGuildProfileActionsBinding6.i;
+        TextView textView = widgetGuildProfileActionsBinding6.h;
         textView.setVisibility(canManageChannels ? 0 : 8);
         setOnClickAndDismissListener(textView, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$1(textView, this, canManageChannels, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding7 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding7 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        TextView textView2 = widgetGuildProfileActionsBinding7.j;
+        TextView textView2 = widgetGuildProfileActionsBinding7.i;
         textView2.setVisibility(canManageChannels ? 0 : 8);
         setOnClickAndDismissListener(textView2, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$2(textView2, this, canManageChannels, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding8 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding8 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        ConstraintLayout constraintLayout = widgetGuildProfileActionsBinding8.k;
+        ConstraintLayout constraintLayout = widgetGuildProfileActionsBinding8.j;
         constraintLayout.setVisibility(canManageEvents && StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(j) ? 0 : 8);
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding9 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding9 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        TextView textView3 = widgetGuildProfileActionsBinding9.l;
+        TextView textView3 = widgetGuildProfileActionsBinding9.k;
         m.checkNotNullExpressionValue(textView3, "guildActionBinding.guildProfileSheetCreateEventNew");
         textView3.setVisibility(getFromGuildEventUpsell() ? 0 : 8);
         setOnClickAndDismissListener(constraintLayout, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3(constraintLayout, this, canManageEvents, j));
@@ -362,72 +349,65 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding10 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        widgetGuildProfileActionsBinding10.f2263c.setText(z2 ? R.string.change_identity : R.string.change_nickname);
+        setOnClickAndDismissListener(widgetGuildProfileActionsBinding10.b, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4(this, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding11 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding11 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        View view = widgetGuildProfileActionsBinding11.b;
-        view.setVisibility(canChangeNickname || z2 ? 0 : 8);
-        setOnClickAndDismissListener(view, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4(this, canChangeNickname, z2, j, actions));
-        WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding12 = this.guildActionBinding;
-        if (widgetGuildProfileActionsBinding12 == null) {
-            m.throwUninitializedPropertyAccessException("guildActionBinding");
-        }
-        TextView textView4 = widgetGuildProfileActionsBinding12.f2265w;
+        TextView textView4 = widgetGuildProfileActionsBinding11.v;
         textView4.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8);
         if (nick == null) {
             nick = actions.getUsername();
         }
         textView4.setText(nick);
+        WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding12 = this.guildActionBinding;
+        if (widgetGuildProfileActionsBinding12 == null) {
+            m.throwUninitializedPropertyAccessException("guildActionBinding");
+        }
+        SimpleDraweeView simpleDraweeView = widgetGuildProfileActionsBinding12.p;
+        String guildAvatar = actions.getGuildAvatar();
+        simpleDraweeView.setVisibility((guildAvatar == null || guildAvatar.length() == 0) ^ true ? 0 : 8);
+        simpleDraweeView.setImageURI(IconUtils.INSTANCE.getForGuildMember(actions.getGuildAvatar(), j, j2, Integer.valueOf(DimenUtils.dpToPixels(16)), false));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding13 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding13 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        SimpleDraweeView simpleDraweeView = widgetGuildProfileActionsBinding13.q;
-        String guildAvatar = actions.getGuildAvatar();
-        simpleDraweeView.setVisibility((guildAvatar == null || guildAvatar.length() == 0) ^ true ? 0 : 8);
-        simpleDraweeView.setImageURI(IconUtils.INSTANCE.getForGuildMember(actions.getGuildAvatar(), j, j2, Integer.valueOf(DimenUtils.dpToPixels(16)), false));
+        LinearLayout linearLayout3 = widgetGuildProfileActionsBinding13.B;
+        m.checkNotNullExpressionValue(linearLayout3, "guildActionBinding.perGuildIdentityContainer");
+        linearLayout3.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8);
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding14 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding14 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        LinearLayout linearLayout3 = widgetGuildProfileActionsBinding14.C;
-        m.checkNotNullExpressionValue(linearLayout3, "guildActionBinding.perGuildIdentityContainer");
-        linearLayout3.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8);
+        CheckedSetting checkedSetting = widgetGuildProfileActionsBinding14.d;
+        checkedSetting.setChecked(actions.isAllowDMChecked());
+        checkedSetting.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$5(this, actions, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding15 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding15 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CheckedSetting checkedSetting = widgetGuildProfileActionsBinding15.e;
-        checkedSetting.setChecked(actions.isAllowDMChecked());
-        checkedSetting.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$5(this, actions, j));
+        CheckedSetting checkedSetting2 = widgetGuildProfileActionsBinding15.q;
+        checkedSetting2.setChecked(actions.getHideMutedChannels());
+        checkedSetting2.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$6(this, actions, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding16 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding16 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CheckedSetting checkedSetting2 = widgetGuildProfileActionsBinding16.f2264r;
-        checkedSetting2.setChecked(actions.getHideMutedChannels());
-        checkedSetting2.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$6(this, actions, j));
+        View view = widgetGuildProfileActionsBinding16.s;
+        view.setVisibility(actions.getCanLeaveGuild() ? 0 : 8);
+        setOnClickAndDismissListener(view, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$7(this, actions, j));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding17 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding17 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        View view2 = widgetGuildProfileActionsBinding17.t;
-        view2.setVisibility(actions.getCanLeaveGuild() ? 0 : 8);
-        setOnClickAndDismissListener(view2, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$7(this, actions, j));
+        CardView cardView3 = widgetGuildProfileActionsBinding17.l;
+        m.checkNotNullExpressionValue(cardView3, "guildActionBinding.guild…fileSheetDeveloperActions");
+        cardView3.setVisibility(actions.isDeveloper() ? 0 : 8);
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding18 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding18 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CardView cardView3 = widgetGuildProfileActionsBinding18.m;
-        m.checkNotNullExpressionValue(cardView3, "guildActionBinding.guild…fileSheetDeveloperActions");
-        cardView3.setVisibility(actions.isDeveloper() ? 0 : 8);
-        WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding19 = this.guildActionBinding;
-        if (widgetGuildProfileActionsBinding19 == null) {
-            m.throwUninitializedPropertyAccessException("guildActionBinding");
-        }
-        widgetGuildProfileActionsBinding19.h.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$11(this, j));
+        widgetGuildProfileActionsBinding18.g.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$11(this, j));
     }
 
     private final void configureGuildBanner(WidgetGuildProfileSheetViewModel.Banner banner) {
@@ -490,7 +470,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         }
     }
 
-    private final void configureGuildHubActions(long j, long j2, WidgetGuildProfileSheetViewModel.Actions actions, boolean z2) {
+    private final void configureGuildHubActions(long j, long j2, WidgetGuildProfileSheetViewModel.Actions actions) {
         if (actions != null) {
             WidgetGuildHubProfileActionsBinding widgetGuildHubProfileActionsBinding = this.guildHubActionBinding;
             if (widgetGuildHubProfileActionsBinding == null) {
@@ -503,12 +483,13 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             }
             LinearLayout linearLayout = widgetGuildHubProfileActionsBinding2.b;
             m.checkNotNullExpressionValue(linearLayout, "guildHubActionBinding.gu…rofileSheetChangeNickname");
-            setOnClickAndDismissListener(linearLayout, new WidgetGuildProfileSheet$configureGuildHubActions$2(this, z2, j, actions));
+            setOnClickAndDismissListener(linearLayout, new WidgetGuildProfileSheet$configureGuildHubActions$2(j));
             WidgetGuildHubProfileActionsBinding widgetGuildHubProfileActionsBinding3 = this.guildHubActionBinding;
             if (widgetGuildHubProfileActionsBinding3 == null) {
                 m.throwUninitializedPropertyAccessException("guildHubActionBinding");
             }
             TextView textView = widgetGuildHubProfileActionsBinding3.f;
+            int i = 8;
             textView.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8);
             String nick = actions.getNick();
             if (nick == null) {
@@ -519,7 +500,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             if (widgetGuildHubProfileActionsBinding4 == null) {
                 m.throwUninitializedPropertyAccessException("guildHubActionBinding");
             }
-            SimpleDraweeView simpleDraweeView = widgetGuildHubProfileActionsBinding4.f2252c;
+            SimpleDraweeView simpleDraweeView = widgetGuildHubProfileActionsBinding4.f2251c;
             String guildAvatar = actions.getGuildAvatar();
             simpleDraweeView.setVisibility((guildAvatar == null || guildAvatar.length() == 0) ^ true ? 0 : 8);
             simpleDraweeView.setImageURI(IconUtils.INSTANCE.getForGuildMember(actions.getGuildAvatar(), j, j2, Integer.valueOf(DimenUtils.dpToPixels(16)), false));
@@ -528,7 +509,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
                 m.throwUninitializedPropertyAccessException("guildHubActionBinding");
             }
             TextView textView2 = widgetGuildHubProfileActionsBinding5.e;
-            textView2.setVisibility(actions.getCanLeaveGuild() ? 0 : 8);
+            if (actions.getCanLeaveGuild()) {
+                i = 0;
+            }
+            textView2.setVisibility(i);
             setOnClickAndDismissListener(textView2, new WidgetGuildProfileSheet$configureGuildHubActions$$inlined$apply$lambda$1(this, actions, j));
         }
     }
@@ -560,7 +544,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             LinearLayout linearLayout = getBinding().q;
             m.checkNotNullExpressionValue(linearLayout, "binding.guildProfileSheetOnlineCount");
             linearLayout.setVisibility(0);
-            TextView textView = getBinding().f2270r;
+            TextView textView = getBinding().f2268r;
             m.checkNotNullExpressionValue(textView, "binding.guildProfileSheetOnlineCountText");
             int intValue = num.intValue();
             LinearLayout linearLayout2 = getBinding().q;
@@ -613,7 +597,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().f2269c;
+        MaterialButton materialButton = getBinding().f2267c;
         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)));
@@ -640,7 +624,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:122:0x0336  */
-    /* JADX WARNING: Removed duplicated region for block: B:123:0x0347  */
+    /* JADX WARNING: Removed duplicated region for block: B:123:0x0343  */
     private final void configureUI(WidgetGuildProfileSheetViewModel.ViewState.Loaded loaded) {
         WidgetGuildProfileSheetViewModel.Actions actions;
         WidgetGuildProfileSheetViewModel.TabItems tabItems;
@@ -660,7 +644,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         WidgetGuildProfileSheetViewModel.EmojisData component12 = loaded.component12();
         WidgetGuildProfileSheetViewModel.BottomActions component13 = loaded.component13();
         boolean component14 = loaded.component14();
-        MeUser component16 = loaded.component16();
+        MeUser component15 = loaded.component15();
         if (!component14 || this.guildHubActionBinding != null) {
             actions = component11;
             if (!component14 && this.guildActionBinding == null) {
@@ -750,10 +734,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
                                                                                                                                     configureMemberCount(component8, component9);
                                                                                                                                     configureTabItems(component1, tabItems, component14);
                                                                                                                                     if (!component14) {
-                                                                                                                                        configureGuildHubActions(component1, component16.getId(), actions, loaded.getInPerGuildAvatarExperiment());
+                                                                                                                                        configureGuildHubActions(component1, component15.getId(), actions);
                                                                                                                                         return;
                                                                                                                                     }
-                                                                                                                                    configureGuildActions(component1, component16.getId(), actions, loaded.getInPerGuildAvatarExperiment());
+                                                                                                                                    configureGuildActions(component1, component15.getId(), actions);
                                                                                                                                     configureEmojis(component12);
                                                                                                                                     configureBottomActions(component1, this.channelId, component13);
                                                                                                                                     return;
@@ -1001,28 +985,28 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (widgetGuildProfileActionsBinding == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CardView cardView = widgetGuildProfileActionsBinding.o;
+        CardView cardView = widgetGuildProfileActionsBinding.n;
         m.checkNotNullExpressionValue(cardView, "guildActionBinding.guildProfileSheetEmojisCard");
         int contentPaddingLeft = cardView.getContentPaddingLeft();
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding2 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding2 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        CardView cardView2 = widgetGuildProfileActionsBinding2.o;
+        CardView cardView2 = widgetGuildProfileActionsBinding2.n;
         m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetEmojisCard");
         int contentPaddingRight = cardView2.getContentPaddingRight() + contentPaddingLeft;
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding3 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        LinearLayout linearLayout = widgetGuildProfileActionsBinding3.g;
+        LinearLayout linearLayout = widgetGuildProfileActionsBinding3.f;
         m.checkNotNullExpressionValue(linearLayout, "guildActionBinding.guild…ofileSheetBottomContainer");
         int paddingStart = linearLayout.getPaddingStart();
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding4 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding4 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
         }
-        LinearLayout linearLayout2 = widgetGuildProfileActionsBinding4.g;
+        LinearLayout linearLayout2 = widgetGuildProfileActionsBinding4.f;
         m.checkNotNullExpressionValue(linearLayout2, "guildActionBinding.guild…ofileSheetBottomContainer");
         return ((i - contentPaddingRight) - (linearLayout2.getPaddingEnd() + paddingStart)) / getResources().getDimensionPixelSize(R.dimen.emoji_size);
     }
@@ -1031,54 +1015,6 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         Companion.show(fragmentManager, z2, j, j2, z3);
     }
 
-    private final void showChangeNicknameDialog(long j, String str, boolean z2) {
-        int i = 0;
-        View inflate = getLayoutInflater().inflate(R.layout.widget_channels_list_actions_change_nickname, (ViewGroup) null, false);
-        int i2 = R.id.channels_list_actions_change_nickname_cancel;
-        MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.channels_list_actions_change_nickname_cancel);
-        if (materialButton != null) {
-            i2 = R.id.channels_list_actions_change_nickname_edit_text;
-            TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(R.id.channels_list_actions_change_nickname_edit_text);
-            if (textInputLayout != null) {
-                i2 = R.id.channels_list_actions_change_nickname_reset;
-                TextView textView = (TextView) inflate.findViewById(R.id.channels_list_actions_change_nickname_reset);
-                if (textView != null) {
-                    i2 = R.id.channels_list_actions_change_nickname_save;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.channels_list_actions_change_nickname_save);
-                    if (materialButton2 != null) {
-                        i2 = R.id.channels_list_actions_change_nickname_title;
-                        TextView textView2 = (TextView) inflate.findViewById(R.id.channels_list_actions_change_nickname_title);
-                        if (textView2 != null) {
-                            LinearLayout linearLayout = (LinearLayout) inflate;
-                            WidgetChannelsListActionsChangeNicknameBinding widgetChannelsListActionsChangeNicknameBinding = new WidgetChannelsListActionsChangeNicknameBinding(linearLayout, materialButton, textInputLayout, textView, materialButton2, textView2);
-                            m.checkNotNullExpressionValue(widgetChannelsListActionsChangeNicknameBinding, "WidgetChannelsListAction…outInflater, null, false)");
-                            materialButton.setOnClickListener(new WidgetGuildProfileSheet$showChangeNicknameDialog$1(this));
-                            textView2.setText(z2 ? R.string.change_identity : R.string.change_nickname);
-                            textInputLayout.setHint(z2 ? R.string.hub_real_name_modal_form_placeholder : R.string.nickname);
-                            m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText");
-                            ViewExtensions.setText(textInputLayout, str);
-                            m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText");
-                            ViewExtensions.setSelectionEnd(textInputLayout);
-                            materialButton2.setOnClickListener(new WidgetGuildProfileSheet$showChangeNicknameDialog$2(this, j, widgetChannelsListActionsChangeNicknameBinding));
-                            if (!(true ^ (str == null || t.isBlank(str)))) {
-                                i = 8;
-                            }
-                            textView.setVisibility(i);
-                            textView.setOnClickListener(new WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1(this, str, j, z2));
-                            textView.setText(z2 ? R.string.reset_to_default : R.string.reset_nickname);
-                            m.checkNotNullExpressionValue(linearLayout, "binding.root");
-                            AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).create();
-                            create.show();
-                            this.dialog = create;
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
-    }
-
     private final void showLeaveServerDialog(long j) {
         WidgetLeaveGuildDialog.Companion companion = WidgetLeaveGuildDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java
index 88f844b89b..a90e888c86 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java
@@ -37,6 +37,6 @@ public final class WidgetGuildProfileSheetViewModel$Companion$observeStores$1<T,
     }
 
     public final Observable<? extends GuildMember> call(MeUser meUser) {
-        return StoreStream.Companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).E(new AnonymousClass1(meUser));
+        return StoreStream.Companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).F(new AnonymousClass1(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$3.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$3.java
index 6db96e151f..74edf35215 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$3.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$3.java
@@ -2,9 +2,7 @@ package com.discord.widgets.guilds.profile;
 
 import c0.t.n;
 import c0.z.d.m;
-import c0.z.d.o;
 import com.discord.models.domain.emoji.Emoji;
-import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.MeUser;
@@ -13,26 +11,27 @@ import com.discord.stores.StoreStream;
 import com.discord.utilities.channel.GuildChannelsInfo;
 import com.discord.widgets.guilds.profile.WidgetGuildProfileSheetViewModel;
 import java.util.List;
-import kotlin.jvm.functions.Function10;
+import rx.functions.Func9;
 /* compiled from: WidgetGuildProfileSheetViewModel.kt */
-public final class WidgetGuildProfileSheetViewModel$Companion$observeStores$3 extends o implements Function10<Guild, StoreGuildProfiles.GuildProfileData, Boolean, MeUser, GuildMember, List<? extends Long>, List<Emoji>, Boolean, GuildChannelsInfo, Experiment, WidgetGuildProfileSheetViewModel.StoreState> {
+public final class WidgetGuildProfileSheetViewModel$Companion$observeStores$3<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> implements Func9<Guild, StoreGuildProfiles.GuildProfileData, Boolean, MeUser, GuildMember, List<? extends Long>, List<Emoji>, Boolean, GuildChannelsInfo, WidgetGuildProfileSheetViewModel.StoreState> {
     public static final WidgetGuildProfileSheetViewModel$Companion$observeStores$3 INSTANCE = new WidgetGuildProfileSheetViewModel$Companion$observeStores$3();
 
-    public WidgetGuildProfileSheetViewModel$Companion$observeStores$3() {
-        super(10);
-    }
-
-    public final WidgetGuildProfileSheetViewModel.StoreState invoke(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, boolean z2, MeUser meUser, GuildMember guildMember, List<Long> list, List<Emoji> list2, boolean z3, GuildChannelsInfo guildChannelsInfo, Experiment experiment) {
-        m.checkNotNullParameter(meUser, "me");
-        m.checkNotNullParameter(list, "restrictedGuildIds");
-        m.checkNotNullParameter(guildChannelsInfo, "guildChannelsInfo");
-        return new WidgetGuildProfileSheetViewModel.StoreState(guild, guildProfileData, guildChannelsInfo, meUser, guildMember, list, StoreStream.Companion.getUserSettings().getIsDeveloperMode(), list2 != null ? list2 : n.emptyList(), z3, z2, experiment != null && experiment.getBucket() == 1);
+    public final WidgetGuildProfileSheetViewModel.StoreState call(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, Boolean bool, MeUser meUser, GuildMember guildMember, List<Long> list, List<Emoji> list2, Boolean bool2, GuildChannelsInfo guildChannelsInfo) {
+        m.checkNotNullExpressionValue(guildChannelsInfo, "guildChannelsInfo");
+        m.checkNotNullExpressionValue(meUser, "me");
+        m.checkNotNullExpressionValue(list, "restrictedGuildIds");
+        boolean isDeveloperMode = StoreStream.Companion.getUserSettings().getIsDeveloperMode();
+        List<Emoji> emptyList = list2 != null ? list2 : n.emptyList();
+        m.checkNotNullExpressionValue(bool2, "isLurking");
+        boolean booleanValue = bool2.booleanValue();
+        m.checkNotNullExpressionValue(bool, "isUnread");
+        return new WidgetGuildProfileSheetViewModel.StoreState(guild, guildProfileData, guildChannelsInfo, meUser, guildMember, list, isDeveloperMode, emptyList, booleanValue, bool.booleanValue());
     }
 
     /* 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function10
-    public /* bridge */ /* synthetic */ WidgetGuildProfileSheetViewModel.StoreState invoke(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, Boolean bool, MeUser meUser, GuildMember guildMember, List<? extends Long> list, List<Emoji> list2, Boolean bool2, GuildChannelsInfo guildChannelsInfo, Experiment experiment) {
-        return invoke(guild, guildProfileData, bool.booleanValue(), meUser, guildMember, (List<Long>) list, list2, bool2.booleanValue(), guildChannelsInfo, experiment);
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func9
+    public /* bridge */ /* synthetic */ WidgetGuildProfileSheetViewModel.StoreState call(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, Boolean bool, MeUser meUser, GuildMember guildMember, List<? extends Long> list, List<Emoji> list2, Boolean bool2, GuildChannelsInfo guildChannelsInfo) {
+        return call(guild, guildProfileData, bool, meUser, guildMember, (List<Long>) list, list2, bool2, guildChannelsInfo);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
index 98a2c2e45c..e8a1760804 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
@@ -32,7 +32,6 @@ import com.discord.utilities.channel.GuildChannelsInfo;
 import com.discord.utilities.guilds.GuildUtilsKt;
 import com.discord.utilities.permissions.ManageGuildContext;
 import com.discord.utilities.rest.RestAPI;
-import com.discord.utilities.rx.ObservableCombineLatestOverloadsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.user.UserUtils;
 import java.util.ArrayList;
@@ -540,16 +539,9 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
 
         public final Observable<StoreState> observeStores(long j) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<Guild> observeGuild = companion.getGuilds().observeGuild(j);
-            Observable<StoreGuildProfiles.GuildProfileData> observeGuildProfile = companion.getGuildProfiles().observeGuildProfile(j);
-            Observable<Boolean> isUnread = companion.getReadStates().getIsUnread(j);
-            Observable observeMe$default = StoreUser.observeMe$default(companion.getUsers(), false, 1, null);
-            Observable X = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).X(new WidgetGuildProfileSheetViewModel$Companion$observeStores$1(j));
-            m.checkNotNullExpressionValue(X, "StoreStream\n            …e.id] }\n                }");
-            Observable<List<Long>> observeRestrictedGuildIds = companion.getUserSettings().observeRestrictedGuildIds();
-            Observable<R> E = companion.getEmojis().getEmojiSet(new StoreEmoji.EmojiContext.GuildProfile(j), true, false).E(new WidgetGuildProfileSheetViewModel$Companion$observeStores$2(j));
-            m.checkNotNullExpressionValue(E, "StoreStream\n            …t.customEmojis[guildId] }");
-            return ObservableCombineLatestOverloadsKt.combineLatest(observeGuild, observeGuildProfile, isUnread, observeMe$default, X, observeRestrictedGuildIds, E, companion.getLurking().isLurkingObs(j), GuildChannelsInfo.Companion.get(j), companion.getExperiments().observeUserExperiment("2021-05_per_guild_avatars", false), WidgetGuildProfileSheetViewModel$Companion$observeStores$3.INSTANCE);
+            Observable<StoreState> c2 = Observable.c(companion.getGuilds().observeGuild(j), companion.getGuildProfiles().observeGuildProfile(j), companion.getReadStates().getIsUnread(j), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Y(new WidgetGuildProfileSheetViewModel$Companion$observeStores$1(j)), companion.getUserSettings().observeRestrictedGuildIds(), companion.getEmojis().getEmojiSet(new StoreEmoji.EmojiContext.GuildProfile(j), true, false).F(new WidgetGuildProfileSheetViewModel$Companion$observeStores$2(j)), companion.getLurking().isLurkingObs(j), GuildChannelsInfo.Companion.get(j), WidgetGuildProfileSheetViewModel$Companion$observeStores$3.INSTANCE);
+            m.checkNotNullExpressionValue(c2, "Observable.combineLatest…ead\n          )\n        }");
+            return c2;
         }
     }
 
@@ -714,18 +706,17 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         private final Guild guild;
         private final GuildChannelsInfo guildChannelsInfo;
         private final StoreGuildProfiles.GuildProfileData guildProfile;
-        private final boolean inGuildAvatarExperiment;
         private final boolean isDeveloper;
         private final boolean isLurking;
         private final boolean isUnread;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2641me;
+        private final MeUser f2639me;
         private final List<Long> restrictedGuildIds;
 
         /* JADX DEBUG: Multi-variable search result rejected for r9v0, resolved type: java.util.List<? extends com.discord.models.domain.emoji.Emoji> */
         /* JADX WARN: Multi-variable type inference failed */
-        public StoreState(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List<Long> list, boolean z2, List<? extends Emoji> list2, boolean z3, boolean z4, boolean z5) {
+        public StoreState(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List<Long> list, boolean z2, List<? extends Emoji> list2, boolean z3, boolean z4) {
             m.checkNotNullParameter(guildChannelsInfo, "guildChannelsInfo");
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(list, "restrictedGuildIds");
@@ -733,18 +724,17 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             this.guild = guild;
             this.guildProfile = guildProfileData;
             this.guildChannelsInfo = guildChannelsInfo;
-            this.f2641me = meUser;
+            this.f2639me = meUser;
             this.computedMe = guildMember;
             this.restrictedGuildIds = list;
             this.isDeveloper = z2;
             this.emojis = list2;
             this.isLurking = z3;
             this.isUnread = z4;
-            this.inGuildAvatarExperiment = z5;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List list, boolean z2, List list2, boolean z3, boolean z4, boolean z5, int i, Object obj) {
-            return storeState.copy((i & 1) != 0 ? storeState.guild : guild, (i & 2) != 0 ? storeState.guildProfile : guildProfileData, (i & 4) != 0 ? storeState.guildChannelsInfo : guildChannelsInfo, (i & 8) != 0 ? storeState.f2641me : meUser, (i & 16) != 0 ? storeState.computedMe : guildMember, (i & 32) != 0 ? storeState.restrictedGuildIds : list, (i & 64) != 0 ? storeState.isDeveloper : z2, (i & 128) != 0 ? storeState.emojis : list2, (i & 256) != 0 ? storeState.isLurking : z3, (i & 512) != 0 ? storeState.isUnread : z4, (i & 1024) != 0 ? storeState.inGuildAvatarExperiment : z5);
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List list, boolean z2, List list2, boolean z3, boolean z4, int i, Object obj) {
+            return storeState.copy((i & 1) != 0 ? storeState.guild : guild, (i & 2) != 0 ? storeState.guildProfile : guildProfileData, (i & 4) != 0 ? storeState.guildChannelsInfo : guildChannelsInfo, (i & 8) != 0 ? storeState.f2639me : meUser, (i & 16) != 0 ? storeState.computedMe : guildMember, (i & 32) != 0 ? storeState.restrictedGuildIds : list, (i & 64) != 0 ? storeState.isDeveloper : z2, (i & 128) != 0 ? storeState.emojis : list2, (i & 256) != 0 ? storeState.isLurking : z3, (i & 512) != 0 ? storeState.isUnread : z4);
         }
 
         public final Guild component1() {
@@ -755,10 +745,6 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             return this.isUnread;
         }
 
-        public final boolean component11() {
-            return this.inGuildAvatarExperiment;
-        }
-
         public final StoreGuildProfiles.GuildProfileData component2() {
             return this.guildProfile;
         }
@@ -768,7 +754,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         }
 
         public final MeUser component4() {
-            return this.f2641me;
+            return this.f2639me;
         }
 
         public final GuildMember component5() {
@@ -791,12 +777,12 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             return this.isLurking;
         }
 
-        public final StoreState copy(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List<Long> list, boolean z2, List<? extends Emoji> list2, boolean z3, boolean z4, boolean z5) {
+        public final StoreState copy(Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List<Long> list, boolean z2, List<? extends Emoji> list2, boolean z3, boolean z4) {
             m.checkNotNullParameter(guildChannelsInfo, "guildChannelsInfo");
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(list, "restrictedGuildIds");
             m.checkNotNullParameter(list2, "emojis");
-            return new StoreState(guild, guildProfileData, guildChannelsInfo, meUser, guildMember, list, z2, list2, z3, z4, z5);
+            return new StoreState(guild, guildProfileData, guildChannelsInfo, meUser, guildMember, list, z2, list2, z3, z4);
         }
 
         public boolean equals(Object obj) {
@@ -807,7 +793,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.guild, storeState.guild) && m.areEqual(this.guildProfile, storeState.guildProfile) && m.areEqual(this.guildChannelsInfo, storeState.guildChannelsInfo) && m.areEqual(this.f2641me, storeState.f2641me) && m.areEqual(this.computedMe, storeState.computedMe) && m.areEqual(this.restrictedGuildIds, storeState.restrictedGuildIds) && this.isDeveloper == storeState.isDeveloper && m.areEqual(this.emojis, storeState.emojis) && this.isLurking == storeState.isLurking && this.isUnread == storeState.isUnread && this.inGuildAvatarExperiment == storeState.inGuildAvatarExperiment;
+            return m.areEqual(this.guild, storeState.guild) && m.areEqual(this.guildProfile, storeState.guildProfile) && m.areEqual(this.guildChannelsInfo, storeState.guildChannelsInfo) && m.areEqual(this.f2639me, storeState.f2639me) && m.areEqual(this.computedMe, storeState.computedMe) && m.areEqual(this.restrictedGuildIds, storeState.restrictedGuildIds) && this.isDeveloper == storeState.isDeveloper && m.areEqual(this.emojis, storeState.emojis) && this.isLurking == storeState.isLurking && this.isUnread == storeState.isUnread;
         }
 
         public final GuildMember getComputedMe() {
@@ -830,12 +816,8 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             return this.guildProfile;
         }
 
-        public final boolean getInGuildAvatarExperiment() {
-            return this.inGuildAvatarExperiment;
-        }
-
         public final MeUser getMe() {
-            return this.f2641me;
+            return this.f2639me;
         }
 
         public final List<Long> getRestrictedGuildIds() {
@@ -850,7 +832,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             int hashCode2 = (hashCode + (guildProfileData != null ? guildProfileData.hashCode() : 0)) * 31;
             GuildChannelsInfo guildChannelsInfo = this.guildChannelsInfo;
             int hashCode3 = (hashCode2 + (guildChannelsInfo != null ? guildChannelsInfo.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2641me;
+            MeUser meUser = this.f2639me;
             int hashCode4 = (hashCode3 + (meUser != null ? meUser.hashCode() : 0)) * 31;
             GuildMember guildMember = this.computedMe;
             int hashCode5 = (hashCode4 + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
@@ -879,18 +861,10 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             int i10 = z3 ? 1 : 0;
             int i11 = (i7 + i8) * 31;
             boolean z4 = this.isUnread;
-            if (z4) {
-                z4 = true;
+            if (!z4) {
+                i2 = z4 ? 1 : 0;
             }
-            int i12 = z4 ? 1 : 0;
-            int i13 = z4 ? 1 : 0;
-            int i14 = z4 ? 1 : 0;
-            int i15 = (i11 + i12) * 31;
-            boolean z5 = this.inGuildAvatarExperiment;
-            if (!z5) {
-                i2 = z5 ? 1 : 0;
-            }
-            return i15 + i2;
+            return i11 + i2;
         }
 
         public final boolean isDeveloper() {
@@ -913,7 +887,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             O.append(", guildChannelsInfo=");
             O.append(this.guildChannelsInfo);
             O.append(", me=");
-            O.append(this.f2641me);
+            O.append(this.f2639me);
             O.append(", computedMe=");
             O.append(this.computedMe);
             O.append(", restrictedGuildIds=");
@@ -925,9 +899,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             O.append(", isLurking=");
             O.append(this.isLurking);
             O.append(", isUnread=");
-            O.append(this.isUnread);
-            O.append(", inGuildAvatarExperiment=");
-            return a.K(O, this.inGuildAvatarExperiment, ")");
+            return a.K(O, this.isUnread, ")");
         }
     }
 
@@ -1045,7 +1017,6 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             private final long guildId;
             private final String guildName;
             private final String guildShortName;
-            private final boolean inPerGuildAvatarExperiment;
             private final boolean isGuildHub;
             private final MeUser meUser;
             private final Integer memberCount;
@@ -1054,7 +1025,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             private final Integer verifiedPartneredIconRes;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Loaded(long j, String str, String str2, String str3, String str4, Integer num, Banner banner, Integer num2, Integer num3, TabItems tabItems, Actions actions, EmojisData emojisData, BottomActions bottomActions, boolean z2, boolean z3, MeUser meUser) {
+            public Loaded(long j, String str, String str2, String str3, String str4, Integer num, Banner banner, Integer num2, Integer num3, TabItems tabItems, Actions actions, EmojisData emojisData, BottomActions bottomActions, boolean z2, MeUser meUser) {
                 super(null);
                 m.checkNotNullParameter(str, "guildName");
                 m.checkNotNullParameter(str2, "guildShortName");
@@ -1076,12 +1047,11 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 this.emojisData = emojisData;
                 this.bottomActions = bottomActions;
                 this.isGuildHub = z2;
-                this.inPerGuildAvatarExperiment = z3;
                 this.meUser = meUser;
             }
 
-            public static /* synthetic */ Loaded copy$default(Loaded loaded, long j, String str, String str2, String str3, String str4, Integer num, Banner banner, Integer num2, Integer num3, TabItems tabItems, Actions actions, EmojisData emojisData, BottomActions bottomActions, boolean z2, boolean z3, MeUser meUser, int i, Object obj) {
-                return loaded.copy((i & 1) != 0 ? loaded.guildId : j, (i & 2) != 0 ? loaded.guildName : str, (i & 4) != 0 ? loaded.guildShortName : str2, (i & 8) != 0 ? loaded.guildIcon : str3, (i & 16) != 0 ? loaded.guildDescription : str4, (i & 32) != 0 ? loaded.verifiedPartneredIconRes : num, (i & 64) != 0 ? loaded.banner : banner, (i & 128) != 0 ? loaded.onlineCount : num2, (i & 256) != 0 ? loaded.memberCount : num3, (i & 512) != 0 ? loaded.tabItems : tabItems, (i & 1024) != 0 ? loaded.actions : actions, (i & 2048) != 0 ? loaded.emojisData : emojisData, (i & 4096) != 0 ? loaded.bottomActions : bottomActions, (i & 8192) != 0 ? loaded.isGuildHub : z2, (i & 16384) != 0 ? loaded.inPerGuildAvatarExperiment : z3, (i & 32768) != 0 ? loaded.meUser : meUser);
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, long j, String str, String str2, String str3, String str4, Integer num, Banner banner, Integer num2, Integer num3, TabItems tabItems, Actions actions, EmojisData emojisData, BottomActions bottomActions, boolean z2, MeUser meUser, int i, Object obj) {
+                return loaded.copy((i & 1) != 0 ? loaded.guildId : j, (i & 2) != 0 ? loaded.guildName : str, (i & 4) != 0 ? loaded.guildShortName : str2, (i & 8) != 0 ? loaded.guildIcon : str3, (i & 16) != 0 ? loaded.guildDescription : str4, (i & 32) != 0 ? loaded.verifiedPartneredIconRes : num, (i & 64) != 0 ? loaded.banner : banner, (i & 128) != 0 ? loaded.onlineCount : num2, (i & 256) != 0 ? loaded.memberCount : num3, (i & 512) != 0 ? loaded.tabItems : tabItems, (i & 1024) != 0 ? loaded.actions : actions, (i & 2048) != 0 ? loaded.emojisData : emojisData, (i & 4096) != 0 ? loaded.bottomActions : bottomActions, (i & 8192) != 0 ? loaded.isGuildHub : z2, (i & 16384) != 0 ? loaded.meUser : meUser);
             }
 
             public final long component1() {
@@ -1108,11 +1078,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 return this.isGuildHub;
             }
 
-            public final boolean component15() {
-                return this.inPerGuildAvatarExperiment;
-            }
-
-            public final MeUser component16() {
+            public final MeUser component15() {
                 return this.meUser;
             }
 
@@ -1148,14 +1114,14 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 return this.memberCount;
             }
 
-            public final Loaded copy(long j, String str, String str2, String str3, String str4, Integer num, Banner banner, Integer num2, Integer num3, TabItems tabItems, Actions actions, EmojisData emojisData, BottomActions bottomActions, boolean z2, boolean z3, MeUser meUser) {
+            public final Loaded copy(long j, String str, String str2, String str3, String str4, Integer num, Banner banner, Integer num2, Integer num3, TabItems tabItems, Actions actions, EmojisData emojisData, BottomActions bottomActions, boolean z2, MeUser meUser) {
                 m.checkNotNullParameter(str, "guildName");
                 m.checkNotNullParameter(str2, "guildShortName");
                 m.checkNotNullParameter(banner, "banner");
                 m.checkNotNullParameter(emojisData, "emojisData");
                 m.checkNotNullParameter(bottomActions, "bottomActions");
                 m.checkNotNullParameter(meUser, "meUser");
-                return new Loaded(j, str, str2, str3, str4, num, banner, num2, num3, tabItems, actions, emojisData, bottomActions, z2, z3, meUser);
+                return new Loaded(j, str, str2, str3, str4, num, banner, num2, num3, tabItems, actions, emojisData, bottomActions, z2, meUser);
             }
 
             public boolean equals(Object obj) {
@@ -1166,7 +1132,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return this.guildId == loaded.guildId && m.areEqual(this.guildName, loaded.guildName) && m.areEqual(this.guildShortName, loaded.guildShortName) && m.areEqual(this.guildIcon, loaded.guildIcon) && m.areEqual(this.guildDescription, loaded.guildDescription) && m.areEqual(this.verifiedPartneredIconRes, loaded.verifiedPartneredIconRes) && m.areEqual(this.banner, loaded.banner) && m.areEqual(this.onlineCount, loaded.onlineCount) && m.areEqual(this.memberCount, loaded.memberCount) && m.areEqual(this.tabItems, loaded.tabItems) && m.areEqual(this.actions, loaded.actions) && m.areEqual(this.emojisData, loaded.emojisData) && m.areEqual(this.bottomActions, loaded.bottomActions) && this.isGuildHub == loaded.isGuildHub && this.inPerGuildAvatarExperiment == loaded.inPerGuildAvatarExperiment && m.areEqual(this.meUser, loaded.meUser);
+                return this.guildId == loaded.guildId && m.areEqual(this.guildName, loaded.guildName) && m.areEqual(this.guildShortName, loaded.guildShortName) && m.areEqual(this.guildIcon, loaded.guildIcon) && m.areEqual(this.guildDescription, loaded.guildDescription) && m.areEqual(this.verifiedPartneredIconRes, loaded.verifiedPartneredIconRes) && m.areEqual(this.banner, loaded.banner) && m.areEqual(this.onlineCount, loaded.onlineCount) && m.areEqual(this.memberCount, loaded.memberCount) && m.areEqual(this.tabItems, loaded.tabItems) && m.areEqual(this.actions, loaded.actions) && m.areEqual(this.emojisData, loaded.emojisData) && m.areEqual(this.bottomActions, loaded.bottomActions) && this.isGuildHub == loaded.isGuildHub && m.areEqual(this.meUser, loaded.meUser);
             }
 
             public final Actions getActions() {
@@ -1205,10 +1171,6 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 return this.guildShortName;
             }
 
-            public final boolean getInPerGuildAvatarExperiment() {
-                return this.inPerGuildAvatarExperiment;
-            }
-
             public final MeUser getMeUser() {
                 return this.meUser;
             }
@@ -1257,24 +1219,18 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 BottomActions bottomActions = this.bottomActions;
                 int hashCode12 = (hashCode11 + (bottomActions != null ? bottomActions.hashCode() : 0)) * 31;
                 boolean z2 = this.isGuildHub;
-                int i2 = 1;
                 if (z2) {
                     z2 = true;
                 }
+                int i2 = z2 ? 1 : 0;
                 int i3 = z2 ? 1 : 0;
                 int i4 = z2 ? 1 : 0;
-                int i5 = z2 ? 1 : 0;
-                int i6 = (hashCode12 + i3) * 31;
-                boolean z3 = this.inPerGuildAvatarExperiment;
-                if (!z3) {
-                    i2 = z3 ? 1 : 0;
-                }
-                int i7 = (i6 + i2) * 31;
+                int i5 = (hashCode12 + i2) * 31;
                 MeUser meUser = this.meUser;
                 if (meUser != null) {
                     i = meUser.hashCode();
                 }
-                return i7 + i;
+                return i5 + i;
             }
 
             public final boolean isGuildHub() {
@@ -1310,8 +1266,6 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 O.append(this.bottomActions);
                 O.append(", isGuildHub=");
                 O.append(this.isGuildHub);
-                O.append(", inPerGuildAvatarExperiment=");
-                O.append(this.inPerGuildAvatarExperiment);
                 O.append(", meUser=");
                 O.append(this.meUser);
                 O.append(")");
@@ -1353,7 +1307,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         this.restAPI = restAPI;
         this.storeLurking = storeLurking;
         this.guildId = j;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetGuildProfileSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         storeAnalytics.trackGuildProfileOpened(j);
     }
@@ -1381,7 +1335,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
     /* JADX WARNING: Removed duplicated region for block: B:43:0x0119  */
     /* JADX WARNING: Removed duplicated region for block: B:45:0x011d  */
     /* JADX WARNING: Removed duplicated region for block: B:48:0x0132  */
-    private final void handleLoadedGuild(Guild guild, GuildPreview guildPreview, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List<Long> list, boolean z2, List<? extends Emoji> list2, boolean z3, boolean z4, boolean z5) {
+    private final void handleLoadedGuild(Guild guild, GuildPreview guildPreview, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List<Long> list, boolean z2, List<? extends Emoji> list2, boolean z3, boolean z4) {
         Integer num;
         List<? extends Emoji> list3;
         List<GuildEmoji> d;
@@ -1418,11 +1372,11 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 num2 = guildPreview.a();
             }
             boolean isPremium = UserUtils.INSTANCE.isPremium(meUser);
-            boolean z6 = this.isEmojiSectionExpanded;
+            boolean z5 = this.isEmojiSectionExpanded;
             if (list3 == null) {
                 list3 = n.emptyList();
             }
-            updateViewState(new ViewState.Loaded(id2, name, shortName, icon, description, num, banner, b, num2, tabItems, actions, new EmojisData(isPremium, z6, list3), bottomActions, guild.isHub(), z5, meUser));
+            updateViewState(new ViewState.Loaded(id2, name, shortName, icon, description, num, banner, b, num2, tabItems, actions, new EmojisData(isPremium, z5, list3), bottomActions, guild.isHub(), meUser));
         }
         num = valueOf;
         Banner banner = new Banner(guild.getId(), guild.getBanner(), Banner.Type.BANNER);
@@ -1444,10 +1398,10 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         if (guildPreview != null) {
         }
         boolean isPremium = UserUtils.INSTANCE.isPremium(meUser);
-        boolean z6 = this.isEmojiSectionExpanded;
+        boolean z5 = this.isEmojiSectionExpanded;
         if (list3 == null) {
         }
-        updateViewState(new ViewState.Loaded(id2, name, shortName, icon, description, num, banner, b, num2, tabItems, actions, new EmojisData(isPremium, z6, list3), bottomActions, guild.isHub(), z5, meUser));
+        updateViewState(new ViewState.Loaded(id2, name, shortName, icon, description, num, banner, b, num2, tabItems, actions, new EmojisData(isPremium, z5, list3), bottomActions, guild.isHub(), meUser));
     }
 
     private final void handleLoadedGuildPreview(GuildPreview guildPreview, MeUser meUser) {
@@ -1472,7 +1426,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             b = b;
             a = a;
         }
-        updateViewState(new ViewState.Loaded(g, h, computeShortName, f, c2, valueOf, banner, b, a, null, null, new EmojisData(isPremium, z2, arrayList), bottomActions, guildPreview.e().contains(GuildFeature.HUB), false, meUser));
+        updateViewState(new ViewState.Loaded(g, h, computeShortName, f, c2, valueOf, banner, b, a, null, null, new EmojisData(isPremium, z2, arrayList), bottomActions, guildPreview.e().contains(GuildFeature.HUB), meUser));
     }
 
     private final void handleStoreState(StoreState storeState) {
@@ -1486,14 +1440,13 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         List<Emoji> component8 = storeState.component8();
         boolean component9 = storeState.component9();
         boolean component10 = storeState.component10();
-        boolean component11 = storeState.component11();
         StoreGuildProfiles.FetchStates fetchStates = null;
         GuildPreview guildPreview = null;
         if (component1 != null) {
             if (component2 != null) {
                 guildPreview = component2.getData();
             }
-            handleLoadedGuild(component1, guildPreview, component3, component4, component5, component6, component7, component8, component9, component10, component11);
+            handleLoadedGuild(component1, guildPreview, component3, component4, component5, component6, component7, component8, component9, component10);
             return;
         }
         StoreGuildProfiles.FetchStates fetchState = component2 != null ? component2.getFetchState() : null;
@@ -1528,7 +1481,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && !this.isEmojiSectionExpanded) {
             this.isEmojiSectionExpanded = true;
-            updateViewState(ViewState.Loaded.copy$default(loaded, 0, null, null, null, null, null, null, null, null, null, null, EmojisData.copy$default(loaded.getEmojisData(), false, this.isEmojiSectionExpanded, null, 5, null), null, false, false, null, 63487, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, 0, null, null, null, null, null, null, null, null, null, null, EmojisData.copy$default(loaded.getEmojisData(), false, this.isEmojiSectionExpanded, null, 5, null), null, false, null, 30719, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4.java
index 5c93495b02..2f0d2c1fe5 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4.java
@@ -61,8 +61,8 @@ public final class GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
-        Observable<Channel> x2 = StoreStream.Companion.getChannels().observeDefaultChannel(this.$item.getEvent().f()).x();
-        m.checkNotNullExpressionValue(x2, "StoreStream.getChannels(…\n                .first()");
-        ObservableExtensionsKt.appSubscribe$default(x2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<Channel> y2 = StoreStream.Companion.getChannels().observeDefaultChannel(this.$item.getEvent().f()).y();
+        m.checkNotNullExpressionValue(y2, "StoreStream.getChannels(…\n                .first()");
+        ObservableExtensionsKt.appSubscribe$default(y2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetEndGuildScheduledEventBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetEndGuildScheduledEventBottomSheet.java
index 5b0ec73913..6c010ec8cf 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetEndGuildScheduledEventBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetEndGuildScheduledEventBottomSheet.java
@@ -110,10 +110,10 @@ public final class WidgetEndGuildScheduledEventBottomSheet extends AppBottomShee
         MaterialButton materialButton = getBinding().b;
         m.checkNotNullExpressionValue(materialButton, "binding.cancel");
         materialButton.setText(requireContext().getString(R.string.guild_event_end_prompt_cancel));
-        MaterialButton materialButton2 = getBinding().f2229c;
+        MaterialButton materialButton2 = getBinding().f2228c;
         m.checkNotNullExpressionValue(materialButton2, "binding.confirm");
         materialButton2.setText(requireContext().getString(R.string.guild_event_end_prompt_confirm));
         getBinding().b.setOnClickListener(new WidgetEndGuildScheduledEventBottomSheet$onViewCreated$1(this));
-        getBinding().f2229c.setOnClickListener(new WidgetEndGuildScheduledEventBottomSheet$onViewCreated$2(this));
+        getBinding().f2228c.setOnClickListener(new WidgetEndGuildScheduledEventBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4.java
index e7665b6610..ec7879fa9f 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4.java
@@ -61,8 +61,8 @@ public final class WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4 ext
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
-        Observable<Channel> x2 = StoreStream.Companion.getChannels().observeDefaultChannel(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent().f()).x();
-        m.checkNotNullExpressionValue(x2, "StoreStream.getChannels(…d)\n              .first()");
-        ObservableExtensionsKt.appSubscribe$default(x2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<Channel> y2 = StoreStream.Companion.getChannels().observeDefaultChannel(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent().f()).y();
+        m.checkNotNullExpressionValue(y2, "StoreStream.getChannels(…d)\n              .first()");
+        ObservableExtensionsKt.appSubscribe$default(y2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java
index d184bbe8b3..bea6399cad 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java
@@ -115,7 +115,7 @@ public final class WidgetGuildScheduledEventDetailsBottomSheet extends AppBottom
         TextView textView2 = getBinding().h;
         c0.z.d.m.checkNotNullExpressionValue(textView2, "binding.guildScheduledEventDetailsGuildName");
         textView2.setText(initialized.getGuild().getName());
-        getBinding().f2278c.setImageResource(initialized.getLocationInfo().getLocationIcon());
+        getBinding().f2276c.setImageResource(initialized.getLocationInfo().getLocationIcon());
         LinkifiedTextView linkifiedTextView = getBinding().d;
         c0.z.d.m.checkNotNullExpressionValue(linkifiedTextView, "binding.guildScheduledEventDetailsChannelName");
         GuildScheduledEventExternalLocationParser locationParser = getLocationParser();
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java
index 40011a586f..998d482af7 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java
@@ -131,13 +131,13 @@ public final class WidgetGuildScheduledEventDetailsExtrasBottomSheet extends App
         }
         textView5.setVisibility(z2 ? 0 : 8);
         getBinding().b.setOnClickListener(new WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$5(this, viewState));
-        TextView textView6 = getBinding().f2279c;
+        TextView textView6 = getBinding().f2277c;
         m.checkNotNullExpressionValue(textView6, "binding.copyId");
         if (!initialized.isDeveloperMode()) {
             i = 8;
         }
         textView6.setVisibility(i);
-        getBinding().f2279c.setOnClickListener(new WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$6(this, viewState));
+        getBinding().f2277c.setOnClickListener(new WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$6(this, viewState));
     }
 
     private final void dismissWithActionTaken() {
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java
index 8df3ce1c2a..4c9aa1a1f4 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java
@@ -133,7 +133,7 @@ public final class WidgetGuildScheduledEventListBottomSheet extends AppBottomShe
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.createEventButton");
             textView2.setVisibility(loaded.getCanCreateEvents() ? 0 : 8);
-            ConstraintLayout constraintLayout = getBinding().f2280c;
+            ConstraintLayout constraintLayout = getBinding().f2278c;
             m.checkNotNullExpressionValue(constraintLayout, "binding.guildScheduledEventListEmptyState");
             if (!loaded.getGuildScheduledEvents().isEmpty()) {
                 i = 8;
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java
index 920f9af9c6..fa30e365bc 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java
@@ -184,7 +184,7 @@ public final class WidgetGuildScheduledEventLocationSelect extends AppFragment {
                 TextView textView = getBinding().h;
                 m.checkNotNullExpressionValue(textView, "binding.locationHeader");
                 ViewExtensions.setTextAndVisibilityBy(textView, getString(R.string.guild_event_location_voice_field_label));
-                TextInputLayout textInputLayout = getBinding().f2281c;
+                TextInputLayout textInputLayout = getBinding().f2279c;
                 m.checkNotNullExpressionValue(textInputLayout, "binding.channelLocationLayout");
                 textInputLayout.setVisibility(0);
                 TextInputLayout textInputLayout2 = getBinding().f;
@@ -194,7 +194,7 @@ public final class WidgetGuildScheduledEventLocationSelect extends AppFragment {
                 TextView textView2 = getBinding().h;
                 m.checkNotNullExpressionValue(textView2, "binding.locationHeader");
                 textView2.setVisibility(8);
-                TextInputLayout textInputLayout3 = getBinding().f2281c;
+                TextInputLayout textInputLayout3 = getBinding().f2279c;
                 m.checkNotNullExpressionValue(textInputLayout3, "binding.channelLocationLayout");
                 textInputLayout3.setVisibility(8);
                 TextInputLayout textInputLayout4 = getBinding().f;
@@ -204,7 +204,7 @@ public final class WidgetGuildScheduledEventLocationSelect extends AppFragment {
                 TextView textView3 = getBinding().h;
                 m.checkNotNullExpressionValue(textView3, "binding.locationHeader");
                 ViewExtensions.setTextAndVisibilityBy(textView3, getString(R.string.guild_event_location_elsewhere_field_label));
-                TextInputLayout textInputLayout5 = getBinding().f2281c;
+                TextInputLayout textInputLayout5 = getBinding().f2279c;
                 m.checkNotNullExpressionValue(textInputLayout5, "binding.channelLocationLayout");
                 textInputLayout5.setVisibility(8);
                 TextInputLayout textInputLayout6 = getBinding().f;
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java
index a274c31653..b0df260d46 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java
@@ -436,9 +436,9 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV
         this.initialChannelId = l;
         this.existingGuildScheduledEventId = l2;
         this.channelsStore = storeChannels;
-        Observable<StoreState> W = observable.W(i0.p.a.a());
-        m.checkNotNullExpressionValue(W, "storeStateObservable\n   …Schedulers.computation())");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(W, this, null, 2, null), WidgetGuildScheduledEventLocationSelectViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<StoreState> X = observable.X(i0.p.a.a());
+        m.checkNotNullExpressionValue(X, "storeStateObservable\n   …Schedulers.computation())");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(X, this, null, 2, null), WidgetGuildScheduledEventLocationSelectViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java
index 769cb9d66d..c56c2b730e 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java
@@ -285,7 +285,7 @@ public final class WidgetGuildScheduledEventSettings extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.guildScheduledEventSettingsStepText");
         b.n(textView, R.string.guild_event_step_label, new Object[]{2, 3}, null, 4);
         getBinding().b.setOnClickListener(new WidgetGuildScheduledEventSettings$onViewBound$1(this));
-        getBinding().f2282c.setOnClickListener(new WidgetGuildScheduledEventSettings$onViewBound$2(this));
+        getBinding().f2280c.setOnClickListener(new WidgetGuildScheduledEventSettings$onViewBound$2(this));
         TextInputEditText textInputEditText = getBinding().o;
         m.checkNotNullExpressionValue(textInputEditText, "binding.guildScheduledEventSettingsTopicInput");
         textInputEditText.addTextChangedListener(new WidgetGuildScheduledEventSettings$onViewBound$$inlined$addTextChangedListener$1(this));
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet.java
index b9b8a9c58d..9364d1925e 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet.java
@@ -67,7 +67,7 @@ public final class WidgetGuildScheduledEventUpsellBottomSheet extends AppBottomS
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f2283c.setOnClickListener(new WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1(this));
+        getBinding().f2281c.setOnClickListener(new WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1(this));
         getBinding().b.setOnClickListener(new WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java
index 56c0d78763..1e13d3127c 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java
@@ -341,7 +341,7 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.stepText");
         c.a.k.b.n(textView, R.string.guild_event_step_label, new Object[]{3, 3}, null, 4);
         getBinding().b.setOnClickListener(new WidgetPreviewGuildScheduledEvent$onViewBound$1(this));
-        getBinding().f2332c.setOnClickListener(new WidgetPreviewGuildScheduledEvent$onViewBound$2(this));
+        getBinding().f2330c.setOnClickListener(new WidgetPreviewGuildScheduledEvent$onViewBound$2(this));
         getBinding().i.setOnClickListener(new WidgetPreviewGuildScheduledEvent$onViewBound$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java
index 7addf660ea..94ada846a3 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java
@@ -45,7 +45,7 @@ public final class WidgetHome$configureFirstOpen$2 extends o implements Function
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo17invoke() {
-            WidgetHome.access$getBinding$p(this.this$0.this$0).f2295c.openStartPanel();
+            WidgetHome.access$getBinding$p(this.this$0.this$0).f2293c.openStartPanel();
         }
     }
 
@@ -124,9 +124,9 @@ public final class WidgetHome$configureFirstOpen$2 extends o implements Function
             }
             j jVar = new j(new AnonymousClass2(this));
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-            Observable G = Observable.G(jVar.p(1000, timeUnit), new j(AnonymousClass3.INSTANCE).p(2000, timeUnit));
-            m.checkNotNullExpressionValue(G, "Observable\n             …, TimeUnit.MILLISECONDS))");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(G, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass4.INSTANCE, 62, (Object) null);
+            Observable H = Observable.H(jVar.p(1000, timeUnit), new j(AnonymousClass3.INSTANCE).p(2000, timeUnit));
+            m.checkNotNullExpressionValue(H, "Observable\n             …, TimeUnit.MILLISECONDS))");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(H, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass4.INSTANCE, 62, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java
index 20c9e0298d..42d1eca60f 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java
@@ -25,7 +25,7 @@ public final class WidgetHome$configureLeftPanel$1 extends o implements Function
 
     public final void invoke(OverlappingPanelsLayout.LockState lockState) {
         m.checkNotNullParameter(lockState, "lockState");
-        WidgetHome.access$getBinding$p(this.this$0).f2295c.setStartPanelUseFullPortraitWidth(lockState == OverlappingPanelsLayout.LockState.OPEN);
-        WidgetHome.access$getBinding$p(this.this$0).f2295c.setStartPanelLockState(lockState);
+        WidgetHome.access$getBinding$p(this.this$0).f2293c.setStartPanelUseFullPortraitWidth(lockState == OverlappingPanelsLayout.LockState.OPEN);
+        WidgetHome.access$getBinding$p(this.this$0).f2293c.setStartPanelLockState(lockState);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java
index 37df80e412..9bfca064e2 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java
@@ -27,6 +27,6 @@ public final class WidgetHome$configureNavigationDrawerAction$1 extends o implem
 
     public final void invoke(StoreNavigation.PanelAction panelAction) {
         m.checkNotNullParameter(panelAction, "it");
-        this.$this_configureNavigationDrawerAction.setNavigationPanelAction(panelAction, WidgetHome.access$getBinding$p(this.this$0).f2295c);
+        this.$this_configureNavigationDrawerAction.setNavigationPanelAction(panelAction, WidgetHome.access$getBinding$p(this.this$0).f2293c);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.java
index c22b792a71..f458f544c5 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.java
@@ -1,16 +1,37 @@
 package com.discord.widgets.home;
 
-import c0.z.d.m;
-import com.discord.models.user.MeUser;
-import com.discord.utilities.user.UserUtils;
+import com.discord.models.guild.Guild;
+import com.discord.stores.StoreNux;
+import com.discord.stores.StoreStream;
+import com.discord.utilities.features.GrowthTeamFeatures;
 import i0.k.b;
+import java.util.Collection;
+import java.util.Iterator;
 /* compiled from: WidgetHome.kt */
-public final class WidgetHome$onViewBoundOrOnResume$10<T, R> implements b<MeUser, Boolean> {
+public final class WidgetHome$onViewBoundOrOnResume$10<T, R> implements b<StoreNux.NuxState, Boolean> {
     public static final WidgetHome$onViewBoundOrOnResume$10 INSTANCE = new WidgetHome$onViewBoundOrOnResume$10();
 
-    public final Boolean call(MeUser meUser) {
-        UserUtils userUtils = UserUtils.INSTANCE;
-        m.checkNotNullExpressionValue(meUser, "it");
-        return Boolean.valueOf(userUtils.getHasUnreadUrgentMessages(meUser));
+    public final Boolean call(StoreNux.NuxState nuxState) {
+        boolean z2;
+        Collection<Guild> values = StoreStream.Companion.getGuilds().getGuilds().values();
+        boolean z3 = false;
+        if (!(values instanceof Collection) || !values.isEmpty()) {
+            Iterator<T> it = values.iterator();
+            while (true) {
+                if (it.hasNext()) {
+                    if (!(!it.next().isHub())) {
+                        z2 = false;
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
+        z2 = true;
+        if (z2 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled()) {
+            z3 = true;
+        }
+        return Boolean.valueOf(z3);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$11.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$11.java
index a1432b9c87..9db8c201ca 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$11.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$11.java
@@ -1,11 +1,11 @@
 package com.discord.widgets.home;
 
 import c0.z.d.o;
-import com.discord.models.user.MeUser;
+import com.discord.stores.StoreNux;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetHome.kt */
-public final class WidgetHome$onViewBoundOrOnResume$11 extends o implements Function1<MeUser, Unit> {
+public final class WidgetHome$onViewBoundOrOnResume$11 extends o implements Function1<StoreNux.NuxState, Unit> {
     public final /* synthetic */ WidgetHome this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -17,12 +17,12 @@ public final class WidgetHome$onViewBoundOrOnResume$11 extends o implements Func
     /* 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(MeUser meUser) {
-        invoke(meUser);
+    public /* bridge */ /* synthetic */ Unit invoke(StoreNux.NuxState nuxState) {
+        invoke(nuxState);
         return Unit.a;
     }
 
-    public final void invoke(MeUser meUser) {
-        WidgetHome.access$showUrgentMessageDialog(this.this$0);
+    public final void invoke(StoreNux.NuxState nuxState) {
+        WidgetHome.access$maybeShowHubEmailUpsell(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$12.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$12.java
index 5669ae1701..d6354c64e5 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$12.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$12.java
@@ -1,26 +1,16 @@
 package com.discord.widgets.home;
 
-import c0.z.d.k;
 import c0.z.d.m;
-import com.discord.widgets.status.WidgetGlobalStatusIndicatorState;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
+import com.discord.models.user.MeUser;
+import com.discord.utilities.user.UserUtils;
+import i0.k.b;
 /* compiled from: WidgetHome.kt */
-public final /* synthetic */ class WidgetHome$onViewBoundOrOnResume$12 extends k implements Function1<WidgetGlobalStatusIndicatorState.State, Unit> {
-    public WidgetHome$onViewBoundOrOnResume$12(WidgetHome widgetHome) {
-        super(1, widgetHome, WidgetHome.class, "handleGlobalStatusIndicatorState", "handleGlobalStatusIndicatorState(Lcom/discord/widgets/status/WidgetGlobalStatusIndicatorState$State;)V", 0);
-    }
+public final class WidgetHome$onViewBoundOrOnResume$12<T, R> implements b<MeUser, Boolean> {
+    public static final WidgetHome$onViewBoundOrOnResume$12 INSTANCE = new WidgetHome$onViewBoundOrOnResume$12();
 
-    /* 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(WidgetGlobalStatusIndicatorState.State state) {
-        invoke(state);
-        return Unit.a;
-    }
-
-    public final void invoke(WidgetGlobalStatusIndicatorState.State state) {
-        m.checkNotNullParameter(state, "p1");
-        WidgetHome.access$handleGlobalStatusIndicatorState((WidgetHome) this.receiver, state);
+    public final Boolean call(MeUser meUser) {
+        UserUtils userUtils = UserUtils.INSTANCE;
+        m.checkNotNullExpressionValue(meUser, "it");
+        return Boolean.valueOf(userUtils.getHasUnreadUrgentMessages(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$13.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$13.java
new file mode 100644
index 0000000000..ee19d29622
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$13.java
@@ -0,0 +1,28 @@
+package com.discord.widgets.home;
+
+import c0.z.d.o;
+import com.discord.models.user.MeUser;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetHome.kt */
+public final class WidgetHome$onViewBoundOrOnResume$13 extends o implements Function1<MeUser, Unit> {
+    public final /* synthetic */ WidgetHome this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetHome$onViewBoundOrOnResume$13(WidgetHome widgetHome) {
+        super(1);
+        this.this$0 = widgetHome;
+    }
+
+    /* 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(MeUser meUser) {
+        invoke(meUser);
+        return Unit.a;
+    }
+
+    public final void invoke(MeUser meUser) {
+        WidgetHome.access$showUrgentMessageDialog(this.this$0);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$14.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$14.java
new file mode 100644
index 0000000000..4a0d3469ee
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$14.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.home;
+
+import c0.z.d.k;
+import c0.z.d.m;
+import com.discord.widgets.status.WidgetGlobalStatusIndicatorState;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetHome.kt */
+public final /* synthetic */ class WidgetHome$onViewBoundOrOnResume$14 extends k implements Function1<WidgetGlobalStatusIndicatorState.State, Unit> {
+    public WidgetHome$onViewBoundOrOnResume$14(WidgetHome widgetHome) {
+        super(1, widgetHome, WidgetHome.class, "handleGlobalStatusIndicatorState", "handleGlobalStatusIndicatorState(Lcom/discord/widgets/status/WidgetGlobalStatusIndicatorState$State;)V", 0);
+    }
+
+    /* 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(WidgetGlobalStatusIndicatorState.State state) {
+        invoke(state);
+        return Unit.a;
+    }
+
+    public final void invoke(WidgetGlobalStatusIndicatorState.State state) {
+        m.checkNotNullParameter(state, "p1");
+        WidgetHome.access$handleGlobalStatusIndicatorState((WidgetHome) this.receiver, state);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.java
index 6b29e37d8e..6c54acb1d3 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.java
@@ -1,13 +1,11 @@
 package com.discord.widgets.home;
 
-import c0.z.d.m;
-import com.discord.utilities.surveys.SurveyUtils;
-import i0.k.b;
+import rx.functions.Func2;
 /* compiled from: WidgetHome.kt */
-public final class WidgetHome$onViewBoundOrOnResume$4<T, R> implements b<SurveyUtils.Survey, Boolean> {
+public final class WidgetHome$onViewBoundOrOnResume$4<T1, T2, R> implements Func2<WidgetHomeModel, WidgetHomeModel, Boolean> {
     public static final WidgetHome$onViewBoundOrOnResume$4 INSTANCE = new WidgetHome$onViewBoundOrOnResume$4();
 
-    public final Boolean call(SurveyUtils.Survey survey) {
-        return Boolean.valueOf(!m.areEqual(survey, SurveyUtils.Survey.None.INSTANCE));
+    public final Boolean call(WidgetHomeModel widgetHomeModel, WidgetHomeModel widgetHomeModel2) {
+        return Boolean.valueOf(widgetHomeModel.getChannelId() == widgetHomeModel2.getChannelId());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.java
index 37c755a60c..b5c5ea1124 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.java
@@ -1,26 +1,30 @@
 package com.discord.widgets.home;
 
-import c0.z.d.k;
 import c0.z.d.m;
-import com.discord.utilities.surveys.SurveyUtils;
+import c0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetHome.kt */
-public final /* synthetic */ class WidgetHome$onViewBoundOrOnResume$5 extends k implements Function1<SurveyUtils.Survey, Unit> {
+public final class WidgetHome$onViewBoundOrOnResume$5 extends o implements Function1<WidgetHomeModel, Unit> {
+    public final /* synthetic */ WidgetHome this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetHome$onViewBoundOrOnResume$5(WidgetHome widgetHome) {
-        super(1, widgetHome, WidgetHome.class, "showSurvey", "showSurvey(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V", 0);
+        super(1);
+        this.this$0 = widgetHome;
     }
 
     /* 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(SurveyUtils.Survey survey) {
-        invoke(survey);
+    public /* bridge */ /* synthetic */ Unit invoke(WidgetHomeModel widgetHomeModel) {
+        invoke(widgetHomeModel);
         return Unit.a;
     }
 
-    public final void invoke(SurveyUtils.Survey survey) {
-        m.checkNotNullParameter(survey, "p1");
-        WidgetHome.access$showSurvey((WidgetHome) this.receiver, survey);
+    public final void invoke(WidgetHomeModel widgetHomeModel) {
+        WidgetHome widgetHome = this.this$0;
+        m.checkNotNullExpressionValue(widgetHomeModel, "it");
+        WidgetHome.access$maybeToggleChannel(widgetHome, widgetHomeModel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.java
index 820b71beb6..a5176be2b8 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.java
@@ -1,12 +1,13 @@
 package com.discord.widgets.home;
 
-import com.discord.stores.StoreNux;
+import c0.z.d.m;
+import com.discord.utilities.surveys.SurveyUtils;
 import i0.k.b;
 /* compiled from: WidgetHome.kt */
-public final class WidgetHome$onViewBoundOrOnResume$6<T, R> implements b<StoreNux.NuxState, Boolean> {
+public final class WidgetHome$onViewBoundOrOnResume$6<T, R> implements b<SurveyUtils.Survey, Boolean> {
     public static final WidgetHome$onViewBoundOrOnResume$6 INSTANCE = new WidgetHome$onViewBoundOrOnResume$6();
 
-    public final Boolean call(StoreNux.NuxState nuxState) {
-        return Boolean.valueOf(nuxState.getFirstOpen());
+    public final Boolean call(SurveyUtils.Survey survey) {
+        return Boolean.valueOf(!m.areEqual(survey, SurveyUtils.Survey.None.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.java
index 5cc2dc6c3a..ccf017ef68 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.java
@@ -1,28 +1,26 @@
 package com.discord.widgets.home;
 
-import c0.z.d.o;
-import com.discord.stores.StoreNux;
+import c0.z.d.k;
+import c0.z.d.m;
+import com.discord.utilities.surveys.SurveyUtils;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetHome.kt */
-public final class WidgetHome$onViewBoundOrOnResume$7 extends o implements Function1<StoreNux.NuxState, Unit> {
-    public final /* synthetic */ WidgetHome this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+public final /* synthetic */ class WidgetHome$onViewBoundOrOnResume$7 extends k implements Function1<SurveyUtils.Survey, Unit> {
     public WidgetHome$onViewBoundOrOnResume$7(WidgetHome widgetHome) {
-        super(1);
-        this.this$0 = widgetHome;
+        super(1, widgetHome, WidgetHome.class, "showSurvey", "showSurvey(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V", 0);
     }
 
     /* 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(StoreNux.NuxState nuxState) {
-        invoke(nuxState);
+    public /* bridge */ /* synthetic */ Unit invoke(SurveyUtils.Survey survey) {
+        invoke(survey);
         return Unit.a;
     }
 
-    public final void invoke(StoreNux.NuxState nuxState) {
-        WidgetHome.access$configureFirstOpen(this.this$0);
+    public final void invoke(SurveyUtils.Survey survey) {
+        m.checkNotNullParameter(survey, "p1");
+        WidgetHome.access$showSurvey((WidgetHome) this.receiver, survey);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.java
index 7424545bc2..9349662043 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.java
@@ -1,37 +1,12 @@
 package com.discord.widgets.home;
 
-import com.discord.models.guild.Guild;
 import com.discord.stores.StoreNux;
-import com.discord.stores.StoreStream;
-import com.discord.utilities.features.GrowthTeamFeatures;
 import i0.k.b;
-import java.util.Collection;
-import java.util.Iterator;
 /* compiled from: WidgetHome.kt */
 public final class WidgetHome$onViewBoundOrOnResume$8<T, R> implements b<StoreNux.NuxState, Boolean> {
     public static final WidgetHome$onViewBoundOrOnResume$8 INSTANCE = new WidgetHome$onViewBoundOrOnResume$8();
 
     public final Boolean call(StoreNux.NuxState nuxState) {
-        boolean z2;
-        Collection<Guild> values = StoreStream.Companion.getGuilds().getGuilds().values();
-        boolean z3 = false;
-        if (!(values instanceof Collection) || !values.isEmpty()) {
-            Iterator<T> it = values.iterator();
-            while (true) {
-                if (it.hasNext()) {
-                    if (!(!it.next().isHub())) {
-                        z2 = false;
-                        break;
-                    }
-                } else {
-                    break;
-                }
-            }
-        }
-        z2 = true;
-        if (z2 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled()) {
-            z3 = true;
-        }
-        return Boolean.valueOf(z3);
+        return Boolean.valueOf(nuxState.getFirstOpen());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.java
index ca068ab020..3c88a47a1a 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.java
@@ -23,6 +23,6 @@ public final class WidgetHome$onViewBoundOrOnResume$9 extends o implements Funct
     }
 
     public final void invoke(StoreNux.NuxState nuxState) {
-        WidgetHome.access$maybeShowHubEmailUpsell(this.this$0);
+        WidgetHome.access$configureFirstOpen(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java
index 52e921214c..880b1f8f37 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java
@@ -15,6 +15,6 @@ public final class WidgetHome$viewModel$2 extends o implements Function0<AppView
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetHomeViewModel.ViewState> mo17invoke() {
-        return new WidgetHomeViewModel(null, null, null, null, null, null, null, null, 255, null);
+        return new WidgetHomeViewModel(null, null, null, null, null, null, null, 127, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome.java b/app/src/main/java/com/discord/widgets/home/WidgetHome.java
index 74bafdf3fd..47f8595f5a 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome.java
@@ -66,10 +66,11 @@ import com.discord.widgets.accessibility.AccessibilityDetectionNavigator;
 import com.discord.widgets.channels.WidgetChannelOnboarding;
 import com.discord.widgets.chat.input.SmoothKeyboardReactionHelper;
 import com.discord.widgets.chat.list.WidgetChatList;
+import com.discord.widgets.directories.WidgetDirectoryChannel;
 import com.discord.widgets.guilds.join.WidgetGuildWelcomeSheet;
-import com.discord.widgets.guilds.profile.WidgetGuildIdentityMarketingSheet;
 import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventDetailsBottomSheet;
 import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventUpsellBottomSheet;
+import com.discord.widgets.home.WidgetHomeModel;
 import com.discord.widgets.home.WidgetHomeViewModel;
 import com.discord.widgets.hubs.WidgetHubEmailFlow;
 import com.discord.widgets.notice.WidgetNoticeNuxSamsungLink;
@@ -191,6 +192,10 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         widgetHome.maybeShowHubEmailUpsell();
     }
 
+    public static final /* synthetic */ void access$maybeToggleChannel(WidgetHome widgetHome, WidgetHomeModel widgetHomeModel) {
+        widgetHome.maybeToggleChannel(widgetHomeModel);
+    }
+
     public static final /* synthetic */ void access$setPanelNsfw$p(WidgetHome widgetHome, WidgetHomePanelNsfw widgetHomePanelNsfw) {
         widgetHome.panelNsfw = widgetHomePanelNsfw;
     }
@@ -253,9 +258,9 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
 
     private final void configureFirstOpen() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable x2 = Observable.j(StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetHome$configureFirstOpen$1.INSTANCE).x();
-        m.checkNotNullExpressionValue(x2, "Observable\n        .comb…       }\n        .first()");
-        ObservableExtensionsKt.appSubscribe$default(x2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$configureFirstOpen$2(this), 62, (Object) null);
+        Observable y2 = Observable.j(StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetHome$configureFirstOpen$1.INSTANCE).y();
+        m.checkNotNullExpressionValue(y2, "Observable\n        .comb…       }\n        .first()");
+        ObservableExtensionsKt.appSubscribe$default(y2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$configureFirstOpen$2(this), 62, (Object) null);
     }
 
     private final void configureLeftPanel() {
@@ -267,8 +272,8 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void configureOverlappingPanels() {
-        getBinding().f2295c.registerStartPanelStateListeners(new WidgetHome$configureOverlappingPanels$1(this));
-        getBinding().f2295c.registerEndPanelStateListeners(new WidgetHome$configureOverlappingPanels$2(this));
+        getBinding().f2293c.registerStartPanelStateListeners(new WidgetHome$configureOverlappingPanels$1(this));
+        getBinding().f2293c.registerEndPanelStateListeners(new WidgetHome$configureOverlappingPanels$2(this));
     }
 
     private final void configureUI(WidgetHomeModel widgetHomeModel) {
@@ -279,20 +284,6 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
             m.checkNotNullExpressionValue(binding, "binding");
             widgetHomeHeaderManager.configure(this, widgetHomeModel, binding);
         }
-        Channel channel = widgetHomeModel.getChannel();
-        int i = 0;
-        boolean z2 = channel != null && ChannelUtils.o(channel);
-        FragmentContainerView fragmentContainerView = getBinding().d.f73c;
-        m.checkNotNullExpressionValue(fragmentContainerView, "binding.panelCenter.widgetHomePanelDirectory");
-        fragmentContainerView.setVisibility(z2 ? 0 : 8);
-        c5 c5Var = getBinding().d.b;
-        m.checkNotNullExpressionValue(c5Var, "binding.panelCenter.widgetHomePanelCenterChat");
-        ConstraintLayout constraintLayout = c5Var.a;
-        m.checkNotNullExpressionValue(constraintLayout, "binding.panelCenter.widgetHomePanelCenterChat.root");
-        if (!(!z2)) {
-            i = 8;
-        }
-        constraintLayout.setVisibility(i);
         WidgetHomePanelNsfw widgetHomePanelNsfw = this.panelNsfw;
         if (widgetHomePanelNsfw != null) {
             widgetHomePanelNsfw.configureUI(widgetHomeModel);
@@ -312,13 +303,13 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final boolean handleBackPressed() {
-        int ordinal = getBinding().f2295c.getSelectedPanel().ordinal();
+        int ordinal = getBinding().f2293c.getSelectedPanel().ordinal();
         if (ordinal == 0) {
             requireActivity().moveTaskToBack(true);
         } else if (ordinal == 1) {
             handleCenterPanelBack();
         } else if (ordinal == 2) {
-            getBinding().f2295c.closePanels();
+            getBinding().f2293c.closePanels();
         }
         return true;
     }
@@ -337,24 +328,22 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
                 return;
             }
         }
-        getBinding().f2295c.openStartPanel();
+        getBinding().f2293c.openStartPanel();
     }
 
     private final void handleEvent(WidgetHomeViewModel.Event event) {
         if (m.areEqual(event, WidgetHomeViewModel.Event.OpenLeftPanel.INSTANCE)) {
-            getBinding().f2295c.openStartPanel();
+            getBinding().f2293c.openStartPanel();
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.ClosePanels.INSTANCE)) {
-            getBinding().f2295c.closePanels();
+            getBinding().f2293c.closePanels();
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.UnlockLeftPanel.INSTANCE)) {
-            getBinding().f2295c.setStartPanelLockState(OverlappingPanelsLayout.LockState.UNLOCKED);
+            getBinding().f2293c.setStartPanelLockState(OverlappingPanelsLayout.LockState.UNLOCKED);
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.ShowChannelOnboardingSheet.INSTANCE)) {
             showChannelOnboardingSheet();
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.AnimatePeekIn.INSTANCE) || m.areEqual(event, WidgetHomeViewModel.Event.AnimatePeekOut.INSTANCE)) {
             animatePeek(event);
         } else if (event instanceof WidgetHomeViewModel.Event.ShowGuildWelcomeSheet) {
             showWelcomeSheet$default(this, ((WidgetHomeViewModel.Event.ShowGuildWelcomeSheet) event).getGuildId(), null, 2, null);
-        } else if (event instanceof WidgetHomeViewModel.Event.ShowGuildProfileMarketingSheet) {
-            showGuildProfileMarketingSheet(((WidgetHomeViewModel.Event.ShowGuildProfileMarketingSheet) event).getGuildId());
         } else if (event instanceof WidgetHomeViewModel.Event.ShowGuildEventUpsell) {
             showGuildEventUpsell(((WidgetHomeViewModel.Event.ShowGuildEventUpsell) event).getGuildId());
         }
@@ -388,8 +377,8 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void handleViewState(WidgetHomeViewModel.ViewState viewState) {
-        getBinding().f2295c.handleStartPanelState(viewState.getLeftPanelState());
-        getBinding().f2295c.handleEndPanelState(viewState.getRightPanelState());
+        getBinding().f2293c.handleStartPanelState(viewState.getLeftPanelState());
+        getBinding().f2293c.handleEndPanelState(viewState.getRightPanelState());
     }
 
     private final boolean isOnHomeTab() {
@@ -403,6 +392,31 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         notices.requestToShow(new StoreNotices.Notice(name, null, 0, 0, true, c0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, true, RecyclerView.FOREVER_NS, WidgetHome$maybeShowHubEmailUpsell$1.INSTANCE, 6, null));
     }
 
+    private final void maybeToggleChannel(WidgetHomeModel widgetHomeModel) {
+        Channel channel = widgetHomeModel.getChannel();
+        int i = 0;
+        boolean z2 = channel != null && ChannelUtils.o(channel);
+        FragmentContainerView fragmentContainerView = getBinding().d.f73c;
+        m.checkNotNullExpressionValue(fragmentContainerView, "binding.panelCenter.widgetHomePanelDirectory");
+        fragmentContainerView.setVisibility(z2 ? 0 : 8);
+        Fragment findFragmentById = getChildFragmentManager().findFragmentById(R.id.widget_home_panel_directory);
+        if (!(findFragmentById instanceof WidgetDirectoryChannel)) {
+            findFragmentById = null;
+        }
+        WidgetDirectoryChannel widgetDirectoryChannel = (WidgetDirectoryChannel) findFragmentById;
+        if (widgetDirectoryChannel != null) {
+            WidgetDirectoryChannel.bindGestureObservers$default(widgetDirectoryChannel, z2, null, 2, null);
+        }
+        c5 c5Var = getBinding().d.b;
+        m.checkNotNullExpressionValue(c5Var, "binding.panelCenter.widgetHomePanelCenterChat");
+        ConstraintLayout constraintLayout = c5Var.a;
+        m.checkNotNullExpressionValue(constraintLayout, "binding.panelCenter.widgetHomePanelCenterChat.root");
+        if (!(!z2)) {
+            i = 8;
+        }
+        constraintLayout.setVisibility(i);
+    }
+
     private final void roundPanelCorners() {
         setPanelCorners((float) DimenUtils.dpToPixels(8));
     }
@@ -422,7 +436,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         FrameLayout frameLayout = getBinding().h;
         m.checkNotNullExpressionValue(frameLayout, "binding.widgetHomeContainer");
         ViewExtensions.setForwardingWindowInsetsListener(frameLayout);
-        HomePanelsLayout homePanelsLayout = getBinding().f2295c;
+        HomePanelsLayout homePanelsLayout = getBinding().f2293c;
         m.checkNotNullExpressionValue(homePanelsLayout, "binding.overlappingPanels");
         ViewExtensions.setForwardingWindowInsetsListener(homePanelsLayout);
         e5 e5Var = getBinding().e;
@@ -472,13 +486,6 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         companion.launch(parentFragmentManager, j);
     }
 
-    private final void showGuildProfileMarketingSheet(long j) {
-        WidgetGuildIdentityMarketingSheet.Companion companion = WidgetGuildIdentityMarketingSheet.Companion;
-        FragmentManager parentFragmentManager = getParentFragmentManager();
-        m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.show(parentFragmentManager, j);
-    }
-
     private final void showSurvey(SurveyUtils.Survey survey) {
         StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(survey.getNoticeKey(), null, 0, 5, true, null, 0, false, 0, new WidgetHome$showSurvey$1(survey), 486, null));
     }
@@ -506,7 +513,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     public final PanelLayout getPanelLayout() {
-        HomePanelsLayout homePanelsLayout = getBinding().f2295c;
+        HomePanelsLayout homePanelsLayout = getBinding().f2293c;
         m.checkNotNullExpressionValue(homePanelsLayout, "binding.overlappingPanels");
         return homePanelsLayout;
     }
@@ -528,7 +535,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     public final void lockCloseRightPanel(boolean z2) {
-        getBinding().f2295c.setEndPanelLockState(z2 ? OverlappingPanelsLayout.LockState.CLOSE : OverlappingPanelsLayout.LockState.UNLOCKED);
+        getBinding().f2293c.setEndPanelLockState(z2 ? OverlappingPanelsLayout.LockState.CLOSE : OverlappingPanelsLayout.LockState.UNLOCKED);
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -543,7 +550,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     @Override // c.a.o.b.a
     public void onGestureRegionsUpdate(List<Rect> list) {
         m.checkNotNullParameter(list, "gestureRegions");
-        getBinding().f2295c.setChildGestureRegions(list);
+        getBinding().f2293c.setChildGestureRegions(list);
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -572,7 +579,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
             m.checkNotNullExpressionValue(binding, "binding");
             widgetHomeHeaderManager.configure(this, widgetHomeModel$app_productionGoogleRelease, binding);
         }
-        if (getBinding().f2295c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) {
+        if (getBinding().f2293c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) {
             setActionBarTitleAccessibilityViewFocused();
         }
     }
@@ -637,27 +644,31 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         }
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeEvents(), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$2(this), 62, (Object) null);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(WidgetHomeModel.Companion.get(), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$3(this), 62, (Object) null);
+        WidgetHomeModel.Companion companion = WidgetHomeModel.Companion;
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(companion.get(), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$3(this), 62, (Object) null);
+        Observable r2 = ObservableExtensionsKt.ui$default(companion.get(), this, null, 2, null).r(WidgetHome$onViewBoundOrOnResume$4.INSTANCE);
+        m.checkNotNullExpressionValue(r2, "WidgetHomeModel\n        …lId == model2.channelId }");
+        ObservableExtensionsKt.appSubscribe$default(r2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$5(this), 62, (Object) null);
         AccessibilityDetectionNavigator.INSTANCE.enqueueNoticeWhenEnabled(this);
-        StoreStream.Companion companion = StoreStream.Companion;
-        configureNavigationDrawerAction(companion.getNavigation());
+        StoreStream.Companion companion2 = StoreStream.Companion;
+        configureNavigationDrawerAction(companion2.getNavigation());
         configureOverlappingPanels();
-        Observable E = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(SurveyUtils.INSTANCE.getSurveyToShow(), 0, false, 3, null), this, null, 2, null).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable w2 = E.w(WidgetHome$onViewBoundOrOnResume$4.INSTANCE);
-        m.checkNotNullExpressionValue(w2, "SurveyUtils\n        .get…SurveyUtils.Survey.None }");
-        ObservableExtensionsKt.appSubscribe$default(w2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$5(this), 62, (Object) null);
-        Observable<StoreNux.NuxState> w3 = companion.getNux().getNuxState().w(WidgetHome$onViewBoundOrOnResume$6.INSTANCE);
-        m.checkNotNullExpressionValue(w3, "StoreStream\n        .get… .filter { it.firstOpen }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(w3, 0, false, 1, null), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$7(this), 62, (Object) null);
-        Observable<StoreNux.NuxState> w4 = companion.getNux().getNuxState().w(WidgetHome$onViewBoundOrOnResume$8.INSTANCE);
-        m.checkNotNullExpressionValue(w4, "StoreStream\n        .get…ectionEnabled()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(w4, 0, false, 1, null), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$9(this), 62, (Object) null);
-        Observable w5 = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).w(WidgetHome$onViewBoundOrOnResume$10.INSTANCE);
-        m.checkNotNullExpressionValue(w5, "StoreStream\n        .get…hasUnreadUrgentMessages }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(w5, this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$11(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(SurveyUtils.INSTANCE.getSurveyToShow(), 0, false, 3, null), this, null, 2, null).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable x2 = F.x(WidgetHome$onViewBoundOrOnResume$6.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "SurveyUtils\n        .get…SurveyUtils.Survey.None }");
+        ObservableExtensionsKt.appSubscribe$default(x2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$7(this), 62, (Object) null);
+        Observable<StoreNux.NuxState> x3 = companion2.getNux().getNuxState().x(WidgetHome$onViewBoundOrOnResume$8.INSTANCE);
+        m.checkNotNullExpressionValue(x3, "StoreStream\n        .get… .filter { it.firstOpen }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(x3, 0, false, 1, null), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$9(this), 62, (Object) null);
+        Observable<StoreNux.NuxState> x4 = companion2.getNux().getNuxState().x(WidgetHome$onViewBoundOrOnResume$10.INSTANCE);
+        m.checkNotNullExpressionValue(x4, "StoreStream\n        .get…ectionEnabled()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(x4, 0, false, 1, null), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$11(this), 62, (Object) null);
+        Observable x5 = StoreUser.observeMe$default(companion2.getUsers(), false, 1, null).x(WidgetHome$onViewBoundOrOnResume$12.INSTANCE);
+        m.checkNotNullExpressionValue(x5, "StoreStream\n        .get…hasUnreadUrgentMessages }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(x5, this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$13(this), 62, (Object) null);
         configureLeftPanel();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(this.globalStatusIndicatorStateObserver.observeState(), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$12(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(this.globalStatusIndicatorStateObserver.observeState(), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$14(this), 62, (Object) null);
     }
 
     public final void setOnGuildListAddHintCreate(Function1<? super View, Unit> function1) {
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
index 08d05750d3..ed1e111e6a 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
@@ -47,25 +47,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti
         m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager");
         PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager);
         switch (menuItem.getItemId()) {
-            case R.id.menu_chat_add_friend /* 2131364170 */:
+            case R.id.menu_chat_add_friend /* 2131364165 */:
                 WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null);
                 break;
-            case R.id.menu_chat_search /* 2131364171 */:
+            case R.id.menu_chat_search /* 2131364166 */:
                 launchForSearch(context);
                 break;
-            case R.id.menu_chat_side_panel /* 2131364172 */:
+            case R.id.menu_chat_side_panel /* 2131364167 */:
                 this.$panelLayout.openEndPanel();
                 break;
-            case R.id.menu_chat_start_call /* 2131364173 */:
+            case R.id.menu_chat_start_call /* 2131364168 */:
                 privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case R.id.menu_chat_start_group /* 2131364174 */:
+            case R.id.menu_chat_start_group /* 2131364169 */:
                 ChannelInviteLaunchUtils.inviteToChannel$default(ChannelInviteLaunchUtils.INSTANCE, this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar", null, null, 24, null);
                 break;
-            case R.id.menu_chat_start_video_call /* 2131364175 */:
+            case R.id.menu_chat_start_video_call /* 2131364170 */:
                 privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case R.id.menu_chat_stop_call /* 2131364176 */:
+            case R.id.menu_chat_stop_call /* 2131364171 */:
                 StoreStream.Companion.getVoiceChannelSelected().clear();
                 break;
         }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java
index c90048ff8a..a5f417f318 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java
@@ -39,9 +39,9 @@ public final class WidgetHomeModel {
 
         public final Observable<WidgetHomeModel> get() {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable X = Observable.j(companion.getGuildSelected().observeSelectedGuildId(), companion.getChannelsSelected().observeResolvedSelectedChannel(), WidgetHomeModel$Companion$get$1.INSTANCE).X(WidgetHomeModel$Companion$get$2.INSTANCE);
-            m.checkNotNullExpressionValue(X, "Observable.combineLatest…            )\n          }");
-            Observable<WidgetHomeModel> q = ObservableExtensionsKt.computationLatest(X).q();
+            Observable Y = Observable.j(companion.getGuildSelected().observeSelectedGuildId(), companion.getChannelsSelected().observeResolvedSelectedChannel(), WidgetHomeModel$Companion$get$1.INSTANCE).Y(WidgetHomeModel$Companion$get$2.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…            )\n          }");
+            Observable<WidgetHomeModel> q = ObservableExtensionsKt.computationLatest(Y).q();
             m.checkNotNullExpressionValue(q, "Observable.combineLatest…  .distinctUntilChanged()");
             return q;
         }
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 afb90bc7ba..a514d93a06 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
@@ -133,9 +133,9 @@ public final class WidgetHomePanelNsfw {
         View inflate;
         boolean z4 = nsfwAllowance == NsfwAllowance.DISALLOWED;
         if (!z2 || (!z3 && !z4)) {
-            Observable<Long> c02 = Observable.c0(HIDE_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable.timer(HIDE_DE…S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this.appComponent, null, 2, null), WidgetHomePanelNsfw.class, (Context) null, new WidgetHomePanelNsfw$toggleContainerVisibility$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetHomePanelNsfw$toggleContainerVisibility$3(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(HIDE_DELAY_MILLIS, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(HIDE_DE…S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this.appComponent, null, 2, null), WidgetHomePanelNsfw.class, (Context) null, new WidgetHomePanelNsfw$toggleContainerVisibility$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetHomePanelNsfw$toggleContainerVisibility$3(this), 58, (Object) null);
             return;
         }
         ViewStub viewStub = this.stub;
@@ -172,7 +172,7 @@ public final class WidgetHomePanelNsfw {
         }
         if (z4) {
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding = this.binding;
-            if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f2296c) == null)) {
+            if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f2294c) == 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.f2296c) != null) {
+        if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f2294c) != null) {
             materialButton.setOnClickListener(new WidgetHomePanelNsfw$configureUI$2(this, widgetHomeModel));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java
index d019392044..0de28cbeb5 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java
@@ -6,18 +6,17 @@ import com.discord.models.user.MeUser;
 import com.discord.panels.PanelState;
 import com.discord.stores.StoreChannelsSelected;
 import com.discord.widgets.home.WidgetHomeViewModel;
-import rx.functions.Func7;
+import rx.functions.Func6;
 /* compiled from: WidgetHomeViewModel.kt */
-public final class WidgetHomeViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, T5, T6, T7, R> implements Func7<PanelState, PanelState, WidgetHomeViewModel.GuildInfo, MeUser, StoreChannelsSelected.ResolvedSelectedChannel, Experiment, Experiment, WidgetHomeViewModel.StoreState> {
+public final class WidgetHomeViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, T5, T6, R> implements Func6<PanelState, PanelState, WidgetHomeViewModel.GuildInfo, MeUser, StoreChannelsSelected.ResolvedSelectedChannel, Experiment, WidgetHomeViewModel.StoreState> {
     public static final WidgetHomeViewModel$Companion$observeStoreState$1 INSTANCE = new WidgetHomeViewModel$Companion$observeStoreState$1();
 
-    public final WidgetHomeViewModel.StoreState call(PanelState panelState, PanelState panelState2, WidgetHomeViewModel.GuildInfo guildInfo, MeUser meUser, StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel, Experiment experiment, Experiment experiment2) {
-        StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel2 = resolvedSelectedChannel;
+    public final WidgetHomeViewModel.StoreState call(PanelState panelState, PanelState panelState2, WidgetHomeViewModel.GuildInfo guildInfo, MeUser meUser, StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel, Experiment experiment) {
         Long l = null;
-        if (!(resolvedSelectedChannel2 instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel)) {
-            resolvedSelectedChannel2 = null;
+        if (!(resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel)) {
+            resolvedSelectedChannel = null;
         }
-        StoreChannelsSelected.ResolvedSelectedChannel.Channel channel = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel2;
+        StoreChannelsSelected.ResolvedSelectedChannel.Channel channel = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel;
         if (channel != null) {
             l = channel.getPeekParent();
         }
@@ -26,6 +25,6 @@ public final class WidgetHomeViewModel$Companion$observeStoreState$1<T1, T2, T3,
         m.checkNotNullExpressionValue(panelState2, "rightPanelState");
         m.checkNotNullExpressionValue(guildInfo, "guildInfo");
         m.checkNotNullExpressionValue(meUser, "me");
-        return new WidgetHomeViewModel.StoreState(panelState, panelState2, guildInfo, meUser, z2, experiment != null && experiment.getBucket() == 1, experiment2 != null && experiment2.getBucket() == 1);
+        return new WidgetHomeViewModel.StoreState(panelState, panelState2, guildInfo, meUser, z2, experiment != null && experiment.getBucket() == 1);
     }
 }
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 3d4b8f6878..4e9898dabc 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
@@ -3,12 +3,9 @@ package com.discord.widgets.home;
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.MainThread;
-import c.a.j.a;
 import c.d.b.a.a;
 import c0.z.d.m;
 import c0.z.d.o;
-import com.discord.api.utcdatetime.UtcDateTime;
-import com.discord.app.AppLog;
 import com.discord.app.AppViewModel;
 import com.discord.models.user.MeUser;
 import com.discord.panels.PanelState;
@@ -21,18 +18,13 @@ import com.discord.stores.StoreNavigation;
 import com.discord.stores.StorePermissions;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
-import com.discord.tooltips.TooltipManager;
 import com.discord.utilities.cache.SharedPreferencesProvider;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 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.guilds.profile.GuildProfileMarketingTooltip;
-import com.discord.widgets.guilds.profile.WidgetChangeGuildIdentity;
 import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventUpsellBottomSheet;
-import java.lang.ref.WeakReference;
-import java.util.Set;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
@@ -50,7 +42,6 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     private final SharedPreferences sharedPreferences;
     private final StoreGuildWelcomeScreens storeGuildWelcomeScreens;
     private final StoreNavigation storeNavigation;
-    private final TooltipManager tooltipManager;
     private boolean wasThreadPeek;
     private WidgetHomeModel widgetHomeModel;
 
@@ -119,9 +110,9 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreGuildSelected storeGuildSelected, StoreNavigation storeNavigation, StoreLurking storeLurking, StoreUser storeUser, StoreGuildWelcomeScreens storeGuildWelcomeScreens, StoreChannelsSelected storeChannelsSelected, StoreExperiments storeExperiments, StorePermissions storePermissions) {
-            Observable<StoreState> e = Observable.e(storeNavigation.observeLeftPanelState(), storeNavigation.observeRightPanelState(), storeGuildSelected.observeSelectedGuildId().X(new WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(storeLurking, storeGuildWelcomeScreens, storePermissions, storeExperiments)), StoreUser.observeMe$default(storeUser, false, 1, null), storeChannelsSelected.observeResolvedSelectedChannel(), storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false), storeExperiments.observeUserExperiment("2021-09_events_upsell", false), WidgetHomeViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(e, "Observable.combineLatest…t == 1,\n        )\n      }");
-            return e;
+            Observable<StoreState> f = Observable.f(storeNavigation.observeLeftPanelState(), storeNavigation.observeRightPanelState(), storeGuildSelected.observeSelectedGuildId().Y(new WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(storeLurking, storeGuildWelcomeScreens, storePermissions, storeExperiments)), StoreUser.observeMe$default(storeUser, false, 1, null), storeChannelsSelected.observeResolvedSelectedChannel(), storeExperiments.observeUserExperiment("2021-09_events_upsell", false), WidgetHomeViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(f, "Observable.combineLatest…t == 1,\n        )\n      }");
+            return f;
         }
     }
 
@@ -217,50 +208,6 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             }
         }
 
-        /* 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.O("ShowGuildProfileMarketingSheet(guildId="), this.guildId, ")");
-            }
-        }
-
         /* compiled from: WidgetHomeViewModel.kt */
         public static final class ShowGuildWelcomeSheet extends Event {
             private final long guildId;
@@ -458,15 +405,14 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     public static final class StoreState {
         private final GuildInfo guildInfo;
         private final boolean isInEventsUpsellExperiment;
-        private final boolean isInGuildIdentityExperiment;
         private final boolean isThreadPeek;
         private final PanelState leftPanelState;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2642me;
+        private final MeUser f2640me;
         private final PanelState rightPanelState;
 
-        public StoreState(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, boolean z3, boolean z4) {
+        public StoreState(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, boolean z3) {
             m.checkNotNullParameter(panelState, "leftPanelState");
             m.checkNotNullParameter(panelState2, "rightPanelState");
             m.checkNotNullParameter(guildInfo, "guildInfo");
@@ -474,13 +420,12 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             this.leftPanelState = panelState;
             this.rightPanelState = panelState2;
             this.guildInfo = guildInfo;
-            this.f2642me = meUser;
+            this.f2640me = meUser;
             this.isThreadPeek = z2;
-            this.isInGuildIdentityExperiment = z3;
-            this.isInEventsUpsellExperiment = z4;
+            this.isInEventsUpsellExperiment = z3;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, boolean z3, boolean z4, int i, Object obj) {
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, boolean z3, int i, Object obj) {
             if ((i & 1) != 0) {
                 panelState = storeState.leftPanelState;
             }
@@ -491,18 +436,15 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
                 guildInfo = storeState.guildInfo;
             }
             if ((i & 8) != 0) {
-                meUser = storeState.f2642me;
+                meUser = storeState.f2640me;
             }
             if ((i & 16) != 0) {
                 z2 = storeState.isThreadPeek;
             }
             if ((i & 32) != 0) {
-                z3 = storeState.isInGuildIdentityExperiment;
+                z3 = storeState.isInEventsUpsellExperiment;
             }
-            if ((i & 64) != 0) {
-                z4 = storeState.isInEventsUpsellExperiment;
-            }
-            return storeState.copy(panelState, panelState2, guildInfo, meUser, z2, z3, z4);
+            return storeState.copy(panelState, panelState2, guildInfo, meUser, z2, z3);
         }
 
         public final PanelState component1() {
@@ -518,7 +460,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser component4() {
-            return this.f2642me;
+            return this.f2640me;
         }
 
         public final boolean component5() {
@@ -526,19 +468,15 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
 
         public final boolean component6() {
-            return this.isInGuildIdentityExperiment;
-        }
-
-        public final boolean component7() {
             return this.isInEventsUpsellExperiment;
         }
 
-        public final StoreState copy(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, boolean z3, boolean z4) {
+        public final StoreState copy(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, boolean z3) {
             m.checkNotNullParameter(panelState, "leftPanelState");
             m.checkNotNullParameter(panelState2, "rightPanelState");
             m.checkNotNullParameter(guildInfo, "guildInfo");
             m.checkNotNullParameter(meUser, "me");
-            return new StoreState(panelState, panelState2, guildInfo, meUser, z2, z3, z4);
+            return new StoreState(panelState, panelState2, guildInfo, meUser, z2, z3);
         }
 
         public boolean equals(Object obj) {
@@ -549,7 +487,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.leftPanelState, storeState.leftPanelState) && m.areEqual(this.rightPanelState, storeState.rightPanelState) && m.areEqual(this.guildInfo, storeState.guildInfo) && m.areEqual(this.f2642me, storeState.f2642me) && this.isThreadPeek == storeState.isThreadPeek && this.isInGuildIdentityExperiment == storeState.isInGuildIdentityExperiment && this.isInEventsUpsellExperiment == storeState.isInEventsUpsellExperiment;
+            return m.areEqual(this.leftPanelState, storeState.leftPanelState) && m.areEqual(this.rightPanelState, storeState.rightPanelState) && m.areEqual(this.guildInfo, storeState.guildInfo) && m.areEqual(this.f2640me, storeState.f2640me) && this.isThreadPeek == storeState.isThreadPeek && this.isInEventsUpsellExperiment == storeState.isInEventsUpsellExperiment;
         }
 
         public final GuildInfo getGuildInfo() {
@@ -561,7 +499,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser getMe() {
-            return this.f2642me;
+            return this.f2640me;
         }
 
         public final PanelState getRightPanelState() {
@@ -576,7 +514,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             int hashCode2 = (hashCode + (panelState2 != null ? panelState2.hashCode() : 0)) * 31;
             GuildInfo guildInfo = this.guildInfo;
             int hashCode3 = (hashCode2 + (guildInfo != null ? guildInfo.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2642me;
+            MeUser meUser = this.f2640me;
             if (meUser != null) {
                 i = meUser.hashCode();
             }
@@ -590,29 +528,17 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             int i5 = z2 ? 1 : 0;
             int i6 = z2 ? 1 : 0;
             int i7 = (i2 + i4) * 31;
-            boolean z3 = this.isInGuildIdentityExperiment;
-            if (z3) {
-                z3 = true;
+            boolean z3 = this.isInEventsUpsellExperiment;
+            if (!z3) {
+                i3 = z3 ? 1 : 0;
             }
-            int i8 = z3 ? 1 : 0;
-            int i9 = z3 ? 1 : 0;
-            int i10 = z3 ? 1 : 0;
-            int i11 = (i7 + i8) * 31;
-            boolean z4 = this.isInEventsUpsellExperiment;
-            if (!z4) {
-                i3 = z4 ? 1 : 0;
-            }
-            return i11 + i3;
+            return i7 + i3;
         }
 
         public final boolean isInEventsUpsellExperiment() {
             return this.isInEventsUpsellExperiment;
         }
 
-        public final boolean isInGuildIdentityExperiment() {
-            return this.isInGuildIdentityExperiment;
-        }
-
         public final boolean isThreadPeek() {
             return this.isThreadPeek;
         }
@@ -625,11 +551,9 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             O.append(", guildInfo=");
             O.append(this.guildInfo);
             O.append(", me=");
-            O.append(this.f2642me);
+            O.append(this.f2640me);
             O.append(", isThreadPeek=");
             O.append(this.isThreadPeek);
-            O.append(", isInGuildIdentityExperiment=");
-            O.append(this.isInGuildIdentityExperiment);
             O.append(", isInEventsUpsellExperiment=");
             return a.K(O, this.isInEventsUpsellExperiment, ")");
         }
@@ -726,12 +650,12 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     }
 
     public WidgetHomeViewModel() {
-        this(null, null, null, null, null, null, null, null, 255, null);
+        this(null, null, null, null, null, null, null, 127, null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
-    public WidgetHomeViewModel(StoreNavigation storeNavigation, StoreGuildWelcomeScreens storeGuildWelcomeScreens, Observable<StoreState> observable, Observable<StoreNavigation.PanelAction> observable2, ChannelOnboardingManager channelOnboardingManager, SharedPreferences sharedPreferences, Clock clock, TooltipManager tooltipManager) {
-        super(new ViewState(r10, r10));
+    public WidgetHomeViewModel(StoreNavigation storeNavigation, StoreGuildWelcomeScreens storeGuildWelcomeScreens, Observable<StoreState> observable, Observable<StoreNavigation.PanelAction> observable2, ChannelOnboardingManager channelOnboardingManager, SharedPreferences sharedPreferences, Clock clock) {
+        super(new ViewState(r9, r9));
         m.checkNotNullParameter(storeNavigation, "storeNavigation");
         m.checkNotNullParameter(storeGuildWelcomeScreens, "storeGuildWelcomeScreens");
         m.checkNotNullParameter(observable, "storeStateObservable");
@@ -739,15 +663,13 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(channelOnboardingManager, "channelOnboardingManager");
         m.checkNotNullParameter(sharedPreferences, "sharedPreferences");
         m.checkNotNullParameter(clock, "clock");
-        m.checkNotNullParameter(tooltipManager, "tooltipManager");
         PanelState.a aVar = PanelState.a.a;
         this.storeNavigation = storeNavigation;
         this.storeGuildWelcomeScreens = storeGuildWelcomeScreens;
         this.channelOnboardingManager = channelOnboardingManager;
         this.sharedPreferences = sharedPreferences;
         this.clock = clock;
-        this.tooltipManager = tooltipManager;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         Observable<StoreState> q = observable.q();
         m.checkNotNullExpressionValue(q, "storeStateObservable\n   …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(q), this, null, 2, null), WidgetHomeViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -755,10 +677,9 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
-    public WidgetHomeViewModel(StoreNavigation storeNavigation, StoreGuildWelcomeScreens storeGuildWelcomeScreens, Observable observable, Observable observable2, ChannelOnboardingManager channelOnboardingManager, SharedPreferences sharedPreferences, Clock clock, TooltipManager tooltipManager, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(r1, r11, r2, r3, r4, r5, r6, r8);
+    public /* synthetic */ WidgetHomeViewModel(StoreNavigation storeNavigation, StoreGuildWelcomeScreens storeGuildWelcomeScreens, Observable observable, Observable observable2, ChannelOnboardingManager channelOnboardingManager, SharedPreferences sharedPreferences, Clock clock, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(r0, r10, r1, (i & 8) != 0 ? r0.getNavigationPanelAction() : observable2, (i & 16) != 0 ? new ChannelOnboardingManager() : channelOnboardingManager, (i & 32) != 0 ? SharedPreferencesProvider.INSTANCE.get() : sharedPreferences, (i & 64) != 0 ? ClockFactory.get() : clock);
         Observable observable3;
-        TooltipManager tooltipManager2;
         StoreNavigation navigation = (i & 1) != 0 ? StoreStream.Companion.getNavigation() : storeNavigation;
         StoreGuildWelcomeScreens guildWelcomeScreens = (i & 2) != 0 ? StoreStream.Companion.getGuildWelcomeScreens() : storeGuildWelcomeScreens;
         if ((i & 4) != 0) {
@@ -768,32 +689,6 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         } else {
             observable3 = observable;
         }
-        Observable navigationPanelAction = (i & 8) != 0 ? navigation.getNavigationPanelAction() : observable2;
-        ChannelOnboardingManager channelOnboardingManager2 = (i & 16) != 0 ? new ChannelOnboardingManager() : channelOnboardingManager;
-        SharedPreferences sharedPreferences2 = (i & 32) != 0 ? SharedPreferencesProvider.INSTANCE.get() : sharedPreferences;
-        Clock clock2 = (i & 64) != 0 ? ClockFactory.get() : clock;
-        if ((i & 128) != 0) {
-            AppLog appLog = AppLog.g;
-            m.checkNotNullParameter(appLog, "logger");
-            WeakReference<c.a.j.a> weakReference = a.b.a;
-            tooltipManager2 = null;
-            c.a.j.a aVar = weakReference != null ? weakReference.get() : null;
-            if (aVar == null) {
-                aVar = new c.a.j.a(appLog);
-                a.b.a = new WeakReference<>(aVar);
-            }
-            TooltipManager.a aVar2 = TooltipManager.a.d;
-            m.checkNotNullParameter(aVar, "floatingViewManager");
-            WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
-            tooltipManager2 = weakReference2 != null ? weakReference2.get() : tooltipManager2;
-            if (tooltipManager2 == null) {
-                TooltipManager tooltipManager3 = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2605c.getValue(), 0, aVar, 4);
-                TooltipManager.a.a = new WeakReference<>(tooltipManager3);
-                tooltipManager2 = tooltipManager3;
-            }
-        } else {
-            tooltipManager2 = tooltipManager;
-        }
     }
 
     public static final /* synthetic */ void access$handleNavDrawerAction(WidgetHomeViewModel widgetHomeViewModel, StoreNavigation.PanelAction panelAction) {
@@ -834,12 +729,6 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         publishSubject.j.onNext(new Event.ShowGuildEventUpsell(j));
     }
 
-    @MainThread
-    private final void emitShowGuildIdentityMarketingSheet(long j) {
-        PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.ShowGuildProfileMarketingSheet(j));
-    }
-
     @MainThread
     private final void emitShowWelcomeSheet(long j) {
         PublishSubject<Event> publishSubject = this.eventSubject;
@@ -882,8 +771,6 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
         if (shouldShowChannelOnboardingSheet(this.previousLeftPanelState, leftPanelState, guildId, isNewUser)) {
             emitShowChannelOnboardingSheet();
-        } else if (shouldShowGuildIdentityMarketingSheet(this.previousLeftPanelState, leftPanelState, storeState.getMe(), storeState.isInGuildIdentityExperiment())) {
-            emitShowGuildIdentityMarketingSheet(guildId);
         } else if (shouldShowGuildEventUpsell(storeState.getGuildInfo().getCanManageEvents(), storeState.getGuildInfo().getCanGuildShowEvents(), storeState.isInEventsUpsellExperiment())) {
             SharedPreferences.Editor edit = this.sharedPreferences.edit();
             m.checkNotNullExpressionValue(edit, "editor");
@@ -909,12 +796,6 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         return z2 && !this.sharedPreferences.getBoolean(WidgetGuildScheduledEventUpsellBottomSheet.GUILD_EVENT_UPSELL_CACHE_KEY, false) && z4 && z3;
     }
 
-    private final boolean shouldShowGuildIdentityMarketingSheet(PanelState panelState, PanelState panelState2, MeUser meUser, boolean z2) {
-        UserUtils userUtils = UserUtils.INSTANCE;
-        Clock clock = this.clock;
-        return z2 && ((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
     public final void emitOpenLeftPanelEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
diff --git a/app/src/main/java/com/discord/widgets/hubs/DomainGuildInfo.java b/app/src/main/java/com/discord/widgets/hubs/DomainGuildInfo.java
index 8b5da9194b..f20c2d8ff2 100644
--- a/app/src/main/java/com/discord/widgets/hubs/DomainGuildInfo.java
+++ b/app/src/main/java/com/discord/widgets/hubs/DomainGuildInfo.java
@@ -13,7 +13,7 @@ public final class DomainGuildInfo implements Parcelable {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2643id;
+    private final long f2641id;
     private final String name;
 
     /* compiled from: WidgetHubDomains.kt */
@@ -47,7 +47,7 @@ public final class DomainGuildInfo implements Parcelable {
     public DomainGuildInfo(String str, long j, String str2) {
         m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.icon = str;
-        this.f2643id = j;
+        this.f2641id = j;
         this.name = str2;
     }
 
@@ -61,7 +61,7 @@ public final class DomainGuildInfo implements Parcelable {
     }
 
     public final long getId() {
-        return this.f2643id;
+        return this.f2641id;
     }
 
     public final String getName() {
@@ -72,7 +72,7 @@ public final class DomainGuildInfo implements Parcelable {
     public void writeToParcel(Parcel parcel, int i) {
         m.checkNotNullParameter(parcel, "parcel");
         parcel.writeString(this.icon);
-        parcel.writeLong(this.f2643id);
+        parcel.writeLong(this.f2641id);
         parcel.writeString(this.name);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/RadioSelectorItem.java b/app/src/main/java/com/discord/widgets/hubs/RadioSelectorItem.java
index 41be862c49..95f9be9207 100644
--- a/app/src/main/java/com/discord/widgets/hubs/RadioSelectorItem.java
+++ b/app/src/main/java/com/discord/widgets/hubs/RadioSelectorItem.java
@@ -10,7 +10,7 @@ public final class RadioSelectorItem implements Parcelable {
     public static final Parcelable.Creator<RadioSelectorItem> CREATOR = new Creator();
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f2644id;
+    private final int f2642id;
     private final boolean selected;
     private final String text;
 
@@ -29,14 +29,14 @@ public final class RadioSelectorItem implements Parcelable {
 
     public RadioSelectorItem(int i, String str, boolean z2) {
         m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
-        this.f2644id = i;
+        this.f2642id = i;
         this.text = str;
         this.selected = z2;
     }
 
     public static /* synthetic */ RadioSelectorItem copy$default(RadioSelectorItem radioSelectorItem, int i, String str, boolean z2, int i2, Object obj) {
         if ((i2 & 1) != 0) {
-            i = radioSelectorItem.f2644id;
+            i = radioSelectorItem.f2642id;
         }
         if ((i2 & 2) != 0) {
             str = radioSelectorItem.text;
@@ -48,7 +48,7 @@ public final class RadioSelectorItem implements Parcelable {
     }
 
     public final int component1() {
-        return this.f2644id;
+        return this.f2642id;
     }
 
     public final String component2() {
@@ -78,11 +78,11 @@ public final class RadioSelectorItem implements Parcelable {
             return false;
         }
         RadioSelectorItem radioSelectorItem = (RadioSelectorItem) obj;
-        return this.f2644id == radioSelectorItem.f2644id && m.areEqual(this.text, radioSelectorItem.text) && this.selected == radioSelectorItem.selected;
+        return this.f2642id == radioSelectorItem.f2642id && m.areEqual(this.text, radioSelectorItem.text) && this.selected == radioSelectorItem.selected;
     }
 
     public final int getId() {
-        return this.f2644id;
+        return this.f2642id;
     }
 
     public final boolean getSelected() {
@@ -95,7 +95,7 @@ public final class RadioSelectorItem implements Parcelable {
 
     @Override // java.lang.Object
     public int hashCode() {
-        int i = this.f2644id * 31;
+        int i = this.f2642id * 31;
         String str = this.text;
         int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31;
         boolean z2 = this.selected;
@@ -111,7 +111,7 @@ public final class RadioSelectorItem implements Parcelable {
     @Override // java.lang.Object
     public String toString() {
         StringBuilder O = a.O("RadioSelectorItem(id=");
-        O.append(this.f2644id);
+        O.append(this.f2642id);
         O.append(", text=");
         O.append(this.text);
         O.append(", selected=");
@@ -121,7 +121,7 @@ public final class RadioSelectorItem implements Parcelable {
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
         m.checkNotNullParameter(parcel, "parcel");
-        parcel.writeInt(this.f2644id);
+        parcel.writeInt(this.f2642id);
         parcel.writeString(this.text);
         parcel.writeInt(this.selected ? 1 : 0);
     }
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 7f2c309909..059330ba9f 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java
@@ -63,7 +63,7 @@ public final class WidgetHubAddName extends AppFragment {
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return");
             getBinding().f.setIsLoading(addNameState.getChangeNicknameAsync() instanceof Loading);
-            getBinding().f2297c.setText(addNameState.getNickname());
+            getBinding().f2295c.setText(addNameState.getNickname());
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.discordHubAddNameTitle");
             Object[] objArr = new Object[1];
@@ -85,7 +85,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().f2297c;
+            TextInputEditText textInputEditText = getBinding().f2295c;
             m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubAddNameInput");
             viewModel.setName(String.valueOf(textInputEditText.getText()));
         }
@@ -108,7 +108,7 @@ public final class WidgetHubAddName extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         getBinding().f.setOnClickListener(new WidgetHubAddName$onViewBound$1(this));
-        TextInputEditText textInputEditText = getBinding().f2297c;
+        TextInputEditText textInputEditText = getBinding().f2295c;
         m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubAddNameInput");
         showKeyboard(textInputEditText);
     }
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 6881d2a0a9..0dd142d5ec 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().f2298c.setTitle(b.k(this, R.string.hub_choose_guild_title, new Object[]{hubAddServerState.getHubName()}, null, 4));
+        getBinding().f2296c.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 1ea2c2358d..8f1da89529 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication.java
@@ -71,11 +71,11 @@ public final class WidgetHubAuthentication extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f2299c.setOnCodeEntered(new WidgetHubAuthentication$onViewBound$1(this));
+        getBinding().f2297c.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)));
-        CodeVerificationView codeVerificationView = getBinding().f2299c;
+        CodeVerificationView codeVerificationView = getBinding().f2297c;
         m.checkNotNullExpressionValue(codeVerificationView, "binding.verification");
         showKeyboard(codeVerificationView);
     }
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 a4879533c2..594198d783 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription.java
@@ -74,7 +74,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().f2300c;
+            TextView textView = getBinding().f2298c;
             DirectoryEntryCategory selectedCategory = hubDescriptionState.getSelectedCategory();
             if (selectedCategory == null || (titleRes2 = selectedCategory.getTitleRes()) == null) {
                 i = R.attr.colorTextMuted;
@@ -83,7 +83,7 @@ public final class WidgetHubDescription extends AppFragment {
                 i = R.attr.colorTextNormal;
             }
             textView.setTextColor(ColorCompat.getThemedColor(context, i));
-            TextView textView2 = getBinding().f2300c;
+            TextView textView2 = getBinding().f2298c;
             m.checkNotNullExpressionValue(textView2, "binding.category");
             DirectoryEntryCategory selectedCategory2 = hubDescriptionState.getSelectedCategory();
             if (selectedCategory2 == null || (titleRes = selectedCategory2.getTitleRes()) == null || (str = getString(titleRes.intValue())) == null) {
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 87b9acb8f7..4c73b65a19 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomainSearch.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomainSearch.java
@@ -87,7 +87,7 @@ public final class WidgetHubDomainSearch extends AppFragment {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.emptyTitle");
         textView.setText(getString(arrayList.isEmpty() ? R.string.directory_search_no_results_title : R.string.directory_search_initial_title));
-        LinearLayout linearLayout = getBinding().f2301c;
+        LinearLayout linearLayout = getBinding().f2299c;
         m.checkNotNullExpressionValue(linearLayout, "binding.emptyState");
         linearLayout.setVisibility(arrayList.isEmpty() ? 0 : 8);
         RecyclerView recyclerView = getBinding().e;
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 79b09dff9b..c04714c380 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomains.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomains.java
@@ -79,7 +79,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().f2302c;
+        MaterialButton materialButton = getBinding().f2300c;
         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 d7bd07c336..8e01148cd3 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 mo17invoke() {
         AuthUtils authUtils = AuthUtils.INSTANCE;
-        TextInputLayout textInputLayout = WidgetHubEmailFlow.access$getBinding$p(this.this$0).f2303c.d;
+        TextInputLayout textInputLayout = WidgetHubEmailFlow.access$getBinding$p(this.this$0).f2301c.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 592ae51f86..23f45d40c6 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow.java
@@ -139,7 +139,7 @@ public final class WidgetHubEmailFlow extends AppFragment {
     }
 
     private final String getEmail() {
-        TextInputEditText textInputEditText = getBinding().f2303c.f189c;
+        TextInputEditText textInputEditText = getBinding().f2301c.f189c;
         m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubEmailI…aderDescriptionEmailInput");
         return String.valueOf(textInputEditText.getText());
     }
@@ -163,10 +163,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().f2303c.f189c;
+            TextInputEditText textInputEditText = getBinding().f2301c.f189c;
             m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubEmailI…aderDescriptionEmailInput");
             String valueOf = String.valueOf(textInputEditText.getText());
-            x4 x4Var = getBinding().f2303c;
+            x4 x4Var = getBinding().f2301c;
             m.checkNotNullExpressionValue(x4Var, "binding.discordHubEmailInput");
             NestedScrollView nestedScrollView = x4Var.a;
             m.checkNotNullExpressionValue(nestedScrollView, "binding.discordHubEmailInput.root");
@@ -209,7 +209,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().f2303c.f;
+        TextView textView = getBinding().f2301c.f;
         m.checkNotNullExpressionValue(textView, "binding.discordHubEmailInput.discordHubEmailLabel");
         if (!validate$default) {
             i = 8;
@@ -242,7 +242,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().f2303c.e;
+        TextView textView = getBinding().f2301c.e;
         m.checkNotNullExpressionValue(textView, "binding.discordHubEmailI…iscordHubEmailHeaderTitle");
         int ordinal = getArgs().getEntryPoint().ordinal();
         if (ordinal == 0) {
@@ -259,7 +259,7 @@ public final class WidgetHubEmailFlow extends AppFragment {
         String string = getString(ordinal2 != 0 ? ordinal2 != 1 ? R.string.hub_waitlist_modal_join_subheader : R.string.hub_email_connection_content_description : R.string.hub_email_connection_nux_content_description);
         m.checkNotNullExpressionValue(string, "getString(\n        when …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().f2303c.b;
+        LinkifiedTextView linkifiedTextView = getBinding().f2301c.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 e27756586c..90123c37d8 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().f2304c;
+            TextInputEditText textInputEditText = getBinding().f2302c;
             m.checkNotNullExpressionValue(textInputEditText, "binding.hubWaitlistEditText");
             viewModel.joinWaitlist(String.valueOf(textInputEditText.getText()));
         }
@@ -87,7 +87,7 @@ public final class WidgetHubWaitlist extends AppFragment {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null)), WidgetHubWaitlist.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHubWaitlist$onViewBoundOrOnResume$1(this), 62, (Object) null);
         getBinding().b.setOnClickListener(new WidgetHubWaitlist$onViewBoundOrOnResume$2(this));
-        TextInputEditText textInputEditText = getBinding().f2304c;
+        TextInputEditText textInputEditText = getBinding().f2302c;
         m.checkNotNullExpressionValue(textInputEditText, "binding.hubWaitlistEditText");
         showKeyboard(textInputEditText);
     }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
index 136b6e0678..2e94a9e7f3 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
@@ -116,16 +116,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_media_browser /* 2131364193 */:
+            case R.id.menu_media_browser /* 2131364188 */:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri, "sourceUri.toString()");
                 UriHandler.handleOrUntrusted$default(context, uri, null, 4, null);
                 return;
-            case R.id.menu_media_download /* 2131364194 */:
+            case R.id.menu_media_download /* 2131364189 */:
                 this.this$0.requestMediaDownload(new AnonymousClass1(this, context));
                 return;
-            case R.id.menu_media_share /* 2131364195 */:
+            case R.id.menu_media_share /* 2131364190 */:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri2 = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri2, "sourceUri.toString()");
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 8fa6da8ee3..fe94c6651b 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
@@ -167,7 +167,7 @@ public final class WidgetMedia extends AppFragment {
                 String str3 = previewImage == null ? previewImage.a : null;
                 Integer num2 = previewImage == null ? previewImage.b : null;
                 if (previewImage != null) {
-                    num = previewImage.f2503c;
+                    num = previewImage.f2501c;
                 }
                 launch(context, j, l, str, str3, num2, num, mediaType);
             }
@@ -400,9 +400,9 @@ public final class WidgetMedia extends AppFragment {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            Observable<Long> c02 = Observable.c0(SHOW_CONTROLS_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable.timer(SHOW_CO…S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), WidgetMedia.class, (Context) null, new WidgetMedia$showControls$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$showControls$2(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(SHOW_CONTROLS_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(SHOW_CO…S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetMedia.class, (Context) null, new WidgetMedia$showControls$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$showControls$2(this), 58, (Object) null);
         } else {
             getBinding().f.c();
         }
@@ -467,7 +467,7 @@ public final class WidgetMedia extends AppFragment {
         if (videoSurfaceView != null) {
             videoSurfaceView.setOnClickListener(new WidgetMedia$onViewBound$1(this));
         }
-        getBinding().f2311c.setOnClickListener(new WidgetMedia$onViewBound$2(this));
+        getBinding().f2309c.setOnClickListener(new WidgetMedia$onViewBound$2(this));
         AppBarLayout appBarLayout = getBinding().b;
         m.checkNotNullExpressionValue(appBarLayout, "binding.actionBarToolbarLayout");
         ViewExtensions.addOnHeightChangedListener(appBarLayout, new WidgetMedia$onViewBound$3(this));
@@ -559,9 +559,9 @@ public final class WidgetMedia extends AppFragment {
             if (appMediaPlayer4 == null) {
                 m.throwUninitializedPropertyAccessException("appMediaPlayer");
             }
-            Observable<AppMediaPlayer.Event> I = appMediaPlayer4.a.I();
-            m.checkNotNullExpressionValue(I, "eventSubject.onBackpressureBuffer()");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(I, this, null, 2, null), WidgetMedia.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1(this), 62, (Object) null);
+            Observable<AppMediaPlayer.Event> J = appMediaPlayer4.a.J();
+            m.checkNotNullExpressionValue(J, "eventSubject.onBackpressureBuffer()");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(J, this, null, 2, null), WidgetMedia.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1(this), 62, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
index cf68f5ebae..72d5249d1f 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
@@ -142,7 +142,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         setActionBarTitle(R.string.login_with_qr);
         boolean booleanExtra = getMostRecentIntent().getBooleanExtra(EXTRA_SHOW_HELP_CHIP, false);
-        Chip chip = getBinding().f2335c;
+        Chip chip = getBinding().f2333c;
         m.checkNotNullExpressionValue(chip, "binding.qrScannerChip");
         if (!booleanExtra) {
             i = 8;
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 acebf110a4..bdce9bd5ad 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().f2316c;
+        ProgressBar progressBar = getBinding().f2314c;
         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 852c5dc8ba..11cf064d4d 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.f2323c;
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f2321c;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.popupBody");
         Layout layout = simpleDraweeSpanTextView.getLayout();
         int lineCount = layout != null ? layout.getLineCount() : 0;
-        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f2323c;
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f2321c;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.popupBody");
         if (lineCount > simpleDraweeSpanTextView2.getMaxLines()) {
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f2323c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f2321c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.popupBody");
             Layout layout2 = simpleDraweeSpanTextView3.getLayout();
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f2323c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f2321c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.popupBody");
             int lineEnd = layout2.getLineEnd(simpleDraweeSpanTextView4.getMaxLines() - 1);
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f2323c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f2321c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView5, "binding.popupBody");
             CharSequence subSequence = simpleDraweeSpanTextView5.getText().subSequence(0, lineEnd - 1);
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f2323c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f2321c;
             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 3c597fe2a1..683bb055d9 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
@@ -64,11 +64,11 @@ public final class WidgetNoticeDialog extends AppDialog {
     private static final String ARG_THEME_ID = "theme_id";
 
     /* renamed from: CANCEL_BUTTON */
-    public static final int notice_cancel = 2131364339;
+    public static final int notice_cancel = 2131364334;
     public static final Companion Companion = new Companion(null);
 
     /* renamed from: OK_BUTTON */
-    public static final int notice_ok = 2131364344;
+    public static final int notice_ok = 2131364339;
     public static final int ON_SHOW = 0;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null);
     private Map<Integer, ? extends Function1<? super View, Unit>> listenerMap;
@@ -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().f2320c;
+        LinkifiedTextView linkifiedTextView = getBinding().f2318c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.noticeBodyText");
         Bundle arguments4 = getArguments();
         linkifiedTextView.setText(arguments4 != null ? arguments4.getCharSequence(ARG_BODY_TEXT) : null);
         if (isCancelable()) {
-            LinkifiedTextView linkifiedTextView2 = getBinding().f2320c;
+            LinkifiedTextView linkifiedTextView2 = getBinding().f2318c;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.noticeBodyText");
             linkifiedTextView2.setMovementMethod(new ActionLinkMovementMethod(new WidgetNoticeDialog$onViewBound$2(this)));
         }
-        LinkifiedTextView linkifiedTextView3 = getBinding().f2320c;
+        LinkifiedTextView linkifiedTextView3 = getBinding().f2318c;
         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 ee35eb0710..47b009712b 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().f2321c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this));
+        getBinding().f2319c.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 e8558d7133..60432852e4 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().f2322c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this));
+        getBinding().f2320c.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 78cf11c06a..2d13890e98 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().f2325c;
+        LinearLayout linearLayout = getBinding().f2323c;
         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 5cf9f17f57..a41bbdbda8 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().f2319c;
+        TabLayout tabLayout = getBinding().f2317c;
         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 daa2de866d..cc51111dcd 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
@@ -110,7 +110,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
                 TextView textView = getBinding().d;
                 m.checkNotNullExpressionValue(textView, "binding.nufChannelPromptGuildIconName");
                 textView.setVisibility(8);
-                SimpleDraweeView simpleDraweeView = getBinding().f2324c;
+                SimpleDraweeView simpleDraweeView = getBinding().f2322c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.nufChannelPromptGuildIcon");
                 IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
             } else {
@@ -120,7 +120,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
                 TextView textView3 = getBinding().d;
                 m.checkNotNullExpressionValue(textView3, "binding.nufChannelPromptGuildIconName");
                 textView3.setText(guild.getShortName());
-                SimpleDraweeView simpleDraweeView2 = getBinding().f2324c;
+                SimpleDraweeView simpleDraweeView2 = getBinding().f2322c;
                 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 118a3dcac0..49d40e9bfc 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().f2262c;
+        TextInputLayout textInputLayout = this.this$0.getBinding().f2260c;
         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 1e6a731aa9..1ad1d6a06b 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().f2262c;
+        TextInputLayout textInputLayout = getBinding().f2260c;
         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 d7ffe4daae..a540b358c3 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.f2330c.setOnClickListener(new PhoneCountryCodeAdapterItem$bind$1(this, phoneCountryCode));
+        this.binding.f2328c.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 91e291196a..b4a01e1a58 100644
--- a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
@@ -54,9 +54,9 @@ public final class WidgetPhoneCountryCodeBottomSheet extends AppBottomSheet {
 
     public WidgetPhoneCountryCodeBottomSheet() {
         super(false, 1, null);
-        BehaviorSubject<String> k0 = BehaviorSubject.k0("");
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(\"\")");
-        this.nameFilterSubject = k0;
+        BehaviorSubject<String> l0 = BehaviorSubject.l0("");
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+        this.nameFilterSubject = l0;
         this.adapter = new PhoneCountryCodeAdapter();
     }
 
@@ -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().f2329c;
+        TextInputLayout textInputLayout = getBinding().f2327c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.phoneCountryCodeSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetPhoneCountryCodeBottomSheet$onResume$1(this));
         Observable<String> o = this.nameFilterSubject.o(200, TimeUnit.MILLISECONDS);
diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
index b855c7152e..cd03f617dd 100644
--- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
+++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
@@ -155,7 +155,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
         ViewPager2 viewPager2 = getBinding().b;
         m.checkNotNullExpressionValue(viewPager2, "binding.tabContents");
         viewPager2.setAdapter(tabsAdapter);
-        TabLayout tabLayout = getBinding().f2336c;
+        TabLayout tabLayout = getBinding().f2334c;
         m.checkNotNullExpressionValue(tabLayout, "binding.tabs");
         ViewPager2 viewPager22 = getBinding().b;
         m.checkNotNullExpressionValue(viewPager22, "binding.tabContents");
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java
index f64a8e294c..3f9c173d43 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java
@@ -36,7 +36,7 @@ public final class WidgetSearch$configureSearchInput$1 extends o implements Func
         }
         AppFragment.hideKeyboard$default(this.this$0, null, 1, null);
         StoreSearch search = StoreStream.Companion.getSearch();
-        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f2339c;
+        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f2337c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
         Context context = textView.getContext();
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java
index ec6ab15952..032553a0b5 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java
@@ -25,10 +25,10 @@ public final class WidgetSearch$configureSearchInput$5 extends o implements Func
     }
 
     public final void invoke(String str) {
-        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f2339c;
+        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f2337c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         ViewExtensions.setText(textInputLayout, str);
-        TextInputLayout textInputLayout2 = WidgetSearch.access$getBinding$p(this.this$0).f2339c;
+        TextInputLayout textInputLayout2 = WidgetSearch.access$getBinding$p(this.this$0).f2337c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
         ViewExtensions.setSelectionEnd(textInputLayout2);
     }
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
index ea82d937fc..565d8137a2 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
@@ -227,15 +227,15 @@ public final class WidgetSearch extends AppFragment {
     }
 
     private final void configureSearchInput() {
-        TextInputLayout textInputLayout = getBinding().f2339c;
+        TextInputLayout textInputLayout = getBinding().f2337c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         ViewExtensions.setOnEditorActionListener(textInputLayout, new WidgetSearch$configureSearchInput$1(this));
-        TextInputLayout textInputLayout2 = getBinding().f2339c;
+        TextInputLayout textInputLayout2 = getBinding().f2337c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, WidgetSearch$configureSearchInput$2.INSTANCE);
-        Observable E = ObservableExtensionsKt.ui$default(StoreStream.Companion.getSearch().getStoreSearchInput().getForcedInput(), this, null, 2, null).E(new WidgetSearch$configureSearchInput$3(this)).E(WidgetSearch$configureSearchInput$4.INSTANCE);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get… obj.toString()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(E, WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$configureSearchInput$5(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.ui$default(StoreStream.Companion.getSearch().getStoreSearchInput().getForcedInput(), this, null, 2, null).F(new WidgetSearch$configureSearchInput$3(this)).F(WidgetSearch$configureSearchInput$4.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get… obj.toString()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$configureSearchInput$5(this), 62, (Object) null);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0092: APUT  (r2v2 java.lang.Object[]), (0 ??[int, short, byte, char]), (r7v2 java.lang.String) */
@@ -251,7 +251,7 @@ public final class WidgetSearch extends AppFragment {
         int i = this.targetType;
         int i2 = 0;
         if (i == 0) {
-            TextInputLayout textInputLayout = getBinding().f2339c;
+            TextInputLayout textInputLayout = getBinding().f2337c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
             Object[] objArr = new Object[1];
             Guild guild = model.getGuild();
@@ -260,7 +260,7 @@ public final class WidgetSearch extends AppFragment {
         } else if (i == 1) {
             Channel channel = model.getChannel();
             String d = channel != null ? ChannelUtils.d(channel, requireContext(), false) : null;
-            TextInputLayout textInputLayout2 = getBinding().f2339c;
+            TextInputLayout textInputLayout2 = getBinding().f2337c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
             Channel channel2 = model.getChannel();
             Integer valueOf = channel2 != null ? Integer.valueOf(channel2.A()) : null;
@@ -303,7 +303,7 @@ public final class WidgetSearch extends AppFragment {
     private final void sendQuery(Context context) {
         AppFragment.hideKeyboard$default(this, null, 1, null);
         StoreSearch search = StoreStream.Companion.getSearch();
-        TextInputLayout textInputLayout = getBinding().f2339c;
+        TextInputLayout textInputLayout = getBinding().f2337c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         search.loadInitial(ViewExtensions.getTextOrEmpty(textInputLayout), new ContextSearchStringProvider(context));
     }
@@ -330,7 +330,7 @@ public final class WidgetSearch extends AppFragment {
         this.targetId = getMostRecentIntent().getLongExtra(INTENT_EXTRA_TARGET_ID, 0);
         this.targetType = getMostRecentIntent().getIntExtra(INTENT_EXTRA_TARGET_TYPE, -1);
         if (!isRecreated()) {
-            TextInputLayout textInputLayout = getBinding().f2339c;
+            TextInputLayout textInputLayout = getBinding().f2337c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
             showKeyboard(textInputLayout);
         }
@@ -348,7 +348,7 @@ public final class WidgetSearch extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(this.targetType, this.targetId), this, null, 2, null), WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$onViewBoundOrOnResume$1(this), 62, (Object) null);
         configureSearchInput();
         getBinding().b.setOnClickListener(new WidgetSearch$onViewBoundOrOnResume$2(this));
-        getBinding().f2339c.setStartIconOnClickListener(new WidgetSearch$onViewBoundOrOnResume$3(this));
+        getBinding().f2337c.setStartIconOnClickListener(new WidgetSearch$onViewBoundOrOnResume$3(this));
     }
 
     public final void setTargetId(long j) {
diff --git a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
index 9aa3e501e6..83d30fa456 100644
--- a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
+++ b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
@@ -76,7 +76,7 @@ public final class WidgetSearchResults extends AppFragment {
             }
 
             public final Observable<Model> get() {
-                Observable q = StoreStream.Companion.getSearch().getStoreSearchQuery().getState().X(WidgetSearchResults$Model$Companion$get$1.INSTANCE).q();
+                Observable q = StoreStream.Companion.getSearch().getStoreSearchQuery().getState().Y(WidgetSearchResults$Model$Companion$get$1.INSTANCE).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return ObservableExtensionsKt.computationLatest(q);
             }
diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
index 0af64d7a7b..458bd2ba07 100644
--- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
@@ -238,7 +238,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             FilterType filterType = ((FilterSuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData()).getFilterType();
             int filterText = getFilterText(filterType);
             int answerText = getAnswerText(filterType);
-            this.binding.f2343c.setOnClickListener(new WidgetSearchSuggestionsAdapter$FilterViewHolder$onConfigure$1(this, filterType));
+            this.binding.f2341c.setOnClickListener(new WidgetSearchSuggestionsAdapter$FilterViewHolder$onConfigure$1(this, filterType));
             ImageView imageView = this.binding.e;
             m.checkNotNullExpressionValue(imageView, "binding.suggestionExampleIcon");
             Context context = imageView.getContext();
@@ -350,7 +350,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             TextView textView = this.binding.d;
             m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemHasText");
             textView.setText(hasSuggestion.getHasAnswerOption().getLocalizedInputText(this.searchStringProvider));
-            this.binding.f2341c.setImageResource(Companion.access$getIconRes(Companion, hasSuggestion.getHasAnswerOption()));
+            this.binding.f2339c.setImageResource(Companion.access$getIconRes(Companion, hasSuggestion.getHasAnswerOption()));
             this.binding.b.setOnClickListener(new WidgetSearchSuggestionsAdapter$HasViewHolder$onConfigure$1(this, hasSuggestion));
         }
     }
@@ -491,7 +491,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullParameter(mGRecyclerDataPayload, "data");
             super.onConfigure(i, (int) mGRecyclerDataPayload);
             ChannelSuggestion channelSuggestion = (ChannelSuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData();
-            TextView textView = this.binding.f2340c;
+            TextView textView = this.binding.f2338c;
             m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemChannelText");
             textView.setText(channelSuggestion.getChannelName());
             this.binding.b.setOnClickListener(new WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1(this, channelSuggestion));
@@ -531,7 +531,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullParameter(mGRecyclerDataPayload, "data");
             super.onConfigure(i, (int) mGRecyclerDataPayload);
             List<QueryNode> query = ((RecentQuerySuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData()).getQuery();
-            TextView textView = this.binding.f2342c;
+            TextView textView = this.binding.f2340c;
             m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemRecentQueryText");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
index dcb834e4c7..32e0b1bc8a 100644
--- a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
@@ -40,7 +40,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
         private final boolean canManageChannelsOfCategory;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2645id;
+        private final long f2643id;
         private final boolean isDraggable;
         private final String key;
         private final String name;
@@ -49,7 +49,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         public CategoryItem(String str, long j, int i, boolean z2, boolean z3, boolean z4) {
             this.name = str;
-            this.f2645id = j;
+            this.f2643id = j;
             this.pos = i;
             this.isDraggable = z2;
             this.canManageCategory = z3;
@@ -66,7 +66,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 str = categoryItem.name;
             }
             if ((i2 & 2) != 0) {
-                j = categoryItem.f2645id;
+                j = categoryItem.f2643id;
             }
             if ((i2 & 4) != 0) {
                 i = categoryItem.pos;
@@ -88,7 +88,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
         }
 
         public final long component2() {
-            return this.f2645id;
+            return this.f2643id;
         }
 
         public final boolean component4() {
@@ -115,7 +115,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 return false;
             }
             CategoryItem categoryItem = (CategoryItem) obj;
-            return m.areEqual(this.name, categoryItem.name) && this.f2645id == categoryItem.f2645id && this.pos == categoryItem.pos && this.isDraggable == categoryItem.isDraggable && this.canManageCategory == categoryItem.canManageCategory && this.canManageChannelsOfCategory == categoryItem.canManageChannelsOfCategory;
+            return m.areEqual(this.name, categoryItem.name) && this.f2643id == categoryItem.f2643id && this.pos == categoryItem.pos && this.isDraggable == categoryItem.isDraggable && this.canManageCategory == categoryItem.canManageCategory && this.canManageChannelsOfCategory == categoryItem.canManageChannelsOfCategory;
         }
 
         public final boolean getCanManageCategory() {
@@ -132,7 +132,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
         }
 
         public final long getId() {
-            return this.f2645id;
+            return this.f2643id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -156,7 +156,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         public int hashCode() {
             String str = this.name;
-            int a = (((b.a(this.f2645id) + ((str != null ? str.hashCode() : 0) * 31)) * 31) + this.pos) * 31;
+            int a = (((b.a(this.f2643id) + ((str != null ? str.hashCode() : 0) * 31)) * 31) + this.pos) * 31;
             boolean z2 = this.isDraggable;
             int i = 1;
             if (z2) {
@@ -189,7 +189,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
             StringBuilder O = a.O("CategoryItem(name=");
             O.append(this.name);
             O.append(", id=");
-            O.append(this.f2645id);
+            O.append(this.f2643id);
             O.append(", pos=");
             O.append(this.pos);
             O.append(", isDraggable=");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
index f439152fb2..8923e248f2 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
@@ -60,7 +60,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         private final Guild guild;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2646me;
+        private final MeUser f2644me;
 
         /* compiled from: WidgetServerDeleteDialog.kt */
         public static final class Companion {
@@ -89,7 +89,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
 
         public Model(MeUser meUser, Guild guild) {
             m.checkNotNullParameter(meUser, "me");
-            this.f2646me = meUser;
+            this.f2644me = meUser;
             this.guild = guild;
         }
 
@@ -98,7 +98,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         }
 
         public final MeUser getMe() {
-            return this.f2646me;
+            return this.f2644me;
         }
     }
 
@@ -142,10 +142,10 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsDeleteServerText");
         b.n(textView2, R.string.delete_server_body, new Object[]{model.getGuild().getName()}, null, 4);
         getBinding().b.setOnClickListener(new WidgetServerDeleteDialog$configureUI$1(this));
-        MaterialButton materialButton = getBinding().f2348c;
+        MaterialButton materialButton = getBinding().f2346c;
         m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsDeleteServerConfirm");
         materialButton.setEnabled(model.getGuild().isOwner(model.getMe().getId()));
-        getBinding().f2348c.setOnClickListener(new WidgetServerDeleteDialog$configureUI$2(this, model));
+        getBinding().f2346c.setOnClickListener(new WidgetServerDeleteDialog$configureUI$2(this, model));
     }
 
     private final WidgetServerDeleteDialogBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
index c822aac897..52fc0ae0c4 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
@@ -65,7 +65,7 @@ public final class WidgetServerNotifications extends AppFragment {
 
         private final Observable<List<NotificationsOverridesAdapter.Item>> getNotificationOverrides(long j) {
             StoreStream.Companion companion = StoreStream.Companion;
-            return Observable.i(companion.getUserGuildSettings().observeGuildSettings(j).E(WidgetServerNotifications$Companion$getNotificationOverrides$1.INSTANCE), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), GuildChannelsInfo.Companion.get(j), WidgetServerNotifications$Companion$getNotificationOverrides$2.INSTANCE);
+            return Observable.i(companion.getUserGuildSettings().observeGuildSettings(j).F(WidgetServerNotifications$Companion$getNotificationOverrides$1.INSTANCE), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), GuildChannelsInfo.Companion.get(j), WidgetServerNotifications$Companion$getNotificationOverrides$2.INSTANCE);
         }
 
         public final void launch(long j, Context context) {
@@ -328,17 +328,17 @@ public final class WidgetServerNotifications extends AppFragment {
         super.onViewBound(view);
         this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g}));
         this.overrideAdapter = new NotificationsOverridesAdapter(WidgetServerNotifications$onViewBound$1.INSTANCE);
-        RecyclerView recyclerView = getBinding().f2350c;
+        RecyclerView recyclerView = getBinding().f2348c;
         m.checkNotNullExpressionValue(recyclerView, "binding.guildNotificationsOverrideList");
         recyclerView.setNestedScrollingEnabled(false);
-        RecyclerView recyclerView2 = getBinding().f2350c;
+        RecyclerView recyclerView2 = getBinding().f2348c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.guildNotificationsOverrideList");
         NotificationsOverridesAdapter notificationsOverridesAdapter = this.overrideAdapter;
         if (notificationsOverridesAdapter == null) {
             m.throwUninitializedPropertyAccessException("overrideAdapter");
         }
         recyclerView2.setAdapter(notificationsOverridesAdapter);
-        createSwipeableItemTouchHelper().attachToRecyclerView(getBinding().f2350c);
+        createSwipeableItemTouchHelper().attachToRecyclerView(getBinding().f2348c);
         long longExtra = getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_GUILD_ID", -1);
         w1 w1Var = getBinding().b;
         m.checkNotNullExpressionValue(w1Var, "binding.addOverride");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
index 3aa5e81758..5f71a12c61 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
@@ -35,7 +35,7 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerNotificationsOverrideSelector$binding$2.INSTANCE, null, 2, null);
     private SettingsChannelListAdapter channelsAdapter;
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.k0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
 
     /* compiled from: WidgetServerNotificationsOverrideSelector.kt */
     public static final class Companion {
@@ -95,7 +95,7 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         setActionBarTitle(R.string.notification_overrides);
         setActionBarSubtitle(R.string.select_channel_or_category);
-        TextInputLayout textInputLayout = getBinding().f2349c;
+        TextInputLayout textInputLayout = getBinding().f2347c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildNotificationsChannelSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetServerNotificationsOverrideSelector$onViewBound$1(this));
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
index cd4c5ee5fa..f3eeb44d59 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
@@ -272,20 +272,20 @@ public final class WidgetServerSettings extends AppFragment {
     private final void configureToolbar(Model model) {
         Guild guild = model.getGuild();
         String forGuild$default = IconUtils.getForGuild$default(guild, null, true, null, 10, null);
-        TextView textView = getBinding().f2362z;
+        TextView textView = getBinding().f2360z;
         m.checkNotNullExpressionValue(textView, "binding.serverSettingsServerName");
         textView.setText(guild.getName());
-        SimpleDraweeView simpleDraweeView = getBinding().f2360x;
+        SimpleDraweeView simpleDraweeView = getBinding().f2358x;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.serverSettingsServerIcon");
         IconUtils.setIcon$default(simpleDraweeView, forGuild$default, (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
-        TextView textView2 = getBinding().f2361y;
+        TextView textView2 = getBinding().f2359y;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsServerIconText");
         int i = 0;
         if (!(forGuild$default == null)) {
             i = 8;
         }
         textView2.setVisibility(i);
-        TextView textView3 = getBinding().f2361y;
+        TextView textView3 = getBinding().f2359y;
         m.checkNotNullExpressionValue(textView3, "binding.serverSettingsServerIconText");
         textView3.setText(guild.getShortName());
         AppFragment.setActionBarOptionsMenu$default(this, model.getManageGuildContext().isOwnerWithRequiredMFALevel() ? R.menu.menu_server_settings : R.menu.menu_empty, new WidgetServerSettings$configureToolbar$1(this, guild), null, 4, null);
@@ -335,21 +335,21 @@ public final class WidgetServerSettings extends AppFragment {
         LinearLayout linearLayout = getBinding().s;
         m.checkNotNullExpressionValue(linearLayout, "binding.serverSettingsSectionCommunity");
         linearLayout.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8);
-        TextView textView8 = getBinding().f2357c;
+        TextView textView8 = getBinding().f2355c;
         m.checkNotNullExpressionValue(textView8, "binding.serverSettingsCommunityOverviewOption");
         Set<GuildFeature> features = model.getGuild().getFeatures();
         GuildFeature guildFeature = GuildFeature.COMMUNITY;
         textView8.setVisibility(features.contains(guildFeature) ? 0 : 8);
-        getBinding().f2357c.setOnClickListener(new WidgetServerSettings$configureUI$8(model));
+        getBinding().f2355c.setOnClickListener(new WidgetServerSettings$configureUI$8(model));
         TextView textView9 = getBinding().e;
         m.checkNotNullExpressionValue(textView9, "binding.serverSettingsEnableCommunityOption");
         textView9.setVisibility(model.getGuild().getFeatures().contains(guildFeature) ^ true ? 0 : 8);
         getBinding().e.setOnClickListener(new WidgetServerSettings$configureUI$9(model));
         getBinding().j.setOnClickListener(new WidgetServerSettings$configureUI$10(model));
-        TextView textView10 = getBinding().f2358r;
+        TextView textView10 = getBinding().f2356r;
         m.checkNotNullExpressionValue(textView10, "binding.serverSettingsRolesOption");
         textView10.setVisibility(manageGuildContext.getCanManageRoles() ? 0 : 8);
-        getBinding().f2358r.setOnClickListener(new WidgetServerSettings$configureUI$11(model));
+        getBinding().f2356r.setOnClickListener(new WidgetServerSettings$configureUI$11(model));
         TextView textView11 = getBinding().i;
         m.checkNotNullExpressionValue(textView11, "binding.serverSettingsInstantInvitesOption");
         textView11.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java
index 85ab804c70..b27d60644d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java
@@ -92,8 +92,8 @@ public final class WidgetServerSettingsBans$Model$Companion$getBanItems$1<T, R>
         }
 
         public final Observable<? extends List<WidgetServerSettingsBans.Model.BanItem>> call(String str) {
-            Observable<R> E = Observable.z(this.$bannedUserMap.values()).w(new AnonymousClass1(str)).E(AnonymousClass2.INSTANCE);
-            return Observable.g0(new r(E.i, new o2(AnonymousClass3.INSTANCE, 10)));
+            Observable<R> F = Observable.A(this.$bannedUserMap.values()).x(new AnonymousClass1(str)).F(AnonymousClass2.INSTANCE);
+            return Observable.h0(new r(F.i, new o2(AnonymousClass3.INSTANCE, 10)));
         }
     }
 
@@ -113,6 +113,6 @@ public final class WidgetServerSettingsBans$Model$Companion$getBanItems$1<T, R>
     }
 
     public final Observable<? extends WidgetServerSettingsBans.Model> call(Map<Long, ? extends ModelBan> map) {
-        return map == null ? StoreStream.Companion.getGuilds().observeGuild(this.$guildId).E(AnonymousClass1.INSTANCE) : Observable.i(StoreStream.Companion.getGuilds().observeGuild(this.$guildId), new j(Integer.valueOf(map.size())), this.$filterPublisher.X(new AnonymousClass2(map)), AnonymousClass3.INSTANCE);
+        return map == null ? StoreStream.Companion.getGuilds().observeGuild(this.$guildId).F(AnonymousClass1.INSTANCE) : Observable.i(StoreStream.Companion.getGuilds().observeGuild(this.$guildId), new j(Integer.valueOf(map.size())), this.$filterPublisher.Y(new AnonymousClass2(map)), AnonymousClass3.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
index 0242837666..fa608012eb 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
@@ -63,7 +63,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
     private Adapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsBans$binding$2.INSTANCE, null, 2, null);
     private AlertDialog dialog;
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.k0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
     private long guildId;
     private final LoggingConfig loggingConfig = new LoggingConfig(false, null, WidgetServerSettingsBans$loggingConfig$1.INSTANCE, 3);
 
@@ -112,7 +112,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
                 ModelBan ban = banItem.getBan();
                 CoreUser coreUser = null;
                 textView.setText((ban == null || (user2 = ban.getUser()) == null) ? null : user2.r());
-                SimpleDraweeView simpleDraweeView = this.binding.f2355c;
+                SimpleDraweeView simpleDraweeView = this.binding.f2353c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.banListItemAvatar");
                 ModelBan ban2 = banItem.getBan();
                 if (!(ban2 == null || (user = ban2.getUser()) == null)) {
@@ -287,9 +287,9 @@ public final class WidgetServerSettingsBans extends AppFragment {
             }
 
             private final Observable<Model> getBanItems(long j, Observable<String> observable) {
-                Observable<R> X = StoreStream.Companion.getBans().observeBans(j).X(new WidgetServerSettingsBans$Model$Companion$getBanItems$1(j, observable));
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable<R> Y = StoreStream.Companion.getBans().observeBans(j).Y(new WidgetServerSettingsBans$Model$Companion$getBanItems$1(j, observable));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -312,9 +312,9 @@ public final class WidgetServerSettingsBans extends AppFragment {
 
             public final Observable<Model> get(long j, Observable<String> observable) {
                 m.checkNotNullParameter(observable, "filterPublisher");
-                Observable<R> X = getCanManageBans(j).X(new WidgetServerSettingsBans$Model$Companion$get$1(j, observable));
-                m.checkNotNullExpressionValue(X, "getCanManageBans(guildId….just(null)\n            }");
-                return X;
+                Observable<R> Y = getCanManageBans(j).Y(new WidgetServerSettingsBans$Model$Companion$get$1(j, observable));
+                m.checkNotNullExpressionValue(Y, "getCanManageBans(guildId….just(null)\n            }");
+                return Y;
             }
         }
 
@@ -547,10 +547,10 @@ public final class WidgetServerSettingsBans extends AppFragment {
     public void onResume() {
         super.onResume();
         BehaviorSubject<String> behaviorSubject = this.filterPublisher;
-        TextInputLayout textInputLayout = getBinding().f2356c;
+        TextInputLayout textInputLayout = getBinding().f2354c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.serverSettingsBansSearch");
         behaviorSubject.onNext(ViewExtensions.getTextOrEmpty(textInputLayout));
-        TextInputLayout textInputLayout2 = getBinding().f2356c;
+        TextInputLayout textInputLayout2 = getBinding().f2354c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.serverSettingsBansSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetServerSettingsBans$onResume$1(this));
         Model.Companion companion = Model.Companion;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java
index 5688de9c03..223ff33f72 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java
@@ -41,6 +41,6 @@ public final class WidgetServerSettingsChannels$configureFabVisibility$1 impleme
         FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
         m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
         companion.show(id2, childFragmentManager, new AnonymousClass1(this));
-        WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f2363c.hide();
+        WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f2361c.hide();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java
index eeddbbf473..6f06a80300 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java
@@ -20,9 +20,9 @@ public final class WidgetServerSettingsChannels$configureFabVisibility$setFabVis
     /* renamed from: invoke */
     public final void mo17invoke() {
         if (!this.$model.isSorting()) {
-            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f2363c.show();
+            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f2361c.show();
         } else {
-            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f2363c.hide();
+            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f2361c.hide();
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
index 45f93e2a69..24ccd0b86e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
@@ -45,13 +45,13 @@ public final class WidgetServerSettingsChannels$configureUI$1<T1, T2> implements
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_sort_channel /* 2131364211 */:
+            case R.id.menu_sort_channel /* 2131364206 */:
                 WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion;
                 FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
                 companion.show(childFragmentManager, new AnonymousClass1(this));
                 return;
-            case R.id.menu_sort_done /* 2131364212 */:
+            case R.id.menu_sort_done /* 2131364207 */:
                 WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1);
                 return;
             default:
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
index afd896e98f..aedbb22c79 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
@@ -47,7 +47,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     public static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private SettingsChannelListAdapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsChannels$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<Integer> channelSortTypeSubject = BehaviorSubject.k0(-1);
+    private final BehaviorSubject<Integer> channelSortTypeSubject = BehaviorSubject.l0(-1);
     private final LoggingConfig loggingConfig = new LoggingConfig(false, null, WidgetServerSettingsChannels$loggingConfig$1.INSTANCE, 3);
 
     /* compiled from: WidgetServerSettingsChannels.kt */
@@ -262,7 +262,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     private final void configureFabVisibility(Model model) {
         WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1 widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1 = new WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1(this, model);
         widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.mo17invoke();
-        getBinding().f2363c.setOnClickListener(new WidgetServerSettingsChannels$configureFabVisibility$1(this, model, widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1));
+        getBinding().f2361c.setOnClickListener(new WidgetServerSettingsChannels$configureFabVisibility$1(this, model, widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1));
     }
 
     private final void configureUI(Model model) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
index ce7689a925..c4a540efd7 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
@@ -105,7 +105,7 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(Integer.valueOf((int) R.id.fab_menu_add_category), createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(Integer.valueOf((int) R.id.fab_menu_add_voice), createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(Integer.valueOf((int) R.id.fab_menu_add_text), createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(Integer.valueOf((int) R.id.fab_menu_main), createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE))));
-        TableLayout tableLayout = getBinding().f2365c;
+        TableLayout tableLayout = getBinding().f2363c;
         m.checkNotNullExpressionValue(tableLayout, "binding.fabMenuTable");
         FloatingActionButton floatingActionButton = getBinding().b;
         m.checkNotNullExpressionValue(floatingActionButton, "binding.fabMenuMainFab");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
index 55c6e3228f..acafbc86ab 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
@@ -47,7 +47,7 @@ public final class WidgetServerSettingsChannelsSortActions extends AppBottomShee
     private final void configureUI() {
         getBinding().b.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$1(this));
         getBinding().d.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$2(this));
-        getBinding().f2364c.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$3(this));
+        getBinding().f2362c.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$3(this));
     }
 
     private final WidgetServerSettingsChannelsSortActionsBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
index e0d392ee7e..710c46df6c 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
@@ -51,9 +51,9 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private static final String INTENT_EXTRA_INTEGRATION_ID = "INTENT_EXTRA_INTEGRATION_ID";
-    private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363059;
-    private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363062;
-    private static final int STATE_KEY_GRACE_PERIOD = 2131363063;
+    private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363054;
+    private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363057;
+    private static final int STATE_KEY_GRACE_PERIOD = 2131363058;
     private static final int[] gracePeriodDays = {1, 3, 7, 14, 30};
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditIntegration$binding$2.INSTANCE, null, 2, null);
     private RadioManager expiryBehaviorRadioManager;
@@ -301,7 +301,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
             m.throwUninitializedPropertyAccessException("gracePeriodRadioManager");
         }
         radioManager2.a(getGracePeriodRadios().get(intValue2));
-        LinearLayout linearLayout = getBinding().f2370c;
+        LinearLayout linearLayout = getBinding().f2368c;
         m.checkNotNullExpressionValue(linearLayout, "binding.editIntegrationCustomEmotesContainer");
         if (!areEqual) {
             i = 8;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
index 4e75b4850a..c279f8441f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
@@ -375,18 +375,18 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
             getBinding().d.setOnClickListener(null);
         }
         if (model.getCanBan()) {
-            TextView textView4 = getBinding().f2371c;
+            TextView textView4 = getBinding().f2369c;
             m.checkNotNullExpressionValue(textView4, "binding.editMemberBanButton");
             c.a.k.b.n(textView4, R.string.ban_user_title, new Object[]{nickOrUsername}, null, 4);
-            TextView textView5 = getBinding().f2371c;
+            TextView textView5 = getBinding().f2369c;
             m.checkNotNullExpressionValue(textView5, "binding.editMemberBanButton");
             textView5.setVisibility(0);
-            getBinding().f2371c.setOnClickListener(new WidgetServerSettingsEditMember$configureUI$3(this, nickOrUsername, model));
+            getBinding().f2369c.setOnClickListener(new WidgetServerSettingsEditMember$configureUI$3(this, nickOrUsername, model));
         } else {
-            TextView textView6 = getBinding().f2371c;
+            TextView textView6 = getBinding().f2369c;
             m.checkNotNullExpressionValue(textView6, "binding.editMemberBanButton");
             textView6.setVisibility(8);
-            getBinding().f2371c.setOnClickListener(null);
+            getBinding().f2369c.setOnClickListener(null);
         }
         if (model.getCanTransferOwnership()) {
             TextView textView7 = getBinding().i;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
index 86da2c629f..2e94368c0e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
@@ -128,7 +128,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             }
 
             public final Observable<Model> get(long j, long j2) {
-                Observable<Model> q = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).X(new WidgetServerSettingsEditRole$Model$Companion$get$1(j, j2)).q();
+                Observable<Model> q = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Y(new WidgetServerSettingsEditRole$Model$Companion$get$1(j, j2)).q();
                 m.checkNotNullExpressionValue(q, "getUsers()\n            .…  .distinctUntilChanged()");
                 return q;
             }
@@ -387,8 +387,8 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         setupPermissionsSettings(model);
         setupColorSetting(model);
         setRoleIcon(model);
-        this.state.configureSaveActionView(getBinding().f2219c);
-        getBinding().f2219c.setOnClickListener(new WidgetServerSettingsEditRole$configureUI$1(this, model));
+        this.state.configureSaveActionView(getBinding().f2218c);
+        getBinding().f2218c.setOnClickListener(new WidgetServerSettingsEditRole$configureUI$1(this, model));
         if (!model.getUseNewThreadPermissions()) {
             CheckedSetting.i(getBinding().N, getString(R.string.role_permissions_send_messages_description), false, 2);
             getBinding().O.setText(getString(R.string.interim_send_messages_in_threads));
@@ -568,138 +568,138 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     private final void setupPermissionsSettings(Model model) {
         long j;
         int i = 0;
-        for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().g, getBinding().h, getBinding().i, getBinding().j, getBinding().m, getBinding().f2220r, getBinding().u, getBinding().v, getBinding().f2223y, getBinding().C, getBinding().f2224z, getBinding().f2221w, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().H, getBinding().I, getBinding().N, getBinding().O, getBinding().o, getBinding().n, getBinding().P, getBinding().Q, getBinding().R, getBinding().S, getBinding().f, getBinding().T, getBinding().V, getBinding().Z, getBinding().f2218b0, getBinding().Y, getBinding().W, getBinding().X, getBinding().f2217a0, getBinding().G, getBinding().U, getBinding().J, getBinding().f2222x})) {
+        for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().g, getBinding().h, getBinding().i, getBinding().j, getBinding().m, getBinding().f2219r, getBinding().u, getBinding().v, getBinding().f2222y, getBinding().C, getBinding().f2223z, getBinding().f2220w, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().H, getBinding().I, getBinding().N, getBinding().O, getBinding().o, getBinding().n, getBinding().P, getBinding().Q, getBinding().R, getBinding().S, getBinding().f, getBinding().T, getBinding().V, getBinding().Z, getBinding().f2217b0, getBinding().Y, getBinding().W, getBinding().X, getBinding().f2216a0, getBinding().G, getBinding().U, getBinding().J, getBinding().f2221x})) {
             m.checkNotNullExpressionValue(checkedSetting, "setting");
             switch (checkedSetting.getId()) {
-                case R.id.role_settings_add_reactions /* 2131364777 */:
+                case R.id.role_settings_add_reactions /* 2131364769 */:
                     j = 64;
                     break;
-                case R.id.role_settings_administrator /* 2131364778 */:
+                case R.id.role_settings_administrator /* 2131364770 */:
                     j = 8;
                     break;
-                case R.id.role_settings_attach_files /* 2131364779 */:
+                case R.id.role_settings_attach_files /* 2131364771 */:
                     j = Permission.ATTACH_FILES;
                     break;
-                case R.id.role_settings_ban_members /* 2131364780 */:
+                case R.id.role_settings_ban_members /* 2131364772 */:
                     j = 4;
                     break;
-                case R.id.role_settings_change_nickname /* 2131364781 */:
+                case R.id.role_settings_change_nickname /* 2131364773 */:
                     j = Permission.CHANGE_NICKNAME;
                     break;
-                case R.id.role_settings_color_disabled_overlay /* 2131364782 */:
-                case R.id.role_settings_color_selector_container /* 2131364783 */:
-                case R.id.role_settings_current_color_display /* 2131364787 */:
-                case R.id.role_settings_edit_name_disabled_overlay /* 2131364788 */:
-                case R.id.role_settings_hoist_checkedsetting /* 2131364790 */:
-                case R.id.role_settings_icon_container /* 2131364791 */:
-                case R.id.role_settings_mentionable_checkedsetting /* 2131364803 */:
-                case R.id.role_settings_overview_scroll /* 2131364804 */:
-                case R.id.role_settings_role_icon /* 2131364809 */:
-                case R.id.role_settings_role_icon_divider /* 2131364810 */:
-                case R.id.role_settings_role_icon_header /* 2131364811 */:
+                case R.id.role_settings_color_disabled_overlay /* 2131364774 */:
+                case R.id.role_settings_color_selector_container /* 2131364775 */:
+                case R.id.role_settings_current_color_display /* 2131364779 */:
+                case R.id.role_settings_edit_name_disabled_overlay /* 2131364780 */:
+                case R.id.role_settings_hoist_checkedsetting /* 2131364782 */:
+                case R.id.role_settings_icon_container /* 2131364783 */:
+                case R.id.role_settings_mentionable_checkedsetting /* 2131364795 */:
+                case R.id.role_settings_overview_scroll /* 2131364796 */:
+                case R.id.role_settings_role_icon /* 2131364801 */:
+                case R.id.role_settings_role_icon_divider /* 2131364802 */:
+                case R.id.role_settings_role_icon_header /* 2131364803 */:
                 default:
                     j = 0;
                     break;
-                case R.id.role_settings_create_instant_invite /* 2131364784 */:
+                case R.id.role_settings_create_instant_invite /* 2131364776 */:
                     j = 1;
                     break;
-                case R.id.role_settings_create_private_threads /* 2131364785 */:
+                case R.id.role_settings_create_private_threads /* 2131364777 */:
                     j = Permission.CREATE_PRIVATE_THREADS;
                     break;
-                case R.id.role_settings_create_public_threads /* 2131364786 */:
+                case R.id.role_settings_create_public_threads /* 2131364778 */:
                     j = Permission.CREATE_PUBLIC_THREADS;
                     break;
-                case R.id.role_settings_embed_links /* 2131364789 */:
+                case R.id.role_settings_embed_links /* 2131364781 */:
                     j = Permission.EMBED_LINKS;
                     break;
-                case R.id.role_settings_kick_members /* 2131364792 */:
+                case R.id.role_settings_kick_members /* 2131364784 */:
                     j = 2;
                     break;
-                case R.id.role_settings_manage_channels /* 2131364793 */:
+                case R.id.role_settings_manage_channels /* 2131364785 */:
                     j = 16;
                     break;
-                case R.id.role_settings_manage_emojis_and_stickers /* 2131364794 */:
+                case R.id.role_settings_manage_emojis_and_stickers /* 2131364786 */:
                     j = Permission.MANAGE_EMOJIS_AND_STICKERS;
                     break;
-                case R.id.role_settings_manage_events /* 2131364795 */:
+                case R.id.role_settings_manage_events /* 2131364787 */:
                     j = Permission.MANAGE_EVENTS;
                     break;
-                case R.id.role_settings_manage_messages /* 2131364796 */:
+                case R.id.role_settings_manage_messages /* 2131364788 */:
                     j = Permission.MANAGE_MESSAGES;
                     break;
-                case R.id.role_settings_manage_nicknames /* 2131364797 */:
+                case R.id.role_settings_manage_nicknames /* 2131364789 */:
                     j = Permission.MANAGE_NICKNAMES;
                     break;
-                case R.id.role_settings_manage_roles /* 2131364798 */:
+                case R.id.role_settings_manage_roles /* 2131364790 */:
                     j = Permission.MANAGE_ROLES;
                     break;
-                case R.id.role_settings_manage_server /* 2131364799 */:
+                case R.id.role_settings_manage_server /* 2131364791 */:
                     j = 32;
                     break;
-                case R.id.role_settings_manage_threads /* 2131364800 */:
+                case R.id.role_settings_manage_threads /* 2131364792 */:
                     j = Permission.MANAGE_THREADS;
                     break;
-                case R.id.role_settings_manage_webhooks /* 2131364801 */:
+                case R.id.role_settings_manage_webhooks /* 2131364793 */:
                     j = Permission.MANAGE_WEBHOOKS;
                     break;
-                case R.id.role_settings_mention_everyone /* 2131364802 */:
+                case R.id.role_settings_mention_everyone /* 2131364794 */:
                     j = Permission.MENTION_EVERYONE;
                     break;
-                case R.id.role_settings_priority_speaker /* 2131364805 */:
+                case R.id.role_settings_priority_speaker /* 2131364797 */:
                     j = 256;
                     break;
-                case R.id.role_settings_read_message_history /* 2131364806 */:
+                case R.id.role_settings_read_message_history /* 2131364798 */:
                     j = Permission.READ_MESSAGE_HISTORY;
                     break;
-                case R.id.role_settings_read_messages /* 2131364807 */:
+                case R.id.role_settings_read_messages /* 2131364799 */:
                     j = Permission.VIEW_CHANNEL;
                     break;
-                case R.id.role_settings_request_to_speak /* 2131364808 */:
+                case R.id.role_settings_request_to_speak /* 2131364800 */:
                     j = Permission.REQUEST_TO_SPEAK;
                     break;
-                case R.id.role_settings_send_messages /* 2131364812 */:
+                case R.id.role_settings_send_messages /* 2131364804 */:
                     j = Permission.SEND_MESSAGES;
                     break;
-                case R.id.role_settings_send_messages_in_threads /* 2131364813 */:
+                case R.id.role_settings_send_messages_in_threads /* 2131364805 */:
                     j = Permission.SEND_MESSAGES_IN_THREADS;
                     break;
-                case R.id.role_settings_send_tts_messages /* 2131364814 */:
+                case R.id.role_settings_send_tts_messages /* 2131364806 */:
                     j = Permission.SEND_TTS_MESSAGES;
                     break;
-                case R.id.role_settings_use_application_commands /* 2131364815 */:
+                case R.id.role_settings_use_application_commands /* 2131364807 */:
                     j = Permission.USE_APPLICATION_COMMANDS;
                     break;
-                case R.id.role_settings_use_external_emojis /* 2131364816 */:
+                case R.id.role_settings_use_external_emojis /* 2131364808 */:
                     j = Permission.USE_EXTERNAL_EMOJIS;
                     break;
-                case R.id.role_settings_use_external_stickers /* 2131364817 */:
+                case R.id.role_settings_use_external_stickers /* 2131364809 */:
                     j = Permission.USE_EXTERNAL_STICKERS;
                     break;
-                case R.id.role_settings_view_audit_log /* 2131364818 */:
+                case R.id.role_settings_view_audit_log /* 2131364810 */:
                     j = 128;
                     break;
-                case R.id.role_settings_view_guild_analytics /* 2131364819 */:
+                case R.id.role_settings_view_guild_analytics /* 2131364811 */:
                     j = Permission.VIEW_GUILD_ANALYTICS;
                     break;
-                case R.id.role_settings_voice_connect /* 2131364820 */:
+                case R.id.role_settings_voice_connect /* 2131364812 */:
                     j = Permission.CONNECT;
                     break;
-                case R.id.role_settings_voice_deafen_members /* 2131364821 */:
+                case R.id.role_settings_voice_deafen_members /* 2131364813 */:
                     j = Permission.DEAFEN_MEMBERS;
                     break;
-                case R.id.role_settings_voice_move_members /* 2131364822 */:
+                case R.id.role_settings_voice_move_members /* 2131364814 */:
                     j = Permission.MOVE_MEMBERS;
                     break;
-                case R.id.role_settings_voice_mute_members /* 2131364823 */:
+                case R.id.role_settings_voice_mute_members /* 2131364815 */:
                     j = Permission.MUTE_MEMBERS;
                     break;
-                case R.id.role_settings_voice_speak /* 2131364824 */:
+                case R.id.role_settings_voice_speak /* 2131364816 */:
                     j = Permission.SPEAK;
                     break;
-                case R.id.role_settings_voice_use_voice_activity /* 2131364825 */:
+                case R.id.role_settings_voice_use_voice_activity /* 2131364817 */:
                     j = Permission.USE_VAD;
                     break;
-                case R.id.role_settings_voice_video /* 2131364826 */:
+                case R.id.role_settings_voice_video /* 2131364818 */:
                     j = 512;
                     break;
             }
@@ -735,7 +735,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         TextView textView = getBinding().e;
         m.checkNotNullExpressionValue(textView, "binding.eventPermissionsTitle");
         textView.setVisibility(model.getHasEventsFeature() ? 0 : 8);
-        CheckedSetting checkedSetting2 = getBinding().f2222x;
+        CheckedSetting checkedSetting2 = getBinding().f2221x;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.roleSettingsManageEvents");
         if (!model.getHasEventsFeature()) {
             i = 8;
@@ -770,11 +770,11 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         setRetainInstance(true);
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f2219c;
+        FloatingActionButton floatingActionButton = getBinding().f2218c;
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editRoleName");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
-        FloatingActionButton floatingActionButton2 = getBinding().f2219c;
+        FloatingActionButton floatingActionButton2 = getBinding().f2218c;
         m.checkNotNullExpressionValue(floatingActionButton2, "binding.editRoleSave");
         floatingActionButton2.setVisibility(8);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
index 23bec07f02..26a09faa58 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
@@ -135,7 +135,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             public void onConfigure(int i, Item item) {
                 m.checkNotNullParameter(item, "data");
-                TextView textView = this.binding.f2374c;
+                TextView textView = this.binding.f2372c;
                 m.checkNotNullExpressionValue(textView, "binding.widgetServerSett…gsEmojisUploadDescription");
                 textView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.guild_settings_emoji_upload_to_server_message, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4));
                 this.binding.b.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder$onConfigure$1(this));
@@ -215,7 +215,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 SimpleDraweeView simpleDraweeView4 = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView4, "binding.serverSettingsEmojisAvatar");
                 simpleDraweeView4.setImageAlpha(emojiItem.getEmoji().getAvailable() ? 255 : 100);
-                this.binding.f2375c.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1(this, item));
+                this.binding.f2373c.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1(this, item));
             }
         }
 
@@ -717,15 +717,15 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 StoreEmojiGuild guildEmojis = companion.getGuildEmojis();
                 StoreGuilds guilds = companion.getGuilds();
-                Observable t = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{guildEmojis, guilds}, false, null, null, new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1(guild, guildEmojis, guilds), 14, null).t(new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$2(guildEmojis, guild.getId()));
-                m.checkNotNullExpressionValue(t, "ObservationDeckProvider.…etchGuildEmoji(guildId) }");
-                return ObservableExtensionsKt.computationBuffered(t);
+                Observable u = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{guildEmojis, guilds}, false, null, null, new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1(guild, guildEmojis, guilds), 14, null).u(new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$2(guildEmojis, guild.getId()));
+                m.checkNotNullExpressionValue(u, "ObservationDeckProvider.…etchGuildEmoji(guildId) }");
+                return ObservableExtensionsKt.computationBuffered(u);
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = canManageEmojisAndStickers(j).X(WidgetServerSettingsEmojis$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(X, "canManageEmojisAndSticke…          }\n            }");
-                return X;
+                Observable<R> Y = canManageEmojisAndStickers(j).Y(WidgetServerSettingsEmojis$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "canManageEmojisAndSticke…          }\n            }");
+                return Y;
             }
         }
 
@@ -931,7 +931,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 z2 = true;
             }
             if (!z2) {
-                AppViewFlipper appViewFlipper = getBinding().f2372c;
+                AppViewFlipper appViewFlipper = getBinding().f2370c;
                 m.checkNotNullExpressionValue(appViewFlipper, "binding.widgetServerSettingsEmojisViewFlipper");
                 appViewFlipper.setDisplayedChild(1);
                 this.uploadEmojiAction = new WidgetServerSettingsEmojis$configureUI$1(this, model);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
index c1e4c52f54..6d1db09841 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
@@ -163,12 +163,12 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), this.emojiName));
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews2 = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f2373c;
+        FloatingActionButton floatingActionButton = getBinding().f2371c;
         TextInputLayout textInputLayout3 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.serverSettingsEmojisEditAlias");
         statefulViews2.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout3);
-        this.state.configureSaveActionView(getBinding().f2373c);
-        getBinding().f2373c.setOnClickListener(new WidgetServerSettingsEmojisEdit$onViewBound$1(this));
+        this.state.configureSaveActionView(getBinding().f2371c);
+        getBinding().f2371c.setOnClickListener(new WidgetServerSettingsEmojisEdit$onViewBound$1(this));
         configureToolbar(this.emojiName);
         configureMenu();
         if (!isRecreated()) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
index 5094669244..34b0f51640 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
@@ -92,7 +92,7 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh
             m.checkNotNullExpressionValue(textView2, "binding.inviteActionsTitle");
             textView2.setText(string);
         }
-        getBinding().f2379c.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$1(this, string));
+        getBinding().f2377c.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$1(this, string));
         getBinding().b.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$2(this, createLinkFromCode));
         getBinding().d.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$3(this, createLinkFromCode));
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
index 78d4914818..9086899c51 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
@@ -308,7 +308,7 @@ public final class WidgetServerSettingsIntegrations extends AppFragment {
         if (model != null) {
             setActionBarTitle(R.string.integrations);
             setActionBarSubtitle(model.getGuildName());
-            AppViewFlipper appViewFlipper = getBinding().f2383c;
+            AppViewFlipper appViewFlipper = getBinding().f2381c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.integrationsViewFlipper");
             appViewFlipper.setDisplayedChild(model.getIntegrations().isEmpty() ? 1 : 0);
             Adapter adapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
index b361607b36..896aba97a4 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
@@ -126,7 +126,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
         ProgressBar progressBar = this.binding.i;
         m.checkNotNullExpressionValue(progressBar, "binding.integrationSyncingProgressBar");
         progressBar.setVisibility(z2 ? 0 : 8);
-        View view = this.binding.f2382c;
+        View view = this.binding.f2380c;
         m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay");
         if (!z2) {
             i = 8;
@@ -157,7 +157,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
         User user = integrationItem.getIntegration().getUser();
         textView2.setText(user != null ? user.r() : null);
         this.binding.d.setImageResource(areEqual ? R.drawable.asset_account_sync_twitch : R.drawable.asset_account_sync_youtube);
-        View view = this.binding.f2382c;
+        View view = this.binding.f2380c;
         m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay");
         int i2 = 0;
         if (!(isSyncing || !isEnabled)) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
index 20b7d71a74..4b374117cf 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
@@ -202,7 +202,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
     private final List<CheckedSetting> getExplicitContentViews() {
         CheckedSetting checkedSetting = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting, "binding.serverSettingsModerationExplicit1");
-        CheckedSetting checkedSetting2 = getBinding().f2386c;
+        CheckedSetting checkedSetting2 = getBinding().f2384c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.serverSettingsModerationExplicit2");
         CheckedSetting checkedSetting3 = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.serverSettingsModerationExplicit3");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java
index fba8076cf0..c70b36b5c4 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java
@@ -36,9 +36,9 @@ public final class WidgetServerSettingsOverview$configureUI$6 implements View.On
         public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
         public final Observable<? extends com.discord.models.guild.Guild> call(Guild guild) {
-            Observable<R> E = StoreStream.Companion.getGuilds().observeGuild(guild.p()).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            return E;
+            Observable<R> F = StoreStream.Companion.getGuilds().observeGuild(guild.p()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            return F;
         }
     }
 
@@ -107,11 +107,11 @@ public final class WidgetServerSettingsOverview$configureUI$6 implements View.On
         Long valueOf2 = channel2 != null ? Long.valueOf(channel2.h()) : null;
         Integer num2 = (Integer) WidgetServerSettingsOverview.access$getState$p(this.this$0).get(90001, Integer.valueOf(this.$this_configureUI.getGuild().getDefaultMessageNotifications()));
         StatefulViews access$getState$p6 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
-        SimpleDraweeView simpleDraweeView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f2388c.d;
+        SimpleDraweeView simpleDraweeView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f2386c.d;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.header.serverSettingsOverviewIcon");
         String str = (String) access$getState$p6.get(simpleDraweeView.getId(), IconUtils.getForGuild$default(this.$this_configureUI.getGuild(), null, false, null, 14, null));
         StatefulViews access$getState$p7 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f2388c.f89c;
+        TextInputLayout textInputLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f2386c.f89c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName");
         String str2 = (String) access$getState$p7.get(textInputLayout.getId(), this.$this_configureUI.getGuild().getName());
         GuildVerificationLevel verificationLevel = this.$this_configureUI.getGuild().getVerificationLevel();
@@ -122,8 +122,8 @@ public final class WidgetServerSettingsOverview$configureUI$6 implements View.On
         StatefulViews access$getState$p9 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
         SimpleDraweeView simpleDraweeView3 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.d;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.uploadBanner.uploadBanner");
-        Observable X = ObservableExtensionsKt.restSubscribeOn$default(apiSerializeNulls.updateGuild(id4, new RestAPIParams.UpdateGuild(valueOf, num, valueOf2, num2, str, str2, verificationLevel, explicitContentFilter, (String) access$getState$p8.get(simpleDraweeView2.getId(), this.$this_configureUI.getGuild().getSplash()), (String) access$getState$p9.get(simpleDraweeView3.getId(), this.$this_configureUI.getGuild().getBanner()), Integer.valueOf(i), u.toList(this.$this_configureUI.getGuild().getFeatures()), this.$this_configureUI.getGuild().getRulesChannelId(), this.$this_configureUI.getGuild().getPublicUpdatesChannelId(), this.$this_configureUI.getGuild().getPreferredLocale())), false, 1, null).X(AnonymousClass1.INSTANCE).X(AnonymousClass2.INSTANCE);
-        m.checkNotNullExpressionValue(X, "RestAPI\n          .apiSe…atedGuild.id)\n          }");
-        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(X, 0, false, 3, null), this.this$0, null, 2, null).k(o.i(new AnonymousClass3(this), this.this$0));
+        Observable Y = ObservableExtensionsKt.restSubscribeOn$default(apiSerializeNulls.updateGuild(id4, new RestAPIParams.UpdateGuild(valueOf, num, valueOf2, num2, str, str2, verificationLevel, explicitContentFilter, (String) access$getState$p8.get(simpleDraweeView2.getId(), this.$this_configureUI.getGuild().getSplash()), (String) access$getState$p9.get(simpleDraweeView3.getId(), this.$this_configureUI.getGuild().getBanner()), Integer.valueOf(i), u.toList(this.$this_configureUI.getGuild().getFeatures()), this.$this_configureUI.getGuild().getRulesChannelId(), this.$this_configureUI.getGuild().getPublicUpdatesChannelId(), this.$this_configureUI.getGuild().getPreferredLocale())), false, 1, null).Y(AnonymousClass1.INSTANCE).Y(AnonymousClass2.INSTANCE);
+        m.checkNotNullExpressionValue(Y, "RestAPI\n          .apiSe…atedGuild.id)\n          }");
+        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null), this.this$0, null, 2, null).k(o.i(new AnonymousClass3(this), this.this$0));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
index a6bf66092d..54e3e6dfeb 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
@@ -94,7 +94,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         private final List<TextView> getTimeouts() {
             TextView textView = getBinding().b;
             m.checkNotNullExpressionValue(textView, "binding.serverSettingsOverviewAfkTimeout01");
-            TextView textView2 = getBinding().f2387c;
+            TextView textView2 = getBinding().f2385c;
             m.checkNotNullExpressionValue(textView2, "binding.serverSettingsOverviewAfkTimeout05");
             TextView textView3 = getBinding().d;
             m.checkNotNullExpressionValue(textView3, "binding.serverSettingsOverviewAfkTimeout15");
@@ -183,9 +183,9 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> X = StoreStream.Companion.getGuilds().observeGuild(j).X(new WidgetServerSettingsOverview$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …        }\n              }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable<R> Y = StoreStream.Companion.getGuilds().observeGuild(j).Y(new WidgetServerSettingsOverview$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -428,36 +428,36 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         if (z2) {
             StatefulViews statefulViews = this.state;
-            SimpleDraweeView simpleDraweeView = getBinding().f2388c.d;
+            SimpleDraweeView simpleDraweeView = getBinding().f2386c.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.header.serverSettingsOverviewIcon");
             statefulViews.put(simpleDraweeView.getId(), str3 != null ? str3 : "");
         } else {
             StatefulViews statefulViews2 = this.state;
-            SimpleDraweeView simpleDraweeView2 = getBinding().f2388c.d;
+            SimpleDraweeView simpleDraweeView2 = getBinding().f2386c.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.header.serverSettingsOverviewIcon");
             str3 = (String) statefulViews2.get(simpleDraweeView2.getId(), str2);
         }
-        getBinding().f2388c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2));
-        SimpleDraweeView simpleDraweeView3 = getBinding().f2388c.d;
+        getBinding().f2386c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2));
+        SimpleDraweeView simpleDraweeView3 = getBinding().f2386c.d;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.header.serverSettingsOverviewIcon");
         IconUtils.setIcon$default(simpleDraweeView3, str3, (int) R.dimen.avatar_size_extra_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         if (str3 != null && !t.isBlank(str3)) {
             z3 = false;
         }
-        TextView textView = getBinding().f2388c.b;
+        TextView textView = getBinding().f2386c.b;
         m.checkNotNullExpressionValue(textView, "binding.header.iconLabel");
         textView.setVisibility(z3 ? 0 : 8);
-        TextView textView2 = getBinding().f2388c.e;
+        TextView textView2 = getBinding().f2386c.e;
         m.checkNotNullExpressionValue(textView2, "binding.header.serverSettingsOverviewIconRemove");
         textView2.setVisibility(z3 ^ true ? 0 : 8);
-        getBinding().f2388c.e.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$2(this, str, str2));
-        TextView textView3 = getBinding().f2388c.f;
+        getBinding().f2386c.e.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$2(this, str, str2));
+        TextView textView3 = getBinding().f2386c.f;
         m.checkNotNullExpressionValue(textView3, "binding.header.serverSettingsOverviewIconText");
         if (!z3) {
             i = 8;
         }
         textView3.setVisibility(i);
-        TextView textView4 = getBinding().f2388c.f;
+        TextView textView4 = getBinding().f2386c.f;
         m.checkNotNullExpressionValue(textView4, "binding.header.serverSettingsOverviewIconText");
         textView4.setText(str);
         this.state.configureSaveActionView(getBinding().f);
@@ -587,10 +587,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         boolean z2 = false;
         configureIcon(model.getGuild().getShortName(), IconUtils.getForGuild$default(model.getGuild(), null, true, null, 10, null), null, false);
-        TextInputLayout textInputLayout = getBinding().f2388c.f89c;
+        TextInputLayout textInputLayout = getBinding().f2386c.f89c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName");
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f2388c.f89c;
+        TextInputLayout textInputLayout2 = getBinding().f2386c.f89c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.header.overviewName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), model.getGuild().getName()));
         LinkifiedTextView linkifiedTextView = getBinding().e.b;
@@ -715,7 +715,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().f;
-        TextInputLayout textInputLayout = getBinding().f2388c.f89c;
+        TextInputLayout textInputLayout = getBinding().f2386c.f89c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName");
         TextView textView = getBinding().b.d;
         m.checkNotNullExpressionValue(textView, "binding.afk.afkTimeout");
@@ -726,7 +726,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         TextView textView3 = getBinding().h.b;
         m.checkNotNullExpressionValue(textView3, "binding.systemChannel.systemChannel");
         statefulViews2.addOptionalFields(textView2, textView3);
-        TextView textView4 = getBinding().f2388c.b;
+        TextView textView4 = getBinding().f2386c.b;
         m.checkNotNullExpressionValue(textView4, "binding.header.iconLabel");
         b.n(textView4, R.string.minimum_size, new Object[]{"128", "128"}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().j.f;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$Model$Companion$get$1.java
index 5986254c9f..5f87b782a3 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$Model$Companion$get$1.java
@@ -84,6 +84,6 @@ public final class WidgetServerSettingsRoles$Model$Companion$get$1<T, R> impleme
 
     public final Observable<? extends WidgetServerSettingsRoles.Model> call(MeUser meUser) {
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.h(companion.getGuilds().observeGuild(this.$guildId), companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).E(new AnonymousClass1(meUser)), companion.getPermissions().observePermissionsForGuild(this.$guildId), companion.getGuilds().observeRoles(this.$guildId), new AnonymousClass2(this, meUser));
+        return Observable.h(companion.getGuilds().observeGuild(this.$guildId), companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).F(new AnonymousClass1(meUser)), companion.getPermissions().observePermissionsForGuild(this.$guildId), companion.getGuilds().observeRoles(this.$guildId), new AnonymousClass2(this, meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$createRole$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$createRole$1.java
index 5b7bbf0f92..97a3fd0686 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$createRole$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles$createRole$1.java
@@ -37,6 +37,6 @@ public final class WidgetServerSettingsRoles$createRole$1<T, R> implements b<Gui
 
     public final Observable<? extends GuildRole> call(GuildRole guildRole) {
         long a = guildRole.a();
-        return StoreStream.Companion.getGuilds().observeRoles(this.$guildId, m.listOf(Long.valueOf(a))).E(new AnonymousClass1(a));
+        return StoreStream.Companion.getGuilds().observeRoles(this.$guildId, m.listOf(Long.valueOf(a))).F(new AnonymousClass1(a));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles.java
index cd2336e1fa..95098cecae 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRoles.java
@@ -85,7 +85,7 @@ public final class WidgetServerSettingsRoles extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<Model> q = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).X(new WidgetServerSettingsRoles$Model$Companion$get$1(j)).q();
+                Observable<Model> q = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Y(new WidgetServerSettingsRoles$Model$Companion$get$1(j)).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -251,18 +251,18 @@ public final class WidgetServerSettingsRoles extends AppFragment {
             widgetServerSettingsRolesAdapter.configure(model.getRoleItems(), new WidgetServerSettingsRoles$configureUI$1(this, model), new WidgetServerSettingsRoles$configureUI$2(this, model));
         }
         if (!model.getCanManageRoles() || !model.getElevated()) {
-            getBinding().f2391c.hide();
-            getBinding().f2391c.setOnClickListener(null);
+            getBinding().f2389c.hide();
+            getBinding().f2389c.setOnClickListener(null);
             return;
         }
-        getBinding().f2391c.setOnClickListener(new WidgetServerSettingsRoles$configureUI$3(this, model));
-        getBinding().f2391c.show();
+        getBinding().f2389c.setOnClickListener(new WidgetServerSettingsRoles$configureUI$3(this, model));
+        getBinding().f2389c.show();
     }
 
     private final void createRole(long j, Model model) {
-        Observable X = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createRole(j), false, 1, null).X(new WidgetServerSettingsRoles$createRole$1(j));
-        m.checkNotNullExpressionValue(X, "RestAPI\n        .api\n   … rolesMap[id] }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(X, 0, false, 3, null), this, null, 2, null), WidgetServerSettingsRoles.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsRoles$createRole$2(this, j, model), 60, (Object) null);
+        Observable Y = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createRole(j), false, 1, null).Y(new WidgetServerSettingsRoles$createRole$1(j));
+        m.checkNotNullExpressionValue(Y, "RestAPI\n        .api\n   … rolesMap[id] }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null), this, null, 2, null), WidgetServerSettingsRoles.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsRoles$createRole$2(this, j, model), 60, (Object) null);
     }
 
     private final WidgetServerSettingsRolesBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesAdapter.java
index d0ab4e4d6d..184d016013 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesAdapter.java
@@ -407,7 +407,7 @@ public final class WidgetServerSettingsRolesAdapter extends DragAndDropAdapter<D
             } else {
                 this.binding.a.setOnLongClickListener(null);
             }
-            ImageView imageView = this.binding.f2389c;
+            ImageView imageView = this.binding.f2387c;
             m.checkNotNullExpressionValue(imageView, "binding.serverSettingsRoleItemLockIndicator");
             imageView.setVisibility(roleItem.getLocked() ? 0 : 8);
             this.binding.e.setRole(roleItem.getRole(), Long.valueOf(roleItem.getGuildId()));
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
index 0ec0002729..6a5bc21de8 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
@@ -229,15 +229,15 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
             if (j <= 0) {
                 dismiss();
             }
-            getBinding().f2393c.setText(z2 ? R.string.disable : R.string.enable);
-            MaterialButton materialButton = getBinding().f2393c;
+            getBinding().f2391c.setText(z2 ? R.string.disable : R.string.enable);
+            MaterialButton materialButton = getBinding().f2391c;
             m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityDialogConfirm");
             WidgetServerSettingsSecurityDialogBinding binding = getBinding();
             m.checkNotNullExpressionValue(binding, "binding");
             LinearLayout linearLayout = binding.a;
             m.checkNotNullExpressionValue(linearLayout, "binding.root");
             materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(linearLayout.getContext(), z2 ? R.color.status_red_500 : R.color.status_green_600)));
-            getBinding().f2393c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j));
+            getBinding().f2391c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j));
             getBinding().b.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$2(this));
         }
 
@@ -275,13 +275,13 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
         setActionBarTitle(R.string.security);
         setActionBarSubtitle(model.getGuildName());
         if (model.isMfaEnabled()) {
-            getBinding().f2392c.setText(R.string.guild_security_req_mfa_turn_off);
-            MaterialButton materialButton = getBinding().f2392c;
+            getBinding().f2390c.setText(R.string.guild_security_req_mfa_turn_off);
+            MaterialButton materialButton = getBinding().f2390c;
             m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityToggleMfaButton");
             materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), (int) R.color.status_red_500)));
         } else {
-            getBinding().f2392c.setText(R.string.guild_security_req_mfa_turn_on);
-            MaterialButton materialButton2 = getBinding().f2392c;
+            getBinding().f2390c.setText(R.string.guild_security_req_mfa_turn_on);
+            MaterialButton materialButton2 = getBinding().f2390c;
             m.checkNotNullExpressionValue(materialButton2, "binding.serverSettingsSecurityToggleMfaButton");
             materialButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), (int) R.color.status_green_600)));
         }
@@ -289,7 +289,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
         if (findFragmentByTag != null) {
             ((ToggleMfaDialog) findFragmentByTag).configure(model.getGuildId(), model.isMfaEnabled());
         }
-        getBinding().f2392c.setOnClickListener(new WidgetServerSettingsSecurity$configureUI$1(this, model));
+        getBinding().f2390c.setOnClickListener(new WidgetServerSettingsSecurity$configureUI$1(this, model));
     }
 
     private final WidgetServerSettingsSecurityBinding getBinding() {
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 f4515ec4c1..c347bf59f7 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().f2286c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this));
+        getBinding().f2284c.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/WidgetServerSettingsVanityUrl.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
index 7c5c4979f4..a83ee51931 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
@@ -246,12 +246,12 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
         if (str != null) {
             if (str.length() > 0) {
                 String u = a.u("https://discord.gg/", str);
-                TextView textView = getBinding().f2394c;
+                TextView textView = getBinding().f2392c;
                 m.checkNotNullExpressionValue(textView, "binding.serverSettingsVanityUrlCurrentUrl");
                 c.a.k.b.n(textView, R.string.vanity_url_help_extended, new Object[]{u}, null, 4);
             }
         }
-        TextView textView2 = getBinding().f2394c;
+        TextView textView2 = getBinding().f2392c;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsVanityUrlCurrentUrl");
         if (str != null) {
             if (str.length() > 0) {
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
index 14927023d4..6213a52980 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
@@ -33,10 +33,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
             public final boolean onMenuItemClick(MenuItem menuItem) {
                 m.checkNotNullExpressionValue(menuItem, "it");
                 switch (menuItem.getItemId()) {
-                    case R.id.menu_audit_log_sort_actions /* 2131364160 */:
+                    case R.id.menu_audit_log_sort_actions /* 2131364155 */:
                         WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1);
                         break;
-                    case R.id.menu_audit_log_sort_users /* 2131364161 */:
+                    case R.id.menu_audit_log_sort_users /* 2131364156 */:
                         WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0);
                         break;
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
index bcc335d428..954634da5b 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
@@ -373,9 +373,9 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
         setActionBarTitle(R.string.guild_settings_label_audit_log);
         setActionBarSubtitle(getMostRecentIntent().getStringExtra(INTENT_EXTRA_GUILD_NAME));
         setActionBarOptionsMenu(R.menu.menu_filter, null, new WidgetServerSettingsAuditLog$onViewBound$1(this));
-        getBinding().f2351c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2());
+        getBinding().f2349c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2());
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f2351c;
+        RecyclerView recyclerView = getBinding().f2349c;
         m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsAuditLogsRecycler");
         WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter = (WidgetServerSettingsAuditLogAdapter) companion.configure(new WidgetServerSettingsAuditLogAdapter(recyclerView));
         widgetServerSettingsAuditLogAdapter.setOnAuditLogAvatarClicked(new WidgetServerSettingsAuditLog$onViewBound$$inlined$apply$lambda$1(this));
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
index 0b9a3fe7d7..0adb7ae396 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
@@ -192,11 +192,11 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
             TextView textView3 = this.binding.e;
             m.checkNotNullExpressionValue(textView3, "binding.auditLogListitemChangeText");
             textView3.setVisibility(auditLogEntryItem.isSelected() && auditLogEntryItem.getHasChangesToRender() ? 0 : 8);
-            ImageView imageView3 = this.binding.f2354c;
+            ImageView imageView3 = this.binding.f2352c;
             m.checkNotNullExpressionValue(imageView3, "binding.auditLogListitemArrow");
             imageView3.setVisibility(auditLogEntryItem.getHasChangesToRender() ? 0 : 4);
             if (!auditLogEntryItem.isSelected() || !auditLogEntryItem.getHasChangesToRender()) {
-                this.binding.f2354c.setImageResource(R.drawable.ic_chevron_right_grey_12dp);
+                this.binding.f2352c.setImageResource(R.drawable.ic_chevron_right_grey_12dp);
                 RelativeLayout relativeLayout = this.binding.i;
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
@@ -205,7 +205,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
                 TextView textView4 = this.binding.e;
                 m.checkNotNullExpressionValue(textView4, "binding.auditLogListitemChangeText");
                 textView4.setText(auditLogEntryItem.getChangeText());
-                this.binding.f2354c.setImageResource(R.drawable.ic_chevron_down_grey_12dp);
+                this.binding.f2352c.setImageResource(R.drawable.ic_chevron_down_grey_12dp);
                 RelativeLayout relativeLayout2 = this.binding.i;
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilter.java
index c2d995473c..c24d23ede2 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilter.java
@@ -42,7 +42,7 @@ public final class WidgetServerSettingsAuditLogFilter extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private WidgetServerSettingsAuditLogFilterAdapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsAuditLogFilter$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.k0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
     private Integer filterType;
     private Long guildId;
     private final Function0<Unit> onFilterSelectedCallback = new WidgetServerSettingsAuditLogFilter$onFilterSelectedCallback$1(this);
@@ -90,7 +90,7 @@ public final class WidgetServerSettingsAuditLogFilter extends AppFragment {
                 m.checkNotNullParameter(context, "context");
                 m.checkNotNullParameter(observable, "filterPublisher");
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable<Model> q = Observable.g(companion.getAuditLog().observeAuditLogState(j), getPermissionUserIds(j).X(WidgetServerSettingsAuditLogFilter$Model$Companion$get$1.INSTANCE), companion.getGuilds().observeComputed(j), new i0.l.e.j(AuditLogUtils.INSTANCE.getALL_ACTION_TYPES()), ObservableExtensionsKt.leadingEdgeThrottle(observable, 100, TimeUnit.MILLISECONDS).q(), new WidgetServerSettingsAuditLogFilter$Model$Companion$get$2(i, context)).q();
+                Observable<Model> q = Observable.g(companion.getAuditLog().observeAuditLogState(j), getPermissionUserIds(j).Y(WidgetServerSettingsAuditLogFilter$Model$Companion$get$1.INSTANCE), companion.getGuilds().observeComputed(j), new i0.l.e.j(AuditLogUtils.INSTANCE.getALL_ACTION_TYPES()), ObservableExtensionsKt.leadingEdgeThrottle(observable, 100, TimeUnit.MILLISECONDS).q(), new WidgetServerSettingsAuditLogFilter$Model$Companion$get$2(i, context)).q();
                 m.checkNotNullExpressionValue(q, "Observable\n             …  .distinctUntilChanged()");
                 return q;
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
index db8b59357d..0aad811f5f 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
@@ -118,7 +118,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
             imageView.setImageResource(auditLogUtils.getTargetTypeImage(view, auditLogActionFilterItem.getActionId()));
-            this.binding.f2352c.setImageResource(auditLogUtils.getActionTypeImage(auditLogActionFilterItem.getActionId()));
+            this.binding.f2350c.setImageResource(auditLogUtils.getActionTypeImage(auditLogActionFilterItem.getActionId()));
             this.binding.b.setText(auditLogActionFilterItem.getText());
             CheckedSetting checkedSetting = this.binding.b;
             m.checkNotNullExpressionValue(checkedSetting, "binding.auditLogFilterCs");
@@ -180,7 +180,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
             TextView textView = this.binding.d;
             m.checkNotNullExpressionValue(textView, "binding.nonMemberText");
             textView.setVisibility(z2 ^ true ? 0 : 8);
-            ImageView imageView = this.binding.f2353c;
+            ImageView imageView = this.binding.f2351c;
             m.checkNotNullExpressionValue(imageView, "binding.itemIcon");
             if (!(!z2)) {
                 i2 = 8;
@@ -213,7 +213,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         private final GuildMember guildMember;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2647id;
+        private final long f2645id;
         private final boolean isChecked;
         private final String key;
         private final CharSequence text;
@@ -223,7 +223,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         public AuditLogUserFilterItem(User user, GuildMember guildMember, long j, CharSequence charSequence, Integer num, boolean z2) {
             this.user = user;
             this.guildMember = guildMember;
-            this.f2647id = j;
+            this.f2645id = j;
             this.text = charSequence;
             this.discriminator = num;
             this.isChecked = z2;
@@ -239,7 +239,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         }
 
         public final long getId() {
-            return this.f2647id;
+            return this.f2645id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
index a3f1b88508..4512417868 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
@@ -68,7 +68,7 @@ public final class WidgetConfirmRemoveCommunityDialog extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f2207c.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$1(this));
+        getBinding().f2206c.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$1(this));
         getBinding().b.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
index 9e45742d6b..a754291352 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
@@ -26,7 +26,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$1 implemen
 
         public final WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig invoke(WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig communityGuildConfig) {
             m.checkNotNullParameter(communityGuildConfig, "it");
-            CheckedSetting checkedSetting = WidgetServerSettingsCommunityFirstStep.access$getBinding$p(this.this$0.this$0).f2367c;
+            CheckedSetting checkedSetting = WidgetServerSettingsCommunityFirstStep.access$getBinding$p(this.this$0.this$0).f2365c;
             m.checkNotNullExpressionValue(checkedSetting, "binding.communitySettingsVerifiedEmailedSwitch");
             return WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig.copy$default(communityGuildConfig, null, null, null, null, false, false, !checkedSetting.isChecked(), false, null, false, null, null, 4031, null);
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
index 88f78e9568..86076985d4 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
@@ -75,7 +75,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
     }
 
     private final void configureUI(WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
-        CheckedSetting checkedSetting = getBinding().f2367c;
+        CheckedSetting checkedSetting = getBinding().f2365c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.communitySettingsVerifiedEmailedSwitch");
         checkedSetting.setChecked(loaded.getCommunityGuildConfig().getVerificationLevel());
         CheckedSetting checkedSetting2 = getBinding().b;
@@ -87,7 +87,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
         if (guild == null || guild.getExplicitContentFilter().compareTo(GuildExplicitContentFilter.NONE) <= 0) {
             z2 = false;
         }
-        getBinding().f2367c.e(new WidgetServerSettingsCommunityFirstStep$configureUI$1(this, loaded, z3));
+        getBinding().f2365c.e(new WidgetServerSettingsCommunityFirstStep$configureUI$1(this, loaded, z3));
         getBinding().b.e(new WidgetServerSettingsCommunityFirstStep$configureUI$2(this, loaded, z2));
     }
 
@@ -112,8 +112,8 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable E = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).w(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(E, WidgetServerSettingsCommunityFirstStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).x(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunityFirstStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
index 77587be2f5..47717b996a 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
@@ -99,10 +99,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
         }
         m.checkNotNullExpressionValue(str, "when (viewState.updatesC…(requireActivity())\n    }");
         getBinding().b.setSubtitle(string);
-        getBinding().f2366c.setSubtitle(str);
+        getBinding().f2364c.setSubtitle(str);
         getBinding().d.setSubtitle(WidgetSettingsLanguage.Companion.getAsStringInLocale(loaded.getGuild().getPreferredLocale()));
         getBinding().b.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$1(this, loaded));
-        getBinding().f2366c.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$2(this, loaded));
+        getBinding().f2364c.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$2(this, loaded));
         getBinding().d.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$3(this));
         getBinding().e.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$4(this, loaded));
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java
index 76d239c590..1006736caa 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java
@@ -66,9 +66,9 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser) {
-            Observable<R> X = storeGuilds.observeGuild(j).X(new WidgetServerSettingsCommunityOverviewViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
-            m.checkNotNullExpressionValue(X, "storeGuilds.observeGuild…      }\n        }\n      }");
-            return X;
+            Observable<R> Y = storeGuilds.observeGuild(j).Y(new WidgetServerSettingsCommunityOverviewViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
+            m.checkNotNullExpressionValue(Y, "storeGuilds.observeGuild…      }\n        }\n      }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser, int i, Object obj) {
@@ -143,7 +143,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
             private final Guild guild;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2648me;
+            private final MeUser f2646me;
             private final Long permissions;
             private final Channel rulesChannel;
             private final Channel updatesChannel;
@@ -154,7 +154,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                 m.checkNotNullParameter(guild, "guild");
                 m.checkNotNullParameter(meUser, "me");
                 this.guild = guild;
-                this.f2648me = meUser;
+                this.f2646me = meUser;
                 this.permissions = l;
                 this.rulesChannel = channel;
                 this.updatesChannel = channel2;
@@ -165,7 +165,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                     guild = valid.guild;
                 }
                 if ((i & 2) != 0) {
-                    meUser = valid.f2648me;
+                    meUser = valid.f2646me;
                 }
                 if ((i & 4) != 0) {
                     l = valid.permissions;
@@ -184,7 +184,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
             }
 
             public final MeUser component2() {
-                return this.f2648me;
+                return this.f2646me;
             }
 
             public final Long component3() {
@@ -213,7 +213,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                     return false;
                 }
                 Valid valid = (Valid) obj;
-                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2648me, valid.f2648me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
+                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2646me, valid.f2646me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
             }
 
             public final Guild getGuild() {
@@ -221,7 +221,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
             }
 
             public final MeUser getMe() {
-                return this.f2648me;
+                return this.f2646me;
             }
 
             public final Long getPermissions() {
@@ -240,7 +240,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                 Guild guild = this.guild;
                 int i = 0;
                 int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
-                MeUser meUser = this.f2648me;
+                MeUser meUser = this.f2646me;
                 int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 Long l = this.permissions;
                 int hashCode3 = (hashCode2 + (l != null ? l.hashCode() : 0)) * 31;
@@ -257,7 +257,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                 StringBuilder O = a.O("Valid(guild=");
                 O.append(this.guild);
                 O.append(", me=");
-                O.append(this.f2648me);
+                O.append(this.f2646me);
                 O.append(", permissions=");
                 O.append(this.permissions);
                 O.append(", rulesChannel=");
@@ -452,7 +452,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
         super(ViewState.Uninitialized.INSTANCE);
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.guildId = j;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetServerSettingsCommunityOverviewViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
index 0ecc3964e7..00ce9b8a18 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
@@ -67,9 +67,9 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
         String string2 = loaded.getCommunityGuildConfig().getUpdatesChannel() == null ? requireContext().getString(R.string.enable_public_modal_create_channel) : ChannelUtils.e(loaded.getCommunityGuildConfig().getUpdatesChannel(), requireContext(), false, 2);
         m.checkNotNullExpressionValue(string2, "when (viewState.communit…t(requireContext())\n    }");
         getBinding().b.setSubtitle(string);
-        getBinding().f2368c.setSubtitle(string2);
+        getBinding().f2366c.setSubtitle(string2);
         getBinding().b.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$1(this));
-        getBinding().f2368c.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$2(this));
+        getBinding().f2366c.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$2(this));
     }
 
     public static final void create(Context context) {
@@ -96,8 +96,8 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable E = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).w(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(E, WidgetServerSettingsCommunitySecondStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).x(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunitySecondStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
index b09395816e..26f2382af7 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
@@ -148,16 +148,16 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable E = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).w(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(E, WidgetServerSettingsCommunityThirdStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).x(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunityThirdStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
         CheckedSetting checkedSetting = getBinding().e;
         Context context = getContext();
         checkedSetting.setText(context != null ? b.b(context, R.string.enable_community_modal_default_notifications_label_mobile, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2(this)) : null);
         CheckedSetting checkedSetting2 = getBinding().d;
         Context context2 = getContext();
         checkedSetting2.setText(context2 != null ? b.b(context2, R.string.enable_community_modal_everyone_role_permission_label_mobile, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3(this)) : null);
-        LinkifiedTextView linkifiedTextView = getBinding().f2369c;
+        LinkifiedTextView linkifiedTextView = getBinding().f2367c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.communitySettingGuidelines");
         b.n(linkifiedTextView, R.string.community_policy_help, new Object[]{f.a.a(360035969312L, null)}, null, 4);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
index 2856d4625c..2da7937942 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
@@ -100,9 +100,9 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment
         Observable<WidgetServerSettingsEnableCommunityViewModel.ViewState> q = getViewModel().observeViewState().q();
         m.checkNotNullExpressionValue(q, "viewModel\n        .obser…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(q, this, null, 2, null), WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        Observable E = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).w(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).E(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(E, WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null).x(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeEvents(), this, null, 2, null), WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java
index ce5b43d1e9..66a5a6dd7f 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java
@@ -312,9 +312,9 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser) {
-            Observable<R> X = storeGuilds.observeGuild(j).X(new WidgetServerSettingsEnableCommunityViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
-            m.checkNotNullExpressionValue(X, "storeGuilds.observeGuild…      }\n        }\n      }");
-            return X;
+            Observable<R> Y = storeGuilds.observeGuild(j).Y(new WidgetServerSettingsEnableCommunityViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
+            m.checkNotNullExpressionValue(Y, "storeGuilds.observeGuild…      }\n        }\n      }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser, int i, Object obj) {
@@ -380,7 +380,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
             private final Guild guild;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2649me;
+            private final MeUser f2647me;
             private final Long permissions;
             private final Map<Long, GuildRole> roles;
             private final Channel rulesChannel;
@@ -392,7 +392,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                 m.checkNotNullParameter(guild, "guild");
                 m.checkNotNullParameter(meUser, "me");
                 this.guild = guild;
-                this.f2649me = meUser;
+                this.f2647me = meUser;
                 this.permissions = l;
                 this.roles = map;
                 this.rulesChannel = channel;
@@ -406,7 +406,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                     guild = valid.guild;
                 }
                 if ((i & 2) != 0) {
-                    meUser = valid.f2649me;
+                    meUser = valid.f2647me;
                 }
                 if ((i & 4) != 0) {
                     l = valid.permissions;
@@ -428,7 +428,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
             }
 
             public final MeUser component2() {
-                return this.f2649me;
+                return this.f2647me;
             }
 
             public final Long component3() {
@@ -461,7 +461,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                     return false;
                 }
                 Valid valid = (Valid) obj;
-                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2649me, valid.f2649me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.roles, valid.roles) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
+                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2647me, valid.f2647me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.roles, valid.roles) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
             }
 
             public final Guild getGuild() {
@@ -469,7 +469,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
             }
 
             public final MeUser getMe() {
-                return this.f2649me;
+                return this.f2647me;
             }
 
             public final Long getPermissions() {
@@ -492,7 +492,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                 Guild guild = this.guild;
                 int i = 0;
                 int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
-                MeUser meUser = this.f2649me;
+                MeUser meUser = this.f2647me;
                 int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 Long l = this.permissions;
                 int hashCode3 = (hashCode2 + (l != null ? l.hashCode() : 0)) * 31;
@@ -511,7 +511,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                 StringBuilder O = a.O("Valid(guild=");
                 O.append(this.guild);
                 O.append(", me=");
-                O.append(this.f2649me);
+                O.append(this.f2647me);
                 O.append(", permissions=");
                 O.append(this.permissions);
                 O.append(", roles=");
@@ -661,7 +661,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
         super(ViewState.Uninitialized.INSTANCE);
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.guildId = j;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetServerSettingsEnableCommunityViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java
index 067c9750fd..e1c0a169da 100644
--- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java
@@ -400,7 +400,7 @@ public final class ServerSettingsGuildRoleSubscriptionViewModel extends AppViewM
         this.guildId = j;
         this.restApi = restAPI;
         this.storeGuildRoleSubscriptions = storeGuildRoleSubscriptions;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         storeGuildRoleSubscriptions.fetchGuildRoleSubscriptionGroupsForGuild(j);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ServerSettingsGuildRoleSubscriptionViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList.java
index ebbf36f133..6477c5948f 100644
--- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList.java
+++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList.java
@@ -74,7 +74,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionTierList extends App
     }
 
     private final void configureUI(ServerSettingsGuildRoleSubscriptionTierListViewModel.ViewState.Loaded loaded) {
-        AppViewFlipper appViewFlipper = getBinding().f2377c;
+        AppViewFlipper appViewFlipper = getBinding().f2375c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsGu…iptionTierListViewFlipper");
         appViewFlipper.setDisplayedChild(1);
         ServerSettingsGuildRoleSubscriptionTierAdapter serverSettingsGuildRoleSubscriptionTierAdapter = this.adapter;
@@ -91,7 +91,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionTierList extends App
 
     private final void configureUI(ServerSettingsGuildRoleSubscriptionTierListViewModel.ViewState viewState) {
         if (viewState instanceof ServerSettingsGuildRoleSubscriptionTierListViewModel.ViewState.Loading) {
-            AppViewFlipper appViewFlipper = getBinding().f2377c;
+            AppViewFlipper appViewFlipper = getBinding().f2375c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsGu…iptionTierListViewFlipper");
             appViewFlipper.setDisplayedChild(0);
         } else if (viewState instanceof ServerSettingsGuildRoleSubscriptionTierListViewModel.ViewState.Loaded) {
diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptions.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptions.java
index 84a193d62b..a4505abbe2 100644
--- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptions.java
+++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptions.java
@@ -85,7 +85,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptions extends AppFragmen
     }
 
     private final void configureUI(ServerSettingsGuildRoleSubscriptionViewModel.ViewState.Loaded loaded) {
-        AppViewFlipper appViewFlipper = getBinding().f2378c;
+        AppViewFlipper appViewFlipper = getBinding().f2376c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsGu…leSubscriptionViewFlipper");
         boolean z2 = true;
         appViewFlipper.setDisplayedChild(1);
@@ -103,7 +103,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptions extends AppFragmen
 
     private final void configureUI(ServerSettingsGuildRoleSubscriptionViewModel.ViewState viewState) {
         if (viewState instanceof ServerSettingsGuildRoleSubscriptionViewModel.ViewState.Loading) {
-            AppViewFlipper appViewFlipper = getBinding().f2378c;
+            AppViewFlipper appViewFlipper = getBinding().f2376c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsGu…leSubscriptionViewFlipper");
             appViewFlipper.setDisplayedChild(0);
         } else if (viewState instanceof ServerSettingsGuildRoleSubscriptionViewModel.ViewState.Empty) {
diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java
index 6e0b81907d..3b2782c37a 100644
--- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java
@@ -481,7 +481,7 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends
         this.guildRoleSubscriptionGroupListingId = j3;
         this.restApi = restAPI;
         this.storeGuildRoleSubscriptions = storeGuildRoleSubscriptions;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         storeGuildRoleSubscriptions.fetchGuildRoleSubscriptionGroupsForGuild(j);
         Observable<StoreState> q = observable.q();
         m.checkNotNullExpressionValue(q, "storeStateObservable\n   …  .distinctUntilChanged()");
diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java
index 21c81026d1..b15cd3417c 100644
--- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java
+++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java
@@ -127,7 +127,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier extends App
             AppViewFlipper appViewFlipper2 = getBinding().g;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.serverSettingsGu…iptionEditTierViewFlipper");
             appViewFlipper2.setDisplayedChild(1);
-            Group group = getBinding().f2376c;
+            Group group = getBinding().f2374c;
             m.checkNotNullExpressionValue(group, "binding.guildRoleSubscriptionEditTierPublishGroup");
             if (!(true ^ loaded.isPublished())) {
                 i = 8;
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 3c1536a797..867b2deca9 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().f2313c;
+        MaterialButton materialButton = getBinding().f2311c;
         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().f2313c;
+            MaterialButton materialButton2 = getBinding().f2311c;
             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().f2313c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this));
+            getBinding().f2311c.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().f2313c;
+            MaterialButton materialButton4 = getBinding().f2311c;
             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().f2313c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this));
+            getBinding().f2311c.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().f2313c;
+            MaterialButton materialButton6 = getBinding().f2311c;
             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().f2313c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this));
+            getBinding().f2311c.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().f2313c;
+            MaterialButton materialButton8 = getBinding().f2311c;
             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().f2313c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this));
+            getBinding().f2311c.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/MemberVerificationPendingViewModel.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java
index ed42888807..c3a6be6822 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java
@@ -63,9 +63,9 @@ public final class MemberVerificationPendingViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStores(long j) {
-            Observable<R> E = StoreStream.Companion.getMemberVerificationForms().observeMemberVerificationFormData(j).E(MemberVerificationPendingViewModel$Companion$observeStores$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "StoreStream\n          .g…d).map { StoreState(it) }");
-            return E;
+            Observable<R> F = StoreStream.Companion.getMemberVerificationForms().observeMemberVerificationFormData(j).F(MemberVerificationPendingViewModel$Companion$observeStores$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "StoreStream\n          .g…d).map { StoreState(it) }");
+            return F;
         }
     }
 
@@ -271,7 +271,7 @@ public final class MemberVerificationPendingViewModel extends AppViewModel<ViewS
         m.checkNotNullParameter(observable, "storeObservable");
         this.guildId = j;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), MemberVerificationPendingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
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 8258f2b536..e0129566a3 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.f2314c;
+            View view3 = this.binding.f2312c;
             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 cbfc943a06..78d7e2afc7 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().f2315c;
+        TextView textView = getBinding().f2313c;
         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 12c6960196..c0b26aa4da 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
@@ -134,7 +134,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().f2312c;
+        SimpleDraweeView simpleDraweeView = getBinding().f2310c;
         IconUtils iconUtils = IconUtils.INSTANCE;
         Guild guild = loaded.getGuild();
         Resources resources = getResources();
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java
index 9318e8b432..562444901d 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java
@@ -218,7 +218,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         private final Guild guild;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2650me;
+        private final MeUser f2648me;
         private final StoreGuildMemberVerificationForm.MemberVerificationFormData memberVerificationFormData;
         private final Map<Long, GuildRole> roles;
 
@@ -226,7 +226,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(map, "channels");
             m.checkNotNullParameter(map2, "roles");
-            this.f2650me = meUser;
+            this.f2648me = meUser;
             this.guild = guild;
             this.memberVerificationFormData = memberVerificationFormData;
             this.channels = map;
@@ -238,7 +238,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, Guild guild, StoreGuildMemberVerificationForm.MemberVerificationFormData memberVerificationFormData, Map map, Map map2, boolean z2, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = storeState.f2650me;
+                meUser = storeState.f2648me;
             }
             if ((i & 2) != 0) {
                 guild = storeState.guild;
@@ -259,7 +259,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         }
 
         public final MeUser component1() {
-            return this.f2650me;
+            return this.f2648me;
         }
 
         public final Guild component2() {
@@ -297,7 +297,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.f2650me, storeState.f2650me) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.memberVerificationFormData, storeState.memberVerificationFormData) && m.areEqual(this.channels, storeState.channels) && m.areEqual(this.roles, storeState.roles) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis;
+            return m.areEqual(this.f2648me, storeState.f2648me) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.memberVerificationFormData, storeState.memberVerificationFormData) && m.areEqual(this.channels, storeState.channels) && m.areEqual(this.roles, storeState.roles) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis;
         }
 
         public final boolean getAllowAnimatedEmojis() {
@@ -313,7 +313,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         }
 
         public final MeUser getMe() {
-            return this.f2650me;
+            return this.f2648me;
         }
 
         public final StoreGuildMemberVerificationForm.MemberVerificationFormData getMemberVerificationFormData() {
@@ -325,7 +325,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2650me;
+            MeUser meUser = this.f2648me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             Guild guild = this.guild;
@@ -351,7 +351,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
 
         public String toString() {
             StringBuilder O = a.O("StoreState(me=");
-            O.append(this.f2650me);
+            O.append(this.f2648me);
             O.append(", guild=");
             O.append(this.guild);
             O.append(", memberVerificationFormData=");
@@ -704,7 +704,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         this.inviteGuild = guild;
         this.restAPI = restAPI;
         this.rulesParser = parser;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.formUserInputDataMap = new HashMap();
         AnalyticsTracker.openModal("Membership Gating", str, Long.valueOf(j));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetMemberVerificationViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java
index 66f3e1cf23..fe0023e6e6 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java
@@ -506,8 +506,8 @@ public final class PremiumGuildTransferInProgressViewModel extends AppViewModel<
     @MainThread
     public final void transferPremiumGuildSubscription() {
         handlePremiumGuildSubscriptionStarted();
-        Observable<R> y2 = this.restAPI.unsubscribeToGuild(this.previousGuildId, this.subscriptionId).y(new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1(this));
-        m.checkNotNullExpressionValue(y2, "restAPI\n        .unsubsc…              )\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(y2, false, 1, null), this, null, 2, null), PremiumGuildTransferInProgressViewModel.class, (Context) null, (Function1) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2(this), (Function0) null, (Function0) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3(this), 54, (Object) null);
+        Observable<R> z2 = this.restAPI.unsubscribeToGuild(this.previousGuildId, this.subscriptionId).z(new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1(this));
+        m.checkNotNullExpressionValue(z2, "restAPI\n        .unsubsc…              )\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null), this, null, 2, null), PremiumGuildTransferInProgressViewModel.class, (Context) null, (Function1) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2(this), (Function0) null, (Function0) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
index 82faa10d83..066895b432 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
@@ -664,7 +664,7 @@ public final class PremiumGuildViewModel extends AppViewModel<ViewState> {
         this.storePremiumGuildSubscription = storePremiumGuildSubscription;
         this.storeSubscriptions = storeSubscriptions;
         this.clock = clock;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         fetchData();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), PremiumGuildViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
index ebe676d796..81278beda7 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
@@ -390,7 +390,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
         simplePager.setAdapter(perksPagerAdapter);
         getBinding().k.addOnPageChangeListener(new WidgetPremiumGuildSubscription$onViewBound$1(this));
         AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_premium_guild, WidgetPremiumGuildSubscription$onViewBound$2.INSTANCE, null, 4, null);
-        LinkifiedTextView linkifiedTextView = getBinding().f2347c;
+        LinkifiedTextView linkifiedTextView = getBinding().f2345c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.boostStatusLearnMore");
         b.m(linkifiedTextView, R.string.premium_guild_perks_modal_blurb_mobile_learn_more, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE);
         CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions, 2, 2);
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
index 8191dc8998..41ac9c092a 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
@@ -186,7 +186,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
         materialButton.setText(b.k(this, R.string.premium_guild_subscribe_confirm_confirmation, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_confirmation_slotCount, 1, 1)}, null, 4));
         CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_cooldown_warning_days, 7, 7);
         CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_cooldown_warning_slotCount, 1, 1);
-        TextView textView = getBinding().f2346c;
+        TextView textView = getBinding().f2344c;
         m.checkNotNullExpressionValue(textView, "binding.boostConfirmationCooldownWarning");
         textView.setText(b.k(this, R.string.premium_guild_subscribe_confirm_cooldown_warning, new Object[]{i18nPluralString2, i18nPluralString}, null, 4));
     }
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 db51208bcc..03390ac0da 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().f2331c;
+        TextView textView = getBinding().f2329c;
         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/servers/role_members/ServerSettingsRoleMembersViewModel.java b/app/src/main/java/com/discord/widgets/servers/role_members/ServerSettingsRoleMembersViewModel.java
index 871d6626e0..61d797c627 100644
--- a/app/src/main/java/com/discord/widgets/servers/role_members/ServerSettingsRoleMembersViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/role_members/ServerSettingsRoleMembersViewModel.java
@@ -422,14 +422,14 @@ public final class ServerSettingsRoleMembersViewModel extends AppViewModel<ViewS
         this.storeGatewayConnection = storeGatewayConnection;
         this.searchQuerySubject = behaviorSubject;
         this.restApi = restAPI;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         StoreGuilds.Actions.requestRoleMembers(j, j2, this, restAPI, storeGatewayConnection);
         Observable<StoreState> q = observable.q();
         m.checkNotNullExpressionValue(q, "storeStateObservable\n   …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(q), this, null, 2, null), ServerSettingsRoleMembersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        Observable<String> N = behaviorSubject.N(750, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(N, "searchQuerySubject\n     …0, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(N), this, null, 2, null), ServerSettingsRoleMembersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable<String> O = behaviorSubject.O(750, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(O, "searchQuerySubject\n     …0, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(O), this, null, 2, null), ServerSettingsRoleMembersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v2, resolved type: com.discord.widgets.servers.role_members.ServerSettingsRoleMembersViewModel$Companion */
@@ -440,9 +440,9 @@ public final class ServerSettingsRoleMembersViewModel extends AppViewModel<ViewS
         BehaviorSubject behaviorSubject2;
         StoreGatewayConnection gatewaySocket = (i & 4) != 0 ? StoreStream.Companion.getGatewaySocket() : storeGatewayConnection;
         if ((i & 8) != 0) {
-            BehaviorSubject k0 = BehaviorSubject.k0("");
-            m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(\"\")");
-            behaviorSubject2 = k0;
+            BehaviorSubject l0 = BehaviorSubject.l0("");
+            m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+            behaviorSubject2 = l0;
         } else {
             behaviorSubject2 = behaviorSubject;
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/role_members/WidgetServerSettingsRoleMembers.java b/app/src/main/java/com/discord/widgets/servers/role_members/WidgetServerSettingsRoleMembers.java
index 45013344b0..0f42250c4a 100644
--- a/app/src/main/java/com/discord/widgets/servers/role_members/WidgetServerSettingsRoleMembers.java
+++ b/app/src/main/java/com/discord/widgets/servers/role_members/WidgetServerSettingsRoleMembers.java
@@ -133,7 +133,7 @@ public final class WidgetServerSettingsRoleMembers extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         this.adapter = new ServerSettingsRoleMembersAdapter(this, null, 2, null);
-        RecyclerView recyclerView = getBinding().f2390c;
+        RecyclerView recyclerView = getBinding().f2388c;
         m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsRoleMembersList");
         ServerSettingsRoleMembersAdapter serverSettingsRoleMembersAdapter = this.adapter;
         if (serverSettingsRoleMembersAdapter == null) {
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
index e542234e7f..96fc97ed43 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
@@ -406,15 +406,15 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
             return;
         }
         if (model.getInviteItems() == null) {
-            AppViewFlipper appViewFlipper = getBinding().f2381c;
+            AppViewFlipper appViewFlipper = getBinding().f2379c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsInstantInvitesViewFlipper");
             appViewFlipper.setDisplayedChild(0);
         } else if (model.getInviteItems().isEmpty()) {
-            AppViewFlipper appViewFlipper2 = getBinding().f2381c;
+            AppViewFlipper appViewFlipper2 = getBinding().f2379c;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.serverSettingsInstantInvitesViewFlipper");
             appViewFlipper2.setDisplayedChild(2);
         } else {
-            AppViewFlipper appViewFlipper3 = getBinding().f2381c;
+            AppViewFlipper appViewFlipper3 = getBinding().f2379c;
             m.checkNotNullExpressionValue(appViewFlipper3, "binding.serverSettingsInstantInvitesViewFlipper");
             appViewFlipper3.setDisplayedChild(1);
             Adapter adapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
index fd6f6a18b4..6c2722bb82 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
@@ -160,7 +160,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
         super.onConfigure(i, (int) inviteItem);
         User inviter = inviteItem.getInvite().getInviter();
         this.binding.a.setOnClickListener(new WidgetServerSettingsInstantInvitesListItem$onConfigure$1(this, inviteItem));
-        TextView textView = this.binding.f2380c;
+        TextView textView = this.binding.f2378c;
         m.checkNotNullExpressionValue(textView, "binding.inviteCode");
         textView.setText(inviteItem.getInvite().code);
         TextView textView2 = this.binding.e;
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
index 72b2a3d444..acf31c0c9f 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
@@ -162,12 +162,12 @@ public final class WidgetServerSettingsMembers extends AppFragment {
 
     public WidgetServerSettingsMembers() {
         super(R.layout.widget_server_settings_members);
-        BehaviorSubject k0 = BehaviorSubject.k0("");
-        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(\"\")");
-        this.nameFilterPublisher = k0;
-        BehaviorSubject k02 = BehaviorSubject.k0(-1L);
-        m.checkNotNullExpressionValue(k02, "BehaviorSubject.create(-1L)");
-        this.roleFilterPublisher = k02;
+        BehaviorSubject l0 = BehaviorSubject.l0("");
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+        this.nameFilterPublisher = l0;
+        BehaviorSubject l02 = BehaviorSubject.l0(-1L);
+        m.checkNotNullExpressionValue(l02, "BehaviorSubject.create(-1L)");
+        this.roleFilterPublisher = l02;
         this.guildId$delegate = g.lazy(new WidgetServerSettingsMembers$guildId$2(this));
         this.loggingConfig = new LoggingConfig(false, null, WidgetServerSettingsMembers$loggingConfig$1.INSTANCE, 3);
     }
@@ -254,7 +254,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f2385c;
+        RecyclerView recyclerView = getBinding().f2383c;
         m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsMembersRecycler");
         this.adapter = (WidgetServerSettingsMembersAdapter) companion.configure(new WidgetServerSettingsMembersAdapter(recyclerView));
         if (!isRecreated()) {
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
index 19eb73f89e..7835fbdbc2 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
@@ -72,7 +72,7 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS
             m.checkNotNullExpressionValue(rolesListView3, "binding.memberListItemRolesList");
             int i2 = 0;
             rolesListView3.setVisibility(memberItem.getRoles().isEmpty() ^ true ? 0 : 8);
-            ImageView imageView = this.binding.f2384c;
+            ImageView imageView = this.binding.f2382c;
             m.checkNotNullExpressionValue(imageView, "binding.memberListItemLock");
             imageView.setVisibility(memberItem.isManagable() ^ true ? 0 : 8);
             ImageView imageView2 = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java
index e19bee0285..55a8a9a95f 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java
@@ -65,9 +65,9 @@ public final class WidgetServerSettingsMembersModel {
         public final Observable<WidgetServerSettingsMembersModel> get(long j, Observable<String> observable, Observable<Long> observable2) {
             m.checkNotNullParameter(observable, "filterPublisher");
             m.checkNotNullParameter(observable2, "roleFilterPublisher");
-            Observable<R> X = StoreStream.Companion.getGuilds().observeComputed(j).X(new WidgetServerSettingsMembersModel$Companion$get$1(j, observable, observable2));
-            m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-            Observable<WidgetServerSettingsMembersModel> q = ObservableExtensionsKt.computationLatest(X).q();
+            Observable<R> Y = StoreStream.Companion.getGuilds().observeComputed(j).Y(new WidgetServerSettingsMembersModel$Companion$get$1(j, observable, observable2));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+            Observable<WidgetServerSettingsMembersModel> q = ObservableExtensionsKt.computationLatest(Y).q();
             m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
             return q;
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
index 91b88fcc42..6b69770c82 100644
--- a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
@@ -586,7 +586,7 @@ public final class MuteSettingsSheetViewModel extends AppViewModel<ViewState> {
         this.storeUserGuildSettings = storeUserGuildSettings;
         this.clock = clock;
         this.config = j != 0 ? new Config.Guild(j) : new Config.Channel(j2);
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), MuteSettingsSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
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 62ecc0e947..dc0d34e7b1 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
@@ -198,7 +198,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             LinearLayout linearLayout = getBinding().o;
             m.checkNotNullExpressionValue(linearLayout, "binding.unmuteButton");
             linearLayout.setVisibility(0);
-            LinearLayout linearLayout2 = getBinding().f2318c;
+            LinearLayout linearLayout2 = getBinding().f2316c;
             m.checkNotNullExpressionValue(linearLayout2, "binding.muteSettingsSheetMuteOptions");
             linearLayout2.setVisibility(8);
             return;
@@ -206,7 +206,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
         LinearLayout linearLayout3 = getBinding().o;
         m.checkNotNullExpressionValue(linearLayout3, "binding.unmuteButton");
         linearLayout3.setVisibility(8);
-        LinearLayout linearLayout4 = getBinding().f2318c;
+        LinearLayout linearLayout4 = getBinding().f2316c;
         m.checkNotNullExpressionValue(linearLayout4, "binding.muteSettingsSheetMuteOptions");
         linearLayout4.setVisibility(0);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
index d715ce3cc6..8af00a8ae3 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
@@ -17,12 +17,12 @@ public final class WidgetSettings$configureToolbar$1<T1, T2> implements Action2<
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_settings_debugging /* 2131364206 */:
+            case R.id.menu_settings_debugging /* 2131364201 */:
                 WidgetDebugging.Companion companion = WidgetDebugging.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launch(context);
                 return;
-            case R.id.menu_settings_log_out /* 2131364207 */:
+            case R.id.menu_settings_log_out /* 2131364202 */:
                 WidgetSettings widgetSettings = this.this$0;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetSettings.access$showLogoutDialog(widgetSettings, context);
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 62109a65bd..8821c72e74 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@@ -252,20 +252,20 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         m.checkNotNullExpressionValue(textView5, "settingsPresenceText");
         textView5.setText(getString(PresenceUtils.INSTANCE.getStatusStringResForPresence(presence)));
         if (model.getPromoCount() > 0) {
-            TextView textView6 = binding.f2411r;
+            TextView textView6 = binding.f2409r;
             m.checkNotNullExpressionValue(textView6, "nitroGiftingBadge");
             textView6.setText(String.valueOf(model.getPromoCount()));
-            TextView textView7 = binding.f2411r;
+            TextView textView7 = binding.f2409r;
             m.checkNotNullExpressionValue(textView7, "nitroGiftingBadge");
             MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(new ShapeAppearanceModel.Builder().setAllCornerSizes(ShapeAppearanceModel.PILL).build());
             materialShapeDrawable.setFillColor(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.status_red_500)));
             textView7.setBackground(materialShapeDrawable);
-            TextView textView8 = binding.f2411r;
+            TextView textView8 = binding.f2409r;
             m.checkNotNullExpressionValue(textView8, "nitroGiftingBadge");
             textView8.setVisibility(0);
             return;
         }
-        TextView textView9 = binding.f2411r;
+        TextView textView9 = binding.f2409r;
         m.checkNotNullExpressionValue(textView9, "nitroGiftingBadge");
         textView9.setVisibility(8);
     }
@@ -313,29 +313,29 @@ 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 + " - 98.6 - Stable (98006)");
+        textView.setText(string + " - 98.9 - Stable (98009)");
         binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
         binding.s.setOnClickListener(WidgetSettings$onViewBound$1$7.INSTANCE);
-        binding.f2410c.setOnClickListener(WidgetSettings$onViewBound$1$8.INSTANCE);
-        binding.f2415z.setOnClickListener(WidgetSettings$onViewBound$1$9.INSTANCE);
+        binding.f2408c.setOnClickListener(WidgetSettings$onViewBound$1$8.INSTANCE);
+        binding.f2413z.setOnClickListener(WidgetSettings$onViewBound$1$9.INSTANCE);
         binding.i.setOnClickListener(WidgetSettings$onViewBound$1$10.INSTANCE);
-        binding.f2414y.setOnClickListener(WidgetSettings$onViewBound$1$11.INSTANCE);
+        binding.f2412y.setOnClickListener(WidgetSettings$onViewBound$1$11.INSTANCE);
         binding.l.setOnClickListener(WidgetSettings$onViewBound$1$12.INSTANCE);
         binding.h.setOnClickListener(WidgetSettings$onViewBound$1$13.INSTANCE);
         binding.b.setOnClickListener(WidgetSettings$onViewBound$1$14.INSTANCE);
         binding.j.setOnClickListener(WidgetSettings$onViewBound$1$15.INSTANCE);
         binding.p.setOnClickListener(WidgetSettings$onViewBound$1$16.INSTANCE);
         binding.e.setOnClickListener(WidgetSettings$onViewBound$1$17.INSTANCE);
-        binding.f2413x.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$4(this));
+        binding.f2411x.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$4(this));
         binding.G.setOnClickListener(WidgetSettings$onViewBound$1$19.INSTANCE);
         binding.K.setOnClickListener(WidgetSettings$onViewBound$1$20.INSTANCE);
         binding.F.setOnClickListener(WidgetSettings$onViewBound$1$21.INSTANCE);
         binding.H.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$5(binding, this));
         binding.d.setOnClickListener(WidgetSettings$onViewBound$1$23.INSTANCE);
         binding.k.setOnClickListener(WidgetSettings$onViewBound$1$24.INSTANCE);
-        binding.f2412w.setOnClickListener(WidgetSettings$onViewBound$1$25.INSTANCE);
+        binding.f2410w.setOnClickListener(WidgetSettings$onViewBound$1$25.INSTANCE);
         for (TextView textView2 : n.listOf((Object[]) new TextView[]{binding.I, binding.t, binding.g, binding.o, binding.f})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView2, "header");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java
index e11839d211..b33c2429ac 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java
@@ -13,8 +13,8 @@ public final class WidgetSettingsAccessibility$configureUI$2 implements View.OnC
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        CheckedSetting checkedSetting = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f2395c;
-        CheckedSetting checkedSetting2 = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f2395c;
+        CheckedSetting checkedSetting = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f2393c;
+        CheckedSetting checkedSetting2 = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f2393c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
         checkedSetting.g(!checkedSetting2.isChecked(), true);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
index 3ec320e8a1..a2293e5631 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
@@ -226,10 +226,10 @@ public final class WidgetSettingsAccessibility extends AppFragment {
                     radioManager2.a(checkedSetting5);
                 }
             }
-            CheckedSetting checkedSetting6 = getBinding().f2395c;
+            CheckedSetting checkedSetting6 = getBinding().f2393c;
             m.checkNotNullExpressionValue(checkedSetting6, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
             checkedSetting6.setChecked(false);
-            getBinding().f2395c.b(R.string.accessibility_reduced_motion_settings_override);
+            getBinding().f2393c.b(R.string.accessibility_reduced_motion_settings_override);
             return;
         }
         CheckedSetting checkedSetting7 = getBinding().b;
@@ -247,11 +247,11 @@ public final class WidgetSettingsAccessibility extends AppFragment {
         CheckedSetting checkedSetting10 = getBinding().k;
         m.checkNotNullExpressionValue(checkedSetting10, "binding.stickersNeverAnimate");
         configureStickerAnimationRadio(currentStickerAnimationSettings3, checkedSetting10, 2);
-        CheckedSetting checkedSetting11 = getBinding().f2395c;
+        CheckedSetting checkedSetting11 = getBinding().f2393c;
         m.checkNotNullExpressionValue(checkedSetting11, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
         checkedSetting11.setChecked(model.getAutoPlayGifs());
         getBinding().b.e(new WidgetSettingsAccessibility$configureUI$1(this));
-        getBinding().f2395c.e(new WidgetSettingsAccessibility$configureUI$2(this));
+        getBinding().f2393c.e(new WidgetSettingsAccessibility$configureUI$2(this));
     }
 
     private final WidgetSettingsAccessibilityBinding getBinding() {
@@ -270,7 +270,7 @@ public final class WidgetSettingsAccessibility extends AppFragment {
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsAccessib…yReducedMotionDescription");
         b.n(linkifiedTextView, R.string.accessibility_prefers_reduced_motion_description, new Object[]{f.a.a(360040613412L, null)}, null, 4);
         getBinding().b.setOnCheckedListener(new WidgetSettingsAccessibility$onViewBoundOrOnResume$3(this));
-        getBinding().f2395c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE);
+        getBinding().f2393c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE);
         this.stickersAnimationRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k}));
         for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().f, getBinding().d, getBinding().h})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
index 0664bbd006..09f76b1596 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
@@ -17,6 +17,6 @@ public final class WidgetSettingsAppearance$pureEvilEasterEggSubject$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final BehaviorSubject<Boolean> mo17invoke() {
-        return BehaviorSubject.k0(Boolean.valueOf(m.areEqual(StoreStream.Companion.getUserSettingsSystem().getTheme(), ModelUserSettings.THEME_PURE_EVIL)));
+        return BehaviorSubject.l0(Boolean.valueOf(m.areEqual(StoreStream.Companion.getUserSettingsSystem().getTheme(), ModelUserSettings.THEME_PURE_EVIL)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
index a9ff802f25..efd84c4325 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
@@ -54,7 +54,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     private static final int PURE_EVIL_UNLOCK_COUNT = 8;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAppearance$binding$2.INSTANCE, null, 2, null);
     private final AtomicInteger holyLightEasterEggCounter = new AtomicInteger(0);
-    private final BehaviorSubject<Integer> newFontScaleSubject = BehaviorSubject.j0();
+    private final BehaviorSubject<Integer> newFontScaleSubject = BehaviorSubject.k0();
     private final AtomicInteger pureEvilEasterEggCounter = new AtomicInteger(0);
     private final Lazy pureEvilEasterEggSubject$delegate = g.lazy(WidgetSettingsAppearance$pureEvilEasterEggSubject$2.INSTANCE);
     private ToastManager toastManager = new ToastManager();
@@ -299,7 +299,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
         getBinding().f.setOnSeekBarChangeListener(new WidgetSettingsAppearance$configureUI$4(this));
         getBinding().e.setOnClickListener(WidgetSettingsAppearance$configureUI$5.INSTANCE);
         setupMessage(model);
-        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().h, getBinding().f2407c})) {
+        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().h, getBinding().f2405c})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
@@ -329,7 +329,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     }
 
     private final void setupMessage(Model model) {
-        SimpleDraweeView simpleDraweeView = getBinding().b.f2195c;
+        SimpleDraweeView simpleDraweeView = getBinding().b.f2194c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatItem.chatListAdapterItemTextAvatar");
         IconUtils.setIcon$default(simpleDraweeView, model.getMeUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
         TextView textView = getBinding().b.f;
@@ -352,9 +352,9 @@ public final class WidgetSettingsAppearance extends AppFragment {
         View view = getBinding().g;
         m.checkNotNullExpressionValue(view, "binding.settingsAppearanceHolyLight");
         view.setVisibility(0);
-        Observable<Long> c02 = Observable.c0(3, TimeUnit.SECONDS);
-        m.checkNotNullExpressionValue(c02, "Observable\n        .timer(3, TimeUnit.SECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), WidgetSettingsAppearance.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAppearance$showHolyLight$1(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(3, TimeUnit.SECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .timer(3, TimeUnit.SECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetSettingsAppearance.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAppearance$showHolyLight$1(this), 62, (Object) null);
     }
 
     private final void tryEnableTorchMode(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
index 23ecc3e75a..3595b7b997 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
@@ -67,7 +67,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
             RecyclerView recyclerView = widgetSettingsAuthorizedAppsListItemBinding.i;
             m.checkNotNullExpressionValue(recyclerView, "binding.oauthApplicationPermissionsRv");
             recyclerView.setAdapter(simpleRecyclerAdapter);
-            for (TextView textView : n.listOf((Object[]) new TextView[]{widgetSettingsAuthorizedAppsListItemBinding.g, widgetSettingsAuthorizedAppsListItemBinding.f2408c, widgetSettingsAuthorizedAppsListItemBinding.h})) {
+            for (TextView textView : n.listOf((Object[]) new TextView[]{widgetSettingsAuthorizedAppsListItemBinding.g, widgetSettingsAuthorizedAppsListItemBinding.f2406c, widgetSettingsAuthorizedAppsListItemBinding.h})) {
                 AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
                 m.checkNotNullExpressionValue(textView, "header");
                 accessibilityUtils.setViewIsHeading(textView);
@@ -92,7 +92,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
             MaterialCardView materialCardView = this.binding.f;
             m.checkNotNullExpressionValue(materialCardView, "binding.oauthApplicationListItem");
             materialCardView.setContentDescription(application.g());
-            TextView textView2 = this.binding.f2408c;
+            TextView textView2 = this.binding.f2406c;
             m.checkNotNullExpressionValue(textView2, "binding.oauthApplicationDescriptionLabelTv");
             String c2 = application.c();
             int i = 0;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
index dc8e173ca9..996d4436c0 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
@@ -78,7 +78,7 @@ public final class WidgetSettingsBehavior extends AppFragment {
         CheckedSetting checkedSetting3 = getBinding().b;
         checkedSetting3.setChecked(userSettings.getIsChromeCustomTabsEnabled());
         checkedSetting3.setOnCheckedListener(new WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3(userSettings));
-        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().e, getBinding().f2409c})) {
+        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().e, getBinding().f2407c})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
index dcc296f9fc..36456d4b44 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
@@ -272,7 +272,7 @@ public final class WidgetSettingsLanguage extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.settingsLanguageCurrentText");
         Companion companion = Companion;
         textView.setText(getString(companion.getLocaleResId(str)));
-        getBinding().f2426c.setImageResource(companion.getLocaleFlagResId(str));
+        getBinding().f2424c.setImageResource(companion.getLocaleFlagResId(str));
     }
 
     private final WidgetSettingsLanguageBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
index 5bb8b2733b..8a34d0340d 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
@@ -88,7 +88,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
                 m.checkNotNullParameter(item, "data");
                 super.onConfigure(i, (int) item);
                 this.binding.a.setOnClickListener(new WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$onConfigure$1(this, item));
-                TextView textView = this.binding.f2427c;
+                TextView textView = this.binding.f2425c;
                 m.checkNotNullExpressionValue(textView, "binding.settingsLanguageSelectItemName");
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
index d36374d954..a86234f54f 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
@@ -89,8 +89,8 @@ public final class WidgetSettingsMedia extends AppFragment {
         checkedSetting.setChecked(storeUserSettings.getIsAttachmentMediaInline());
         CheckedSetting.i(getBinding().b, b.k(this, R.string.inline_attachment_media_help, new Object[]{PREVIEW_MAX_SIZE_MB}, null, 4), false, 2);
         getBinding().b.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$1(this));
-        getBinding().f2428c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this));
-        CheckedSetting checkedSetting2 = getBinding().f2428c;
+        getBinding().f2426c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this));
+        CheckedSetting checkedSetting2 = getBinding().f2426c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.compressionToggle");
         StoreUserSettings storeUserSettings2 = this.userSettings;
         if (storeUserSettings2 == null) {
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java
index d73270fdfd..0cb6fd3b34 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java
@@ -36,7 +36,7 @@ public final class WidgetSettingsNotifications$onViewBoundOrOnResume$1 extends o
         CheckedSetting checkedSetting2 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).b;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsInappNotifsSwitch");
         checkedSetting2.setChecked(settingsV2.isEnabledInApp());
-        CheckedSetting checkedSetting3 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f2430c;
+        CheckedSetting checkedSetting3 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f2428c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsNotificationsBlink");
         checkedSetting3.setChecked(settingsV2.isDisableBlink());
         CheckedSetting checkedSetting4 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
index 8bab8a4310..5273086115 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
@@ -66,7 +66,7 @@ public final class WidgetSettingsNotifications extends AppFragment {
         StoreNotifications storeNotifications = this.notificationStore;
         getBinding().d.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$1(storeNotifications));
         getBinding().b.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$2(storeNotifications));
-        getBinding().f2430c.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$3(storeNotifications));
+        getBinding().f2428c.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$3(storeNotifications));
         getBinding().f.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$4(storeNotifications));
         getBinding().e.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$5(storeNotifications));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
index 497efa568e..296012fccb 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
@@ -74,6 +74,6 @@ public final class WidgetSettingsNotificationsOs extends AppBottomSheet {
         super.onViewCreated(view, bundle);
         getBinding().d.setOnCheckedListener(WidgetSettingsNotificationsOs$onViewCreated$1.INSTANCE);
         getBinding().b.setOnCheckedListener(WidgetSettingsNotificationsOs$onViewCreated$2.INSTANCE);
-        getBinding().f2429c.setOnClickListener(new WidgetSettingsNotificationsOs$onViewCreated$3(this));
+        getBinding().f2427c.setOnClickListener(new WidgetSettingsNotificationsOs$onViewCreated$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java
index 74e1534405..6a9059d2df 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java
@@ -48,9 +48,9 @@ public final class WidgetSettingsPrivacy$Model$Companion$get$3<T, R> implements
 
         public final Observable<? extends RestAPI.HarvestState> call(MeUser meUser) {
             RetryWithDelay retryWithDelay = RetryWithDelay.INSTANCE;
-            Observable<RestAPI.HarvestState> H = RestAPI.Companion.getApi().getHarvestStatusGuarded().H(a.c());
-            m.checkNotNullExpressionValue(H, "RestAPI\n                …bserveOn(Schedulers.io())");
-            return RetryWithDelay.restRetry$default(retryWithDelay, H, 0, null, null, 7, null).p(500, TimeUnit.MILLISECONDS).K(AnonymousClass1.INSTANCE);
+            Observable<RestAPI.HarvestState> I = RestAPI.Companion.getApi().getHarvestStatusGuarded().I(a.c());
+            m.checkNotNullExpressionValue(I, "RestAPI\n                …bserveOn(Schedulers.io())");
+            return RetryWithDelay.restRetry$default(retryWithDelay, I, 0, null, null, 7, null).p(500, TimeUnit.MILLISECONDS).L(AnonymousClass1.INSTANCE);
         }
     }
 
@@ -76,6 +76,6 @@ public final class WidgetSettingsPrivacy$Model$Companion$get$3<T, R> implements
     public final Observable<? extends WidgetSettingsPrivacy.Model> call(WidgetSettingsPrivacy.LocalState localState) {
         j jVar = new j(localState);
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(jVar, companion.getUserSettings().observeConsents(), Observable.G(new j(null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).w(AnonymousClass1.INSTANCE).y(AnonymousClass2.INSTANCE)), AnonymousClass3.INSTANCE);
+        return Observable.i(jVar, companion.getUserSettings().observeConsents(), Observable.H(new j(null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).x(AnonymousClass1.INSTANCE).z(AnonymousClass2.INSTANCE)), AnonymousClass3.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
index b8c0009ddb..304dce50e2 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
@@ -22,7 +22,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$2 implement
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2433c;
+        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2431c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncSettingEnabled");
         boolean z2 = !checkedSetting.isChecked();
         if (this.$model.getContactSyncConnection() != null) {
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java
index 89a8793389..8e294460bf 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java
@@ -21,7 +21,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$3 implement
         m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncSettingEmail");
         boolean isChecked = checkedSetting2.isChecked();
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2433c;
+        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2431c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEnabled");
         boolean isChecked2 = checkedSetting3.isChecked();
         CheckedSetting checkedSetting4 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).b;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java
index 4f262fb5a4..da08417bb4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java
@@ -21,7 +21,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$4 implement
         m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncSettingPhone");
         boolean isChecked = checkedSetting2.isChecked();
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2433c;
+        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2431c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEnabled");
         boolean isChecked2 = checkedSetting3.isChecked();
         CheckedSetting checkedSetting4 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).e;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
index 817b833ab6..d4f9288785 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
@@ -37,10 +37,10 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
             @Override // android.view.View.OnClickListener
             public final void onClick(View view) {
                 this.$dialog.dismiss();
-                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f2438z;
+                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f2436z;
                 m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
                 checkedSetting.setChecked(true);
-                CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f2438z;
+                CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f2436z;
                 m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics");
                 checkedSetting2.setEnabled(true);
             }
@@ -65,7 +65,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
                 Boolean bool = r4.$consented;
                 m.checkNotNullExpressionValue(bool, "consented");
                 boolean booleanValue = bool.booleanValue();
-                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f2438z;
+                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f2436z;
                 m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
                 WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, RestAPIParams.Consents.Type.USAGE_STATS, checkedSetting);
             }
@@ -107,14 +107,14 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
     }
 
     public final void call(Boolean bool) {
-        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2438z;
+        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2436z;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
         checkedSetting.setEnabled(false);
         m.checkNotNullExpressionValue(bool, "consented");
         if (bool.booleanValue()) {
             WidgetSettingsPrivacy widgetSettingsPrivacy = this.this$0;
             boolean booleanValue = bool.booleanValue();
-            CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2438z;
+            CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2436z;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics");
             WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, RestAPIParams.Consents.Type.USAGE_STATS, checkedSetting2);
             return;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java
index e31f48b25f..bc38cd2fa8 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java
@@ -19,6 +19,6 @@ public final class WidgetSettingsPrivacy$friendSourceRadios$2 extends o implemen
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final List<? extends CheckedSetting> mo17invoke() {
-        return n.listOf((Object[]) new CheckedSetting[]{WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2434r, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).s, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).t});
+        return n.listOf((Object[]) new CheckedSetting[]{WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2432r, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).s, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).t});
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java
index 499ecea7a5..8e173b230b 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java
@@ -24,7 +24,7 @@ public final class WidgetSettingsPrivacy$onViewBoundOrOnResume$2 extends o imple
     }
 
     public final void invoke(boolean z2) {
-        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2437y;
+        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f2435y;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyScreenreaderDetection");
         checkedSetting.setChecked(z2);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
index e02a37e6c6..fd0fd929fa 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
@@ -90,12 +90,12 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         private final ModelUserSettings.FriendSourceFlags friendSourceFlags;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2651me;
+        private final MeUser f2649me;
         private final int userDiscoveryFlags;
 
         public LocalState(MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, ModelConnectedAccount modelConnectedAccount, Experiment experiment, int i2) {
             m.checkNotNullParameter(meUser, "me");
-            this.f2651me = meUser;
+            this.f2649me = meUser;
             this.explicitContentFilter = i;
             this.defaultRestrictedGuilds = z2;
             this.friendSourceFlags = friendSourceFlags;
@@ -106,7 +106,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
 
         public static /* synthetic */ LocalState copy$default(LocalState localState, MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, ModelConnectedAccount modelConnectedAccount, Experiment experiment, int i2, int i3, Object obj) {
             if ((i3 & 1) != 0) {
-                meUser = localState.f2651me;
+                meUser = localState.f2649me;
             }
             if ((i3 & 2) != 0) {
                 i = localState.explicitContentFilter;
@@ -130,7 +130,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public final MeUser component1() {
-            return this.f2651me;
+            return this.f2649me;
         }
 
         public final int component2() {
@@ -170,7 +170,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
                 return false;
             }
             LocalState localState = (LocalState) obj;
-            return m.areEqual(this.f2651me, localState.f2651me) && this.explicitContentFilter == localState.explicitContentFilter && this.defaultRestrictedGuilds == localState.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, localState.friendSourceFlags) && m.areEqual(this.contactSyncConnection, localState.contactSyncConnection) && m.areEqual(this.contactSyncExperiment, localState.contactSyncExperiment) && this.userDiscoveryFlags == localState.userDiscoveryFlags;
+            return m.areEqual(this.f2649me, localState.f2649me) && this.explicitContentFilter == localState.explicitContentFilter && this.defaultRestrictedGuilds == localState.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, localState.friendSourceFlags) && m.areEqual(this.contactSyncConnection, localState.contactSyncConnection) && m.areEqual(this.contactSyncExperiment, localState.contactSyncExperiment) && this.userDiscoveryFlags == localState.userDiscoveryFlags;
         }
 
         public final ModelConnectedAccount getContactSyncConnection() {
@@ -194,7 +194,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public final MeUser getMe() {
-            return this.f2651me;
+            return this.f2649me;
         }
 
         public final int getUserDiscoveryFlags() {
@@ -202,7 +202,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2651me;
+            MeUser meUser = this.f2649me;
             int i = 0;
             int hashCode = (((meUser != null ? meUser.hashCode() : 0) * 31) + this.explicitContentFilter) * 31;
             boolean z2 = this.defaultRestrictedGuilds;
@@ -226,7 +226,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
 
         public String toString() {
             StringBuilder O = a.O("LocalState(me=");
-            O.append(this.f2651me);
+            O.append(this.f2649me);
             O.append(", explicitContentFilter=");
             O.append(this.explicitContentFilter);
             O.append(", defaultRestrictedGuilds=");
@@ -253,7 +253,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         private final RestAPI.HarvestState harvestState;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2652me;
+        private final MeUser f2650me;
         private final boolean showContactSync;
         private final int userDiscoveryFlags;
 
@@ -275,16 +275,16 @@ public final class WidgetSettingsPrivacy extends AppFragment {
                 Observable<Integer> observeExplicitContentFilter = companion.getUserSettings().observeExplicitContentFilter();
                 Observable<Boolean> observeIsDefaultGuildsRestricted = companion.getUserSettings().observeIsDefaultGuildsRestricted();
                 Observable<ModelUserSettings.FriendSourceFlags> observeFriendSourceFlags = companion.getUserSettings().observeFriendSourceFlags();
-                Observable E = companion.getUserConnections().observeConnectedAccounts().E(WidgetSettingsPrivacy$Model$Companion$get$1.INSTANCE);
+                Observable F = companion.getUserConnections().observeConnectedAccounts().F(WidgetSettingsPrivacy$Model$Companion$get$1.INSTANCE);
                 Observable<Experiment> observeUserExperiment = companion.getExperiments().observeUserExperiment("2021-04_contact_sync_android_main", true);
                 Observable<Integer> observeFriendDiscoveryFlags = companion.getUserSettings().observeFriendDiscoveryFlags();
                 WidgetSettingsPrivacy$Model$Companion$get$2 widgetSettingsPrivacy$Model$Companion$get$2 = WidgetSettingsPrivacy$Model$Companion$get$2.INSTANCE;
                 if (widgetSettingsPrivacy$Model$Companion$get$2 != null) {
                     widgetSettingsPrivacy$Model$Companion$get$2 = new WidgetSettingsPrivacy$sam$rx_functions_Func7$0(widgetSettingsPrivacy$Model$Companion$get$2);
                 }
-                Observable X = Observable.e(observeMe$default, observeExplicitContentFilter, observeIsDefaultGuildsRestricted, observeFriendSourceFlags, E, observeUserExperiment, observeFriendDiscoveryFlags, (Func7) widgetSettingsPrivacy$Model$Companion$get$2).X(WidgetSettingsPrivacy$Model$Companion$get$3.INSTANCE);
-                m.checkNotNullExpressionValue(X, "Observable\n          .co…            }\n          }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable Y = Observable.e(observeMe$default, observeExplicitContentFilter, observeIsDefaultGuildsRestricted, observeFriendSourceFlags, F, observeUserExperiment, observeFriendDiscoveryFlags, (Func7) widgetSettingsPrivacy$Model$Companion$get$2).Y(WidgetSettingsPrivacy$Model$Companion$get$3.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "Observable\n          .co…            }\n          }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "Observable\n          .co…  .distinctUntilChanged()");
                 return q;
             }
@@ -293,7 +293,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         public Model(MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, int i2, ModelConnectedAccount modelConnectedAccount, boolean z3, Consents consents, RestAPI.HarvestState harvestState) {
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(consents, "consents");
-            this.f2652me = meUser;
+            this.f2650me = meUser;
             this.explicitContentFilter = i;
             this.defaultRestrictedGuilds = z2;
             this.friendSourceFlags = friendSourceFlags;
@@ -305,11 +305,11 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, int i2, ModelConnectedAccount modelConnectedAccount, boolean z3, Consents consents, RestAPI.HarvestState harvestState, int i3, Object obj) {
-            return model.copy((i3 & 1) != 0 ? model.f2652me : meUser, (i3 & 2) != 0 ? model.explicitContentFilter : i, (i3 & 4) != 0 ? model.defaultRestrictedGuilds : z2, (i3 & 8) != 0 ? model.friendSourceFlags : friendSourceFlags, (i3 & 16) != 0 ? model.userDiscoveryFlags : i2, (i3 & 32) != 0 ? model.contactSyncConnection : modelConnectedAccount, (i3 & 64) != 0 ? model.showContactSync : z3, (i3 & 128) != 0 ? model.consents : consents, (i3 & 256) != 0 ? model.harvestState : harvestState);
+            return model.copy((i3 & 1) != 0 ? model.f2650me : meUser, (i3 & 2) != 0 ? model.explicitContentFilter : i, (i3 & 4) != 0 ? model.defaultRestrictedGuilds : z2, (i3 & 8) != 0 ? model.friendSourceFlags : friendSourceFlags, (i3 & 16) != 0 ? model.userDiscoveryFlags : i2, (i3 & 32) != 0 ? model.contactSyncConnection : modelConnectedAccount, (i3 & 64) != 0 ? model.showContactSync : z3, (i3 & 128) != 0 ? model.consents : consents, (i3 & 256) != 0 ? model.harvestState : harvestState);
         }
 
         public final MeUser component1() {
-            return this.f2652me;
+            return this.f2650me;
         }
 
         public final int component2() {
@@ -358,7 +358,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.f2652me, model.f2652me) && this.explicitContentFilter == model.explicitContentFilter && this.defaultRestrictedGuilds == model.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, model.friendSourceFlags) && this.userDiscoveryFlags == model.userDiscoveryFlags && m.areEqual(this.contactSyncConnection, model.contactSyncConnection) && this.showContactSync == model.showContactSync && m.areEqual(this.consents, model.consents) && m.areEqual(this.harvestState, model.harvestState);
+            return m.areEqual(this.f2650me, model.f2650me) && this.explicitContentFilter == model.explicitContentFilter && this.defaultRestrictedGuilds == model.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, model.friendSourceFlags) && this.userDiscoveryFlags == model.userDiscoveryFlags && m.areEqual(this.contactSyncConnection, model.contactSyncConnection) && this.showContactSync == model.showContactSync && m.areEqual(this.consents, model.consents) && m.areEqual(this.harvestState, model.harvestState);
         }
 
         public final Consents getConsents() {
@@ -386,7 +386,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public final MeUser getMe() {
-            return this.f2652me;
+            return this.f2650me;
         }
 
         public final boolean getShowContactSync() {
@@ -398,7 +398,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2652me;
+            MeUser meUser = this.f2650me;
             int i = 0;
             int hashCode = (((meUser != null ? meUser.hashCode() : 0) * 31) + this.explicitContentFilter) * 31;
             boolean z2 = this.defaultRestrictedGuilds;
@@ -430,7 +430,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
 
         public String toString() {
             StringBuilder O = a.O("Model(me=");
-            O.append(this.f2652me);
+            O.append(this.f2650me);
             O.append(", explicitContentFilter=");
             O.append(this.explicitContentFilter);
             O.append(", defaultRestrictedGuilds=");
@@ -520,7 +520,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.contactSyncSettingInfo");
             textView2.setMovementMethod(LinkMovementMethod.getInstance());
-            CheckedSetting checkedSetting = getBinding().f2433c;
+            CheckedSetting checkedSetting = getBinding().f2431c;
             m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncSettingEnabled");
             ModelConnectedAccount contactSyncConnection = model.getContactSyncConnection();
             checkedSetting.setChecked(contactSyncConnection != null && contactSyncConnection.isFriendSync());
@@ -530,7 +530,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
             CheckedSetting checkedSetting3 = getBinding().b;
             m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEmail");
             checkedSetting3.setChecked((model.getUserDiscoveryFlags() & 4) == 4);
-            getBinding().f2433c.e(new WidgetSettingsPrivacy$configureContactSyncOptions$2(this, model));
+            getBinding().f2431c.e(new WidgetSettingsPrivacy$configureContactSyncOptions$2(this, model));
             getBinding().e.e(new WidgetSettingsPrivacy$configureContactSyncOptions$3(this));
             getBinding().b.e(new WidgetSettingsPrivacy$configureContactSyncOptions$4(this));
             CheckedSetting checkedSetting4 = getBinding().f;
@@ -593,10 +593,10 @@ public final class WidgetSettingsPrivacy extends AppFragment {
             LinearLayout linearLayout = getBinding().k;
             m.checkNotNullExpressionValue(linearLayout, "binding.settingsPrivacyControls");
             linearLayout.setVisibility(0);
-            CheckedSetting checkedSetting = getBinding().f2438z;
+            CheckedSetting checkedSetting = getBinding().f2436z;
             m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
             checkedSetting.setChecked(model.getConsents().getUsageStatistics().getConsented());
-            getBinding().f2438z.setOnCheckedListener(new WidgetSettingsPrivacy$configurePrivacyControls$1(this, context));
+            getBinding().f2436z.setOnCheckedListener(new WidgetSettingsPrivacy$configurePrivacyControls$1(this, context));
             CheckedSetting checkedSetting2 = getBinding().v;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization");
             checkedSetting2.setChecked(model.getConsents().getPersonalization().getConsented());
@@ -605,7 +605,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     private final void configureRequestDataButton(boolean z2, RestAPI.HarvestState harvestState) {
-        getBinding().f2435w.setOnClickListener(new WidgetSettingsPrivacy$configureRequestDataButton$1(this, z2, harvestState));
+        getBinding().f2433w.setOnClickListener(new WidgetSettingsPrivacy$configureRequestDataButton$1(this, z2, harvestState));
     }
 
     private final void configureUI(Model model) {
@@ -739,9 +739,9 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     private final void updateDefaultGuildsRestricted(boolean z2, boolean z3) {
-        Observable Y = (!z3 ? new i0.l.e.j(null) : !z2 ? new i0.l.e.j(n0.emptySet()) : StoreStream.Companion.getGuilds().observeGuilds().E(WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.INSTANCE)).Y(1);
-        m.checkNotNullExpressionValue(Y, "when {\n      !applyToExi… }\n    }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Y), this, null, 2, null), WidgetSettingsPrivacy.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2(this, z2), 62, (Object) null);
+        Observable Z = (!z3 ? new i0.l.e.j(null) : !z2 ? new i0.l.e.j(n0.emptySet()) : StoreStream.Companion.getGuilds().observeGuilds().F(WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.INSTANCE)).Z(1);
+        m.checkNotNullExpressionValue(Z, "when {\n      !applyToExi… }\n    }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Z), this, null, 2, null), WidgetSettingsPrivacy.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2(this, z2), 62, (Object) null);
         AlertDialog alertDialog = this.dialog;
         if (alertDialog != null) {
             alertDialog.dismiss();
@@ -796,11 +796,11 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization");
         f fVar = f.a;
         checkedSetting.h(b.j(checkedSetting2, R.string.data_privacy_controls_personalization_note_learn_more, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
-        CheckedSetting checkedSetting3 = getBinding().f2437y;
-        CheckedSetting checkedSetting4 = getBinding().f2437y;
+        CheckedSetting checkedSetting3 = getBinding().f2435y;
+        CheckedSetting checkedSetting4 = getBinding().f2435y;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.settingsPrivacyScreenreaderDetection");
         checkedSetting3.h(b.j(checkedSetting4, R.string.data_privacy_controls_allow_accessibility_detection_note, new Object[]{fVar.a(360035966492L, null)}, null, 4), true);
-        CheckedSetting checkedSetting5 = getBinding().f2437y;
+        CheckedSetting checkedSetting5 = getBinding().f2435y;
         checkedSetting5.setOnCheckedListener(new WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1(checkedSetting5, this));
         getBinding().i.setButtonVisibility(false);
         CheckedSetting checkedSetting6 = getBinding().i;
@@ -821,11 +821,11 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         sb.append(')');
         textView.setText(b.l(sb.toString(), new Object[0], null, 2));
         getBinding().h.setOnClickListener(new WidgetSettingsPrivacy$onViewBound$4(a));
-        CheckedSetting checkedSetting8 = getBinding().f2438z;
-        CheckedSetting checkedSetting9 = getBinding().f2438z;
+        CheckedSetting checkedSetting8 = getBinding().f2436z;
+        CheckedSetting checkedSetting9 = getBinding().f2436z;
         m.checkNotNullExpressionValue(checkedSetting9, "binding.settingsPrivacyStatistics");
         checkedSetting8.h(b.j(checkedSetting9, R.string.data_privacy_controls_usage_statistics_note, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
-        for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f2436x, getBinding().n, getBinding().u, getBinding().l})) {
+        for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f2434x, getBinding().n, getBinding().u, getBinding().l})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView3, "header");
             accessibilityUtils.setViewIsHeading(textView3);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
index 638d318c21..e63ff6632e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
@@ -66,7 +66,7 @@ public final class WidgetSettingsVoice extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsVoice$binding$2.INSTANCE, null, 2, null);
     private List<CheckedSetting> openSLESConfigRadioButtons;
     private RadioManager openSLESConfigRadioManager;
-    private final BehaviorSubject<Boolean> requestListenForSensitivitySubject = BehaviorSubject.k0(Boolean.FALSE);
+    private final BehaviorSubject<Boolean> requestListenForSensitivitySubject = BehaviorSubject.l0(Boolean.FALSE);
 
     /* compiled from: WidgetSettingsVoice.kt */
     public static final class Companion {
@@ -133,7 +133,7 @@ public final class WidgetSettingsVoice extends AppFragment {
             super.onViewCreated(view, bundle);
             setBottomSheetCollapsedStateDisabled();
             getBinding().b.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$1(this));
-            getBinding().f2446c.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$2(this));
+            getBinding().f2444c.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$2(this));
         }
     }
 
@@ -163,12 +163,12 @@ public final class WidgetSettingsVoice extends AppFragment {
                 Observable j = Observable.j(observable, companion.getMediaEngine().getIsNativeEngineInitialized(), WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.INSTANCE);
                 Observable<StoreMediaSettings.VoiceConfiguration> voiceConfig = companion.getMediaSettings().getVoiceConfig();
                 Observable<MediaEngine.OpenSLESConfig> openSLESConfig = companion.getMediaEngine().getOpenSLESConfig();
-                Observable X = j.X(WidgetSettingsVoice$Model$Companion$get$1.INSTANCE);
+                Observable Y = j.Y(WidgetSettingsVoice$Model$Companion$get$1.INSTANCE);
                 WidgetSettingsVoice$Model$Companion$get$2 widgetSettingsVoice$Model$Companion$get$2 = WidgetSettingsVoice$Model$Companion$get$2.INSTANCE;
                 if (widgetSettingsVoice$Model$Companion$get$2 != null) {
                     widgetSettingsVoice$Model$Companion$get$2 = new WidgetSettingsVoice$sam$rx_functions_Func3$0(widgetSettingsVoice$Model$Companion$get$2);
                 }
-                Observable i = Observable.i(voiceConfig, openSLESConfig, X, (Func3) widgetSettingsVoice$Model$Companion$get$2);
+                Observable i = Observable.i(voiceConfig, openSLESConfig, Y, (Func3) widgetSettingsVoice$Model$Companion$get$2);
                 m.checkNotNullExpressionValue(i, "Observable\n            .…    ::Model\n            )");
                 Observable<Model> q = ObservableExtensionsKt.computationLatest(i).q();
                 m.checkNotNullExpressionValue(q, "Observable\n            .…  .distinctUntilChanged()");
@@ -332,10 +332,10 @@ public final class WidgetSettingsVoice extends AppFragment {
         }
         checkedSetting6.setChecked(z2);
         getBinding().h.setOnCheckedListener(WidgetSettingsVoice$configureUI$6.INSTANCE);
-        CheckedSetting checkedSetting7 = getBinding().f2440c;
+        CheckedSetting checkedSetting7 = getBinding().f2438c;
         m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsVoiceEchoCancellationToggle");
         checkedSetting7.setChecked(model.getVoiceConfig().getEchoCancellation());
-        getBinding().f2440c.setOnCheckedListener(WidgetSettingsVoice$configureUI$7.INSTANCE);
+        getBinding().f2438c.setOnCheckedListener(WidgetSettingsVoice$configureUI$7.INSTANCE);
         CheckedSetting checkedSetting8 = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting8, "binding.settingsVoiceAutoVadToggle");
         checkedSetting8.setChecked(model.getVoiceConfig().getAutomaticVad());
@@ -358,43 +358,43 @@ public final class WidgetSettingsVoice extends AppFragment {
         m.checkNotNullExpressionValue(relativeLayout, "binding.settingsVoiceSensitivityWrap");
         int i = 8;
         relativeLayout.setVisibility(model.getModeVAD() ? 0 : 8);
-        TextView textView = getBinding().f2443x;
+        TextView textView = getBinding().f2441x;
         m.checkNotNullExpressionValue(textView, "binding.settingsVoiceSensitivityLabel");
         textView.setVisibility(model.getVoiceConfig().getAutomaticVad() ? 0 : 8);
         boolean z2 = !m.areEqual(model.getLocalVoiceStatus(), LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED);
         LinearLayout linearLayout = getBinding().A;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsVoiceSensitivityTestingContainer");
         linearLayout.setVisibility(z2 ? 0 : 8);
-        MaterialButton materialButton = getBinding().f2445z;
+        MaterialButton materialButton = getBinding().f2443z;
         m.checkNotNullExpressionValue(materialButton, "binding.settingsVoiceSensitivityTestButton");
         if (!z2) {
             i = 0;
         }
         materialButton.setVisibility(i);
-        getBinding().f2445z.setOnClickListener(new WidgetSettingsVoice$configureVoiceSensitivity$1(this));
+        getBinding().f2443z.setOnClickListener(new WidgetSettingsVoice$configureVoiceSensitivity$1(this));
         if (model.getVoiceConfig().getAutomaticVad()) {
-            View view = getBinding().f2442w;
+            View view = getBinding().f2440w;
             m.checkNotNullExpressionValue(view, "binding.settingsVoiceSensitivityAutomatic");
             view.setVisibility(0);
-            SeekBar seekBar = getBinding().f2444y;
+            SeekBar seekBar = getBinding().f2442y;
             m.checkNotNullExpressionValue(seekBar, "binding.settingsVoiceSensitivityManual");
             seekBar.setVisibility(4);
             int i2 = model.getLocalVoiceStatus().b ? R.drawable.drawable_voice_indicator_speaking : R.drawable.drawable_voice_indicator_not_speaking;
-            View view2 = getBinding().f2442w;
+            View view2 = getBinding().f2440w;
             m.checkNotNullExpressionValue(view2, "binding.settingsVoiceSensitivityAutomatic");
             view2.setBackground(ContextCompat.getDrawable(requireContext(), i2));
             return;
         }
-        View view3 = getBinding().f2442w;
+        View view3 = getBinding().f2440w;
         m.checkNotNullExpressionValue(view3, "binding.settingsVoiceSensitivityAutomatic");
         view3.setVisibility(4);
-        SeekBar seekBar2 = getBinding().f2444y;
+        SeekBar seekBar2 = getBinding().f2442y;
         m.checkNotNullExpressionValue(seekBar2, "binding.settingsVoiceSensitivityManual");
         seekBar2.setVisibility(0);
-        SeekBar seekBar3 = getBinding().f2444y;
+        SeekBar seekBar3 = getBinding().f2442y;
         m.checkNotNullExpressionValue(seekBar3, "binding.settingsVoiceSensitivityManual");
         seekBar3.setSecondaryProgress(((int) model.getLocalVoiceStatus().a) + 100);
-        SeekBar seekBar4 = getBinding().f2444y;
+        SeekBar seekBar4 = getBinding().f2442y;
         m.checkNotNullExpressionValue(seekBar4, "binding.settingsVoiceSensitivityManual");
         seekBar4.setProgress(((int) model.getVoiceConfig().getSensitivity()) + 100);
     }
@@ -423,10 +423,10 @@ public final class WidgetSettingsVoice extends AppFragment {
     private final void onOverlayToggled(Context context) {
         StoreStream.Companion companion = StoreStream.Companion;
         if (companion.getUserSettings().getIsMobileOverlayEnabled()) {
-            Observable<RtcConnection.StateChange> w2 = companion.getRtcConnection().getConnectionState().w(WidgetSettingsVoice$onOverlayToggled$1.INSTANCE);
-            Observable<R> E = companion.getVoiceChannelSelected().observeSelectedChannel().w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable j = Observable.j(w2, E, WidgetSettingsVoice$onOverlayToggled$2.INSTANCE);
+            Observable<RtcConnection.StateChange> x2 = companion.getRtcConnection().getConnectionState().x(WidgetSettingsVoice$onOverlayToggled$1.INSTANCE);
+            Observable<R> F = companion.getVoiceChannelSelected().observeSelectedChannel().x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable j = Observable.j(x2, F, WidgetSettingsVoice$onOverlayToggled$2.INSTANCE);
             m.checkNotNullExpressionValue(j, "Observable\n          .co… -> rtcState to channel }");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout(j, 200, false), this, null, 2, null), WidgetSettingsVoice.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsVoice$onOverlayToggled$3(context), 62, (Object) null);
             return;
@@ -476,7 +476,7 @@ public final class WidgetSettingsVoice extends AppFragment {
         m.checkNotNullExpressionValue(checkedSetting4, "binding.settingsVoiceOverlayToggle");
         checkedSetting4.setChecked(StoreStream.Companion.getUserSettings().getIsMobileOverlayEnabled() && Companion.access$hasOverlayPermission(Companion, requireContext()));
         getBinding().u.setOnCheckedListener(new WidgetSettingsVoice$onViewBound$1(this));
-        for (TextView textView2 : n.listOf((Object[]) new TextView[]{getBinding().f, getBinding().f2441r, getBinding().t, getBinding().v, getBinding().C, getBinding().m})) {
+        for (TextView textView2 : n.listOf((Object[]) new TextView[]{getBinding().f, getBinding().f2439r, getBinding().t, getBinding().v, getBinding().C, getBinding().m})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView2, "header");
             accessibilityUtils.setViewIsHeading(textView2);
@@ -509,7 +509,7 @@ public final class WidgetSettingsVoice extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         getBinding().s.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$1());
-        getBinding().f2444y.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$2());
+        getBinding().f2442y.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$2());
         Model.Companion companion = Model.Companion;
         BehaviorSubject<Boolean> behaviorSubject = this.requestListenForSensitivitySubject;
         m.checkNotNullExpressionValue(behaviorSubject, "requestListenForSensitivitySubject");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
index 37a822e768..4557d692ef 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
@@ -185,7 +185,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
         m.checkNotNullExpressionValue(textView2, "binding.disableDeleteBody");
         textView2.setText(getString(mode.getBodyStringId()));
         getBinding().e.setText(getString(mode.getConfirmStringId()));
-        getBinding().f2215c.setOnClickListener(new WidgetDisableDeleteAccountDialog$onViewBound$1(this));
+        getBinding().f2214c.setOnClickListener(new WidgetDisableDeleteAccountDialog$onViewBound$1(this));
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.disableDeleteCodeWrap");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetDisableDeleteAccountDialog$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
index 374f474d9d..d9ed14cef3 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
@@ -110,7 +110,7 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
             textView4.setText(getString(R.string.mfa_sms_confirm_remove_body));
             getBinding().d.setText(getString(R.string.disable));
         }
-        getBinding().f2228c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this));
+        getBinding().f2227c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this));
         getBinding().d.setIsLoading(false);
         getBinding().d.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$2(this, valueOf));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java
index 6f756e948e..1e009ab3e3 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java
@@ -53,7 +53,7 @@ public final class WidgetSettingsAccount$onViewBound$1 extends k implements Func
         } else {
             throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
         }
-        NestedScrollView nestedScrollView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f2400x;
+        NestedScrollView nestedScrollView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f2398x;
         LinearLayout linearLayout = WidgetSettingsAccount.access$getBinding$p(this.this$0).v;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountPrivateDataWrap");
         nestedScrollView.smoothScrollTo(0, linearLayout.getBottom());
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
index d9d2deb7b9..3e4630f843 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
@@ -299,7 +299,7 @@ public final class WidgetSettingsAccount extends AppFragment {
         TextView textView3 = getBinding().F;
         m.checkNotNullExpressionValue(textView3, "binding.settingsAccountViewBackupCodes");
         textView3.setEnabled(!z3);
-        TextView textView4 = getBinding().f2399w;
+        TextView textView4 = getBinding().f2397w;
         m.checkNotNullExpressionValue(textView4, "binding.settingsAccountRemoveTwoFa");
         textView4.setEnabled(!z3);
         LinearLayout linearLayout = getBinding().i;
@@ -340,7 +340,7 @@ public final class WidgetSettingsAccount extends AppFragment {
         getBinding().A.setOnClickListener(WidgetSettingsAccount$configureUI$2.INSTANCE);
         getBinding().p.setOnClickListener(WidgetSettingsAccount$configureUI$3.INSTANCE);
         getBinding().e.setOnClickListener(WidgetSettingsAccount$configureUI$4.INSTANCE);
-        getBinding().f2398r.setOnClickListener(WidgetSettingsAccount$configureUI$5.INSTANCE);
+        getBinding().f2396r.setOnClickListener(WidgetSettingsAccount$configureUI$5.INSTANCE);
         TextView textView5 = getBinding().l;
         m.checkNotNullExpressionValue(textView5, "binding.settingsAccountMfaEnabledHeader");
         textView5.setVisibility(component1.getMfaEnabled() ? 0 : 8);
@@ -366,37 +366,37 @@ public final class WidgetSettingsAccount extends AppFragment {
         }
         getBinding().j.setOnClickListener(WidgetSettingsAccount$configureUI$6.INSTANCE);
         getBinding().F.setOnClickListener(WidgetSettingsAccount$configureUI$7.INSTANCE);
-        getBinding().f2399w.setOnClickListener(new WidgetSettingsAccount$configureUI$8(this));
+        getBinding().f2397w.setOnClickListener(new WidgetSettingsAccount$configureUI$8(this));
         getBinding().G.setOnClickListener(WidgetSettingsAccount$configureUI$9.INSTANCE);
         getBinding().u.setOnClickListener(new WidgetSettingsAccount$configureUI$10(this, model));
         getBinding().t.setOnClickListener(new WidgetSettingsAccount$configureUI$11(this, model));
         String sMSBackupDisabledMessage = getSMSBackupDisabledMessage(component1);
         CharSequence charSequence = null;
         if (sMSBackupDisabledMessage != null || component2.isTogglingSMSBackup()) {
-            CheckedSetting.d(getBinding().f2401y, null, 1);
-            TextView textView7 = getBinding().f2402z;
+            CheckedSetting.d(getBinding().f2399y, null, 1);
+            TextView textView7 = getBinding().f2400z;
             m.checkNotNullExpressionValue(textView7, "binding.settingsAccountSmsPhone");
             ViewExtensions.setEnabledAlpha$default(textView7, false, 0.0f, 2, null);
         } else {
-            TextView textView8 = getBinding().f2402z;
+            TextView textView8 = getBinding().f2400z;
             m.checkNotNullExpressionValue(textView8, "binding.settingsAccountSmsPhone");
             ViewExtensions.setEnabledAlpha$default(textView8, true, 0.0f, 2, null);
-            getBinding().f2401y.e(new WidgetSettingsAccount$configureUI$12(this, component1));
+            getBinding().f2399y.e(new WidgetSettingsAccount$configureUI$12(this, component1));
         }
-        TextView textView9 = getBinding().f2402z;
+        TextView textView9 = getBinding().f2400z;
         m.checkNotNullExpressionValue(textView9, "binding.settingsAccountSmsPhone");
         if (component1.getPhoneNumber() != null) {
-            TextView textView10 = getBinding().f2402z;
+            TextView textView10 = getBinding().f2400z;
             m.checkNotNullExpressionValue(textView10, "binding.settingsAccountSmsPhone");
             Context context = textView10.getContext();
             m.checkNotNullExpressionValue(context, "binding.settingsAccountSmsPhone.context");
             charSequence = b.h(context, R.string.mfa_sms_auth_current_phone, new Object[]{component1.getPhoneNumber()}, null, 4);
         }
         ViewExtensions.setTextAndVisibilityBy(textView9, charSequence);
-        CheckedSetting checkedSetting = getBinding().f2401y;
+        CheckedSetting checkedSetting = getBinding().f2399y;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsAccountSmsBackup");
         checkedSetting.setChecked(userUtils.isMfaSMSEnabled(component1));
-        CheckedSetting checkedSetting2 = getBinding().f2401y;
+        CheckedSetting checkedSetting2 = getBinding().f2399y;
         if (sMSBackupDisabledMessage == null) {
             sMSBackupDisabledMessage = getString(R.string.mfa_sms_auth_sales_pitch);
             m.checkNotNullExpressionValue(sMSBackupDisabledMessage, "getString(R.string.mfa_sms_auth_sales_pitch)");
@@ -409,7 +409,7 @@ public final class WidgetSettingsAccount extends AppFragment {
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             companion.show(parentFragmentManager, true);
         }
-        for (TextView textView11 : n.listOf((Object[]) new TextView[]{getBinding().g, getBinding().f2397c, getBinding().h})) {
+        for (TextView textView11 : n.listOf((Object[]) new TextView[]{getBinding().g, getBinding().f2395c, getBinding().h})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView11, "header");
             accessibilityUtils.setViewIsHeading(textView11);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
index 41ef4e8295..5083ab4cee 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
@@ -333,7 +333,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
             m.checkNotNullExpressionValue(recyclerView2, "binding.settingsBackupCodesRv");
             this.backupCodesAdapter = (Adapter) companion.configure(new Adapter(recyclerView2));
         }
-        getBinding().f2396c.setOnClickListener(new WidgetSettingsAccountBackupCodes$onViewBound$2(this));
+        getBinding().f2394c.setOnClickListener(new WidgetSettingsAccountBackupCodes$onViewBound$2(this));
         showPasswordModal();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java
index 5c61a34390..f856731e24 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java
@@ -26,7 +26,7 @@ public final class WidgetSettingsAccountChangePassword$onViewBound$2 extends o i
 
     public final void invoke(Editable editable) {
         m.checkNotNullParameter(editable, "it");
-        TextInputLayout textInputLayout = WidgetSettingsAccountChangePassword.access$getBinding$p(this.this$0).f2403c;
+        TextInputLayout textInputLayout = WidgetSettingsAccountChangePassword.access$getBinding$p(this.this$0).f2401c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.changePasswordNewPasswordInput");
         textInputLayout.setError(null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
index be920fd54e..23c8c61288 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
@@ -90,7 +90,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.changePasswordCurrentPasswordInput");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout2);
-        TextInputLayout textInputLayout3 = getBinding().f2403c;
+        TextInputLayout textInputLayout3 = getBinding().f2401c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.changePasswordNewPasswordInput");
         String textOrEmpty2 = ViewExtensions.getTextOrEmpty(textInputLayout3);
         if (textOrEmpty.length() == 0) {
@@ -101,10 +101,10 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout5, "binding.changePasswordCurrentPasswordInput");
             textInputLayout4.setError(textInputLayout5.getContext().getString(R.string.password_required));
         } else if (!AuthUtils.INSTANCE.isValidPasswordLength(textOrEmpty2)) {
-            getBinding().f2403c.requestFocus();
-            TextInputLayout textInputLayout6 = getBinding().f2403c;
+            getBinding().f2401c.requestFocus();
+            TextInputLayout textInputLayout6 = getBinding().f2401c;
             m.checkNotNullExpressionValue(textInputLayout6, "binding.changePasswordNewPasswordInput");
-            TextInputLayout textInputLayout7 = getBinding().f2403c;
+            TextInputLayout textInputLayout7 = getBinding().f2401c;
             m.checkNotNullExpressionValue(textInputLayout7, "binding.changePasswordNewPasswordInput");
             textInputLayout6.setError(textInputLayout7.getContext().getString(R.string.password_length_error));
         } else {
@@ -138,13 +138,13 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
-        TextInputLayout textInputLayout = getBinding().f2403c;
+        TextInputLayout textInputLayout = getBinding().f2401c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.changePasswordNewPasswordInput");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.changePasswordCurrentPasswordInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetSettingsAccountChangePassword$onViewBound$1(this));
-        TextInputLayout textInputLayout3 = getBinding().f2403c;
+        TextInputLayout textInputLayout3 = getBinding().f2401c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.changePasswordNewPasswordInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout3, this, new WidgetSettingsAccountChangePassword$onViewBound$2(this));
         TextInputLayout textInputLayout4 = getBinding().e;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
index 7102f3d4fa..51077ce0d2 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
@@ -88,7 +88,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment {
             str = "";
         }
         ViewExtensions.setText(textInputLayout, str);
-        getBinding().f2404c.setOnClickListener(new WidgetSettingsAccountContactsNameEdit$configureUI$1(this));
+        getBinding().f2402c.setOnClickListener(new WidgetSettingsAccountContactsNameEdit$configureUI$1(this));
     }
 
     private final WidgetSettingsAccountContactsNameEditBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
index aeb55aaf77..baa3db250f 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
@@ -111,9 +111,9 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountEmailWrap");
         ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsAccountEmailEdit$onViewBound$1(this), 1, null);
-        getBinding().f2406c.setOnClickListener(new WidgetSettingsAccountEmailEdit$onViewBound$2(this));
+        getBinding().f2404c.setOnClickListener(new WidgetSettingsAccountEmailEdit$onViewBound$2(this));
         StatefulViews statefulViews = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f2406c;
+        FloatingActionButton floatingActionButton = getBinding().f2404c;
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountEmailWrap");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout2);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
index 6322d939df..15d312b11b 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
@@ -23,7 +23,7 @@ public final class WidgetSettingsAccountUsernameEdit$validationManager$2 extends
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo17invoke() {
-        TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f2405c;
+        TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f2403c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
         InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.username_required)};
         TextInputLayout textInputLayout2 = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).b;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
index 9e24d45c31..2d59e10fef 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
@@ -79,10 +79,10 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     }
 
     private final void configureUI(MeUser meUser) {
-        TextInputLayout textInputLayout = getBinding().f2405c;
+        TextInputLayout textInputLayout = getBinding().f2403c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f2405c;
+        TextInputLayout textInputLayout2 = getBinding().f2403c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountUsernameWrap");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), meUser.getUsername()));
         TextInputLayout textInputLayout3 = getBinding().b;
@@ -94,11 +94,11 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
         String format = String.format("%04d", Arrays.copyOf(new Object[]{Integer.valueOf(meUser.getDiscriminator())}, 1));
         m.checkNotNullExpressionValue(format, "java.lang.String.format(format, *args)");
         ViewExtensions.setText(textInputLayout3, (CharSequence) statefulViews2.get(id2, format));
-        TextInputLayout textInputLayout5 = getBinding().f2405c;
+        TextInputLayout textInputLayout5 = getBinding().f2403c;
         m.checkNotNullExpressionValue(textInputLayout5, "binding.editAccountUsernameWrap");
         EditText editText = textInputLayout5.getEditText();
         Editable text = editText != null ? editText.getText() : null;
-        TextInputLayout textInputLayout6 = getBinding().f2405c;
+        TextInputLayout textInputLayout6 = getBinding().f2403c;
         m.checkNotNullExpressionValue(textInputLayout6, "binding.editAccountUsernameWrap");
         Selection.setSelection(text, ViewExtensions.getTextOrEmpty(textInputLayout6).length());
         TextInputLayout textInputLayout7 = getBinding().b;
@@ -125,7 +125,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
             WidgetUserPasswordVerify.Companion companion = WidgetUserPasswordVerify.Companion;
             Context requireContext = requireContext();
             ActivityResultLauncher<Intent> activityResultLauncher = this.passwordVerifyLauncher;
-            TextInputLayout textInputLayout = getBinding().f2405c;
+            TextInputLayout textInputLayout = getBinding().f2403c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
             TextInputLayout textInputLayout2 = getBinding().b;
@@ -150,7 +150,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
         getBinding().d.setOnClickListener(new WidgetSettingsAccountUsernameEdit$onViewBound$3(this));
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
-        TextInputLayout textInputLayout3 = getBinding().f2405c;
+        TextInputLayout textInputLayout3 = getBinding().f2403c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.editAccountUsernameWrap");
         TextInputLayout textInputLayout4 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout4, "binding.editAccountDiscriminatorWrap");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
index 05a16455a9..a80e82ea94 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
@@ -133,7 +133,7 @@ public final class WidgetSettingsBlockedUsers extends AppFragment {
         super.onViewCreated(view, bundle);
         setActionBarTitle(R.string.user_settings_blocked_users);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        RecyclerView recyclerView = getBinding().f2416c;
+        RecyclerView recyclerView = getBinding().f2414c;
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         m.checkNotNullExpressionValue(recyclerView, "it");
         WidgetSettingsBlockedUsersAdapter widgetSettingsBlockedUsersAdapter = (WidgetSettingsBlockedUsersAdapter) companion.configure(new WidgetSettingsBlockedUsersAdapter(recyclerView));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
index dbeda288cf..53b3821ea9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
@@ -63,7 +63,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.blockedUserItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, item.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
-            TextView textView = this.binding.f2424c;
+            TextView textView = this.binding.f2422c;
             m.checkNotNullExpressionValue(textView, "binding.blockedUserItemName");
             textView.setText(item.getUser().getUsername());
             this.binding.d.setOnClickListener(new WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder$onConfigure$2(this, item));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java
index 0c2ced5ee5..8acf375248 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java
@@ -42,6 +42,6 @@ public final class WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }
-        return this.$storeUser.observeUsers(linkedHashMap.keySet()).E(AnonymousClass1.INSTANCE);
+        return this.$storeUser.observeUsers(linkedHashMap.keySet()).F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
index 8d390beeb0..130d271cb9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
@@ -68,9 +68,9 @@ public final class WidgetSettingsBlockedUsersViewModel extends AppViewModel<View
         public final Observable<StoreState> observeStores(StoreUserRelationships storeUserRelationships, StoreUser storeUser) {
             m.checkNotNullParameter(storeUserRelationships, "storeUserRelationships");
             m.checkNotNullParameter(storeUser, "storeUser");
-            Observable<R> X = storeUserRelationships.observe().X(new WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1(storeUser));
-            m.checkNotNullExpressionValue(X, "storeUserRelationships\n …          }\n            }");
-            return X;
+            Observable<R> Y = storeUserRelationships.observe().Y(new WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1(storeUser));
+            m.checkNotNullExpressionValue(Y, "storeUserRelationships\n …          }\n            }");
+            return Y;
         }
     }
 
@@ -339,7 +339,7 @@ public final class WidgetSettingsBlockedUsersViewModel extends AppViewModel<View
         m.checkNotNullParameter(observable, "storeObservable");
         m.checkNotNullParameter(restAPI, "restAPI");
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetSettingsBlockedUsersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
index 216b9dceb6..0f32a12921 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
@@ -88,13 +88,13 @@ public final class WidgetEnableMFAKey extends AppFragment {
         if (activity != null && (packageManager = activity.getPackageManager()) != null) {
             Companion companion = Companion;
             if (Companion.access$isPackageInstalled(companion, AuthUtils.AUTHY_PACKAGE, packageManager)) {
-                TextView textView = getBinding().f2420c;
+                TextView textView = getBinding().f2418c;
                 m.checkNotNullExpressionValue(textView, "binding.enableMfaKeyLaunchAuthy");
                 textView.setText(b.k(this, R.string.launch_app, new Object[]{b.k(this, R.string.two_fa_app_name_authy, new Object[0], null, 4)}, null, 4));
-                TextView textView2 = getBinding().f2420c;
+                TextView textView2 = getBinding().f2418c;
                 m.checkNotNullExpressionValue(textView2, "binding.enableMfaKeyLaunchAuthy");
                 textView2.setVisibility(0);
-                getBinding().f2420c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager));
+                getBinding().f2418c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager));
             }
             if (Companion.access$isPackageInstalled(companion, AuthUtils.GOOGLE_AUTHENTICATOR_PACKAGE, packageManager)) {
                 TextView textView3 = getBinding().d;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java
index 21e2a322fa..e8978a1009 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java
@@ -29,7 +29,7 @@ public final class WidgetEnableMFASteps$onViewBoundOrOnResume$1 extends o implem
         DimmerView.setDimmed$default(WidgetEnableMFASteps.access$getBinding$p(this.this$0).b, viewState.isLoading(), false, 2, null);
         Integer screenIndex = viewState.getScreenIndex();
         if (screenIndex != null) {
-            WidgetEnableMFASteps.access$getBinding$p(this.this$0).f2227c.b(screenIndex.intValue());
+            WidgetEnableMFASteps.access$getBinding$p(this.this$0).f2226c.b(screenIndex.intValue());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
index 20d05d41a1..5ebf6889b0 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
@@ -99,7 +99,7 @@ public final class WidgetEnableMFASteps extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f2227c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, R.string.cancel, 0, null, null, null, null, false, false, false, 2042), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, null, false, false, false, 2046), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, null, false, false, false, 766), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, null, false, false, false, 1022)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this));
+        getBinding().f2226c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, R.string.cancel, 0, null, null, null, null, false, false, false, 2042), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, null, false, false, false, 2046), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, null, false, false, false, 766), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, null, false, false, false, 1022)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this));
     }
 
     @Override // com.discord.app.AppFragment
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 c929afadbd..891d171d60 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().f2328c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this));
-            MaterialButton materialButton = getBinding().f2328c;
+            getBinding().f2326c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this));
+            MaterialButton materialButton = getBinding().f2326c;
             m.checkNotNullExpressionValue(materialButton, "binding.dialogDelete");
             materialButton.setAlpha(0.3f);
         } else {
-            getBinding().f2328c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1));
+            getBinding().f2326c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1));
         }
         getBinding().d.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$4(this, component1));
         if (m.areEqual(component1.getBillingAddress().getCountry(), "CA")) {
@@ -504,11 +504,11 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        Observable<R> E = getViewModel().observeViewState().w(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.INSTANCE).E(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-        Observable Y = E.E(WidgetPaymentSourceEditDialog$onViewBound$1.INSTANCE).E(new WidgetPaymentSourceEditDialog$onViewBound$2(this)).Y(1);
-        m.checkNotNullExpressionValue(Y, "viewModel\n        .obser…       }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(Y, this, null, 2, null), WidgetPaymentSourceEditDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPaymentSourceEditDialog$onViewBound$3(this), 62, (Object) null);
+        Observable<R> F = getViewModel().observeViewState().x(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.INSTANCE).F(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        Observable Z = F.F(WidgetPaymentSourceEditDialog$onViewBound$1.INSTANCE).F(new WidgetPaymentSourceEditDialog$onViewBound$2(this)).Z(1);
+        m.checkNotNullExpressionValue(Z, "viewModel\n        .obser…       }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(Z, this, null, 2, null), WidgetPaymentSourceEditDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPaymentSourceEditDialog$onViewBound$3(this), 62, (Object) null);
         getBinding().b.setNavigationOnClickListener(new WidgetPaymentSourceEditDialog$onViewBound$4(this));
         getBinding().d.setOnClickListener(new WidgetPaymentSourceEditDialog$onViewBound$5(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
index 0e39ece23d..901a45b18e 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
@@ -163,10 +163,10 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 String id2 = connection.getId();
                 m.checkNotNullExpressionValue(id2, "connectedAccount.id");
                 this.binding.a.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1(from, this, userConnectionItem));
-                ImageView imageView = this.binding.f2425c;
+                ImageView imageView = this.binding.f2423c;
                 Integer platformImage = from.getPlatformImage();
                 imageView.setImageResource(platformImage != null ? platformImage.intValue() : 0);
-                ImageView imageView2 = this.binding.f2425c;
+                ImageView imageView2 = this.binding.f2423c;
                 m.checkNotNullExpressionValue(imageView2, "binding.connectedAccountImg");
                 imageView2.setContentDescription(from.name());
                 TextView textView = this.binding.d;
@@ -343,21 +343,21 @@ public final class WidgetSettingsUserConnections extends AppFragment {
             TextView textView = getBinding().b;
             m.checkNotNullExpressionValue(textView, "binding.connectionsEmpty");
             textView.setVisibility(8);
-            RecyclerView recyclerView = getBinding().f2418c;
+            RecyclerView recyclerView = getBinding().f2416c;
             m.checkNotNullExpressionValue(recyclerView, "binding.connectionsRecycler");
             recyclerView.setVisibility(8);
         } else if (viewState instanceof WidgetSettingsUserConnectionsViewModel.ViewState.Empty) {
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.connectionsEmpty");
             textView2.setVisibility(0);
-            RecyclerView recyclerView2 = getBinding().f2418c;
+            RecyclerView recyclerView2 = getBinding().f2416c;
             m.checkNotNullExpressionValue(recyclerView2, "binding.connectionsRecycler");
             recyclerView2.setVisibility(8);
         } else if (viewState instanceof WidgetSettingsUserConnectionsViewModel.ViewState.Loaded) {
             TextView textView3 = getBinding().b;
             m.checkNotNullExpressionValue(textView3, "binding.connectionsEmpty");
             textView3.setVisibility(8);
-            RecyclerView recyclerView3 = getBinding().f2418c;
+            RecyclerView recyclerView3 = getBinding().f2416c;
             m.checkNotNullExpressionValue(recyclerView3, "binding.connectionsRecycler");
             recyclerView3.setVisibility(0);
             List<WidgetSettingsUserConnectionsViewModel.ConnectionState> data = ((WidgetSettingsUserConnectionsViewModel.ViewState.Loaded) viewState).getData();
@@ -370,7 +370,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 adapter2.setData(arrayList);
             }
             if (itemCount != 0 && arrayList.size() > itemCount) {
-                getBinding().f2418c.smoothScrollToPosition(arrayList.size() - 1);
+                getBinding().f2416c.smoothScrollToPosition(arrayList.size() - 1);
             }
         }
     }
@@ -386,7 +386,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
         FragmentActivity activity = getActivity();
         if (activity != null) {
             MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-            RecyclerView recyclerView = getBinding().f2418c;
+            RecyclerView recyclerView = getBinding().f2416c;
             m.checkNotNullExpressionValue(recyclerView, "binding.connectionsRecycler");
             m.checkNotNullExpressionValue(activity, "it");
             FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
index 30b2981671..999cde55a4 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
@@ -86,7 +86,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
             public void onConfigure(int i, PlatformItem platformItem) {
                 m.checkNotNullParameter(platformItem, "data");
                 super.onConfigure(i, (int) platformItem);
-                TextView textView = this.binding.f2423c;
+                TextView textView = this.binding.f2421c;
                 m.checkNotNullExpressionValue(textView, "binding.addConnectedAccountText");
                 textView.setText(platformItem.getPlatform().getProperName());
                 ImageView imageView = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
index 523be6441d..cacb8923c3 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
@@ -94,7 +94,7 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
         setActionBarSubtitle(R.string.user_settings);
         setActionBarTitle(R.string.connections);
         trackXboxLinkStep();
-        getBinding().f2208c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE);
+        getBinding().f2207c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE);
         getBinding().b.setOnCodeEntered(new WidgetSettingsUserConnectionsAddXbox$onViewBound$2(this));
     }
 
@@ -103,8 +103,8 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
         m.checkNotNullParameter(platform, "platform");
         m.checkNotNullParameter(appComponent, "appComponent");
         m.checkNotNullParameter(action1, "errorHandler");
-        Observable y2 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getConnectionState(platform.getPlatformId(), str), false, 1, null).y(new WidgetSettingsUserConnectionsAddXbox$submitPinCode$1(platform));
-        m.checkNotNullExpressionValue(y2, "RestAPI\n        .api\n   …              )\n        }");
-        ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(y2, appComponent, null, 2, null), dimmerView, 0, 2, null).k(o.a.g(activity, new WidgetSettingsUserConnectionsAddXbox$submitPinCode$2(activity), action1));
+        Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getConnectionState(platform.getPlatformId(), str), false, 1, null).z(new WidgetSettingsUserConnectionsAddXbox$submitPinCode$1(platform));
+        m.checkNotNullExpressionValue(z2, "RestAPI\n        .api\n   …              )\n        }");
+        ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(z2, appComponent, null, 2, null), dimmerView, 0, 2, null).k(o.a.g(activity, new WidgetSettingsUserConnectionsAddXbox$submitPinCode$2(activity), action1));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java
index 90f1877c45..0229ec03a4 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java
@@ -382,10 +382,10 @@ public final class WidgetSettingsUserConnectionsViewModel extends AppViewModel<V
         m.checkNotNullParameter(restAPI, "restApi");
         this.restApi = restAPI;
         this.joinStatusMap = new LinkedHashMap();
-        BehaviorSubject<Map<String, JoinStatus>> k0 = BehaviorSubject.k0(h0.emptyMap());
-        this.joinStateSubject = k0;
+        BehaviorSubject<Map<String, JoinStatus>> l0 = BehaviorSubject.l0(h0.emptyMap());
+        this.joinStateSubject = l0;
         storeUserConnections.fetchConnectedAccounts();
-        Observable j = Observable.j(observable, k0, new AnonymousClass1(this));
+        Observable j = Observable.j(observable, l0, new AnonymousClass1(this));
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…te(storeState, joinMap) }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(j), this, null, 2, null), WidgetSettingsUserConnectionsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
index efcd1b4f72..fdb82ee421 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
@@ -126,7 +126,7 @@ public final class WidgetSettingsDeveloper extends AppFragment {
 
     private final void setupCrashes() {
         getBinding().d.setOnClickListener(WidgetSettingsDeveloper$setupCrashes$1.INSTANCE);
-        getBinding().f2419c.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$2(this));
+        getBinding().f2417c.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$2(this));
         getBinding().b.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$3(this));
         getBinding().g.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$4(this));
     }
@@ -141,9 +141,9 @@ public final class WidgetSettingsDeveloper extends AppFragment {
         }
         recyclerView.setAdapter(experimentOverridesAdapter);
         StoreExperiments experiments = StoreStream.Companion.getExperiments();
-        Observable<R> E = experiments.observeOverrides().E(new WidgetSettingsDeveloper$setupExperimentSection$1(experiments));
-        m.checkNotNullExpressionValue(E, "experimentStore\n        …              }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(E, this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupExperimentSection$2(this), 62, (Object) null);
+        Observable<R> F = experiments.observeOverrides().F(new WidgetSettingsDeveloper$setupExperimentSection$1(experiments));
+        m.checkNotNullExpressionValue(F, "experimentStore\n        …              }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(F, this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupExperimentSection$2(this), 62, (Object) null);
     }
 
     private final void setupNoticesSection() {
@@ -152,9 +152,9 @@ public final class WidgetSettingsDeveloper extends AppFragment {
         m.checkNotNullExpressionValue(recyclerView, "binding.developerSettingsNotices");
         recyclerView.setAdapter(simpleRecyclerAdapter);
         new WidgetSettingsDeveloper$setupNoticesSection$1(this).mo17invoke().attachToRecyclerView(getBinding().f);
-        Observable<R> E = StoreStream.Companion.getNotices().observeNoticesSeen().E(WidgetSettingsDeveloper$setupNoticesSection$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "StoreStream\n        .get…      .toList()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(E), this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupNoticesSection$3(simpleRecyclerAdapter), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getNotices().observeNoticesSeen().F(WidgetSettingsDeveloper$setupNoticesSection$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…      .toList()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(F), this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupNoticesSection$3(simpleRecyclerAdapter), 62, (Object) null);
     }
 
     private final void setupScreenshotDetector() {
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
index b5cab4d430..0ccd636733 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
@@ -627,7 +627,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(observable, "storeObservable");
         this.viewType = viewType;
         this.oldSkuName = str;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         fetchData();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ChoosePlanViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getGooglePlayPurchases().observeEvents(), this, null, 2, null), ChoosePlanViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
index c50d00c052..1b99efe312 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
@@ -287,7 +287,7 @@ public final class ClaimOutboundPromoViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(storeOutboundPromotions, "storeOutboundPromotions");
         this.claimStatus = claimStatus;
         this.storeOutboundPromotions = storeOutboundPromotions;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         handleClaimStatus();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java
index 02a8137926..385eb2d56e 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java
@@ -202,14 +202,14 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
         private final Observable<StoreState> observeStores() {
             StoreStream.Companion companion = StoreStream.Companion;
             Observable<StoreEntitlements.State> observeEntitlementState = companion.getEntitlements().observeEntitlementState();
-            Observable X = companion.getUsers().observeMeId().X(SettingsGiftingViewModel$Companion$observeStores$1.INSTANCE);
+            Observable Y = companion.getUsers().observeMeId().Y(SettingsGiftingViewModel$Companion$observeStores$1.INSTANCE);
             Observable<StoreOutboundPromotions.State> observeState = companion.getOutboundPromotions().observeState();
-            Observable E = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).E(SettingsGiftingViewModel$Companion$observeStores$2.INSTANCE);
+            Observable F = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).F(SettingsGiftingViewModel$Companion$observeStores$2.INSTANCE);
             SettingsGiftingViewModel$Companion$observeStores$3 settingsGiftingViewModel$Companion$observeStores$3 = SettingsGiftingViewModel$Companion$observeStores$3.INSTANCE;
             if (settingsGiftingViewModel$Companion$observeStores$3 != null) {
                 settingsGiftingViewModel$Companion$observeStores$3 = new SettingsGiftingViewModel$sam$rx_functions_Func4$0(settingsGiftingViewModel$Companion$observeStores$3);
             }
-            Observable<StoreState> q = Observable.h(observeEntitlementState, X, observeState, E, (Func4) settingsGiftingViewModel$Companion$observeStores$3).q();
+            Observable<StoreState> q = Observable.h(observeEntitlementState, Y, observeState, F, (Func4) settingsGiftingViewModel$Companion$observeStores$3).q();
             m.checkNotNullExpressionValue(q, "Observable\n          .co…  .distinctUntilChanged()");
             return q;
         }
@@ -693,7 +693,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
         private final ClaimStatus claimStatus;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2653id;
+        private final long f2651id;
         private final String imageUrl;
         private final String terms;
         private final String title;
@@ -704,7 +704,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(str2, "terms");
             m.checkNotNullParameter(str3, "imageUrl");
             this.claimStatus = claimStatus;
-            this.f2653id = j;
+            this.f2651id = j;
             this.title = str;
             this.terms = str2;
             this.imageUrl = str3;
@@ -715,7 +715,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
                 claimStatus = outboundPromoItem.claimStatus;
             }
             if ((i & 2) != 0) {
-                j = outboundPromoItem.f2653id;
+                j = outboundPromoItem.f2651id;
             }
             if ((i & 4) != 0) {
                 str = outboundPromoItem.title;
@@ -734,7 +734,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
         }
 
         public final long component2() {
-            return this.f2653id;
+            return this.f2651id;
         }
 
         public final String component3() {
@@ -765,7 +765,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             OutboundPromoItem outboundPromoItem = (OutboundPromoItem) obj;
-            return m.areEqual(this.claimStatus, outboundPromoItem.claimStatus) && this.f2653id == outboundPromoItem.f2653id && m.areEqual(this.title, outboundPromoItem.title) && m.areEqual(this.terms, outboundPromoItem.terms) && m.areEqual(this.imageUrl, outboundPromoItem.imageUrl);
+            return m.areEqual(this.claimStatus, outboundPromoItem.claimStatus) && this.f2651id == outboundPromoItem.f2651id && m.areEqual(this.title, outboundPromoItem.title) && m.areEqual(this.terms, outboundPromoItem.terms) && m.areEqual(this.imageUrl, outboundPromoItem.imageUrl);
         }
 
         public final ClaimStatus getClaimStatus() {
@@ -773,7 +773,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
         }
 
         public final long getId() {
-            return this.f2653id;
+            return this.f2651id;
         }
 
         public final String getImageUrl() {
@@ -791,7 +791,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
         public int hashCode() {
             ClaimStatus claimStatus = this.claimStatus;
             int i = 0;
-            int a = (b.a(this.f2653id) + ((claimStatus != null ? claimStatus.hashCode() : 0) * 31)) * 31;
+            int a = (b.a(this.f2651id) + ((claimStatus != null ? claimStatus.hashCode() : 0) * 31)) * 31;
             String str = this.title;
             int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
             String str2 = this.terms;
@@ -807,7 +807,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
             StringBuilder O = a.O("OutboundPromoItem(claimStatus=");
             O.append(this.claimStatus);
             O.append(", id=");
-            O.append(this.f2653id);
+            O.append(this.f2651id);
             O.append(", title=");
             O.append(this.title);
             O.append(", terms=");
@@ -1175,26 +1175,26 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
         this.storeGifting = storeGifting;
         this.storeUserSettingsSystem = storeUserSettingsSystem;
         this.storeOutboundPromotions = storeOutboundPromotions;
-        BehaviorSubject<StoreState> j0 = BehaviorSubject.j0();
-        this.storeStateSubject = j0;
-        BehaviorSubject<List<ClaimedOutboundPromotion>> j02 = BehaviorSubject.j0();
-        this.claimedPromotionsSubject = j02;
+        BehaviorSubject<StoreState> k0 = BehaviorSubject.k0();
+        this.storeStateSubject = k0;
+        BehaviorSubject<List<ClaimedOutboundPromotion>> k02 = BehaviorSubject.k0();
+        this.claimedPromotionsSubject = k02;
         this.shouldCheckClaimedPromos = new AtomicBoolean(true);
-        this.giftPurchaseEventSubject = PublishSubject.j0();
-        this.eventSubject = PublishSubject.j0();
+        this.giftPurchaseEventSubject = PublishSubject.k0();
+        this.eventSubject = PublishSubject.k0();
         this.onGiftCodeResolved = SettingsGiftingViewModel$onGiftCodeResolved$1.INSTANCE;
         this.subscriptions = new CompositeSubscription();
         storeEntitlements.fetchMyGiftEntitlements();
         googlePlayBillingManager.queryPurchases();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeGooglePlayPurchases.observeEvents(), this, null, 2, null), SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeGooglePlayPurchases.observeQueryState(), this, null, 2, null), SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
-        Observable s = ObservableExtensionsKt.computationLatest(observable).s(new AnonymousClass3(this));
-        m.checkNotNullExpressionValue(s, "storeObservable\n        …oreState.isUserPremium) }");
-        ObservableExtensionsKt.appSubscribe$default(s, SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass4(j0), 62, (Object) null);
-        m.checkNotNullExpressionValue(j0, "storeStateSubject");
-        Observable computationLatest = ObservableExtensionsKt.computationLatest(j0);
-        m.checkNotNullExpressionValue(j02, "claimedPromotionsSubject");
-        Observable q = Observable.j(computationLatest, ObservableExtensionsKt.computationLatest(j02), new SettingsGiftingViewModel$sam$rx_functions_Func2$0(new AnonymousClass5(this))).q();
+        Observable t = ObservableExtensionsKt.computationLatest(observable).t(new AnonymousClass3(this));
+        m.checkNotNullExpressionValue(t, "storeObservable\n        …oreState.isUserPremium) }");
+        ObservableExtensionsKt.appSubscribe$default(t, SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass4(k0), 62, (Object) null);
+        m.checkNotNullExpressionValue(k0, "storeStateSubject");
+        Observable computationLatest = ObservableExtensionsKt.computationLatest(k0);
+        m.checkNotNullExpressionValue(k02, "claimedPromotionsSubject");
+        Observable q = Observable.j(computationLatest, ObservableExtensionsKt.computationLatest(k02), new SettingsGiftingViewModel$sam$rx_functions_Func2$0(new AnonymousClass5(this))).q();
         m.checkNotNullExpressionValue(q, "Observable.combineLatest…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(q, this, null, 2, null), SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass6(this), 62, (Object) null);
     }
@@ -1387,9 +1387,9 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
             return;
         }
         if (z2) {
-            Observable K = ObservableExtensionsKt.restSubscribeOn$default(this.storeOutboundPromotions.fetchClaimedOutboundPromotions(), false, 1, null).r(new SettingsGiftingViewModel$maybeCheckClaimedPromos$1(this)).K(SettingsGiftingViewModel$maybeCheckClaimedPromos$2.INSTANCE);
-            m.checkNotNullExpressionValue(K, "storeOutboundPromotions.…rorReturn { emptyList() }");
-            ObservableExtensionsKt.appSubscribe$default(K, SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new SettingsGiftingViewModel$maybeCheckClaimedPromos$3(this.claimedPromotionsSubject), 62, (Object) null);
+            Observable L = ObservableExtensionsKt.restSubscribeOn$default(this.storeOutboundPromotions.fetchClaimedOutboundPromotions(), false, 1, null).s(new SettingsGiftingViewModel$maybeCheckClaimedPromos$1(this)).L(SettingsGiftingViewModel$maybeCheckClaimedPromos$2.INSTANCE);
+            m.checkNotNullExpressionValue(L, "storeOutboundPromotions.…rorReturn { emptyList() }");
+            ObservableExtensionsKt.appSubscribe$default(L, SettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new SettingsGiftingViewModel$maybeCheckClaimedPromos$3(this.claimedPromotionsSubject), 62, (Object) null);
             return;
         }
         this.claimedPromotionsSubject.onNext(n.emptyList());
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Companion$observeStores$3.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Companion$observeStores$3.java
index ec57af7872..504c5e12fa 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Companion$observeStores$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Companion$observeStores$3.java
@@ -1,7 +1,6 @@
 package com.discord.widgets.settings.premium;
 
 import c0.z.d.m;
-import com.discord.models.experiments.domain.Experiment;
 import com.discord.stores.StoreEntitlements;
 import com.discord.stores.StoreGooglePlayPurchases;
 import com.discord.stores.StoreGooglePlaySkuDetails;
@@ -9,12 +8,12 @@ import com.discord.stores.StorePaymentSources;
 import com.discord.stores.StorePremiumGuildSubscription;
 import com.discord.stores.StoreSubscriptions;
 import com.discord.widgets.settings.premium.SettingsPremiumViewModel;
-import rx.functions.Func8;
+import rx.functions.Func7;
 /* compiled from: SettingsPremiumViewModel.kt */
-public final class SettingsPremiumViewModel$Companion$observeStores$3<T1, T2, T3, T4, T5, T6, T7, T8, R> implements Func8<StorePaymentSources.PaymentSourcesState, SettingsPremiumViewModel.SubscriptionAndInvoice, SettingsPremiumViewModel.SubscriptionAndInvoice, StoreEntitlements.State, StorePremiumGuildSubscription.State, StoreGooglePlaySkuDetails.State, StoreGooglePlayPurchases.State, Experiment, SettingsPremiumViewModel.StoreState> {
+public final class SettingsPremiumViewModel$Companion$observeStores$3<T1, T2, T3, T4, T5, T6, T7, R> implements Func7<StorePaymentSources.PaymentSourcesState, SettingsPremiumViewModel.SubscriptionAndInvoice, SettingsPremiumViewModel.SubscriptionAndInvoice, StoreEntitlements.State, StorePremiumGuildSubscription.State, StoreGooglePlaySkuDetails.State, StoreGooglePlayPurchases.State, SettingsPremiumViewModel.StoreState> {
     public static final SettingsPremiumViewModel$Companion$observeStores$3 INSTANCE = new SettingsPremiumViewModel$Companion$observeStores$3();
 
-    public final SettingsPremiumViewModel.StoreState call(StorePaymentSources.PaymentSourcesState paymentSourcesState, SettingsPremiumViewModel.SubscriptionAndInvoice subscriptionAndInvoice, SettingsPremiumViewModel.SubscriptionAndInvoice subscriptionAndInvoice2, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4, Experiment experiment) {
+    public final SettingsPremiumViewModel.StoreState call(StorePaymentSources.PaymentSourcesState paymentSourcesState, SettingsPremiumViewModel.SubscriptionAndInvoice subscriptionAndInvoice, SettingsPremiumViewModel.SubscriptionAndInvoice subscriptionAndInvoice2, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4) {
         m.checkNotNullExpressionValue(paymentSourcesState, "paymentSourcesState");
         StoreSubscriptions.SubscriptionsState subscriptionsState = subscriptionAndInvoice.getSubscriptionsState();
         m.checkNotNullExpressionValue(state, "entitlementsState");
@@ -23,6 +22,6 @@ public final class SettingsPremiumViewModel$Companion$observeStores$3<T1, T2, T3
         SettingsPremiumViewModel.InvoicePreviewFetch invoicePreviewFetch2 = subscriptionAndInvoice2.getInvoicePreviewFetch();
         m.checkNotNullExpressionValue(state3, "skuDetailsState");
         m.checkNotNullExpressionValue(state4, "purchaseState");
-        return new SettingsPremiumViewModel.StoreState(paymentSourcesState, subscriptionsState, state, state2, invoicePreviewFetch, invoicePreviewFetch2, state3, state4, experiment != null && experiment.getBucket() == 1);
+        return new SettingsPremiumViewModel.StoreState(paymentSourcesState, subscriptionsState, state, state2, invoicePreviewFetch, invoicePreviewFetch2, state3, state4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
index 357cf306ad..707e068b22 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
@@ -124,9 +124,9 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                     m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …nvoice(null))\n          )");
                     return jVar;
                 }
-                Observable<SubscriptionAndInvoice> K = ObservableExtensionsKt.restSubscribeOn$default(restAPI.getInvoicePreview(new RestAPIParams.InvoicePreviewBody(id2, true, z2 && !modelSubscription.isGoogleSubscription())), false, 1, null).E(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$1(subscriptionsState)).K(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$2(subscriptionsState));
-                m.checkNotNullExpressionValue(K, "restAPI\n              .g…ch.Error)\n              }");
-                return K;
+                Observable<SubscriptionAndInvoice> L = ObservableExtensionsKt.restSubscribeOn$default(restAPI.getInvoicePreview(new RestAPIParams.InvoicePreviewBody(id2, true, z2 && !modelSubscription.isGoogleSubscription())), false, 1, null).F(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$1(subscriptionsState)).L(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$2(subscriptionsState));
+                m.checkNotNullExpressionValue(L, "restAPI\n              .g…ch.Error)\n              }");
+                return L;
             }
             Observable observable = d.j;
             m.checkNotNullExpressionValue(observable, "Observable.never()");
@@ -134,9 +134,9 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStores(StorePaymentSources storePaymentSources, StoreSubscriptions storeSubscriptions, StoreEntitlements storeEntitlements, StorePremiumGuildSubscription storePremiumGuildSubscription, StoreGooglePlaySkuDetails storeGooglePlaySkuDetails, StoreGooglePlayPurchases storeGooglePlayPurchases, StoreExperiments storeExperiments, RestAPI restAPI) {
-            Observable<StoreState> d = Observable.d(storePaymentSources.observePaymentSourcesState(), storeSubscriptions.observeSubscriptions().X(new SettingsPremiumViewModel$Companion$observeStores$1(restAPI)), storeSubscriptions.observeSubscriptions().X(new SettingsPremiumViewModel$Companion$observeStores$2(restAPI)), storeEntitlements.observeEntitlementState(), StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(storePremiumGuildSubscription, null, 1, null), storeGooglePlaySkuDetails.observeState(), storeGooglePlayPurchases.observeState(), storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false), SettingsPremiumViewModel$Companion$observeStores$3.INSTANCE);
-            m.checkNotNullExpressionValue(d, "Observable\n          .co…            )\n          }");
-            return d;
+            Observable<StoreState> e = Observable.e(storePaymentSources.observePaymentSourcesState(), storeSubscriptions.observeSubscriptions().Y(new SettingsPremiumViewModel$Companion$observeStores$1(restAPI)), storeSubscriptions.observeSubscriptions().Y(new SettingsPremiumViewModel$Companion$observeStores$2(restAPI)), storeEntitlements.observeEntitlementState(), StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(storePremiumGuildSubscription, null, 1, null), storeGooglePlaySkuDetails.observeState(), storeGooglePlayPurchases.observeState(), SettingsPremiumViewModel$Companion$observeStores$3.INSTANCE);
+            m.checkNotNullExpressionValue(e, "Observable\n          .co…            )\n          }");
+            return e;
         }
     }
 
@@ -271,14 +271,13 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         private final InvoicePreviewFetch currentInvoicePreviewFetch;
         private final StoreEntitlements.State entitlementState;
         private final StorePremiumGuildSubscription.State guildSubscriptionState;
-        private final boolean inGuildAvatarExperiment;
         private final StorePaymentSources.PaymentSourcesState paymentSourcesState;
         private final StoreGooglePlayPurchases.State purchaseState;
         private final InvoicePreviewFetch renewalInvoicePreviewFetch;
         private final StoreGooglePlaySkuDetails.State skuDetailsState;
         private final StoreSubscriptions.SubscriptionsState subscriptionsState;
 
-        public StoreState(StorePaymentSources.PaymentSourcesState paymentSourcesState, StoreSubscriptions.SubscriptionsState subscriptionsState, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, InvoicePreviewFetch invoicePreviewFetch, InvoicePreviewFetch invoicePreviewFetch2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4, boolean z2) {
+        public StoreState(StorePaymentSources.PaymentSourcesState paymentSourcesState, StoreSubscriptions.SubscriptionsState subscriptionsState, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, InvoicePreviewFetch invoicePreviewFetch, InvoicePreviewFetch invoicePreviewFetch2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4) {
             m.checkNotNullParameter(paymentSourcesState, "paymentSourcesState");
             m.checkNotNullParameter(subscriptionsState, "subscriptionsState");
             m.checkNotNullParameter(state, "entitlementState");
@@ -295,11 +294,10 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             this.currentInvoicePreviewFetch = invoicePreviewFetch2;
             this.skuDetailsState = state3;
             this.purchaseState = state4;
-            this.inGuildAvatarExperiment = z2;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, StorePaymentSources.PaymentSourcesState paymentSourcesState, StoreSubscriptions.SubscriptionsState subscriptionsState, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, InvoicePreviewFetch invoicePreviewFetch, InvoicePreviewFetch invoicePreviewFetch2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4, boolean z2, int i, Object obj) {
-            return storeState.copy((i & 1) != 0 ? storeState.paymentSourcesState : paymentSourcesState, (i & 2) != 0 ? storeState.subscriptionsState : subscriptionsState, (i & 4) != 0 ? storeState.entitlementState : state, (i & 8) != 0 ? storeState.guildSubscriptionState : state2, (i & 16) != 0 ? storeState.renewalInvoicePreviewFetch : invoicePreviewFetch, (i & 32) != 0 ? storeState.currentInvoicePreviewFetch : invoicePreviewFetch2, (i & 64) != 0 ? storeState.skuDetailsState : state3, (i & 128) != 0 ? storeState.purchaseState : state4, (i & 256) != 0 ? storeState.inGuildAvatarExperiment : z2);
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, StorePaymentSources.PaymentSourcesState paymentSourcesState, StoreSubscriptions.SubscriptionsState subscriptionsState, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, InvoicePreviewFetch invoicePreviewFetch, InvoicePreviewFetch invoicePreviewFetch2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4, int i, Object obj) {
+            return storeState.copy((i & 1) != 0 ? storeState.paymentSourcesState : paymentSourcesState, (i & 2) != 0 ? storeState.subscriptionsState : subscriptionsState, (i & 4) != 0 ? storeState.entitlementState : state, (i & 8) != 0 ? storeState.guildSubscriptionState : state2, (i & 16) != 0 ? storeState.renewalInvoicePreviewFetch : invoicePreviewFetch, (i & 32) != 0 ? storeState.currentInvoicePreviewFetch : invoicePreviewFetch2, (i & 64) != 0 ? storeState.skuDetailsState : state3, (i & 128) != 0 ? storeState.purchaseState : state4);
         }
 
         public final StorePaymentSources.PaymentSourcesState component1() {
@@ -334,11 +332,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             return this.purchaseState;
         }
 
-        public final boolean component9() {
-            return this.inGuildAvatarExperiment;
-        }
-
-        public final StoreState copy(StorePaymentSources.PaymentSourcesState paymentSourcesState, StoreSubscriptions.SubscriptionsState subscriptionsState, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, InvoicePreviewFetch invoicePreviewFetch, InvoicePreviewFetch invoicePreviewFetch2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4, boolean z2) {
+        public final StoreState copy(StorePaymentSources.PaymentSourcesState paymentSourcesState, StoreSubscriptions.SubscriptionsState subscriptionsState, StoreEntitlements.State state, StorePremiumGuildSubscription.State state2, InvoicePreviewFetch invoicePreviewFetch, InvoicePreviewFetch invoicePreviewFetch2, StoreGooglePlaySkuDetails.State state3, StoreGooglePlayPurchases.State state4) {
             m.checkNotNullParameter(paymentSourcesState, "paymentSourcesState");
             m.checkNotNullParameter(subscriptionsState, "subscriptionsState");
             m.checkNotNullParameter(state, "entitlementState");
@@ -347,7 +341,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(invoicePreviewFetch2, "currentInvoicePreviewFetch");
             m.checkNotNullParameter(state3, "skuDetailsState");
             m.checkNotNullParameter(state4, "purchaseState");
-            return new StoreState(paymentSourcesState, subscriptionsState, state, state2, invoicePreviewFetch, invoicePreviewFetch2, state3, state4, z2);
+            return new StoreState(paymentSourcesState, subscriptionsState, state, state2, invoicePreviewFetch, invoicePreviewFetch2, state3, state4);
         }
 
         public boolean equals(Object obj) {
@@ -358,7 +352,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.paymentSourcesState, storeState.paymentSourcesState) && m.areEqual(this.subscriptionsState, storeState.subscriptionsState) && m.areEqual(this.entitlementState, storeState.entitlementState) && m.areEqual(this.guildSubscriptionState, storeState.guildSubscriptionState) && m.areEqual(this.renewalInvoicePreviewFetch, storeState.renewalInvoicePreviewFetch) && m.areEqual(this.currentInvoicePreviewFetch, storeState.currentInvoicePreviewFetch) && m.areEqual(this.skuDetailsState, storeState.skuDetailsState) && m.areEqual(this.purchaseState, storeState.purchaseState) && this.inGuildAvatarExperiment == storeState.inGuildAvatarExperiment;
+            return m.areEqual(this.paymentSourcesState, storeState.paymentSourcesState) && m.areEqual(this.subscriptionsState, storeState.subscriptionsState) && m.areEqual(this.entitlementState, storeState.entitlementState) && m.areEqual(this.guildSubscriptionState, storeState.guildSubscriptionState) && m.areEqual(this.renewalInvoicePreviewFetch, storeState.renewalInvoicePreviewFetch) && m.areEqual(this.currentInvoicePreviewFetch, storeState.currentInvoicePreviewFetch) && m.areEqual(this.skuDetailsState, storeState.skuDetailsState) && m.areEqual(this.purchaseState, storeState.purchaseState);
         }
 
         public final InvoicePreviewFetch getCurrentInvoicePreviewFetch() {
@@ -373,10 +367,6 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             return this.guildSubscriptionState;
         }
 
-        public final boolean getInGuildAvatarExperiment() {
-            return this.inGuildAvatarExperiment;
-        }
-
         public final StorePaymentSources.PaymentSourcesState getPaymentSourcesState() {
             return this.paymentSourcesState;
         }
@@ -417,15 +407,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             if (state4 != null) {
                 i = state4.hashCode();
             }
-            int i2 = (hashCode7 + i) * 31;
-            boolean z2 = this.inGuildAvatarExperiment;
-            if (z2) {
-                z2 = true;
-            }
-            int i3 = z2 ? 1 : 0;
-            int i4 = z2 ? 1 : 0;
-            int i5 = z2 ? 1 : 0;
-            return i2 + i3;
+            return hashCode7 + i;
         }
 
         public String toString() {
@@ -445,8 +427,8 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             O.append(this.skuDetailsState);
             O.append(", purchaseState=");
             O.append(this.purchaseState);
-            O.append(", inGuildAvatarExperiment=");
-            return a.K(O, this.inGuildAvatarExperiment, ")");
+            O.append(")");
+            return O.toString();
         }
     }
 
@@ -544,7 +526,6 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             private final List<ModelEntitlement> entitlements;
             private final Map<Long, ModelPremiumGuildSubscriptionSlot> guildSubscriptions;
             private final boolean hasAnyPremiumGuildSubscriptions;
-            private final boolean inGuildAvatarExperiment;
             private final boolean isBusy;
             private final int pastDueGracePeriodDays;
             private final List<ModelPaymentSource> paymentSources;
@@ -558,7 +539,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             /* JADX DEBUG: Multi-variable search result rejected for r11v0, resolved type: java.util.List<? extends com.android.billingclient.api.Purchase> */
             /* JADX WARN: Multi-variable type inference failed */
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Loaded(ModelSubscription modelSubscription, List<? extends ModelPaymentSource> list, boolean z2, List<ModelEntitlement> list2, Map<Long, ModelPremiumGuildSubscriptionSlot> map, boolean z3, ModelInvoicePreview modelInvoicePreview, ModelInvoicePreview modelInvoicePreview2, Map<String, ? extends SkuDetails> map2, List<? extends Purchase> list3, boolean z4, int i) {
+            public Loaded(ModelSubscription modelSubscription, List<? extends ModelPaymentSource> list, boolean z2, List<ModelEntitlement> list2, Map<Long, ModelPremiumGuildSubscriptionSlot> map, boolean z3, ModelInvoicePreview modelInvoicePreview, ModelInvoicePreview modelInvoicePreview2, Map<String, ? extends SkuDetails> map2, List<? extends Purchase> list3, int i) {
                 super(null);
                 m.checkNotNullParameter(list, "paymentSources");
                 m.checkNotNullParameter(list2, "entitlements");
@@ -575,12 +556,11 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 this.currentInvoicePreview = modelInvoicePreview2;
                 this.skuDetails = map2;
                 this.purchases = list3;
-                this.inGuildAvatarExperiment = z4;
                 this.pastDueGracePeriodDays = i;
             }
 
-            public static /* synthetic */ Loaded copy$default(Loaded loaded, ModelSubscription modelSubscription, List list, boolean z2, List list2, Map map, boolean z3, ModelInvoicePreview modelInvoicePreview, ModelInvoicePreview modelInvoicePreview2, Map map2, List list3, boolean z4, int i, int i2, Object obj) {
-                return loaded.copy((i2 & 1) != 0 ? loaded.premiumSubscription : modelSubscription, (i2 & 2) != 0 ? loaded.paymentSources : list, (i2 & 4) != 0 ? loaded.isBusy : z2, (i2 & 8) != 0 ? loaded.entitlements : list2, (i2 & 16) != 0 ? loaded.guildSubscriptions : map, (i2 & 32) != 0 ? loaded.hasAnyPremiumGuildSubscriptions : z3, (i2 & 64) != 0 ? loaded.renewalInvoicePreview : modelInvoicePreview, (i2 & 128) != 0 ? loaded.currentInvoicePreview : modelInvoicePreview2, (i2 & 256) != 0 ? loaded.skuDetails : map2, (i2 & 512) != 0 ? loaded.purchases : list3, (i2 & 1024) != 0 ? loaded.inGuildAvatarExperiment : z4, (i2 & 2048) != 0 ? loaded.pastDueGracePeriodDays : i);
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, ModelSubscription modelSubscription, List list, boolean z2, List list2, Map map, boolean z3, ModelInvoicePreview modelInvoicePreview, ModelInvoicePreview modelInvoicePreview2, Map map2, List list3, int i, int i2, Object obj) {
+                return loaded.copy((i2 & 1) != 0 ? loaded.premiumSubscription : modelSubscription, (i2 & 2) != 0 ? loaded.paymentSources : list, (i2 & 4) != 0 ? loaded.isBusy : z2, (i2 & 8) != 0 ? loaded.entitlements : list2, (i2 & 16) != 0 ? loaded.guildSubscriptions : map, (i2 & 32) != 0 ? loaded.hasAnyPremiumGuildSubscriptions : z3, (i2 & 64) != 0 ? loaded.renewalInvoicePreview : modelInvoicePreview, (i2 & 128) != 0 ? loaded.currentInvoicePreview : modelInvoicePreview2, (i2 & 256) != 0 ? loaded.skuDetails : map2, (i2 & 512) != 0 ? loaded.purchases : list3, (i2 & 1024) != 0 ? loaded.pastDueGracePeriodDays : i);
             }
 
             public final ModelSubscription component1() {
@@ -591,11 +571,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 return this.purchases;
             }
 
-            public final boolean component11() {
-                return this.inGuildAvatarExperiment;
-            }
-
-            public final int component12() {
+            public final int component11() {
                 return this.pastDueGracePeriodDays;
             }
 
@@ -631,13 +607,13 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 return this.skuDetails;
             }
 
-            public final Loaded copy(ModelSubscription modelSubscription, List<? extends ModelPaymentSource> list, boolean z2, List<ModelEntitlement> list2, Map<Long, ModelPremiumGuildSubscriptionSlot> map, boolean z3, ModelInvoicePreview modelInvoicePreview, ModelInvoicePreview modelInvoicePreview2, Map<String, ? extends SkuDetails> map2, List<? extends Purchase> list3, boolean z4, int i) {
+            public final Loaded copy(ModelSubscription modelSubscription, List<? extends ModelPaymentSource> list, boolean z2, List<ModelEntitlement> list2, Map<Long, ModelPremiumGuildSubscriptionSlot> map, boolean z3, ModelInvoicePreview modelInvoicePreview, ModelInvoicePreview modelInvoicePreview2, Map<String, ? extends SkuDetails> map2, List<? extends Purchase> list3, int i) {
                 m.checkNotNullParameter(list, "paymentSources");
                 m.checkNotNullParameter(list2, "entitlements");
                 m.checkNotNullParameter(map, "guildSubscriptions");
                 m.checkNotNullParameter(map2, "skuDetails");
                 m.checkNotNullParameter(list3, "purchases");
-                return new Loaded(modelSubscription, list, z2, list2, map, z3, modelInvoicePreview, modelInvoicePreview2, map2, list3, z4, i);
+                return new Loaded(modelSubscription, list, z2, list2, map, z3, modelInvoicePreview, modelInvoicePreview2, map2, list3, i);
             }
 
             public boolean equals(Object obj) {
@@ -648,7 +624,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.premiumSubscription, loaded.premiumSubscription) && m.areEqual(this.paymentSources, loaded.paymentSources) && this.isBusy == loaded.isBusy && m.areEqual(this.entitlements, loaded.entitlements) && m.areEqual(this.guildSubscriptions, loaded.guildSubscriptions) && this.hasAnyPremiumGuildSubscriptions == loaded.hasAnyPremiumGuildSubscriptions && m.areEqual(this.renewalInvoicePreview, loaded.renewalInvoicePreview) && m.areEqual(this.currentInvoicePreview, loaded.currentInvoicePreview) && m.areEqual(this.skuDetails, loaded.skuDetails) && m.areEqual(this.purchases, loaded.purchases) && this.inGuildAvatarExperiment == loaded.inGuildAvatarExperiment && this.pastDueGracePeriodDays == loaded.pastDueGracePeriodDays;
+                return m.areEqual(this.premiumSubscription, loaded.premiumSubscription) && m.areEqual(this.paymentSources, loaded.paymentSources) && this.isBusy == loaded.isBusy && m.areEqual(this.entitlements, loaded.entitlements) && m.areEqual(this.guildSubscriptions, loaded.guildSubscriptions) && this.hasAnyPremiumGuildSubscriptions == loaded.hasAnyPremiumGuildSubscriptions && m.areEqual(this.renewalInvoicePreview, loaded.renewalInvoicePreview) && m.areEqual(this.currentInvoicePreview, loaded.currentInvoicePreview) && m.areEqual(this.skuDetails, loaded.skuDetails) && m.areEqual(this.purchases, loaded.purchases) && this.pastDueGracePeriodDays == loaded.pastDueGracePeriodDays;
             }
 
             public final ModelInvoicePreview getCurrentInvoicePreview() {
@@ -667,10 +643,6 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 return this.hasAnyPremiumGuildSubscriptions;
             }
 
-            public final boolean getInGuildAvatarExperiment() {
-                return this.inGuildAvatarExperiment;
-            }
-
             public final int getPastDueGracePeriodDays() {
                 return this.pastDueGracePeriodDays;
             }
@@ -715,15 +687,12 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 Map<Long, ModelPremiumGuildSubscriptionSlot> map = this.guildSubscriptions;
                 int hashCode4 = (hashCode3 + (map != null ? map.hashCode() : 0)) * 31;
                 boolean z3 = this.hasAnyPremiumGuildSubscriptions;
-                if (z3) {
-                    z3 = true;
+                if (!z3) {
+                    i2 = z3 ? 1 : 0;
                 }
-                int i7 = z3 ? 1 : 0;
-                int i8 = z3 ? 1 : 0;
-                int i9 = z3 ? 1 : 0;
-                int i10 = (hashCode4 + i7) * 31;
+                int i7 = (hashCode4 + i2) * 31;
                 ModelInvoicePreview modelInvoicePreview = this.renewalInvoicePreview;
-                int hashCode5 = (i10 + (modelInvoicePreview != null ? modelInvoicePreview.hashCode() : 0)) * 31;
+                int hashCode5 = (i7 + (modelInvoicePreview != null ? modelInvoicePreview.hashCode() : 0)) * 31;
                 ModelInvoicePreview modelInvoicePreview2 = this.currentInvoicePreview;
                 int hashCode6 = (hashCode5 + (modelInvoicePreview2 != null ? modelInvoicePreview2.hashCode() : 0)) * 31;
                 Map<String, SkuDetails> map2 = this.skuDetails;
@@ -732,12 +701,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 if (list3 != null) {
                     i = list3.hashCode();
                 }
-                int i11 = (hashCode7 + i) * 31;
-                boolean z4 = this.inGuildAvatarExperiment;
-                if (!z4) {
-                    i2 = z4 ? 1 : 0;
-                }
-                return ((i11 + i2) * 31) + this.pastDueGracePeriodDays;
+                return ((hashCode7 + i) * 31) + this.pastDueGracePeriodDays;
             }
 
             public final boolean isBusy() {
@@ -765,8 +729,6 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                 O.append(this.skuDetails);
                 O.append(", purchases=");
                 O.append(this.purchases);
-                O.append(", inGuildAvatarExperiment=");
-                O.append(this.inGuildAvatarExperiment);
                 O.append(", pastDueGracePeriodDays=");
                 return a.z(O, this.pastDueGracePeriodDays, ")");
             }
@@ -809,7 +771,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         this.storePremiumGuildSubscription = storePremiumGuildSubscription;
         this.billingGracePeriodExperiment = billingGracePeriodExperiment;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         fetchData();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), SettingsPremiumViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -900,7 +862,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
             if (list == null) {
                 list = n.emptyList();
             }
-            obj = new ViewState.Loaded(modelSubscription, paymentSources, false, list, ((StorePremiumGuildSubscription.State.Loaded) guildSubscriptionState).getPremiumGuildSubscriptionSlotMap(), hasAnyOfPlans, ((InvoicePreviewFetch.Invoice) renewalInvoicePreviewFetch).getModelInvoicePreview(), ((InvoicePreviewFetch.Invoice) currentInvoicePreviewFetch).getModelInvoicePreview(), ((StoreGooglePlaySkuDetails.State.Loaded) skuDetailsState).getSkuDetails(), ((StoreGooglePlayPurchases.State.Loaded) purchaseState).getPurchases(), storeState.getInGuildAvatarExperiment(), getPastDueGracePeriod(modelSubscription));
+            obj = new ViewState.Loaded(modelSubscription, paymentSources, false, list, ((StorePremiumGuildSubscription.State.Loaded) guildSubscriptionState).getPremiumGuildSubscriptionSlotMap(), hasAnyOfPlans, ((InvoicePreviewFetch.Invoice) renewalInvoicePreviewFetch).getModelInvoicePreview(), ((InvoicePreviewFetch.Invoice) currentInvoicePreviewFetch).getModelInvoicePreview(), ((StoreGooglePlaySkuDetails.State.Loaded) skuDetailsState).getSkuDetails(), ((StoreGooglePlayPurchases.State.Loaded) purchaseState).getPurchases(), getPastDueGracePeriod(modelSubscription));
         }
         updateViewState(obj);
     }
@@ -912,7 +874,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, true, null, null, false, null, null, null, null, false, 0, 4091, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, true, null, null, false, null, null, null, null, 0, 2043, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
index 91e8c1dd99..d22aeadada 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
@@ -253,7 +253,7 @@ public final class WidgetChoosePlan extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setUpRecycler();
-        LinkifiedTextView linkifiedTextView = getBinding().f2204c;
+        LinkifiedTextView linkifiedTextView = getBinding().f2203c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.choosePlanEmptyDescription");
         b.n(linkifiedTextView, R.string.premium_no_plans_body, new Object[]{c.a.d.f.a.a(360055386693L, null)}, null, 4);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
index a1b56d6e42..03c87520c1 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
@@ -351,7 +351,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
             TextView textView2 = this.binding.g;
             m.checkNotNullExpressionValue(textView2, "binding.planItemPrice");
             PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
-            MaterialCardView materialCardView = this.binding.f2203c;
+            MaterialCardView materialCardView = this.binding.f2202c;
             m.checkNotNullExpressionValue(materialCardView, "binding.planItemContainer");
             Context context = materialCardView.getContext();
             m.checkNotNullExpressionValue(context, "binding.planItemContainer.context");
@@ -373,7 +373,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
             TextView textView5 = this.binding.g;
             m.checkNotNullExpressionValue(textView5, "binding.planItemPrice");
             DrawableCompat.setCompoundDrawablesCompat$default(textView5, 0, 0, themedDrawableRes$default, 0, 11, (Object) null);
-            this.binding.f2203c.setOnClickListener(new WidgetChoosePlanAdapter$PlanViewHeader$onConfigure$1(this, item));
+            this.binding.f2202c.setOnClickListener(new WidgetChoosePlanAdapter$PlanViewHeader$onConfigure$1(this, item));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
index 8f2f918544..2a5255e93f 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
@@ -136,7 +136,7 @@ public final class WidgetClaimOutboundPromo extends AppDialog {
             m.checkNotNullExpressionValue(textView, "binding.claimPromoBody");
             ClaimOutboundPromoViewModel.ViewState.Claimed claimed = (ClaimOutboundPromoViewModel.ViewState.Claimed) viewState;
             textView.setText(claimed.getClaimedStatus().getBody());
-            TextView textView2 = getBinding().f2205c;
+            TextView textView2 = getBinding().f2204c;
             m.checkNotNullExpressionValue(textView2, "binding.claimPromoCode");
             textView2.setText(claimed.getClaimedStatus().getCode());
             AppViewFlipper appViewFlipper2 = getBinding().g;
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 4c02a0d9b6..392e2ac5af 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<UrlNode.RenderContext, Node<UrlNode.RenderContext>, MessageParseState> parser = this.parser;
         m.checkNotNullExpressionValue(string, "content");
-        getBinding().f2327c.setDraweeSpanStringBuilder(AstRenderer.render(Parser.parse$default(parser, string, MessageParseState.Companion.getInitialState(), null, 4, null), getRenderContext()));
+        getBinding().f2325c.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/premium/WidgetSettingsGifting.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
index bfdc6688e1..60eca75d91 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
@@ -213,7 +213,7 @@ public final class WidgetSettingsGifting extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout3, "binding.settingsGiftingGiftCodeInputWrap");
             textInputLayout3.setError(k);
             boolean z3 = !loaded.getOutboundPromos().isEmpty();
-            TextView textView = getBinding().f2422r;
+            TextView textView = getBinding().f2420r;
             m.checkNotNullExpressionValue(textView, "binding.settingsGiftingYourGiftsHeader");
             textView.setVisibility(z3 ? 0 : 8);
             RecyclerView recyclerView = getBinding().s;
@@ -241,7 +241,7 @@ public final class WidgetSettingsGifting extends AppFragment {
             m.throwUninitializedPropertyAccessException("chooseGiftViews");
         }
         for (GiftSelectView giftSelectView : map.keySet()) {
-            giftSelectView.i.f2203c.setOnClickListener(new c.a.y.m0.a(giftSelectView));
+            giftSelectView.i.f2202c.setOnClickListener(new c.a.y.m0.a(giftSelectView));
         }
     }
 
@@ -339,7 +339,7 @@ public final class WidgetSettingsGifting extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        this.chooseGiftViews = c0.t.h0.mapOf(o.to(getBinding().f2421c, GooglePlayInAppSkuKt.getPremiumTier1Month()), o.to(getBinding().d, GooglePlayInAppSkuKt.getPremiumTier1Year()), o.to(getBinding().e, GooglePlayInAppSkuKt.getPremiumTier2Month()), o.to(getBinding().f, GooglePlayInAppSkuKt.getPremiumTier2Year()));
+        this.chooseGiftViews = c0.t.h0.mapOf(o.to(getBinding().f2419c, GooglePlayInAppSkuKt.getPremiumTier1Month()), o.to(getBinding().d, GooglePlayInAppSkuKt.getPremiumTier1Year()), o.to(getBinding().e, GooglePlayInAppSkuKt.getPremiumTier2Month()), o.to(getBinding().f, GooglePlayInAppSkuKt.getPremiumTier2Year()));
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().o.setOnClickListener(WidgetSettingsGifting$onViewBound$1.INSTANCE);
         TextInputLayout textInputLayout = getBinding().k;
@@ -417,7 +417,7 @@ public final class WidgetSettingsGifting extends AppFragment {
                 TextView textView5 = key.i.g;
                 m.checkNotNullExpressionValue(textView5, "binding.planItemPrice");
                 DrawableCompat.setCompoundDrawablesCompat$default(textView5, 0, 0, themedDrawableRes$default, 0, 11, (Object) null);
-                key.i.f2203c.setOnClickListener(new c.a.y.m0.a(key));
+                key.i.f2202c.setOnClickListener(new c.a.y.m0.a(key));
             }
         }
         RecyclerView recyclerView4 = getBinding().m;
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
index bdba3b3fc2..cd61cff796 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
@@ -666,10 +666,10 @@ public final class WidgetSettingsPremium extends AppFragment {
             obj = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodStart, requireContext, (String) null, (java.text.DateFormat) null, ordinal2 != 2 ? ordinal2 != 4 ? 0 : 30 : loaded.getPastDueGracePeriodDays(), 12, (Object) null);
         }
         obj = obj2;
-        LinearLayout linearLayout = getBinding().f2431c.f;
+        LinearLayout linearLayout = getBinding().f2429c.f;
         m.checkNotNullExpressionValue(linearLayout, "binding.payment.premiumSettingsPaymentContainer");
         linearLayout.setVisibility(premiumSubscription != null ? 0 : 8);
-        View view = getBinding().f2431c.f118c;
+        View view = getBinding().f2429c.f118c;
         m.checkNotNullExpressionValue(view, "binding.payment.premiumSettingsBillingDivider");
         view.setVisibility(isAppleSubscription ? 0 : 8);
         if (premiumSubscription != null) {
@@ -710,31 +710,31 @@ public final class WidgetSettingsPremium extends AppFragment {
             }
             charSequence = null;
         }
-        TextView textView = getBinding().f2431c.d;
+        TextView textView = getBinding().f2429c.d;
         m.checkNotNullExpressionValue(textView, "binding.payment.premiumSettingsBillingInformation");
         if (charSequence == null) {
             z2 = false;
         }
         textView.setVisibility(z2 ? 0 : 8);
         if (charSequence != null) {
-            TextView textView2 = getBinding().f2431c.d;
+            TextView textView2 = getBinding().f2429c.d;
             m.checkNotNullExpressionValue(textView2, "binding.payment.premiumSettingsBillingInformation");
             textView2.setText(charSequence);
         }
-        MaterialButton materialButton = getBinding().f2431c.b;
+        MaterialButton materialButton = getBinding().f2429c.b;
         m.checkNotNullExpressionValue(materialButton, "binding.payment.activeSubscriptionsBottomButton");
         if (isAppleSubscription) {
             charSequence2 = b.k(this, R.string.billing_manage_subscription, new Object[0], null, 4);
         }
         ViewExtensions.setTextAndVisibilityBy(materialButton, charSequence2);
-        getBinding().f2431c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription));
-        TextView textView3 = getBinding().f2431c.e;
+        getBinding().f2429c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription));
+        TextView textView3 = getBinding().f2429c.e;
         m.checkNotNullExpressionValue(textView3, "binding.payment.premiumSettingsGooglePlayManage");
         if (!isGoogleSubscription) {
             i = 8;
         }
         textView3.setVisibility(i);
-        getBinding().f2431c.e.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$2(isGoogleSubscription, premiumSubscription));
+        getBinding().f2429c.e.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$2(isGoogleSubscription, premiumSubscription));
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:62:0x00ea, code lost:
@@ -989,9 +989,8 @@ public final class WidgetSettingsPremium extends AppFragment {
 
     private final void showContent(SettingsPremiumViewModel.ViewState.Loaded loaded) {
         SubscriptionPlanType planType;
-        AppViewFlipper appViewFlipper = getBinding().f2432r;
+        AppViewFlipper appViewFlipper = getBinding().f2430r;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumSettingsViewFlipper");
-        int i = 0;
         appViewFlipper.setDisplayedChild(0);
         ModelSubscription premiumSubscription = loaded.getPremiumSubscription();
         Boolean valueOf = (premiumSubscription == null || (planType = premiumSubscription.getPlanType()) == null) ? null : Boolean.valueOf(planType.isPremiumSubscription());
@@ -999,12 +998,6 @@ public final class WidgetSettingsPremium extends AppFragment {
         Boolean valueOf2 = premiumSubscription2 != null ? Boolean.valueOf(premiumSubscription2.isNonePlan()) : null;
         Boolean bool = Boolean.FALSE;
         if (!m.areEqual(valueOf, bool) || !m.areEqual(valueOf2, bool)) {
-            TextView textView = getBinding().d.f170c;
-            m.checkNotNullExpressionValue(textView, "binding.premiumPerks.identityPerk");
-            if (!loaded.getInGuildAvatarExperiment()) {
-                i = 8;
-            }
-            textView.setVisibility(i);
             configureActiveSubscriptionView(loaded);
             configureGrandfatheredHeader(loaded.getPremiumSubscription());
             configureLegalese(loaded);
@@ -1016,9 +1009,9 @@ public final class WidgetSettingsPremium extends AppFragment {
             Integer valueOf3 = extras != null ? Integer.valueOf(extras.getInt(INTENT_SCROLL_TO_SECTION, -1)) : null;
             if (valueOf3 == null || valueOf3.intValue() != -1) {
                 try {
-                    Observable<Long> c02 = Observable.c0(300, TimeUnit.MILLISECONDS);
-                    m.checkNotNullExpressionValue(c02, "Observable\n            .…0, TimeUnit.MILLISECONDS)");
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$showContent$1(this, valueOf3), 62, (Object) null);
+                    Observable<Long> d02 = Observable.d0(300, TimeUnit.MILLISECONDS);
+                    m.checkNotNullExpressionValue(d02, "Observable\n            .…0, TimeUnit.MILLISECONDS)");
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$showContent$1(this, valueOf3), 62, (Object) null);
                 } catch (Exception e) {
                     Logger.e$default(AppLog.g, "Error Scrolling to section", e, null, 4, null);
                 }
@@ -1048,14 +1041,14 @@ public final class WidgetSettingsPremium extends AppFragment {
     }
 
     private final void showFailureUI() {
-        AppViewFlipper appViewFlipper = getBinding().f2432r;
+        AppViewFlipper appViewFlipper = getBinding().f2430r;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumSettingsViewFlipper");
         appViewFlipper.setDisplayedChild(2);
         getBinding().k.setOnClickListener(new WidgetSettingsPremium$showFailureUI$1(this));
     }
 
     private final void showLoadingUI() {
-        AppViewFlipper appViewFlipper = getBinding().f2432r;
+        AppViewFlipper appViewFlipper = getBinding().f2430r;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumSettingsViewFlipper");
         appViewFlipper.setDisplayedChild(1);
         scrollToTop();
@@ -1068,7 +1061,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         setActionBarSubtitle(R.string.user_settings);
         setActionBarTitle(R.string.premium_title);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        TextView textView = getBinding().d.f;
+        TextView textView = getBinding().d.e;
         m.checkNotNullExpressionValue(textView, "binding.premiumPerks.uploadSizePerk");
         textView.setText(b.d(view, R.string.premium_perks_upload_size, new Object[0], new WidgetSettingsPremium$onViewBound$1(this)));
         TextView textView2 = getBinding().s.d;
@@ -1081,14 +1074,14 @@ public final class WidgetSettingsPremium extends AppFragment {
         m.checkNotNullExpressionValue(textView4, "binding.premiumTier1.tier1GuildSubscriptionPerk");
         textView4.setText(b.d(view, R.string.premium_perks_tier_1_guild_subscription, new Object[0], WidgetSettingsPremium$onViewBound$4.INSTANCE));
         NumberFormat instance = NumberFormat.getInstance(this.localeManager.getPrimaryLocale(requireContext()));
-        TextView textView5 = getBinding().d.d;
+        TextView textView5 = getBinding().d.f170c;
         m.checkNotNullExpressionValue(textView5, "binding.premiumPerks.maxGuildsPerk");
         textView5.setText(b.d(view, R.string.premium_perks_tier_2_max_guilds, new Object[0], new WidgetSettingsPremium$onViewBound$5(instance)));
-        TextView textView6 = getBinding().d.e;
+        TextView textView6 = getBinding().d.d;
         m.checkNotNullExpressionValue(textView6, "binding.premiumPerks.maxMessageLengthPerk");
         textView6.setText(b.e(this, R.string.premium_chat_perks_max_message_length, new Object[0], new WidgetSettingsPremium$onViewBound$6(instance)));
         configureButtonText$default(this, null, 1, null);
-        for (TextView textView7 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f2431c.g})) {
+        for (TextView textView7 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f2429c.g})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView7, "header");
             accessibilityUtils.setViewIsHeading(textView7);
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
index 556f73aa8d..0feeceda81 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
@@ -88,7 +88,7 @@ public final class SettingsPremiumGuildViewModel extends AppViewModel<ViewState>
             Observable observePremiumGuildSubscriptionsState$default = StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(companion.getPremiumGuildSubscriptions(), null, 1, null);
             Observable<StoreSubscriptions.SubscriptionsState> observeSubscriptions = companion.getSubscriptions().observeSubscriptions();
             Observable<LinkedHashMap<Long, Guild>> observeOrderedGuilds = companion.getGuildsSorted().observeOrderedGuilds();
-            Observable q = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).E(SettingsPremiumGuildViewModel$Companion$observeStores$1.INSTANCE).q();
+            Observable q = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).F(SettingsPremiumGuildViewModel$Companion$observeStores$1.INSTANCE).q();
             SettingsPremiumGuildViewModel$Companion$observeStores$2 settingsPremiumGuildViewModel$Companion$observeStores$2 = SettingsPremiumGuildViewModel$Companion$observeStores$2.INSTANCE;
             if (settingsPremiumGuildViewModel$Companion$observeStores$2 != null) {
                 settingsPremiumGuildViewModel$Companion$observeStores$2 = new SettingsPremiumGuildViewModel$sam$rx_functions_Func4$0(settingsPremiumGuildViewModel$Companion$observeStores$2);
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
index 4583bac0f5..7d1ace0840 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
@@ -133,7 +133,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     }
 
     private final void showContent(SettingsPremiumGuildViewModel.ViewState.Loaded loaded) {
-        AppViewFlipper appViewFlipper = getBinding().f2417c;
+        AppViewFlipper appViewFlipper = getBinding().f2415c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper");
         appViewFlipper.setDisplayedChild(2);
         boolean z2 = !loaded.getPremiumGuildSubscriptionItems().isEmpty();
@@ -202,13 +202,13 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     }
 
     private final void showFailureUI() {
-        AppViewFlipper appViewFlipper = getBinding().f2417c;
+        AppViewFlipper appViewFlipper = getBinding().f2415c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper");
         appViewFlipper.setDisplayedChild(1);
     }
 
     private final void showLoadingUI() {
-        AppViewFlipper appViewFlipper = getBinding().f2417c;
+        AppViewFlipper appViewFlipper = getBinding().f2415c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper");
         appViewFlipper.setDisplayedChild(0);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java
index 2105a1c90a..ebdd235d95 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java
@@ -480,10 +480,10 @@ public final class SettingsUserProfileViewModel extends AppViewModel<ViewState>
         this.storeUserProfile = storeUserProfile;
         this.restAPI = restAPI;
         this.bioParser = parser;
-        this.eventSubject = PublishSubject.j0();
-        Observable Y = ObservableExtensionsKt.computationLatest(storeUser.observeMe(false)).Y(1);
-        m.checkNotNullExpressionValue(Y, "storeUser.observeMe(emit…Latest()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Y, this, null, 2, null), SettingsUserProfileViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        this.eventSubject = PublishSubject.k0();
+        Observable Z = ObservableExtensionsKt.computationLatest(storeUser.observeMe(false)).Z(1);
+        m.checkNotNullExpressionValue(Z, "storeUser.observeMe(emit…Latest()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Z, this, null, 2, null), SettingsUserProfileViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         Observable<StoreState> q = observable.q();
         m.checkNotNullExpressionValue(q, "storeStateObservable\n   …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(q), this, null, 2, null), SettingsUserProfileViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
@@ -571,7 +571,7 @@ public final class SettingsUserProfileViewModel extends AppViewModel<ViewState>
     }
 
     public final Observable<UserProfileHeaderViewModel.ViewState> observeHeaderViewState() {
-        Observable<UserProfileHeaderViewModel.ViewState> q = observeViewState().E(SettingsUserProfileViewModel$observeHeaderViewState$1.INSTANCE).q();
+        Observable<UserProfileHeaderViewModel.ViewState> q = observeViewState().F(SettingsUserProfileViewModel$observeHeaderViewState$1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "observeViewState().map {… }.distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java
index 68c2cfe0bd..4eccc60d41 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java
@@ -181,18 +181,18 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
         kVar.j = false;
         kVar.f = 0;
         kVar.a = R.string.user_settings_banner_color_title;
-        kVar.f2907r = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary);
+        kVar.f2905r = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f2909x = fontUtils.getThemedFontResId(getContext(), R.attr.font_display_bold);
+        kVar.f2907x = fontUtils.getThemedFontResId(getContext(), R.attr.font_display_bold);
         kVar.l = true;
         kVar.e = R.string.color_picker_use_default;
         kVar.p = ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand);
         kVar.d = R.string.select;
-        kVar.f2908w = ColorCompat.getColor(getContext(), (int) R.color.white);
-        kVar.f2910y = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_semibold);
+        kVar.f2906w = ColorCompat.getColor(getContext(), (int) R.color.white);
+        kVar.f2908y = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_semibold);
         kVar.t = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextMuted);
         kVar.u = R.drawable.drawable_cpv_edit_text_background;
-        kVar.f2911z = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_normal);
+        kVar.f2909z = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_normal);
         ColorPickerDialog a = kVar.a();
         a.j = new WidgetEditProfileBannerSheet$launchColorPicker$1(this);
         AppBottomSheet.hideKeyboard$default(this, null, 1, null);
@@ -255,7 +255,7 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
         getBinding().g.setOnClickListener(new WidgetEditProfileBannerSheet$onViewCreated$1(this));
         getBinding().f.setOnClickListener(new WidgetEditProfileBannerSheet$onViewCreated$2(this));
         boolean z2 = getArgumentsOrDefault().getBoolean(ARG_HAS_BANNER_IMAGE);
-        MaterialTextView materialTextView = getBinding().f2216c;
+        MaterialTextView materialTextView = getBinding().f2215c;
         m.checkNotNullExpressionValue(materialTextView, "binding.bannerChangeImageItemTitle");
         int i = 0;
         if (z2) {
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java
index 92278f03ba..00c2358117 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java
@@ -125,8 +125,8 @@ public final class WidgetSettingsUserProfile$configureBannerSelect$2 extends o i
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
-        Observable J = WidgetSettingsUserProfile.access$getAvatarRepresentativeColorHexSubject$p(this.this$0).Y(1).J();
-        m.checkNotNullExpressionValue(J, "avatarRepresentativeColo…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(J, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable K = WidgetSettingsUserProfile.access$getAvatarRepresentativeColorHexSubject$p(this.this$0).Z(1).K();
+        m.checkNotNullExpressionValue(K, "avatarRepresentativeColo…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(K, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
index e3e31c522c..de452ec259 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
@@ -100,7 +100,7 @@ public final class WidgetSettingsUserProfile extends AppFragment {
         f0 f0Var = new f0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsUserProfileViewModel.class), new WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1(f0Var), new h0(widgetSettingsUserProfile$viewModel$2));
         this.discardConfirmed = new AtomicBoolean(false);
-        this.avatarRepresentativeColorHexSubject = BehaviorSubject.j0();
+        this.avatarRepresentativeColorHexSubject = BehaviorSubject.k0();
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.ViewState viewState) {
@@ -280,7 +280,7 @@ public final class WidgetSettingsUserProfile extends AppFragment {
     }
 
     private final void setCurrentBioFromEditor() {
-        TextInputEditText textInputEditText = getBinding().f2439c;
+        TextInputEditText textInputEditText = getBinding().f2437c;
         m.checkNotNullExpressionValue(textInputEditText, "binding.bioEditorTextInputField");
         getViewModel().updateBio(String.valueOf(textInputEditText.getText()));
         getViewModel().updateIsEditingBio(false);
@@ -333,7 +333,7 @@ public final class WidgetSettingsUserProfile extends AppFragment {
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().h.setOnClickListener(new WidgetSettingsUserProfile$onViewBound$1(this, view));
         ((TouchInterceptingCoordinatorLayout) view).setOnInterceptTouchEvent(new WidgetSettingsUserProfile$onViewBound$2(this));
-        getBinding().f2439c.setRawInputType(1);
+        getBinding().f2437c.setRawInputType(1);
         getBinding().e.setOnClickListener(new WidgetSettingsUserProfile$onViewBound$3(this));
         getBinding().i.setOnAvatarRepresentativeColorUpdated(new WidgetSettingsUserProfile$onViewBound$4(this));
         getBinding().i.setOnBadgeClick(new WidgetSettingsUserProfile$onViewBound$5(this));
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java
index d78ab95911..3cae2201ab 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java
@@ -53,6 +53,6 @@ public final class WidgetIncomingShare$onSendClicked$2<T, R> implements b<Pair<?
         ViewEmbedGameInvite.Model model2 = this.$gameInviteModel;
         Activity activity = model2 != null ? model2.getActivity() : null;
         ViewEmbedGameInvite.Model model3 = this.$gameInviteModel;
-        return StoreMessages.sendMessage$default(messages, h, component1, textOrEmpty, null, list, null, null, null, application, activity, model3 != null ? model3.getMessageActivity() : null, null, null, null, 14464, null).E(new WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1(this, component1));
+        return StoreMessages.sendMessage$default(messages, h, component1, textOrEmpty, null, list, null, null, null, application, activity, model3 != null ? model3.getMessageActivity() : null, null, null, null, 14464, null).F(new WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1(this, component1));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java
index 9cd7b43f53..099ab66f33 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java
@@ -81,7 +81,7 @@ public final class WidgetIncomingShare$onViewBoundOrOnResume$1<T, R> implements
     public final Observable<? extends WidgetIncomingShare.Model> call(WidgetGlobalSearchModel.ItemDataPayload itemDataPayload) {
         Channel channel;
         BehaviorSubject access$getContentPublisher$p = WidgetIncomingShare.access$getContentPublisher$p(this.this$0);
-        Observable<R> X = WidgetIncomingShare.access$getContentPublisher$p(this.this$0).X(AnonymousClass1.INSTANCE);
+        Observable<R> Y = WidgetIncomingShare.access$getContentPublisher$p(this.this$0).Y(AnonymousClass1.INSTANCE);
         BehaviorSubject access$getCommentPublisher$p = WidgetIncomingShare.access$getCommentPublisher$p(this.this$0);
         m.checkNotNullExpressionValue(access$getCommentPublisher$p, "commentPublisher");
         Observable leadingEdgeThrottle = ObservableExtensionsKt.leadingEdgeThrottle(access$getCommentPublisher$p, 500, TimeUnit.MILLISECONDS);
@@ -90,6 +90,6 @@ public final class WidgetIncomingShare$onViewBoundOrOnResume$1<T, R> implements
         m.checkNotNullExpressionValue(access$getSearchQueryPublisher$p, "searchQueryPublisher");
         Observable forSend$default = WidgetGlobalSearchModel.Companion.getForSend$default(companion, access$getSearchQueryPublisher$p, null, 2, null);
         StoreStream.Companion companion2 = StoreStream.Companion;
-        return Observable.f(access$getContentPublisher$p, X, leadingEdgeThrottle, forSend$default, companion2.getSlowMode().observeCooldownSecs((itemDataPayload == null || (channel = itemDataPayload.getChannel()) == null) ? null : Long.valueOf(channel.h()), StoreSlowMode.Type.MessageSend.INSTANCE).E(AnonymousClass2.INSTANCE).q(), StoreUser.observeMe$default(companion2.getUsers(), false, 1, null), new AnonymousClass3(itemDataPayload));
+        return Observable.f(access$getContentPublisher$p, Y, leadingEdgeThrottle, forSend$default, companion2.getSlowMode().observeCooldownSecs((itemDataPayload == null || (channel = itemDataPayload.getChannel()) == null) ? null : Long.valueOf(channel.h()), StoreSlowMode.Type.MessageSend.INSTANCE).F(AnonymousClass2.INSTANCE).q(), StoreUser.observeMe$default(companion2.getUsers(), false, 1, null), new AnonymousClass3(itemDataPayload));
     }
 }
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 39b5797687..5a2e6be93e 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
@@ -79,13 +79,13 @@ public final class WidgetIncomingShare extends AppFragment {
     private static final int FLIPPER_SEARCH = 0;
     private static final int FLIPPER_SELECTED = 1;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetIncomingShare$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<String> commentPublisher = BehaviorSubject.k0("");
-    private final BehaviorSubject<ContentModel> contentPublisher = BehaviorSubject.j0();
+    private final BehaviorSubject<String> commentPublisher = BehaviorSubject.l0("");
+    private final BehaviorSubject<ContentModel> contentPublisher = BehaviorSubject.k0();
     private Adapter previewAdapter;
     private String queryString;
     private WidgetGlobalSearchAdapter resultsAdapter;
-    private final BehaviorSubject<String> searchQueryPublisher = BehaviorSubject.k0("");
-    private final BehaviorSubject<WidgetGlobalSearchModel.ItemDataPayload> selectedReceiverPublisher = BehaviorSubject.j0();
+    private final BehaviorSubject<String> searchQueryPublisher = BehaviorSubject.l0("");
+    private final BehaviorSubject<WidgetGlobalSearchModel.ItemDataPayload> selectedReceiverPublisher = BehaviorSubject.k0();
 
     /* compiled from: WidgetIncomingShare.kt */
     public final class Adapter extends RecyclerView.Adapter<ViewHolder> {
@@ -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().f2305c;
+        ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f2303c;
         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().f2305c.bind(gameInviteModel, clock);
+            getBinding().f2303c.bind(gameInviteModel, clock);
         }
     }
 
@@ -758,13 +758,13 @@ public final class WidgetIncomingShare extends AppFragment {
         Observable observeMe$default = StoreUser.observeMe$default(companion2.getUsers(), false, 1, null);
         Observable<R> k = companion2.getChannelsSelected().observeSelectedChannel().k(cVar);
         m.checkNotNullExpressionValue(k, "StoreStream\n            …         .compose(filter)");
-        Observable y2 = Observable.j(observeMe$default, ObservableExtensionsKt.takeSingleUntilTimeout$default(k, 1000, false, 2, null), WidgetIncomingShare$onSendClicked$1.INSTANCE).Y(1).y(new WidgetIncomingShare$onSendClicked$2(this, list, model));
-        m.checkNotNullExpressionValue(y2, "Observable\n        .comb…ervable.empty()\n        }");
+        Observable z8 = Observable.j(observeMe$default, ObservableExtensionsKt.takeSingleUntilTimeout$default(k, 1000, false, 2, null), WidgetIncomingShare$onSendClicked$1.INSTANCE).Z(1).z(new WidgetIncomingShare$onSendClicked$2(this, list, model));
+        m.checkNotNullExpressionValue(z8, "Observable\n        .comb…ervable.empty()\n        }");
         WidgetGlobalSearchAdapter widgetGlobalSearchAdapter = this.resultsAdapter;
         if (widgetGlobalSearchAdapter == null) {
             m.throwUninitializedPropertyAccessException("resultsAdapter");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui(y2, this, widgetGlobalSearchAdapter), getBinding().b, 0), WidgetIncomingShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetIncomingShare$onSendClicked$3(this, list, context, itemDataPayload, z4, z5, z6), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui(z8, this, widgetGlobalSearchAdapter), getBinding().b, 0), WidgetIncomingShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetIncomingShare$onSendClicked$3(this, list, context, itemDataPayload, z4, z5, z6), 62, (Object) null);
     }
 
     private final void onSendCompleted() {
@@ -826,9 +826,9 @@ public final class WidgetIncomingShare extends AppFragment {
         m.checkNotNullExpressionValue(behaviorSubject, "searchQueryPublisher");
         StoreGuilds.Actions.requestMembers(this, behaviorSubject, false);
         Clock clock = ClockFactory.get();
-        Observable<R> X = this.selectedReceiverPublisher.q().X(new WidgetIncomingShare$onViewBoundOrOnResume$1(this));
-        m.checkNotNullExpressionValue(X, "selectedReceiverPublishe…  )\n          }\n        }");
-        Observable computationLatest = ObservableExtensionsKt.computationLatest(X);
+        Observable<R> Y = this.selectedReceiverPublisher.q().Y(new WidgetIncomingShare$onViewBoundOrOnResume$1(this));
+        m.checkNotNullExpressionValue(Y, "selectedReceiverPublishe…  )\n          }\n        }");
+        Observable computationLatest = ObservableExtensionsKt.computationLatest(Y);
         WidgetGlobalSearchAdapter widgetGlobalSearchAdapter = this.resultsAdapter;
         if (widgetGlobalSearchAdapter == null) {
             m.throwUninitializedPropertyAccessException("resultsAdapter");
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
index 35119dfd26..e4282f519b 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
@@ -118,7 +118,7 @@ public final class StageChannelJoinHelper {
         StoreVoiceChannelSelected storeVoiceChannelSelected2;
         StageChannelJoinHelper stageChannelJoinHelper2;
         boolean z4;
-        Observable<Channel> x2;
+        Observable<Channel> y2;
         StageChannelJoinHelper stageChannelJoinHelper3;
         Object obj;
         StoreVoiceChannelSelected storeVoiceChannelSelected3;
@@ -192,8 +192,8 @@ public final class StageChannelJoinHelper {
                     context3 = (Context) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1;
                     stageChannelJoinHelper2 = (StageChannelJoinHelper) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0;
                     l.throwOnFailure(obj2);
-                    x2 = storeVoiceChannelSelected2.observeSelectedChannel().w(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).x();
-                    m.checkNotNullExpressionValue(x2, "selectedVoiceChannelStor…= null }\n        .first()");
+                    y2 = storeVoiceChannelSelected2.observeSelectedChannel().x(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).y();
+                    m.checkNotNullExpressionValue(y2, "selectedVoiceChannelStor…= null }\n        .first()");
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0 = stageChannelJoinHelper2;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1 = context3;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2 = fragmentManager3;
@@ -203,7 +203,7 @@ public final class StageChannelJoinHelper {
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j6;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z4;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 3;
-                    if (RxCoroutineUtilsKt.awaitSingle(x2, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
+                    if (RxCoroutineUtilsKt.awaitSingle(y2, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
                         return coroutine_suspended;
                     }
                     z3 = z4;
@@ -234,8 +234,8 @@ public final class StageChannelJoinHelper {
                 if (((Unit) obj) != null) {
                     return c0.w.i.a.b.boxBoolean(false);
                 }
-                Observable<Set<Long>> x3 = storeGuilds2.observeGuildIds().w(new StageChannelJoinHelper$lurkAndJoinStageAsync$3(j5)).x();
-                m.checkNotNullExpressionValue(x3, "guildsStore\n        .obs…in ids }\n        .first()");
+                Observable<Set<Long>> y3 = storeGuilds2.observeGuildIds().x(new StageChannelJoinHelper$lurkAndJoinStageAsync$3(j5)).y();
+                m.checkNotNullExpressionValue(y3, "guildsStore\n        .obs…in ids }\n        .first()");
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0 = stageChannelJoinHelper3;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1 = context4;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2 = fragmentManager4;
@@ -246,7 +246,7 @@ public final class StageChannelJoinHelper {
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j6;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z5;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 2;
-                if (RxCoroutineUtilsKt.awaitSingle(x3, stageChannelJoinHelper$lurkAndJoinStageAsync$1) == coroutine_suspended) {
+                if (RxCoroutineUtilsKt.awaitSingle(y3, stageChannelJoinHelper$lurkAndJoinStageAsync$1) == coroutine_suspended) {
                     return coroutine_suspended;
                 }
                 storeLurking3 = storeLurking4;
@@ -255,8 +255,8 @@ public final class StageChannelJoinHelper {
                 stageChannelJoinHelper2 = stageChannelJoinHelper3;
                 fragmentManager3 = fragmentManager4;
                 z4 = z5;
-                x2 = storeVoiceChannelSelected2.observeSelectedChannel().w(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).x();
-                m.checkNotNullExpressionValue(x2, "selectedVoiceChannelStor…= null }\n        .first()");
+                y2 = storeVoiceChannelSelected2.observeSelectedChannel().x(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).y();
+                m.checkNotNullExpressionValue(y2, "selectedVoiceChannelStor…= null }\n        .first()");
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0 = stageChannelJoinHelper2;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1 = context3;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2 = fragmentManager3;
@@ -266,7 +266,7 @@ public final class StageChannelJoinHelper {
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j6;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z4;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 3;
-                if (RxCoroutineUtilsKt.awaitSingle(x2, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
+                if (RxCoroutineUtilsKt.awaitSingle(y2, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
                 }
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java
index f0d700f41a..b50d230836 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java
@@ -48,10 +48,10 @@ public final class StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$i
         if (i == 0) {
             l.throwOnFailure(obj);
             Observable<Bitmap> bitmap = MGImagesBitmap.INSTANCE.getBitmap(this.$iconUrl$inlined, true);
-            Observable g02 = Observable.g0(new r(bitmap.i, new f1(StageChannelNotifications$onInvitedToSpeak$1$bitmap$1$1$1.INSTANCE)));
-            m.checkNotNullExpressionValue(g02, "MGImagesBitmap.getBitmap…nErrorResumeNext { null }");
+            Observable h02 = Observable.h0(new r(bitmap.i, new f1(StageChannelNotifications$onInvitedToSpeak$1$bitmap$1$1$1.INSTANCE)));
+            m.checkNotNullExpressionValue(h02, "MGImagesBitmap.getBitmap…nErrorResumeNext { null }");
             this.label = 1;
-            obj = RxCoroutineUtilsKt.awaitSingle(g02, this);
+            obj = RxCoroutineUtilsKt.awaitSingle(h02, this);
             if (obj == coroutine_suspended) {
                 return coroutine_suspended;
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java b/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java
index b64b496458..74fe921dcf 100644
--- a/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java
@@ -135,9 +135,9 @@ public final class StageCallModel {
         }
 
         public final Observable<StageCallModel> observeStageCallModel(long j) {
-            Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new StageCallModel$Companion$observeStageCallModel$1(j));
-            m.checkNotNullExpressionValue(X, "StoreStream\n          .g…            }\n          }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new StageCallModel$Companion$observeStageCallModel$1(j));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
index e7d266086a..03f0963be2 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
@@ -111,10 +111,10 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet {
         MaterialButton materialButton = getBinding().b;
         m.checkNotNullExpressionValue(materialButton, "binding.cancel");
         materialButton.setText(requireContext().getString(R.string.explicit_end_stage_cancel));
-        MaterialButton materialButton2 = getBinding().f2229c;
+        MaterialButton materialButton2 = getBinding().f2228c;
         m.checkNotNullExpressionValue(materialButton2, "binding.confirm");
         materialButton2.setText(requireContext().getString(R.string.explicit_end_stage_confirm_mobile));
         getBinding().b.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$1(this));
-        getBinding().f2229c.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$2(this));
+        getBinding().f2228c.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
index b370301dad..9956078425 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
@@ -129,7 +129,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet
         WidgetStageAudienceBlockedBottomSheetBinding binding = getBinding();
         m.checkNotNullExpressionValue(binding, "binding");
         setPeekHeightBottomView(binding.a);
-        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f2447c;
+        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f2445c;
         m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.blockedUsers");
         this.adapter = new StageAudienceBlockedBottomSheetAdapter(maxHeightRecyclerView);
     }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
index d560e22610..57921d4cf8 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
@@ -72,7 +72,7 @@ public final class WidgetStageAudienceNoticeBottomSheet extends AppBottomSheet {
         ImageView imageView = getBinding().b;
         m.checkNotNullExpressionValue(imageView, "binding.bullet4Icon");
         imageView.setVisibility(z2 ? 0 : 8);
-        TextView textView = getBinding().f2448c;
+        TextView textView = getBinding().f2446c;
         m.checkNotNullExpressionValue(textView, "binding.bullet4Label");
         if (!z2) {
             i = 8;
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
index 43bdf6ee08..4adb44aaea 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
@@ -84,7 +84,7 @@ public final class WidgetStageModeratorJoinBottomSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f2453c.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$1(this));
+        getBinding().f2451c.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$1(this));
         getBinding().b.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
index fb93f8ecc7..bb4aa1cf07 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
@@ -137,7 +137,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
                 this.hasReceivedInitialRaisedHandsState = true;
                 switchMaterial.jumpDrawablesToCurrentState();
             }
-            Group group = getBinding().f2454c;
+            Group group = getBinding().f2452c;
             m.checkNotNullExpressionValue(group, "binding.raisedHandsEmptyGroup");
             group.setVisibility(loaded.isEmpty() ? 0 : 8);
             MaterialTextView materialTextView = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
index 6247caa8a6..311d58c473 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
@@ -87,11 +87,11 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreVoiceParticipants storeVoiceParticipants, StoreChannels storeChannels, StoreGuilds storeGuilds, StoreStageChannels storeStageChannels, Clock clock) {
-            Observable<R> E = storeChannels.observeChannel(j).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable<StoreState> X = E.q().X(new WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1(storeGuilds, storeVoiceParticipants, j, storeStageChannels, clock));
-            m.checkNotNullExpressionValue(X, "channelsStore.observeCha…          }\n            }");
-            return X;
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> Y = F.q().Y(new WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1(storeGuilds, storeVoiceParticipants, j, storeStageChannels, clock));
+            m.checkNotNullExpressionValue(Y, "channelsStore.observeCha…          }\n            }");
+            return Y;
         }
     }
 
@@ -504,7 +504,7 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
         this.channelsStore = storeChannels;
         this.usersStore = storeUser;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetStageRaisedHandsBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -558,11 +558,11 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
     }
 
     private final Observable<Void> setUserSuppressed(long j, boolean z2) {
-        Observable<R> E = this.channelsStore.observeChannel(this.channelId).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable y2 = E.x().y(new WidgetStageRaisedHandsBottomSheetViewModel$setUserSuppressed$1(j, z2));
-        m.checkNotNullExpressionValue(y2, "channelSingle\n        .f…stSubscribeOn()\n        }");
-        return ObservableExtensionsKt.ui$default(y2, this, null, 2, null);
+        Observable<R> F = this.channelsStore.observeChannel(this.channelId).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable z3 = F.y().z(new WidgetStageRaisedHandsBottomSheetViewModel$setUserSuppressed$1(j, z2));
+        m.checkNotNullExpressionValue(z3, "channelSingle\n        .f…stSubscribeOn()\n        }");
+        return ObservableExtensionsKt.ui$default(z3, this, null, 2, null);
     }
 
     public final void dismissRequestToSpeak(StoreVoiceParticipants.VoiceUser voiceUser) {
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
index 7321bc1c60..a4e8541b08 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
@@ -103,7 +103,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
 
     private final void configureUI(WidgetStageStartEventBottomSheetViewModel.ViewState viewState) {
         if (viewState instanceof WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded) {
-            MaterialButton materialButton = getBinding().f2455c;
+            MaterialButton materialButton = getBinding().f2453c;
             m.checkNotNullExpressionValue(materialButton, "binding.startStageButton");
             WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded loaded = (WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded) viewState;
             boolean z2 = true;
@@ -121,7 +121,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.subtitle");
             textView2.setText(getString(loaded.getStageInstance() == null ? R.string.start_stage_channel_event_modal_subtitle : R.string.edit_stage_subtitle));
-            MaterialButton materialButton2 = getBinding().f2455c;
+            MaterialButton materialButton2 = getBinding().f2453c;
             m.checkNotNullExpressionValue(materialButton2, "binding.startStageButton");
             materialButton2.setText(getString(loaded.getStageInstance() == null ? R.string.start_stage_channel_event_modal_button : R.string.save_changes));
             TextView textView3 = getBinding().b;
@@ -184,7 +184,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
         TextInputEditText textInputEditText = getBinding().f;
         m.checkNotNullExpressionValue(textInputEditText, "binding.topicInput");
         TextWatcherKt.addBindedTextWatcher(textInputEditText, this, new WidgetStageStartEventBottomSheet$onViewCreated$1(this));
-        getBinding().f2455c.setOnClickListener(new WidgetStageStartEventBottomSheet$onViewCreated$2(this));
+        getBinding().f2453c.setOnClickListener(new WidgetStageStartEventBottomSheet$onViewCreated$2(this));
     }
 
     public final void setOnDismiss(Function0<Unit> function0) {
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
index 28c038f17a..a6bb8e7f15 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
@@ -75,9 +75,9 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StoreStageInstances storeStageInstances) {
-            Observable<R> E = storeChannels.observeChannel(j).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable<StoreState> j2 = Observable.j(E, storeStageInstances.observeStageInstanceForChannel(j).x(), WidgetStageStartEventBottomSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> j2 = Observable.j(F, storeStageInstances.observeStageInstanceForChannel(j).y(), WidgetStageStartEventBottomSheetViewModel$Companion$observeStoreState$1.INSTANCE);
             m.checkNotNullExpressionValue(j2, "Observable.combineLatest… stageInstance)\n        }");
             return j2;
         }
@@ -435,7 +435,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
         this.channelsStore = storeChannels;
         this.stageInstanceStore = storeStageInstances;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetStageStartEventBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageViewModel.java b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageViewModel.java
index bc2bf42d43..033b52fdbb 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageViewModel.java
@@ -74,11 +74,11 @@ public final class ModeratorStartStageViewModel extends AppViewModel<ViewState>
         }
 
         private final Observable<StoreState> observeStores(long j, StoreChannels storeChannels, StoreGuildScheduledEvents storeGuildScheduledEvents, StorePermissions storePermissions, StoreVoiceParticipants storeVoiceParticipants) {
-            Observable<R> E = storeChannels.observeChannel(j).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable<StoreState> X = E.X(new ModeratorStartStageViewModel$Companion$observeStores$1(storeVoiceParticipants, storeGuildScheduledEvents, storePermissions, j));
-            m.checkNotNullExpressionValue(X, "channelStore.observeChan…  )\n          }\n        }");
-            return X;
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> Y = F.Y(new ModeratorStartStageViewModel$Companion$observeStores$1(storeVoiceParticipants, storeGuildScheduledEvents, storePermissions, j));
+            m.checkNotNullExpressionValue(Y, "channelStore.observeChan…  )\n          }\n        }");
+            return Y;
         }
     }
 
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 9dfe4beb83..8d3ee3c897 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
@@ -158,10 +158,10 @@ public final class WidgetModeratorStartStage extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        RecyclerView recyclerView = getBinding().f2317c;
+        RecyclerView recyclerView = getBinding().f2315c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         this.adapter = new ModeratorStartStageAdapter(recyclerView, new WidgetModeratorStartStage$onViewBound$1(this));
-        RecyclerView recyclerView2 = getBinding().f2317c;
+        RecyclerView recyclerView2 = getBinding().f2315c;
         recyclerView2.setLayoutManager(new LinearLayoutManager(recyclerView2.getContext()));
         ModeratorStartStageAdapter moderatorStartStageAdapter = this.adapter;
         if (moderatorStartStageAdapter == null) {
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java
index 187d5b699b..ad0262172e 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java
@@ -17,6 +17,6 @@ public final class WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1<T, R>
         m.checkNotNullExpressionValue(l, "selectedChannelId");
         Observable<StoreMessageAck.Ack> observeForChannel = messageAck.observeForChannel(l.longValue());
         TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-        return Observable.m(new j(Boolean.FALSE), Observable.j(observeForChannel.o(200, timeUnit), companion.getMessagesMostRecent().observeRecentMessageIds(l.longValue()).o(200, timeUnit).Y(1), WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.INSTANCE).a0(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.INSTANCE));
+        return Observable.m(new j(Boolean.FALSE), Observable.j(observeForChannel.o(200, timeUnit), companion.getMessagesMostRecent().observeRecentMessageIds(l.longValue()).o(200, timeUnit).Z(1), WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.INSTANCE).b0(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
index 5171cdcef4..607517fa0c 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
@@ -72,7 +72,7 @@ public final class WidgetChatStatus extends AppFragment {
 
             public final Observable<Model> get() {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getChannelsSelected().observeId().q().X(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.INSTANCE).q(), companion.getMessages().getAllDetached(), companion.getReadStates().getUnreadMarkerForSelectedChannel(), new WidgetChatStatus$sam$rx_functions_Func3$0(new WidgetChatStatus$Model$Companion$get$1(this)), 500, TimeUnit.MILLISECONDS);
+                Observable combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getChannelsSelected().observeId().q().Y(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.INSTANCE).q(), companion.getMessages().getAllDetached(), companion.getReadStates().getUnreadMarkerForSelectedChannel(), new WidgetChatStatus$sam$rx_functions_Func3$0(new WidgetChatStatus$Model$Companion$get$1(this)), 500, TimeUnit.MILLISECONDS);
                 m.checkNotNullExpressionValue(combineLatest, "ObservableWithLeadingEdg…ILLISECONDS\n            )");
                 Observable<Model> q = ObservableExtensionsKt.computationLatest(combineLatest).q();
                 m.checkNotNullExpressionValue(q, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
@@ -211,7 +211,7 @@ public final class WidgetChatStatus extends AppFragment {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.chatStatusUnreadMessagesText");
         textView.setText(getUnreadMessageText(model.isUnreadEstimate(), model.getUnreadCount(), model.getUnreadMessageId()));
-        getBinding().f2202c.setOnClickListener(new WidgetChatStatus$configureUI$2(model));
+        getBinding().f2201c.setOnClickListener(new WidgetChatStatus$configureUI$2(model));
     }
 
     private final WidgetChatStatusBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
index 928054e6a7..305d2f8a41 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
@@ -84,7 +84,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     }
 
     private final Observable<WidgetGlobalStatusIndicatorViewModel.ViewState> bindDelay(Observable<WidgetGlobalStatusIndicatorViewModel.ViewState> observable) {
-        return observable.X(new WidgetGlobalStatusIndicator$bindDelay$1(observable));
+        return observable.Y(new WidgetGlobalStatusIndicator$bindDelay$1(observable));
     }
 
     private final void configureUI(WidgetGlobalStatusIndicatorViewModel.ViewState viewState) {
@@ -115,7 +115,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         }
         WidgetGlobalStatusIndicatorState.State state = this.lastIndicatorState;
         if (state != null && state.isViewingCall()) {
-            LinearLayout linearLayout = getBinding().f2245c;
+            LinearLayout linearLayout = getBinding().f2244c;
             m.checkNotNullExpressionValue(linearLayout, "binding.indicator");
             LinearLayout linearLayout2 = getBinding().e;
             m.checkNotNullExpressionValue(linearLayout2, "binding.indicatorActions");
@@ -132,7 +132,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void configureUIVisibility(WidgetGlobalStatusIndicatorState.State state) {
         this.lastIndicatorState = state;
-        LinearLayout linearLayout = getBinding().f2245c;
+        LinearLayout linearLayout = getBinding().f2244c;
         m.checkNotNullExpressionValue(linearLayout, "binding.indicator");
         linearLayout.setVisibility(state.isVisible() ? 0 : 8);
     }
@@ -160,7 +160,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void setupConnectingState() {
         resetContentVisibility(getBinding());
-        getBinding().f2245c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
+        getBinding().f2244c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
         getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary));
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.indicatorText");
@@ -181,7 +181,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     }
 
     private final void setupContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) {
-        getBinding().f2245c.setOnClickListener(new WidgetGlobalStatusIndicator$setupContainerClicks$1(this, callOngoing));
+        getBinding().f2244c.setOnClickListener(new WidgetGlobalStatusIndicator$setupContainerClicks$1(this, callOngoing));
     }
 
     private final void setupIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) {
@@ -190,7 +190,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         LinearLayout linearLayout = getBinding().e;
         m.checkNotNullExpressionValue(linearLayout, "binding.indicatorActions");
         linearLayout.setVisibility(8);
-        LinearLayout linearLayout2 = getBinding().f2245c;
+        LinearLayout linearLayout2 = getBinding().f2244c;
         VoiceViewUtils voiceViewUtils = VoiceViewUtils.INSTANCE;
         linearLayout2.setBackgroundColor(voiceViewUtils.getConnectionStatusColor(callOngoing.getConnectionState(), callOngoing.getConnectionQuality(), requireContext()));
         String e = ChannelUtils.e(callOngoing.getSelectedVoiceChannel(), requireContext(), false, 2);
@@ -211,7 +211,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void setupOfflineState(boolean z2) {
         resetContentVisibility(getBinding());
-        getBinding().f2245c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
+        getBinding().f2244c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
         getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary));
         getBinding().i.setText(z2 ? R.string.network_offline_airplane_mode : R.string.network_offline);
         ImageView imageView = getBinding().h;
@@ -220,7 +220,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     }
 
     private final void setupStageContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) {
-        getBinding().f2245c.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$1(this, stageChannelOngoing));
+        getBinding().f2244c.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$1(this, stageChannelOngoing));
         getBinding().d.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$2(this));
         getBinding().g.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$3(this));
     }
@@ -229,7 +229,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     private final void setupStageIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) {
         resetContentVisibility(getBinding());
         int color = stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), R.color.white) : ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary);
-        getBinding().f2245c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), R.color.status_green_600) : ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
+        getBinding().f2244c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), R.color.status_green_600) : ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
         getBinding().i.setTextColor(color);
         getBinding().g.setTextColor(color);
         LinearLayout linearLayout = getBinding().e;
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java
index 0e2f1edfa9..57b7c374aa 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java
@@ -10,7 +10,7 @@ import rx.subjects.BehaviorSubject;
 public final class WidgetGlobalStatusIndicatorState {
     public static final Provider Provider = new Provider(null);
     private static final WidgetGlobalStatusIndicatorState callIndicatorState = new WidgetGlobalStatusIndicatorState();
-    private final BehaviorSubject<State> stateSubject = BehaviorSubject.j0();
+    private final BehaviorSubject<State> stateSubject = BehaviorSubject.k0();
 
     /* compiled from: WidgetGlobalStatusIndicatorState.kt */
     public static final class Provider {
@@ -133,20 +133,20 @@ public final class WidgetGlobalStatusIndicatorState {
         if ((i & 1) != 0) {
             BehaviorSubject<State> behaviorSubject = widgetGlobalStatusIndicatorState.stateSubject;
             m.checkNotNullExpressionValue(behaviorSubject, "stateSubject");
-            State m0 = behaviorSubject.m0();
-            z2 = m0 != null ? m0.isVisible() : false;
+            State n0 = behaviorSubject.n0();
+            z2 = n0 != null ? n0.isVisible() : false;
         }
         if ((i & 2) != 0) {
             BehaviorSubject<State> behaviorSubject2 = widgetGlobalStatusIndicatorState.stateSubject;
             m.checkNotNullExpressionValue(behaviorSubject2, "stateSubject");
-            State m02 = behaviorSubject2.m0();
-            z3 = m02 != null ? m02.isCustomBackground() : false;
+            State n02 = behaviorSubject2.n0();
+            z3 = n02 != null ? n02.isCustomBackground() : false;
         }
         if ((i & 4) != 0) {
             BehaviorSubject<State> behaviorSubject3 = widgetGlobalStatusIndicatorState.stateSubject;
             m.checkNotNullExpressionValue(behaviorSubject3, "stateSubject");
-            State m03 = behaviorSubject3.m0();
-            z4 = m03 != null ? m03.isViewingCall() : false;
+            State n03 = behaviorSubject3.n0();
+            z4 = n03 != null ? n03.isViewingCall() : false;
         }
         widgetGlobalStatusIndicatorState.updateState(z2, z3, z4);
     }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java
index b5b7d802f4..cf435a5e73 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java
@@ -138,7 +138,7 @@ public final class WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreSt
             if (r2 != null) {
                 r2 = new WidgetGlobalStatusIndicatorViewModel$sam$rx_functions_Func1$0(r2);
             }
-            return observeState.E((b) r2);
+            return observeState.F((b) r2);
         }
         j jVar = new j(channel);
         Observable<RtcConnection.StateChange> connectionState = this.$storeRtcConnection.getConnectionState();
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java
index f5df995d21..2dd9f22ad5 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java
@@ -74,7 +74,7 @@ public final class WidgetGlobalStatusIndicatorViewModel extends AppViewModel<Vie
         }
 
         private final Observable<StoreState> observeStoreState(StreamContextService streamContextService, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreConnectivity storeConnectivity, StoreRtcConnection storeRtcConnection, StoreGuilds storeGuilds, StoreVoiceParticipants storeVoiceParticipants, StoreStageChannels storeStageChannels, StoreUserRelationships storeUserRelationships, StoreStageInstances storeStageInstances, ObservationDeck observationDeck) {
-            return storeVoiceChannelSelected.observeSelectedChannel().X(new WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1(storeConnectivity, storeRtcConnection, storeGuilds, storeVoiceParticipants, streamContextService, storeStageChannels, observationDeck, storeUserRelationships, storeStageInstances));
+            return storeVoiceChannelSelected.observeSelectedChannel().Y(new WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1(storeConnectivity, storeRtcConnection, storeGuilds, storeVoiceParticipants, streamContextService, storeStageChannels, observationDeck, storeUserRelationships, storeStageInstances));
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, StreamContextService streamContextService, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreConnectivity storeConnectivity, StoreRtcConnection storeRtcConnection, StoreGuilds storeGuilds, StoreVoiceParticipants storeVoiceParticipants, StoreStageChannels storeStageChannels, StoreUserRelationships storeUserRelationships, StoreStageInstances storeStageInstances, ObservationDeck observationDeck, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
index 0f4cc4c0d6..e65583b955 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
@@ -124,7 +124,7 @@ public final class WidgetThreadStatus extends AppFragment {
 
     @MainThread
     private final void updateView(WidgetThreadStatusViewModel.ViewState viewState) {
-        getBinding().f2471c.setIsLoading(viewState.isLoading());
+        getBinding().f2469c.setIsLoading(viewState.isLoading());
         WidgetThreadStatusViewModel.Status threadStatus = viewState.getThreadStatus();
         int i = 8;
         if (threadStatus instanceof WidgetThreadStatusViewModel.Status.Hide) {
@@ -135,7 +135,7 @@ public final class WidgetThreadStatus extends AppFragment {
             ConstraintLayout constraintLayout2 = getBinding().b;
             c0.z.d.m.checkNotNullExpressionValue(constraintLayout2, "binding.threadStatus");
             constraintLayout2.setVisibility(0);
-            LoadingButton loadingButton = getBinding().f2471c;
+            LoadingButton loadingButton = getBinding().f2469c;
             c0.z.d.m.checkNotNullExpressionValue(loadingButton, "binding.threadStatusButton");
             WidgetThreadStatusViewModel.Status.Archived archived = (WidgetThreadStatusViewModel.Status.Archived) threadStatus;
             if (archived.getCanArchive()) {
@@ -145,26 +145,26 @@ public final class WidgetThreadStatus extends AppFragment {
             LinkifiedTextView linkifiedTextView = getBinding().d;
             c0.z.d.m.checkNotNullExpressionValue(linkifiedTextView, "binding.threadStatusText");
             linkifiedTextView.setText(archived.isLocked() ? getResources().getString(R.string.thread_header_notice_locked) : getResources().getString(R.string.thread_header_notice_archived));
-            getBinding().f2471c.setText(getResources().getString(R.string.unarchive));
-            LoadingButton loadingButton2 = getBinding().f2471c;
+            getBinding().f2469c.setText(getResources().getString(R.string.unarchive));
+            LoadingButton loadingButton2 = getBinding().f2469c;
             c0.z.d.m.checkNotNullExpressionValue(loadingButton2, "binding.threadStatusButton");
             loadingButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundAccent)));
-            getBinding().f2471c.setOnClickListener(new WidgetThreadStatus$updateView$1(this));
+            getBinding().f2469c.setOnClickListener(new WidgetThreadStatus$updateView$1(this));
         } else if (threadStatus instanceof WidgetThreadStatusViewModel.Status.Unjoined) {
             ConstraintLayout constraintLayout3 = getBinding().b;
             c0.z.d.m.checkNotNullExpressionValue(constraintLayout3, "binding.threadStatus");
             constraintLayout3.setVisibility(0);
-            LoadingButton loadingButton3 = getBinding().f2471c;
+            LoadingButton loadingButton3 = getBinding().f2469c;
             c0.z.d.m.checkNotNullExpressionValue(loadingButton3, "binding.threadStatusButton");
             loadingButton3.setVisibility(0);
             LinkifiedTextView linkifiedTextView2 = getBinding().d;
             c0.z.d.m.checkNotNullExpressionValue(linkifiedTextView2, "binding.threadStatusText");
             linkifiedTextView2.setText(getResources().getString(R.string.thread_header_notice_join));
-            getBinding().f2471c.setText(getResources().getString(R.string.join));
-            LoadingButton loadingButton4 = getBinding().f2471c;
+            getBinding().f2469c.setText(getResources().getString(R.string.join));
+            LoadingButton loadingButton4 = getBinding().f2469c;
             c0.z.d.m.checkNotNullExpressionValue(loadingButton4, "binding.threadStatusButton");
             loadingButton4.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand_500)));
-            getBinding().f2471c.setOnClickListener(new WidgetThreadStatus$updateView$2(this));
+            getBinding().f2469c.setOnClickListener(new WidgetThreadStatus$updateView$2(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatusViewModel.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatusViewModel.java
index 2c83dfa378..7e4de9f6d1 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatusViewModel.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatusViewModel.java
@@ -67,11 +67,11 @@ public final class WidgetThreadStatusViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreThreadsActiveJoined storeThreadsActiveJoined, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions) {
-            Observable<R> E = storeChannelsSelected.observeSelectedChannel().w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-            Observable<StoreState> X = E.X(new WidgetThreadStatusViewModel$Companion$observeStoreState$1(storeThreadsActiveJoined, storePermissions));
-            m.checkNotNullExpressionValue(X, "storeChannelsSelected.ob…ntilChanged()\n          }");
-            return X;
+            Observable<R> F = storeChannelsSelected.observeSelectedChannel().x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> Y = F.Y(new WidgetThreadStatusViewModel$Companion$observeStoreState$1(storeThreadsActiveJoined, storePermissions));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected.ob…ntilChanged()\n          }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreThreadsActiveJoined storeThreadsActiveJoined, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, int i, Object obj) {
@@ -402,7 +402,7 @@ public final class WidgetThreadStatusViewModel extends AppViewModel<ViewState> {
         super(null, 1, null);
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeStateObservable = observable;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetThreadStatusViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java
index 658073b7a0..76204e9c7a 100644
--- a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java
@@ -89,6 +89,6 @@ public final class GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$
     }
 
     public final Observable<? extends GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo> call(Guild guild) {
-        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getStickerGuild(this.$sticker.getId()).E(AnonymousClass1.INSTANCE).E(AnonymousClass2.INSTANCE).K(new AnonymousClass3(guild)) : new j(new GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getStickerGuild(this.$sticker.getId()).E(AnonymousClass4.INSTANCE).E(AnonymousClass5.INSTANCE).K(AnonymousClass6.INSTANCE);
+        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getStickerGuild(this.$sticker.getId()).F(AnonymousClass1.INSTANCE).F(AnonymousClass2.INSTANCE).L(new AnonymousClass3(guild)) : new j(new GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getStickerGuild(this.$sticker.getId()).F(AnonymousClass4.INSTANCE).F(AnonymousClass5.INSTANCE).L(AnonymousClass6.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java
index a3106a282b..40ae1db1d8 100644
--- a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java
@@ -228,9 +228,9 @@ public final class GuildStickerSheetViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<GuildStickerGuildInfo> getGuildForGuildSticker(RestAPI restAPI, Sticker sticker, StoreGuilds storeGuilds) {
-            Observable<GuildStickerGuildInfo> y2 = Observable.B(new GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1(storeGuilds, sticker)).y(new GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2(restAPI, sticker));
-            m.checkNotNullExpressionValue(y2, "Observable.fromCallable …      }\n        }\n      }");
-            return y2;
+            Observable<GuildStickerGuildInfo> z2 = Observable.C(new GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1(storeGuilds, sticker)).z(new GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2(restAPI, sticker));
+            m.checkNotNullExpressionValue(z2, "Observable.fromCallable …      }\n        }\n      }");
+            return z2;
         }
 
         private final Observable<StoreState> observeStoreState(RestAPI restAPI, Sticker sticker, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreGuilds storeGuilds) {
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 d457c63206..88b589c089 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().f2285c;
+        TextView textView2 = getBinding().f2283c;
         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/stickers/WidgetStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
index b51278c5e1..e1030a4bbc 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
@@ -95,9 +95,9 @@ public final class WidgetStickerSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView, "binding.stickerSheetStickerName");
         textView.setText(component2.h());
         if (!viewState.isUserPremiumTier2()) {
-            getBinding().f2460c.setOnClickListener(new WidgetStickerSheet$configureUI$1(this));
+            getBinding().f2458c.setOnClickListener(new WidgetStickerSheet$configureUI$1(this));
         }
-        TextView textView2 = getBinding().f2460c;
+        TextView textView2 = getBinding().f2458c;
         m.checkNotNullExpressionValue(textView2, "binding.stickerSheetStickerInfo");
         boolean z2 = true;
         int i = 0;
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
index dae6c5c869..960053bbdb 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
@@ -68,7 +68,7 @@ public final class WidgetUnknownStickerSheet extends AppBottomSheet {
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.api.sticker.StickerPartial");
         StickerPartial stickerPartial = (StickerPartial) serializable;
         getBinding().b.d(stickerPartial, 0);
-        TextView textView = getBinding().f2475c;
+        TextView textView = getBinding().f2473c;
         m.checkNotNullExpressionValue(textView, "binding.unknownStickerSheetStickerName");
         textView.setText(stickerPartial.e());
     }
diff --git a/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java b/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java
index 76b6215499..b163736855 100644
--- a/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java
+++ b/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java
@@ -11,7 +11,7 @@ import rx.subjects.BehaviorSubject;
 public final class BottomNavViewObserver implements TabsHostBottomNavigationView.HeightChangedListener {
     public static final Companion Companion = new Companion(null);
     private static final Lazy INSTANCE$delegate = g.lazy(BottomNavViewObserver$Companion$INSTANCE$2.INSTANCE);
-    private final BehaviorSubject<Integer> heightSubject = BehaviorSubject.k0(0);
+    private final BehaviorSubject<Integer> heightSubject = BehaviorSubject.l0(0);
 
     /* compiled from: BottomNavViewObserver.kt */
     public static final class Companion {
diff --git a/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java b/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java
index ca7344132f..cc0f420c87 100644
--- a/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java
+++ b/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java
@@ -499,7 +499,7 @@ public final class TabsHostViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeTabsNavigation = storeTabsNavigation;
         this.storeNavigation = storeNavigation;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), TabsHostViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(bottomNavViewObserver.observeHeight(), this, null, 2, null), TabsHostViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeTabsNavigation.observeDismissTabsDialogEvent(), this, null, 2, null), TabsHostViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
index 17925f21a5..bf2f473d42 100644
--- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
+++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
@@ -168,14 +168,14 @@ public final class WidgetTabsHost extends AppFragment {
     }
 
     private final void setPanelWindowInsetsListeners(boolean z2) {
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2461c, WidgetTabsHost$setPanelWindowInsetsListeners$1.INSTANCE);
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f2459c, WidgetTabsHost$setPanelWindowInsetsListeners$1.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().e, new WidgetTabsHost$setPanelWindowInsetsListeners$2(z2));
         FrameLayout frameLayout = getBinding().g;
         m.checkNotNullExpressionValue(frameLayout, "binding.widgetTabsHostNavHost");
         ViewExtensions.setForwardingWindowInsetsListener(frameLayout);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().h, new WidgetTabsHost$setPanelWindowInsetsListeners$3(z2));
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, WidgetTabsHost$setPanelWindowInsetsListeners$4.INSTANCE);
-        getBinding().f2461c.requestApplyInsets();
+        getBinding().f2459c.requestApplyInsets();
     }
 
     public static /* synthetic */ void setPanelWindowInsetsListeners$default(WidgetTabsHost widgetTabsHost, boolean z2, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java
index e747101a13..6472a4367e 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java
@@ -13,7 +13,7 @@ public final class WidgetTosAccept$configureUI$1 implements CompoundButton.OnChe
 
     @Override // android.widget.CompoundButton.OnCheckedChangeListener
     public final void onCheckedChanged(CompoundButton compoundButton, boolean z2) {
-        MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).f2472c;
+        MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).f2470c;
         m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
         materialButton.setEnabled(z2);
     }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
index 9c7771f81c..e376726bcf 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
@@ -64,12 +64,12 @@ public final class WidgetTosAccept extends AppFragment {
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.alertTosPrivacyPolicy");
             b.n(linkifiedTextView2, R.string.privacy_policy_url, new Object[0], null, 4);
             getBinding().b.setOnCheckedChangeListener(new WidgetTosAccept$configureUI$1(this));
-            MaterialButton materialButton = getBinding().f2472c;
+            MaterialButton materialButton = getBinding().f2470c;
             m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
             CheckBox checkBox = getBinding().b;
             m.checkNotNullExpressionValue(checkBox, "binding.alertTosAck");
             materialButton.setEnabled(checkBox.isChecked());
-            getBinding().f2472c.setOnClickListener(new WidgetTosAccept$configureUI$2(this));
+            getBinding().f2470c.setOnClickListener(new WidgetTosAccept$configureUI$2(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
index 563b621d22..da7ab743d8 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
@@ -288,7 +288,7 @@ public final class WidgetTosReportViolation extends AppFragment {
         super.onViewBound(view);
         setActionBarTitle(R.string.report);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        TextView textView = getBinding().f2473c;
+        TextView textView = getBinding().f2471c;
         m.checkNotNullExpressionValue(textView, "binding.reportHeader");
         c.a.k.b.n(textView, R.string.report_message, new Object[]{getArgs().getTarget()}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().g;
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
index 5af1c0a626..622bbd8aca 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
@@ -98,7 +98,7 @@ public final class WidgetTosReportViolationReasonView extends RelativeLayout {
 
     public final void setReason(ReportReason reportReason) {
         this.reason = reportReason;
-        TextView textView = this.binding.f2474c;
+        TextView textView = this.binding.f2472c;
         m.checkNotNullExpressionValue(textView, "binding.reportReasonHeader");
         String str = null;
         textView.setText(reportReason != null ? reportReason.b() : null);
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java
index 1c482bc0d4..4e218c8d03 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java
@@ -271,9 +271,9 @@ public final class WidgetTosReportViolationViewModel extends AppViewModel<ViewSt
     }
 
     private final Observable<StoreState> observeStoreState() {
-        Observable<StoreState> E = ObservableExtensionsKt.restSubscribeOn$default(RestAPIInterface.DefaultImpls.report$default(RestAPI.Companion.getApi(), Long.valueOf(this.channelId), null, Long.valueOf(this.messageId), null, 2, null), false, 1, null).E(WidgetTosReportViolationViewModel$observeStoreState$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "RestAPI\n          .api\n …eportReasons)\n          }");
-        return E;
+        Observable<StoreState> F = ObservableExtensionsKt.restSubscribeOn$default(RestAPIInterface.DefaultImpls.report$default(RestAPI.Companion.getApi(), Long.valueOf(this.channelId), null, Long.valueOf(this.messageId), null, 2, null), false, 1, null).F(WidgetTosReportViolationViewModel$observeStoreState$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "RestAPI\n          .api\n …eportReasons)\n          }");
+        return F;
     }
 
     public final ReportReason getReasonSelected() {
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 b8bff49f0e..e61304a13a 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().f2307c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this));
+        getBinding().f2305c.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/WidgetPruneUsers.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
index 3a1a7f9603..85f017383c 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
@@ -144,7 +144,7 @@ public final class WidgetPruneUsers extends AppDialog {
             WidgetPruneUsersViewModel.ViewState.Loading loading = (WidgetPruneUsersViewModel.ViewState.Loading) viewState;
             sb.append(loading.getGuildName());
             String sb2 = sb.toString();
-            TextView textView = getBinding().f2334c;
+            TextView textView = getBinding().f2332c;
             m.checkNotNullExpressionValue(textView, "binding.pruneUserHeader");
             textView.setText(sb2);
             int ordinal = loading.getWhichPruneDays().ordinal();
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java
index 5f15efd848..1c21696854 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java
@@ -519,11 +519,11 @@ public final class WidgetPruneUsersViewModel extends AppViewModel<ViewState> {
         this.storeUsers = storeUser;
         this.guildName = str;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         ViewState viewState = getViewState();
         Objects.requireNonNull(viewState, "null cannot be cast to non-null type com.discord.widgets.user.WidgetPruneUsersViewModel.ViewState.Loading");
         this.whichPruneDays = ((ViewState.Loading) viewState).getWhichPruneDays();
-        Observable q = observable.E(AnonymousClass1.INSTANCE).q();
+        Observable q = observable.F(AnonymousClass1.INSTANCE).q();
         m.checkNotNullExpressionValue(q, "storeDataObservable\n    …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(q), this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
@@ -591,9 +591,9 @@ public final class WidgetPruneUsersViewModel extends AppViewModel<ViewState> {
 
     private final void getUpdatedPruneCount() {
         updateViewState(getLoadingState());
-        Observable K = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getPruneCount(this.guildId, this.whichPruneDays.getCount()), false, 1, null).E(WidgetPruneUsersViewModel$getUpdatedPruneCount$1.INSTANCE).E(new WidgetPruneUsersViewModel$getUpdatedPruneCount$2(this)).r(new WidgetPruneUsersViewModel$getUpdatedPruneCount$3(this)).K(WidgetPruneUsersViewModel$getUpdatedPruneCount$4.INSTANCE);
-        m.checkNotNullExpressionValue(K, "restAPI.getPruneCount(gu…Failed(dismiss = false) }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(K, this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$5(this), (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$6(this), 58, (Object) null);
+        Observable L = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getPruneCount(this.guildId, this.whichPruneDays.getCount()), false, 1, null).F(WidgetPruneUsersViewModel$getUpdatedPruneCount$1.INSTANCE).F(new WidgetPruneUsersViewModel$getUpdatedPruneCount$2(this)).s(new WidgetPruneUsersViewModel$getUpdatedPruneCount$3(this)).L(WidgetPruneUsersViewModel$getUpdatedPruneCount$4.INSTANCE);
+        m.checkNotNullExpressionValue(L, "restAPI.getPruneCount(gu…Failed(dismiss = false) }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(L, this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$5(this), (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$6(this), 58, (Object) null);
     }
 
     private final void pruneInProgress(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java
index 3348c3e318..338d4081f5 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java
@@ -15,7 +15,7 @@ public final class WidgetUserMentions$WidgetUserMentionFilter$onResume$3<T> impl
     public final void call(Boolean bool) {
         WidgetUserMentions.WidgetUserMentionFilter widgetUserMentionFilter = this.this$0;
         WidgetUserMentions.Model.MessageLoader.Filters access$getFilters$p = WidgetUserMentions.WidgetUserMentionFilter.access$getFilters$p(widgetUserMentionFilter);
-        CheckedSetting checkedSetting = WidgetUserMentions.WidgetUserMentionFilter.access$getBinding$p(this.this$0).f2481c;
+        CheckedSetting checkedSetting = WidgetUserMentions.WidgetUserMentionFilter.access$getBinding$p(this.this$0).f2479c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.userMentionsFilterIncludeRoles");
         WidgetUserMentions.WidgetUserMentionFilter.access$updateFilters(widgetUserMentionFilter, WidgetUserMentions.Model.MessageLoader.Filters.copy$default(access$getFilters$p, 0, false, false, checkedSetting.isChecked(), 7, null));
         WidgetUserMentions.WidgetUserMentionFilter.access$delayedDismiss(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java
index b537561c00..6709fcf90e 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java
@@ -20,6 +20,6 @@ public final class WidgetUserMentions$observeModel$1<T, R> implements b<Navigati
         WidgetUserMentions.Model.Companion companion = WidgetUserMentions.Model.Companion;
         WidgetUserMentions.Model.MessageLoader access$getMentionsLoader$p = WidgetUserMentions.access$getMentionsLoader$p(this.this$0);
         m.checkNotNullExpressionValue(navigationTab, "selectedTab");
-        return companion.get(access$getMentionsLoader$p, navigationTab).Y(1);
+        return companion.get(access$getMentionsLoader$p, navigationTab).Z(1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
index ee0281b1b9..b6ed3aaaa1 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
@@ -144,8 +144,8 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
             public final Observable<Model> get(MessageLoader messageLoader, NavigationTab navigationTab) {
                 m.checkNotNullParameter(messageLoader, "messageLoader");
                 m.checkNotNullParameter(navigationTab, "selectedTab");
-                Observable<R> X = messageLoader.getMentionsLoadingStateSubject().X(new WidgetUserMentions$Model$Companion$get$1(navigationTab));
-                Observable<Model> q = Observable.g0(new r(X.i, new LeadingEdgeThrottle(300, TimeUnit.MILLISECONDS, i0.p.a.a()))).q();
+                Observable<R> Y = messageLoader.getMentionsLoadingStateSubject().Y(new WidgetUserMentions$Model$Companion$get$1(navigationTab));
+                Observable<Model> q = Observable.h0(new r(Y.i, new LeadingEdgeThrottle(300, TimeUnit.MILLISECONDS, i0.p.a.a()))).q();
                 m.checkNotNullExpressionValue(q, "messageLoader\n          …  .distinctUntilChanged()");
                 return q;
             }
@@ -398,9 +398,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
             public MessageLoader(long j) {
                 this.retryDelayMs = j;
-                BehaviorSubject<LoadingState> k0 = BehaviorSubject.k0(this.mentionsLoadingState);
-                m.checkNotNullExpressionValue(k0, "BehaviorSubject.create(mentionsLoadingState)");
-                this.mentionsLoadingStateSubject = k0;
+                BehaviorSubject<LoadingState> l0 = BehaviorSubject.l0(this.mentionsLoadingState);
+                m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(mentionsLoadingState)");
+                this.mentionsLoadingStateSubject = l0;
             }
 
             public static final /* synthetic */ Subscription access$getLoadSubscription$p(MessageLoader messageLoader) {
@@ -448,9 +448,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                     subscription.unsubscribe();
                 }
                 this.retryAction = function0;
-                Observable<Long> c02 = Observable.c0(this.retryDelayMs, TimeUnit.MILLISECONDS);
-                m.checkNotNullExpressionValue(c02, "Observable.timer(retryDe…s, TimeUnit.MILLISECONDS)");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(c02), MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$retry$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$retry$2(function0), 58, (Object) null);
+                Observable<Long> d02 = Observable.d0(this.retryDelayMs, TimeUnit.MILLISECONDS);
+                m.checkNotNullExpressionValue(d02, "Observable.timer(retryDe…s, TimeUnit.MILLISECONDS)");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(d02), MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$retry$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$retry$2(function0), 58, (Object) null);
             }
 
             private final void setMentionsLoadingState(LoadingState loadingState) {
@@ -512,9 +512,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                 setMentionsLoadingState(function1.invoke(this.mentionsLoadingState));
                 if (!this.mentionsLoadingState.isLoading() && !this.mentionsLoadingState.isAllLoaded() && (interactionState = this.interactionState) != null && interactionState.isAtTopIgnoringTouch() && this.isFocused) {
                     setMentionsLoadingState(LoadingState.copy$default(this.mentionsLoadingState, true, false, null, 6, null));
-                    Observable E = ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getMentions(this.mentionLimit, this.filters.getIncludeRoles(), this.filters.getIncludeEveryone(), Long.valueOf(this.filters.getAllGuilds() ? 0 : this.filters.getGuildId()), this.loadBeforeMessageId), false, 1, null)).E(WidgetUserMentions$Model$MessageLoader$tryLoad$2.INSTANCE);
-                    m.checkNotNullExpressionValue(E, "RestAPI\n            .api…messages.map(::Message) }");
-                    ObservableExtensionsKt.appSubscribe$default(E, MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$5(this), new WidgetUserMentions$Model$MessageLoader$tryLoad$3(this), (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$4(this), 50, (Object) null);
+                    Observable F = ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getMentions(this.mentionLimit, this.filters.getIncludeRoles(), this.filters.getIncludeEveryone(), Long.valueOf(this.filters.getAllGuilds() ? 0 : this.filters.getGuildId()), this.loadBeforeMessageId), false, 1, null)).F(WidgetUserMentions$Model$MessageLoader$tryLoad$2.INSTANCE);
+                    m.checkNotNullExpressionValue(F, "RestAPI\n            .api…messages.map(::Message) }");
+                    ObservableExtensionsKt.appSubscribe$default(F, MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$5(this), new WidgetUserMentions$Model$MessageLoader$tryLoad$3(this), (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$4(this), 50, (Object) null);
                 }
             }
         }
@@ -1069,14 +1069,14 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
             }
             checkedSetting5.setChecked(filters2.getIncludeEveryone());
             getBinding().b.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$2(this));
-            CheckedSetting checkedSetting6 = getBinding().f2481c;
+            CheckedSetting checkedSetting6 = getBinding().f2479c;
             m.checkNotNullExpressionValue(checkedSetting6, "binding.userMentionsFilterIncludeRoles");
             Model.MessageLoader.Filters filters3 = this.filters;
             if (filters3 == null) {
                 m.throwUninitializedPropertyAccessException("filters");
             }
             checkedSetting6.setChecked(filters3.getIncludeRoles());
-            getBinding().f2481c.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$3(this));
+            getBinding().f2479c.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$3(this));
         }
     }
 
@@ -1100,7 +1100,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
     }
 
     private final void addThreadSpineItemDecoration(WidgetChatListAdapter widgetChatListAdapter) {
-        getBinding().f2480c.addItemDecoration(new ThreadSpineItemDecoration(requireContext(), widgetChatListAdapter));
+        getBinding().f2478c.addItemDecoration(new ThreadSpineItemDecoration(requireContext(), widgetChatListAdapter));
     }
 
     private final void configureToolbar(String str) {
@@ -1135,7 +1135,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
     }
 
     private final WidgetChatListAdapter createAdapter(Function1<? super StoreChat.InteractionState, Unit> function1) {
-        RecyclerView recyclerView = getBinding().f2480c;
+        RecyclerView recyclerView = getBinding().f2478c;
         m.checkNotNullExpressionValue(recyclerView, "binding.userMentionsList");
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -1168,9 +1168,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
         if (isEmbedded()) {
             return Model.Companion.get(this.mentionsLoader, NavigationTab.MENTIONS);
         }
-        Observable<R> X = StoreStream.Companion.getTabsNavigation().observeSelectedTab().X(new WidgetUserMentions$observeModel$1(this));
-        m.checkNotNullExpressionValue(X, "StoreStream.getTabsNavig…          }\n            }");
-        return X;
+        Observable<R> Y = StoreStream.Companion.getTabsNavigation().observeSelectedTab().Y(new WidgetUserMentions$observeModel$1(this));
+        m.checkNotNullExpressionValue(Y, "StoreStream.getTabsNavig…          }\n            }");
+        return Y;
     }
 
     @Override // androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
index 6d6a7077ff..43ad6814e6 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
@@ -90,9 +90,9 @@ public final class WidgetUserMutualFriends extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable X = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getRelationships(j), false, 1, null).X(new WidgetUserMutualFriends$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(X, "RestAPI\n            .api…          )\n            }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable Y = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getRelationships(j), false, 1, null).Y(new WidgetUserMutualFriends$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "RestAPI\n            .api…          )\n            }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "RestAPI\n            .api…  .distinctUntilChanged()");
                 return q;
             }
@@ -456,7 +456,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
                 IconUtils.setIcon$default(simpleDraweeView, mutualFriend.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
                 int i2 = 0;
                 while (i2 <= 3) {
-                    x5 x5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f2486c : this.binding.b;
+                    x5 x5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f2484c : this.binding.b;
                     m.checkNotNullExpressionValue(x5Var, "when (i) {\n            1…mutualServer4\n          }");
                     RelativeLayout relativeLayout = x5Var.a;
                     m.checkNotNullExpressionValue(relativeLayout, "item.root");
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
index 6e27543ee4..3e8cd2de35 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
@@ -119,7 +119,7 @@ public final class WidgetUserMutualGuilds extends AppFragment {
                 m.checkNotNullParameter(item, "data");
                 super.onConfigure(i, (int) item);
                 this.binding.a.setOnClickListener(new WidgetUserMutualGuilds$Adapter$ViewHolder$onConfigure$1(this, item));
-                SimpleDraweeView simpleDraweeView = this.binding.f2487c;
+                SimpleDraweeView simpleDraweeView = this.binding.f2485c;
                 Guild guild = item.getGuild();
                 String str = null;
                 int i2 = 8;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
index a5f88586fa..e9c53ffe73 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
@@ -22,7 +22,7 @@ public final class WidgetUserPasswordVerify$validationManager$2 extends o implem
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo17invoke() {
-        TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f2482c;
+        TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f2480c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
         return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.password_required), AuthUtils.INSTANCE.createPasswordInputValidator(R.string.password_length_error)));
     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
index 917e15d6b8..6d74f5b398 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
@@ -188,7 +188,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     private final void saveInfo() {
         if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
             AppFragment.hideKeyboard$default(this, null, 1, null);
-            TextInputLayout textInputLayout = getBinding().f2482c;
+            TextInputLayout textInputLayout = getBinding().f2480c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
             Serializable serializableExtra = getMostRecentIntent().getSerializableExtra(INTENT_EXTRA_ACTION);
@@ -227,10 +227,10 @@ public final class WidgetUserPasswordVerify extends AppFragment {
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
-        TextInputLayout textInputLayout = getBinding().f2482c;
+        TextInputLayout textInputLayout = getBinding().f2480c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
-        TextInputLayout textInputLayout2 = getBinding().f2482c;
+        TextInputLayout textInputLayout2 = getBinding().f2480c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountPasswordWrap");
         ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserPasswordVerify$onViewBound$1(this), 1, null);
         getBinding().d.setOnClickListener(new WidgetUserPasswordVerify$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
index 333a02615b..a10b7bad6d 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
@@ -211,7 +211,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         setActionBarTitle(R.string.custom_status);
         this.expirationRadioManager = new RadioManager(n.listOf((Object[]) new MaterialRadioButton[]{getBinding().g, getBinding().e, getBinding().d, getBinding().f, getBinding().h}));
-        getBinding().f2488c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this));
+        getBinding().f2486c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this));
         getBinding().j.setEndIconOnClickListener(new WidgetUserSetCustomStatus$onViewBound$2(this));
         TextInputLayout textInputLayout = getBinding().j;
         m.checkNotNullExpressionValue(textInputLayout, "binding.setCustomStatusText");
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
index 5da53996fe..4f77c6b446 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
@@ -79,9 +79,9 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStoreState(StoreUserSettings storeUserSettings, StoreEmoji storeEmoji) {
-            Observable<StoreState> Y = Observable.j(storeUserSettings.observeCustomStatus(), storeEmoji.getEmojiSet(StoreEmoji.EmojiContext.Global.INSTANCE, false, false), WidgetUserSetCustomStatusViewModel$Companion$observeStoreState$1.INSTANCE).Y(1);
-            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…        )\n      }.take(1)");
-            return Y;
+            Observable<StoreState> Z = Observable.j(storeUserSettings.observeCustomStatus(), storeEmoji.getEmojiSet(StoreEmoji.EmojiContext.Global.INSTANCE, false, false), WidgetUserSetCustomStatusViewModel$Companion$observeStoreState$1.INSTANCE).Z(1);
+            m.checkNotNullExpressionValue(Z, "Observable.combineLatest…        )\n      }.take(1)");
+            return Z;
         }
 
         public final FormState.Expiration getDEFAULT_EXPIRATION() {
@@ -477,7 +477,7 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
         this.storeUserSettings = storeUserSettings;
         this.clock = clock;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetUserSetCustomStatusViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
index 317fc55e31..381b06e8bd 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
@@ -139,10 +139,10 @@ public final class WidgetUserStatusSheet extends AppBottomSheet {
         z3 z3Var2 = getBinding().d;
         m.checkNotNullExpressionValue(z3Var2, "binding.userStatusUpdateIdle");
         z3Var2.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$2(this));
-        getBinding().f2495c.b.setImageResource(R.drawable.ic_status_dnd_16dp);
-        getBinding().f2495c.d.setText(R.string.status_dnd);
-        getBinding().f2495c.f200c.setText(R.string.status_dnd_help);
-        z3 z3Var3 = getBinding().f2495c;
+        getBinding().f2493c.b.setImageResource(R.drawable.ic_status_dnd_16dp);
+        getBinding().f2493c.d.setText(R.string.status_dnd);
+        getBinding().f2493c.f200c.setText(R.string.status_dnd_help);
+        z3 z3Var3 = getBinding().f2493c;
         m.checkNotNullExpressionValue(z3Var3, "binding.userStatusUpdateDnd");
         z3Var3.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$3(this));
         getBinding().e.b.setImageResource(R.drawable.ic_status_invisible_16dp);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java
index 773aa54be0..987aac23da 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java
@@ -75,9 +75,9 @@ public final class WidgetUserStatusSheetViewModel extends AppViewModel<ViewState
         }
 
         private final Observable<StoreState> observeStoreState(StoreUserPresence storeUserPresence) {
-            Observable<R> E = storeUserPresence.observeLocalPresence().E(WidgetUserStatusSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "storePresences\n         …          )\n            }");
-            return E;
+            Observable<R> F = storeUserPresence.observeLocalPresence().F(WidgetUserStatusSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storePresences\n         …          )\n            }");
+            return F;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
index 0d2fa7a9d2..49af93186c 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
@@ -75,7 +75,7 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase {
         RelativeLayout relativeLayout = binding.b;
         relativeLayout.setVisibility(isEmailAllowed() ? 0 : 8);
         relativeLayout.setOnClickListener(new WidgetUserAccountVerify$onViewBound$$inlined$with$lambda$1(this));
-        RelativeLayout relativeLayout2 = binding.f2477c;
+        RelativeLayout relativeLayout2 = binding.f2475c;
         if (!isPhoneAllowed()) {
             i = 8;
         }
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java
index 0f77965057..4cf908119a 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java
@@ -36,7 +36,7 @@ public final class WidgetUserEmailUpdate$onViewBound$3 implements View.OnClickLi
     public final void onClick(View view) {
         RestAPI api = RestAPI.Companion.getApi();
         RestAPIParams.UserInfo.Companion companion = RestAPIParams.UserInfo.Companion;
-        TextInputLayout textInputLayout = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).f2478c;
+        TextInputLayout textInputLayout = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).f2476c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangeEmail");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
         TextInputLayout textInputLayout2 = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).d;
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
index 4d02100576..98181f9c17 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
@@ -95,7 +95,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase {
         m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangePassword");
         if (ViewExtensions.getTextOrEmpty(textInputLayout).length() >= 3) {
             Pattern pattern = Patterns.EMAIL_ADDRESS;
-            TextInputLayout textInputLayout2 = getBinding().f2478c;
+            TextInputLayout textInputLayout2 = getBinding().f2476c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.alertVerifyEmailChangeEmail");
             if (pattern.matcher(ViewExtensions.getTextOrEmpty(textInputLayout2)).matches()) {
                 z2 = true;
@@ -126,7 +126,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        TextInputLayout textInputLayout = getBinding().f2478c;
+        TextInputLayout textInputLayout = getBinding().f2476c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangeEmail");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetUserEmailUpdate$onViewBound$1(this));
         TextInputLayout textInputLayout2 = getBinding().d;
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
index 282eb3f0eb..6c111f9344 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
@@ -50,7 +50,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
         private final String email;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2654me;
+        private final MeUser f2652me;
         private final boolean verified;
 
         /* compiled from: WidgetUserEmailVerify.kt */
@@ -63,7 +63,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
             }
 
             public final Observable<Model> get() {
-                Observable<Model> q = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).E(WidgetUserEmailVerify$Model$Companion$get$1.INSTANCE).q();
+                Observable<Model> q = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).F(WidgetUserEmailVerify$Model$Companion$get$1.INSTANCE).q();
                 m.checkNotNullExpressionValue(q, "getUsers()\n            .…  .distinctUntilChanged()");
                 return q;
             }
@@ -71,20 +71,20 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
 
         public Model(MeUser meUser) {
             m.checkNotNullParameter(meUser, "me");
-            this.f2654me = meUser;
+            this.f2652me = meUser;
             this.email = meUser.getEmail();
             this.verified = meUser.isVerified();
         }
 
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = model.f2654me;
+                meUser = model.f2652me;
             }
             return model.copy(meUser);
         }
 
         public final MeUser component1() {
-            return this.f2654me;
+            return this.f2652me;
         }
 
         public final Model copy(MeUser meUser) {
@@ -94,7 +94,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
 
         public boolean equals(Object obj) {
             if (this != obj) {
-                return (obj instanceof Model) && m.areEqual(this.f2654me, ((Model) obj).f2654me);
+                return (obj instanceof Model) && m.areEqual(this.f2652me, ((Model) obj).f2652me);
             }
             return true;
         }
@@ -104,7 +104,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
         }
 
         public final MeUser getMe() {
-            return this.f2654me;
+            return this.f2652me;
         }
 
         public final boolean getVerified() {
@@ -112,7 +112,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2654me;
+            MeUser meUser = this.f2652me;
             if (meUser != null) {
                 return meUser.hashCode();
             }
@@ -121,7 +121,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
 
         public String toString() {
             StringBuilder O = a.O("Model(me=");
-            O.append(this.f2654me);
+            O.append(this.f2652me);
             O.append(")");
             return O.toString();
         }
@@ -151,7 +151,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
             WidgetUserEmailUpdate.Companion.launch(requireContext(), getMode(), this.emailUpdateLauncher);
         } else {
             getBinding().b.setOnClickListener(new WidgetUserEmailVerify$configureUI$1(this));
-            getBinding().f2479c.setOnClickListener(new WidgetUserEmailVerify$configureUI$2(this, model));
+            getBinding().f2477c.setOnClickListener(new WidgetUserEmailVerify$configureUI$2(this, model));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
index 1ea36093d5..401a7833e4 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
@@ -109,18 +109,18 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.userPhoneAddDescriptionNote");
             b.n(textView, R.string.phone_verification_current_phone, new Object[]{meUser.getPhoneNumber()}, null, 4);
-            TextView textView2 = getBinding().f2483c;
+            TextView textView2 = getBinding().f2481c;
             m.checkNotNullExpressionValue(textView2, "binding.removePhone");
             textView2.setVisibility(0);
         } else {
             getBinding().g.setText(R.string.enter_phone_title);
             getBinding().d.setText(R.string.enter_phone_description);
-            TextView textView3 = getBinding().f2483c;
+            TextView textView3 = getBinding().f2481c;
             m.checkNotNullExpressionValue(textView3, "binding.removePhone");
             textView3.setVisibility(8);
         }
         if (meUser.getEmail() == null) {
-            TextView textView4 = getBinding().f2483c;
+            TextView textView4 = getBinding().f2481c;
             m.checkNotNullExpressionValue(textView4, "binding.removePhone");
             textView4.setVisibility(8);
         }
@@ -173,7 +173,7 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{phone}, false, null, null, new WidgetUserPhoneManage$onViewBound$1(phone), 14, null), this, null, 2, null), WidgetUserPhoneManage.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserPhoneManage$onViewBound$2(this), 62, (Object) null);
         getBinding().f.a(this, new WidgetUserPhoneManage$onViewBound$3(this));
         getBinding().e.setOnClickListener(new WidgetUserPhoneManage$onViewBound$4(this));
-        getBinding().f2483c.setOnClickListener(new WidgetUserPhoneManage$onViewBound$5(this));
+        getBinding().f2481c.setOnClickListener(new WidgetUserPhoneManage$onViewBound$5(this));
     }
 
     @Override // com.discord.widgets.user.account.WidgetUserAccountVerifyBase, com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
index 33087a164e..ff78f30db2 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
@@ -115,7 +115,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
         String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_PHONE_NUMBER);
         if (stringExtra != null) {
             m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…A_PHONE_NUMBER) ?: return");
-            ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), WidgetUserPhoneVerify$handleCodeEntered$1.INSTANCE), false, 1, null), getBinding().f2484c, 0, 2, null), this, null, 2, null).k(o.h(new WidgetUserPhoneVerify$handleCodeEntered$2(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$3(this)));
+            ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), WidgetUserPhoneVerify$handleCodeEntered$1.INSTANCE), false, 1, null), getBinding().f2482c, 0, 2, null), this, null, 2, null).k(o.h(new WidgetUserPhoneVerify$handleCodeEntered$2(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$3(this)));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java
index 0f2ba06a01..d750889000 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java
@@ -17,6 +17,6 @@ public final class ModelRichPresence$Companion$get$1<T, R> implements b<Presence
             return new j(null);
         }
         Activity primaryActivity = PresenceUtils.INSTANCE.getPrimaryActivity(presence);
-        return (primaryActivity == null || (a = primaryActivity.a()) == null) ? new j(new ModelRichPresence(presence, null, 2, null)) : StoreStream.Companion.getApplication().observeApplication(Long.valueOf(a.longValue())).E(new ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1(presence));
+        return (primaryActivity == null || (a = primaryActivity.a()) == null) ? new j(new ModelRichPresence(presence, null, 2, null)) : StoreStream.Companion.getApplication().observeApplication(Long.valueOf(a.longValue())).F(new ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1(presence));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java
index 184fd1aa2d..8997160b76 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java
@@ -34,9 +34,9 @@ public final class ModelRichPresence {
 
         public final Observable<ModelRichPresence> get(long j, StoreUserPresence storeUserPresence) {
             m.checkNotNullParameter(storeUserPresence, "storeUserPresence");
-            Observable<R> X = storeUserPresence.observePresenceForUser(j).X(ModelRichPresence$Companion$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(X, "storeUserPresence\n      …          }\n            }");
-            return X;
+            Observable<R> Y = storeUserPresence.observePresenceForUser(j).Y(ModelRichPresence$Companion$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "storeUserPresence\n      …          }\n            }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
index 7be4dc3742..026eceaee1 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
@@ -45,9 +45,9 @@ public final class ModelStageRichPresence {
 
         public final Observable<List<ModelStageRichPresence>> observeStageRichPresence(StoreUserPresence storeUserPresence) {
             m.checkNotNullParameter(storeUserPresence, "storeUserPresence");
-            Observable<R> E = storeUserPresence.observeAllPresences().E(ModelStageRichPresence$Companion$observeStageRichPresence$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "storeUserPresence\n      …   }.toList()\n          }");
-            return E;
+            Observable<R> F = storeUserPresence.observeAllPresences().F(ModelStageRichPresence$Companion$observeStageRichPresence$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storeUserPresence\n      …   }.toList()\n          }");
+            return F;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
index 1b6a02b78f..115d47b946 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
@@ -665,9 +665,9 @@ public class ViewHolderUserRichPresence {
             ActivityTimestamps o = activity.o();
             if ((o != null ? friendlyTime(o) : null) != null) {
                 if (this.perSecondTimerSubscription == null) {
-                    Observable<Long> C = Observable.C(0, 1, TimeUnit.SECONDS);
-                    m.checkNotNullExpressionValue(C, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(C, appComponent, null, 2, null), getClass(), (Context) null, new ViewHolderUserRichPresence$configureUiTimestamp$1(this), (Function1) null, (Function0) null, (Function0) null, new ViewHolderUserRichPresence$configureUiTimestamp$2(this, activity), 58, (Object) null);
+                    Observable<Long> D = Observable.D(0, 1, TimeUnit.SECONDS);
+                    m.checkNotNullExpressionValue(D, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(D, appComponent, null, 2, null), getClass(), (Context) null, new ViewHolderUserRichPresence$configureUiTimestamp$1(this), (Function1) null, (Function0) null, (Function0) null, new ViewHolderUserRichPresence$configureUiTimestamp$2(this, activity), 58, (Object) null);
                     return;
                 }
                 return;
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
index bbcecb993d..ec54708503 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
@@ -138,9 +138,9 @@ public final class UserProfileHeaderView extends ConstraintLayout {
             m.checkNotNullParameter(userProfileHeaderView, "$this$bind");
             m.checkNotNullParameter(appComponent, "appComponent");
             m.checkNotNullParameter(observable, "observable");
-            Observable<R> E = observable.w(UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.INSTANCE).E(UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.INSTANCE);
-            m.checkNotNullExpressionValue(E, "filter { it is T }.map { it as T }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(E, appComponent, null, 2, null), appComponent.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$Companion$bind$1(userProfileHeaderView), 62, (Object) null);
+            Observable<R> F = observable.x(UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.INSTANCE).F(UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(F, appComponent, null, 2, null), appComponent.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$Companion$bind$1(userProfileHeaderView), 62, (Object) null);
         }
     }
 
@@ -381,9 +381,9 @@ public final class UserProfileHeaderView extends ConstraintLayout {
 
     private final Observable<Integer> observeRepresentativeColor(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
         GuildMember guildMember = loaded.getGuildMember();
-        Observable<Integer> a02 = ObservableExtensionsKt.ui((guildMember == null || !guildMember.hasAvatar()) ? RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(loaded.getAvatarColorId()) : RepresentativeColorsKt.getGuildMemberRepresentativeColors().observeRepresentativeColor(loaded.getGuildMemberColorId())).Z(new ViewDetachedFromWindowObservable(this).observe()).a0(UserProfileHeaderView$observeRepresentativeColor$1.INSTANCE);
-        m.checkNotNullExpressionValue(a02, "representativeColorObser….takeUntil { it != null }");
-        return a02;
+        Observable<Integer> b02 = ObservableExtensionsKt.ui((guildMember == null || !guildMember.hasAvatar()) ? RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(loaded.getAvatarColorId()) : RepresentativeColorsKt.getGuildMemberRepresentativeColors().observeRepresentativeColor(loaded.getGuildMemberColorId())).a0(new ViewDetachedFromWindowObservable(this).observe()).b0(UserProfileHeaderView$observeRepresentativeColor$1.INSTANCE);
+        m.checkNotNullExpressionValue(b02, "representativeColorObser….takeUntil { it != null }");
+        return b02;
     }
 
     private final void onTapBanner() {
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java
index 31458da44c..aa4813ae48 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java
@@ -33,6 +33,6 @@ public final class UserProfileHeaderViewModel$Companion$observeStoreState$1<T, R
 
     public final Observable<? extends Pair<MeUser, User>> call(MeUser meUser) {
         long j = this.$userId;
-        return j == -1 ? new j(new Pair(meUser, meUser)) : this.$storeUser.observeUser(j).E(new AnonymousClass1(meUser));
+        return j == -1 ? new j(new Pair(meUser, meUser)) : this.$storeUser.observeUser(j).F(new AnonymousClass1(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java
index 06b0260fc6..3c7c995b18 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java
@@ -93,9 +93,9 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
 
         private final Observable<Map<Long, GuildMember>> observeComputedMembers(Long l, Long l2, Collection<Long> collection, StoreChannels storeChannels, StoreGuilds storeGuilds) {
             if (l != null && l.longValue() > 0) {
-                Observable<R> X = storeChannels.observeChannel(l.longValue()).X(new UserProfileHeaderViewModel$Companion$observeComputedMembers$1(storeGuilds, collection));
-                m.checkNotNullExpressionValue(X, "storeChannels\n          …emptyMap())\n            }");
-                return X;
+                Observable<R> Y = storeChannels.observeChannel(l.longValue()).Y(new UserProfileHeaderViewModel$Companion$observeComputedMembers$1(storeGuilds, collection));
+                m.checkNotNullExpressionValue(Y, "storeChannels\n          …emptyMap())\n            }");
+                return Y;
             } else if (l2 != null && l2.longValue() > 0) {
                 return storeGuilds.observeComputed(l2.longValue(), collection);
             } else {
@@ -120,9 +120,9 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(storeUserSettings, "storeUserSettings");
             m.checkNotNullParameter(streamContextService, "streamContextService");
             m.checkNotNullParameter(storeAccessibility, "storeAccessibility");
-            Observable<StoreState> X = StoreUser.observeMe$default(storeUser, false, 1, null).X(new UserProfileHeaderViewModel$Companion$observeStoreState$1(j, storeUser)).X(new UserProfileHeaderViewModel$Companion$observeStoreState$2(l, storeChannels, storeGuilds, l2, storeUserPresence, streamContextService, storeUserProfile, storeExperiments, storeUserSettings, storeAccessibility));
-            m.checkNotNullExpressionValue(X, "storeUser.observeMe()\n  …            }\n          }");
-            return X;
+            Observable<StoreState> Y = StoreUser.observeMe$default(storeUser, false, 1, null).Y(new UserProfileHeaderViewModel$Companion$observeStoreState$1(j, storeUser)).Y(new UserProfileHeaderViewModel$Companion$observeStoreState$2(l, storeChannels, storeGuilds, l2, storeUserPresence, streamContextService, storeUserProfile, storeExperiments, storeUserSettings, storeAccessibility));
+            m.checkNotNullExpressionValue(Y, "storeUser.observeMe()\n  …            }\n          }");
+            return Y;
         }
     }
 
@@ -133,7 +133,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         private final Collection<Map<Long, GuildMember>> guildMembers;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2655me;
+        private final MeUser f2653me;
         private final boolean reducedMotionEnabled;
         private final ModelRichPresence richPresence;
         private final StreamContext streamContext;
@@ -150,7 +150,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(map, "userIdToGuildMemberMap");
             m.checkNotNullParameter(collection, "guildMembers");
             m.checkNotNullParameter(modelUserProfile, "userProfile");
-            this.f2655me = meUser;
+            this.f2653me = meUser;
             this.user = user;
             this.userIdToGuildMemberMap = map;
             this.guildMembers = collection;
@@ -164,11 +164,11 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         }
 
         public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, User user, Map map, Collection collection, ModelRichPresence modelRichPresence, StreamContext streamContext, ModelUserProfile modelUserProfile, Experiment experiment, boolean z2, boolean z3, Channel channel, int i, Object obj) {
-            return storeState.copy((i & 1) != 0 ? storeState.f2655me : meUser, (i & 2) != 0 ? storeState.user : user, (i & 4) != 0 ? storeState.userIdToGuildMemberMap : map, (i & 8) != 0 ? storeState.guildMembers : collection, (i & 16) != 0 ? storeState.richPresence : modelRichPresence, (i & 32) != 0 ? storeState.streamContext : streamContext, (i & 64) != 0 ? storeState.userProfile : modelUserProfile, (i & 128) != 0 ? storeState.winnerBadgeExperiment : experiment, (i & 256) != 0 ? storeState.allowAnimatedEmojis : z2, (i & 512) != 0 ? storeState.reducedMotionEnabled : z3, (i & 1024) != 0 ? storeState.channel : channel);
+            return storeState.copy((i & 1) != 0 ? storeState.f2653me : meUser, (i & 2) != 0 ? storeState.user : user, (i & 4) != 0 ? storeState.userIdToGuildMemberMap : map, (i & 8) != 0 ? storeState.guildMembers : collection, (i & 16) != 0 ? storeState.richPresence : modelRichPresence, (i & 32) != 0 ? storeState.streamContext : streamContext, (i & 64) != 0 ? storeState.userProfile : modelUserProfile, (i & 128) != 0 ? storeState.winnerBadgeExperiment : experiment, (i & 256) != 0 ? storeState.allowAnimatedEmojis : z2, (i & 512) != 0 ? storeState.reducedMotionEnabled : z3, (i & 1024) != 0 ? storeState.channel : channel);
         }
 
         public final MeUser component1() {
-            return this.f2655me;
+            return this.f2653me;
         }
 
         public final boolean component10() {
@@ -228,7 +228,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.f2655me, storeState.f2655me) && m.areEqual(this.user, storeState.user) && m.areEqual(this.userIdToGuildMemberMap, storeState.userIdToGuildMemberMap) && m.areEqual(this.guildMembers, storeState.guildMembers) && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.winnerBadgeExperiment, storeState.winnerBadgeExperiment) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis && this.reducedMotionEnabled == storeState.reducedMotionEnabled && m.areEqual(this.channel, storeState.channel);
+            return m.areEqual(this.f2653me, storeState.f2653me) && m.areEqual(this.user, storeState.user) && m.areEqual(this.userIdToGuildMemberMap, storeState.userIdToGuildMemberMap) && m.areEqual(this.guildMembers, storeState.guildMembers) && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.winnerBadgeExperiment, storeState.winnerBadgeExperiment) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis && this.reducedMotionEnabled == storeState.reducedMotionEnabled && m.areEqual(this.channel, storeState.channel);
         }
 
         public final boolean getAllowAnimatedEmojis() {
@@ -244,7 +244,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser getMe() {
-            return this.f2655me;
+            return this.f2653me;
         }
 
         public final boolean getReducedMotionEnabled() {
@@ -276,7 +276,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2655me;
+            MeUser meUser = this.f2653me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             User user = this.user;
@@ -316,7 +316,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
 
         public String toString() {
             StringBuilder O = a.O("StoreState(me=");
-            O.append(this.f2655me);
+            O.append(this.f2653me);
             O.append(", user=");
             O.append(this.user);
             O.append(", userIdToGuildMemberMap=");
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
index 12730c28ab..0e8ea691be 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
@@ -42,19 +42,19 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
     public static final class Emoji {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2656id;
+        private final String f2654id;
         private final boolean isAnimated;
         private final String name;
 
         public Emoji(String str, String str2, boolean z2) {
-            this.f2656id = str;
+            this.f2654id = str;
             this.name = str2;
             this.isAnimated = z2;
         }
 
         public static /* synthetic */ Emoji copy$default(Emoji emoji, String str, String str2, boolean z2, int i, Object obj) {
             if ((i & 1) != 0) {
-                str = emoji.f2656id;
+                str = emoji.f2654id;
             }
             if ((i & 2) != 0) {
                 str2 = emoji.name;
@@ -66,7 +66,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         }
 
         public final String component1() {
-            return this.f2656id;
+            return this.f2654id;
         }
 
         public final String component2() {
@@ -89,11 +89,11 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
                 return false;
             }
             Emoji emoji = (Emoji) obj;
-            return m.areEqual(this.f2656id, emoji.f2656id) && m.areEqual(this.name, emoji.name) && this.isAnimated == emoji.isAnimated;
+            return m.areEqual(this.f2654id, emoji.f2654id) && m.areEqual(this.name, emoji.name) && this.isAnimated == emoji.isAnimated;
         }
 
         public final String getId() {
-            return this.f2656id;
+            return this.f2654id;
         }
 
         public final String getName() {
@@ -101,7 +101,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         }
 
         public int hashCode() {
-            String str = this.f2656id;
+            String str = this.f2654id;
             int i = 0;
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.name;
@@ -125,7 +125,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
 
         public String toString() {
             StringBuilder O = a.O("Emoji(id=");
-            O.append(this.f2656id);
+            O.append(this.f2654id);
             O.append(", name=");
             O.append(this.name);
             O.append(", isAnimated=");
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java
index cb03fb9dcd..43f85b70e9 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java
@@ -12,7 +12,7 @@ public final class WidgetGlobalSearch$onViewBound$4 implements View.OnClickListe
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetGlobalSearch widgetGlobalSearch = this.this$0;
-        widgetGlobalSearch.hideKeyboard(WidgetGlobalSearch.access$getBinding$p(widgetGlobalSearch).f2243c);
+        widgetGlobalSearch.hideKeyboard(WidgetGlobalSearch.access$getBinding$p(widgetGlobalSearch).f2242c);
         WidgetGlobalSearch.access$getDismissViewModel$p(this.this$0).dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
index fd6a42306f..f23de16ad4 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
@@ -22,7 +22,7 @@ public final class WidgetGlobalSearch$onViewBound$6 implements View.OnClickListe
     public final void onClick(View view) {
         WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion;
         Context x2 = a.x(view, "it", "it.context");
-        TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f2243c;
+        TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f2242c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         companion.show(x2, w.trimStart(ViewExtensions.getTextOrEmpty(textInputLayout), MentionUtilsKt.MENTIONS_CHAR, MentionUtilsKt.CHANNELS_CHAR, '*'), "QuickSwitcher");
         WidgetGlobalSearch.onSelected$default(this.this$0, NavigationTab.FRIENDS, null, 2, null);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
index 699ecb885f..21fb025c68 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
@@ -69,7 +69,7 @@ public final class WidgetGlobalSearch extends AppFragment {
     private static final int INDEX_RESULTS_NOT_FOUND = 2;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGlobalSearch$binding$2.INSTANCE, null, 2, null);
     private final Lazy dismissViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGlobalSearchDismissModel.class), new WidgetGlobalSearch$$special$$inlined$activityViewModels$1(this), new WidgetGlobalSearch$$special$$inlined$activityViewModels$2(this));
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.k0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
     private String filterString;
     private WidgetGlobalSearchGuildsAdapter guildsAdapter;
     private WidgetGlobalSearchAdapter resultsAdapter;
@@ -291,7 +291,7 @@ public final class WidgetGlobalSearch extends AppFragment {
     @MainThread
     private final void setSearchPrefix(String str) {
         CharSequence charSequence;
-        TextInputLayout textInputLayout = getBinding().f2243c;
+        TextInputLayout textInputLayout = getBinding().f2242c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(ViewExtensions.getTextOrEmpty(textInputLayout));
         if (spannableStringBuilder.length() == 0) {
@@ -306,7 +306,7 @@ public final class WidgetGlobalSearch extends AppFragment {
         }
         m.checkNotNullExpressionValue(charSequence, "newQuery");
         if (!t.isBlank(charSequence)) {
-            TextInputLayout textInputLayout2 = getBinding().f2243c;
+            TextInputLayout textInputLayout2 = getBinding().f2242c;
             ViewExtensions.setText(textInputLayout2, charSequence);
             textInputLayout2.post(new WidgetGlobalSearch$setSearchPrefix$1$1(textInputLayout2));
         }
@@ -329,7 +329,7 @@ public final class WidgetGlobalSearch extends AppFragment {
     }
 
     public final void onDismiss() {
-        hideKeyboard(getBinding().f2243c);
+        hideKeyboard(getBinding().f2242c);
     }
 
     @Override // com.discord.app.AppFragment
@@ -344,20 +344,20 @@ public final class WidgetGlobalSearch extends AppFragment {
         RecyclerView recyclerView2 = getBinding().e;
         m.checkNotNullExpressionValue(recyclerView2, "binding.globalSearchGuildList");
         this.guildsAdapter = (WidgetGlobalSearchGuildsAdapter) companion.configure(new WidgetGlobalSearchGuildsAdapter(recyclerView2, ColorCompat.getThemedColor(view, (int) R.attr.primary_630)));
-        TextInputLayout textInputLayout = getBinding().f2243c;
+        TextInputLayout textInputLayout = getBinding().f2242c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetGlobalSearch$onViewBound$1(this));
         Bundle arguments = getArguments();
         if (!(arguments == null || (string = arguments.getString(EXTRA_SEARCH_TEXT)) == null)) {
-            TextInputLayout textInputLayout2 = getBinding().f2243c;
+            TextInputLayout textInputLayout2 = getBinding().f2242c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.globalSearchBar");
             ViewExtensions.setText(textInputLayout2, string);
-            TextInputLayout textInputLayout3 = getBinding().f2243c;
+            TextInputLayout textInputLayout3 = getBinding().f2242c;
             m.checkNotNullExpressionValue(textInputLayout3, "binding.globalSearchBar");
             ViewExtensions.setSelectionEnd(textInputLayout3);
         }
-        getBinding().f2243c.setEndIconOnClickListener(new WidgetGlobalSearch$onViewBound$3(this));
-        getBinding().f2243c.setStartIconOnClickListener(new WidgetGlobalSearch$onViewBound$4(this));
+        getBinding().f2242c.setEndIconOnClickListener(new WidgetGlobalSearch$onViewBound$3(this));
+        getBinding().f2242c.setStartIconOnClickListener(new WidgetGlobalSearch$onViewBound$4(this));
         j jVar = new j(Unit.a);
         m.checkNotNullExpressionValue(jVar, "Observable.just(Unit)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(jVar, this, null, 2, null), WidgetGlobalSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearch$onViewBound$5(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
index 5185437f05..8bca24d55a 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
@@ -108,8 +108,8 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getDismissViewModel().getDismissEvents(), this, null, 2, null), WidgetGlobalSearchDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearchDialog$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        Observable R = ObservableExtensionsKt.computationLatest(StoreStream.Companion.getChannelsSelected().observeId()).q().R(1);
-        m.checkNotNullExpressionValue(R, "StoreStream\n        .get…hanged()\n        .skip(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(R, this, null, 2, null), WidgetGlobalSearchDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearchDialog$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable S = ObservableExtensionsKt.computationLatest(StoreStream.Companion.getChannelsSelected().observeId()).q().S(1);
+        m.checkNotNullExpressionValue(S, "StoreStream\n        .get…hanged()\n        .skip(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(S, this, null, 2, null), WidgetGlobalSearchDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearchDialog$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java
index d3895a4114..4f7ab7211d 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java
@@ -7,7 +7,7 @@ import rx.Observable;
 import rx.subjects.PublishSubject;
 /* compiled from: WidgetGlobalSearchDismissModel.kt */
 public final class WidgetGlobalSearchDismissModel extends AppViewModel<Unit> {
-    private final PublishSubject<Unit> dismissEventsSubject = PublishSubject.j0();
+    private final PublishSubject<Unit> dismissEventsSubject = PublishSubject.k0();
 
     public WidgetGlobalSearchDismissModel() {
         super(null, 1, null);
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 df6f691977..6f888d126a 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.f2290c;
+            TextView textView = this.binding.f2288c;
             m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount");
             configureMentionsCount(textView, item.getMentionCount());
             SimpleDraweeView simpleDraweeView = this.binding.b;
@@ -167,7 +167,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             ImageView imageView = this.bindingGuild.i;
             m.checkNotNullExpressionValue(imageView, "bindingGuild.guildsItemVoice");
             imageView.setVisibility(item.getConnectedToVoice() ? 0 : 8);
-            ImageView imageView2 = this.binding.f2244c;
+            ImageView imageView2 = this.binding.f2243c;
             m.checkNotNullExpressionValue(imageView2, "binding.guildsItemUnread");
             imageView2.setVisibility(item.isUnread() ? 0 : 8);
             ImageView imageView3 = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
index ec9dbc403b..ceb8b8c1fd 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
@@ -66,7 +66,7 @@ public final class WidgetGlobalSearchGuildsModel {
         private final Guild guild;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2657id;
+        private final long f2655id;
         private final boolean isSelected;
         private final boolean isUnread;
         private final String key;
@@ -105,7 +105,7 @@ public final class WidgetGlobalSearchGuildsModel {
         /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001c: INVOKE  (r4v1 int) = (r0v0 'this' com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel$Item A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel.Item.getType():int), ('-' char), (r2v0 long)] */
         public Item(int i, long j, Channel channel, Guild guild, int i2, boolean z2, boolean z3, boolean z4, int i3) {
             this._type = i;
-            this.f2657id = j;
+            this.f2655id = j;
             this.channel = channel;
             this.guild = guild;
             this.mentionCount = i2;
@@ -131,11 +131,11 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public static /* synthetic */ Item copy$default(Item item, int i, long j, Channel channel, Guild guild, int i2, boolean z2, boolean z3, boolean z4, int i3, int i4, Object obj) {
-            return item.copy((i4 & 1) != 0 ? item._type : i, (i4 & 2) != 0 ? item.f2657id : j, (i4 & 4) != 0 ? item.channel : channel, (i4 & 8) != 0 ? item.guild : guild, (i4 & 16) != 0 ? item.mentionCount : i2, (i4 & 32) != 0 ? item.isUnread : z2, (i4 & 64) != 0 ? item.isSelected : z3, (i4 & 128) != 0 ? item.connectedToVoice : z4, (i4 & 256) != 0 ? item.unavailableGuildCount : i3);
+            return item.copy((i4 & 1) != 0 ? item._type : i, (i4 & 2) != 0 ? item.f2655id : j, (i4 & 4) != 0 ? item.channel : channel, (i4 & 8) != 0 ? item.guild : guild, (i4 & 16) != 0 ? item.mentionCount : i2, (i4 & 32) != 0 ? item.isUnread : z2, (i4 & 64) != 0 ? item.isSelected : z3, (i4 & 128) != 0 ? item.connectedToVoice : z4, (i4 & 256) != 0 ? item.unavailableGuildCount : i3);
         }
 
         public final long component2() {
-            return this.f2657id;
+            return this.f2655id;
         }
 
         public final Channel component3() {
@@ -178,7 +178,7 @@ public final class WidgetGlobalSearchGuildsModel {
                 return false;
             }
             Item item = (Item) obj;
-            return this._type == item._type && this.f2657id == item.f2657id && m.areEqual(this.channel, item.channel) && m.areEqual(this.guild, item.guild) && this.mentionCount == item.mentionCount && this.isUnread == item.isUnread && this.isSelected == item.isSelected && this.connectedToVoice == item.connectedToVoice && this.unavailableGuildCount == item.unavailableGuildCount;
+            return this._type == item._type && this.f2655id == item.f2655id && m.areEqual(this.channel, item.channel) && m.areEqual(this.guild, item.guild) && this.mentionCount == item.mentionCount && this.isUnread == item.isUnread && this.isSelected == item.isSelected && this.connectedToVoice == item.connectedToVoice && this.unavailableGuildCount == item.unavailableGuildCount;
         }
 
         public final Channel getChannel() {
@@ -194,7 +194,7 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public final long getId() {
-            return this.f2657id;
+            return this.f2655id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -216,7 +216,7 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public int hashCode() {
-            int a = (b.a(this.f2657id) + (this._type * 31)) * 31;
+            int a = (b.a(this.f2655id) + (this._type * 31)) * 31;
             Channel channel = this.channel;
             int i = 0;
             int hashCode = (a + (channel != null ? channel.hashCode() : 0)) * 31;
@@ -261,7 +261,7 @@ public final class WidgetGlobalSearchGuildsModel {
             StringBuilder O = a.O("Item(_type=");
             O.append(this._type);
             O.append(", id=");
-            O.append(this.f2657id);
+            O.append(this.f2655id);
             O.append(", channel=");
             O.append(this.channel);
             O.append(", guild=");
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
index 5fef8441a3..8319ef598a 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
@@ -309,7 +309,7 @@ public final class WidgetGlobalSearchModel {
             if (widgetGlobalSearchModel$Companion$get$channelContextObservable$1 != null) {
                 widgetGlobalSearchModel$Companion$get$channelContextObservable$1 = new WidgetGlobalSearchModel$sam$rx_functions_Func8$0(widgetGlobalSearchModel$Companion$get$channelContextObservable$1);
             }
-            Observable q4 = ObservableWithLeadingEdgeThrottle.combineLatest(observeGuilds, observeGuildAndPrivateChannels, observeAllActiveJoinedThreadsChannelsById, observePermissionsForAllChannels, observePrivateChannels, observeIds, unreadChannelIds, unreadGuildIds, (Func8) widgetGlobalSearchModel$Companion$get$channelContextObservable$1, 3, timeUnit).E(new WidgetGlobalSearchModel$Companion$get$channelContextObservable$2(function2)).q();
+            Observable q4 = ObservableWithLeadingEdgeThrottle.combineLatest(observeGuilds, observeGuildAndPrivateChannels, observeAllActiveJoinedThreadsChannelsById, observePermissionsForAllChannels, observePrivateChannels, observeIds, unreadChannelIds, unreadGuildIds, (Func8) widgetGlobalSearchModel$Companion$get$channelContextObservable$1, 3, timeUnit).F(new WidgetGlobalSearchModel$Companion$get$channelContextObservable$2(function2)).q();
             Observable<WidgetGlobalSearchModel> q5 = ObservableWithLeadingEdgeThrottle.combineLatest(q2, q3, q4, ObservableWithLeadingEdgeThrottle.combineLatest(q2, q4, companion.getUserGuildSettings().observeGuildSettings(), companion.getGuildsSorted().observeOrderedGuilds(), WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.INSTANCE, 5, timeUnit).q(), new j(function1), new j(function12), new WidgetGlobalSearchModel$sam$rx_functions_Func6$0(new WidgetGlobalSearchModel$Companion$get$1(this)), 200, timeUnit2).q();
             m.checkNotNullExpressionValue(q5, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
             return q5;
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java
index 308542cf35..45c3526591 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java
@@ -18,7 +18,7 @@ public final class WidgetUserSheet$onViewCreated$14 implements View.OnFocusChang
         if (!z2) {
             WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0);
             Context context = this.this$0.getContext();
-            TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2493y;
+            TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2491y;
             m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
             access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
         }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java
index 405de88d07..fef3c916c4 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java
@@ -33,10 +33,10 @@ public final class WidgetUserSheet$onViewCreated$15 extends o implements Functio
         m.checkNotNullParameter(textView, "it");
         WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0);
         Context context = this.this$0.getContext();
-        TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2493y;
+        TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2491y;
         m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
         access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
-        WidgetUserSheet.access$getBinding$p(this.this$0).f2493y.clearFocus();
+        WidgetUserSheet.access$getBinding$p(this.this$0).f2491y.clearFocus();
         this.this$0.hideKeyboard(this.$view);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
index ae20137e1a..37e7e652ae 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
@@ -234,7 +234,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
 
     private final void configureAboutMe(WidgetUserSheetViewModel.ViewState.Loaded loaded) {
         List<Node<MessageRenderContext>> bioAst = loaded.getBioAst();
-        TextView textView = getBinding().f2489c;
+        TextView textView = getBinding().f2487c;
         m.checkNotNullExpressionValue(textView, "binding.aboutMeHeader");
         boolean z2 = true;
         int i = 0;
@@ -315,7 +315,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
         }
         String guildSectionHeaderText = loaded.getGuildSectionHeaderText();
         if (guildSectionHeaderText != null) {
-            TextView textView = getBinding().f2490r;
+            TextView textView = getBinding().f2488r;
             m.checkNotNullExpressionValue(textView, "binding.userSheetGuildHeader");
             textView.setText(guildSectionHeaderText);
         }
@@ -350,45 +350,45 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void configureNote(WidgetUserSheetViewModel.ViewState.Loaded loaded) {
-        getBinding().f2492x.setRawInputType(1);
+        getBinding().f2490x.setRawInputType(1);
         StoreUserNotes.UserNoteState userNoteFetchState = loaded.getUserNoteFetchState();
         if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Empty) {
-            TextInputLayout textInputLayout = getBinding().f2493y;
+            TextInputLayout textInputLayout = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
             textInputLayout.setHint(getString(R.string.note_placeholder_mobile));
-            TextInputLayout textInputLayout2 = getBinding().f2493y;
+            TextInputLayout textInputLayout2 = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap");
             textInputLayout2.setEnabled(true);
         } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loading) {
-            TextInputLayout textInputLayout3 = getBinding().f2493y;
+            TextInputLayout textInputLayout3 = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout3, "binding.userSheetNoteTextFieldWrap");
             textInputLayout3.setHint(getString(R.string.loading_note));
-            TextInputLayout textInputLayout4 = getBinding().f2493y;
+            TextInputLayout textInputLayout4 = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout4, "binding.userSheetNoteTextFieldWrap");
             textInputLayout4.setEnabled(false);
         } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded) {
-            TextInputLayout textInputLayout5 = getBinding().f2493y;
+            TextInputLayout textInputLayout5 = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout5, "binding.userSheetNoteTextFieldWrap");
             textInputLayout5.setHint(getString(R.string.note_placeholder_mobile));
-            TextInputLayout textInputLayout6 = getBinding().f2493y;
+            TextInputLayout textInputLayout6 = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout6, "binding.userSheetNoteTextFieldWrap");
             textInputLayout6.setEnabled(true);
         }
         if (loaded.getUserNote() != null) {
-            TextInputLayout textInputLayout7 = getBinding().f2493y;
+            TextInputLayout textInputLayout7 = getBinding().f2491y;
             m.checkNotNullExpressionValue(textInputLayout7, "binding.userSheetNoteTextFieldWrap");
             ViewExtensions.setTextIfDifferent(textInputLayout7, loaded.getUserNote());
         }
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:17:0x0054  */
-    /* JADX WARNING: Removed duplicated region for block: B:18:0x0056  */
-    /* JADX WARNING: Removed duplicated region for block: B:26:0x0091  */
-    /* JADX WARNING: Removed duplicated region for block: B:27:0x0093  */
-    /* JADX WARNING: Removed duplicated region for block: B:30:0x00a5  */
-    /* JADX WARNING: Removed duplicated region for block: B:31:0x00a7  */
-    /* JADX WARNING: Removed duplicated region for block: B:34:0x00ae A[RETURN] */
-    /* JADX WARNING: Removed duplicated region for block: B:35:0x00af  */
+    /* JADX WARNING: Removed duplicated region for block: B:15:0x004e  */
+    /* JADX WARNING: Removed duplicated region for block: B:16:0x0050  */
+    /* JADX WARNING: Removed duplicated region for block: B:24:0x008b  */
+    /* JADX WARNING: Removed duplicated region for block: B:25:0x008d  */
+    /* JADX WARNING: Removed duplicated region for block: B:28:0x009f  */
+    /* JADX WARNING: Removed duplicated region for block: B:29:0x00a1  */
+    /* JADX WARNING: Removed duplicated region for block: B:32:0x00a8 A[RETURN] */
+    /* JADX WARNING: Removed duplicated region for block: B:33:0x00a9  */
     private final void configureProfileActionButtons(WidgetUserSheetViewModel.ViewState.Loaded loaded) {
         boolean z2;
         boolean z3;
@@ -403,7 +403,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(materialButton, "binding.userSheetProfileIdentityButton");
         boolean z4 = true;
         if (isMe) {
-            if ((currentGuildId != null ? currentGuildId.longValue() : 0) > 0 && loaded.getInGuildAvatarExperiment()) {
+            if ((currentGuildId != null ? currentGuildId.longValue() : 0) > 0) {
                 z2 = true;
                 materialButton.setVisibility(!z2 ? 0 : 8);
                 getBinding().F.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(currentGuildId));
@@ -429,21 +429,21 @@ public final class WidgetUserSheet extends AppBottomSheet {
                         Button button2 = getBinding().f;
                         m.checkNotNullExpressionValue(button2, "binding.userSheetAddFriendActionButton");
                         button2.setVisibility(0);
-                        Button button3 = getBinding().f2494z;
+                        Button button3 = getBinding().f2492z;
                         m.checkNotNullExpressionValue(button3, "binding.userSheetPendingFriendRequestActionButton");
                         button3.setVisibility(8);
                     } else if (userRelationshipType == 3 || userRelationshipType == 4) {
                         Button button4 = getBinding().f;
                         m.checkNotNullExpressionValue(button4, "binding.userSheetAddFriendActionButton");
                         button4.setVisibility(8);
-                        Button button5 = getBinding().f2494z;
+                        Button button5 = getBinding().f2492z;
                         m.checkNotNullExpressionValue(button5, "binding.userSheetPendingFriendRequestActionButton");
                         button5.setVisibility(0);
                     } else {
                         Button button6 = getBinding().f;
                         m.checkNotNullExpressionValue(button6, "binding.userSheetAddFriendActionButton");
                         button6.setVisibility(8);
-                        Button button7 = getBinding().f2494z;
+                        Button button7 = getBinding().f2492z;
                         m.checkNotNullExpressionValue(button7, "binding.userSheetPendingFriendRequestActionButton");
                         button7.setVisibility(8);
                     }
@@ -457,7 +457,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
                     }
                     button8.setVisibility(i);
                     getBinding().f.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$6(this, loaded));
-                    getBinding().f2494z.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$7(this, userRelationshipType, loaded));
+                    getBinding().f2492z.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$7(this, userRelationshipType, loaded));
                     return;
                 }
                 return;
@@ -767,10 +767,10 @@ public final class WidgetUserSheet extends AppBottomSheet {
         if (j > 0 && j2 > 0) {
             StoreStream.Companion.getGuildSubscriptions().unsubscribeUser(j2, j);
         }
-        hideKeyboard(getBinding().f2493y);
+        hideKeyboard(getBinding().f2491y);
         WidgetUserSheetViewModel viewModel = getViewModel();
         Context context = getContext();
-        TextInputLayout textInputLayout = getBinding().f2493y;
+        TextInputLayout textInputLayout = getBinding().f2491y;
         m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
         viewModel.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
         super.onPause();
@@ -813,14 +813,14 @@ public final class WidgetUserSheet extends AppBottomSheet {
         getBinding().h.setOnServerDeafen(new WidgetUserSheet$onViewCreated$11(this));
         getBinding().h.setOnServerMove(new WidgetUserSheet$onViewCreated$12(this));
         getBinding().h.setOnDisconnect(new WidgetUserSheet$onViewCreated$13(this));
-        TextInputLayout textInputLayout = getBinding().f2493y;
+        TextInputLayout textInputLayout = getBinding().f2491y;
         m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
         ViewExtensions.setOnEditTextFocusChangeListener(textInputLayout, new WidgetUserSheet$onViewCreated$14(this));
-        TextInputLayout textInputLayout2 = getBinding().f2493y;
+        TextInputLayout textInputLayout2 = getBinding().f2491y;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap");
         ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserSheet$onViewCreated$15(this, view), 1, null);
         ViewCompat.setAccessibilityDelegate(getBinding().v, new WidgetUserSheet$onViewCreated$16(this));
-        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().j, getBinding().f2490r, getBinding().f2491w, getBinding().m, getBinding().s, getBinding().I})) {
+        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().j, getBinding().f2488r, getBinding().f2489w, getBinding().m, getBinding().s, getBinding().I})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java
index eefc69ab37..a2f290e75f 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java
@@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$inviteUserToSpeak$1 extends o implem
         return Unit.a;
     }
 
-    public final void invoke(Void r28) {
+    public final void invoke(Void r27) {
         WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0);
         if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) {
             access$getViewState$p = null;
         }
         WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p;
         if (loaded != null) {
-            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 127, null), null, null, null, 0, null, null, null, false, null, false, null, false, 4193791, null));
+            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 127, null), null, null, null, 0, null, null, null, false, null, false, null, 2096639, null));
             WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java
index 0e2fcb0c03..5839265371 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java
@@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$setUserSuppressedInChannel$1 extends
         return Unit.a;
     }
 
-    public final void invoke(Void r28) {
+    public final void invoke(Void r27) {
         WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0);
         if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) {
             access$getViewState$p = null;
         }
         WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p;
         if (loaded != null) {
-            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 191, null), null, null, null, 0, null, null, null, false, null, false, null, false, 4193791, null));
+            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 191, null), null, null, null, 0, null, null, null, false, null, false, null, 2096639, null));
             WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
index 70d93eaa3c..4c7c0f683f 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
@@ -749,10 +749,9 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         private final Map<Long, VoiceState> currentChannelVoiceStates;
         private final Guild guild;
         private final Map<Long, GuildRole> guildRoles;
-        private final boolean inGuildAvatarExperiment;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2658me;
+        private final MeUser f2656me;
         private final boolean muted;
         private final Map<Long, VoiceState> mySelectedVoiceChannelVoiceStates;
         private final StageRoles myStageRoles;
@@ -770,9 +769,9 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         private final StageRequestToSpeakState userRequestToSpeakState;
         private final StageRoles userStageRoles;
 
-        private StoreState(User user, MeUser meUser, Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5) {
+        private StoreState(User user, MeUser meUser, Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) {
             this.user = user;
-            this.f2658me = meUser;
+            this.f2656me = meUser;
             this.channel = channel;
             this.computedMembers = map;
             this.guildRoles = map2;
@@ -793,16 +792,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             this.userStageRoles = stageRoles;
             this.userRequestToSpeakState = stageRequestToSpeakState;
             this.myStageRoles = stageRoles2;
-            this.inGuildAvatarExperiment = z5;
         }
 
-        public /* synthetic */ StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5, DefaultConstructorMarker defaultConstructorMarker) {
-            this(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z5);
+        public /* synthetic */ StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, DefaultConstructorMarker defaultConstructorMarker) {
+            this(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2);
         }
 
-        /* renamed from: copy-U9gTzXU$default  reason: not valid java name */
-        public static /* synthetic */ StoreState m65copyU9gTzXU$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5, int i, Object obj) {
-            return storeState.m68copyU9gTzXU((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2658me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : modelUserProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2, (i & 4194304) != 0 ? storeState.inGuildAvatarExperiment : z5);
+        /* renamed from: copy-1YV1AGg$default  reason: not valid java name */
+        public static /* synthetic */ StoreState m65copy1YV1AGg$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, int i, Object obj) {
+            return storeState.m68copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2656me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : modelUserProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2);
         }
 
         public final User component1() {
@@ -850,7 +848,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser component2() {
-            return this.f2658me;
+            return this.f2656me;
         }
 
         /* renamed from: component20-twRsX-0  reason: not valid java name */
@@ -867,10 +865,6 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             return this.myStageRoles;
         }
 
-        public final boolean component23() {
-            return this.inGuildAvatarExperiment;
-        }
-
         public final Channel component3() {
             return this.channel;
         }
@@ -899,8 +893,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             return this.selfMuted;
         }
 
-        /* renamed from: copy-U9gTzXU  reason: not valid java name */
-        public final StoreState m68copyU9gTzXU(User user, MeUser meUser, Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5) {
+        /* renamed from: copy-1YV1AGg  reason: not valid java name */
+        public final StoreState m68copy1YV1AGg(User user, MeUser meUser, Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) {
             m.checkNotNullParameter(user, "user");
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(map, "computedMembers");
@@ -910,7 +904,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(modelUserProfile, "userProfile");
             m.checkNotNullParameter(userNoteState, "userNoteFetchState");
             m.checkNotNullParameter(stageRequestToSpeakState, "userRequestToSpeakState");
-            return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z5);
+            return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2);
         }
 
         public boolean equals(Object obj) {
@@ -921,7 +915,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2658me, storeState.f2658me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles) && this.inGuildAvatarExperiment == storeState.inGuildAvatarExperiment;
+            return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2656me, storeState.f2656me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles);
         }
 
         public final Channel getChannel() {
@@ -944,12 +938,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             return this.guildRoles;
         }
 
-        public final boolean getInGuildAvatarExperiment() {
-            return this.inGuildAvatarExperiment;
-        }
-
         public final MeUser getMe() {
-            return this.f2658me;
+            return this.f2656me;
         }
 
         public final boolean getMuted() {
@@ -1022,7 +1012,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             User user = this.user;
             int i = 0;
             int hashCode = (user != null ? user.hashCode() : 0) * 31;
-            MeUser meUser = this.f2658me;
+            MeUser meUser = this.f2656me;
             int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
             Channel channel = this.channel;
             int hashCode3 = (hashCode2 + (channel != null ? channel.hashCode() : 0)) * 31;
@@ -1052,13 +1042,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             int i9 = z3 ? 1 : 0;
             int i10 = (i6 + i7) * 31;
             boolean z4 = this.selfDeafened;
-            if (z4) {
-                z4 = true;
+            if (!z4) {
+                i2 = z4 ? 1 : 0;
             }
-            int i11 = z4 ? 1 : 0;
-            int i12 = z4 ? 1 : 0;
-            int i13 = z4 ? 1 : 0;
-            int floatToIntBits = (Float.floatToIntBits(this.outputVolume) + ((i10 + i11) * 31)) * 31;
+            int floatToIntBits = (Float.floatToIntBits(this.outputVolume) + ((i10 + i2) * 31)) * 31;
             ModelRichPresence modelRichPresence = this.richPresence;
             int hashCode8 = (floatToIntBits + (modelRichPresence != null ? modelRichPresence.hashCode() : 0)) * 31;
             Guild guild = this.guild;
@@ -1083,19 +1070,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             if (stageRoles2 != null) {
                 i = stageRoles2.hashCode();
             }
-            int i14 = (hashCode17 + i) * 31;
-            boolean z5 = this.inGuildAvatarExperiment;
-            if (!z5) {
-                i2 = z5 ? 1 : 0;
-            }
-            return i14 + i2;
+            return hashCode17 + i;
         }
 
         public String toString() {
             StringBuilder O = a.O("StoreState(user=");
             O.append(this.user);
             O.append(", me=");
-            O.append(this.f2658me);
+            O.append(this.f2656me);
             O.append(", channel=");
             O.append(this.channel);
             O.append(", computedMembers=");
@@ -1136,8 +1118,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             O.append(this.userRequestToSpeakState);
             O.append(", myStageRoles=");
             O.append(this.myStageRoles);
-            O.append(", inGuildAvatarExperiment=");
-            return a.K(O, this.inGuildAvatarExperiment, ")");
+            O.append(")");
+            return O.toString();
         }
     }
 
@@ -1156,7 +1138,6 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             private final String guildName;
             private final String guildSectionHeaderText;
             private final boolean hasPremiumCustomization;
-            private final boolean inGuildAvatarExperiment;
             private final boolean isMe;
             private final boolean profileLoaded;
             private final ModelRichPresence richPresence;
@@ -1172,7 +1153,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             private final UserProfileVoiceSettingsView.ViewState voiceSettingsViewState;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2, boolean z5, Long l, boolean z6) {
+            public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2, boolean z5, Long l) {
                 super(null);
                 String avatar;
                 m.checkNotNullParameter(user, "user");
@@ -1202,17 +1183,16 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 this.bioAst = list2;
                 this.profileLoaded = z5;
                 this.guildId = l;
-                this.inGuildAvatarExperiment = z6;
-                boolean z7 = true;
+                boolean z6 = true;
                 if (user.getBanner() == null && ((avatar = user.getAvatar()) == null || !IconUtils.INSTANCE.isImageHashAnimated(avatar))) {
-                    z7 = false;
+                    z6 = false;
                 }
-                this.hasPremiumCustomization = z7;
+                this.hasPremiumCustomization = z6;
                 this.currentGuildId = channel != null ? Long.valueOf(channel.f()) : l;
             }
 
-            public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List list2, boolean z5, Long l, boolean z6, int i2, Object obj) {
-                return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 65536) != 0 ? loaded.userNote : str3, (i2 & 131072) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 262144) != 0 ? loaded.bioAst : list2, (i2 & 524288) != 0 ? loaded.profileLoaded : z5, (i2 & 1048576) != 0 ? loaded.guildId : l, (i2 & 2097152) != 0 ? loaded.inGuildAvatarExperiment : z6);
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List list2, boolean z5, Long l, int i2, Object obj) {
+                return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 65536) != 0 ? loaded.userNote : str3, (i2 & 131072) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 262144) != 0 ? loaded.bioAst : list2, (i2 & 524288) != 0 ? loaded.profileLoaded : z5, (i2 & 1048576) != 0 ? loaded.guildId : l);
             }
 
             public final User component1() {
@@ -1271,10 +1251,6 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return this.guildId;
             }
 
-            public final boolean component22() {
-                return this.inGuildAvatarExperiment;
-            }
-
             public final boolean component3() {
                 return this.showVoiceSettings;
             }
@@ -1303,14 +1279,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return this.adminViewState;
             }
 
-            public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2, boolean z5, Long l, boolean z6) {
+            public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2, boolean z5, Long l) {
                 m.checkNotNullParameter(user, "user");
                 m.checkNotNullParameter(viewState, "voiceSettingsViewState");
                 m.checkNotNullParameter(list, "roleItems");
                 m.checkNotNullParameter(viewState3, "stageViewState");
                 m.checkNotNullParameter(viewState4, "connectionsViewState");
                 m.checkNotNullParameter(userNoteState, "userNoteFetchState");
-                return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, str3, z4, list2, z5, l, z6);
+                return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, str3, z4, list2, z5, l);
             }
 
             public boolean equals(Object obj) {
@@ -1321,7 +1297,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst) && this.profileLoaded == loaded.profileLoaded && m.areEqual(this.guildId, loaded.guildId) && this.inGuildAvatarExperiment == loaded.inGuildAvatarExperiment;
+                return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst) && this.profileLoaded == loaded.profileLoaded && m.areEqual(this.guildId, loaded.guildId);
             }
 
             public final UserProfileAdminView.ViewState getAdminViewState() {
@@ -1364,10 +1340,6 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return this.hasPremiumCustomization;
             }
 
-            public final boolean getInGuildAvatarExperiment() {
-                return this.inGuildAvatarExperiment;
-            }
-
             public final Presence getPresence() {
                 ModelRichPresence modelRichPresence = this.richPresence;
                 if (modelRichPresence != null) {
@@ -1482,23 +1454,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 List<Node<MessageRenderContext>> list2 = this.bioAst;
                 int hashCode15 = (i14 + (list2 != null ? list2.hashCode() : 0)) * 31;
                 boolean z5 = this.profileLoaded;
-                if (z5) {
-                    z5 = true;
+                if (!z5) {
+                    i2 = z5 ? 1 : 0;
                 }
-                int i15 = z5 ? 1 : 0;
-                int i16 = z5 ? 1 : 0;
-                int i17 = z5 ? 1 : 0;
-                int i18 = (hashCode15 + i15) * 31;
+                int i15 = (hashCode15 + i2) * 31;
                 Long l = this.guildId;
                 if (l != null) {
                     i = l.hashCode();
                 }
-                int i19 = (i18 + i) * 31;
-                boolean z6 = this.inGuildAvatarExperiment;
-                if (!z6) {
-                    i2 = z6 ? 1 : 0;
-                }
-                return i19 + i2;
+                return i15 + i;
             }
 
             public final boolean isMe() {
@@ -1552,9 +1516,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 O.append(", profileLoaded=");
                 O.append(this.profileLoaded);
                 O.append(", guildId=");
-                O.append(this.guildId);
-                O.append(", inGuildAvatarExperiment=");
-                return a.K(O, this.inGuildAvatarExperiment, ")");
+                return a.E(O, this.guildId, ")");
             }
         }
 
@@ -1617,7 +1579,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         this.restAPISerializeNulls = restAPI2;
         this.storeApplicationStreamPreviews = storeApplicationStreamPreviews;
         this.bioParser = parser;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.fetchedPreviews = new LinkedHashSet();
         this.revealedBioIndices = new LinkedHashSet();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -1626,7 +1588,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetUserSheetViewModel(long j, long j2, Long l, String str, boolean z2, Observable observable, WidgetUserSheet.StreamPreviewClickBehavior streamPreviewClickBehavior, StoreMediaSettings storeMediaSettings, StoreApplicationStreaming storeApplicationStreaming, StoreUserNotes storeUserNotes, RestAPI restAPI, RestAPI restAPI2, StoreApplicationStreamPreviews storeApplicationStreamPreviews, Parser parser, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(j, j2, l, str, z2, (i & 32) != 0 ? WidgetUserSheetViewModelStoreState.observeStoreState$default(WidgetUserSheetViewModelStoreState.INSTANCE, j, Long.valueOf(j2), l, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 262136, null) : observable, streamPreviewClickBehavior, (i & 128) != 0 ? StoreStream.Companion.getMediaSettings() : storeMediaSettings, (i & 256) != 0 ? StoreStream.Companion.getApplicationStreaming() : storeApplicationStreaming, (i & 512) != 0 ? StoreStream.Companion.getUsersNotes() : storeUserNotes, (i & 1024) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 2048) != 0 ? RestAPI.Companion.getApiSerializeNulls() : restAPI2, (i & 4096) != 0 ? StoreStream.Companion.getApplicationStreamPreviews() : storeApplicationStreamPreviews, (i & 8192) != 0 ? DiscordParser.createParser$default(false, false, false, 4, null) : parser);
+        this(j, j2, l, str, z2, (i & 32) != 0 ? WidgetUserSheetViewModelStoreState.observeStoreState$default(WidgetUserSheetViewModelStoreState.INSTANCE, j, Long.valueOf(j2), l, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 131064, null) : observable, streamPreviewClickBehavior, (i & 128) != 0 ? StoreStream.Companion.getMediaSettings() : storeMediaSettings, (i & 256) != 0 ? StoreStream.Companion.getApplicationStreaming() : storeApplicationStreaming, (i & 512) != 0 ? StoreStream.Companion.getUsersNotes() : storeUserNotes, (i & 1024) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 2048) != 0 ? RestAPI.Companion.getApiSerializeNulls() : restAPI2, (i & 4096) != 0 ? StoreStream.Companion.getApplicationStreamPreviews() : storeApplicationStreamPreviews, (i & 8192) != 0 ? DiscordParser.createParser$default(false, false, false, 4, null) : parser);
     }
 
     public static final /* synthetic */ void access$emitDismissSheetEvent(WidgetUserSheetViewModel widgetUserSheetViewModel) {
@@ -1910,7 +1872,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             } else {
                 str2 = null;
             }
-            updateViewState(new ViewState.Loaded(user, z5, z7, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str2, isInSameVoiceChannel, createAndProcessBioAstFromText, z8, this.guildId, storeState.getInGuildAvatarExperiment()));
+            updateViewState(new ViewState.Loaded(user, z5, z7, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str2, isInSameVoiceChannel, createAndProcessBioAstFromText, z8, this.guildId));
             this.mostRecentStoreState = storeState;
         }
         user = user2;
@@ -1936,7 +1898,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         if (note == null) {
         }
         str2 = note;
-        updateViewState(new ViewState.Loaded(user, z5, z7, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str2, isInSameVoiceChannel, createAndProcessBioAstFromText, z8, this.guildId, storeState.getInGuildAvatarExperiment()));
+        updateViewState(new ViewState.Loaded(user, z5, z7, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str2, isInSameVoiceChannel, createAndProcessBioAstFromText, z8, this.guildId));
         this.mostRecentStoreState = storeState;
     }
 
@@ -2061,7 +2023,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (storeState = this.mostRecentStoreState) != null && (userProfile = storeState.getUserProfile()) != null && (user = userProfile.getUser()) != null && (d = user.d()) != null && (a = d.a()) != null) {
             this.revealedBioIndices.add(Integer.valueOf(spoilerNode.getId()));
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(a), false, null, false, 3932159, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(a), false, null, 1835007, null));
         }
     }
 
@@ -2074,7 +2036,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) {
             long id2 = loaded.getUser().getId();
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, true, 127, null), null, null, null, 0, null, null, null, false, null, false, null, false, 4193791, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, true, 127, null), null, null, null, 0, null, null, null, false, null, false, null, 2096639, null));
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, false, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$inviteUserToSpeak$1(this), 62, (Object) null);
         }
     }
@@ -2191,7 +2153,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) {
             long id2 = loaded.getUser().getId();
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, true, false, 191, null), null, null, null, 0, null, null, null, false, null, false, null, false, 4193791, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m61copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, true, false, 191, null), null, null, null, 0, null, null, null, false, null, false, null, 2096639, null));
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, z2, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$setUserSuppressedInChannel$1(this), 62, (Object) null);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java
index fc399fcc36..18bb0058d2 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java
@@ -11,12 +11,10 @@ import com.discord.api.role.GuildRole;
 import com.discord.api.voice.state.StageRequestToSpeakState;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.models.domain.ModelUserProfile;
-import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
-import com.discord.stores.StoreExperiments;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreMediaSettings;
 import com.discord.stores.StorePermissions;
@@ -37,12 +35,11 @@ import i0.k.b;
 import i0.l.e.j;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import kotlin.jvm.functions.Function16;
+import kotlin.jvm.functions.Function15;
 import rx.Observable;
 /* compiled from: WidgetUserSheetViewModelStoreState.kt */
 public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R> implements b<WidgetUserSheetViewModelStoreState.BootstrapData, Observable<? extends WidgetUserSheetViewModel.StoreState>> {
     public final /* synthetic */ Long $guildId;
-    public final /* synthetic */ StoreExperiments $storeExperiments;
     public final /* synthetic */ StoreGuilds $storeGuilds;
     public final /* synthetic */ StoreMediaSettings $storeMediaSettings;
     public final /* synthetic */ StorePermissions $storePermissions;
@@ -66,7 +63,7 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
 
     /* compiled from: WidgetUserSheetViewModelStoreState.kt */
     /* renamed from: com.discord.widgets.user.usersheet.WidgetUserSheetViewModelStoreState$observeStoreState$3$2  reason: invalid class name */
-    public static final class AnonymousClass2 extends o implements Function16<Map<Long, ? extends GuildMember>, Map<Long, ? extends GuildRole>, Map<Long, ? extends VoiceState>, Map<Long, ? extends VoiceState>, StoreMediaSettings.VoiceConfiguration, ModelRichPresence, Guild, Long, StreamContext, ModelUserProfile, Integer, StoreUserNotes.UserNoteState, StageRoles, StageRequestToSpeakState, StageRoles, Experiment, WidgetUserSheetViewModel.StoreState> {
+    public static final class AnonymousClass2 extends o implements Function15<Map<Long, ? extends GuildMember>, Map<Long, ? extends GuildRole>, Map<Long, ? extends VoiceState>, Map<Long, ? extends VoiceState>, StoreMediaSettings.VoiceConfiguration, ModelRichPresence, Guild, Long, StreamContext, ModelUserProfile, Integer, StoreUserNotes.UserNoteState, StageRoles, StageRequestToSpeakState, StageRoles, WidgetUserSheetViewModel.StoreState> {
         public final /* synthetic */ Channel $channel;
         public final /* synthetic */ MeUser $me;
         public final /* synthetic */ Channel $selectedVoiceChannel;
@@ -74,14 +71,14 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AnonymousClass2(User user, MeUser meUser, Channel channel, Channel channel2) {
-            super(16);
+            super(15);
             this.$user = user;
             this.$me = meUser;
             this.$channel = channel;
             this.$selectedVoiceChannel = channel2;
         }
 
-        public final WidgetUserSheetViewModel.StoreState invoke(Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, Experiment experiment) {
+        public final WidgetUserSheetViewModel.StoreState invoke(Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) {
             m.checkNotNullParameter(map, "computedMembers");
             m.checkNotNullParameter(map2, "guildRoles");
             m.checkNotNullParameter(map3, "mySelectedVoiceChannelVoiceStates");
@@ -100,18 +97,18 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
             MeUser meUser = this.$me;
             Channel channel = this.$channel;
             Channel channel2 = this.$selectedVoiceChannel;
-            return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, (channel2 == null || !ChannelUtils.y(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, experiment != null && experiment.getBucket() == 1, null);
+            return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, (channel2 == null || !ChannelUtils.y(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, null);
         }
 
         /* 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function16
-        public /* bridge */ /* synthetic */ WidgetUserSheetViewModel.StoreState invoke(Map<Long, ? extends GuildMember> map, Map<Long, ? extends GuildRole> map2, Map<Long, ? extends VoiceState> map3, Map<Long, ? extends VoiceState> map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, Experiment experiment) {
-            return invoke((Map<Long, GuildMember>) map, (Map<Long, GuildRole>) map2, (Map<Long, VoiceState>) map3, (Map<Long, VoiceState>) map4, voiceConfiguration, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, stageRoles, stageRequestToSpeakState, stageRoles2, experiment);
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function15
+        public /* bridge */ /* synthetic */ WidgetUserSheetViewModel.StoreState invoke(Map<Long, ? extends GuildMember> map, Map<Long, ? extends GuildRole> map2, Map<Long, ? extends VoiceState> map3, Map<Long, ? extends VoiceState> map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) {
+            return invoke((Map<Long, GuildMember>) map, (Map<Long, GuildRole>) map2, (Map<Long, VoiceState>) map3, (Map<Long, VoiceState>) map4, voiceConfiguration, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, stageRoles, stageRequestToSpeakState, stageRoles2);
         }
     }
 
-    public WidgetUserSheetViewModelStoreState$observeStoreState$3(Long l, StoreGuilds storeGuilds, StoreVoiceStates storeVoiceStates, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StreamContextService streamContextService, StoreStageChannels storeStageChannels, StoreExperiments storeExperiments, StoreMediaSettings storeMediaSettings, StoreUserProfile storeUserProfile, StoreUserRelationships storeUserRelationships, StoreUserNotes storeUserNotes) {
+    public WidgetUserSheetViewModelStoreState$observeStoreState$3(Long l, StoreGuilds storeGuilds, StoreVoiceStates storeVoiceStates, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StreamContextService streamContextService, StoreStageChannels storeStageChannels, StoreMediaSettings storeMediaSettings, StoreUserProfile storeUserProfile, StoreUserRelationships storeUserRelationships, StoreUserNotes storeUserNotes) {
         this.$guildId = l;
         this.$storeGuilds = storeGuilds;
         this.$storeVoiceStates = storeVoiceStates;
@@ -119,40 +116,38 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
         this.$storePermissions = storePermissions;
         this.$streamContextService = streamContextService;
         this.$storeStageChannels = storeStageChannels;
-        this.$storeExperiments = storeExperiments;
         this.$storeMediaSettings = storeMediaSettings;
         this.$storeUserProfile = storeUserProfile;
         this.$storeUserRelationships = storeUserRelationships;
         this.$storeUserNotes = storeUserNotes;
     }
 
-    /* JADX WARNING: Code restructure failed: missing block: B:32:0x00e4, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:32:0x00e3, code lost:
         if (r5 != null) goto L_0x00ec;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:41:0x011e, code lost:
-        if (r6 != null) goto L_0x0129;
+    /* JADX WARNING: Code restructure failed: missing block: B:41:0x011f, code lost:
+        if (r7 != null) goto L_0x012a;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:46:0x013c, code lost:
-        if (r2 != null) goto L_0x014a;
+    /* JADX WARNING: Code restructure failed: missing block: B:46:0x013d, code lost:
+        if (r2 != null) goto L_0x014b;
      */
-    /* JADX WARNING: Removed duplicated region for block: B:15:0x0072  */
-    /* JADX WARNING: Removed duplicated region for block: B:20:0x008f  */
-    /* JADX WARNING: Removed duplicated region for block: B:25:0x00ad  */
-    /* JADX WARNING: Removed duplicated region for block: B:31:0x00d7  */
-    /* JADX WARNING: Removed duplicated region for block: B:40:0x010e  */
-    /* JADX WARNING: Removed duplicated region for block: B:42:0x0121  */
-    /* JADX WARNING: Removed duplicated region for block: B:45:0x012b  */
-    /* JADX WARNING: Removed duplicated region for block: B:47:0x013f  */
+    /* JADX WARNING: Removed duplicated region for block: B:15:0x0071  */
+    /* JADX WARNING: Removed duplicated region for block: B:20:0x008e  */
+    /* JADX WARNING: Removed duplicated region for block: B:25:0x00ac  */
+    /* JADX WARNING: Removed duplicated region for block: B:31:0x00d6  */
+    /* JADX WARNING: Removed duplicated region for block: B:40:0x010f  */
+    /* JADX WARNING: Removed duplicated region for block: B:42:0x0122  */
+    /* JADX WARNING: Removed duplicated region for block: B:45:0x012c  */
+    /* JADX WARNING: Removed duplicated region for block: B:47:0x0140  */
     public final Observable<? extends WidgetUserSheetViewModel.StoreState> call(WidgetUserSheetViewModelStoreState.BootstrapData bootstrapData) {
         Observable<Map<Long, GuildMember>> observable;
         Observable<Map<Long, GuildRole>> observable2;
         Observable<Guild> observable3;
-        Observable<Long> observable4;
-        Observable<Long> observable5;
-        Observable<StageRoles> observable6;
+        Observable<ModelRichPresence> observable4;
+        Observable<StageRoles> observable5;
         Channel channel;
         MeUser meUser;
-        Observable<StageRequestToSpeakState> observable7;
+        Observable<StageRequestToSpeakState> observable6;
         Observable<Map<Long, VoiceState>> observe;
         Observable<Map<Long, VoiceState>> observe2;
         User component1 = bootstrapData.component1();
@@ -160,7 +155,7 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
         Channel component3 = bootstrapData.component3();
         Channel component4 = bootstrapData.component4();
         if (component1 == null) {
-            return Observable.c0(5, TimeUnit.SECONDS).E(AnonymousClass1.INSTANCE);
+            return Observable.d0(5, TimeUnit.SECONDS).F(AnonymousClass1.INSTANCE);
         }
         Long l = this.$guildId;
         if (l == null) {
@@ -178,50 +173,49 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
                         observable2 = observeRoles;
                         Observable<Map<Long, VoiceState>> jVar = (component4 != null || (observe2 = this.$storeVoiceStates.observe(component4.f(), component4.h())) == null) ? new j(h0.emptyMap()) : observe2;
                         Observable<Map<Long, VoiceState>> jVar2 = (component3 != null || (observe = this.$storeVoiceStates.observe(component3.f(), component3.h())) == null) ? new j(h0.emptyMap()) : observe;
-                        Observable<ModelRichPresence> observable8 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
+                        Observable<ModelRichPresence> observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
                         if (l != null) {
                             l.longValue();
                             observable3 = this.$storeGuilds.observeGuild(l.longValue());
                         }
                         observable3 = new j<>(null);
-                        if (component3 == null || (observable4 = this.$storePermissions.observePermissionsForChannel(component3.h())) == null) {
-                            observable4 = new j<>(null);
+                        if (component3 == null || (r6 = this.$storePermissions.observePermissionsForChannel(component3.h())) == null) {
+                            Observable<Long> observable8 = new j<>(null);
                         }
                         Observable<StreamContext> forUser = this.$streamContextService.getForUser(component1.getId(), true);
                         if (component4 != null) {
-                            observable5 = observable4;
-                            observable6 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h());
+                            observable4 = observable7;
+                            observable5 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h());
                         } else {
-                            observable5 = observable4;
+                            observable4 = observable7;
                         }
-                        observable6 = new j<>(null);
+                        observable5 = new j<>(null);
                         if (component4 != null) {
                             meUser = component2;
                             channel = component3;
-                            observable7 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h());
+                            observable6 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h());
                         } else {
                             meUser = component2;
                             channel = component3;
                         }
-                        observable7 = new j(StageRequestToSpeakState.NONE);
+                        observable6 = new j(StageRequestToSpeakState.NONE);
                         if (component4 == null || (r3 = this.$storeStageChannels.observeMyRoles(component4.h())) == null) {
                             Observable<StageRoles> observable9 = new j<>(null);
                         }
-                        Observable<Experiment> observeUserExperiment = this.$storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false);
                         m.checkNotNullExpressionValue(observable, "computedMembersObservable");
                         m.checkNotNullExpressionValue(observable2, "guildRolesObservable");
                         m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable");
                         m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable");
                         Observable<StoreMediaSettings.VoiceConfiguration> voiceConfig = this.$storeMediaSettings.getVoiceConfig();
                         m.checkNotNullExpressionValue(observable3, "guildsObservable");
-                        m.checkNotNullExpressionValue(observable5, "permissionsObservable");
+                        m.checkNotNullExpressionValue(observable8, "permissionsObservable");
                         Observable<ModelUserProfile> observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId());
                         Observable<Integer> observe3 = this.$storeUserRelationships.observe(component1.getId());
                         Observable<StoreUserNotes.UserNoteState> observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId());
-                        m.checkNotNullExpressionValue(observable6, "userStageRolesObservable");
-                        m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable");
+                        m.checkNotNullExpressionValue(observable5, "userStageRolesObservable");
+                        m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable");
                         m.checkNotNullExpressionValue(observable9, "myStageRolesObservable");
-                        return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable8, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable9, observeUserExperiment, new AnonymousClass2(component1, meUser, channel, component4));
+                        return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4));
                     }
                 }
                 observable2 = new j(h0.emptyMap());
@@ -229,34 +223,33 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
                 }
                 if (component3 != null) {
                 }
-                Observable<ModelRichPresence> observable8 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
+                Observable<ModelRichPresence> observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
                 if (l != null) {
                 }
                 observable3 = new j<>(null);
-                observable4 = new j<>(null);
+                Observable<Long> observable8 = new j<>(null);
                 Observable<StreamContext> forUser = this.$streamContextService.getForUser(component1.getId(), true);
                 if (component4 != null) {
                 }
-                observable6 = new j<>(null);
+                observable5 = new j<>(null);
                 if (component4 != null) {
                 }
-                observable7 = new j(StageRequestToSpeakState.NONE);
+                observable6 = new j(StageRequestToSpeakState.NONE);
                 Observable<StageRoles> observable9 = new j<>(null);
-                Observable<Experiment> observeUserExperiment = this.$storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false);
                 m.checkNotNullExpressionValue(observable, "computedMembersObservable");
                 m.checkNotNullExpressionValue(observable2, "guildRolesObservable");
                 m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable");
                 m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable");
                 Observable<StoreMediaSettings.VoiceConfiguration> voiceConfig = this.$storeMediaSettings.getVoiceConfig();
                 m.checkNotNullExpressionValue(observable3, "guildsObservable");
-                m.checkNotNullExpressionValue(observable5, "permissionsObservable");
+                m.checkNotNullExpressionValue(observable8, "permissionsObservable");
                 Observable<ModelUserProfile> observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId());
                 Observable<Integer> observe3 = this.$storeUserRelationships.observe(component1.getId());
                 Observable<StoreUserNotes.UserNoteState> observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId());
-                m.checkNotNullExpressionValue(observable6, "userStageRolesObservable");
-                m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable");
+                m.checkNotNullExpressionValue(observable5, "userStageRolesObservable");
+                m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable");
                 m.checkNotNullExpressionValue(observable9, "myStageRolesObservable");
-                return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable8, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable9, observeUserExperiment, new AnonymousClass2(component1, meUser, channel, component4));
+                return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4));
             }
         }
         observable = new j(h0.emptyMap());
@@ -267,33 +260,32 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
         }
         if (component3 != null) {
         }
-        Observable<ModelRichPresence> observable8 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
+        Observable<ModelRichPresence> observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
         if (l != null) {
         }
         observable3 = new j<>(null);
-        observable4 = new j<>(null);
+        Observable<Long> observable8 = new j<>(null);
         Observable<StreamContext> forUser = this.$streamContextService.getForUser(component1.getId(), true);
         if (component4 != null) {
         }
-        observable6 = new j<>(null);
+        observable5 = new j<>(null);
         if (component4 != null) {
         }
-        observable7 = new j(StageRequestToSpeakState.NONE);
+        observable6 = new j(StageRequestToSpeakState.NONE);
         Observable<StageRoles> observable9 = new j<>(null);
-        Observable<Experiment> observeUserExperiment = this.$storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false);
         m.checkNotNullExpressionValue(observable, "computedMembersObservable");
         m.checkNotNullExpressionValue(observable2, "guildRolesObservable");
         m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable");
         m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable");
         Observable<StoreMediaSettings.VoiceConfiguration> voiceConfig = this.$storeMediaSettings.getVoiceConfig();
         m.checkNotNullExpressionValue(observable3, "guildsObservable");
-        m.checkNotNullExpressionValue(observable5, "permissionsObservable");
+        m.checkNotNullExpressionValue(observable8, "permissionsObservable");
         Observable<ModelUserProfile> observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId());
         Observable<Integer> observe3 = this.$storeUserRelationships.observe(component1.getId());
         Observable<StoreUserNotes.UserNoteState> observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId());
-        m.checkNotNullExpressionValue(observable6, "userStageRolesObservable");
-        m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable");
+        m.checkNotNullExpressionValue(observable5, "userStageRolesObservable");
+        m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable");
         m.checkNotNullExpressionValue(observable9, "myStageRolesObservable");
-        return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable8, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable9, observeUserExperiment, new AnonymousClass2(component1, meUser, channel, component4));
+        return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java
index df5b12d0cd..20dd657f3d 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java
@@ -6,7 +6,6 @@ import com.discord.api.channel.Channel;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
 import com.discord.stores.StoreChannels;
-import com.discord.stores.StoreExperiments;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreMediaSettings;
 import com.discord.stores.StorePermissions;
@@ -37,14 +36,14 @@ public final class WidgetUserSheetViewModelStoreState {
         private final Channel channel;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2659me;
+        private final MeUser f2657me;
         private final Channel selectedVoiceChannel;
         private final User user;
 
         public BootstrapData(User user, MeUser meUser, Channel channel, Channel channel2) {
             m.checkNotNullParameter(meUser, "me");
             this.user = user;
-            this.f2659me = meUser;
+            this.f2657me = meUser;
             this.channel = channel;
             this.selectedVoiceChannel = channel2;
         }
@@ -54,7 +53,7 @@ public final class WidgetUserSheetViewModelStoreState {
                 user = bootstrapData.user;
             }
             if ((i & 2) != 0) {
-                meUser = bootstrapData.f2659me;
+                meUser = bootstrapData.f2657me;
             }
             if ((i & 4) != 0) {
                 channel = bootstrapData.channel;
@@ -70,7 +69,7 @@ public final class WidgetUserSheetViewModelStoreState {
         }
 
         public final MeUser component2() {
-            return this.f2659me;
+            return this.f2657me;
         }
 
         public final Channel component3() {
@@ -94,7 +93,7 @@ public final class WidgetUserSheetViewModelStoreState {
                 return false;
             }
             BootstrapData bootstrapData = (BootstrapData) obj;
-            return m.areEqual(this.user, bootstrapData.user) && m.areEqual(this.f2659me, bootstrapData.f2659me) && m.areEqual(this.channel, bootstrapData.channel) && m.areEqual(this.selectedVoiceChannel, bootstrapData.selectedVoiceChannel);
+            return m.areEqual(this.user, bootstrapData.user) && m.areEqual(this.f2657me, bootstrapData.f2657me) && m.areEqual(this.channel, bootstrapData.channel) && m.areEqual(this.selectedVoiceChannel, bootstrapData.selectedVoiceChannel);
         }
 
         public final Channel getChannel() {
@@ -102,7 +101,7 @@ public final class WidgetUserSheetViewModelStoreState {
         }
 
         public final MeUser getMe() {
-            return this.f2659me;
+            return this.f2657me;
         }
 
         public final Channel getSelectedVoiceChannel() {
@@ -117,7 +116,7 @@ public final class WidgetUserSheetViewModelStoreState {
             User user = this.user;
             int i = 0;
             int hashCode = (user != null ? user.hashCode() : 0) * 31;
-            MeUser meUser = this.f2659me;
+            MeUser meUser = this.f2657me;
             int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
             Channel channel = this.channel;
             int hashCode3 = (hashCode2 + (channel != null ? channel.hashCode() : 0)) * 31;
@@ -132,7 +131,7 @@ public final class WidgetUserSheetViewModelStoreState {
             StringBuilder O = a.O("BootstrapData(user=");
             O.append(this.user);
             O.append(", me=");
-            O.append(this.f2659me);
+            O.append(this.f2657me);
             O.append(", channel=");
             O.append(this.channel);
             O.append(", selectedVoiceChannel=");
@@ -145,7 +144,7 @@ public final class WidgetUserSheetViewModelStoreState {
     private WidgetUserSheetViewModelStoreState() {
     }
 
-    public static /* synthetic */ Observable observeStoreState$default(WidgetUserSheetViewModelStoreState widgetUserSheetViewModelStoreState, long j, Long l, Long l2, StoreUser storeUser, StoreChannels storeChannels, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreUserProfile storeUserProfile, StoreUserRelationships storeUserRelationships, StoreVoiceStates storeVoiceStates, StoreGuilds storeGuilds, StoreMediaSettings storeMediaSettings, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StoreUserNotes storeUserNotes, StoreStageChannels storeStageChannels, StreamContextService streamContextService, Scheduler scheduler, StoreExperiments storeExperiments, int i, Object obj) {
+    public static /* synthetic */ Observable observeStoreState$default(WidgetUserSheetViewModelStoreState widgetUserSheetViewModelStoreState, long j, Long l, Long l2, StoreUser storeUser, StoreChannels storeChannels, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreUserProfile storeUserProfile, StoreUserRelationships storeUserRelationships, StoreVoiceStates storeVoiceStates, StoreGuilds storeGuilds, StoreMediaSettings storeMediaSettings, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StoreUserNotes storeUserNotes, StoreStageChannels storeStageChannels, StreamContextService streamContextService, Scheduler scheduler, int i, Object obj) {
         Scheduler scheduler2;
         StoreUser users = (i & 8) != 0 ? StoreStream.Companion.getUsers() : storeUser;
         StoreChannels channels = (i & 16) != 0 ? StoreStream.Companion.getChannels() : storeChannels;
@@ -160,20 +159,20 @@ public final class WidgetUserSheetViewModelStoreState {
         StoreUserNotes usersNotes = (i & 8192) != 0 ? StoreStream.Companion.getUsersNotes() : storeUserNotes;
         StoreStageChannels stageChannels = (i & 16384) != 0 ? StoreStream.Companion.getStageChannels() : storeStageChannels;
         StreamContextService streamContextService2 = (32768 & i) != 0 ? new StreamContextService(null, null, null, null, null, null, null, null, 255, null) : streamContextService;
-        if ((65536 & i) != 0) {
+        if ((i & 65536) != 0) {
             Scheduler a = i0.p.a.a();
             m.checkNotNullExpressionValue(a, "Schedulers.computation()");
             scheduler2 = a;
         } else {
             scheduler2 = scheduler;
         }
-        return widgetUserSheetViewModelStoreState.observeStoreState(j, l, l2, users, channels, voiceChannelSelected, userProfile, userRelationships, voiceStates, guilds, mediaSettings, presences, permissions, usersNotes, stageChannels, streamContextService2, scheduler2, (i & 131072) != 0 ? StoreStream.Companion.getExperiments() : storeExperiments);
+        return widgetUserSheetViewModelStoreState.observeStoreState(j, l, l2, users, channels, voiceChannelSelected, userProfile, userRelationships, voiceStates, guilds, mediaSettings, presences, permissions, usersNotes, stageChannels, streamContextService2, scheduler2);
     }
 
     /* JADX WARN: Multi-variable type inference failed */
     /* JADX DEBUG: Type inference failed for r0v4. Raw type applied. Possible types: rx.Observable$a<T>, rx.Observable$a */
     /* JADX WARNING: Unknown variable types count: 1 */
-    public final Observable<WidgetUserSheetViewModel.StoreState> observeStoreState(long j, Long l, Long l2, StoreUser storeUser, StoreChannels storeChannels, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreUserProfile storeUserProfile, StoreUserRelationships storeUserRelationships, StoreVoiceStates storeVoiceStates, StoreGuilds storeGuilds, StoreMediaSettings storeMediaSettings, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StoreUserNotes storeUserNotes, StoreStageChannels storeStageChannels, StreamContextService streamContextService, Scheduler scheduler, StoreExperiments storeExperiments) {
+    public final Observable<WidgetUserSheetViewModel.StoreState> observeStoreState(long j, Long l, Long l2, StoreUser storeUser, StoreChannels storeChannels, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreUserProfile storeUserProfile, StoreUserRelationships storeUserRelationships, StoreVoiceStates storeVoiceStates, StoreGuilds storeGuilds, StoreMediaSettings storeMediaSettings, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StoreUserNotes storeUserNotes, StoreStageChannels storeStageChannels, StreamContextService streamContextService, Scheduler scheduler) {
         Observable<Channel> observable;
         m.checkNotNullParameter(storeUser, "storeUser");
         m.checkNotNullParameter(storeChannels, "storeChannels");
@@ -189,7 +188,6 @@ public final class WidgetUserSheetViewModelStoreState {
         m.checkNotNullParameter(storeStageChannels, "storeStageChannels");
         m.checkNotNullParameter(streamContextService, "streamContextService");
         m.checkNotNullParameter(scheduler, "storeStateRxScheduler");
-        m.checkNotNullParameter(storeExperiments, "storeExperiments");
         Observable<User> observeUser = storeUser.observeUser(j);
         Observable observeMe$default = StoreUser.observeMe$default(storeUser, false, 1, null);
         if (l == null || (observable = storeChannels.observeChannel(l.longValue())) == null) {
@@ -200,7 +198,7 @@ public final class WidgetUserSheetViewModelStoreState {
         if (widgetUserSheetViewModelStoreState$observeStoreState$2 != null) {
             widgetUserSheetViewModelStoreState$observeStoreState$2 = new WidgetUserSheetViewModelStoreState$sam$rx_functions_Func4$0(widgetUserSheetViewModelStoreState$observeStoreState$2);
         }
-        Observable<WidgetUserSheetViewModel.StoreState> q = Observable.g0(new r(Observable.h(observeUser, observeMe$default, observable, observeSelectedChannel, (Func4) widgetUserSheetViewModelStoreState$observeStoreState$2).X(new WidgetUserSheetViewModelStoreState$observeStoreState$3(l2, storeGuilds, storeVoiceStates, storeUserPresence, storePermissions, streamContextService, storeStageChannels, storeExperiments, storeMediaSettings, storeUserProfile, storeUserRelationships, storeUserNotes)).i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS, scheduler))).q();
+        Observable<WidgetUserSheetViewModel.StoreState> q = Observable.h0(new r(Observable.h(observeUser, observeMe$default, observable, observeSelectedChannel, (Func4) widgetUserSheetViewModelStoreState$observeStoreState$2).Y(new WidgetUserSheetViewModelStoreState$observeStoreState$3(l2, storeGuilds, storeVoiceStates, storeUserPresence, storePermissions, streamContextService, storeStageChannels, storeMediaSettings, storeUserProfile, storeUserRelationships, storeUserNotes)).i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS, scheduler))).q();
         m.checkNotNullExpressionValue(q, "Observable\n          .co…  .distinctUntilChanged()");
         return q;
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
index 31ac70a181..ae6ab90b01 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
@@ -197,9 +197,9 @@ public final class PrivateCallLaunchUtilsKt$callAndLaunch$1 extends o implements
     /* renamed from: invoke */
     public final void mo17invoke() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable Y = Observable.j(companion.getRtcConnection().getConnectionState().w(AnonymousClass1.INSTANCE), companion.getVoiceChannelSelected().observeSelectedChannel().E(AnonymousClass2.INSTANCE), AnonymousClass3.INSTANCE).k(c.a.d.o.c(new AnonymousClass4(this), -1L, 250, TimeUnit.MILLISECONDS)).Y(1);
-        m.checkNotNullExpressionValue(Y, "Observable\n        .comb…       )\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Y), WidgetCallFullscreen.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass5(this), 62, (Object) null);
+        Observable Z = Observable.j(companion.getRtcConnection().getConnectionState().x(AnonymousClass1.INSTANCE), companion.getVoiceChannelSelected().observeSelectedChannel().F(AnonymousClass2.INSTANCE), AnonymousClass3.INSTANCE).k(c.a.d.o.c(new AnonymousClass4(this), -1L, 250, TimeUnit.MILLISECONDS)).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable\n        .comb…       )\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), WidgetCallFullscreen.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass5(this), 62, (Object) null);
         AnonymousClass6 r1 = new AnonymousClass6(this);
         if (this.$isVideo) {
             companion.getMediaEngine().selectDefaultVideoDevice(new AnonymousClass7(this, r1));
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java
index 495f454125..70419138ac 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java
@@ -87,6 +87,6 @@ public final class WidgetVoiceCallIncoming$Model$Companion$get$1<T, R> implement
         }
         CallModel.Companion companion = CallModel.Companion;
         m.checkNotNullExpressionValue(set, "incomingCalls");
-        return companion.get(((Number) u.first(set)).longValue()).E(new AnonymousClass1(set));
+        return companion.get(((Number) u.first(set)).longValue()).F(new AnonymousClass1(set));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
index 40b450acc7..0070bf7cb7 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
@@ -66,9 +66,9 @@ public class WidgetVoiceCallIncoming extends AppFragment {
             }
 
             public final Observable<Model> get() {
-                Observable<R> X = StoreStream.Companion.getCallsIncoming().observeIncoming().X(WidgetVoiceCallIncoming$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(X, "StoreStream\n            …          }\n            }");
-                Observable<Model> q = ObservableExtensionsKt.computationLatest(X).q();
+                Observable<R> Y = StoreStream.Companion.getCallsIncoming().observeIncoming().Y(WidgetVoiceCallIncoming$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                Observable<Model> q = ObservableExtensionsKt.computationLatest(Y).q();
                 m.checkNotNullExpressionValue(q, "StoreStream\n            …  .distinctUntilChanged()");
                 return q;
             }
@@ -212,9 +212,9 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         public void onViewCreated(View view, Bundle bundle) {
             m.checkNotNullParameter(view, "view");
             super.onViewCreated(view, bundle);
-            Observable<Long> c02 = Observable.c0(15, TimeUnit.SECONDS);
-            m.checkNotNullExpressionValue(c02, "Observable.timer(15, TimeUnit.SECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(c02, this, null, 2, null), SystemCallIncoming.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(15, TimeUnit.SECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(15, TimeUnit.SECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), SystemCallIncoming.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1(this), 62, (Object) null);
         }
     }
 
@@ -259,7 +259,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         }
         linearLayout.setVisibility(i);
         getBinding().d.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$2(this, model));
-        getBinding().f2497c.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$3(this, model));
+        getBinding().f2495c.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$3(this, model));
         getBinding().f.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$4(this, model));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
index 5d7a05feb9..a8503e0ef3 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
@@ -48,9 +48,9 @@ public final class WidgetVoiceCallInline extends AppFragment {
             }
 
             public final Observable<Model> get() {
-                Observable<R> E = VoiceConnected.Companion.get().E(WidgetVoiceCallInline$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(E, "VoiceConnected\n         …eConnected)\n            }");
-                return E;
+                Observable<R> F = VoiceConnected.Companion.get().F(WidgetVoiceCallInline$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "VoiceConnected\n         …eConnected)\n            }");
+                return F;
             }
         }
 
@@ -71,9 +71,9 @@ public final class WidgetVoiceCallInline extends AppFragment {
                 }
 
                 public final Observable<VoiceConnected> get() {
-                    Observable<R> X = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().X(WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.INSTANCE);
-                    m.checkNotNullExpressionValue(X, "StoreStream\n            …        }\n              }");
-                    return ObservableExtensionsKt.computationLatest(X);
+                    Observable<R> Y = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().Y(WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.INSTANCE);
+                    m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                    return ObservableExtensionsKt.computationLatest(Y);
                 }
             }
 
@@ -240,7 +240,7 @@ public final class WidgetVoiceCallInline extends AppFragment {
 
     private final void onViewBindingDestroy(WidgetVoiceCallInlineBinding widgetVoiceCallInlineBinding) {
         b a = b.C0034b.a();
-        MaterialButton materialButton = widgetVoiceCallInlineBinding.f2498c;
+        MaterialButton materialButton = widgetVoiceCallInlineBinding.f2496c;
         m.checkNotNullExpressionValue(materialButton, "binding.voiceConnectedPtt");
         a.i.remove(Integer.valueOf(materialButton.getId()));
         a.a();
@@ -254,9 +254,9 @@ public final class WidgetVoiceCallInline extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f2498c.setOnClickListener(WidgetVoiceCallInline$onViewBound$1.INSTANCE);
-        getBinding().f2498c.setOnTouchListener(new OnPressListener(WidgetVoiceCallInline$onViewBound$2.INSTANCE));
-        getBinding().f2498c.addOnLayoutChangeListener(b.C0034b.a());
+        getBinding().f2496c.setOnClickListener(WidgetVoiceCallInline$onViewBound$1.INSTANCE);
+        getBinding().f2496c.setOnTouchListener(new OnPressListener(WidgetVoiceCallInline$onViewBound$2.INSTANCE));
+        getBinding().f2496c.addOnLayoutChangeListener(b.C0034b.a());
         setWindowInsetsListeners();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
index 43936e2267..21ec9475ca 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
@@ -103,7 +103,7 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
                                     WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
                                     tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
                                     if (tooltipManager == null) {
-                                        tooltipManager = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2605c.getValue(), 0, aVar, 4);
+                                        tooltipManager = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2603c.getValue(), 0, aVar, 4);
                                         TooltipManager.a.a = new WeakReference<>(tooltipManager);
                                     }
                                     this.tooltipManager = tooltipManager;
@@ -144,9 +144,9 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
                 ImageView imageView2 = this.binding.f;
                 m.checkNotNullExpressionValue(imageView2, "binding.voiceFullscreenControlsScreenshare");
                 FloatingViewGravity floatingViewGravity = FloatingViewGravity.CENTER;
-                Observable<Unit> E = appComponent.getUnsubscribeSignal().E(AnchoredVoiceControlsView$configureScreenShareButtonSparkle$2.INSTANCE);
-                m.checkNotNullExpressionValue(E, "appComponent.unsubscribeSignal.map { Unit }");
-                tooltipManager2.d(imageView2, sparkleView, screenShareButtonSparkleTooltip, floatingViewGravity, 0, 0, false, E);
+                Observable<Unit> F = appComponent.getUnsubscribeSignal().F(AnchoredVoiceControlsView$configureScreenShareButtonSparkle$2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "appComponent.unsubscribeSignal.map { Unit }");
+                tooltipManager2.d(imageView2, sparkleView, screenShareButtonSparkleTooltip, floatingViewGravity, 0, 0, false, F);
                 return;
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
index 37fe31d7a7..581c04ad86 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
@@ -193,7 +193,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f2338c.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$1(this));
+        getBinding().f2336c.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$1(this));
         getBinding().b.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java
index 40aa337f8c..4461492505 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java
@@ -40,9 +40,9 @@ public final class IssueDetailsFormViewModel extends AppViewModel<Unit> {
         m.checkNotNullParameter(feedbackSubmitter, "feedbackSubmitter");
         this.pendingFeedback = pendingFeedback;
         this.feedbackSubmitter = feedbackSubmitter;
-        PublishSubject<Event> j0 = PublishSubject.j0();
-        m.checkNotNullExpressionValue(j0, "PublishSubject.create()");
-        this.eventSubject = j0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
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 955324f7a7..1763bc6856 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).f2306c;
+        TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f2304c;
         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 6fe3871b54..e402a414ed 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().f2306c);
+                appActivity.hideKeyboard(getBinding().f2304c);
             }
             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().f2306c;
+        TextInputLayout textInputLayout = getBinding().f2304c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetIssueDetailsForm$onViewBound$2(this));
-        TextInputLayout textInputLayout2 = getBinding().f2306c;
+        TextInputLayout textInputLayout2 = getBinding().f2304c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.issueDetailsInput");
         showKeyboard(textInputLayout2);
         LinkifiedTextView linkifiedTextView = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
index 4d0f8c1ab9..58e34bc375 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
@@ -87,9 +87,9 @@ public final class CallFeedbackSheetViewModel extends AppViewModel<FeedbackSheet
         }
 
         private final Observable<StoreState> observeStoreState(StoreExperiments storeExperiments) {
-            Observable<R> E = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).E(CallFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "storeExperiments\n       …            )\n          }");
-            return E;
+            Observable<R> F = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).F(CallFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storeExperiments\n       …            )\n          }");
+            return F;
         }
 
         public final List<FeedbackIssue> getISSUES_UI_OPTIONS() {
@@ -345,7 +345,7 @@ public final class CallFeedbackSheetViewModel extends AppViewModel<FeedbackSheet
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeAnalytics = storeAnalytics;
         this.storeExperiments = storeExperiments;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.submitOnDismiss = true;
         this.pendingCallFeedback = new PendingFeedback.CallFeedback(config.getChannelId(), config.getRtcConnectionId(), config.getCallDurationMs(), config.getMediaSessionId(), null, null, null, null, 240, null);
         this.issuesUiOptions = u.plus((Collection<? extends FeedbackIssue>) c0.t.m.shuffled(ISSUES_UI_OPTIONS), FeedbackIssue.OTHER);
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
index 54b1742477..2158b4af77 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
@@ -78,9 +78,9 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
         }
 
         private final Observable<StoreState> observeStoreState(StoreExperiments storeExperiments) {
-            Observable<R> E = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).E(StreamFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "storeExperiments\n       …            )\n          }");
-            return E;
+            Observable<R> F = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).F(StreamFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storeExperiments\n       …            )\n          }");
+            return F;
         }
 
         public final List<FeedbackIssue> getISSUES_UI_OPTIONS() {
@@ -166,7 +166,7 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeExperiments = storeExperiments;
         this.storeAnalytics = storeAnalytics;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.submitOnDismiss = true;
         ModelApplicationStream decodeStreamKey = ModelApplicationStream.Companion.decodeStreamKey(str);
         this.stream = decodeStreamKey;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
index 5ec5ea3e00..e215bfcef3 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
@@ -52,21 +52,21 @@ public final class WidgetCallFullscreen$configureMenu$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_call_overlay_launcher /* 2131364164 */:
+            case R.id.menu_call_overlay_launcher /* 2131364159 */:
                 DiscordOverlayService.Companion companion = DiscordOverlayService.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launchForConnect(context);
                 return;
-            case R.id.menu_call_switch_camera /* 2131364165 */:
+            case R.id.menu_call_switch_camera /* 2131364160 */:
                 WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed();
                 return;
-            case R.id.menu_call_video_list /* 2131364166 */:
+            case R.id.menu_call_video_list /* 2131364161 */:
                 WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
                 companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this));
                 return;
-            case R.id.menu_call_voice_settings /* 2131364167 */:
+            case R.id.menu_call_voice_settings /* 2131364162 */:
                 WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion;
                 Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h());
                 FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
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 f6b93c1501..089ff3e5e1 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
@@ -238,7 +238,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
         tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
         if (tooltipManager == null) {
-            tooltipManager = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2605c.getValue(), 0, aVar, 4);
+            tooltipManager = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2603c.getValue(), 0, aVar, 4);
             TooltipManager.a.a = new WeakReference<>(tooltipManager);
         }
         this.tooltipManager = tooltipManager;
@@ -614,9 +614,9 @@ public final class WidgetCallFullscreen extends AppFragment {
     private final void configureConnectionStatusText(CallModel callModel) {
         Subscription subscription = this.connectedTimerSubscription;
         if (subscription == null || subscription.isUnsubscribed()) {
-            Observable<Long> C = Observable.C(0, 1, TimeUnit.SECONDS);
-            m.checkNotNullExpressionValue(C, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(C, this, null, 2, null), WidgetCallFullscreen.class, (Context) null, new WidgetCallFullscreen$configureConnectionStatusText$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreen$configureConnectionStatusText$1(this, callModel), 58, (Object) null);
+            Observable<Long> D = Observable.D(0, 1, TimeUnit.SECONDS);
+            m.checkNotNullExpressionValue(D, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(D, this, null, 2, null), WidgetCallFullscreen.class, (Context) null, new WidgetCallFullscreen$configureConnectionStatusText$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreen$configureConnectionStatusText$1(this, callModel), 58, (Object) null);
         }
     }
 
@@ -958,15 +958,15 @@ public final class WidgetCallFullscreen extends AppFragment {
             String string = getResources().getString(R.string.voice_controls_sheet_tooltip_swipe_up);
             m.checkNotNullExpressionValue(string, "resources.getString(R.st…s_sheet_tooltip_swipe_up)");
             int dpToPixels = DimenUtils.dpToPixels(-12);
-            Observable<Unit> E = getUnsubscribeSignal().E(WidgetCallFullscreen$configureSwipeTooltip$1.INSTANCE);
-            m.checkNotNullExpressionValue(E, "this.unsubscribeSignal.map { }");
+            Observable<Unit> F = getUnsubscribeSignal().F(WidgetCallFullscreen$configureSwipeTooltip$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "this.unsubscribeSignal.map { }");
             FloatingViewGravity floatingViewGravity = FloatingViewGravity.TOP;
             Objects.requireNonNull(defaultTooltipCreator);
             m.checkNotNullParameter(voiceControlsSheetView, "anchorView");
             m.checkNotNullParameter(string, "tooltipText");
             m.checkNotNullParameter(voiceControlsSheetSwipeTooltip, "tooltip");
             m.checkNotNullParameter(floatingViewGravity, "tooltipGravity");
-            m.checkNotNullParameter(E, "componentPausedObservable");
+            m.checkNotNullParameter(F, "componentPausedObservable");
             if (defaultTooltipCreator.a.b(voiceControlsSheetSwipeTooltip, true)) {
                 LayoutInflater from = LayoutInflater.from(voiceControlsSheetView.getContext());
                 if (floatingViewGravity == floatingViewGravity) {
@@ -1000,7 +1000,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                 TooltipManager tooltipManager = defaultTooltipCreator.a;
                 View root = viewBinding.getRoot();
                 m.checkNotNullExpressionValue(root, "tooltipView.root");
-                tooltipManager.d(voiceControlsSheetView, root, voiceControlsSheetSwipeTooltip, floatingViewGravity, 0, dpToPixels, true, E);
+                tooltipManager.d(voiceControlsSheetView, root, voiceControlsSheetSwipeTooltip, floatingViewGravity, 0, dpToPixels, true, F);
                 return;
             }
             return;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
index d37ed3db47..5f19366b45 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
@@ -1641,16 +1641,16 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
         this.experimentsStore = storeExperiments;
         this.showStageCallBottomSheet = j != StoreStream.Companion.getVoiceChannelSelected().getSelectedVoiceChannelId();
         this.logStreamQualityIndicatorViewed = true;
-        this.eventSubject = PublishSubject.j0();
-        PublishSubject<List<VideoCallParticipantView.ParticipantData>> j0 = PublishSubject.j0();
-        this.offScreenSubject = j0;
+        this.eventSubject = PublishSubject.k0();
+        PublishSubject<List<VideoCallParticipantView.ParticipantData>> k0 = PublishSubject.k0();
+        this.offScreenSubject = k0;
         this.videoPlayerIdleDetector = new VideoPlayerIdleDetector(0, null, null, new WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1(this), 7, null);
         this.allVideoParticipants = n.emptyList();
         if (str != null) {
             this.autotargetStreamKey = str;
             storeVoiceChannelSelected.selectVoiceChannel(ModelApplicationStream.Companion.decodeStreamKey(str).getChannelId());
         }
-        Observable<List<VideoCallParticipantView.ParticipantData>> o = j0.o(1000, TimeUnit.MILLISECONDS);
+        Observable<List<VideoCallParticipantView.ParticipantData>> o = k0.o(1000, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "offScreenSubject\n       …0, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(o, WidgetCallFullscreenViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -1717,7 +1717,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
             return participantData;
         }
         m.checkNotNullParameter(applicationStreamMetadata, "metadata");
-        VideoCallParticipantView.StreamResolution aVar = applicationStreamMetadata.e == Payloads.ResolutionType.Source ? VideoCallParticipantView.StreamResolution.b.a : new VideoCallParticipantView.StreamResolution.a(applicationStreamMetadata.f2580c);
+        VideoCallParticipantView.StreamResolution aVar = applicationStreamMetadata.e == Payloads.ResolutionType.Source ? VideoCallParticipantView.StreamResolution.b.a : new VideoCallParticipantView.StreamResolution.a(applicationStreamMetadata.f2578c);
         Integer num = applicationStreamMetadata.d;
         if (num != null) {
             streamFps = new VideoCallParticipantView.StreamFps(num.intValue());
@@ -2082,9 +2082,9 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
     @MainThread
     private final void startTapForwardingJob() {
         cancelTapForwardingJob();
-        Observable<Long> d02 = Observable.d0(255, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler);
-        m.checkNotNullExpressionValue(d02, "Observable\n        .time…ackgroundThreadScheduler)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$2(this), 58, (Object) null);
+        Observable<Long> e02 = Observable.e0(255, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler);
+        m.checkNotNullExpressionValue(e02, "Observable\n        .time…ackgroundThreadScheduler)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$2(this), 58, (Object) null);
     }
 
     @MainThread
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java
index 734ffcd65a..dedf416806 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java
@@ -272,7 +272,7 @@ public final class WidgetGuildCallOnboardingSheetViewModel extends AppViewModel<
         this.channelsStore = storeChannels;
         this.guildsStore = storeGuilds;
         this.voiceStatesStore = storeVoiceStates;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         Observable<StoreState> q = observeStoreState().q();
         m.checkNotNullExpressionValue(q, "observeStoreState()\n    …  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(q), this, null, 2, null), WidgetGuildCallOnboardingSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -293,9 +293,9 @@ public final class WidgetGuildCallOnboardingSheetViewModel extends AppViewModel<
     }
 
     private final Observable<StoreState> observeStoreState() {
-        Observable<StoreState> E = VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.channelId, this.channelsStore, this.guildsStore, this.permissionsStore, this.voiceStatesStore, null, null, 96, null).E(WidgetGuildCallOnboardingSheetViewModel$observeStoreState$1.INSTANCE);
-        m.checkNotNullExpressionValue(E, "VoiceChannelJoinabilityU…StoreState(joinability) }");
-        return E;
+        Observable<StoreState> F = VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.channelId, this.channelsStore, this.guildsStore, this.permissionsStore, this.voiceStatesStore, null, null, 96, null).F(WidgetGuildCallOnboardingSheetViewModel$observeStoreState$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "VoiceChannelJoinabilityU…StoreState(joinability) }");
+        return F;
     }
 
     public final Observable<Event> observeEvents() {
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
index fdbe932c5c..dce1162659 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
@@ -86,7 +86,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         long j = getArgumentsOrDefault().getLong(ARG_VOICE_CHANNEL_ID);
-        getBinding().f2456c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j));
+        getBinding().f2454c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j));
         getBinding().b.setOnClickListener(new WidgetStartCallSheet$onViewCreated$2(this, j));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java
index 70f39cb909..894bf51aea 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java
@@ -47,7 +47,7 @@ public final class VideoCallGridViewHolder extends RecyclerView.ViewHolder {
         Objects.requireNonNull(videoCallParticipantView);
         m.checkNotNullParameter(function2, "onShown");
         m.checkNotNullParameter(function22, "onClicked");
-        videoCallParticipantView.f2623x = function2;
-        videoCallParticipantView.f2622w = function22;
+        videoCallParticipantView.f2621x = function2;
+        videoCallParticipantView.f2620w = function22;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
index 9bacc24a5d..dc676dc65f 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
@@ -53,7 +53,7 @@ public final class AudienceViewHolder extends StageCallViewHolder {
         m.checkNotNullParameter(stageCallItem, "data");
         super.onConfigure(i, (int) stageCallItem);
         StageCallItem.AudienceItem audienceItem = (StageCallItem.AudienceItem) stageCallItem;
-        this.binding.f2449c.setCutoutEnabled(audienceItem.getVoiceUser().isRequestingToSpeak());
+        this.binding.f2447c.setCutoutEnabled(audienceItem.getVoiceUser().isRequestingToSpeak());
         ImageView imageView = this.binding.e;
         imageView.setVisibility(audienceItem.getVoiceUser().isRequestingToSpeak() ? 0 : 8);
         imageView.setActivated(audienceItem.getVoiceUser().isInvitedToSpeak());
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
index 75e889036d..85e4e4f11d 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
@@ -129,7 +129,7 @@ public final class DetailsViewHolder extends StageCallViewHolder {
         ImageView imageView4 = this.binding.b;
         m.checkNotNullExpressionValue(imageView4, "binding.publicDot");
         imageView4.setVisibility(detailsItem.isPublic() ? 0 : 8);
-        ImageView imageView5 = this.binding.f2450c;
+        ImageView imageView5 = this.binding.f2448c;
         m.checkNotNullExpressionValue(imageView5, "binding.publicIcon");
         imageView5.setVisibility(detailsItem.isPublic() ? 0 : 8);
         TextView textView9 = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/PrestartDetailsViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/PrestartDetailsViewHolder.java
index 5ad5bc2314..14106a5706 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/PrestartDetailsViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/PrestartDetailsViewHolder.java
@@ -38,7 +38,7 @@ public final class PrestartDetailsViewHolder extends StageCallViewHolder {
         m.checkNotNullParameter(stageCallItem, "data");
         super.onConfigure(i, (int) stageCallItem);
         StageCallItem.PreStartDetailsItem preStartDetailsItem = (StageCallItem.PreStartDetailsItem) stageCallItem;
-        TextView textView = this.binding.f2452c;
+        TextView textView = this.binding.f2450c;
         m.checkNotNullExpressionValue(textView, "binding.title");
         textView.setText(preStartDetailsItem.getTitle());
         TextView textView2 = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
index 032e79f3a8..55de3c3608 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
@@ -93,10 +93,10 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        Observable<R> E = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(colorId).w(ObservableExtensionsKt$filterNull$1.INSTANCE).E(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(E, "filter { it != null }.map { it!! }");
-        Observable Y = E.Y(1);
-        m.checkNotNullExpressionValue(Y, "UserRepresentativeColors…erNull()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(Y, StageCallSpeakerView.class, (Context) null, new h(stageCallSpeakerView2), (Function1) null, (Function0) null, (Function0) null, new i(stageCallSpeakerView2), 58, (Object) null);
+        Observable<R> F = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(colorId).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "UserRepresentativeColors…erNull()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StageCallSpeakerView.class, (Context) null, new h(stageCallSpeakerView2), (Function1) null, (Function0) null, (Function0) null, new i(stageCallSpeakerView2), 58, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java
index 0f9fa7a569..e13ac57879 100644
--- a/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java
@@ -129,6 +129,6 @@ public final class CallModel$Companion$get$1<T, R> implements b<Channel, Observa
         }
         Observable access$observeChunk = CallModel.Companion.access$observeChunk(CallModel.Companion, channel);
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.c(access$observeChunk, companion.getApplicationStreaming().observeActiveStream(), companion.getRtcConnection().observeRtcConnectionMetadata(), companion.getExperiments().observeUserExperiment("2019-12_android_call_feedback_sheet_sample_rate_denominator", true).E(AnonymousClass1.INSTANCE), companion.getExperiments().observeUserExperiment("2020-09_stream_feedback_sheet_sample_rate_denominator", true).E(AnonymousClass2.INSTANCE), VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.$channelId, null, null, null, null, null, null, 126, null), companion.getGuilds().observeFromChannelId(this.$channelId), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), StoreGuildScheduledEvents.observeGuildScheduledEvents$default(companion.getGuildScheduledEvents(), channel.f(), false, 2, null), new AnonymousClass3(this, channel));
+        return Observable.c(access$observeChunk, companion.getApplicationStreaming().observeActiveStream(), companion.getRtcConnection().observeRtcConnectionMetadata(), companion.getExperiments().observeUserExperiment("2019-12_android_call_feedback_sheet_sample_rate_denominator", true).F(AnonymousClass1.INSTANCE), companion.getExperiments().observeUserExperiment("2020-09_stream_feedback_sheet_sample_rate_denominator", true).F(AnonymousClass2.INSTANCE), VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.$channelId, null, null, null, null, null, null, 126, null), companion.getGuilds().observeFromChannelId(this.$channelId), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), StoreGuildScheduledEvents.observeGuildScheduledEvents$default(companion.getGuildScheduledEvents(), channel.f(), false, 2, null), new AnonymousClass3(this, channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
index 38df3cf5cd..cacf8a51d2 100644
--- a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
@@ -276,9 +276,9 @@ public final class CallModel {
         }
 
         public final Observable<CallModel> get(long j) {
-            Observable<R> X = StoreStream.Companion.getChannels().observeChannel(j).X(new CallModel$Companion$get$1(j));
-            m.checkNotNullExpressionValue(X, "StoreStream\n          .g…            }\n          }");
-            return X;
+            Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new CallModel$Companion$get$1(j));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java
index f8090c3d93..501487246b 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java
@@ -24,7 +24,7 @@ public final class WidgetVoiceChannelSettings$configureUI$6 implements View.OnCl
         WidgetVoiceChannelSettings widgetVoiceChannelSettings = this.this$0;
         long h = this.$this_configureUI.getChannel().h();
         StatefulViews access$getState$p = WidgetVoiceChannelSettings.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2499c;
+        TextInputLayout textInputLayout = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2497c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         String str = (String) access$getState$p.get(textInputLayout.getId(), ChannelUtils.c(this.$this_configureUI.getChannel()));
         StatefulViews access$getState$p2 = WidgetVoiceChannelSettings.access$getState$p(this.this$0);
@@ -37,7 +37,7 @@ public final class WidgetVoiceChannelSettings$configureUI$6 implements View.OnCl
         }
         String str2 = (String) access$getState$p2.get(id2, z2);
         int A = this.$this_configureUI.getChannel().A();
-        SeekBar seekBar = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2500r;
+        SeekBar seekBar = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2498r;
         m.checkNotNullExpressionValue(seekBar, "binding.userLimitSeekbar");
         int progress = seekBar.getProgress();
         SeekBar seekBar2 = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).b;
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
index 19808561a3..a7a202e922 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
@@ -332,10 +332,10 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         TextView textView3 = getBinding().p;
         m.checkNotNullExpressionValue(textView3, "binding.settingsUserLimitHelp");
         c.a.k.b.n(textView3, R.string.form_help_user_limit, new Object[0], null, 4);
-        SeekBar seekBar = getBinding().f2500r;
+        SeekBar seekBar = getBinding().f2498r;
         m.checkNotNullExpressionValue(seekBar, "binding.userLimitSeekbar");
         seekBar.setProgress(model.getChannel().B());
-        getBinding().f2500r.setOnSeekBarChangeListener(new WidgetVoiceChannelSettings$configureUI$2(this));
+        getBinding().f2498r.setOnSeekBarChangeListener(new WidgetVoiceChannelSettings$configureUI$2(this));
         configureUserLimitVisibility(model.getChannel().A() == 2);
         int c2 = model.getChannel().c() / 1000;
         TextView textView4 = getBinding().k;
@@ -384,10 +384,10 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         c.a.k.b.n(textView9, R.string.form_help_region_override, new Object[0], null, 4);
         getBinding().g.setOnClickListener(new WidgetVoiceChannelSettings$configureUI$4(this, model));
         configureRegionOverrideVisibility(model.getCanManageChannel());
-        TextInputLayout textInputLayout = getBinding().f2499c;
+        TextInputLayout textInputLayout = getBinding().f2497c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         StatefulViews statefulViews4 = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f2499c;
+        TextInputLayout textInputLayout2 = getBinding().f2497c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews4.get(textInputLayout2.getId(), ChannelUtils.c(model.getChannel())));
         TextInputLayout textInputLayout3 = getBinding().d;
@@ -511,7 +511,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         statefulViews2.addOptionalFields(textView);
         StatefulViews statefulViews3 = this.state;
         FloatingActionButton floatingActionButton = getBinding().i;
-        TextInputLayout textInputLayout2 = getBinding().f2499c;
+        TextInputLayout textInputLayout2 = getBinding().f2497c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         TextInputLayout textInputLayout3 = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
index aedb71b0b1..6aeff143ac 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
@@ -66,10 +66,10 @@ public final class WidgetNoiseCancellationBottomSheet extends AppBottomSheet {
     }
 
     private final void configureUI() {
-        TextView textView = getBinding().f2501c;
+        TextView textView = getBinding().f2499c;
         m.checkNotNullExpressionValue(textView, "binding.noiseCancellationLearnMore");
         b.n(textView, R.string.learn_more_link, new Object[]{f.a.a(360040843952L, null)}, null, 4);
-        TextView textView2 = getBinding().f2501c;
+        TextView textView2 = getBinding().f2499c;
         m.checkNotNullExpressionValue(textView2, "binding.noiseCancellationLearnMore");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
         getBinding().b.setOnClickListener(new WidgetNoiseCancellationBottomSheet$configureUI$1(this));
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
index 12069f12c8..77f505323e 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
@@ -86,7 +86,7 @@ public final class WidgetNoiseCancellationBottomSheetViewModel extends AppViewMo
         super(null, 1, null);
         m.checkNotNullParameter(storeMediaSettings, "mediaSettingsStore");
         this.mediaSettingsStore = storeMediaSettings;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
index db19220b82..8ef9b6308b 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
@@ -657,36 +657,36 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
     }
 
     private final void configureUI(WidgetVoiceBottomSheetViewModel.ViewState viewState) {
-        TextView textView = getBinding().f2496c.g;
+        TextView textView = getBinding().f2494c.g;
         m.checkNotNullExpressionValue(textView, "binding.header.voiceBottomSheetHeaderTitle");
         textView.setText(viewState.getTitle());
-        TextView textView2 = getBinding().f2496c.f;
+        TextView textView2 = getBinding().f2494c.f;
         m.checkNotNullExpressionValue(textView2, "binding.header.voiceBottomSheetHeaderSubtitle");
         ViewExtensions.setTextAndVisibilityBy(textView2, viewState.getSubtitle());
-        ImageView imageView = getBinding().f2496c.b;
+        ImageView imageView = getBinding().f2494c.b;
         m.checkNotNullExpressionValue(imageView, "binding.header.voiceBottomSheetHeaderDeafen");
         imageView.setActivated(viewState.isDeafened());
-        ImageView imageView2 = getBinding().f2496c.b;
+        ImageView imageView2 = getBinding().f2494c.b;
         m.checkNotNullExpressionValue(imageView2, "binding.header.voiceBottomSheetHeaderDeafen");
         imageView2.setContentDescription(viewState.isDeafened() ? getString(R.string.undeafen) : getString(R.string.deafen));
-        getBinding().f2496c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this));
-        ImageView imageView3 = getBinding().f2496c.f127c;
+        getBinding().f2494c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this));
+        ImageView imageView3 = getBinding().f2494c.f127c;
         m.checkNotNullExpressionValue(imageView3, "binding.header.voiceBottomSheetHeaderInvite");
         imageView3.setVisibility(viewState.getShowInviteOption() ? 0 : 8);
-        getBinding().f2496c.f127c.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$2(this, viewState));
-        getBinding().f2496c.e.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$3(this));
-        getBinding().f2496c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this));
+        getBinding().f2494c.f127c.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$2(this, viewState));
+        getBinding().f2494c.e.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$3(this));
+        getBinding().f2494c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this));
         if (viewState.isNoiseCancellationActive() != null) {
             if (m.areEqual(viewState.isNoiseCancellationActive(), Boolean.TRUE)) {
-                getBinding().f2496c.d.setImageResource(R.drawable.ic_noise_cancellation_active_24dp);
+                getBinding().f2494c.d.setImageResource(R.drawable.ic_noise_cancellation_active_24dp);
             } else {
-                getBinding().f2496c.d.setImageResource(R.drawable.ic_noise_cancellation_disabled_24dp);
+                getBinding().f2494c.d.setImageResource(R.drawable.ic_noise_cancellation_disabled_24dp);
             }
-            ImageView imageView4 = getBinding().f2496c.d;
+            ImageView imageView4 = getBinding().f2494c.d;
             m.checkNotNullExpressionValue(imageView4, "binding.header.voiceBott…etHeaderNoiseCancellation");
             imageView4.setVisibility(0);
         } else {
-            ImageView imageView5 = getBinding().f2496c.d;
+            ImageView imageView5 = getBinding().f2494c.d;
             m.checkNotNullExpressionValue(imageView5, "binding.header.voiceBott…etHeaderNoiseCancellation");
             imageView5.setVisibility(8);
         }
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 a62505c519..d061cb3061 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
@@ -983,7 +983,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
         this.voiceEngineServiceController = voiceEngineServiceController;
         this.clock = clock;
         this.tooltipManager = tooltipManager;
-        this.eventSubject = PublishSubject.j0();
+        this.eventSubject = PublishSubject.k0();
         this.fetchedPreviews = new LinkedHashSet();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetVoiceBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -1019,7 +1019,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
             WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
             tooltipManager4 = weakReference2 != null ? weakReference2.get() : tooltipManager4;
             if (tooltipManager4 == null) {
-                tooltipManager3 = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2605c.getValue(), 0, aVar, 4);
+                tooltipManager3 = new TooltipManager((c.a.v.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2603c.getValue(), 0, aVar, 4);
                 TooltipManager.a.a = new WeakReference<>(tooltipManager3);
             } else {
                 tooltipManager3 = tooltipManager4;
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
index c2d4857951..074582436b 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
@@ -109,8 +109,8 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet {
     }
 
     private final void configureUI(ViewState viewState) {
-        getBinding().f2502c.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$1(this, viewState));
-        TextView textView = getBinding().f2502c;
+        getBinding().f2500c.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$1(this, viewState));
+        TextView textView = getBinding().f2500c;
         m.checkNotNullExpressionValue(textView, "binding.voiceSettingsInvite");
         int i = 8;
         textView.setVisibility(viewState.getShowInviteItem() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java
index 42328dbf93..0107a0a1ca 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java
@@ -66,9 +66,9 @@ public final class WidgetVoiceSettingsBottomSheetViewModel extends AppViewModel<
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreStageChannels storeStageChannels) {
-            Observable<StoreState> X = ObservableExtensionsKt.computationLatest(CallModel.Companion.get(j)).q().X(new WidgetVoiceSettingsBottomSheetViewModel$Companion$observeStoreState$1(storeStageChannels, j));
-            m.checkNotNullExpressionValue(X, "CallModel.get(channelId)…          }\n            }");
-            return X;
+            Observable<StoreState> Y = ObservableExtensionsKt.computationLatest(CallModel.Companion.get(j)).q().Y(new WidgetVoiceSettingsBottomSheetViewModel$Companion$observeStoreState$1(storeStageChannels, j));
+            m.checkNotNullExpressionValue(Y, "CallModel.get(channelId)…          }\n            }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java b/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java
index 25be2135b2..5c48097ba9 100644
--- a/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java
+++ b/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java
@@ -40,7 +40,7 @@ public final class BackgroundMessageSendWorker extends Worker {
         if (application != null) {
             StoreStream.Companion companion = StoreStream.Companion;
             companion.initialize(application);
-            new i0.m.a(companion.getMessages().observeInitResendFinished().w(a.i).Y(1)).b();
+            new i0.m.a(companion.getMessages().observeInitResendFinished().x(a.i).Z(1)).b();
             ListenableWorker.Result success = ListenableWorker.Result.success();
             m.checkNotNullExpressionValue(success, "Result.success()");
             return success;
diff --git a/app/src/main/java/com/esotericsoftware/kryo/Registration.java b/app/src/main/java/com/esotericsoftware/kryo/Registration.java
index 627931a07b..5977932840 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/Registration.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/Registration.java
@@ -6,7 +6,7 @@ import g0.b.a.a;
 public class Registration {
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f2660id;
+    private final int f2658id;
     private a instantiator;
     private Serializer serializer;
     private final Class type;
@@ -17,14 +17,14 @@ public class Registration {
         } else if (serializer != null) {
             this.type = cls;
             this.serializer = serializer;
-            this.f2660id = i;
+            this.f2658id = i;
         } else {
             throw new IllegalArgumentException("serializer cannot be null.");
         }
     }
 
     public int getId() {
-        return this.f2660id;
+        return this.f2658id;
     }
 
     public a getInstantiator() {
@@ -58,7 +58,7 @@ public class Registration {
 
     public String toString() {
         StringBuilder O = c.d.b.a.a.O("[");
-        O.append(this.f2660id);
+        O.append(this.f2658id);
         O.append(", ");
         O.append(Util.className(this.type));
         O.append("]");
diff --git a/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java b/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
index b5473e948c..bbad4ab7b8 100644
--- a/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
+++ b/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
@@ -13,7 +13,7 @@ public class DiskCacheConfig {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Supplier<File> f2661c;
+    public final Supplier<File> f2659c;
     public final long d;
     public final long e;
     public final long f;
@@ -40,7 +40,7 @@ public class DiskCacheConfig {
         public Supplier<File> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public long f2662c = 41943040;
+        public long f2660c = 41943040;
         public g d = new c.f.b.b.b();
         public final Context e;
 
@@ -65,8 +65,8 @@ public class DiskCacheConfig {
         this.b = str;
         Supplier<File> supplier = bVar.b;
         Objects.requireNonNull(supplier);
-        this.f2661c = supplier;
-        this.d = bVar.f2662c;
+        this.f2659c = supplier;
+        this.d = bVar.f2660c;
         this.e = 10485760;
         this.f = Permission.SPEAK;
         g gVar = bVar.d;
diff --git a/app/src/main/java/com/facebook/common/references/CloseableReference.java b/app/src/main/java/com/facebook/common/references/CloseableReference.java
index c69539ab33..9fd3834ea9 100644
--- a/app/src/main/java/com/facebook/common/references/CloseableReference.java
+++ b/app/src/main/java/com/facebook/common/references/CloseableReference.java
@@ -63,7 +63,7 @@ public abstract class CloseableReference<T> implements Cloneable, Closeable {
         this.n = sharedReference;
         synchronized (sharedReference) {
             sharedReference.b();
-            sharedReference.f2663c++;
+            sharedReference.f2661c++;
         }
         this.o = cVar;
         this.p = th;
diff --git a/app/src/main/java/com/facebook/common/references/SharedReference.java b/app/src/main/java/com/facebook/common/references/SharedReference.java
index 4c85556a66..d58ccb0d83 100644
--- a/app/src/main/java/com/facebook/common/references/SharedReference.java
+++ b/app/src/main/java/com/facebook/common/references/SharedReference.java
@@ -13,7 +13,7 @@ public class SharedReference<T> {
     public T b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2663c = 1;
+    public int f2661c = 1;
     public final f<T> d;
 
     public static class NullReferenceException extends RuntimeException {
@@ -45,9 +45,9 @@ public class SharedReference<T> {
         T t;
         synchronized (this) {
             b();
-            d.j(Boolean.valueOf(this.f2663c > 0));
-            i = this.f2663c - 1;
-            this.f2663c = i;
+            d.j(Boolean.valueOf(this.f2661c > 0));
+            i = this.f2661c - 1;
+            this.f2661c = i;
         }
         if (i == 0) {
             synchronized (this) {
@@ -76,7 +76,7 @@ public class SharedReference<T> {
         boolean z3;
         synchronized (this) {
             z2 = false;
-            z3 = this.f2663c > 0;
+            z3 = this.f2661c > 0;
         }
         if (z3) {
             z2 = true;
diff --git a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java
index 123954b3dd..af732e548d 100644
--- a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java
+++ b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java
@@ -28,7 +28,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public static final Map<String, Object> b = f.of("origin", "memory_bitmap", "origin_sub", "shortcut");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Class<?> f2664c = AbstractDraweeController.class;
+    public static final Class<?> f2662c = AbstractDraweeController.class;
     public final c d;
     public final c.f.g.b.a e;
     public final Executor f;
@@ -45,14 +45,14 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2665r;
+    public boolean f2663r;
     public String s;
     public DataSource<T> t;
     public T u;
     public boolean v;
 
     /* renamed from: w  reason: collision with root package name */
-    public Drawable f2666w;
+    public Drawable f2664w;
 
     public class a extends c.f.e.d<T> {
         public final /* synthetic */ String a;
@@ -183,7 +183,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         this.t = j;
         B(j, null);
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2664c, "controller %x %s: submitRequest: dataSource: %x", Integer.valueOf(System.identityHashCode(this)), this.m, Integer.valueOf(System.identityHashCode(this.t)));
+            c.f.d.e.a.j(f2662c, "controller %x %s: submitRequest: dataSource: %x", Integer.valueOf(System.identityHashCode(this)), this.m, Integer.valueOf(System.identityHashCode(this.t)));
         }
         this.t.f(new a(this.m, this.t.b()), this.f);
         c.f.j.r.b.b();
@@ -225,7 +225,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
 
     @Override // com.facebook.drawee.interfaces.DraweeController
     public Animatable c() {
-        Drawable drawable = this.f2666w;
+        Drawable drawable = this.f2664w;
         if (drawable instanceof Animatable) {
             return (Animatable) drawable;
         }
@@ -236,7 +236,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public void d() {
         c.f.j.r.b.b();
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2664c, "controller %x %s: onAttach: %s", Integer.valueOf(System.identityHashCode(this)), this.m, this.p ? "request already submitted" : "request needs submit");
+            c.f.d.e.a.j(f2662c, "controller %x %s: onAttach: %s", Integer.valueOf(System.identityHashCode(this)), this.m, this.p ? "request already submitted" : "request needs submit");
         }
         this.d.a(c.a.ON_ATTACH_CONTROLLER);
         Objects.requireNonNull(this.k);
@@ -251,7 +251,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     @Override // com.facebook.drawee.interfaces.DraweeController
     public void e(DraweeHierarchy draweeHierarchy) {
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2664c, "controller %x %s: setHierarchy: %s", Integer.valueOf(System.identityHashCode(this)), this.m, draweeHierarchy);
+            c.f.d.e.a.j(f2662c, "controller %x %s: setHierarchy: %s", Integer.valueOf(System.identityHashCode(this)), this.m, draweeHierarchy);
         }
         this.d.a(draweeHierarchy != null ? c.a.ON_SET_HIERARCHY : c.a.ON_CLEAR_HIERARCHY);
         if (this.p) {
@@ -322,7 +322,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         }
         this.o = false;
         y();
-        this.f2665r = false;
+        this.f2663r = false;
         d dVar = this.g;
         if (dVar != null) {
             dVar.a = false;
@@ -353,7 +353,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         }
         this.l = null;
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2664c, "controller %x %s -> %s: initialize", Integer.valueOf(System.identityHashCode(this)), this.m, str);
+            c.f.d.e.a.j(f2662c, "controller %x %s -> %s: initialize", Integer.valueOf(System.identityHashCode(this)), this.m, str);
         }
         this.m = str;
         this.n = obj;
@@ -372,7 +372,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         a.AbstractC0062a aVar;
         boolean h = c.f.d.e.a.h(2);
         if (h) {
-            c.f.d.e.a.j(f2664c, "controller %x %s: onTouchEvent %s", Integer.valueOf(System.identityHashCode(this)), this.m, motionEvent);
+            c.f.d.e.a.j(f2662c, "controller %x %s: onTouchEvent %s", Integer.valueOf(System.identityHashCode(this)), this.m, motionEvent);
         }
         c.f.g.g.a aVar2 = this.h;
         if (aVar2 == null) {
@@ -514,7 +514,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
             p("final_failed @ onFailure", th);
             this.t = null;
             this.q = true;
-            if (this.f2665r && (drawable = this.f2666w) != null) {
+            if (this.f2663r && (drawable = this.f2664w) != null) {
                 this.k.f(drawable, 1.0f, true);
             } else if (D()) {
                 this.k.b(th);
@@ -550,9 +550,9 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
             try {
                 Drawable g = g(t);
                 T t2 = this.u;
-                Drawable drawable = this.f2666w;
+                Drawable drawable = this.f2664w;
                 this.u = t;
-                this.f2666w = g;
+                this.f2664w = g;
                 if (z2) {
                     try {
                         q("set_final_result @ onNewResult", t);
@@ -615,14 +615,14 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         } else {
             map = null;
         }
-        Drawable drawable = this.f2666w;
+        Drawable drawable = this.f2664w;
         if (drawable != null) {
             x(drawable);
         }
         if (this.s != null) {
             this.s = null;
         }
-        this.f2666w = null;
+        this.f2664w = null;
         T t = this.u;
         if (t != null) {
             map2 = t(l(t));
diff --git a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java
index 9e8dd291a9..bbb4ff13c5 100644
--- a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java
+++ b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java
@@ -18,7 +18,7 @@ public abstract class AbstractDraweeControllerBuilder<BUILDER extends AbstractDr
     public static final NullPointerException b = new NullPointerException("No image request was specified!");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicLong f2668c = new AtomicLong();
+    public static final AtomicLong f2666c = new AtomicLong();
     public final Context d;
     public final Set<ControllerListener> e;
     public final Set<c.f.h.b.a.b> f;
@@ -60,7 +60,7 @@ public abstract class AbstractDraweeControllerBuilder<BUILDER extends AbstractDr
         }
         c.f.j.r.b.b();
         AbstractDraweeController d = d();
-        d.f2665r = false;
+        d.f2663r = false;
         d.s = null;
         boolean z2 = this.l;
         if (z2) {
diff --git a/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java b/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java
index f4a10c18ed..a02c7e0629 100644
--- a/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java
+++ b/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java
@@ -18,7 +18,7 @@ public interface ScalingUtils$ScaleType {
     public static final ScalingUtils$ScaleType b = y.l;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ScalingUtils$ScaleType f2669c = a0.l;
+    public static final ScalingUtils$ScaleType f2667c = a0.l;
     public static final ScalingUtils$ScaleType d = x.l;
     public static final ScalingUtils$ScaleType e = v.l;
     public static final ScalingUtils$ScaleType f = w.l;
diff --git a/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java b/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java
index 46b406b4c9..b0f0f682e5 100644
--- a/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java
+++ b/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java
@@ -25,7 +25,7 @@ public class GenericDraweeHierarchy implements a {
     public final Resources b;
 
     /* renamed from: c  reason: collision with root package name */
-    public c f2670c;
+    public c f2668c;
     public final b d;
     public final f e;
     public final g f;
@@ -36,7 +36,7 @@ public class GenericDraweeHierarchy implements a {
         this.a = colorDrawable;
         c.f.j.r.b.b();
         this.b = aVar.f428c;
-        this.f2670c = aVar.f429r;
+        this.f2668c = aVar.f429r;
         g gVar = new g(colorDrawable);
         this.f = gVar;
         List<Drawable> list = aVar.p;
@@ -73,7 +73,7 @@ public class GenericDraweeHierarchy implements a {
         if (fVar.u == 1) {
             fVar.u = 0;
         }
-        b bVar = new b(d.d(fVar, this.f2670c));
+        b bVar = new b(d.d(fVar, this.f2668c));
         this.d = bVar;
         bVar.mutate();
         m();
@@ -130,7 +130,7 @@ public class GenericDraweeHierarchy implements a {
 
     @Override // c.f.g.h.a
     public void f(Drawable drawable, float f, boolean z2) {
-        Drawable c2 = d.c(drawable, this.f2670c, this.b);
+        Drawable c2 = d.c(drawable, this.f2668c, this.b);
         c2.mutate();
         this.f.o(c2);
         this.e.e();
@@ -144,7 +144,7 @@ public class GenericDraweeHierarchy implements a {
     }
 
     public final Drawable g(Drawable drawable, ScalingUtils$ScaleType scalingUtils$ScaleType) {
-        return d.e(d.c(drawable, this.f2670c, this.b), scalingUtils$ScaleType, null);
+        return d.e(d.c(drawable, this.f2668c, this.b), scalingUtils$ScaleType, null);
     }
 
     @Override // com.facebook.drawee.interfaces.DraweeHierarchy
@@ -235,7 +235,7 @@ public class GenericDraweeHierarchy implements a {
             this.e.c(i, null);
             return;
         }
-        k(i).g(d.c(drawable, this.f2670c, this.b));
+        k(i).g(d.c(drawable, this.f2668c, this.b));
     }
 
     public void p(int i) {
@@ -272,7 +272,7 @@ public class GenericDraweeHierarchy implements a {
     }
 
     public void s(c cVar) {
-        this.f2670c = cVar;
+        this.f2668c = cVar;
         b bVar = this.d;
         Drawable drawable = d.a;
         Drawable drawable2 = bVar.j;
@@ -292,7 +292,7 @@ public class GenericDraweeHierarchy implements a {
         }
         for (int i = 0; i < this.e.k.length; i++) {
             c.f.g.e.d k = k(i);
-            c cVar2 = this.f2670c;
+            c cVar2 = this.f2668c;
             Resources resources = this.b;
             while (true) {
                 Drawable l = k.l();
diff --git a/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java b/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java
index 42e131c079..f72063255b 100644
--- a/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java
+++ b/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java
@@ -64,12 +64,12 @@ public class DraweeSpanStringBuilder extends SpannableStringBuilder {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2671c;
+        public final int f2669c;
 
         public c(c.f.g.i.a aVar, boolean z2, int i) {
             this.a = aVar;
             this.b = z2;
-            this.f2671c = i;
+            this.f2669c = i;
         }
 
         @Override // c.f.g.c.c, com.facebook.drawee.controller.ControllerListener
@@ -78,11 +78,11 @@ public class DraweeSpanStringBuilder extends SpannableStringBuilder {
             if (this.b && imageInfo != null && this.a.o.d() != null) {
                 Drawable d = this.a.o.d();
                 Rect bounds = d.getBounds();
-                int i = this.f2671c;
+                int i = this.f2669c;
                 if (i != -1) {
                     int height = (int) ((((float) i) / ((float) imageInfo.getHeight())) * ((float) imageInfo.getWidth()));
-                    if (bounds.width() != height || bounds.height() != this.f2671c) {
-                        d.setBounds(0, 0, height, this.f2671c);
+                    if (bounds.width() != height || bounds.height() != this.f2669c) {
+                        d.setBounds(0, 0, height, this.f2669c);
                         DraweeSpanStringBuilder draweeSpanStringBuilder = DraweeSpanStringBuilder.this;
                         int i2 = DraweeSpanStringBuilder.i;
                         Objects.requireNonNull(draweeSpanStringBuilder);
diff --git a/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java b/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java
index e00cfebdf7..1c690a1566 100644
--- a/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java
+++ b/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java
@@ -14,7 +14,7 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     public boolean b = false;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2672c = true;
+    public boolean f2670c = true;
     public DH d;
     public DraweeController e = null;
     public final c f;
@@ -38,7 +38,7 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     }
 
     public final void b() {
-        if (!this.b || !this.f2672c) {
+        if (!this.b || !this.f2670c) {
             c();
         } else {
             a();
@@ -69,9 +69,9 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     }
 
     public void f(boolean z2) {
-        if (this.f2672c != z2) {
+        if (this.f2670c != z2) {
             this.f.a(z2 ? c.a.ON_DRAWABLE_SHOW : c.a.ON_DRAWABLE_HIDE);
-            this.f2672c = z2;
+            this.f2670c = z2;
             b();
         }
     }
@@ -121,7 +121,7 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
         i g2 = d.g2(this);
         g2.b("controllerAttached", this.a);
         g2.b("holderAttached", this.b);
-        g2.b("drawableVisible", this.f2672c);
+        g2.b("drawableVisible", this.f2670c);
         g2.c("events", this.f.toString());
         return g2.toString();
     }
diff --git a/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java b/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java
index 0e336a3740..88d8049278 100644
--- a/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java
+++ b/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java
@@ -20,7 +20,7 @@ public class AnimatedFactoryV2Impl implements c.f.j.a.b.a {
     public final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final m<CacheKey, c.f.j.j.c> f2673c;
+    public final m<CacheKey, c.f.j.j.c> f2671c;
     public final boolean d;
     public d e;
     public c.f.j.a.c.b f;
@@ -95,7 +95,7 @@ public class AnimatedFactoryV2Impl implements c.f.j.a.b.a {
     public AnimatedFactoryV2Impl(PlatformBitmapFactory platformBitmapFactory, e eVar, m<CacheKey, c.f.j.j.c> mVar, boolean z2) {
         this.a = platformBitmapFactory;
         this.b = eVar;
-        this.f2673c = mVar;
+        this.f2671c = mVar;
         this.d = z2;
     }
 
@@ -112,7 +112,7 @@ public class AnimatedFactoryV2Impl implements c.f.j.a.b.a {
             if (f.j == null) {
                 f.j = new f();
             }
-            this.h = new c.f.h.a.d.e(bVar2, f.j, cVar, RealtimeSinceBootClock.get(), this.a, this.f2673c, aVar, bVar);
+            this.h = new c.f.h.a.d.e(bVar2, f.j, cVar, RealtimeSinceBootClock.get(), this.a, this.f2671c, aVar, bVar);
         }
         return this.h;
     }
diff --git a/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java b/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java
index fbae417452..02c11dde75 100644
--- a/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java
+++ b/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java
@@ -4,7 +4,7 @@ public class MemoryCacheParams {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2674c;
+    public final int f2672c;
     public final int d;
     public final int e;
     public final long f;
@@ -12,7 +12,7 @@ public class MemoryCacheParams {
     public MemoryCacheParams(int i, int i2, int i3, int i4, int i5, long j) {
         this.a = i;
         this.b = i2;
-        this.f2674c = i3;
+        this.f2672c = i3;
         this.d = i4;
         this.e = i5;
         this.f = j;
diff --git a/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java b/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java
index 1a794f3a94..d00ce60c56 100644
--- a/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java
+++ b/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java
@@ -20,7 +20,7 @@ public abstract class BasePool<V> implements e<V> {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final y f2675c;
+    public final y f2673c;
     @VisibleForTesting
     public final SparseArray<f<V>> d;
     @VisibleForTesting
@@ -85,7 +85,7 @@ public abstract class BasePool<V> implements e<V> {
         Objects.requireNonNull(cVar);
         this.b = cVar;
         Objects.requireNonNull(yVar);
-        this.f2675c = yVar;
+        this.f2673c = yVar;
         Objects.requireNonNull(zVar);
         this.i = zVar;
         SparseArray<f<V>> sparseArray = new SparseArray<>();
@@ -101,7 +101,7 @@ public abstract class BasePool<V> implements e<V> {
                     int i2 = sparseIntArray.get(keyAt, 0);
                     SparseArray<f<V>> sparseArray2 = this.d;
                     int k = k(keyAt);
-                    Objects.requireNonNull(this.f2675c);
+                    Objects.requireNonNull(this.f2673c);
                     sparseArray2.put(keyAt, new f<>(k, valueAt, i2, false));
                 }
                 this.f = false;
@@ -121,7 +121,7 @@ public abstract class BasePool<V> implements e<V> {
         if (this.j) {
             return true;
         }
-        y yVar = this.f2675c;
+        y yVar = this.f2673c;
         int i2 = yVar.a;
         int i3 = this.g.b;
         if (i > i2 - i3) {
@@ -168,7 +168,7 @@ public abstract class BasePool<V> implements e<V> {
                         h.e++;
                     }
                 } else {
-                    throw new PoolSizeViolationException(this.f2675c.a, this.g.b, this.h.b, k);
+                    throw new PoolSizeViolationException(this.f2673c.a, this.g.b, this.h.b, k);
                 }
             } else {
                 d.B(this.e.add(l));
@@ -200,7 +200,7 @@ public abstract class BasePool<V> implements e<V> {
             d.B(this.e.add(v));
             synchronized (this) {
                 if (n()) {
-                    r(this.f2675c.b);
+                    r(this.f2673c.b);
                 }
             }
             return v;
@@ -250,7 +250,7 @@ public abstract class BasePool<V> implements e<V> {
     @VisibleForTesting
     public synchronized boolean n() {
         boolean z2;
-        z2 = this.g.b + this.h.b > this.f2675c.b;
+        z2 = this.g.b + this.h.b > this.f2673c.b;
         if (z2) {
             this.i.d();
         }
@@ -275,7 +275,7 @@ public abstract class BasePool<V> implements e<V> {
 
     public f<V> q(int i) {
         int k = k(i);
-        Objects.requireNonNull(this.f2675c);
+        Objects.requireNonNull(this.f2673c);
         return new f<>(k, Integer.MAX_VALUE, 0, false);
     }
 
diff --git a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java
index ac4d892f95..fa6f0572af 100644
--- a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java
@@ -17,12 +17,12 @@ public class NativeJpegTranscoder implements b {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2676c;
+    public boolean f2674c;
 
     public NativeJpegTranscoder(boolean z2, int i, boolean z3, boolean z4) {
         this.a = z2;
         this.b = i;
-        this.f2676c = z3;
+        this.f2674c = z3;
         if (z4) {
             d.g0();
         }
@@ -113,7 +113,7 @@ public class NativeJpegTranscoder implements b {
             int c2 = c.f.j.s.d.c(fVar, eVar2, eVar, this.a);
             int i = 1;
             int max = Math.max(1, 8 / c02);
-            if (this.f2676c) {
+            if (this.f2674c) {
                 c2 = max;
             }
             InputStream e = eVar.e();
diff --git a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java
index ef78b05239..83cd88f08a 100644
--- a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java
+++ b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java
@@ -8,13 +8,13 @@ public class NativeJpegTranscoderFactory implements c.f.j.s.c {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2677c;
+    public final boolean f2675c;
 
     @c
     public NativeJpegTranscoderFactory(int i, boolean z2, boolean z3) {
         this.a = i;
         this.b = z2;
-        this.f2677c = z3;
+        this.f2675c = z3;
     }
 
     @Override // c.f.j.s.c
@@ -23,6 +23,6 @@ public class NativeJpegTranscoderFactory implements c.f.j.s.c {
         if (cVar != c.f.i.b.a) {
             return null;
         }
-        return new NativeJpegTranscoder(z2, this.a, this.b, this.f2677c);
+        return new NativeJpegTranscoder(z2, this.a, this.b, this.f2675c);
     }
 }
diff --git a/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java b/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java
index 57db45b3f6..98b1e5987c 100644
--- a/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 public class GingerbreadPurgeableDecoder extends DalvikPurgeableDecoder {
 
     /* renamed from: c  reason: collision with root package name */
-    public static Method f2678c;
+    public static Method f2676c;
     public final b d = c.f.d.m.c.c();
 
     /* JADX WARNING: Removed duplicated region for block: B:27:0x0059  */
@@ -157,15 +157,15 @@ public class GingerbreadPurgeableDecoder extends DalvikPurgeableDecoder {
     }
 
     public final synchronized Method i() {
-        if (f2678c == null) {
+        if (f2676c == null) {
             try {
-                f2678c = MemoryFile.class.getDeclaredMethod("getFileDescriptor", new Class[0]);
+                f2676c = MemoryFile.class.getDeclaredMethod("getFileDescriptor", new Class[0]);
             } catch (Exception e) {
                 m.a(e);
                 throw new RuntimeException(e);
             }
         }
-        return f2678c;
+        return f2676c;
     }
 
     public final FileDescriptor j(MemoryFile memoryFile) {
diff --git a/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java b/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
index a48392f691..52817cb546 100644
--- a/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
@@ -15,18 +15,18 @@ import com.facebook.imagepipeline.nativecode.DalvikPurgeableDecoder;
 public class KitKatPurgeableDecoder extends DalvikPurgeableDecoder {
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f2679c;
+    public final n f2677c;
 
     @c
     public KitKatPurgeableDecoder(n nVar) {
-        this.f2679c = nVar;
+        this.f2677c = nVar;
     }
 
     @Override // com.facebook.imagepipeline.nativecode.DalvikPurgeableDecoder
     public Bitmap c(CloseableReference<PooledByteBuffer> closeableReference, BitmapFactory.Options options) {
         PooledByteBuffer w2 = closeableReference.w();
         int size = w2.size();
-        CloseableReference<byte[]> a = this.f2679c.a(size);
+        CloseableReference<byte[]> a = this.f2677c.a(size);
         try {
             byte[] w3 = a.w();
             w2.i(0, w3, 0, size);
@@ -48,7 +48,7 @@ public class KitKatPurgeableDecoder extends DalvikPurgeableDecoder {
         PooledByteBuffer w2 = closeableReference.w();
         d.j(Boolean.valueOf(i <= w2.size()));
         int i2 = i + 2;
-        CloseableReference<byte[]> a = this.f2679c.a(i2);
+        CloseableReference<byte[]> a = this.f2677c.a(i2);
         try {
             byte[] w3 = a.w();
             w2.i(0, w3, 0, i);
diff --git a/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java b/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
index e585341fd3..ff493e47da 100644
--- a/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
+++ b/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
@@ -34,7 +34,7 @@ public class LocalExifThumbnailProducer implements j1<e> {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ContentResolver f2680c;
+    public final ContentResolver f2678c;
 
     @d
     public class Api24Utils {
@@ -77,9 +77,9 @@ public class LocalExifThumbnailProducer implements j1<e> {
             int i;
             Throwable th;
             int columnIndex;
-            Uri uri = this.n.f2681c;
+            Uri uri = this.n.f2679c;
             LocalExifThumbnailProducer localExifThumbnailProducer = LocalExifThumbnailProducer.this;
-            ContentResolver contentResolver = localExifThumbnailProducer.f2680c;
+            ContentResolver contentResolver = localExifThumbnailProducer.f2678c;
             e eVar = null;
             Cursor cursor = null;
             r8 = null;
@@ -133,7 +133,7 @@ public class LocalExifThumbnailProducer implements j1<e> {
             if (z2) {
                 exifInterface = new ExifInterface(str);
             } else {
-                ContentResolver contentResolver2 = localExifThumbnailProducer.f2680c;
+                ContentResolver contentResolver2 = localExifThumbnailProducer.f2678c;
                 if (c.f.d.l.b.c(uri)) {
                     try {
                         assetFileDescriptor = contentResolver2.openAssetFileDescriptor(uri, "r");
@@ -215,7 +215,7 @@ public class LocalExifThumbnailProducer implements j1<e> {
     public LocalExifThumbnailProducer(Executor executor, g gVar, ContentResolver contentResolver) {
         this.a = executor;
         this.b = gVar;
-        this.f2680c = contentResolver;
+        this.f2678c = contentResolver;
     }
 
     @Override // c.f.j.p.j1
diff --git a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
index 907f5b51dc..0675749e67 100644
--- a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
+++ b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
@@ -17,7 +17,7 @@ public class ImageRequest {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Uri f2681c;
+    public final Uri f2679c;
     public final int d;
     public File e;
     public final boolean f;
@@ -34,7 +34,7 @@ public class ImageRequest {
     public final c.f.j.q.b q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final c.f.j.k.e f2682r;
+    public final c.f.j.k.e f2680r;
     public final int s;
 
     public static class a implements d<ImageRequest, Uri> {
@@ -69,7 +69,7 @@ public class ImageRequest {
     public ImageRequest(ImageRequestBuilder imageRequestBuilder) {
         this.b = imageRequestBuilder.f;
         Uri uri = imageRequestBuilder.a;
-        this.f2681c = uri;
+        this.f2679c = uri;
         boolean z2 = true;
         int i = -1;
         if (uri != null) {
@@ -106,7 +106,7 @@ public class ImageRequest {
         this.f = imageRequestBuilder.g;
         this.g = imageRequestBuilder.h;
         this.h = imageRequestBuilder.e;
-        this.i = imageRequestBuilder.f2683c;
+        this.i = imageRequestBuilder.f2681c;
         f fVar = imageRequestBuilder.d;
         this.j = fVar == null ? f.a : fVar;
         this.k = imageRequestBuilder.o;
@@ -116,13 +116,13 @@ public class ImageRequest {
         this.o = imageRequestBuilder.l;
         this.p = imageRequestBuilder.m;
         this.q = imageRequestBuilder.j;
-        this.f2682r = imageRequestBuilder.n;
+        this.f2680r = imageRequestBuilder.n;
         this.s = imageRequestBuilder.p;
     }
 
     public synchronized File a() {
         if (this.e == null) {
-            this.e = new File(this.f2681c.getPath());
+            this.e = new File(this.f2679c.getPath());
         }
         return this.e;
     }
@@ -132,7 +132,7 @@ public class ImageRequest {
             return false;
         }
         ImageRequest imageRequest = (ImageRequest) obj;
-        if (this.g != imageRequest.g || this.n != imageRequest.n || this.o != imageRequest.o || !c.c.a.a0.d.i0(this.f2681c, imageRequest.f2681c) || !c.c.a.a0.d.i0(this.b, imageRequest.b) || !c.c.a.a0.d.i0(this.e, imageRequest.e) || !c.c.a.a0.d.i0(this.k, imageRequest.k) || !c.c.a.a0.d.i0(this.h, imageRequest.h) || !c.c.a.a0.d.i0(this.i, imageRequest.i) || !c.c.a.a0.d.i0(this.l, imageRequest.l) || !c.c.a.a0.d.i0(this.m, imageRequest.m) || !c.c.a.a0.d.i0(this.p, imageRequest.p)) {
+        if (this.g != imageRequest.g || this.n != imageRequest.n || this.o != imageRequest.o || !c.c.a.a0.d.i0(this.f2679c, imageRequest.f2679c) || !c.c.a.a0.d.i0(this.b, imageRequest.b) || !c.c.a.a0.d.i0(this.e, imageRequest.e) || !c.c.a.a0.d.i0(this.k, imageRequest.k) || !c.c.a.a0.d.i0(this.h, imageRequest.h) || !c.c.a.a0.d.i0(this.i, imageRequest.i) || !c.c.a.a0.d.i0(this.l, imageRequest.l) || !c.c.a.a0.d.i0(this.m, imageRequest.m) || !c.c.a.a0.d.i0(this.p, imageRequest.p)) {
             return false;
         }
         CacheKey cacheKey = null;
@@ -150,12 +150,12 @@ public class ImageRequest {
 
     public int hashCode() {
         c.f.j.q.b bVar = this.q;
-        return Arrays.hashCode(new Object[]{this.b, this.f2681c, Boolean.valueOf(this.g), this.k, this.l, this.m, Boolean.valueOf(this.n), Boolean.valueOf(this.o), this.h, this.p, this.i, this.j, bVar != null ? bVar.getPostprocessorCacheKey() : null, null, Integer.valueOf(this.s)});
+        return Arrays.hashCode(new Object[]{this.b, this.f2679c, Boolean.valueOf(this.g), this.k, this.l, this.m, Boolean.valueOf(this.n), Boolean.valueOf(this.o), this.h, this.p, this.i, this.j, bVar != null ? bVar.getPostprocessorCacheKey() : null, null, Integer.valueOf(this.s)});
     }
 
     public String toString() {
         i g2 = c.c.a.a0.d.g2(this);
-        g2.c(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI, this.f2681c);
+        g2.c(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI, this.f2679c);
         g2.c("cacheChoice", this.b);
         g2.c("decodeOptions", this.h);
         g2.c("postprocessor", this.q);
diff --git a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
index 987c086e0b..1b744d38c4 100644
--- a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
@@ -14,7 +14,7 @@ public class ImageRequestBuilder {
     public ImageRequest.c b = ImageRequest.c.FULL_FETCH;
 
     /* renamed from: c  reason: collision with root package name */
-    public e f2683c = null;
+    public e f2681c = null;
     public f d = null;
     public b e = b.a;
     public ImageRequest.b f = ImageRequest.b.DEFAULT;
diff --git a/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java b/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java
index f0cb84b810..6b37b681b2 100644
--- a/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java
+++ b/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java
@@ -34,7 +34,7 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy> imple
     public final ControllerListener q = new a();
 
     /* renamed from: r  reason: collision with root package name */
-    public final e.a f2684r;
+    public final e.a f2682r;
     public final d s;
 
     public class a extends c<Object> {
@@ -73,7 +73,7 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy> imple
     public ZoomableDraweeView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         b bVar = new b();
-        this.f2684r = bVar;
+        this.f2682r = bVar;
         d dVar = new d();
         this.s = dVar;
         c.f.g.f.a aVar = new c.f.g.f.a(context.getResources());
@@ -244,6 +244,6 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy> imple
         Objects.requireNonNull(eVar);
         ((c.f.l.b.c) this.n).b = null;
         this.n = eVar;
-        ((c.f.l.b.c) eVar).b = this.f2684r;
+        ((c.f.l.b.c) eVar).b = this.f2682r;
     }
 }
diff --git a/app/src/main/java/com/facebook/soloader/SoLoader.java b/app/src/main/java/com/facebook/soloader/SoLoader.java
index b5bf6592c2..5ad083c57a 100644
--- a/app/src/main/java/com/facebook/soloader/SoLoader.java
+++ b/app/src/main/java/com/facebook/soloader/SoLoader.java
@@ -38,7 +38,7 @@ public class SoLoader {
     public static k b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ReentrantReadWriteLock f2685c = new ReentrantReadWriteLock();
+    public static final ReentrantReadWriteLock f2683c = new ReentrantReadWriteLock();
     public static l[] d = null;
     public static volatile int e = 0;
     public static m[] f;
@@ -77,14 +77,14 @@ public class SoLoader {
         public final /* synthetic */ String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ String f2686c;
+        public final /* synthetic */ String f2684c;
         public final /* synthetic */ Runtime d;
         public final /* synthetic */ Method e;
 
         public a(boolean z2, String str, String str2, Runtime runtime, Method method) {
             this.a = z2;
             this.b = str;
-            this.f2686c = str2;
+            this.f2684c = str2;
             this.d = runtime;
             this.e = method;
         }
@@ -152,7 +152,7 @@ public class SoLoader {
             Throwable e;
             Throwable th2;
             if (this.a) {
-                String str2 = (i & 4) == 4 ? this.b : this.f2686c;
+                String str2 = (i & 4) == 4 ? this.b : this.f2684c;
                 String str3 = null;
                 try {
                     synchronized (this.d) {
@@ -240,7 +240,7 @@ public class SoLoader {
         Throwable th;
         int i3;
         String message;
-        ReentrantReadWriteLock reentrantReadWriteLock2 = f2685c;
+        ReentrantReadWriteLock reentrantReadWriteLock2 = f2683c;
         reentrantReadWriteLock2.readLock().lock();
         try {
             if (d != null) {
@@ -291,7 +291,7 @@ public class SoLoader {
                                     }
                                 }
                             } catch (Throwable th2) {
-                                f2685c.readLock().unlock();
+                                f2683c.readLock().unlock();
                                 throw th2;
                             }
                         }
@@ -319,7 +319,7 @@ public class SoLoader {
                                 S.append(d2.getAbsolutePath());
                                 S.append("\n");
                             }
-                            f2685c.readLock().unlock();
+                            f2683c.readLock().unlock();
                             S.append(" result: ");
                             S.append(i3);
                             String sb = S.toString();
@@ -377,7 +377,7 @@ public class SoLoader {
                 throw new UnsatisfiedLinkError("couldn't find DSO to load: " + str);
             }
         } finally {
-            f2685c.readLock().unlock();
+            f2683c.readLock().unlock();
         }
     }
 
@@ -437,7 +437,7 @@ public class SoLoader {
         boolean z2;
         String str = "init exiting";
         String str2 = "SoLoader";
-        f2685c.writeLock().lock();
+        f2683c.writeLock().lock();
         try {
             if (d == null) {
                 Log.d("SoLoader", "init start");
@@ -509,7 +509,7 @@ public class SoLoader {
                     }
                 }
                 l[] lVarArr = (l[]) arrayList.toArray(new l[arrayList.size()]);
-                ReentrantReadWriteLock reentrantReadWriteLock = f2685c;
+                ReentrantReadWriteLock reentrantReadWriteLock = f2683c;
                 reentrantReadWriteLock.writeLock().lock();
                 try {
                     if ((k & 2) != 0) {
@@ -530,13 +530,13 @@ public class SoLoader {
                     e++;
                     Log.d("SoLoader", "init finish: " + d.length + " SO sources prepared");
                 } catch (Throwable th) {
-                    f2685c.writeLock().unlock();
+                    f2683c.writeLock().unlock();
                     throw th;
                 }
             }
         } finally {
             Log.d(str2, str);
-            f2685c.writeLock().unlock();
+            f2683c.writeLock().unlock();
         }
     }
 
diff --git a/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java b/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java
index 8af73f1d20..29a8ea597f 100644
--- a/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java
+++ b/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java
@@ -13,18 +13,18 @@ public class PersistentCookieJar implements ClearableCookieJar {
     public CookieCache b;
 
     /* renamed from: c  reason: collision with root package name */
-    public CookiePersistor f2687c;
+    public CookiePersistor f2685c;
 
     public PersistentCookieJar(CookieCache cookieCache, CookiePersistor cookiePersistor) {
         this.b = cookieCache;
-        this.f2687c = cookiePersistor;
+        this.f2685c = cookiePersistor;
         ((SetCookieCache) cookieCache).addAll(((SharedPrefsCookiePersistor) cookiePersistor).c());
     }
 
     @Override // e0.p
     public synchronized void a(w wVar, List<n> list) {
         this.b.addAll(list);
-        CookiePersistor cookiePersistor = this.f2687c;
+        CookiePersistor cookiePersistor = this.f2685c;
         ArrayList arrayList = new ArrayList();
         for (n nVar : list) {
             if (nVar.m) {
@@ -49,7 +49,7 @@ public class PersistentCookieJar implements ClearableCookieJar {
                 arrayList.add(next);
             }
         }
-        this.f2687c.removeAll(arrayList2);
+        this.f2685c.removeAll(arrayList2);
         return arrayList;
     }
 }
diff --git a/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java b/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
index e750fcfdf4..7d3505325a 100644
--- a/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
+++ b/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
@@ -29,23 +29,23 @@ public class RealtimeBlurView extends View {
     public Bitmap q;
 
     /* renamed from: r  reason: collision with root package name */
-    public Bitmap f2688r;
+    public Bitmap f2686r;
     public Canvas s;
     public boolean t;
     public Paint u;
     public final Rect v = new Rect();
 
     /* renamed from: w  reason: collision with root package name */
-    public final Rect f2689w = new Rect();
+    public final Rect f2687w = new Rect();
 
     /* renamed from: x  reason: collision with root package name */
-    public View f2690x;
+    public View f2688x;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f2691y;
+    public boolean f2689y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final ViewTreeObserver.OnPreDrawListener f2692z = new a();
+    public final ViewTreeObserver.OnPreDrawListener f2690z = new a();
 
     public class a implements ViewTreeObserver.OnPreDrawListener {
         public a() {
@@ -59,8 +59,8 @@ public class RealtimeBlurView extends View {
             Bitmap bitmap;
             int[] iArr = new int[2];
             RealtimeBlurView realtimeBlurView2 = RealtimeBlurView.this;
-            Bitmap bitmap2 = realtimeBlurView2.f2688r;
-            View view = realtimeBlurView2.f2690x;
+            Bitmap bitmap2 = realtimeBlurView2.f2686r;
+            View view = realtimeBlurView2.f2688x;
             if (view != null && realtimeBlurView2.isShown()) {
                 RealtimeBlurView realtimeBlurView3 = RealtimeBlurView.this;
                 float f = realtimeBlurView3.n;
@@ -78,7 +78,7 @@ public class RealtimeBlurView extends View {
                     int max = Math.max(1, (int) (((float) width) / f2));
                     int max2 = Math.max(1, (int) (((float) height) / f2));
                     boolean z3 = realtimeBlurView3.p;
-                    if (realtimeBlurView3.s == null || (bitmap = realtimeBlurView3.f2688r) == null || bitmap.getWidth() != max || realtimeBlurView3.f2688r.getHeight() != max2) {
+                    if (realtimeBlurView3.s == null || (bitmap = realtimeBlurView3.f2686r) == null || bitmap.getWidth() != max || realtimeBlurView3.f2686r.getHeight() != max2) {
                         realtimeBlurView3.c();
                         try {
                             Bitmap createBitmap = Bitmap.createBitmap(max, max2, Bitmap.Config.ARGB_8888);
@@ -86,7 +86,7 @@ public class RealtimeBlurView extends View {
                             if (createBitmap != null) {
                                 realtimeBlurView3.s = new Canvas(realtimeBlurView3.q);
                                 Bitmap createBitmap2 = Bitmap.createBitmap(max, max2, Bitmap.Config.ARGB_8888);
-                                realtimeBlurView3.f2688r = createBitmap2;
+                                realtimeBlurView3.f2686r = createBitmap2;
                                 if (createBitmap2 != null) {
                                     z3 = true;
                                 }
@@ -102,7 +102,7 @@ public class RealtimeBlurView extends View {
                     }
                     z2 = true;
                     if (z2) {
-                        boolean z4 = RealtimeBlurView.this.f2688r != bitmap2;
+                        boolean z4 = RealtimeBlurView.this.f2686r != bitmap2;
                         view.getLocationOnScreen(iArr);
                         RealtimeBlurView.this.getLocationOnScreen(iArr);
                         int i = (-iArr[0]) + iArr[0];
@@ -135,8 +135,8 @@ public class RealtimeBlurView extends View {
                         }
                         realtimeBlurView.s.restoreToCount(save);
                         RealtimeBlurView realtimeBlurView6 = RealtimeBlurView.this;
-                        realtimeBlurView6.o.a(realtimeBlurView6.q, realtimeBlurView6.f2688r);
-                        if (z4 || RealtimeBlurView.this.f2691y) {
+                        realtimeBlurView6.o.a(realtimeBlurView6.q, realtimeBlurView6.f2686r);
+                        if (z4 || RealtimeBlurView.this.f2689y) {
                             RealtimeBlurView.this.invalidate();
                         }
                     }
@@ -181,10 +181,10 @@ public class RealtimeBlurView extends View {
             bitmap.recycle();
             this.q = null;
         }
-        Bitmap bitmap2 = this.f2688r;
+        Bitmap bitmap2 = this.f2686r;
         if (bitmap2 != null) {
             bitmap2.recycle();
-            this.f2688r = null;
+            this.f2686r = null;
         }
     }
 
@@ -255,28 +255,28 @@ public class RealtimeBlurView extends View {
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
         View activityDecorView = getActivityDecorView();
-        this.f2690x = activityDecorView;
+        this.f2688x = activityDecorView;
         boolean z2 = false;
         if (activityDecorView != null) {
-            activityDecorView.getViewTreeObserver().addOnPreDrawListener(this.f2692z);
-            if (this.f2690x.getRootView() != getRootView()) {
+            activityDecorView.getViewTreeObserver().addOnPreDrawListener(this.f2690z);
+            if (this.f2688x.getRootView() != getRootView()) {
                 z2 = true;
             }
-            this.f2691y = z2;
+            this.f2689y = z2;
             if (z2) {
-                this.f2690x.postInvalidate();
+                this.f2688x.postInvalidate();
                 return;
             }
             return;
         }
-        this.f2691y = false;
+        this.f2689y = false;
     }
 
     @Override // android.view.View
     public void onDetachedFromWindow() {
-        View view = this.f2690x;
+        View view = this.f2688x;
         if (view != null) {
-            view.getViewTreeObserver().removeOnPreDrawListener(this.f2692z);
+            view.getViewTreeObserver().removeOnPreDrawListener(this.f2690z);
         }
         b();
         super.onDetachedFromWindow();
@@ -285,17 +285,17 @@ public class RealtimeBlurView extends View {
     @Override // android.view.View
     public void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        Bitmap bitmap = this.f2688r;
+        Bitmap bitmap = this.f2686r;
         int i2 = this.m;
         if (bitmap != null) {
             this.v.right = bitmap.getWidth();
             this.v.bottom = bitmap.getHeight();
-            this.f2689w.right = getWidth();
-            this.f2689w.bottom = getHeight();
-            canvas.drawBitmap(bitmap, this.v, this.f2689w, (Paint) null);
+            this.f2687w.right = getWidth();
+            this.f2687w.bottom = getHeight();
+            canvas.drawBitmap(bitmap, this.v, this.f2687w, (Paint) null);
         }
         this.u.setColor(i2);
-        canvas.drawRect(this.f2689w, this.u);
+        canvas.drawRect(this.f2687w, this.u);
     }
 
     public void setBlurRadius(float f) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/Format.java b/app/src/main/java/com/google/android/exoplayer2/Format.java
index d7cd7f1103..297463c6d7 100644
--- a/app/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/app/src/main/java/com/google/android/exoplayer2/Format.java
@@ -50,7 +50,7 @@ public final class Format implements Parcelable {
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public final Metadata f2693r;
+    public final Metadata f2691r;
     @Nullable
     public final String s;
     @Nullable
@@ -60,16 +60,16 @@ public final class Format implements Parcelable {
     @Nullable
 
     /* renamed from: w  reason: collision with root package name */
-    public final DrmInitData f2694w;
+    public final DrmInitData f2692w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final long f2695x;
+    public final long f2693x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2696y;
+    public final int f2694y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final int f2697z;
+    public final int f2695z;
 
     public class a implements Parcelable.Creator<Format> {
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -98,7 +98,7 @@ public final class Format implements Parcelable {
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public String f2698c;
+        public String f2696c;
         public int d;
         public int e;
         public int f;
@@ -121,7 +121,7 @@ public final class Format implements Parcelable {
         public int q;
 
         /* renamed from: r  reason: collision with root package name */
-        public float f2699r;
+        public float f2697r;
         public int s;
         public float t;
         @Nullable
@@ -130,16 +130,16 @@ public final class Format implements Parcelable {
         @Nullable
 
         /* renamed from: w  reason: collision with root package name */
-        public ColorInfo f2700w;
+        public ColorInfo f2698w;
 
         /* renamed from: x  reason: collision with root package name */
-        public int f2701x;
+        public int f2699x;
 
         /* renamed from: y  reason: collision with root package name */
-        public int f2702y;
+        public int f2700y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f2703z;
+        public int f2701z;
 
         public b() {
             this.f = -1;
@@ -148,42 +148,42 @@ public final class Format implements Parcelable {
             this.o = RecyclerView.FOREVER_NS;
             this.p = -1;
             this.q = -1;
-            this.f2699r = -1.0f;
+            this.f2697r = -1.0f;
             this.t = 1.0f;
             this.v = -1;
-            this.f2701x = -1;
-            this.f2702y = -1;
-            this.f2703z = -1;
+            this.f2699x = -1;
+            this.f2700y = -1;
+            this.f2701z = -1;
             this.C = -1;
         }
 
         public b(Format format, a aVar) {
             this.a = format.i;
             this.b = format.j;
-            this.f2698c = format.k;
+            this.f2696c = format.k;
             this.d = format.l;
             this.e = format.m;
             this.f = format.n;
             this.g = format.o;
             this.h = format.q;
-            this.i = format.f2693r;
+            this.i = format.f2691r;
             this.j = format.s;
             this.k = format.t;
             this.l = format.u;
             this.m = format.v;
-            this.n = format.f2694w;
-            this.o = format.f2695x;
-            this.p = format.f2696y;
-            this.q = format.f2697z;
-            this.f2699r = format.A;
+            this.n = format.f2692w;
+            this.o = format.f2693x;
+            this.p = format.f2694y;
+            this.q = format.f2695z;
+            this.f2697r = format.A;
             this.s = format.B;
             this.t = format.C;
             this.u = format.D;
             this.v = format.E;
-            this.f2700w = format.F;
-            this.f2701x = format.G;
-            this.f2702y = format.H;
-            this.f2703z = format.I;
+            this.f2698w = format.F;
+            this.f2699x = format.G;
+            this.f2700y = format.H;
+            this.f2701z = format.I;
             this.A = format.J;
             this.B = format.K;
             this.C = format.L;
@@ -212,7 +212,7 @@ public final class Format implements Parcelable {
         this.o = readInt2;
         this.p = readInt2 != -1 ? readInt2 : readInt;
         this.q = parcel.readString();
-        this.f2693r = (Metadata) parcel.readParcelable(Metadata.class.getClassLoader());
+        this.f2691r = (Metadata) parcel.readParcelable(Metadata.class.getClassLoader());
         this.s = parcel.readString();
         this.t = parcel.readString();
         this.u = parcel.readInt();
@@ -226,10 +226,10 @@ public final class Format implements Parcelable {
             list.add(createByteArray);
         }
         DrmInitData drmInitData = (DrmInitData) parcel.readParcelable(DrmInitData.class.getClassLoader());
-        this.f2694w = drmInitData;
-        this.f2695x = parcel.readLong();
-        this.f2696y = parcel.readInt();
-        this.f2697z = parcel.readInt();
+        this.f2692w = drmInitData;
+        this.f2693x = parcel.readLong();
+        this.f2694y = parcel.readInt();
+        this.f2695z = parcel.readInt();
         this.A = parcel.readFloat();
         this.B = parcel.readInt();
         this.C = parcel.readFloat();
@@ -250,7 +250,7 @@ public final class Format implements Parcelable {
     public Format(b bVar, a aVar) {
         this.i = bVar.a;
         this.j = bVar.b;
-        this.k = f0.B(bVar.f2698c);
+        this.k = f0.B(bVar.f2696c);
         this.l = bVar.d;
         this.m = bVar.e;
         int i = bVar.f;
@@ -259,18 +259,18 @@ public final class Format implements Parcelable {
         this.o = i2;
         this.p = i2 != -1 ? i2 : i;
         this.q = bVar.h;
-        this.f2693r = bVar.i;
+        this.f2691r = bVar.i;
         this.s = bVar.j;
         this.t = bVar.k;
         this.u = bVar.l;
         List<byte[]> list = bVar.m;
         this.v = list == null ? Collections.emptyList() : list;
         DrmInitData drmInitData = bVar.n;
-        this.f2694w = drmInitData;
-        this.f2695x = bVar.o;
-        this.f2696y = bVar.p;
-        this.f2697z = bVar.q;
-        this.A = bVar.f2699r;
+        this.f2692w = drmInitData;
+        this.f2693x = bVar.o;
+        this.f2694y = bVar.p;
+        this.f2695z = bVar.q;
+        this.A = bVar.f2697r;
         int i3 = bVar.s;
         int i4 = 0;
         this.B = i3 == -1 ? 0 : i3;
@@ -278,10 +278,10 @@ public final class Format implements Parcelable {
         this.C = f == -1.0f ? 1.0f : f;
         this.D = bVar.u;
         this.E = bVar.v;
-        this.F = bVar.f2700w;
-        this.G = bVar.f2701x;
-        this.H = bVar.f2702y;
-        this.I = bVar.f2703z;
+        this.F = bVar.f2698w;
+        this.G = bVar.f2699x;
+        this.H = bVar.f2700y;
+        this.I = bVar.f2701z;
         int i5 = bVar.A;
         this.J = i5 == -1 ? 0 : i5;
         int i6 = bVar.B;
@@ -327,7 +327,7 @@ public final class Format implements Parcelable {
         }
         Format format = (Format) obj;
         int i2 = this.N;
-        return (i2 == 0 || (i = format.N) == 0 || i2 == i) && this.l == format.l && this.m == format.m && this.n == format.n && this.o == format.o && this.u == format.u && this.f2695x == format.f2695x && this.f2696y == format.f2696y && this.f2697z == format.f2697z && this.B == format.B && this.E == format.E && this.G == format.G && this.H == format.H && this.I == format.I && this.J == format.J && this.K == format.K && this.L == format.L && Float.compare(this.A, format.A) == 0 && Float.compare(this.C, format.C) == 0 && f0.a(this.M, format.M) && f0.a(this.i, format.i) && f0.a(this.j, format.j) && f0.a(this.q, format.q) && f0.a(this.s, format.s) && f0.a(this.t, format.t) && f0.a(this.k, format.k) && Arrays.equals(this.D, format.D) && f0.a(this.f2693r, format.f2693r) && f0.a(this.F, format.F) && f0.a(this.f2694w, format.f2694w) && b(format);
+        return (i2 == 0 || (i = format.N) == 0 || i2 == i) && this.l == format.l && this.m == format.m && this.n == format.n && this.o == format.o && this.u == format.u && this.f2693x == format.f2693x && this.f2694y == format.f2694y && this.f2695z == format.f2695z && this.B == format.B && this.E == format.E && this.G == format.G && this.H == format.H && this.I == format.I && this.J == format.J && this.K == format.K && this.L == format.L && Float.compare(this.A, format.A) == 0 && Float.compare(this.C, format.C) == 0 && f0.a(this.M, format.M) && f0.a(this.i, format.i) && f0.a(this.j, format.j) && f0.a(this.q, format.q) && f0.a(this.s, format.s) && f0.a(this.t, format.t) && f0.a(this.k, format.k) && Arrays.equals(this.D, format.D) && f0.a(this.f2691r, format.f2691r) && f0.a(this.F, format.F) && f0.a(this.f2692w, format.f2692w) && b(format);
     }
 
     @Override // java.lang.Object
@@ -342,12 +342,12 @@ public final class Format implements Parcelable {
             int hashCode3 = (((((((((hashCode2 + (str3 == null ? 0 : str3.hashCode())) * 31) + this.l) * 31) + this.m) * 31) + this.n) * 31) + this.o) * 31;
             String str4 = this.q;
             int hashCode4 = (hashCode3 + (str4 == null ? 0 : str4.hashCode())) * 31;
-            Metadata metadata = this.f2693r;
+            Metadata metadata = this.f2691r;
             int hashCode5 = (hashCode4 + (metadata == null ? 0 : metadata.hashCode())) * 31;
             String str5 = this.s;
             int hashCode6 = (hashCode5 + (str5 == null ? 0 : str5.hashCode())) * 31;
             String str6 = this.t;
-            int floatToIntBits = (((((((((((((((Float.floatToIntBits(this.C) + ((((Float.floatToIntBits(this.A) + ((((((((((hashCode6 + (str6 == null ? 0 : str6.hashCode())) * 31) + this.u) * 31) + ((int) this.f2695x)) * 31) + this.f2696y) * 31) + this.f2697z) * 31)) * 31) + this.B) * 31)) * 31) + this.E) * 31) + this.G) * 31) + this.H) * 31) + this.I) * 31) + this.J) * 31) + this.K) * 31) + this.L) * 31;
+            int floatToIntBits = (((((((((((((((Float.floatToIntBits(this.C) + ((((Float.floatToIntBits(this.A) + ((((((((((hashCode6 + (str6 == null ? 0 : str6.hashCode())) * 31) + this.u) * 31) + ((int) this.f2693x)) * 31) + this.f2694y) * 31) + this.f2695z) * 31)) * 31) + this.B) * 31)) * 31) + this.E) * 31) + this.G) * 31) + this.H) * 31) + this.I) * 31) + this.J) * 31) + this.K) * 31) + this.L) * 31;
             Class<? extends w> cls = this.M;
             if (cls != null) {
                 i = cls.hashCode();
@@ -374,9 +374,9 @@ public final class Format implements Parcelable {
         O.append(", ");
         O.append(this.k);
         O.append(", [");
-        O.append(this.f2696y);
+        O.append(this.f2694y);
         O.append(", ");
-        O.append(this.f2697z);
+        O.append(this.f2695z);
         O.append(", ");
         O.append(this.A);
         O.append("], [");
@@ -396,7 +396,7 @@ public final class Format implements Parcelable {
         parcel.writeInt(this.o);
         parcel.writeString(this.q);
         int i2 = 0;
-        parcel.writeParcelable(this.f2693r, 0);
+        parcel.writeParcelable(this.f2691r, 0);
         parcel.writeString(this.s);
         parcel.writeString(this.t);
         parcel.writeInt(this.u);
@@ -405,10 +405,10 @@ public final class Format implements Parcelable {
         for (int i3 = 0; i3 < size; i3++) {
             parcel.writeByteArray(this.v.get(i3));
         }
-        parcel.writeParcelable(this.f2694w, 0);
-        parcel.writeLong(this.f2695x);
-        parcel.writeInt(this.f2696y);
-        parcel.writeInt(this.f2697z);
+        parcel.writeParcelable(this.f2692w, 0);
+        parcel.writeLong(this.f2693x);
+        parcel.writeInt(this.f2694y);
+        parcel.writeInt(this.f2695z);
         parcel.writeFloat(this.A);
         parcel.writeInt(this.B);
         parcel.writeFloat(this.C);
diff --git a/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
index 38e75a0810..dcb9f89c6a 100644
--- a/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
+++ b/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
@@ -17,13 +17,13 @@ public interface AudioProcessor {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2704c;
+        public final int f2702c;
         public final int d;
         public final int e;
 
         public a(int i, int i2, int i3) {
             this.b = i;
-            this.f2704c = i2;
+            this.f2702c = i2;
             this.d = i3;
             this.e = f0.z(i3) ? f0.s(i3, i2) : -1;
         }
@@ -32,7 +32,7 @@ public interface AudioProcessor {
             StringBuilder O = c.d.b.a.a.O("AudioFormat[sampleRate=");
             O.append(this.b);
             O.append(", channelCount=");
-            O.append(this.f2704c);
+            O.append(this.f2702c);
             O.append(", encoding=");
             return c.d.b.a.a.y(O, this.d, ']');
         }
diff --git a/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 21556b245a..473220d4e4 100644
--- a/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -82,7 +82,7 @@ public final class DefaultAudioSink implements AudioSink {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2705c;
+    public final boolean f2703c;
     public final v d;
     public final e0 e;
     public final AudioProcessor[] f;
@@ -101,7 +101,7 @@ public final class DefaultAudioSink implements AudioSink {
     public c q;
 
     /* renamed from: r  reason: collision with root package name */
-    public c f2706r;
+    public c f2704r;
     @Nullable
     public AudioTrack s;
     public n t;
@@ -110,17 +110,17 @@ public final class DefaultAudioSink implements AudioSink {
     public e v;
 
     /* renamed from: w  reason: collision with root package name */
-    public d1 f2707w;
+    public d1 f2705w;
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public ByteBuffer f2708x;
+    public ByteBuffer f2706x;
 
     /* renamed from: y  reason: collision with root package name */
-    public int f2709y;
+    public int f2707y;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f2710z;
+    public long f2708z;
 
     public static final class InvalidAudioTrackTimestampException extends RuntimeException {
     }
@@ -160,7 +160,7 @@ public final class DefaultAudioSink implements AudioSink {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2711c;
+        public final int f2709c;
         public final int d;
         public final int e;
         public final int f;
@@ -172,7 +172,7 @@ public final class DefaultAudioSink implements AudioSink {
             int i8;
             this.a = format;
             this.b = i;
-            this.f2711c = i2;
+            this.f2709c = i2;
             this.d = i3;
             this.e = i4;
             this.f = i5;
@@ -229,7 +229,7 @@ public final class DefaultAudioSink implements AudioSink {
                 AudioAttributes d = d(nVar, z2);
                 boolean z3 = true;
                 AudioTrack.Builder sessionId = new AudioTrack.Builder().setAudioAttributes(d).setAudioFormat(y2).setTransferMode(1).setBufferSizeInBytes(this.h).setSessionId(i);
-                if (this.f2711c != 1) {
+                if (this.f2709c != 1) {
                     z3 = false;
                 }
                 return sessionId.setOffloadedPlayback(z3).build();
@@ -297,7 +297,7 @@ public final class DefaultAudioSink implements AudioSink {
         }
 
         public boolean f() {
-            return this.f2711c == 1;
+            return this.f2709c == 1;
         }
     }
 
@@ -306,7 +306,7 @@ public final class DefaultAudioSink implements AudioSink {
         public final b0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final d0 f2712c;
+        public final d0 f2710c;
 
         public d(AudioProcessor... audioProcessorArr) {
             b0 b0Var = new b0();
@@ -315,14 +315,14 @@ public final class DefaultAudioSink implements AudioSink {
             this.a = audioProcessorArr2;
             System.arraycopy(audioProcessorArr, 0, audioProcessorArr2, 0, audioProcessorArr.length);
             this.b = b0Var;
-            this.f2712c = d0Var;
+            this.f2710c = d0Var;
             audioProcessorArr2[audioProcessorArr.length] = b0Var;
             audioProcessorArr2[audioProcessorArr.length + 1] = d0Var;
         }
 
         @Override // com.google.android.exoplayer2.audio.DefaultAudioSink.b
         public d1 a(d1 d1Var) {
-            d0 d0Var = this.f2712c;
+            d0 d0Var = this.f2710c;
             float f = d1Var.b;
             if (d0Var.f1055c != f) {
                 d0Var.f1055c = f;
@@ -338,7 +338,7 @@ public final class DefaultAudioSink implements AudioSink {
 
         @Override // com.google.android.exoplayer2.audio.DefaultAudioSink.b
         public long b(long j) {
-            d0 d0Var = this.f2712c;
+            d0 d0Var = this.f2710c;
             if (d0Var.o < Permission.VIEW_CHANNEL) {
                 return (long) (((double) d0Var.f1055c) * ((double) j));
             }
@@ -368,13 +368,13 @@ public final class DefaultAudioSink implements AudioSink {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2713c;
+        public final long f2711c;
         public final long d;
 
         public e(d1 d1Var, boolean z2, long j, long j2, a aVar) {
             this.a = d1Var;
             this.b = z2;
-            this.f2713c = j;
+            this.f2711c = j;
             this.d = j2;
         }
     }
@@ -448,8 +448,8 @@ public final class DefaultAudioSink implements AudioSink {
             R.append(j4);
             R.append(", ");
             DefaultAudioSink defaultAudioSink = DefaultAudioSink.this;
-            c cVar = defaultAudioSink.f2706r;
-            R.append(cVar.f2711c == 0 ? defaultAudioSink.f2710z / ((long) cVar.b) : defaultAudioSink.A);
+            c cVar = defaultAudioSink.f2704r;
+            R.append(cVar.f2709c == 0 ? defaultAudioSink.f2708z / ((long) cVar.b) : defaultAudioSink.A);
             R.append(", ");
             R.append(DefaultAudioSink.this.D());
             Log.w("DefaultAudioSink", R.toString());
@@ -465,8 +465,8 @@ public final class DefaultAudioSink implements AudioSink {
             R.append(j4);
             R.append(", ");
             DefaultAudioSink defaultAudioSink = DefaultAudioSink.this;
-            c cVar = defaultAudioSink.f2706r;
-            R.append(cVar.f2711c == 0 ? defaultAudioSink.f2710z / ((long) cVar.b) : defaultAudioSink.A);
+            c cVar = defaultAudioSink.f2704r;
+            R.append(cVar.f2709c == 0 ? defaultAudioSink.f2708z / ((long) cVar.b) : defaultAudioSink.A);
             R.append(", ");
             R.append(DefaultAudioSink.this.D());
             Log.w("DefaultAudioSink", R.toString());
@@ -514,7 +514,7 @@ public final class DefaultAudioSink implements AudioSink {
         this.a = oVar;
         this.b = bVar;
         int i = f0.a;
-        this.f2705c = i >= 21 && z2;
+        this.f2703c = i >= 21 && z2;
         this.k = i >= 23 && z3;
         this.l = i >= 29 && z4;
         this.h = new ConditionVariable(true);
@@ -534,7 +534,7 @@ public final class DefaultAudioSink implements AudioSink {
         this.V = new t(0, 0.0f);
         d1 d1Var = d1.a;
         this.v = new e(d1Var, false, 0, 0, null);
-        this.f2707w = d1Var;
+        this.f2705w = d1Var;
         this.P = -1;
         this.I = new AudioProcessor[0];
         this.J = new ByteBuffer[0];
@@ -659,8 +659,8 @@ public final class DefaultAudioSink implements AudioSink {
     }
 
     public final long D() {
-        c cVar = this.f2706r;
-        return cVar.f2711c == 0 ? this.B / ((long) cVar.d) : this.C;
+        c cVar = this.f2704r;
+        return cVar.f2709c == 0 ? this.B / ((long) cVar.d) : this.C;
     }
 
     public final void E() throws AudioSink.InitializationException {
@@ -668,7 +668,7 @@ public final class DefaultAudioSink implements AudioSink {
         Handler handler;
         this.h.block();
         try {
-            c cVar = this.f2706r;
+            c cVar = this.f2704r;
             Objects.requireNonNull(cVar);
             AudioTrack a2 = cVar.a(this.W, this.t, this.U);
             this.s = a2;
@@ -682,14 +682,14 @@ public final class DefaultAudioSink implements AudioSink {
                 Objects.requireNonNull(handler2);
                 audioTrack.registerStreamEventCallback(new j(handler2), hVar.b);
                 AudioTrack audioTrack2 = this.s;
-                Format format = this.f2706r.a;
+                Format format = this.f2704r.a;
                 audioTrack2.setOffloadDelayPadding(format.J, format.K);
             }
             this.U = this.s.getAudioSessionId();
             s sVar = this.i;
             AudioTrack audioTrack3 = this.s;
-            c cVar2 = this.f2706r;
-            sVar.e(audioTrack3, cVar2.f2711c == 2, cVar2.g, cVar2.d, cVar2.h);
+            c cVar2 = this.f2704r;
+            sVar.e(audioTrack3, cVar2.f2709c == 2, cVar2.g, cVar2.d, cVar2.h);
             N();
             int i = this.V.a;
             if (i != 0) {
@@ -698,7 +698,7 @@ public final class DefaultAudioSink implements AudioSink {
             }
             this.F = true;
         } catch (AudioSink.InitializationException e2) {
-            if (this.f2706r.f()) {
+            if (this.f2704r.f()) {
                 this.Y = true;
             }
             AudioSink.a aVar2 = this.p;
@@ -722,7 +722,7 @@ public final class DefaultAudioSink implements AudioSink {
             sVar.f1066x = SystemClock.elapsedRealtime() * 1000;
             sVar.A = D;
             this.s.stop();
-            this.f2709y = 0;
+            this.f2707y = 0;
         }
     }
 
@@ -761,7 +761,7 @@ public final class DefaultAudioSink implements AudioSink {
     }
 
     public final void K() {
-        this.f2710z = 0;
+        this.f2708z = 0;
         this.A = 0;
         this.B = 0;
         this.C = 0;
@@ -777,8 +777,8 @@ public final class DefaultAudioSink implements AudioSink {
         this.R = false;
         this.Q = false;
         this.P = -1;
-        this.f2708x = null;
-        this.f2709y = 0;
+        this.f2706x = null;
+        this.f2707y = 0;
         this.e.o = 0;
         x();
     }
@@ -811,7 +811,7 @@ public final class DefaultAudioSink implements AudioSink {
                 rVar.a();
             }
         }
-        this.f2707w = d1Var;
+        this.f2705w = d1Var;
     }
 
     public final void N() {
@@ -827,10 +827,10 @@ public final class DefaultAudioSink implements AudioSink {
     }
 
     public final boolean O() {
-        if (this.W || !"audio/raw".equals(this.f2706r.a.t)) {
+        if (this.W || !"audio/raw".equals(this.f2704r.a.t)) {
             return false;
         }
-        return !(this.f2705c && f0.y(this.f2706r.a.I));
+        return !(this.f2703c && f0.y(this.f2704r.a.I));
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:44:0x00e2, code lost:
@@ -878,10 +878,10 @@ public final class DefaultAudioSink implements AudioSink {
                         if ((i2 >= 24 && i == -6) || i == -32) {
                             z3 = true;
                         }
-                        if (z3 && this.f2706r.f()) {
+                        if (z3 && this.f2704r.f()) {
                             this.Y = true;
                         }
-                        AudioSink.WriteException writeException = new AudioSink.WriteException(i, this.f2706r.a, z3);
+                        AudioSink.WriteException writeException = new AudioSink.WriteException(i, this.f2704r.a, z3);
                         AudioSink.a aVar2 = this.p;
                         if (!(aVar2 == null || (handler = (aVar = y.this.Q0).a) == null)) {
                             handler.post(new c.i.a.c.v1.c(aVar, writeException));
@@ -907,7 +907,7 @@ public final class DefaultAudioSink implements AudioSink {
                             }
                         }
                     }
-                    int i3 = this.f2706r.f2711c;
+                    int i3 = this.f2704r.f2709c;
                     if (i3 == 0) {
                         this.B += (long) i;
                     }
@@ -931,31 +931,31 @@ public final class DefaultAudioSink implements AudioSink {
                     if (i2 >= 26) {
                         i = audioTrack.write(byteBuffer, remaining2, 1, j * 1000);
                     } else {
-                        if (this.f2708x == null) {
+                        if (this.f2706x == null) {
                             ByteBuffer allocate = ByteBuffer.allocate(16);
-                            this.f2708x = allocate;
+                            this.f2706x = allocate;
                             allocate.order(ByteOrder.BIG_ENDIAN);
-                            this.f2708x.putInt(1431633921);
+                            this.f2706x.putInt(1431633921);
                         }
-                        if (this.f2709y == 0) {
-                            this.f2708x.putInt(4, remaining2);
-                            this.f2708x.putLong(8, j * 1000);
-                            this.f2708x.position(0);
-                            this.f2709y = remaining2;
+                        if (this.f2707y == 0) {
+                            this.f2706x.putInt(4, remaining2);
+                            this.f2706x.putLong(8, j * 1000);
+                            this.f2706x.position(0);
+                            this.f2707y = remaining2;
                         }
-                        int remaining3 = this.f2708x.remaining();
+                        int remaining3 = this.f2706x.remaining();
                         if (remaining3 > 0) {
-                            int write = audioTrack.write(this.f2708x, remaining3, 1);
+                            int write = audioTrack.write(this.f2706x, remaining3, 1);
                             if (write < 0) {
-                                this.f2709y = 0;
+                                this.f2707y = 0;
                                 i = write;
                             }
                         }
                         i = audioTrack.write(byteBuffer, remaining2, 1);
                         if (i < 0) {
-                            this.f2709y = 0;
+                            this.f2707y = 0;
                         } else {
-                            this.f2709y -= i;
+                            this.f2707y -= i;
                         }
                     }
                 } else {
@@ -984,7 +984,7 @@ public final class DefaultAudioSink implements AudioSink {
 
     @Override // com.google.android.exoplayer2.audio.AudioSink
     public d1 c() {
-        return this.k ? this.f2707w : z();
+        return this.k ? this.f2705w : z();
     }
 
     public final void d(long j) {
@@ -992,8 +992,8 @@ public final class DefaultAudioSink implements AudioSink {
         Handler handler;
         d1 a2 = O() ? this.b.a(z()) : d1.a;
         boolean d2 = O() ? this.b.d(C()) : false;
-        this.j.add(new e(a2, d2, Math.max(0L, j), this.f2706r.c(D()), null));
-        AudioProcessor[] audioProcessorArr = this.f2706r.i;
+        this.j.add(new e(a2, d2, Math.max(0L, j), this.f2704r.c(D()), null));
+        AudioProcessor[] audioProcessorArr = this.f2704r.i;
         ArrayList arrayList = new ArrayList();
         for (AudioProcessor audioProcessor : audioProcessorArr) {
             if (audioProcessor.a()) {
@@ -1052,7 +1052,7 @@ public final class DefaultAudioSink implements AudioSink {
             }
             c cVar = this.q;
             if (cVar != null) {
-                this.f2706r = cVar;
+                this.f2704r = cVar;
                 this.q = null;
             }
             this.i.d();
@@ -1274,21 +1274,21 @@ public final class DefaultAudioSink implements AudioSink {
         sVar.C = nanoTime2;
         sVar.B = j;
         sVar.D = z4;
-        long min = Math.min(j, this.f2706r.c(D()));
+        long min = Math.min(j, this.f2704r.c(D()));
         while (!this.j.isEmpty() && min >= this.j.getFirst().d) {
             this.v = this.j.remove();
         }
         e eVar = this.v;
         long j9 = min - eVar.d;
         if (eVar.a.equals(d1.a)) {
-            j2 = this.v.f2713c + j9;
+            j2 = this.v.f2711c + j9;
         } else if (this.j.isEmpty()) {
-            j2 = this.b.b(j9) + this.v.f2713c;
+            j2 = this.b.b(j9) + this.v.f2711c;
         } else {
             e first = this.j.getFirst();
-            j2 = first.f2713c - f0.p(first.d - min, this.v.a.b);
+            j2 = first.f2711c - f0.p(first.d - min, this.v.a.b);
         }
-        return this.f2706r.c(this.b.c()) + j2;
+        return this.f2704r.c(this.b.c()) + j2;
     }
 
     @Override // com.google.android.exoplayer2.audio.AudioSink
@@ -1364,21 +1364,21 @@ public final class DefaultAudioSink implements AudioSink {
                 return false;
             }
             c cVar = this.q;
-            c cVar2 = this.f2706r;
+            c cVar2 = this.f2704r;
             Objects.requireNonNull(cVar);
-            if (!(cVar2.f2711c == cVar.f2711c && cVar2.g == cVar.g && cVar2.e == cVar.e && cVar2.f == cVar.f && cVar2.d == cVar.d)) {
+            if (!(cVar2.f2709c == cVar.f2709c && cVar2.g == cVar.g && cVar2.e == cVar.e && cVar2.f == cVar.f && cVar2.d == cVar.d)) {
                 I();
                 if (g()) {
                     return false;
                 }
                 flush();
             } else {
-                this.f2706r = this.q;
+                this.f2704r = this.q;
                 this.q = null;
                 if (G(this.s)) {
                     this.s.setOffloadEndOfStream();
                     AudioTrack audioTrack = this.s;
-                    Format format = this.f2706r.a;
+                    Format format = this.f2704r.a;
                     audioTrack.setOffloadDelayPadding(format.J, format.K);
                     this.Z = true;
                 }
@@ -1402,7 +1402,7 @@ public final class DefaultAudioSink implements AudioSink {
             this.E = false;
             this.F = false;
             if (this.k && f0.a >= 23) {
-                M(this.f2707w);
+                M(this.f2705w);
             }
             d(j);
             if (this.S) {
@@ -1428,8 +1428,8 @@ public final class DefaultAudioSink implements AudioSink {
                 if (!byteBuffer.hasRemaining()) {
                     return true;
                 }
-                c cVar3 = this.f2706r;
-                if (cVar3.f2711c != 0 && this.D == 0) {
+                c cVar3 = this.f2704r;
+                if (cVar3.f2709c != 0 && this.D == 0) {
                     int i6 = cVar3.g;
                     switch (i6) {
                         case 5:
@@ -1544,8 +1544,8 @@ public final class DefaultAudioSink implements AudioSink {
                     this.u = null;
                 }
                 long j2 = this.G;
-                c cVar4 = this.f2706r;
-                long j3 = ((((cVar4.f2711c == 0 ? this.f2710z / ((long) cVar4.b) : this.A) - this.e.o) * 1000000) / ((long) cVar4.a.H)) + j2;
+                c cVar4 = this.f2704r;
+                long j3 = ((((cVar4.f2709c == 0 ? this.f2708z / ((long) cVar4.b) : this.A) - this.e.o) * 1000000) / ((long) cVar4.a.H)) + j2;
                 if (!this.E && Math.abs(j3 - j) > 200000) {
                     StringBuilder R = c.d.b.a.a.R("Discontinuity detected [expected ", j3, ", got ");
                     R.append(j);
@@ -1566,8 +1566,8 @@ public final class DefaultAudioSink implements AudioSink {
                         y.this.X0 = true;
                     }
                 }
-                if (this.f2706r.f2711c == 0) {
-                    this.f2710z += (long) byteBuffer.remaining();
+                if (this.f2704r.f2709c == 0) {
+                    this.f2708z += (long) byteBuffer.remaining();
                 } else {
                     this.A += (long) (this.D * i);
                 }
@@ -1628,7 +1628,7 @@ public final class DefaultAudioSink implements AudioSink {
                 return 0;
             }
             int i = format.I;
-            return (i == 2 || (this.f2705c && i == 4)) ? 2 : 1;
+            return (i == 2 || (this.f2703c && i == 4)) ? 2 : 1;
         } else if (this.l && !this.Y && H(format, this.t)) {
             return 2;
         } else {
@@ -1655,7 +1655,7 @@ public final class DefaultAudioSink implements AudioSink {
             c.c.a.a0.d.k(f0.z(format.I));
             int s = f0.s(format.I, format.G);
             int i10 = format.I;
-            if (!this.f2705c || !f0.y(i10)) {
+            if (!this.f2703c || !f0.y(i10)) {
                 i9 = 0;
             }
             AudioProcessor[] audioProcessorArr2 = i9 != 0 ? this.g : this.f;
@@ -1686,10 +1686,10 @@ public final class DefaultAudioSink implements AudioSink {
             }
             int i14 = aVar.d;
             i4 = aVar.b;
-            i3 = f0.n(aVar.f2704c);
+            i3 = f0.n(aVar.f2702c);
             audioProcessorArr = audioProcessorArr2;
             i2 = i14;
-            i5 = f0.s(i14, aVar.f2704c);
+            i5 = f0.s(i14, aVar.f2702c);
             i6 = s;
             i7 = 0;
         } else {
@@ -1725,7 +1725,7 @@ public final class DefaultAudioSink implements AudioSink {
             if (F()) {
                 this.q = cVar;
             } else {
-                this.f2706r = cVar;
+                this.f2704r = cVar;
             }
         } else {
             throw new AudioSink.ConfigurationException("Invalid output channel config (mode=" + i7 + ") for: " + format, format);
diff --git a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index e0d0f2283b..47dc1779ca 100644
--- a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -54,7 +54,7 @@ public class DefaultDrmSession implements DrmSession {
     public final x b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2715c;
+    public final a f2713c;
     public final b d;
     public final int e;
     public final boolean f;
@@ -74,7 +74,7 @@ public class DefaultDrmSession implements DrmSession {
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public w f2716r;
+    public w f2714r;
     @Nullable
     public DrmSession.DrmSessionException s;
     @Nullable
@@ -85,7 +85,7 @@ public class DefaultDrmSession implements DrmSession {
     @Nullable
 
     /* renamed from: w  reason: collision with root package name */
-    public x.d f2717w;
+    public x.d f2715w;
 
     public static final class UnexpectedDrmSessionException extends IOException {
         public UnexpectedDrmSessionException(@Nullable Throwable th) {
@@ -178,14 +178,14 @@ public class DefaultDrmSession implements DrmSession {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2718c;
+        public final long f2716c;
         public final Object d;
         public int e;
 
         public d(long j, boolean z2, long j2, Object obj) {
             this.a = j;
             this.b = z2;
-            this.f2718c = j2;
+            this.f2716c = j2;
             this.d = obj;
         }
     }
@@ -204,18 +204,18 @@ public class DefaultDrmSession implements DrmSession {
             int i = message.what;
             if (i == 0) {
                 DefaultDrmSession defaultDrmSession = DefaultDrmSession.this;
-                if (obj != defaultDrmSession.f2717w) {
+                if (obj != defaultDrmSession.f2715w) {
                     return;
                 }
                 if (defaultDrmSession.n == 2 || defaultDrmSession.i()) {
-                    defaultDrmSession.f2717w = null;
+                    defaultDrmSession.f2715w = null;
                     if (obj2 instanceof Exception) {
-                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2715c).a((Exception) obj2);
+                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2713c).a((Exception) obj2);
                         return;
                     }
                     try {
                         defaultDrmSession.b.j((byte[]) obj2);
-                        DefaultDrmSessionManager.d dVar = (DefaultDrmSessionManager.d) defaultDrmSession.f2715c;
+                        DefaultDrmSessionManager.d dVar = (DefaultDrmSessionManager.d) defaultDrmSession.f2713c;
                         for (DefaultDrmSession defaultDrmSession2 : DefaultDrmSessionManager.this.n) {
                             if (defaultDrmSession2.l(false)) {
                                 defaultDrmSession2.h(true);
@@ -223,7 +223,7 @@ public class DefaultDrmSession implements DrmSession {
                         }
                         DefaultDrmSessionManager.this.n.clear();
                     } catch (Exception e) {
-                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2715c).a(e);
+                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2713c).a(e);
                     }
                 }
             } else if (i == 1) {
@@ -264,7 +264,7 @@ public class DefaultDrmSession implements DrmSession {
             Objects.requireNonNull(bArr);
         }
         this.l = uuid;
-        this.f2715c = aVar;
+        this.f2713c = aVar;
         this.d = bVar;
         this.b = xVar;
         this.e = i;
@@ -349,10 +349,10 @@ public class DefaultDrmSession implements DrmSession {
             this.q = null;
             this.p.quit();
             this.p = null;
-            this.f2716r = null;
+            this.f2714r = null;
             this.s = null;
             this.v = null;
-            this.f2717w = null;
+            this.f2715w = null;
             byte[] bArr = this.t;
             if (bArr != null) {
                 this.b.g(bArr);
@@ -399,8 +399,8 @@ public class DefaultDrmSession implements DrmSession {
         if (i3 == 0) {
             DefaultDrmSessionManager.this.m.remove(this);
             DefaultDrmSessionManager defaultDrmSessionManager2 = DefaultDrmSessionManager.this;
-            if (defaultDrmSessionManager2.f2720r == this) {
-                defaultDrmSessionManager2.f2720r = null;
+            if (defaultDrmSessionManager2.f2718r == this) {
+                defaultDrmSessionManager2.f2718r = null;
             }
             if (defaultDrmSessionManager2.s == this) {
                 defaultDrmSessionManager2.s = null;
@@ -432,7 +432,7 @@ public class DefaultDrmSession implements DrmSession {
     @Override // com.google.android.exoplayer2.drm.DrmSession
     @Nullable
     public final w e() {
-        return this.f2716r;
+        return this.f2714r;
     }
 
     @Override // com.google.android.exoplayer2.drm.DrmSession
@@ -549,7 +549,7 @@ public class DefaultDrmSession implements DrmSession {
 
     public final void k(Exception exc) {
         if (exc instanceof NotProvisionedException) {
-            ((DefaultDrmSessionManager.d) this.f2715c).b(this);
+            ((DefaultDrmSessionManager.d) this.f2713c).b(this);
         } else {
             j(exc);
         }
@@ -563,14 +563,14 @@ public class DefaultDrmSession implements DrmSession {
         try {
             byte[] e2 = this.b.e();
             this.t = e2;
-            this.f2716r = this.b.c(e2);
+            this.f2714r = this.b.c(e2);
             g(c.i.a.c.z1.k.a);
             this.n = 3;
             Objects.requireNonNull(this.t);
             return true;
         } catch (NotProvisionedException e3) {
             if (z2) {
-                ((DefaultDrmSessionManager.d) this.f2715c).b(this);
+                ((DefaultDrmSessionManager.d) this.f2713c).b(this);
                 return false;
             }
             j(e3);
@@ -596,7 +596,7 @@ public class DefaultDrmSession implements DrmSession {
 
     public void n() {
         x.d d2 = this.b.d();
-        this.f2717w = d2;
+        this.f2715w = d2;
         c cVar = this.q;
         int i = f0.a;
         Objects.requireNonNull(d2);
diff --git a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index 9ca6ed2532..458aa116b8 100644
--- a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -40,7 +40,7 @@ public class DefaultDrmSessionManager implements s {
     public final UUID b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final x.c f2719c;
+    public final x.c f2717c;
     public final b0 d;
     public final HashMap<String, String> e;
     public final boolean f;
@@ -59,7 +59,7 @@ public class DefaultDrmSessionManager implements s {
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public DefaultDrmSession f2720r;
+    public DefaultDrmSession f2718r;
     @Nullable
     public DefaultDrmSession s;
     @Nullable
@@ -69,11 +69,11 @@ public class DefaultDrmSessionManager implements s {
     @Nullable
 
     /* renamed from: w  reason: collision with root package name */
-    public byte[] f2721w;
+    public byte[] f2719w;
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public volatile c f2722x;
+    public volatile c f2720x;
 
     public static final class MissingSchemeDataException extends Exception {
         public MissingSchemeDataException(UUID uuid, a aVar) {
@@ -140,7 +140,7 @@ public class DefaultDrmSessionManager implements s {
         Objects.requireNonNull(uuid);
         c.c.a.a0.d.n(!h0.b.equals(uuid), "Use C.CLEARKEY_UUID instead");
         this.b = uuid;
-        this.f2719c = cVar;
+        this.f2717c = cVar;
         this.d = b0Var;
         this.e = hashMap;
         this.f = z2;
@@ -167,7 +167,7 @@ public class DefaultDrmSessionManager implements s {
         this.p = i + 1;
         if (i == 0) {
             c.c.a.a0.d.D(this.q == null);
-            x a2 = this.f2719c.a(this.b);
+            x a2 = this.f2717c.a(this.b);
             this.q = a2;
             a2.h(new b(null));
         }
@@ -185,10 +185,10 @@ public class DefaultDrmSessionManager implements s {
         } else {
             c.c.a.a0.d.D(looper2 == looper);
         }
-        if (this.f2722x == null) {
-            this.f2722x = new c(looper);
+        if (this.f2720x == null) {
+            this.f2720x = new c(looper);
         }
-        DrmInitData drmInitData = format.f2694w;
+        DrmInitData drmInitData = format.f2692w;
         DefaultDrmSession defaultDrmSession = null;
         if (drmInitData == null) {
             int g = c.i.a.c.i2.s.g(format.t);
@@ -212,18 +212,18 @@ public class DefaultDrmSessionManager implements s {
             if (i == -1 || c0.class.equals(xVar.a())) {
                 return null;
             }
-            DefaultDrmSession defaultDrmSession2 = this.f2720r;
+            DefaultDrmSession defaultDrmSession2 = this.f2718r;
             if (defaultDrmSession2 == null) {
                 c.i.b.b.a<Object> aVar2 = c.i.b.b.u.j;
                 DefaultDrmSession e2 = e(q0.k, true, null);
                 this.m.add(e2);
-                this.f2720r = e2;
+                this.f2718r = e2;
             } else {
                 defaultDrmSession2.a(null);
             }
-            return this.f2720r;
+            return this.f2718r;
         }
-        if (this.f2721w == null) {
+        if (this.f2719w == null) {
             list = f(drmInitData, this.b, false);
             if (((ArrayList) list).isEmpty()) {
                 MissingSchemeDataException missingSchemeDataException = new MissingSchemeDataException(this.b, null);
@@ -270,7 +270,7 @@ public class DefaultDrmSessionManager implements s {
         x xVar = this.q;
         Objects.requireNonNull(xVar);
         Class<? extends w> a2 = xVar.a();
-        DrmInitData drmInitData = format.f2694w;
+        DrmInitData drmInitData = format.f2692w;
         int i = 0;
         if (drmInitData == null) {
             int g = c.i.a.c.i2.s.g(format.t);
@@ -291,7 +291,7 @@ public class DefaultDrmSessionManager implements s {
             }
             return null;
         }
-        if (this.f2721w == null) {
+        if (this.f2719w == null) {
             if (((ArrayList) f(drmInitData, this.b, true)).isEmpty()) {
                 if (drmInitData.l == 1 && drmInitData.i[0].a(h0.b)) {
                     StringBuilder O = c.d.b.a.a.O("DrmInitData only contains common PSSH SchemeData. Assuming support for: ");
@@ -322,7 +322,7 @@ public class DefaultDrmSessionManager implements s {
         d dVar = this.i;
         e eVar = this.k;
         int i = this.v;
-        byte[] bArr = this.f2721w;
+        byte[] bArr = this.f2719w;
         HashMap<String, String> hashMap = this.e;
         b0 b0Var = this.d;
         Looper looper = this.t;
diff --git a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 616b8d3696..e97381b456 100644
--- a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -100,31 +100,31 @@ public abstract class MediaCodecRenderer extends g0 {
     public int Z;
 
     /* renamed from: a0  reason: collision with root package name */
-    public boolean f2723a0;
+    public boolean f2721a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public boolean f2724b0;
+    public boolean f2722b0;
 
     /* renamed from: c0  reason: collision with root package name */
-    public boolean f2725c0;
+    public boolean f2723c0;
 
     /* renamed from: d0  reason: collision with root package name */
-    public boolean f2726d0;
+    public boolean f2724d0;
 
     /* renamed from: e0  reason: collision with root package name */
-    public boolean f2727e0;
+    public boolean f2725e0;
 
     /* renamed from: f0  reason: collision with root package name */
-    public boolean f2728f0;
+    public boolean f2726f0;
 
     /* renamed from: g0  reason: collision with root package name */
-    public boolean f2729g0;
+    public boolean f2727g0;
 
     /* renamed from: h0  reason: collision with root package name */
-    public boolean f2730h0;
+    public boolean f2728h0;
 
     /* renamed from: i0  reason: collision with root package name */
-    public boolean f2731i0;
+    public boolean f2729i0;
     public boolean j0;
     @Nullable
     public q k0;
@@ -144,19 +144,19 @@ public abstract class MediaCodecRenderer extends g0 {
     public int v0;
 
     /* renamed from: w  reason: collision with root package name */
-    public final boolean f2732w;
+    public final boolean f2730w;
     public int w0;
 
     /* renamed from: x  reason: collision with root package name */
-    public final float f2733x;
+    public final float f2731x;
     public int x0;
 
     /* renamed from: y  reason: collision with root package name */
-    public final DecoderInputBuffer f2734y = new DecoderInputBuffer(0);
+    public final DecoderInputBuffer f2732y = new DecoderInputBuffer(0);
     public boolean y0;
 
     /* renamed from: z  reason: collision with root package name */
-    public final DecoderInputBuffer f2735z = new DecoderInputBuffer(0);
+    public final DecoderInputBuffer f2733z = new DecoderInputBuffer(0);
     public boolean z0;
 
     public static class DecoderInitializationException extends Exception {
@@ -193,8 +193,8 @@ public abstract class MediaCodecRenderer extends g0 {
         this.u = aVar;
         Objects.requireNonNull(tVar);
         this.v = tVar;
-        this.f2732w = z2;
-        this.f2733x = f;
+        this.f2730w = z2;
+        this.f2731x = f;
         p pVar = new p();
         this.B = pVar;
         this.C = new d0<>();
@@ -423,7 +423,7 @@ public abstract class MediaCodecRenderer extends g0 {
     public final boolean P() throws ExoPlaybackException {
         if (this.y0) {
             this.w0 = 1;
-            if (this.f2724b0 || this.f2726d0) {
+            if (this.f2722b0 || this.f2724d0) {
                 this.x0 = 3;
                 return false;
             }
@@ -441,7 +441,7 @@ public abstract class MediaCodecRenderer extends g0 {
         int i;
         boolean z5;
         if (!(this.n0 >= 0)) {
-            if (!this.f2727e0 || !this.z0) {
+            if (!this.f2725e0 || !this.z0) {
                 i = this.R.d(this.E);
             } else {
                 try {
@@ -459,9 +459,9 @@ public abstract class MediaCodecRenderer extends g0 {
                     this.A0 = true;
                     MediaFormat outputFormat = this.R.getOutputFormat();
                     if (this.Z != 0 && outputFormat.getInteger("width") == 32 && outputFormat.getInteger("height") == 32) {
-                        this.f2731i0 = true;
+                        this.f2729i0 = true;
                     } else {
-                        if (this.f2729g0) {
+                        if (this.f2727g0) {
                             outputFormat.setInteger("channel-count", 1);
                         }
                         this.T = outputFormat;
@@ -473,8 +473,8 @@ public abstract class MediaCodecRenderer extends g0 {
                     k0();
                 }
                 return false;
-            } else if (this.f2731i0) {
-                this.f2731i0 = false;
+            } else if (this.f2729i0) {
+                this.f2729i0 = false;
                 this.R.releaseOutputBuffer(i, false);
                 return true;
             } else {
@@ -489,7 +489,7 @@ public abstract class MediaCodecRenderer extends g0 {
                         MediaCodec.BufferInfo bufferInfo2 = this.E;
                         byteBuffer.limit(bufferInfo2.offset + bufferInfo2.size);
                     }
-                    if (this.f2728f0) {
+                    if (this.f2726f0) {
                         MediaCodec.BufferInfo bufferInfo3 = this.E;
                         if (bufferInfo3.presentationTimeUs == 0 && (bufferInfo3.flags & 4) != 0) {
                             long j3 = this.B0;
@@ -524,7 +524,7 @@ public abstract class MediaCodecRenderer extends g0 {
                 }
             }
         }
-        if (!this.f2727e0 || !this.z0) {
+        if (!this.f2725e0 || !this.z0) {
             z3 = true;
             z2 = false;
             r rVar = this.R;
@@ -577,8 +577,8 @@ public abstract class MediaCodecRenderer extends g0 {
             if (c2 < 0) {
                 return false;
             }
-            this.f2735z.k = this.R.g(c2);
-            this.f2735z.p();
+            this.f2733z.k = this.R.g(c2);
+            this.f2733z.p();
         }
         if (this.w0 == 1) {
             if (!this.j0) {
@@ -588,9 +588,9 @@ public abstract class MediaCodecRenderer extends g0 {
             }
             this.w0 = 2;
             return false;
-        } else if (this.f2730h0) {
-            this.f2730h0 = false;
-            ByteBuffer byteBuffer = this.f2735z.k;
+        } else if (this.f2728h0) {
+            this.f2728h0 = false;
+            ByteBuffer byteBuffer = this.f2733z.k;
             byte[] bArr = t;
             byteBuffer.put(bArr);
             this.R.queueInputBuffer(this.m0, 0, bArr.length, 0, 0);
@@ -600,13 +600,13 @@ public abstract class MediaCodecRenderer extends g0 {
         } else {
             if (this.v0 == 1) {
                 for (int i = 0; i < this.S.v.size(); i++) {
-                    this.f2735z.k.put(this.S.v.get(i));
+                    this.f2733z.k.put(this.S.v.get(i));
                 }
                 this.v0 = 2;
             }
-            int position = this.f2735z.k.position();
+            int position = this.f2733z.k.position();
             s0 A = A();
-            int I = I(A, this.f2735z, false);
+            int I = I(A, this.f2733z, false);
             if (i()) {
                 this.C0 = this.B0;
             }
@@ -615,14 +615,14 @@ public abstract class MediaCodecRenderer extends g0 {
             }
             if (I == -5) {
                 if (this.v0 == 2) {
-                    this.f2735z.p();
+                    this.f2733z.p();
                     this.v0 = 1;
                 }
                 f0(A);
                 return true;
-            } else if (this.f2735z.n()) {
+            } else if (this.f2733z.n()) {
                 if (this.v0 == 2) {
-                    this.f2735z.p();
+                    this.f2733z.p();
                     this.v0 = 1;
                 }
                 this.D0 = true;
@@ -640,10 +640,10 @@ public abstract class MediaCodecRenderer extends g0 {
                 } catch (MediaCodec.CryptoException e) {
                     throw z(e, this.I, false);
                 }
-            } else if (this.y0 || this.f2735z.o()) {
-                boolean t2 = this.f2735z.t();
+            } else if (this.y0 || this.f2733z.o()) {
+                boolean t2 = this.f2733z.t();
                 if (t2) {
-                    b bVar = this.f2735z.j;
+                    b bVar = this.f2733z.j;
                     Objects.requireNonNull(bVar);
                     if (position != 0) {
                         if (bVar.d == null) {
@@ -655,8 +655,8 @@ public abstract class MediaCodecRenderer extends g0 {
                         iArr2[0] = iArr2[0] + position;
                     }
                 }
-                if (this.f2723a0 && !t2) {
-                    ByteBuffer byteBuffer2 = this.f2735z.k;
+                if (this.f2721a0 && !t2) {
+                    ByteBuffer byteBuffer2 = this.f2733z.k;
                     byte[] bArr2 = u.a;
                     int position2 = byteBuffer2.position();
                     int i2 = 0;
@@ -685,12 +685,12 @@ public abstract class MediaCodecRenderer extends g0 {
                         }
                         i2 = i4;
                     }
-                    if (this.f2735z.k.position() == 0) {
+                    if (this.f2733z.k.position() == 0) {
                         return true;
                     }
-                    this.f2723a0 = false;
+                    this.f2721a0 = false;
                 }
-                DecoderInputBuffer decoderInputBuffer = this.f2735z;
+                DecoderInputBuffer decoderInputBuffer = this.f2733z;
                 long j = decoderInputBuffer.m;
                 q qVar = this.k0;
                 if (qVar != null) {
@@ -721,7 +721,7 @@ public abstract class MediaCodecRenderer extends g0 {
                         }
                     }
                 }
-                if (this.f2735z.m()) {
+                if (this.f2733z.m()) {
                     this.D.add(Long.valueOf(j));
                 }
                 if (this.F0) {
@@ -729,23 +729,23 @@ public abstract class MediaCodecRenderer extends g0 {
                     this.F0 = false;
                 }
                 if (this.k0 != null) {
-                    this.B0 = Math.max(this.B0, this.f2735z.m);
+                    this.B0 = Math.max(this.B0, this.f2733z.m);
                 } else {
                     this.B0 = Math.max(this.B0, j);
                 }
-                this.f2735z.s();
-                if (this.f2735z.l()) {
-                    Z(this.f2735z);
+                this.f2733z.s();
+                if (this.f2733z.l()) {
+                    Z(this.f2733z);
                 }
-                j0(this.f2735z);
+                j0(this.f2733z);
                 if (t2) {
                     try {
-                        this.R.a(this.m0, 0, this.f2735z.j, j, 0);
+                        this.R.a(this.m0, 0, this.f2733z.j, j, 0);
                     } catch (MediaCodec.CryptoException e2) {
                         throw z(e2, this.I, false);
                     }
                 } else {
-                    this.R.queueInputBuffer(this.m0, 0, this.f2735z.k.limit(), j, 0);
+                    this.R.queueInputBuffer(this.m0, 0, this.f2733z.k.limit(), j, 0);
                 }
                 r0();
                 this.y0 = true;
@@ -753,7 +753,7 @@ public abstract class MediaCodecRenderer extends g0 {
                 this.L0.f1075c++;
                 return true;
             } else {
-                this.f2735z.p();
+                this.f2733z.p();
                 if (this.v0 == 2) {
                     this.v0 = 1;
                 }
@@ -774,7 +774,7 @@ public abstract class MediaCodecRenderer extends g0 {
         if (this.R == null) {
             return false;
         }
-        if (this.x0 == 3 || this.f2724b0 || ((this.f2725c0 && !this.A0) || (this.f2726d0 && this.z0))) {
+        if (this.x0 == 3 || this.f2722b0 || ((this.f2723c0 && !this.A0) || (this.f2724d0 && this.z0))) {
             n0();
             return true;
         }
@@ -862,7 +862,7 @@ public abstract class MediaCodecRenderer extends g0 {
             Objects.requireNonNull(formatArr);
             f = W(f2, format, formatArr);
         }
-        float f3 = f <= this.f2733x ? -1.0f : f;
+        float f3 = f <= this.f2731x ? -1.0f : f;
         r rVar = null;
         try {
             long elapsedRealtime = SystemClock.elapsedRealtime();
@@ -892,9 +892,9 @@ public abstract class MediaCodecRenderer extends g0 {
                     if (str2.startsWith("SM-T585") || str2.startsWith("SM-A510") || str2.startsWith("SM-A520") || str2.startsWith("SM-J700")) {
                         i = 2;
                         this.Z = i;
-                        this.f2723a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
-                        this.f2724b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
-                        this.f2725c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
+                        this.f2721a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
+                        this.f2722b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
+                        this.f2723c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
                         if (i2 > 23 || !"OMX.google.vorbis.decoder".equals(str)) {
                             if (i2 <= 19) {
                                 String str3 = f0.b;
@@ -904,14 +904,14 @@ public abstract class MediaCodecRenderer extends g0 {
                                 }
                             }
                             z2 = false;
-                            this.f2726d0 = z2;
-                            this.f2727e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                            this.f2724d0 = z2;
+                            this.f2725e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                             if (i2 < 21 && "OMX.SEC.mp3.dec".equals(str) && "samsung".equals(f0.f964c)) {
                                 String str4 = f0.b;
                                 if (str4.startsWith("baffin") || str4.startsWith("grand") || str4.startsWith("fortuna") || str4.startsWith("gprimelte") || str4.startsWith("j2y18lte") || str4.startsWith("ms01")) {
                                     z3 = true;
-                                    this.f2728f0 = z3;
-                                    this.f2729g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                                    this.f2726f0 = z3;
+                                    this.f2727g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                                     String str5 = sVar.a;
                                     this.j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f964c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                                     if ("c2.android.mp3.decoder".equals(sVar.a)) {
@@ -925,8 +925,8 @@ public abstract class MediaCodecRenderer extends g0 {
                                 }
                             }
                             z3 = false;
-                            this.f2728f0 = z3;
-                            this.f2729g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                            this.f2726f0 = z3;
+                            this.f2727g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                             String str5 = sVar.a;
                             this.j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f964c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                             if ("c2.android.mp3.decoder".equals(sVar.a)) {
@@ -937,12 +937,12 @@ public abstract class MediaCodecRenderer extends g0 {
                             d0(str, elapsedRealtime2, elapsedRealtime2 - elapsedRealtime);
                         }
                         z2 = true;
-                        this.f2726d0 = z2;
-                        this.f2727e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                        this.f2724d0 = z2;
+                        this.f2725e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                         String str4 = f0.b;
                         z3 = true;
-                        this.f2728f0 = z3;
-                        this.f2729g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                        this.f2726f0 = z3;
+                        this.f2727g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                         String str5 = sVar.a;
                         this.j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f964c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                         if ("c2.android.mp3.decoder".equals(sVar.a)) {
@@ -958,18 +958,18 @@ public abstract class MediaCodecRenderer extends g0 {
                     if ("flounder".equals(str6) || "flounder_lte".equals(str6) || "grouper".equals(str6) || "tilapia".equals(str6)) {
                         i = 1;
                         this.Z = i;
-                        this.f2723a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
-                        this.f2724b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
-                        this.f2725c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
+                        this.f2721a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
+                        this.f2722b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
+                        this.f2723c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
                         if (i2 <= 19) {
                         }
                         z2 = false;
-                        this.f2726d0 = z2;
-                        this.f2727e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                        this.f2724d0 = z2;
+                        this.f2725e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                         String str4 = f0.b;
                         z3 = true;
-                        this.f2728f0 = z3;
-                        this.f2729g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                        this.f2726f0 = z3;
+                        this.f2727g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                         String str5 = sVar.a;
                         this.j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f964c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                         if ("c2.android.mp3.decoder".equals(sVar.a)) {
@@ -982,18 +982,18 @@ public abstract class MediaCodecRenderer extends g0 {
                 }
                 i = 0;
                 this.Z = i;
-                this.f2723a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
-                this.f2724b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
-                this.f2725c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
+                this.f2721a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
+                this.f2722b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
+                this.f2723c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
                 if (i2 <= 19) {
                 }
                 z2 = false;
-                this.f2726d0 = z2;
-                this.f2727e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                this.f2724d0 = z2;
+                this.f2725e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                 String str4 = f0.b;
                 z3 = true;
-                this.f2728f0 = z3;
-                this.f2729g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                this.f2726f0 = z3;
+                this.f2727g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                 String str5 = sVar.a;
                 this.j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f964c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                 if ("c2.android.mp3.decoder".equals(sVar.a)) {
@@ -1085,7 +1085,7 @@ public abstract class MediaCodecRenderer extends g0 {
                 List<s> U = U(z2);
                 ArrayDeque<s> arrayDeque = new ArrayDeque<>();
                 this.W = arrayDeque;
-                if (this.f2732w) {
+                if (this.f2730w) {
                     arrayDeque.addAll(U);
                 } else if (!U.isEmpty()) {
                     this.W.add(U.get(0));
@@ -1245,10 +1245,10 @@ public abstract class MediaCodecRenderer extends g0 {
                             this.u0 = true;
                             this.v0 = 1;
                             int i3 = this.Z;
-                            if (!(i3 == 2 || (i3 == 1 && format.f2696y == format2.f2696y && format.f2697z == format2.f2697z))) {
+                            if (!(i3 == 2 || (i3 == 1 && format.f2694y == format2.f2694y && format.f2695z == format2.f2695z))) {
                                 z4 = false;
                             }
-                            this.f2730h0 = z4;
+                            this.f2728h0 = z4;
                             this.S = format;
                             if (z5) {
                             }
@@ -1258,7 +1258,7 @@ public abstract class MediaCodecRenderer extends g0 {
                         if (!z5) {
                             if (this.y0) {
                                 this.w0 = 1;
-                                if (this.f2724b0 || this.f2726d0) {
+                                if (this.f2722b0 || this.f2724d0) {
                                     this.x0 = 3;
                                     z4 = false;
                                 } else {
@@ -1332,12 +1332,12 @@ public abstract class MediaCodecRenderer extends g0 {
 
     public final boolean m0(boolean z2) throws ExoPlaybackException {
         s0 A = A();
-        this.f2734y.p();
-        int I = I(A, this.f2734y, z2);
+        this.f2732y.p();
+        int I = I(A, this.f2732y, z2);
         if (I == -5) {
             f0(A);
             return true;
-        } else if (I != -4 || !this.f2734y.n()) {
+        } else if (I != -4 || !this.f2732y.n()) {
             return false;
         } else {
             this.D0 = true;
@@ -1408,8 +1408,8 @@ public abstract class MediaCodecRenderer extends g0 {
         this.l0 = -9223372036854775807L;
         this.z0 = false;
         this.y0 = false;
-        this.f2730h0 = false;
-        this.f2731i0 = false;
+        this.f2728h0 = false;
+        this.f2729i0 = false;
         this.p0 = false;
         this.q0 = false;
         this.D.clear();
@@ -1497,13 +1497,13 @@ public abstract class MediaCodecRenderer extends g0 {
         this.A0 = false;
         this.V = -1.0f;
         this.Z = 0;
-        this.f2723a0 = false;
-        this.f2724b0 = false;
-        this.f2725c0 = false;
-        this.f2726d0 = false;
-        this.f2727e0 = false;
-        this.f2728f0 = false;
-        this.f2729g0 = false;
+        this.f2721a0 = false;
+        this.f2722b0 = false;
+        this.f2723c0 = false;
+        this.f2724d0 = false;
+        this.f2725e0 = false;
+        this.f2726f0 = false;
+        this.f2727g0 = false;
         this.j0 = false;
         this.u0 = false;
         this.v0 = 0;
@@ -1512,7 +1512,7 @@ public abstract class MediaCodecRenderer extends g0 {
 
     public final void r0() {
         this.m0 = -1;
-        this.f2735z.k = null;
+        this.f2733z.k = null;
     }
 
     public final void s0(@Nullable DrmSession drmSession) {
@@ -1570,7 +1570,7 @@ public abstract class MediaCodecRenderer extends g0 {
         if (W == -1.0f) {
             O();
             return false;
-        } else if (f2 == -1.0f && W <= this.f2733x) {
+        } else if (f2 == -1.0f && W <= this.f2731x) {
             return true;
         } else {
             Bundle bundle = new Bundle();
diff --git a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 096969bf4c..60073458e3 100644
--- a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -28,7 +28,7 @@ public final class MediaCodecUtil {
     public static final HashMap<b, List<s>> b = new HashMap<>();
 
     /* renamed from: c  reason: collision with root package name */
-    public static int f2736c = -1;
+    public static int f2734c = -1;
 
     public static class DecoderQueryException extends Exception {
         public DecoderQueryException(Throwable th, a aVar) {
@@ -41,12 +41,12 @@ public final class MediaCodecUtil {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2737c;
+        public final boolean f2735c;
 
         public b(String str, boolean z2, boolean z3) {
             this.a = str;
             this.b = z2;
-            this.f2737c = z3;
+            this.f2735c = z3;
         }
 
         public boolean equals(@Nullable Object obj) {
@@ -57,13 +57,13 @@ public final class MediaCodecUtil {
                 return false;
             }
             b bVar = (b) obj;
-            return TextUtils.equals(this.a, bVar.a) && this.b == bVar.b && this.f2737c == bVar.f2737c;
+            return TextUtils.equals(this.a, bVar.a) && this.b == bVar.b && this.f2735c == bVar.f2735c;
         }
 
         public int hashCode() {
             int i = 1231;
             int m = (c.d.b.a.a.m(this.a, 31, 31) + (this.b ? 1231 : 1237)) * 31;
-            if (!this.f2737c) {
+            if (!this.f2735c) {
                 i = 1237;
             }
             return m + i;
@@ -1305,7 +1305,7 @@ public final class MediaCodecUtil {
                                 MediaCodecInfo.CodecCapabilities capabilitiesForType = a2.getCapabilitiesForType(b2);
                                 boolean b3 = cVar.b("tunneled-playback", b2, capabilitiesForType);
                                 boolean c2 = cVar.c("tunneled-playback", b2, capabilitiesForType);
-                                boolean z5 = bVar2.f2737c;
+                                boolean z5 = bVar2.f2735c;
                                 if (z5 || !c2) {
                                     if (!z5 || b3) {
                                         boolean b4 = cVar.b("secure-playback", b2, capabilitiesForType);
@@ -1490,7 +1490,7 @@ public final class MediaCodecUtil {
 
     public static int i() throws DecoderQueryException {
         int i;
-        if (f2736c == -1) {
+        if (f2734c == -1) {
             int i2 = 0;
             s d2 = d("video/avc", false, false);
             if (d2 != null) {
@@ -1545,9 +1545,9 @@ public final class MediaCodecUtil {
                 }
                 i2 = Math.max(i3, f0.a >= 21 ? 345600 : 172800);
             }
-            f2736c = i2;
+            f2734c = i2;
         }
-        return f2736c;
+        return f2734c;
     }
 
     public static <T> void j(List<T> list, f<T> fVar) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
index 13f604c522..67ef3f4762 100644
--- a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
+++ b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
@@ -18,7 +18,7 @@ public final class SpliceInsertCommand extends SpliceCommand {
     public final boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final long f2738r;
+    public final long f2736r;
     public final int s;
     public final int t;
     public final int u;
@@ -42,18 +42,18 @@ public final class SpliceInsertCommand extends SpliceCommand {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2739c;
+        public final long f2737c;
 
         public b(int i, long j, long j2) {
             this.a = i;
             this.b = j;
-            this.f2739c = j2;
+            this.f2737c = j2;
         }
 
         public b(int i, long j, long j2, a aVar) {
             this.a = i;
             this.b = j;
-            this.f2739c = j2;
+            this.f2737c = j2;
         }
     }
 
@@ -67,7 +67,7 @@ public final class SpliceInsertCommand extends SpliceCommand {
         this.o = j3;
         this.p = Collections.unmodifiableList(list);
         this.q = z6;
-        this.f2738r = j4;
+        this.f2736r = j4;
         this.s = i;
         this.t = i2;
         this.u = i3;
@@ -89,7 +89,7 @@ public final class SpliceInsertCommand extends SpliceCommand {
         }
         this.p = Collections.unmodifiableList(arrayList);
         this.q = parcel.readByte() == 1 ? true : z2;
-        this.f2738r = parcel.readLong();
+        this.f2736r = parcel.readLong();
         this.s = parcel.readInt();
         this.t = parcel.readInt();
         this.u = parcel.readInt();
@@ -110,10 +110,10 @@ public final class SpliceInsertCommand extends SpliceCommand {
             b bVar = this.p.get(i2);
             parcel.writeInt(bVar.a);
             parcel.writeLong(bVar.b);
-            parcel.writeLong(bVar.f2739c);
+            parcel.writeLong(bVar.f2737c);
         }
         parcel.writeByte(this.q ? (byte) 1 : 0);
-        parcel.writeLong(this.f2738r);
+        parcel.writeLong(this.f2736r);
         parcel.writeInt(this.s);
         parcel.writeInt(this.t);
         parcel.writeInt(this.u);
diff --git a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
index 5d08bff1a1..e797f339fc 100644
--- a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
+++ b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
@@ -43,7 +43,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2740c;
+        public final boolean f2738c;
         public final boolean d;
         public final long e;
         public final List<b> f;
@@ -56,7 +56,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
         public c(long j, boolean z2, boolean z3, boolean z4, List<b> list, long j2, boolean z5, long j3, int i, int i2, int i3) {
             this.a = j;
             this.b = z2;
-            this.f2740c = z3;
+            this.f2738c = z3;
             this.d = z4;
             this.f = Collections.unmodifiableList(list);
             this.e = j2;
@@ -71,7 +71,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
             this.a = parcel.readLong();
             boolean z2 = false;
             this.b = parcel.readByte() == 1;
-            this.f2740c = parcel.readByte() == 1;
+            this.f2738c = parcel.readByte() == 1;
             this.d = parcel.readByte() == 1;
             int readInt = parcel.readInt();
             ArrayList arrayList = new ArrayList(readInt);
@@ -109,7 +109,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
             c cVar = this.i.get(i2);
             parcel.writeLong(cVar.a);
             parcel.writeByte(cVar.b ? (byte) 1 : 0);
-            parcel.writeByte(cVar.f2740c ? (byte) 1 : 0);
+            parcel.writeByte(cVar.f2738c ? (byte) 1 : 0);
             parcel.writeByte(cVar.d ? (byte) 1 : 0);
             int size2 = cVar.f.size();
             parcel.writeInt(size2);
diff --git a/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index ddffc1e3a0..11d8bc9e67 100644
--- a/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 public class DefaultTrackSelector extends i {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f2741c = new int[0];
+    public static final int[] f2739c = new int[0];
     public static final p0<Integer> d = p0.a(c.i.a.c.f2.c.i);
     public static final p0<Integer> e = p0.a(c.i.a.c.f2.b.i);
     public final g.b f;
@@ -71,23 +71,23 @@ public class DefaultTrackSelector extends i {
         public final int q;
 
         /* renamed from: r  reason: collision with root package name */
-        public final int f2742r;
+        public final int f2740r;
         public final int s;
         public final int t;
         public final int u;
         public final int v;
 
         /* renamed from: w  reason: collision with root package name */
-        public final int f2743w;
+        public final int f2741w;
 
         /* renamed from: x  reason: collision with root package name */
-        public final int f2744x;
+        public final int f2742x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final boolean f2745y;
+        public final boolean f2743y;
 
         /* renamed from: z  reason: collision with root package name */
-        public final boolean f2746z;
+        public final boolean f2744z;
 
         public class a implements Parcelable.Creator<Parameters> {
             /* Return type fixed from 'java.lang.Object' to match base method */
@@ -106,15 +106,15 @@ public class DefaultTrackSelector extends i {
         public Parameters(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, boolean z2, boolean z3, boolean z4, int i9, int i10, boolean z5, u<String> uVar, u<String> uVar2, int i11, int i12, int i13, boolean z6, boolean z7, boolean z8, boolean z9, u<String> uVar3, u<String> uVar4, int i14, boolean z10, int i15, boolean z11, boolean z12, boolean z13, boolean z14, boolean z15, SparseArray<Map<TrackGroupArray, SelectionOverride>> sparseArray, SparseBooleanArray sparseBooleanArray) {
             super(uVar2, i11, uVar4, i14, z10, i15);
             this.q = i;
-            this.f2742r = i2;
+            this.f2740r = i2;
             this.s = i3;
             this.t = i4;
             this.u = i5;
             this.v = i6;
-            this.f2743w = i7;
-            this.f2744x = i8;
-            this.f2745y = z2;
-            this.f2746z = z3;
+            this.f2741w = i7;
+            this.f2742x = i8;
+            this.f2743y = z2;
+            this.f2744z = z3;
             this.A = z4;
             this.B = i9;
             this.C = i10;
@@ -139,17 +139,17 @@ public class DefaultTrackSelector extends i {
         public Parameters(Parcel parcel) {
             super(parcel);
             this.q = parcel.readInt();
-            this.f2742r = parcel.readInt();
+            this.f2740r = parcel.readInt();
             this.s = parcel.readInt();
             this.t = parcel.readInt();
             this.u = parcel.readInt();
             this.v = parcel.readInt();
-            this.f2743w = parcel.readInt();
-            this.f2744x = parcel.readInt();
+            this.f2741w = parcel.readInt();
+            this.f2742x = parcel.readInt();
             int i = f0.a;
             boolean z2 = true;
-            this.f2745y = parcel.readInt() != 0;
-            this.f2746z = parcel.readInt() != 0;
+            this.f2743y = parcel.readInt() != 0;
+            this.f2744z = parcel.readInt() != 0;
             this.A = parcel.readInt() != 0;
             this.B = parcel.readInt();
             this.C = parcel.readInt();
@@ -206,7 +206,7 @@ public class DefaultTrackSelector extends i {
                 return false;
             }
             Parameters parameters = (Parameters) obj;
-            if (super.equals(obj) && this.q == parameters.q && this.f2742r == parameters.f2742r && this.s == parameters.s && this.t == parameters.t && this.u == parameters.u && this.v == parameters.v && this.f2743w == parameters.f2743w && this.f2744x == parameters.f2744x && this.f2745y == parameters.f2745y && this.f2746z == parameters.f2746z && this.A == parameters.A && this.D == parameters.D && this.B == parameters.B && this.C == parameters.C && this.E.equals(parameters.E) && this.F == parameters.F && this.G == parameters.G && this.H == parameters.H && this.I == parameters.I && this.J == parameters.J && this.K == parameters.K && this.L.equals(parameters.L) && this.M == parameters.M && this.N == parameters.N && this.O == parameters.O && this.P == parameters.P && this.Q == parameters.Q) {
+            if (super.equals(obj) && this.q == parameters.q && this.f2740r == parameters.f2740r && this.s == parameters.s && this.t == parameters.t && this.u == parameters.u && this.v == parameters.v && this.f2741w == parameters.f2741w && this.f2742x == parameters.f2742x && this.f2743y == parameters.f2743y && this.f2744z == parameters.f2744z && this.A == parameters.A && this.D == parameters.D && this.B == parameters.B && this.C == parameters.C && this.E.equals(parameters.E) && this.F == parameters.F && this.G == parameters.G && this.H == parameters.H && this.I == parameters.I && this.J == parameters.J && this.K == parameters.K && this.L.equals(parameters.L) && this.M == parameters.M && this.N == parameters.N && this.O == parameters.O && this.P == parameters.P && this.Q == parameters.Q) {
                 SparseBooleanArray sparseBooleanArray = this.S;
                 SparseBooleanArray sparseBooleanArray2 = parameters.S;
                 int size = sparseBooleanArray.size();
@@ -281,24 +281,24 @@ public class DefaultTrackSelector extends i {
         @Override // com.google.android.exoplayer2.trackselection.TrackSelectionParameters, java.lang.Object
         public int hashCode() {
             int hashCode = this.E.hashCode();
-            return ((((((((((this.L.hashCode() + ((((((((((((((hashCode + (((((((((((((((((((((((((((((super.hashCode() * 31) + this.q) * 31) + this.f2742r) * 31) + this.s) * 31) + this.t) * 31) + this.u) * 31) + this.v) * 31) + this.f2743w) * 31) + this.f2744x) * 31) + (this.f2745y ? 1 : 0)) * 31) + (this.f2746z ? 1 : 0)) * 31) + (this.A ? 1 : 0)) * 31) + (this.D ? 1 : 0)) * 31) + this.B) * 31) + this.C) * 31)) * 31) + this.F) * 31) + this.G) * 31) + (this.H ? 1 : 0)) * 31) + (this.I ? 1 : 0)) * 31) + (this.J ? 1 : 0)) * 31) + (this.K ? 1 : 0)) * 31)) * 31) + (this.M ? 1 : 0)) * 31) + (this.N ? 1 : 0)) * 31) + (this.O ? 1 : 0)) * 31) + (this.P ? 1 : 0)) * 31) + (this.Q ? 1 : 0);
+            return ((((((((((this.L.hashCode() + ((((((((((((((hashCode + (((((((((((((((((((((((((((((super.hashCode() * 31) + this.q) * 31) + this.f2740r) * 31) + this.s) * 31) + this.t) * 31) + this.u) * 31) + this.v) * 31) + this.f2741w) * 31) + this.f2742x) * 31) + (this.f2743y ? 1 : 0)) * 31) + (this.f2744z ? 1 : 0)) * 31) + (this.A ? 1 : 0)) * 31) + (this.D ? 1 : 0)) * 31) + this.B) * 31) + this.C) * 31)) * 31) + this.F) * 31) + this.G) * 31) + (this.H ? 1 : 0)) * 31) + (this.I ? 1 : 0)) * 31) + (this.J ? 1 : 0)) * 31) + (this.K ? 1 : 0)) * 31)) * 31) + (this.M ? 1 : 0)) * 31) + (this.N ? 1 : 0)) * 31) + (this.O ? 1 : 0)) * 31) + (this.P ? 1 : 0)) * 31) + (this.Q ? 1 : 0);
         }
 
         @Override // com.google.android.exoplayer2.trackselection.TrackSelectionParameters, android.os.Parcelable
         public void writeToParcel(Parcel parcel, int i) {
             super.writeToParcel(parcel, i);
             parcel.writeInt(this.q);
-            parcel.writeInt(this.f2742r);
+            parcel.writeInt(this.f2740r);
             parcel.writeInt(this.s);
             parcel.writeInt(this.t);
             parcel.writeInt(this.u);
             parcel.writeInt(this.v);
-            parcel.writeInt(this.f2743w);
-            parcel.writeInt(this.f2744x);
-            boolean z2 = this.f2745y;
+            parcel.writeInt(this.f2741w);
+            parcel.writeInt(this.f2742x);
+            boolean z2 = this.f2743y;
             int i2 = f0.a;
             parcel.writeInt(z2 ? 1 : 0);
-            parcel.writeInt(this.f2746z ? 1 : 0);
+            parcel.writeInt(this.f2744z ? 1 : 0);
             parcel.writeInt(this.A ? 1 : 0);
             parcel.writeInt(this.B);
             parcel.writeInt(this.C);
@@ -412,7 +412,7 @@ public class DefaultTrackSelector extends i {
         public final int q;
 
         /* renamed from: r  reason: collision with root package name */
-        public final boolean f2747r;
+        public final boolean f2745r;
         public final int s;
         public final int t;
         public final int u;
@@ -445,7 +445,7 @@ public class DefaultTrackSelector extends i {
             this.n = i6;
             this.m = i3;
             this.o = Integer.bitCount(format.m & parameters.k);
-            this.f2747r = (format.l & 1) != 0;
+            this.f2745r = (format.l & 1) != 0;
             int i7 = format.G;
             this.s = i7;
             this.t = format.H;
@@ -502,7 +502,7 @@ public class DefaultTrackSelector extends i {
             Integer valueOf = Integer.valueOf(this.n);
             Integer valueOf2 = Integer.valueOf(aVar.n);
             t0 t0Var = t0.i;
-            n b2 = c2.b(valueOf, valueOf2, t0Var).a(this.m, aVar.m).a(this.o, aVar.o).c(this.i, aVar.i).b(Integer.valueOf(this.v), Integer.valueOf(aVar.v), t0Var).b(Integer.valueOf(this.u), Integer.valueOf(aVar.u), this.k.M ? DefaultTrackSelector.d.b() : DefaultTrackSelector.e).c(this.f2747r, aVar.f2747r).b(Integer.valueOf(this.p), Integer.valueOf(aVar.p), t0Var).a(this.q, aVar.q).b(Integer.valueOf(this.s), Integer.valueOf(aVar.s), b).b(Integer.valueOf(this.t), Integer.valueOf(aVar.t), b);
+            n b2 = c2.b(valueOf, valueOf2, t0Var).a(this.m, aVar.m).a(this.o, aVar.o).c(this.i, aVar.i).b(Integer.valueOf(this.v), Integer.valueOf(aVar.v), t0Var).b(Integer.valueOf(this.u), Integer.valueOf(aVar.u), this.k.M ? DefaultTrackSelector.d.b() : DefaultTrackSelector.e).c(this.f2745r, aVar.f2745r).b(Integer.valueOf(this.p), Integer.valueOf(aVar.p), t0Var).a(this.q, aVar.q).b(Integer.valueOf(this.s), Integer.valueOf(aVar.s), b).b(Integer.valueOf(this.t), Integer.valueOf(aVar.t), b);
             Integer valueOf3 = Integer.valueOf(this.u);
             Integer valueOf4 = Integer.valueOf(aVar.u);
             if (!f0.a(this.j, aVar.j)) {
@@ -544,7 +544,7 @@ public class DefaultTrackSelector extends i {
         public u<String> q;
 
         /* renamed from: r  reason: collision with root package name */
-        public boolean f2748r;
+        public boolean f2746r;
         public boolean s;
         public final SparseArray<Map<TrackGroupArray, SelectionOverride>> t = new SparseArray<>();
         public final SparseBooleanArray u = new SparseBooleanArray();
@@ -619,7 +619,7 @@ public class DefaultTrackSelector extends i {
         }
 
         public Parameters b() {
-            return new Parameters(this.d, this.e, this.f, this.g, 0, 0, 0, 0, this.h, false, this.i, this.j, this.k, this.l, this.m, this.a, 0, this.n, this.o, this.p, false, false, false, this.q, this.b, this.f2749c, false, 0, false, false, this.f2748r, false, this.s, this.t, this.u);
+            return new Parameters(this.d, this.e, this.f, this.g, 0, 0, 0, 0, this.h, false, this.i, this.j, this.k, this.l, this.m, this.a, 0, this.n, this.o, this.p, false, false, false, this.q, this.b, this.f2747c, false, 0, false, false, this.f2746r, false, this.s, this.t, this.u);
         }
 
         /* JADX DEBUG: Type inference failed for r2v1. Raw type applied. Possible types: c.i.b.b.u<java.lang.Object>, c.i.b.b.u<java.lang.String> */
@@ -641,7 +641,7 @@ public class DefaultTrackSelector extends i {
             this.o = Integer.MAX_VALUE;
             this.p = true;
             this.q = uVar;
-            this.f2748r = true;
+            this.f2746r = true;
             this.s = true;
         }
     }
@@ -725,10 +725,10 @@ public class DefaultTrackSelector extends i {
         public final int o;
 
         /* JADX WARNING: Code restructure failed: missing block: B:33:0x0053, code lost:
-            if (r10 < ((float) r8.f2743w)) goto L_0x005e;
+            if (r10 < ((float) r8.f2741w)) goto L_0x005e;
          */
         /* JADX WARNING: Code restructure failed: missing block: B:37:0x005b, code lost:
-            if (r10 < r8.f2744x) goto L_0x005e;
+            if (r10 < r8.f2742x) goto L_0x005e;
          */
         /* JADX WARNING: Removed duplicated region for block: B:32:0x004e  */
         /* JADX WARNING: Removed duplicated region for block: B:36:0x0059  */
@@ -749,12 +749,12 @@ public class DefaultTrackSelector extends i {
             int i10 = 0;
             boolean z4 = true;
             int i11 = -1;
-            if (z2 && (((i7 = format.f2696y) == -1 || i7 <= parameters.q) && ((i8 = format.f2697z) == -1 || i8 <= parameters.f2742r))) {
+            if (z2 && (((i7 = format.f2694y) == -1 || i7 <= parameters.q) && ((i8 = format.f2695z) == -1 || i8 <= parameters.f2740r))) {
                 float f2 = format.A;
                 if ((f2 == -1.0f || f2 <= ((float) parameters.s)) && ((i9 = format.p) == -1 || i9 <= parameters.t)) {
                     z3 = true;
                     this.i = z3;
-                    if (z2 && (((i4 = format.f2696y) == -1 || i4 >= parameters.u) && ((i5 = format.f2697z) == -1 || i5 >= parameters.v))) {
+                    if (z2 && (((i4 = format.f2694y) == -1 || i4 >= parameters.u) && ((i5 = format.f2695z) == -1 || i5 >= parameters.v))) {
                         f = format.A;
                         if (f != -1.0f) {
                         }
@@ -764,8 +764,8 @@ public class DefaultTrackSelector extends i {
                         this.k = z4;
                         this.l = DefaultTrackSelector.e(i, false);
                         this.m = format.p;
-                        i2 = format.f2696y;
-                        if (!(i2 == -1 || (i3 = format.f2697z) == -1)) {
+                        i2 = format.f2694y;
+                        if (!(i2 == -1 || (i3 = format.f2695z) == -1)) {
                             i11 = i2 * i3;
                         }
                         this.n = i11;
@@ -788,7 +788,7 @@ public class DefaultTrackSelector extends i {
                     this.k = z4;
                     this.l = DefaultTrackSelector.e(i, false);
                     this.m = format.p;
-                    i2 = format.f2696y;
+                    i2 = format.f2694y;
                     i11 = i2 * i3;
                     this.n = i11;
                     int i12 = Integer.MAX_VALUE;
@@ -811,7 +811,7 @@ public class DefaultTrackSelector extends i {
             this.k = z4;
             this.l = DefaultTrackSelector.e(i, false);
             this.m = format.p;
-            i2 = format.f2696y;
+            i2 = format.f2694y;
             i11 = i2 * i3;
             this.n = i11;
             int i12 = Integer.MAX_VALUE;
@@ -882,8 +882,8 @@ public class DefaultTrackSelector extends i {
                     break;
                 }
                 Format format = trackGroup.j[i9];
-                int i11 = format.f2696y;
-                if (i11 > 0 && (i4 = format.f2697z) > 0) {
+                int i11 = format.f2694y;
+                if (i11 > 0 && (i4 = format.f2695z) > 0) {
                     if (z2) {
                         boolean z4 = i11 > i4;
                         if (i <= i2) {
@@ -895,8 +895,8 @@ public class DefaultTrackSelector extends i {
                             int i12 = i11 * i6;
                             int i13 = i4 * i5;
                             Point point = i12 < i13 ? new Point(i5, f0.f(i13, i11)) : new Point(f0.f(i12, i4), i6);
-                            int i14 = format.f2696y;
-                            int i15 = format.f2697z;
+                            int i14 = format.f2694y;
+                            int i15 = format.f2695z;
                             i7 = i14 * i15;
                             if (i14 >= ((int) (((float) point.x) * 0.98f)) && i15 >= ((int) (((float) point.y) * 0.98f)) && i7 < i10) {
                                 i10 = i7;
@@ -909,8 +909,8 @@ public class DefaultTrackSelector extends i {
                     int i13 = i4 * i5;
                     if (i12 < i13) {
                     }
-                    int i14 = format.f2696y;
-                    int i15 = format.f2697z;
+                    int i14 = format.f2694y;
+                    int i15 = format.f2695z;
                     i7 = i14 * i15;
                     i10 = i7;
                 }
@@ -919,8 +919,8 @@ public class DefaultTrackSelector extends i {
             if (i10 != Integer.MAX_VALUE) {
                 for (int size = arrayList.size() - 1; size >= 0; size--) {
                     Format format2 = trackGroup.j[((Integer) arrayList.get(size)).intValue()];
-                    int i16 = format2.f2696y;
-                    int i17 = (i16 == -1 || (i3 = format2.f2697z) == -1) ? -1 : i16 * i3;
+                    int i16 = format2.f2694y;
+                    int i17 = (i16 == -1 || (i3 = format2.f2695z) == -1) ? -1 : i16 * i3;
                     if (i17 == -1 || i17 > i10) {
                         arrayList.remove(size);
                     }
@@ -942,11 +942,11 @@ public class DefaultTrackSelector extends i {
         if (str != null && !f0.a(format.t, str)) {
             return false;
         }
-        int i11 = format.f2696y;
+        int i11 = format.f2694y;
         if (i11 != -1 && (i7 > i11 || i11 > i3)) {
             return false;
         }
-        int i12 = format.f2697z;
+        int i12 = format.f2695z;
         if (i12 != -1 && (i8 > i12 || i12 > i4)) {
             return false;
         }
diff --git a/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
index 8ac7d0ebc1..4c55275a5e 100644
--- a/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
+++ b/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -40,7 +40,7 @@ public class TrackSelectionParameters implements Parcelable {
         public u<String> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2749c = 0;
+        public int f2747c = 0;
 
         /* JADX DEBUG: Type inference failed for r0v1. Raw type applied. Possible types: c.i.b.b.u<java.lang.Object>, c.i.b.b.u<java.lang.String> */
         @Deprecated
@@ -55,7 +55,7 @@ public class TrackSelectionParameters implements Parcelable {
             CaptioningManager captioningManager;
             int i = f0.a;
             if (i >= 19 && ((i >= 23 || Looper.myLooper() != null) && (captioningManager = (CaptioningManager) context.getSystemService("captioning")) != null && captioningManager.isEnabled())) {
-                this.f2749c = 1088;
+                this.f2747c = 1088;
                 Locale locale = captioningManager.getLocale();
                 if (locale != null) {
                     this.b = u.t(i >= 21 ? locale.toLanguageTag() : locale.toString());
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 562e274890..22d0f75909 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -66,7 +66,7 @@ public class DefaultTimeBar extends View implements k {
     public final Paint q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final Paint f2750r;
+    public final Paint f2748r;
     @Nullable
     public final Drawable s;
     public final int t;
@@ -74,16 +74,16 @@ public class DefaultTimeBar extends View implements k {
     public final int v;
 
     /* renamed from: w  reason: collision with root package name */
-    public final int f2751w;
+    public final int f2749w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final int f2752x;
+    public final int f2750x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2753y;
+    public final int f2751y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final int f2754z;
+    public final int f2752z;
 
     public DefaultTimeBar(Context context, @Nullable AttributeSet attributeSet) {
         this(context, attributeSet, 0, attributeSet);
@@ -106,7 +106,7 @@ public class DefaultTimeBar extends View implements k {
         Paint paint5 = new Paint();
         this.q = paint5;
         Paint paint6 = new Paint();
-        this.f2750r = paint6;
+        this.f2748r = paint6;
         paint6.setAntiAlias(true);
         this.F = new CopyOnWriteArraySet<>();
         this.G = new Point();
@@ -137,10 +137,10 @@ public class DefaultTimeBar extends View implements k {
                 this.t = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_bar_height, c2);
                 this.u = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_touch_target_height, c3);
                 this.v = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_bar_gravity, 0);
-                this.f2751w = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_ad_marker_width, c4);
-                this.f2752x = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_enabled_size, c5);
-                this.f2753y = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_disabled_size, c6);
-                this.f2754z = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_dragged_size, c7);
+                this.f2749w = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_ad_marker_width, c4);
+                this.f2750x = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_enabled_size, c5);
+                this.f2751y = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_disabled_size, c6);
+                this.f2752z = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_dragged_size, c7);
                 int i3 = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_played_color, -1);
                 int i4 = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_scrubber_color, -1);
                 int i5 = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_buffered_color, -855638017);
@@ -160,10 +160,10 @@ public class DefaultTimeBar extends View implements k {
             this.t = c2;
             this.u = c3;
             this.v = 0;
-            this.f2751w = c4;
-            this.f2752x = c5;
-            this.f2753y = c6;
-            this.f2754z = c7;
+            this.f2749w = c4;
+            this.f2750x = c5;
+            this.f2751y = c6;
+            this.f2752z = c7;
             paint.setColor(-1);
             paint6.setColor(-1);
             paint2.setColor(-855638017);
@@ -180,7 +180,7 @@ public class DefaultTimeBar extends View implements k {
         if (drawable2 != null) {
             this.A = (drawable2.getMinimumWidth() + 1) / 2;
         } else {
-            this.A = (Math.max(this.f2753y, Math.max(this.f2752x, this.f2754z)) + 1) / 2;
+            this.A = (Math.max(this.f2751y, Math.max(this.f2750x, this.f2752z)) + 1) / 2;
         }
         this.N = 1.0f;
         ValueAnimator valueAnimator = new ValueAnimator();
@@ -387,12 +387,12 @@ public class DefaultTimeBar extends View implements k {
                 Objects.requireNonNull(jArr);
                 boolean[] zArr = this.V;
                 Objects.requireNonNull(zArr);
-                int i5 = this.f2751w / 2;
+                int i5 = this.f2749w / 2;
                 for (int i6 = 0; i6 < this.T; i6++) {
                     long i7 = f0.i(jArr[i6], 0, this.Q);
                     Rect rect4 = this.j;
-                    int min = Math.min(rect4.width() - this.f2751w, Math.max(0, ((int) ((((long) this.j.width()) * i7) / this.Q)) - i5)) + rect4.left;
-                    canvas.drawRect((float) min, (float) centerY, (float) (min + this.f2751w), (float) i, zArr[i6] ? this.q : this.p);
+                    int min = Math.min(rect4.width() - this.f2749w, Math.max(0, ((int) ((((long) this.j.width()) * i7) / this.Q)) - i5)) + rect4.left;
+                    canvas.drawRect((float) min, (float) centerY, (float) (min + this.f2749w), (float) i, zArr[i6] ? this.q : this.p);
                 }
             }
         }
@@ -402,7 +402,7 @@ public class DefaultTimeBar extends View implements k {
             int centerY2 = this.l.centerY();
             Drawable drawable = this.s;
             if (drawable == null) {
-                canvas.drawCircle((float) h, (float) centerY2, (float) ((int) ((((float) ((this.O || isFocused()) ? this.f2754z : isEnabled() ? this.f2752x : this.f2753y)) * this.N) / 2.0f)), this.f2750r);
+                canvas.drawCircle((float) h, (float) centerY2, (float) ((int) ((((float) ((this.O || isFocused()) ? this.f2752z : isEnabled() ? this.f2750x : this.f2751y)) * this.N) / 2.0f)), this.f2748r);
             } else {
                 int intrinsicWidth = ((int) (((float) drawable.getIntrinsicWidth()) * this.N)) / 2;
                 int intrinsicHeight = ((int) (((float) this.s.getIntrinsicHeight()) * this.N)) / 2;
@@ -665,7 +665,7 @@ public class DefaultTimeBar extends View implements k {
     }
 
     public void setScrubberColor(@ColorInt int i) {
-        this.f2750r.setColor(i);
+        this.f2748r.setColor(i);
         invalidate(this.i);
     }
 
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index ad166c175d..d5ebb834da 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -67,31 +67,31 @@ public class PlayerControlView extends FrameLayout {
     public boolean W;
 
     /* renamed from: a0  reason: collision with root package name */
-    public int f2755a0;
+    public int f2753a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public int f2756b0;
+    public int f2754b0;
 
     /* renamed from: c0  reason: collision with root package name */
-    public int f2757c0;
+    public int f2755c0;
 
     /* renamed from: d0  reason: collision with root package name */
-    public boolean f2758d0;
+    public boolean f2756d0;
 
     /* renamed from: e0  reason: collision with root package name */
-    public boolean f2759e0;
+    public boolean f2757e0;
 
     /* renamed from: f0  reason: collision with root package name */
-    public boolean f2760f0;
+    public boolean f2758f0;
 
     /* renamed from: g0  reason: collision with root package name */
-    public boolean f2761g0;
+    public boolean f2759g0;
 
     /* renamed from: h0  reason: collision with root package name */
-    public boolean f2762h0;
+    public boolean f2760h0;
 
     /* renamed from: i0  reason: collision with root package name */
-    public long f2763i0;
+    public long f2761i0;
     public final b j;
     public long[] j0;
     public final CopyOnWriteArrayList<d> k;
@@ -114,7 +114,7 @@ public class PlayerControlView extends FrameLayout {
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public final ImageView f2764r;
+    public final ImageView f2762r;
     @Nullable
     public final ImageView s;
     @Nullable
@@ -126,16 +126,16 @@ public class PlayerControlView extends FrameLayout {
     @Nullable
 
     /* renamed from: w  reason: collision with root package name */
-    public final k f2765w;
+    public final k f2763w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final StringBuilder f2766x;
+    public final StringBuilder f2764x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final Formatter f2767y;
+    public final Formatter f2765y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final r1.b f2768z;
+    public final r1.b f2766z;
 
     public final class b implements g1.a, k.a, View.OnClickListener {
         public b(a aVar) {
@@ -191,7 +191,7 @@ public class PlayerControlView extends FrameLayout {
             PlayerControlView playerControlView = PlayerControlView.this;
             TextView textView = playerControlView.v;
             if (textView != null) {
-                textView.setText(f0.u(playerControlView.f2766x, playerControlView.f2767y, j));
+                textView.setText(f0.u(playerControlView.f2764x, playerControlView.f2765y, j));
             }
         }
 
@@ -246,7 +246,7 @@ public class PlayerControlView extends FrameLayout {
             playerControlView.W = true;
             TextView textView = playerControlView.v;
             if (textView != null) {
-                textView.setText(f0.u(playerControlView.f2766x, playerControlView.f2767y, j));
+                textView.setText(f0.u(playerControlView.f2764x, playerControlView.f2765y, j));
             }
         }
 
@@ -288,10 +288,10 @@ public class PlayerControlView extends FrameLayout {
                 } else if (playerControlView.o == view) {
                     Objects.requireNonNull((j0) playerControlView.Q);
                     g1Var.q(false);
-                } else if (playerControlView.f2764r == view) {
+                } else if (playerControlView.f2762r == view) {
                     i0 i0Var = playerControlView.Q;
                     int B = g1Var.B();
-                    int i = PlayerControlView.this.f2757c0;
+                    int i = PlayerControlView.this.f2755c0;
                     int i2 = 1;
                     while (true) {
                         if (i2 > 2) {
@@ -401,40 +401,40 @@ public class PlayerControlView extends FrameLayout {
         super(context, attributeSet, i2);
         int i3 = R.e.exo_player_control_view;
         int i4 = 5000;
-        this.f2755a0 = 5000;
-        this.f2757c0 = 0;
-        this.f2756b0 = 200;
-        this.f2763i0 = -9223372036854775807L;
-        this.f2758d0 = true;
-        this.f2759e0 = true;
-        this.f2760f0 = true;
-        this.f2761g0 = true;
-        this.f2762h0 = false;
+        this.f2753a0 = 5000;
+        this.f2755c0 = 0;
+        this.f2754b0 = 200;
+        this.f2761i0 = -9223372036854775807L;
+        this.f2756d0 = true;
+        this.f2757e0 = true;
+        this.f2758f0 = true;
+        this.f2759g0 = true;
+        this.f2760h0 = false;
         int i5 = 15000;
         if (attributeSet2 != null) {
             TypedArray obtainStyledAttributes = context.getTheme().obtainStyledAttributes(attributeSet2, R.g.PlayerControlView, 0, 0);
             try {
                 i4 = obtainStyledAttributes.getInt(R.g.PlayerControlView_rewind_increment, 5000);
                 i5 = obtainStyledAttributes.getInt(R.g.PlayerControlView_fastforward_increment, 15000);
-                this.f2755a0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_show_timeout, this.f2755a0);
+                this.f2753a0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_show_timeout, this.f2753a0);
                 i3 = obtainStyledAttributes.getResourceId(R.g.PlayerControlView_controller_layout_id, i3);
-                this.f2757c0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_repeat_toggle_modes, this.f2757c0);
-                this.f2758d0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_rewind_button, this.f2758d0);
-                this.f2759e0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_fastforward_button, this.f2759e0);
-                this.f2760f0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_previous_button, this.f2760f0);
-                this.f2761g0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_next_button, this.f2761g0);
-                this.f2762h0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_shuffle_button, this.f2762h0);
-                setTimeBarMinUpdateInterval(obtainStyledAttributes.getInt(R.g.PlayerControlView_time_bar_min_update_interval, this.f2756b0));
+                this.f2755c0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_repeat_toggle_modes, this.f2755c0);
+                this.f2756d0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_rewind_button, this.f2756d0);
+                this.f2757e0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_fastforward_button, this.f2757e0);
+                this.f2758f0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_previous_button, this.f2758f0);
+                this.f2759g0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_next_button, this.f2759g0);
+                this.f2760h0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_shuffle_button, this.f2760h0);
+                setTimeBarMinUpdateInterval(obtainStyledAttributes.getInt(R.g.PlayerControlView_time_bar_min_update_interval, this.f2754b0));
             } finally {
                 obtainStyledAttributes.recycle();
             }
         }
         this.k = new CopyOnWriteArrayList<>();
-        this.f2768z = new r1.b();
+        this.f2766z = new r1.b();
         this.A = new r1.c();
         StringBuilder sb = new StringBuilder();
-        this.f2766x = sb;
-        this.f2767y = new Formatter(sb, Locale.getDefault());
+        this.f2764x = sb;
+        this.f2765y = new Formatter(sb, Locale.getDefault());
         this.j0 = new long[0];
         this.k0 = new boolean[0];
         this.l0 = new long[0];
@@ -450,7 +450,7 @@ public class PlayerControlView extends FrameLayout {
         k kVar = (k) findViewById(i6);
         View findViewById = findViewById(R.c.exo_progress_placeholder);
         if (kVar != null) {
-            this.f2765w = kVar;
+            this.f2763w = kVar;
         } else if (findViewById != null) {
             DefaultTimeBar defaultTimeBar = new DefaultTimeBar(context, null, 0, attributeSet2);
             defaultTimeBar.setId(i6);
@@ -459,13 +459,13 @@ public class PlayerControlView extends FrameLayout {
             int indexOfChild = viewGroup.indexOfChild(findViewById);
             viewGroup.removeView(findViewById);
             viewGroup.addView(defaultTimeBar, indexOfChild);
-            this.f2765w = defaultTimeBar;
+            this.f2763w = defaultTimeBar;
         } else {
-            this.f2765w = null;
+            this.f2763w = null;
         }
         this.u = (TextView) findViewById(R.c.exo_duration);
         this.v = (TextView) findViewById(R.c.exo_position);
-        k kVar2 = this.f2765w;
+        k kVar2 = this.f2763w;
         if (kVar2 != null) {
             kVar2.b(bVar);
         }
@@ -500,7 +500,7 @@ public class PlayerControlView extends FrameLayout {
             findViewById7.setOnClickListener(bVar);
         }
         ImageView imageView = (ImageView) findViewById(R.c.exo_repeat_toggle);
-        this.f2764r = imageView;
+        this.f2762r = imageView;
         if (imageView != null) {
             imageView.setOnClickListener(bVar);
         }
@@ -595,23 +595,23 @@ public class PlayerControlView extends FrameLayout {
             }
             removeCallbacks(this.B);
             removeCallbacks(this.C);
-            this.f2763i0 = -9223372036854775807L;
+            this.f2761i0 = -9223372036854775807L;
         }
     }
 
     public final void d() {
         removeCallbacks(this.C);
-        if (this.f2755a0 > 0) {
+        if (this.f2753a0 > 0) {
             long uptimeMillis = SystemClock.uptimeMillis();
-            int i2 = this.f2755a0;
-            this.f2763i0 = uptimeMillis + ((long) i2);
+            int i2 = this.f2753a0;
+            this.f2761i0 = uptimeMillis + ((long) i2);
             if (this.T) {
                 postDelayed(this.C, (long) i2);
                 return;
             }
             return;
         }
-        this.f2763i0 = -9223372036854775807L;
+        this.f2761i0 = -9223372036854775807L;
     }
 
     @Override // android.view.View, android.view.ViewGroup
@@ -655,15 +655,15 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public int getRepeatToggleModes() {
-        return this.f2757c0;
+        return this.f2755c0;
     }
 
     public boolean getShowShuffleButton() {
-        return this.f2762h0;
+        return this.f2760h0;
     }
 
     public int getShowTimeoutMs() {
-        return this.f2755a0;
+        return this.f2753a0;
     }
 
     public boolean getShowVrButton() {
@@ -725,11 +725,11 @@ public class PlayerControlView extends FrameLayout {
                     }
                     z5 = z6;
                     z6 = z7;
-                    j(this.f2760f0, z6, this.l);
-                    j(this.f2758d0, z3, this.q);
-                    j(this.f2759e0, z2, this.p);
-                    j(this.f2761g0, z5, this.m);
-                    kVar = this.f2765w;
+                    j(this.f2758f0, z6, this.l);
+                    j(this.f2756d0, z3, this.q);
+                    j(this.f2757e0, z2, this.p);
+                    j(this.f2759g0, z5, this.m);
+                    kVar = this.f2763w;
                     if (kVar == null) {
                         kVar.setEnabled(z4);
                         return;
@@ -741,11 +741,11 @@ public class PlayerControlView extends FrameLayout {
             z4 = false;
             z3 = false;
             z2 = false;
-            j(this.f2760f0, z6, this.l);
-            j(this.f2758d0, z3, this.q);
-            j(this.f2759e0, z2, this.p);
-            j(this.f2761g0, z5, this.m);
-            kVar = this.f2765w;
+            j(this.f2758f0, z6, this.l);
+            j(this.f2756d0, z3, this.q);
+            j(this.f2757e0, z2, this.p);
+            j(this.f2759g0, z5, this.m);
+            kVar = this.f2763w;
             if (kVar == null) {
             }
         }
@@ -795,12 +795,12 @@ public class PlayerControlView extends FrameLayout {
             }
             TextView textView = this.v;
             if (textView != null && !this.W) {
-                textView.setText(f0.u(this.f2766x, this.f2767y, j2));
+                textView.setText(f0.u(this.f2764x, this.f2765y, j2));
             }
-            k kVar = this.f2765w;
+            k kVar = this.f2763w;
             if (kVar != null) {
                 kVar.setPosition(j2);
-                this.f2765w.setBufferedPosition(j);
+                this.f2763w.setBufferedPosition(j);
             }
             c cVar = this.R;
             if (cVar != null) {
@@ -810,13 +810,13 @@ public class PlayerControlView extends FrameLayout {
             int u = g1Var == null ? 1 : g1Var.u();
             long j3 = 1000;
             if (g1Var != null && g1Var.v()) {
-                k kVar2 = this.f2765w;
+                k kVar2 = this.f2763w;
                 long min = Math.min(kVar2 != null ? kVar2.getPreferredUpdateDelay() : 1000, 1000 - (j2 % 1000));
                 float f = g1Var.c().b;
                 if (f > 0.0f) {
                     j3 = (long) (((float) min) / f);
                 }
-                postDelayed(this.B, f0.i(j3, (long) this.f2756b0, 1000));
+                postDelayed(this.B, f0.i(j3, (long) this.f2754b0, 1000));
             } else if (u != 4 && u != 1) {
                 postDelayed(this.B, 1000);
             }
@@ -825,31 +825,31 @@ public class PlayerControlView extends FrameLayout {
 
     public final void n() {
         ImageView imageView;
-        if (e() && this.T && (imageView = this.f2764r) != null) {
-            if (this.f2757c0 == 0) {
+        if (e() && this.T && (imageView = this.f2762r) != null) {
+            if (this.f2755c0 == 0) {
                 j(false, false, imageView);
                 return;
             }
             g1 g1Var = this.P;
             if (g1Var == null) {
                 j(true, false, imageView);
-                this.f2764r.setImageDrawable(this.D);
-                this.f2764r.setContentDescription(this.G);
+                this.f2762r.setImageDrawable(this.D);
+                this.f2762r.setContentDescription(this.G);
                 return;
             }
             j(true, true, imageView);
             int B = g1Var.B();
             if (B == 0) {
-                this.f2764r.setImageDrawable(this.D);
-                this.f2764r.setContentDescription(this.G);
+                this.f2762r.setImageDrawable(this.D);
+                this.f2762r.setContentDescription(this.G);
             } else if (B == 1) {
-                this.f2764r.setImageDrawable(this.E);
-                this.f2764r.setContentDescription(this.H);
+                this.f2762r.setImageDrawable(this.E);
+                this.f2762r.setContentDescription(this.H);
             } else if (B == 2) {
-                this.f2764r.setImageDrawable(this.F);
-                this.f2764r.setContentDescription(this.I);
+                this.f2762r.setImageDrawable(this.F);
+                this.f2762r.setContentDescription(this.I);
             }
-            this.f2764r.setVisibility(0);
+            this.f2762r.setVisibility(0);
         }
     }
 
@@ -857,7 +857,7 @@ public class PlayerControlView extends FrameLayout {
         ImageView imageView;
         if (e() && this.T && (imageView = this.s) != null) {
             g1 g1Var = this.P;
-            if (!this.f2762h0) {
+            if (!this.f2760h0) {
                 j(false, false, imageView);
             } else if (g1Var == null) {
                 j(true, false, imageView);
@@ -875,7 +875,7 @@ public class PlayerControlView extends FrameLayout {
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
         this.T = true;
-        long j = this.f2763i0;
+        long j = this.f2761i0;
         if (j != -9223372036854775807L) {
             long uptimeMillis = j - SystemClock.uptimeMillis();
             if (uptimeMillis <= 0) {
@@ -963,13 +963,13 @@ public class PlayerControlView extends FrameLayout {
                                 if (i5 > cVar.p) {
                                     break;
                                 }
-                                D.f(i5, this.f2768z);
-                                int i6 = this.f2768z.f.f853c;
+                                D.f(i5, this.f2766z);
+                                int i6 = this.f2766z.f.f853c;
                                 int i7 = 0;
                                 while (i7 < i6) {
-                                    long d2 = this.f2768z.d(i7);
+                                    long d2 = this.f2766z.d(i7);
                                     if (d2 == Long.MIN_VALUE) {
-                                        long j4 = this.f2768z.d;
+                                        long j4 = this.f2766z.d;
                                         if (j4 == j) {
                                             i7++;
                                             j = -9223372036854775807L;
@@ -977,7 +977,7 @@ public class PlayerControlView extends FrameLayout {
                                             d2 = j4;
                                         }
                                     }
-                                    long j5 = d2 + this.f2768z.e;
+                                    long j5 = d2 + this.f2766z.e;
                                     if (j5 >= 0) {
                                         long[] jArr = this.j0;
                                         if (i2 == jArr.length) {
@@ -986,7 +986,7 @@ public class PlayerControlView extends FrameLayout {
                                             this.k0 = Arrays.copyOf(this.k0, length);
                                         }
                                         this.j0[i2] = h0.b(j5 + j3);
-                                        this.k0[i2] = !this.f2768z.f.e[i7].b();
+                                        this.k0[i2] = !this.f2766z.f.e[i7].b();
                                         i2++;
                                         i7++;
                                         j = -9223372036854775807L;
@@ -1009,9 +1009,9 @@ public class PlayerControlView extends FrameLayout {
                     long b2 = h0.b(j2);
                     textView = this.u;
                     if (textView != null) {
-                        textView.setText(f0.u(this.f2766x, this.f2767y, b2));
+                        textView.setText(f0.u(this.f2764x, this.f2765y, b2));
                     }
-                    kVar = this.f2765w;
+                    kVar = this.f2763w;
                     if (kVar != null) {
                         kVar.setDuration(b2);
                         int length2 = this.l0.length;
@@ -1023,7 +1023,7 @@ public class PlayerControlView extends FrameLayout {
                         }
                         System.arraycopy(this.l0, 0, this.j0, i2, length2);
                         System.arraycopy(this.m0, 0, this.k0, i2, length2);
-                        this.f2765w.a(this.j0, this.k0, i8);
+                        this.f2763w.a(this.j0, this.k0, i8);
                     }
                     m();
                 }
@@ -1039,7 +1039,7 @@ public class PlayerControlView extends FrameLayout {
             textView = this.u;
             if (textView != null) {
             }
-            kVar = this.f2765w;
+            kVar = this.f2763w;
             if (kVar != null) {
             }
             m();
@@ -1092,7 +1092,7 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setRepeatToggleModes(int i2) {
-        this.f2757c0 = i2;
+        this.f2755c0 = i2;
         g1 g1Var = this.P;
         if (g1Var != null) {
             int B = g1Var.B();
@@ -1126,7 +1126,7 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setShowFastForwardButton(boolean z2) {
-        this.f2759e0 = z2;
+        this.f2757e0 = z2;
         k();
     }
 
@@ -1136,27 +1136,27 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setShowNextButton(boolean z2) {
-        this.f2761g0 = z2;
+        this.f2759g0 = z2;
         k();
     }
 
     public void setShowPreviousButton(boolean z2) {
-        this.f2760f0 = z2;
+        this.f2758f0 = z2;
         k();
     }
 
     public void setShowRewindButton(boolean z2) {
-        this.f2758d0 = z2;
+        this.f2756d0 = z2;
         k();
     }
 
     public void setShowShuffleButton(boolean z2) {
-        this.f2762h0 = z2;
+        this.f2760h0 = z2;
         o();
     }
 
     public void setShowTimeoutMs(int i2) {
-        this.f2755a0 = i2;
+        this.f2753a0 = i2;
         if (e()) {
             d();
         }
@@ -1170,7 +1170,7 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setTimeBarMinUpdateInterval(int i2) {
-        this.f2756b0 = f0.h(i2, 16, 1000);
+        this.f2754b0 = f0.h(i2, 16, 1000);
     }
 
     public void setVrButtonListener(@Nullable View.OnClickListener onClickListener) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index d6264673c3..b4464b2ce8 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -86,7 +86,7 @@ public class PlayerView extends FrameLayout {
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public final PlayerControlView f2769r;
+    public final PlayerControlView f2767r;
     @Nullable
     public final FrameLayout s;
     @Nullable
@@ -97,17 +97,17 @@ public class PlayerView extends FrameLayout {
     @Nullable
 
     /* renamed from: w  reason: collision with root package name */
-    public PlayerControlView.d f2770w;
+    public PlayerControlView.d f2768w;
 
     /* renamed from: x  reason: collision with root package name */
-    public boolean f2771x;
+    public boolean f2769x;
     @Nullable
 
     /* renamed from: y  reason: collision with root package name */
-    public Drawable f2772y;
+    public Drawable f2770y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2773z;
+    public int f2771z;
 
     public final class a implements g1.a, k, v, View.OnLayoutChangeListener, g, PlayerControlView.d {
         public final r1.b i = new r1.b();
@@ -355,7 +355,7 @@ public class PlayerView extends FrameLayout {
             this.o = null;
             this.p = null;
             this.q = null;
-            this.f2769r = null;
+            this.f2767r = null;
             this.s = null;
             this.t = null;
             ImageView imageView = new ImageView(context);
@@ -459,9 +459,9 @@ public class PlayerView extends FrameLayout {
         this.t = (FrameLayout) findViewById(R.c.exo_overlay);
         ImageView imageView2 = (ImageView) findViewById(R.c.exo_artwork);
         this.n = imageView2;
-        this.f2771x = z3 && imageView2 != null;
+        this.f2769x = z3 && imageView2 != null;
         if (i3 != 0) {
-            this.f2772y = ContextCompat.getDrawable(getContext(), i3);
+            this.f2770y = ContextCompat.getDrawable(getContext(), i3);
         }
         SubtitleView subtitleView = (SubtitleView) findViewById(R.c.exo_subtitles);
         this.o = subtitleView;
@@ -474,7 +474,7 @@ public class PlayerView extends FrameLayout {
         if (findViewById2 != null) {
             findViewById2.setVisibility(8);
         }
-        this.f2773z = i7;
+        this.f2771z = i7;
         TextView textView = (TextView) findViewById(R.c.exo_error_message);
         this.q = textView;
         if (textView != null) {
@@ -484,10 +484,10 @@ public class PlayerView extends FrameLayout {
         PlayerControlView playerControlView = (PlayerControlView) findViewById(i14);
         View findViewById3 = findViewById(R.c.exo_controller_placeholder);
         if (playerControlView != null) {
-            this.f2769r = playerControlView;
+            this.f2767r = playerControlView;
         } else if (findViewById3 != null) {
             PlayerControlView playerControlView2 = new PlayerControlView(context, null, 0, attributeSet);
-            this.f2769r = playerControlView2;
+            this.f2767r = playerControlView2;
             playerControlView2.setId(i14);
             playerControlView2.setLayoutParams(findViewById3.getLayoutParams());
             ViewGroup viewGroup = (ViewGroup) findViewById3.getParent();
@@ -495,9 +495,9 @@ public class PlayerView extends FrameLayout {
             viewGroup.removeView(findViewById3);
             viewGroup.addView(playerControlView2, indexOfChild);
         } else {
-            this.f2769r = null;
+            this.f2767r = null;
         }
-        PlayerControlView playerControlView3 = this.f2769r;
+        PlayerControlView playerControlView3 = this.f2767r;
         this.E = playerControlView3 != null ? i2 : 0;
         this.H = z7;
         this.F = z6;
@@ -505,7 +505,7 @@ public class PlayerView extends FrameLayout {
         this.v = z2 && playerControlView3 != null;
         d();
         l();
-        PlayerControlView playerControlView4 = this.f2769r;
+        PlayerControlView playerControlView4 = this.f2767r;
         if (playerControlView4 != null) {
             playerControlView4.k.add(aVar);
         }
@@ -543,7 +543,7 @@ public class PlayerView extends FrameLayout {
     }
 
     public void d() {
-        PlayerControlView playerControlView = this.f2769r;
+        PlayerControlView playerControlView = this.f2767r;
         if (playerControlView != null) {
             playerControlView.c();
         }
@@ -557,8 +557,8 @@ public class PlayerView extends FrameLayout {
         }
         int keyCode = keyEvent.getKeyCode();
         boolean z2 = keyCode == 19 || keyCode == 270 || keyCode == 22 || keyCode == 271 || keyCode == 20 || keyCode == 269 || keyCode == 21 || keyCode == 268 || keyCode == 23;
-        if (!z2 || !o() || this.f2769r.e()) {
-            if ((o() && this.f2769r.a(keyEvent)) || super.dispatchKeyEvent(keyEvent)) {
+        if (!z2 || !o() || this.f2767r.e()) {
+            if ((o() && this.f2767r.a(keyEvent)) || super.dispatchKeyEvent(keyEvent)) {
                 f(true);
             } else if (!z2 || !o()) {
                 return false;
@@ -579,7 +579,7 @@ public class PlayerView extends FrameLayout {
 
     public final void f(boolean z2) {
         if ((!e() || !this.G) && o()) {
-            boolean z3 = this.f2769r.e() && this.f2769r.getShowTimeoutMs() <= 0;
+            boolean z3 = this.f2767r.e() && this.f2767r.getShowTimeoutMs() <= 0;
             boolean h = h();
             if (z2 || z3 || h) {
                 i(h);
@@ -616,7 +616,7 @@ public class PlayerView extends FrameLayout {
         if (frameLayout != null) {
             arrayList.add(new b(frameLayout, 3, "Transparent overlay does not impact viewability"));
         }
-        PlayerControlView playerControlView = this.f2769r;
+        PlayerControlView playerControlView = this.f2767r;
         if (playerControlView != null) {
             arrayList.add(new b(playerControlView, 0));
         }
@@ -648,7 +648,7 @@ public class PlayerView extends FrameLayout {
 
     @Nullable
     public Drawable getDefaultArtwork() {
-        return this.f2772y;
+        return this.f2770y;
     }
 
     @Nullable
@@ -672,7 +672,7 @@ public class PlayerView extends FrameLayout {
     }
 
     public boolean getUseArtwork() {
-        return this.f2771x;
+        return this.f2769x;
     }
 
     public boolean getUseController() {
@@ -695,8 +695,8 @@ public class PlayerView extends FrameLayout {
 
     public final void i(boolean z2) {
         if (o()) {
-            this.f2769r.setShowTimeoutMs(z2 ? 0 : this.E);
-            this.f2769r.h();
+            this.f2767r.setShowTimeoutMs(z2 ? 0 : this.E);
+            this.f2767r.h();
         }
     }
 
@@ -704,10 +704,10 @@ public class PlayerView extends FrameLayout {
         if (!o() || this.u == null) {
             return false;
         }
-        if (!this.f2769r.e()) {
+        if (!this.f2767r.e()) {
             f(true);
         } else if (this.H) {
-            this.f2769r.c();
+            this.f2767r.c();
         }
         return true;
     }
@@ -718,7 +718,7 @@ public class PlayerView extends FrameLayout {
             g1 g1Var = this.u;
             boolean z2 = true;
             int i3 = 0;
-            if (g1Var == null || g1Var.u() != 2 || ((i2 = this.f2773z) != 2 && (i2 != 1 || !this.u.g()))) {
+            if (g1Var == null || g1Var.u() != 2 || ((i2 = this.f2771z) != 2 && (i2 != 1 || !this.u.g()))) {
                 z2 = false;
             }
             View view = this.p;
@@ -730,7 +730,7 @@ public class PlayerView extends FrameLayout {
     }
 
     public final void l() {
-        PlayerControlView playerControlView = this.f2769r;
+        PlayerControlView playerControlView = this.f2767r;
         String str = null;
         if (playerControlView == null || !this.v) {
             setContentDescription(null);
@@ -782,7 +782,7 @@ public class PlayerView extends FrameLayout {
                 }
             }
             b();
-            if (this.f2771x) {
+            if (this.f2769x) {
                 d.H(this.n);
                 z3 = true;
             } else {
@@ -828,7 +828,7 @@ public class PlayerView extends FrameLayout {
                         return;
                     }
                 }
-                if (g(this.f2772y)) {
+                if (g(this.f2770y)) {
                     return;
                 }
             }
@@ -844,7 +844,7 @@ public class PlayerView extends FrameLayout {
         if (!this.v) {
             return false;
         }
-        d.H(this.f2769r);
+        d.H(this.f2767r);
         return true;
     }
 
@@ -887,8 +887,8 @@ public class PlayerView extends FrameLayout {
     }
 
     public void setControlDispatcher(i0 i0Var) {
-        d.H(this.f2769r);
-        this.f2769r.setControlDispatcher(i0Var);
+        d.H(this.f2767r);
+        this.f2767r.setControlDispatcher(i0Var);
     }
 
     public void setControllerAutoShow(boolean z2) {
@@ -900,29 +900,29 @@ public class PlayerView extends FrameLayout {
     }
 
     public void setControllerHideOnTouch(boolean z2) {
-        d.H(this.f2769r);
+        d.H(this.f2767r);
         this.H = z2;
         l();
     }
 
     public void setControllerShowTimeoutMs(int i2) {
-        d.H(this.f2769r);
+        d.H(this.f2767r);
         this.E = i2;
-        if (this.f2769r.e()) {
+        if (this.f2767r.e()) {
             i(h());
         }
     }
 
     public void setControllerVisibilityListener(@Nullable PlayerControlView.d dVar) {
-        d.H(this.f2769r);
-        PlayerControlView.d dVar2 = this.f2770w;
+        d.H(this.f2767r);
+        PlayerControlView.d dVar2 = this.f2768w;
         if (dVar2 != dVar) {
             if (dVar2 != null) {
-                this.f2769r.k.remove(dVar2);
+                this.f2767r.k.remove(dVar2);
             }
-            this.f2770w = dVar;
+            this.f2768w = dVar;
             if (dVar != null) {
-                PlayerControlView playerControlView = this.f2769r;
+                PlayerControlView playerControlView = this.f2767r;
                 Objects.requireNonNull(playerControlView);
                 playerControlView.k.add(dVar);
             }
@@ -936,8 +936,8 @@ public class PlayerView extends FrameLayout {
     }
 
     public void setDefaultArtwork(@Nullable Drawable drawable) {
-        if (this.f2772y != drawable) {
-            this.f2772y = drawable;
+        if (this.f2770y != drawable) {
+            this.f2770y = drawable;
             n(false);
         }
     }
@@ -951,8 +951,8 @@ public class PlayerView extends FrameLayout {
 
     @Deprecated
     public void setFastForwardIncrementMs(int i2) {
-        d.H(this.f2769r);
-        this.f2769r.setFastForwardIncrementMs(i2);
+        d.H(this.f2767r);
+        this.f2767r.setFastForwardIncrementMs(i2);
     }
 
     public void setKeepContentOnPlayerReset(boolean z2) {
@@ -964,8 +964,8 @@ public class PlayerView extends FrameLayout {
 
     @Deprecated
     public void setPlaybackPreparer(@Nullable e1 e1Var) {
-        d.H(this.f2769r);
-        this.f2769r.setPlaybackPreparer(e1Var);
+        d.H(this.f2767r);
+        this.f2767r.setPlaybackPreparer(e1Var);
     }
 
     public void setPlayer(@Nullable g1 g1Var) {
@@ -1003,7 +1003,7 @@ public class PlayerView extends FrameLayout {
             }
             this.u = g1Var;
             if (o()) {
-                this.f2769r.setPlayer(g1Var);
+                this.f2767r.setPlayer(g1Var);
             }
             k();
             m();
@@ -1044,8 +1044,8 @@ public class PlayerView extends FrameLayout {
     }
 
     public void setRepeatToggleModes(int i2) {
-        d.H(this.f2769r);
-        this.f2769r.setRepeatToggleModes(i2);
+        d.H(this.f2767r);
+        this.f2767r.setRepeatToggleModes(i2);
     }
 
     public void setResizeMode(int i2) {
@@ -1055,45 +1055,45 @@ public class PlayerView extends FrameLayout {
 
     @Deprecated
     public void setRewindIncrementMs(int i2) {
-        d.H(this.f2769r);
-        this.f2769r.setRewindIncrementMs(i2);
+        d.H(this.f2767r);
+        this.f2767r.setRewindIncrementMs(i2);
     }
 
     public void setShowBuffering(int i2) {
-        if (this.f2773z != i2) {
-            this.f2773z = i2;
+        if (this.f2771z != i2) {
+            this.f2771z = i2;
             k();
         }
     }
 
     public void setShowFastForwardButton(boolean z2) {
-        d.H(this.f2769r);
-        this.f2769r.setShowFastForwardButton(z2);
+        d.H(this.f2767r);
+        this.f2767r.setShowFastForwardButton(z2);
     }
 
     public void setShowMultiWindowTimeBar(boolean z2) {
-        d.H(this.f2769r);
-        this.f2769r.setShowMultiWindowTimeBar(z2);
+        d.H(this.f2767r);
+        this.f2767r.setShowMultiWindowTimeBar(z2);
     }
 
     public void setShowNextButton(boolean z2) {
-        d.H(this.f2769r);
-        this.f2769r.setShowNextButton(z2);
+        d.H(this.f2767r);
+        this.f2767r.setShowNextButton(z2);
     }
 
     public void setShowPreviousButton(boolean z2) {
-        d.H(this.f2769r);
-        this.f2769r.setShowPreviousButton(z2);
+        d.H(this.f2767r);
+        this.f2767r.setShowPreviousButton(z2);
     }
 
     public void setShowRewindButton(boolean z2) {
-        d.H(this.f2769r);
-        this.f2769r.setShowRewindButton(z2);
+        d.H(this.f2767r);
+        this.f2767r.setShowRewindButton(z2);
     }
 
     public void setShowShuffleButton(boolean z2) {
-        d.H(this.f2769r);
-        this.f2769r.setShowShuffleButton(z2);
+        d.H(this.f2767r);
+        this.f2767r.setShowShuffleButton(z2);
     }
 
     public void setShutterBackgroundColor(int i2) {
@@ -1105,23 +1105,23 @@ public class PlayerView extends FrameLayout {
 
     public void setUseArtwork(boolean z2) {
         d.D(!z2 || this.n != null);
-        if (this.f2771x != z2) {
-            this.f2771x = z2;
+        if (this.f2769x != z2) {
+            this.f2769x = z2;
             n(false);
         }
     }
 
     public void setUseController(boolean z2) {
-        d.D(!z2 || this.f2769r != null);
+        d.D(!z2 || this.f2767r != null);
         if (this.v != z2) {
             this.v = z2;
             if (o()) {
-                this.f2769r.setPlayer(this.u);
+                this.f2767r.setPlayer(this.u);
             } else {
-                PlayerControlView playerControlView = this.f2769r;
+                PlayerControlView playerControlView = this.f2767r;
                 if (playerControlView != null) {
                     playerControlView.c();
-                    this.f2769r.setPlayer(null);
+                    this.f2767r.setPlayer(null);
                 }
             }
             l();
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
index 59c4ddfb70..e64967e82a 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
@@ -32,7 +32,7 @@ public final class SubtitleView extends FrameLayout implements k {
     public a q;
 
     /* renamed from: r  reason: collision with root package name */
-    public View f2774r;
+    public View f2772r;
 
     public interface a {
         void a(List<c> list, b bVar, float f, int i, float f2);
@@ -42,7 +42,7 @@ public final class SubtitleView extends FrameLayout implements k {
         super(context, attributeSet);
         g gVar = new g(context, attributeSet);
         this.q = gVar;
-        this.f2774r = gVar;
+        this.f2772r = gVar;
         addView(gVar);
         this.p = 1;
     }
@@ -110,12 +110,12 @@ public final class SubtitleView extends FrameLayout implements k {
     }
 
     private <T extends View & a> void setView(T t) {
-        removeView(this.f2774r);
-        View view = this.f2774r;
+        removeView(this.f2772r);
+        View view = this.f2772r;
         if (view instanceof n) {
             ((n) view).j.destroy();
         }
-        this.f2774r = t;
+        this.f2772r = t;
         this.q = t;
         addView(t);
     }
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 03676cffb4..43df653908 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -29,7 +29,7 @@ public class TrackSelectionView extends LinearLayout {
     public l q;
 
     /* renamed from: r  reason: collision with root package name */
-    public TrackGroupArray f2775r;
+    public TrackGroupArray f2773r;
     public boolean s;
 
     public class b implements View.OnClickListener {
@@ -74,7 +74,7 @@ public class TrackSelectionView extends LinearLayout {
         b bVar = new b(null);
         this.m = bVar;
         this.q = new h(getResources());
-        this.f2775r = TrackGroupArray.i;
+        this.f2773r = TrackGroupArray.i;
         CheckedTextView checkedTextView = (CheckedTextView) from.inflate(17367055, (ViewGroup) this, false);
         this.k = checkedTextView;
         checkedTextView.setBackgroundResource(resourceId);
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
index bcd464857b..950110b265 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
@@ -22,7 +22,7 @@ public final class Loader {
     public static final c b = new c(3, -9223372036854775807L, null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final ExecutorService f2776c;
+    public final ExecutorService f2774c;
     @Nullable
     public d<? extends e> d;
     @Nullable
@@ -118,7 +118,7 @@ public final class Loader {
                 return;
             }
             this.m = null;
-            loader.f2776c.execute(this);
+            loader.f2774c.execute(this);
         }
 
         @Override // android.os.Handler
@@ -128,7 +128,7 @@ public final class Loader {
                 if (i == 0) {
                     this.m = null;
                     Loader loader = Loader.this;
-                    ExecutorService executorService = loader.f2776c;
+                    ExecutorService executorService = loader.f2774c;
                     d<? extends e> dVar = loader.d;
                     Objects.requireNonNull(dVar);
                     executorService.execute(dVar);
@@ -261,7 +261,7 @@ public final class Loader {
 
     public Loader(String str) {
         int i = f0.a;
-        this.f2776c = Executors.newSingleThreadExecutor(new c.i.a.c.i2.e(str));
+        this.f2774c = Executors.newSingleThreadExecutor(new c.i.a.c.i2.e(str));
     }
 
     public static c a(boolean z2, long j) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 55d7f6d7fb..c7ea593581 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -20,7 +20,7 @@ public final class CacheDataSink implements h {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2778c;
+    public final int f2776c;
     @Nullable
     public l d;
     public long e;
@@ -47,7 +47,7 @@ public final class CacheDataSink implements h {
         Objects.requireNonNull(cache);
         this.a = cache;
         this.b = i == 0 ? RecyclerView.FOREVER_NS : j;
-        this.f2778c = 20480;
+        this.f2776c = 20480;
     }
 
     @Override // c.i.a.c.h2.h
@@ -113,10 +113,10 @@ public final class CacheDataSink implements h {
         int i = f0.a;
         this.f = cache.a(str, lVar.f + this.i, j2);
         FileOutputStream fileOutputStream = new FileOutputStream(this.f);
-        if (this.f2778c > 0) {
+        if (this.f2776c > 0) {
             y yVar = this.j;
             if (yVar == null) {
-                this.j = new y(fileOutputStream, this.f2778c);
+                this.j = new y(fileOutputStream, this.f2776c);
             } else {
                 yVar.a(fileOutputStream);
             }
diff --git a/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
index 45764904fa..72c73d019f 100644
--- a/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
+++ b/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -31,20 +31,20 @@ public class FlexboxLayout extends ViewGroup implements a {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2779r;
+    public int f2777r;
     public int s;
     public int t;
     public int[] u;
     public SparseIntArray v;
 
     /* renamed from: w  reason: collision with root package name */
-    public c f2780w = new c(this);
+    public c f2778w = new c(this);
 
     /* renamed from: x  reason: collision with root package name */
-    public List<b> f2781x = new ArrayList();
+    public List<b> f2779x = new ArrayList();
 
     /* renamed from: y  reason: collision with root package name */
-    public c.b f2782y = new c.b();
+    public c.b f2780y = new c.b();
 
     public static class LayoutParams extends ViewGroup.MarginLayoutParams implements FlexItem {
         public static final Parcelable.Creator<LayoutParams> CREATOR = new a();
@@ -59,7 +59,7 @@ public class FlexboxLayout extends ViewGroup implements a {
         public int q = ViewCompat.MEASURED_SIZE_MASK;
 
         /* renamed from: r  reason: collision with root package name */
-        public boolean f2783r;
+        public boolean f2781r;
 
         public static class a implements Parcelable.Creator<LayoutParams> {
             /* Return type fixed from 'java.lang.Object' to match base method */
@@ -87,7 +87,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             this.o = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_minHeight, -1);
             this.p = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_maxWidth, ViewCompat.MEASURED_SIZE_MASK);
             this.q = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_maxHeight, ViewCompat.MEASURED_SIZE_MASK);
-            this.f2783r = obtainStyledAttributes.getBoolean(R.a.FlexboxLayout_Layout_layout_wrapBefore, false);
+            this.f2781r = obtainStyledAttributes.getBoolean(R.a.FlexboxLayout_Layout_layout_wrapBefore, false);
             obtainStyledAttributes.recycle();
         }
 
@@ -104,7 +104,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             this.o = parcel.readInt();
             this.p = parcel.readInt();
             this.q = parcel.readInt();
-            this.f2783r = parcel.readByte() != 0 ? true : z2;
+            this.f2781r = parcel.readByte() != 0 ? true : z2;
             ((ViewGroup.MarginLayoutParams) this).bottomMargin = parcel.readInt();
             ((ViewGroup.MarginLayoutParams) this).leftMargin = parcel.readInt();
             ((ViewGroup.MarginLayoutParams) this).rightMargin = parcel.readInt();
@@ -132,7 +132,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             this.o = layoutParams.o;
             this.p = layoutParams.p;
             this.q = layoutParams.q;
-            this.f2783r = layoutParams.f2783r;
+            this.f2781r = layoutParams.f2781r;
         }
 
         @Override // com.google.android.flexbox.FlexItem
@@ -207,7 +207,7 @@ public class FlexboxLayout extends ViewGroup implements a {
 
         @Override // com.google.android.flexbox.FlexItem
         public boolean i0() {
-            return this.f2783r;
+            return this.f2781r;
         }
 
         @Override // com.google.android.flexbox.FlexItem
@@ -241,7 +241,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             parcel.writeInt(this.o);
             parcel.writeInt(this.p);
             parcel.writeInt(this.q);
-            parcel.writeByte(this.f2783r ? (byte) 1 : 0);
+            parcel.writeByte(this.f2781r ? (byte) 1 : 0);
             parcel.writeInt(((ViewGroup.MarginLayoutParams) this).bottomMargin);
             parcel.writeInt(((ViewGroup.MarginLayoutParams) this).leftMargin);
             parcel.writeInt(((ViewGroup.MarginLayoutParams) this).rightMargin);
@@ -275,12 +275,12 @@ public class FlexboxLayout extends ViewGroup implements a {
         }
         int i = obtainStyledAttributes.getInt(R.a.FlexboxLayout_showDivider, 0);
         if (i != 0) {
-            this.f2779r = i;
+            this.f2777r = i;
             this.q = i;
         }
         int i2 = obtainStyledAttributes.getInt(R.a.FlexboxLayout_showDividerVertical, 0);
         if (i2 != 0) {
-            this.f2779r = i2;
+            this.f2777r = i2;
         }
         int i3 = obtainStyledAttributes.getInt(R.a.FlexboxLayout_showDividerHorizontal, 0);
         if (i3 != 0) {
@@ -312,7 +312,7 @@ public class FlexboxLayout extends ViewGroup implements a {
         if (this.v == null) {
             this.v = new SparseIntArray(getChildCount());
         }
-        c cVar = this.f2780w;
+        c cVar = this.f2778w;
         SparseIntArray sparseIntArray = this.v;
         int flexItemCount = cVar.a.getFlexItemCount();
         List<c.C0102c> f = cVar.f(flexItemCount);
@@ -340,7 +340,7 @@ public class FlexboxLayout extends ViewGroup implements a {
     @Override // c.i.a.e.a
     public void b(b bVar) {
         if (i()) {
-            if ((this.f2779r & 4) > 0) {
+            if ((this.f2777r & 4) > 0) {
                 int i = bVar.e;
                 int i2 = this.t;
                 bVar.e = i + i2;
@@ -386,7 +386,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             if (p(i, i2)) {
                 i4 = 0 + this.t;
             }
-            if ((this.f2779r & 4) <= 0) {
+            if ((this.f2777r & 4) <= 0) {
                 return i4;
             }
             i3 = this.t;
@@ -443,8 +443,8 @@ public class FlexboxLayout extends ViewGroup implements a {
     }
 
     public List<b> getFlexLines() {
-        ArrayList arrayList = new ArrayList(this.f2781x.size());
-        for (b bVar : this.f2781x) {
+        ArrayList arrayList = new ArrayList(this.f2779x.size());
+        for (b bVar : this.f2779x) {
             if (bVar.a() != 0) {
                 arrayList.add(bVar);
             }
@@ -454,7 +454,7 @@ public class FlexboxLayout extends ViewGroup implements a {
 
     @Override // c.i.a.e.a
     public List<b> getFlexLinesInternal() {
-        return this.f2781x;
+        return this.f2779x;
     }
 
     @Override // c.i.a.e.a
@@ -469,7 +469,7 @@ public class FlexboxLayout extends ViewGroup implements a {
     @Override // c.i.a.e.a
     public int getLargestMainSize() {
         int i = Integer.MIN_VALUE;
-        for (b bVar : this.f2781x) {
+        for (b bVar : this.f2779x) {
             i = Math.max(i, bVar.e);
         }
         return i;
@@ -485,15 +485,15 @@ public class FlexboxLayout extends ViewGroup implements a {
     }
 
     public int getShowDividerVertical() {
-        return this.f2779r;
+        return this.f2777r;
     }
 
     @Override // c.i.a.e.a
     public int getSumOfCrossSize() {
-        int size = this.f2781x.size();
+        int size = this.f2779x.size();
         int i = 0;
         for (int i2 = 0; i2 < size; i2++) {
-            b bVar = this.f2781x.get(i2);
+            b bVar = this.f2779x.get(i2);
             if (q(i2)) {
                 i += i() ? this.s : this.t;
             }
@@ -524,9 +524,9 @@ public class FlexboxLayout extends ViewGroup implements a {
     public final void k(Canvas canvas, boolean z2, boolean z3) {
         int paddingLeft = getPaddingLeft();
         int max = Math.max(0, (getWidth() - getPaddingRight()) - paddingLeft);
-        int size = this.f2781x.size();
+        int size = this.f2779x.size();
         for (int i = 0; i < size; i++) {
-            b bVar = this.f2781x.get(i);
+            b bVar = this.f2779x.get(i);
             for (int i2 = 0; i2 < bVar.h; i2++) {
                 int i3 = bVar.o + i2;
                 View o = o(i3);
@@ -535,7 +535,7 @@ public class FlexboxLayout extends ViewGroup implements a {
                     if (p(i3, i2)) {
                         n(canvas, z2 ? o.getRight() + ((ViewGroup.MarginLayoutParams) layoutParams).rightMargin : (o.getLeft() - ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin) - this.t, bVar.b, bVar.g);
                     }
-                    if (i2 == bVar.h - 1 && (this.f2779r & 4) > 0) {
+                    if (i2 == bVar.h - 1 && (this.f2777r & 4) > 0) {
                         n(canvas, z2 ? (o.getLeft() - ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin) - this.t : o.getRight() + ((ViewGroup.MarginLayoutParams) layoutParams).rightMargin, bVar.b, bVar.g);
                     }
                 }
@@ -552,9 +552,9 @@ public class FlexboxLayout extends ViewGroup implements a {
     public final void l(Canvas canvas, boolean z2, boolean z3) {
         int paddingTop = getPaddingTop();
         int max = Math.max(0, (getHeight() - getPaddingBottom()) - paddingTop);
-        int size = this.f2781x.size();
+        int size = this.f2779x.size();
         for (int i = 0; i < size; i++) {
-            b bVar = this.f2781x.get(i);
+            b bVar = this.f2779x.get(i);
             for (int i2 = 0; i2 < bVar.h; i2++) {
                 int i3 = bVar.o + i2;
                 View o = o(i3);
@@ -571,7 +571,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             if (q(i)) {
                 n(canvas, z2 ? bVar.f1086c : bVar.a - this.t, paddingTop, max);
             }
-            if (r(i) && (this.f2779r & 4) > 0) {
+            if (r(i) && (this.f2777r & 4) > 0) {
                 n(canvas, z2 ? bVar.a - this.t : bVar.f1086c, paddingTop, max);
             }
         }
@@ -607,7 +607,7 @@ public class FlexboxLayout extends ViewGroup implements a {
     @Override // android.view.View
     public void onDraw(Canvas canvas) {
         if (this.p != null || this.o != null) {
-            if (this.q != 0 || this.f2779r != 0) {
+            if (this.q != 0 || this.f2777r != 0) {
                 int layoutDirection = ViewCompat.getLayoutDirection(this);
                 int i = this.i;
                 boolean z2 = false;
@@ -686,7 +686,7 @@ public class FlexboxLayout extends ViewGroup implements a {
         if (this.v == null) {
             this.v = new SparseIntArray(getChildCount());
         }
-        c cVar = this.f2780w;
+        c cVar = this.f2778w;
         SparseIntArray sparseIntArray = this.v;
         int flexItemCount = cVar.a.getFlexItemCount();
         if (sparseIntArray.size() == flexItemCount) {
@@ -703,20 +703,20 @@ public class FlexboxLayout extends ViewGroup implements a {
                 i4++;
             }
             if (z2) {
-                c cVar2 = this.f2780w;
+                c cVar2 = this.f2778w;
                 SparseIntArray sparseIntArray2 = this.v;
                 int flexItemCount2 = cVar2.a.getFlexItemCount();
                 this.u = cVar2.x(flexItemCount2, cVar2.f(flexItemCount2), sparseIntArray2);
             }
             i3 = this.i;
             if (i3 != 0 || i3 == 1) {
-                this.f2781x.clear();
-                this.f2782y.a();
-                this.f2780w.b(this.f2782y, i, i2, Integer.MAX_VALUE, 0, -1, null);
-                this.f2781x = this.f2782y.a;
-                this.f2780w.h(i, i2, 0);
+                this.f2779x.clear();
+                this.f2780y.a();
+                this.f2778w.b(this.f2780y, i, i2, Integer.MAX_VALUE, 0, -1, null);
+                this.f2779x = this.f2780y.a;
+                this.f2778w.h(i, i2, 0);
                 if (this.l == 3) {
-                    for (b bVar : this.f2781x) {
+                    for (b bVar : this.f2779x) {
                         int i5 = Integer.MIN_VALUE;
                         for (int i6 = 0; i6 < bVar.h; i6++) {
                             View o = o(bVar.o + i6);
@@ -728,18 +728,18 @@ public class FlexboxLayout extends ViewGroup implements a {
                         bVar.g = i5;
                     }
                 }
-                this.f2780w.g(i, i2, getPaddingBottom() + getPaddingTop());
-                this.f2780w.A(0);
-                u(this.i, i, i2, this.f2782y.b);
+                this.f2778w.g(i, i2, getPaddingBottom() + getPaddingTop());
+                this.f2778w.A(0);
+                u(this.i, i, i2, this.f2780y.b);
             } else if (i3 == 2 || i3 == 3) {
-                this.f2781x.clear();
-                this.f2782y.a();
-                this.f2780w.b(this.f2782y, i2, i, Integer.MAX_VALUE, 0, -1, null);
-                this.f2781x = this.f2782y.a;
-                this.f2780w.h(i, i2, 0);
-                this.f2780w.g(i, i2, getPaddingRight() + getPaddingLeft());
-                this.f2780w.A(0);
-                u(this.i, i, i2, this.f2782y.b);
+                this.f2779x.clear();
+                this.f2780y.a();
+                this.f2778w.b(this.f2780y, i2, i, Integer.MAX_VALUE, 0, -1, null);
+                this.f2779x = this.f2780y.a;
+                this.f2778w.h(i, i2, 0);
+                this.f2778w.g(i, i2, getPaddingRight() + getPaddingLeft());
+                this.f2778w.A(0);
+                u(this.i, i, i2, this.f2780y.b);
                 return;
             } else {
                 StringBuilder O = c.d.b.a.a.O("Invalid value for the flex direction is set: ");
@@ -753,16 +753,16 @@ public class FlexboxLayout extends ViewGroup implements a {
         i3 = this.i;
         if (i3 != 0) {
         }
-        this.f2781x.clear();
-        this.f2782y.a();
-        this.f2780w.b(this.f2782y, i, i2, Integer.MAX_VALUE, 0, -1, null);
-        this.f2781x = this.f2782y.a;
-        this.f2780w.h(i, i2, 0);
+        this.f2779x.clear();
+        this.f2780y.a();
+        this.f2778w.b(this.f2780y, i, i2, Integer.MAX_VALUE, 0, -1, null);
+        this.f2779x = this.f2780y.a;
+        this.f2778w.h(i, i2, 0);
         if (this.l == 3) {
         }
-        this.f2780w.g(i, i2, getPaddingBottom() + getPaddingTop());
-        this.f2780w.A(0);
-        u(this.i, i, i2, this.f2782y.b);
+        this.f2778w.g(i, i2, getPaddingBottom() + getPaddingTop());
+        this.f2778w.A(0);
+        u(this.i, i, i2, this.f2780y.b);
     }
 
     public final boolean p(int i, int i2) {
@@ -780,12 +780,12 @@ public class FlexboxLayout extends ViewGroup implements a {
             }
             i3++;
         }
-        return z2 ? i() ? (this.f2779r & 1) != 0 : (this.q & 1) != 0 : i() ? (this.f2779r & 2) != 0 : (this.q & 2) != 0;
+        return z2 ? i() ? (this.f2777r & 1) != 0 : (this.q & 1) != 0 : i() ? (this.f2777r & 2) != 0 : (this.q & 2) != 0;
     }
 
     public final boolean q(int i) {
         boolean z2;
-        if (i < 0 || i >= this.f2781x.size()) {
+        if (i < 0 || i >= this.f2779x.size()) {
             return false;
         }
         int i2 = 0;
@@ -793,26 +793,26 @@ public class FlexboxLayout extends ViewGroup implements a {
             if (i2 >= i) {
                 z2 = true;
                 break;
-            } else if (this.f2781x.get(i2).a() > 0) {
+            } else if (this.f2779x.get(i2).a() > 0) {
                 z2 = false;
                 break;
             } else {
                 i2++;
             }
         }
-        return z2 ? i() ? (this.q & 1) != 0 : (this.f2779r & 1) != 0 : i() ? (this.q & 2) != 0 : (this.f2779r & 2) != 0;
+        return z2 ? i() ? (this.q & 1) != 0 : (this.f2777r & 1) != 0 : i() ? (this.q & 2) != 0 : (this.f2777r & 2) != 0;
     }
 
     public final boolean r(int i) {
-        if (i < 0 || i >= this.f2781x.size()) {
+        if (i < 0 || i >= this.f2779x.size()) {
             return false;
         }
-        for (int i2 = i + 1; i2 < this.f2781x.size(); i2++) {
-            if (this.f2781x.get(i2).a() > 0) {
+        for (int i2 = i + 1; i2 < this.f2779x.size(); i2++) {
+            if (this.f2779x.get(i2).a() > 0) {
                 return false;
             }
         }
-        return i() ? (this.q & 4) != 0 : (this.f2779r & 4) != 0;
+        return i() ? (this.q & 4) != 0 : (this.f2777r & 4) != 0;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:39:0x00d9  */
@@ -832,10 +832,10 @@ public class FlexboxLayout extends ViewGroup implements a {
         int i9 = i3 - i;
         int paddingBottom = (i4 - i2) - getPaddingBottom();
         int paddingTop = getPaddingTop();
-        int size = this.f2781x.size();
+        int size = this.f2779x.size();
         int i10 = 0;
         while (i10 < size) {
-            b bVar = this.f2781x.get(i10);
+            b bVar = this.f2779x.get(i10);
             if (q(i10)) {
                 int i11 = this.s;
                 paddingBottom -= i11;
@@ -895,26 +895,26 @@ public class FlexboxLayout extends ViewGroup implements a {
                             f4 = f8;
                             i8 = 0;
                         }
-                        int i17 = (i5 != bVar.h - i13 || (this.f2779r & 4) <= 0) ? 0 : this.t;
+                        int i17 = (i5 != bVar.h - i13 || (this.f2777r & 4) <= 0) ? 0 : this.t;
                         if (this.j != 2) {
                             i6 = paddingLeft;
                             layoutParams = layoutParams2;
                             i7 = i5;
                             if (z2) {
-                                this.f2780w.u(o, bVar, Math.round(f4) - o.getMeasuredWidth(), paddingTop, Math.round(f4), o.getMeasuredHeight() + paddingTop);
+                                this.f2778w.u(o, bVar, Math.round(f4) - o.getMeasuredWidth(), paddingTop, Math.round(f4), o.getMeasuredHeight() + paddingTop);
                             } else {
-                                this.f2780w.u(o, bVar, Math.round(f5), paddingTop, o.getMeasuredWidth() + Math.round(f5), o.getMeasuredHeight() + paddingTop);
+                                this.f2778w.u(o, bVar, Math.round(f5), paddingTop, o.getMeasuredWidth() + Math.round(f5), o.getMeasuredHeight() + paddingTop);
                             }
                         } else if (z2) {
                             i6 = paddingLeft;
                             layoutParams = layoutParams2;
                             i7 = i5;
-                            this.f2780w.u(o, bVar, Math.round(f4) - o.getMeasuredWidth(), paddingBottom - o.getMeasuredHeight(), Math.round(f4), paddingBottom);
+                            this.f2778w.u(o, bVar, Math.round(f4) - o.getMeasuredWidth(), paddingBottom - o.getMeasuredHeight(), Math.round(f4), paddingBottom);
                         } else {
                             i6 = paddingLeft;
                             layoutParams = layoutParams2;
                             i7 = i5;
-                            this.f2780w.u(o, bVar, Math.round(f5), paddingBottom - o.getMeasuredHeight(), o.getMeasuredWidth() + Math.round(f5), paddingBottom);
+                            this.f2778w.u(o, bVar, Math.round(f5), paddingBottom - o.getMeasuredHeight(), o.getMeasuredWidth() + Math.round(f5), paddingBottom);
                         }
                         float measuredWidth = ((float) o.getMeasuredWidth()) + max + ((float) ((ViewGroup.MarginLayoutParams) layoutParams).rightMargin) + f5;
                         float measuredWidth2 = f4 - ((((float) o.getMeasuredWidth()) + max) + ((float) ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin));
@@ -1015,7 +1015,7 @@ public class FlexboxLayout extends ViewGroup implements a {
 
     @Override // c.i.a.e.a
     public void setFlexLines(List<b> list) {
-        this.f2781x = list;
+        this.f2779x = list;
     }
 
     public void setFlexWrap(int i) {
@@ -1052,8 +1052,8 @@ public class FlexboxLayout extends ViewGroup implements a {
     }
 
     public void setShowDividerVertical(int i) {
-        if (i != this.f2779r) {
-            this.f2779r = i;
+        if (i != this.f2777r) {
+            this.f2777r = i;
             requestLayout();
         }
     }
@@ -1077,9 +1077,9 @@ public class FlexboxLayout extends ViewGroup implements a {
         int paddingLeft = getPaddingLeft();
         int i9 = i4 - i2;
         int i10 = (i3 - i) - paddingRight;
-        int size = this.f2781x.size();
+        int size = this.f2779x.size();
         for (int i11 = 0; i11 < size; i11++) {
-            b bVar = this.f2781x.get(i11);
+            b bVar = this.f2779x.get(i11);
             if (q(i11)) {
                 int i12 = this.t;
                 paddingLeft += i12;
@@ -1142,18 +1142,18 @@ public class FlexboxLayout extends ViewGroup implements a {
                             layoutParams = layoutParams2;
                             i6 = i5;
                             if (z3) {
-                                this.f2780w.v(o, bVar, false, paddingLeft, Math.round(f4) - o.getMeasuredHeight(), o.getMeasuredWidth() + paddingLeft, Math.round(f4));
+                                this.f2778w.v(o, bVar, false, paddingLeft, Math.round(f4) - o.getMeasuredHeight(), o.getMeasuredWidth() + paddingLeft, Math.round(f4));
                             } else {
-                                this.f2780w.v(o, bVar, false, paddingLeft, Math.round(f5), o.getMeasuredWidth() + paddingLeft, o.getMeasuredHeight() + Math.round(f5));
+                                this.f2778w.v(o, bVar, false, paddingLeft, Math.round(f5), o.getMeasuredWidth() + paddingLeft, o.getMeasuredHeight() + Math.round(f5));
                             }
                         } else if (z3) {
                             layoutParams = layoutParams2;
                             i6 = i5;
-                            this.f2780w.v(o, bVar, true, i10 - o.getMeasuredWidth(), Math.round(f4) - o.getMeasuredHeight(), i10, Math.round(f4));
+                            this.f2778w.v(o, bVar, true, i10 - o.getMeasuredWidth(), Math.round(f4) - o.getMeasuredHeight(), i10, Math.round(f4));
                         } else {
                             layoutParams = layoutParams2;
                             i6 = i5;
-                            this.f2780w.v(o, bVar, true, i10 - o.getMeasuredWidth(), Math.round(f5), i10, o.getMeasuredHeight() + Math.round(f5));
+                            this.f2778w.v(o, bVar, true, i10 - o.getMeasuredWidth(), Math.round(f5), i10, o.getMeasuredHeight() + Math.round(f5));
                         }
                         float measuredHeight = ((float) o.getMeasuredHeight()) + max + ((float) ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin) + f5;
                         float measuredHeight2 = f4 - ((((float) o.getMeasuredHeight()) + max) + ((float) ((ViewGroup.MarginLayoutParams) layoutParams).topMargin));
diff --git a/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
index ab5644bb2a..1d18f4d2f6 100644
--- a/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
+++ b/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
@@ -36,23 +36,23 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     public final c.i.a.e.c q = new c.i.a.e.c(this);
 
     /* renamed from: r  reason: collision with root package name */
-    public RecyclerView.Recycler f2784r;
+    public RecyclerView.Recycler f2782r;
     public RecyclerView.State s;
     public c t;
     public b u = new b(null);
     public OrientationHelper v;
 
     /* renamed from: w  reason: collision with root package name */
-    public OrientationHelper f2785w;
+    public OrientationHelper f2783w;
 
     /* renamed from: x  reason: collision with root package name */
-    public SavedState f2786x;
+    public SavedState f2784x;
 
     /* renamed from: y  reason: collision with root package name */
-    public int f2787y = -1;
+    public int f2785y = -1;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2788z = Integer.MIN_VALUE;
+    public int f2786z = Integer.MIN_VALUE;
 
     public static class LayoutParams extends RecyclerView.LayoutParams implements FlexItem {
         public static final Parcelable.Creator<LayoutParams> CREATOR = new a();
@@ -279,7 +279,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         public int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2789c;
+        public int f2787c;
         public int d = 0;
         public boolean e;
         public boolean f;
@@ -292,17 +292,17 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             if (!FlexboxLayoutManager.this.i()) {
                 FlexboxLayoutManager flexboxLayoutManager = FlexboxLayoutManager.this;
                 if (flexboxLayoutManager.n) {
-                    bVar.f2789c = bVar.e ? flexboxLayoutManager.v.getEndAfterPadding() : flexboxLayoutManager.getWidth() - FlexboxLayoutManager.this.v.getStartAfterPadding();
+                    bVar.f2787c = bVar.e ? flexboxLayoutManager.v.getEndAfterPadding() : flexboxLayoutManager.getWidth() - FlexboxLayoutManager.this.v.getStartAfterPadding();
                     return;
                 }
             }
-            bVar.f2789c = bVar.e ? FlexboxLayoutManager.this.v.getEndAfterPadding() : FlexboxLayoutManager.this.v.getStartAfterPadding();
+            bVar.f2787c = bVar.e ? FlexboxLayoutManager.this.v.getEndAfterPadding() : FlexboxLayoutManager.this.v.getStartAfterPadding();
         }
 
         public static void b(b bVar) {
             bVar.a = -1;
             bVar.b = -1;
-            bVar.f2789c = Integer.MIN_VALUE;
+            bVar.f2787c = Integer.MIN_VALUE;
             boolean z2 = false;
             bVar.f = false;
             bVar.g = false;
@@ -343,7 +343,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             O.append(", mFlexLinePosition=");
             O.append(this.b);
             O.append(", mCoordinate=");
-            O.append(this.f2789c);
+            O.append(this.f2787c);
             O.append(", mPerpendicularCoordinate=");
             O.append(this.d);
             O.append(", mLayoutFromEnd=");
@@ -362,7 +362,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2790c;
+        public int f2788c;
         public int d;
         public int e;
         public int f;
@@ -378,7 +378,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             StringBuilder O = c.d.b.a.a.O("LayoutState{mAvailable=");
             O.append(this.a);
             O.append(", mFlexLinePosition=");
-            O.append(this.f2790c);
+            O.append(this.f2788c);
             O.append(", mPosition=");
             O.append(this.d);
             O.append(", mOffset=");
@@ -418,7 +418,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             }
             this.k = 1;
             this.v = null;
-            this.f2785w = null;
+            this.f2783w = null;
             requestLayout();
         }
         if (this.l != 4) {
@@ -458,21 +458,21 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.t.b = false;
         }
         if (i() || !this.n) {
-            this.t.a = bVar.f2789c - this.v.getStartAfterPadding();
+            this.t.a = bVar.f2787c - this.v.getStartAfterPadding();
         } else {
-            this.t.a = (this.E.getWidth() - bVar.f2789c) - this.v.getStartAfterPadding();
+            this.t.a = (this.E.getWidth() - bVar.f2787c) - this.v.getStartAfterPadding();
         }
         c cVar = this.t;
         cVar.d = bVar.a;
         cVar.h = 1;
         cVar.i = -1;
-        cVar.e = bVar.f2789c;
+        cVar.e = bVar.f2787c;
         cVar.f = Integer.MIN_VALUE;
         int i3 = bVar.b;
-        cVar.f2790c = i3;
+        cVar.f2788c = i3;
         if (z2 && i3 > 0 && this.p.size() > (i2 = bVar.b)) {
             c cVar2 = this.t;
-            cVar2.f2790c--;
+            cVar2.f2788c--;
             cVar2.d -= this.p.get(i2).h;
         }
     }
@@ -633,7 +633,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     @Override // c.i.a.e.a
     public View f(int i2) {
         View view = this.C.get(i2);
-        return view != null ? view : this.f2784r.getViewForPosition(i2);
+        return view != null ? view : this.f2782r.getViewForPosition(i2);
     }
 
     public int findLastVisibleItemPosition() {
@@ -810,17 +810,17 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             if (i()) {
                 if (this.k == 0) {
                     this.v = OrientationHelper.createHorizontalHelper(this);
-                    this.f2785w = OrientationHelper.createVerticalHelper(this);
+                    this.f2783w = OrientationHelper.createVerticalHelper(this);
                     return;
                 }
                 this.v = OrientationHelper.createVerticalHelper(this);
-                this.f2785w = OrientationHelper.createHorizontalHelper(this);
+                this.f2783w = OrientationHelper.createHorizontalHelper(this);
             } else if (this.k == 0) {
                 this.v = OrientationHelper.createVerticalHelper(this);
-                this.f2785w = OrientationHelper.createHorizontalHelper(this);
+                this.f2783w = OrientationHelper.createHorizontalHelper(this);
             } else {
                 this.v = OrientationHelper.createHorizontalHelper(this);
-                this.f2785w = OrientationHelper.createVerticalHelper(this);
+                this.f2783w = OrientationHelper.createVerticalHelper(this);
             }
         }
     }
@@ -859,10 +859,10 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             }
             List<c.i.a.e.b> list = this.p;
             int i23 = cVar.d;
-            if (!(i23 >= 0 && i23 < state.getItemCount() && (i16 = cVar.f2790c) >= 0 && i16 < list.size())) {
+            if (!(i23 >= 0 && i23 < state.getItemCount() && (i16 = cVar.f2788c) >= 0 && i16 < list.size())) {
                 break;
             }
-            c.i.a.e.b bVar = this.p.get(cVar.f2790c);
+            c.i.a.e.b bVar = this.p.get(cVar.f2788c);
             cVar.d = bVar.o;
             if (i()) {
                 int paddingLeft = getPaddingLeft();
@@ -929,7 +929,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                     i26 = i12;
                 }
                 i3 = i19;
-                cVar.f2790c += this.t.i;
+                cVar.f2788c += this.t.i;
                 i5 = bVar.g;
                 i4 = i21;
                 i2 = i22;
@@ -1021,7 +1021,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 }
                 i4 = i21;
                 i2 = i22;
-                cVar.f2790c += this.t.i;
+                cVar.f2788c += this.t.i;
                 i5 = bVar.g;
             }
             i22 = i2 + i5;
@@ -1130,7 +1130,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         boolean z3;
         boolean z4;
         int i5;
-        this.f2784r = recycler;
+        this.f2782r = recycler;
         this.s = state;
         int itemCount = state.getItemCount();
         if (itemCount != 0 || !state.isPreLayout()) {
@@ -1168,32 +1168,32 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.q.k(itemCount);
             this.q.i(itemCount);
             this.t.j = false;
-            SavedState savedState = this.f2786x;
+            SavedState savedState = this.f2784x;
             if (savedState != null) {
                 int i7 = savedState.i;
                 if (i7 >= 0 && i7 < itemCount) {
-                    this.f2787y = i7;
+                    this.f2785y = i7;
                 }
             }
             b bVar = this.u;
-            if (!(bVar.f && this.f2787y == -1 && savedState == null)) {
+            if (!(bVar.f && this.f2785y == -1 && savedState == null)) {
                 b.b(bVar);
                 b bVar2 = this.u;
-                SavedState savedState2 = this.f2786x;
-                if (!state.isPreLayout() && (i5 = this.f2787y) != -1) {
+                SavedState savedState2 = this.f2784x;
+                if (!state.isPreLayout() && (i5 = this.f2785y) != -1) {
                     if (i5 < 0 || i5 >= state.getItemCount()) {
-                        this.f2787y = -1;
-                        this.f2788z = Integer.MIN_VALUE;
+                        this.f2785y = -1;
+                        this.f2786z = Integer.MIN_VALUE;
                     } else {
-                        int i8 = this.f2787y;
+                        int i8 = this.f2785y;
                         bVar2.a = i8;
                         bVar2.b = this.q.f1088c[i8];
-                        SavedState savedState3 = this.f2786x;
+                        SavedState savedState3 = this.f2784x;
                         if (savedState3 != null) {
                             int itemCount2 = state.getItemCount();
                             int i9 = savedState3.i;
                             if (i9 >= 0 && i9 < itemCount2) {
-                                bVar2.f2789c = this.v.getStartAfterPadding() + savedState2.j;
+                                bVar2.f2787c = this.v.getStartAfterPadding() + savedState2.j;
                                 bVar2.g = true;
                                 bVar2.b = -1;
                                 z3 = true;
@@ -1202,17 +1202,17 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                                         View p = bVar2.e ? p(state.getItemCount()) : n(state.getItemCount());
                                         if (p != null) {
                                             FlexboxLayoutManager flexboxLayoutManager = FlexboxLayoutManager.this;
-                                            OrientationHelper orientationHelper = flexboxLayoutManager.k == 0 ? flexboxLayoutManager.f2785w : flexboxLayoutManager.v;
+                                            OrientationHelper orientationHelper = flexboxLayoutManager.k == 0 ? flexboxLayoutManager.f2783w : flexboxLayoutManager.v;
                                             if (flexboxLayoutManager.i() || !FlexboxLayoutManager.this.n) {
                                                 if (bVar2.e) {
-                                                    bVar2.f2789c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedEnd(p);
+                                                    bVar2.f2787c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedEnd(p);
                                                 } else {
-                                                    bVar2.f2789c = orientationHelper.getDecoratedStart(p);
+                                                    bVar2.f2787c = orientationHelper.getDecoratedStart(p);
                                                 }
                                             } else if (bVar2.e) {
-                                                bVar2.f2789c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedStart(p);
+                                                bVar2.f2787c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedStart(p);
                                             } else {
-                                                bVar2.f2789c = orientationHelper.getDecoratedEnd(p);
+                                                bVar2.f2787c = orientationHelper.getDecoratedEnd(p);
                                             }
                                             int position = FlexboxLayoutManager.this.getPosition(p);
                                             bVar2.a = position;
@@ -1234,7 +1234,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                                             }
                                             if (!state.isPreLayout() && supportsPredictiveItemAnimations()) {
                                                 if (this.v.getDecoratedStart(p) >= this.v.getEndAfterPadding() || this.v.getDecoratedEnd(p) < this.v.getStartAfterPadding()) {
-                                                    bVar2.f2789c = bVar2.e ? this.v.getEndAfterPadding() : this.v.getStartAfterPadding();
+                                                    bVar2.f2787c = bVar2.e ? this.v.getEndAfterPadding() : this.v.getStartAfterPadding();
                                                 }
                                             }
                                             z4 = true;
@@ -1252,28 +1252,28 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                                 this.u.f = true;
                             }
                         }
-                        if (this.f2788z == Integer.MIN_VALUE) {
-                            View findViewByPosition = findViewByPosition(this.f2787y);
+                        if (this.f2786z == Integer.MIN_VALUE) {
+                            View findViewByPosition = findViewByPosition(this.f2785y);
                             if (findViewByPosition == null) {
                                 if (getChildCount() > 0) {
-                                    bVar2.e = this.f2787y < getPosition(getChildAt(0));
+                                    bVar2.e = this.f2785y < getPosition(getChildAt(0));
                                 }
                                 b.a(bVar2);
                             } else if (this.v.getDecoratedMeasurement(findViewByPosition) > this.v.getTotalSpace()) {
                                 b.a(bVar2);
                             } else if (this.v.getDecoratedStart(findViewByPosition) - this.v.getStartAfterPadding() < 0) {
-                                bVar2.f2789c = this.v.getStartAfterPadding();
+                                bVar2.f2787c = this.v.getStartAfterPadding();
                                 bVar2.e = false;
                             } else if (this.v.getEndAfterPadding() - this.v.getDecoratedEnd(findViewByPosition) < 0) {
-                                bVar2.f2789c = this.v.getEndAfterPadding();
+                                bVar2.f2787c = this.v.getEndAfterPadding();
                                 bVar2.e = true;
                             } else {
-                                bVar2.f2789c = bVar2.e ? this.v.getTotalSpaceChange() + this.v.getDecoratedEnd(findViewByPosition) : this.v.getDecoratedStart(findViewByPosition);
+                                bVar2.f2787c = bVar2.e ? this.v.getTotalSpaceChange() + this.v.getDecoratedEnd(findViewByPosition) : this.v.getDecoratedStart(findViewByPosition);
                             }
                         } else if (i() || !this.n) {
-                            bVar2.f2789c = this.v.getStartAfterPadding() + this.f2788z;
+                            bVar2.f2787c = this.v.getStartAfterPadding() + this.f2786z;
                         } else {
-                            bVar2.f2789c = this.f2788z - this.v.getEndPadding();
+                            bVar2.f2787c = this.f2786z - this.v.getEndPadding();
                         }
                         z3 = true;
                         if (!z3) {
@@ -1311,7 +1311,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.A = width;
             this.B = height;
             int i14 = this.F;
-            if (i14 != -1 || (this.f2787y == -1 && !z2)) {
+            if (i14 != -1 || (this.f2785y == -1 && !z2)) {
                 int min = i14 != -1 ? Math.min(i14, this.u.a) : this.u.a;
                 this.G.a();
                 if (i()) {
@@ -1346,7 +1346,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 b bVar4 = this.u;
                 int i15 = this.q.f1088c[bVar4.a];
                 bVar4.b = i15;
-                this.t.f2790c = i15;
+                this.t.f2788c = i15;
             }
             if (this.u.e) {
                 m(recycler, state, this.t);
@@ -1375,9 +1375,9 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public void onLayoutCompleted(RecyclerView.State state) {
         super.onLayoutCompleted(state);
-        this.f2786x = null;
-        this.f2787y = -1;
-        this.f2788z = Integer.MIN_VALUE;
+        this.f2784x = null;
+        this.f2785y = -1;
+        this.f2786z = Integer.MIN_VALUE;
         this.F = -1;
         b.b(this.u);
         this.C.clear();
@@ -1386,14 +1386,14 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public void onRestoreInstanceState(Parcelable parcelable) {
         if (parcelable instanceof SavedState) {
-            this.f2786x = (SavedState) parcelable;
+            this.f2784x = (SavedState) parcelable;
             requestLayout();
         }
     }
 
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public Parcelable onSaveInstanceState() {
-        SavedState savedState = this.f2786x;
+        SavedState savedState = this.f2784x;
         if (savedState != null) {
             return new SavedState(savedState, (a) null);
         }
@@ -1502,15 +1502,15 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         }
         int u = u(i2);
         this.u.d += u;
-        this.f2785w.offsetChildren(-u);
+        this.f2783w.offsetChildren(-u);
         return u;
     }
 
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public void scrollToPosition(int i2) {
-        this.f2787y = i2;
-        this.f2788z = Integer.MIN_VALUE;
-        SavedState savedState = this.f2786x;
+        this.f2785y = i2;
+        this.f2786z = Integer.MIN_VALUE;
+        SavedState savedState = this.f2784x;
         if (savedState != null) {
             savedState.i = -1;
         }
@@ -1526,7 +1526,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         }
         int u = u(i2);
         this.u.d += u;
-        this.f2785w.offsetChildren(-u);
+        this.f2783w.offsetChildren(-u);
         return u;
     }
 
@@ -1568,9 +1568,9 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             cVar.d = i6;
             int[] iArr = this.q.f1088c;
             if (iArr.length <= i6) {
-                cVar.f2790c = -1;
+                cVar.f2788c = -1;
             } else {
-                cVar.f2790c = iArr[i6];
+                cVar.f2788c = iArr[i6];
             }
             if (z3) {
                 cVar.e = this.v.getDecoratedStart(q);
@@ -1585,7 +1585,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 cVar.e = this.v.getDecoratedEnd(q);
                 this.t.f = this.v.getDecoratedEnd(q) - this.v.getEndAfterPadding();
             }
-            int i8 = this.t.f2790c;
+            int i8 = this.t.f2788c;
             if ((i8 == -1 || i8 > this.p.size() - 1) && this.t.d <= getFlexItemCount()) {
                 int i9 = abs - this.t.f;
                 this.G.a();
@@ -1616,7 +1616,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 cVar3.d = -1;
             }
             c cVar4 = this.t;
-            cVar4.f2790c = i10 > 0 ? i10 - 1 : 0;
+            cVar4.f2788c = i10 > 0 ? i10 - 1 : 0;
             if (z3) {
                 cVar4.e = this.v.getDecoratedEnd(o);
                 this.t.f = this.v.getDecoratedEnd(o) - this.v.getEndAfterPadding();
@@ -1776,7 +1776,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             removeAllViews();
             this.j = i2;
             this.v = null;
-            this.f2785w = null;
+            this.f2783w = null;
             k();
             requestLayout();
         }
@@ -1792,12 +1792,12 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 this.F = i2;
                 View childAt = getChildAt(0);
                 if (childAt != null) {
-                    this.f2787y = getPosition(childAt);
+                    this.f2785y = getPosition(childAt);
                     if (i() || !this.n) {
-                        this.f2788z = this.v.getDecoratedStart(childAt) - this.v.getStartAfterPadding();
+                        this.f2786z = this.v.getDecoratedStart(childAt) - this.v.getStartAfterPadding();
                         return;
                     }
-                    this.f2788z = this.v.getEndPadding() + this.v.getDecoratedEnd(childAt);
+                    this.f2786z = this.v.getEndPadding() + this.v.getDecoratedEnd(childAt);
                 }
             }
         }
@@ -1811,20 +1811,20 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.t.b = false;
         }
         if (i() || !this.n) {
-            this.t.a = this.v.getEndAfterPadding() - bVar.f2789c;
+            this.t.a = this.v.getEndAfterPadding() - bVar.f2787c;
         } else {
-            this.t.a = bVar.f2789c - getPaddingRight();
+            this.t.a = bVar.f2787c - getPaddingRight();
         }
         c cVar = this.t;
         cVar.d = bVar.a;
         cVar.h = 1;
         cVar.i = 1;
-        cVar.e = bVar.f2789c;
+        cVar.e = bVar.f2787c;
         cVar.f = Integer.MIN_VALUE;
-        cVar.f2790c = bVar.b;
+        cVar.f2788c = bVar.b;
         if (z2 && this.p.size() > 1 && (i2 = bVar.b) >= 0 && i2 < this.p.size() - 1) {
             c cVar2 = this.t;
-            cVar2.f2790c++;
+            cVar2.f2788c++;
             cVar2.d += this.p.get(bVar.b).h;
         }
     }
diff --git a/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java b/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java
index a53c61019c..8753243bee 100644
--- a/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java
+++ b/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java
@@ -28,7 +28,7 @@ public class AdvertisingIdClient {
     public b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2791c;
+    public boolean f2789c;
     public final Object d = new Object();
     @Nullable
     public a e;
@@ -102,7 +102,7 @@ public class AdvertisingIdClient {
             context = applicationContext;
         }
         this.f = context;
-        this.f2791c = false;
+        this.f2789c = false;
         this.h = j;
         this.g = z3;
     }
@@ -203,13 +203,13 @@ public class AdvertisingIdClient {
         synchronized (this) {
             if (this.f != null && this.a != null) {
                 try {
-                    if (this.f2791c) {
+                    if (this.f2789c) {
                         c.i.a.f.e.n.a.b().c(this.f, this.a);
                     }
                 } catch (Throwable th) {
                     Log.i("AdvertisingIdClient", "AdvertisingIdClient unbindService failed.", th);
                 }
-                this.f2791c = false;
+                this.f2789c = false;
                 this.b = null;
                 this.a = null;
             }
@@ -220,7 +220,7 @@ public class AdvertisingIdClient {
         Info info;
         c.c.a.a0.d.x("Calling this from your main thread can lead to deadlock");
         synchronized (this) {
-            if (!this.f2791c) {
+            if (!this.f2789c) {
                 synchronized (this.d) {
                     a aVar = this.e;
                     if (aVar == null || !aVar.l) {
@@ -229,7 +229,7 @@ public class AdvertisingIdClient {
                 }
                 try {
                     f(false);
-                    if (!this.f2791c) {
+                    if (!this.f2789c) {
                         throw new IOException("AdvertisingIdClient cannot reconnect.");
                     }
                 } catch (Exception e) {
@@ -268,13 +268,13 @@ public class AdvertisingIdClient {
     public final void f(boolean z2) throws IOException, IllegalStateException, GooglePlayServicesNotAvailableException, GooglePlayServicesRepairableException {
         c.c.a.a0.d.x("Calling this from your main thread can lead to deadlock");
         synchronized (this) {
-            if (this.f2791c) {
+            if (this.f2789c) {
                 a();
             }
             c.i.a.f.e.a c2 = c(this.f, this.g);
             this.a = c2;
             this.b = d(c2);
-            this.f2791c = true;
+            this.f2789c = true;
             if (z2) {
                 e();
             }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java b/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
index 08c9649275..4d9dec2eaf 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
@@ -39,7 +39,7 @@ public class Credential extends AbstractSafeParcelable implements ReflectedParce
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public Uri f2792c;
+        public Uri f2790c;
         @Nullable
         public String d;
 
@@ -48,7 +48,7 @@ public class Credential extends AbstractSafeParcelable implements ReflectedParce
         }
 
         public Credential a() {
-            return new Credential(this.a, this.b, this.f2792c, null, this.d, null, null, null);
+            return new Credential(this.a, this.b, this.f2790c, null, this.d, null, null, null);
         }
     }
 
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
index 05b4937e8e..faf2c50a71 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
@@ -40,7 +40,7 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
     public String q;
 
     /* renamed from: r  reason: collision with root package name */
-    public List<Scope> f2793r;
+    public List<Scope> f2791r;
     @Nullable
     public String s;
     @Nullable
@@ -57,7 +57,7 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
         this.o = str5;
         this.p = j;
         this.q = str6;
-        this.f2793r = list;
+        this.f2791r = list;
         this.s = str7;
         this.t = str8;
     }
@@ -117,7 +117,7 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
 
     @NonNull
     public Set<Scope> v0() {
-        HashSet hashSet = new HashSet(this.f2793r);
+        HashSet hashSet = new HashSet(this.f2791r);
         hashSet.addAll(this.u);
         return hashSet;
     }
@@ -138,7 +138,7 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
         c.c.a.a0.d.z2(parcel, 8, 8);
         parcel.writeLong(j);
         c.c.a.a0.d.s2(parcel, 9, this.q, false);
-        c.c.a.a0.d.v2(parcel, 10, this.f2793r, false);
+        c.c.a.a0.d.v2(parcel, 10, this.f2791r, false);
         c.c.a.a0.d.s2(parcel, 11, this.s, false);
         c.c.a.a0.d.s2(parcel, 12, this.t, false);
         c.c.a.a0.d.B2(parcel, w2);
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
index c636bb57e3..7af40a7670 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
@@ -42,7 +42,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
     public Account q;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2794r;
+    public boolean f2792r;
     public final boolean s;
     public final boolean t;
     @Nullable
@@ -51,14 +51,14 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
     public String v;
 
     /* renamed from: w  reason: collision with root package name */
-    public ArrayList<GoogleSignInOptionsExtensionParcelable> f2795w;
+    public ArrayList<GoogleSignInOptionsExtensionParcelable> f2793w;
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public String f2796x;
+    public String f2794x;
 
     /* renamed from: y  reason: collision with root package name */
-    public Map<Integer, GoogleSignInOptionsExtensionParcelable> f2797y;
+    public Map<Integer, GoogleSignInOptionsExtensionParcelable> f2795y;
 
     /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
     public static final class a {
@@ -66,7 +66,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f2798c;
+        public boolean f2796c;
         public boolean d;
         @Nullable
         public String e;
@@ -84,13 +84,13 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         public a(@NonNull GoogleSignInOptions googleSignInOptions) {
             this.a = new HashSet(googleSignInOptions.p);
             this.b = googleSignInOptions.s;
-            this.f2798c = googleSignInOptions.t;
-            this.d = googleSignInOptions.f2794r;
+            this.f2796c = googleSignInOptions.t;
+            this.d = googleSignInOptions.f2792r;
             this.e = googleSignInOptions.u;
             this.f = googleSignInOptions.q;
             this.g = googleSignInOptions.v;
-            this.h = GoogleSignInOptions.x0(googleSignInOptions.f2795w);
-            this.i = googleSignInOptions.f2796x;
+            this.h = GoogleSignInOptions.x0(googleSignInOptions.f2793w);
+            this.i = googleSignInOptions.f2794x;
         }
 
         public final GoogleSignInOptions a() {
@@ -104,7 +104,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
             if (this.d && (this.f == null || !this.a.isEmpty())) {
                 this.a.add(GoogleSignInOptions.j);
             }
-            return new GoogleSignInOptions(3, new ArrayList(this.a), this.f, this.d, this.b, this.f2798c, this.e, this.g, this.h, this.i);
+            return new GoogleSignInOptions(3, new ArrayList(this.a), this.f, this.d, this.b, this.f2796c, this.e, this.g, this.h, this.i);
         }
     }
 
@@ -140,14 +140,14 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         this.o = i2;
         this.p = arrayList;
         this.q = account;
-        this.f2794r = z2;
+        this.f2792r = z2;
         this.s = z3;
         this.t = z4;
         this.u = str;
         this.v = str2;
-        this.f2795w = new ArrayList<>(map.values());
-        this.f2797y = map;
-        this.f2796x = str3;
+        this.f2793w = new ArrayList<>(map.values());
+        this.f2795y = map;
+        this.f2794x = str3;
     }
 
     @Nullable
@@ -200,8 +200,8 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         }
         try {
             GoogleSignInOptions googleSignInOptions = (GoogleSignInOptions) obj;
-            if (this.f2795w.size() <= 0) {
-                if (googleSignInOptions.f2795w.size() <= 0) {
+            if (this.f2793w.size() <= 0) {
+                if (googleSignInOptions.f2793w.size() <= 0) {
                     if (this.p.size() == googleSignInOptions.v0().size()) {
                         if (this.p.containsAll(googleSignInOptions.v0())) {
                             Account account = this.q;
@@ -213,7 +213,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
                                 if (TextUtils.isEmpty(googleSignInOptions.u)) {
                                 }
                             }
-                            if (this.t == googleSignInOptions.t && this.f2794r == googleSignInOptions.f2794r && this.s == googleSignInOptions.s && TextUtils.equals(this.f2796x, googleSignInOptions.f2796x)) {
+                            if (this.t == googleSignInOptions.t && this.f2792r == googleSignInOptions.f2792r && this.s == googleSignInOptions.s && TextUtils.equals(this.f2794x, googleSignInOptions.f2794x)) {
                                 return true;
                             }
                         }
@@ -241,8 +241,8 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         Account account = this.q;
         int hashCode = ((arrayList.hashCode() + 31) * 31) + (account == null ? 0 : account.hashCode());
         String str = this.u;
-        int hashCode2 = (((((((hashCode * 31) + (str == null ? 0 : str.hashCode())) * 31) + (this.t ? 1 : 0)) * 31) + (this.f2794r ? 1 : 0)) * 31) + (this.s ? 1 : 0);
-        String str2 = this.f2796x;
+        int hashCode2 = (((((((hashCode * 31) + (str == null ? 0 : str.hashCode())) * 31) + (this.t ? 1 : 0)) * 31) + (this.f2792r ? 1 : 0)) * 31) + (this.s ? 1 : 0);
+        String str2 = this.f2794x;
         int i4 = hashCode2 * 31;
         if (str2 != null) {
             i2 = str2.hashCode();
@@ -262,7 +262,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         parcel.writeInt(i3);
         d.v2(parcel, 2, v0(), false);
         d.r2(parcel, 3, this.q, i2, false);
-        boolean z2 = this.f2794r;
+        boolean z2 = this.f2792r;
         d.z2(parcel, 4, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.s;
@@ -273,8 +273,8 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         parcel.writeInt(z4 ? 1 : 0);
         d.s2(parcel, 7, this.u, false);
         d.s2(parcel, 8, this.v, false);
-        d.v2(parcel, 9, this.f2795w, false);
-        d.s2(parcel, 10, this.f2796x, false);
+        d.v2(parcel, 9, this.f2793w, false);
+        d.s2(parcel, 10, this.f2794x, false);
         d.B2(parcel, w2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java b/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
index bb2192513e..f8856a28b3 100644
--- a/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
+++ b/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
@@ -43,7 +43,7 @@ import com.google.android.gms.tasks.TaskCompletionSource;
 public class GoogleApiAvailability extends c {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Object f2799c = new Object();
+    public static final Object f2797c = new Object();
     public static final GoogleApiAvailability d = new GoogleApiAvailability();
     public static final int e = c.a;
 
@@ -211,7 +211,7 @@ public class GoogleApiAvailability extends c {
             }
             if (c.i.a.f.e.o.c.R()) {
                 d.F(c.i.a.f.e.o.c.R());
-                synchronized (f2799c) {
+                synchronized (f2797c) {
                 }
                 NotificationChannel notificationChannel = notificationManager.getNotificationChannel("com.google.android.gms.availability");
                 SimpleArrayMap<String, String> simpleArrayMap = m.a;
diff --git a/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java b/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java
index 4a876f1a6c..075df2c9c2 100644
--- a/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java
+++ b/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java
@@ -81,7 +81,7 @@ public class GoogleApiActivity extends Activity implements DialogInterface.OnCan
                     finish();
                 }
             } else {
-                Object obj = GoogleApiAvailability.f2799c;
+                Object obj = GoogleApiAvailability.f2797c;
                 GoogleApiAvailability.d.f(this, num == null ? 8 : num.intValue(), 2, this);
                 this.j = 1;
             }
diff --git a/app/src/main/java/com/google/android/gms/common/api/Status.java b/app/src/main/java/com/google/android/gms/common/api/Status.java
index d079da91d0..5b37d6506e 100644
--- a/app/src/main/java/com/google/android/gms/common/api/Status.java
+++ b/app/src/main/java/com/google/android/gms/common/api/Status.java
@@ -36,7 +36,7 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public final ConnectionResult f2800r;
+    public final ConnectionResult f2798r;
 
     static {
         new Status(17, null);
@@ -48,7 +48,7 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
         this.o = i3;
         this.p = str;
         this.q = pendingIntent;
-        this.f2800r = connectionResult;
+        this.f2798r = connectionResult;
     }
 
     public Status(@RecentlyNonNull int i2, @Nullable String str) {
@@ -56,7 +56,7 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
         this.o = i2;
         this.p = str;
         this.q = null;
-        this.f2800r = null;
+        this.f2798r = null;
     }
 
     public Status(@RecentlyNonNull int i2, @Nullable String str, @Nullable PendingIntent pendingIntent) {
@@ -64,7 +64,7 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
         this.o = i2;
         this.p = str;
         this.q = pendingIntent;
-        this.f2800r = null;
+        this.f2798r = null;
     }
 
     @Override // c.i.a.f.e.h.h
@@ -80,13 +80,13 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
             return false;
         }
         Status status = (Status) obj;
-        return this.n == status.n && this.o == status.o && d.j0(this.p, status.p) && d.j0(this.q, status.q) && d.j0(this.f2800r, status.f2800r);
+        return this.n == status.n && this.o == status.o && d.j0(this.p, status.p) && d.j0(this.q, status.q) && d.j0(this.f2798r, status.f2798r);
     }
 
     @Override // java.lang.Object
     @RecentlyNonNull
     public final int hashCode() {
-        return Arrays.hashCode(new Object[]{Integer.valueOf(this.n), Integer.valueOf(this.o), this.p, this.q, this.f2800r});
+        return Arrays.hashCode(new Object[]{Integer.valueOf(this.n), Integer.valueOf(this.o), this.p, this.q, this.f2798r});
     }
 
     @Override // java.lang.Object
@@ -117,7 +117,7 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
         parcel.writeInt(i3);
         d.s2(parcel, 2, this.p, false);
         d.r2(parcel, 3, this.q, i2, false);
-        d.r2(parcel, 4, this.f2800r, i2, false);
+        d.r2(parcel, 4, this.f2798r, i2, false);
         int i4 = this.n;
         d.z2(parcel, 1000, 4);
         parcel.writeInt(i4);
diff --git a/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java b/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java
index 8932416037..78e700221b 100644
--- a/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java
+++ b/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java
@@ -27,7 +27,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
     public final Object b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a<R> f2801c;
+    public final a<R> f2799c;
     public final CountDownLatch d;
     public final ArrayList<d.a> e;
     public final AtomicReference<l0> f;
@@ -87,7 +87,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
         this.e = new ArrayList<>();
         this.f = new AtomicReference<>();
         this.k = false;
-        this.f2801c = new a<>(Looper.getMainLooper());
+        this.f2799c = new a<>(Looper.getMainLooper());
         new WeakReference(null);
     }
 
@@ -97,7 +97,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
         this.e = new ArrayList<>();
         this.f = new AtomicReference<>();
         this.k = false;
-        this.f2801c = new a<>(cVar != null ? cVar.c() : Looper.getMainLooper());
+        this.f2799c = new a<>(cVar != null ? cVar.c() : Looper.getMainLooper());
         new WeakReference(cVar);
     }
 
diff --git a/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
index 79fa7ed3e5..2450855254 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
@@ -34,7 +34,7 @@ public class GetServiceRequest extends AbstractSafeParcelable {
     public Feature[] q;
 
     /* renamed from: r  reason: collision with root package name */
-    public Feature[] f2802r;
+    public Feature[] f2800r;
     public boolean s;
     public int t;
     public boolean u;
@@ -79,7 +79,7 @@ public class GetServiceRequest extends AbstractSafeParcelable {
         this.n = scopeArr;
         this.o = bundle;
         this.q = featureArr;
-        this.f2802r = featureArr2;
+        this.f2800r = featureArr2;
         this.s = z2;
         this.t = i4;
         this.u = z3;
@@ -103,7 +103,7 @@ public class GetServiceRequest extends AbstractSafeParcelable {
         d.o2(parcel, 7, this.o, false);
         d.r2(parcel, 8, this.p, i, false);
         d.u2(parcel, 10, this.q, i, false);
-        d.u2(parcel, 11, this.f2802r, i, false);
+        d.u2(parcel, 11, this.f2800r, i, false);
         boolean z2 = this.s;
         d.z2(parcel, 12, 4);
         parcel.writeInt(z2 ? 1 : 0);
diff --git a/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java b/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
index 46a6211c15..18727c84c4 100644
--- a/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
+++ b/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
@@ -33,7 +33,7 @@ public final class DynamiteModule {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public static i f2803c = null;
+    public static i f2801c = null;
     @Nullable
     public static String d = null;
     public static int e = -1;
@@ -75,7 +75,7 @@ public final class DynamiteModule {
             public int b = 0;
 
             /* renamed from: c  reason: collision with root package name */
-            public int f2804c = 0;
+            public int f2802c = 0;
         }
 
         /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
@@ -177,7 +177,7 @@ public final class DynamiteModule {
             sb.append(":");
             sb.append(i3);
             Log.i("DynamiteModule", sb.toString());
-            int i4 = a2.f2804c;
+            int i4 = a2.f2802c;
             if (i4 == 0 || ((i4 == -1 && a2.a == 0) || (i4 == 1 && a2.b == 0))) {
                 int i5 = a2.a;
                 int i6 = a2.b;
@@ -209,13 +209,13 @@ public final class DynamiteModule {
                     String valueOf = String.valueOf(e3.getMessage());
                     Log.w("DynamiteModule", valueOf.length() != 0 ? "Failed to load remote module: ".concat(valueOf) : new String("Failed to load remote module: "));
                     int i7 = a2.a;
-                    if (i7 == 0 || aVar.a(context, str, new c(i7)).f2804c != -1) {
+                    if (i7 == 0 || aVar.a(context, str, new c(i7)).f2802c != -1) {
                         throw new LoadingException("Remote load failed. No local fallback found.", e3, null);
                     }
                     return e(context, str);
                 }
             } else {
-                int i8 = a2.f2804c;
+                int i8 = a2.f2802c;
                 StringBuilder sb3 = new StringBuilder(47);
                 sb3.append("VersionPolicy returned invalid code:");
                 sb3.append(i8);
@@ -415,7 +415,7 @@ public final class DynamiteModule {
                 IInterface queryLocalInterface = iBinder.queryLocalInterface("com.google.android.gms.dynamite.IDynamiteLoaderV2");
                 iVar = queryLocalInterface instanceof i ? (i) queryLocalInterface : new h(iBinder);
             }
-            f2803c = iVar;
+            f2801c = iVar;
         } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e2) {
             throw new LoadingException("Failed to instantiate dynamite loader", e2, null);
         }
@@ -530,7 +530,7 @@ public final class DynamiteModule {
         sb.append(i2);
         Log.i("DynamiteModule", sb.toString());
         synchronized (DynamiteModule.class) {
-            iVar = f2803c;
+            iVar = f2801c;
         }
         if (iVar != null) {
             b bVar = f.get();
diff --git a/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java b/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java
index 7f5ee04a0f..a024464b14 100644
--- a/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java
+++ b/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java
@@ -22,7 +22,7 @@ public abstract class zzhi extends u3 {
     public static final boolean b = j7.g;
 
     /* renamed from: c  reason: collision with root package name */
-    public g4 f2805c;
+    public g4 f2803c;
 
     /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
     public static class a extends zzhi {
@@ -215,7 +215,7 @@ public abstract class zzhi extends u3 {
                 l3Var.l(e);
             }
             r(e);
-            q6Var.g(c6Var, this.f2805c);
+            q6Var.g(c6Var, this.f2803c);
         }
 
         @Override // com.google.android.gms.internal.measurement.zzhi
diff --git a/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java b/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
index 3f06ce2633..91d181d725 100644
--- a/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
+++ b/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
@@ -37,7 +37,7 @@ public class AppMeasurement {
     public final u4 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b7 f2806c;
+    public final b7 f2804c;
     public final boolean d;
 
     /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
@@ -154,7 +154,7 @@ public class AppMeasurement {
     }
 
     public AppMeasurement(b7 b7Var) {
-        this.f2806c = b7Var;
+        this.f2804c = b7Var;
         this.b = null;
         this.d = true;
     }
@@ -162,7 +162,7 @@ public class AppMeasurement {
     public AppMeasurement(u4 u4Var) {
         Objects.requireNonNull(u4Var, "null reference");
         this.b = u4Var;
-        this.f2806c = null;
+        this.f2804c = null;
         this.d = false;
     }
 
@@ -193,7 +193,7 @@ public class AppMeasurement {
     @Keep
     public void beginAdUnitExposure(@NonNull @Size(min = 1) String str) {
         if (this.d) {
-            this.f2806c.g(str);
+            this.f2804c.g(str);
             return;
         }
         a A = this.b.A();
@@ -204,7 +204,7 @@ public class AppMeasurement {
     @Keep
     public void clearConditionalUserProperty(@NonNull @Size(max = 24, min = 1) String str, @Nullable String str2, @Nullable Bundle bundle) {
         if (this.d) {
-            this.f2806c.l(str, str2, bundle);
+            this.f2804c.l(str, str2, bundle);
         } else {
             this.b.s().R(str, str2, bundle);
         }
@@ -213,7 +213,7 @@ public class AppMeasurement {
     @Keep
     public void endAdUnitExposure(@NonNull @Size(min = 1) String str) {
         if (this.d) {
-            this.f2806c.j(str);
+            this.f2804c.j(str);
             return;
         }
         a A = this.b.A();
@@ -223,13 +223,13 @@ public class AppMeasurement {
 
     @Keep
     public long generateEventId() {
-        return this.d ? this.f2806c.e() : this.b.t().t0();
+        return this.d ? this.f2804c.e() : this.b.t().t0();
     }
 
     @Nullable
     @Keep
     public String getAppInstanceId() {
-        return this.d ? this.f2806c.c() : this.b.s().g.get();
+        return this.d ? this.f2804c.c() : this.b.s().g.get();
     }
 
     @Keep
@@ -238,7 +238,7 @@ public class AppMeasurement {
         List<Bundle> list;
         int i = 0;
         if (this.d) {
-            list = this.f2806c.i(str, str2);
+            list = this.f2804c.i(str, str2);
         } else {
             c6 s = this.b.s();
             if (s.f().y()) {
@@ -273,7 +273,7 @@ public class AppMeasurement {
     @Keep
     public String getCurrentScreenClass() {
         if (this.d) {
-            return this.f2806c.b();
+            return this.f2804c.b();
         }
         i7 i7Var = this.b.s().a.w().f1237c;
         if (i7Var != null) {
@@ -286,7 +286,7 @@ public class AppMeasurement {
     @Keep
     public String getCurrentScreenName() {
         if (this.d) {
-            return this.f2806c.a();
+            return this.f2804c.a();
         }
         i7 i7Var = this.b.s().a.w().f1237c;
         if (i7Var != null) {
@@ -298,14 +298,14 @@ public class AppMeasurement {
     @Nullable
     @Keep
     public String getGmpAppId() {
-        return this.d ? this.f2806c.d() : this.b.s().O();
+        return this.d ? this.f2804c.d() : this.b.s().O();
     }
 
     @Keep
     @WorkerThread
     public int getMaxUserProperties(@NonNull @Size(min = 1) String str) {
         if (this.d) {
-            return this.f2806c.h(str);
+            return this.f2804c.h(str);
         }
         this.b.s();
         c.c.a.a0.d.w(str);
@@ -316,7 +316,7 @@ public class AppMeasurement {
     @WorkerThread
     public Map<String, Object> getUserProperties(@Nullable String str, @Nullable @Size(max = 24, min = 1) String str2, boolean z2) {
         if (this.d) {
-            return this.f2806c.k(str, str2, z2);
+            return this.f2804c.k(str, str2, z2);
         }
         c6 s = this.b.s();
         if (s.f().y()) {
@@ -344,7 +344,7 @@ public class AppMeasurement {
     @Keep
     public void logEventInternal(String str, String str2, Bundle bundle) {
         if (this.d) {
-            this.f2806c.m(str, str2, bundle);
+            this.f2804c.m(str, str2, bundle);
         } else {
             this.b.s().H(str, str2, bundle);
         }
@@ -354,7 +354,7 @@ public class AppMeasurement {
     public void setConditionalUserProperty(@NonNull ConditionalUserProperty conditionalUserProperty) {
         Objects.requireNonNull(conditionalUserProperty, "null reference");
         if (this.d) {
-            this.f2806c.f(conditionalUserProperty.a());
+            this.f2804c.f(conditionalUserProperty.a());
             return;
         }
         c6 s = this.b.s();
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java
index 3399f9ab53..4259e1073b 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java
@@ -26,30 +26,30 @@ public final class zzn extends AbstractSafeParcelable {
     public final boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final long f2807r;
+    public final long f2805r;
     public final String s;
     public final long t;
     public final long u;
     public final int v;
 
     /* renamed from: w  reason: collision with root package name */
-    public final boolean f2808w;
+    public final boolean f2806w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final boolean f2809x;
+    public final boolean f2807x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final boolean f2810y;
+    public final boolean f2808y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final String f2811z;
+    public final String f2809z;
 
     public zzn(String str, String str2, String str3, long j, String str4, long j2, long j3, String str5, boolean z2, boolean z3, String str6, long j4, long j5, int i, boolean z4, boolean z5, boolean z6, String str7, Boolean bool, long j6, List<String> list, String str8, String str9) {
         d.w(str);
         this.i = str;
         this.j = TextUtils.isEmpty(str2) ? null : str2;
         this.k = str3;
-        this.f2807r = j;
+        this.f2805r = j;
         this.l = str4;
         this.m = j2;
         this.n = j3;
@@ -60,10 +60,10 @@ public final class zzn extends AbstractSafeParcelable {
         this.t = j4;
         this.u = j5;
         this.v = i;
-        this.f2808w = z4;
-        this.f2809x = z5;
-        this.f2810y = z6;
-        this.f2811z = str7;
+        this.f2806w = z4;
+        this.f2807x = z5;
+        this.f2808y = z6;
+        this.f2809z = str7;
         this.A = bool;
         this.B = j6;
         this.C = list;
@@ -75,7 +75,7 @@ public final class zzn extends AbstractSafeParcelable {
         this.i = str;
         this.j = str2;
         this.k = str3;
-        this.f2807r = j3;
+        this.f2805r = j3;
         this.l = str4;
         this.m = j;
         this.n = j2;
@@ -86,10 +86,10 @@ public final class zzn extends AbstractSafeParcelable {
         this.t = j4;
         this.u = j5;
         this.v = i;
-        this.f2808w = z4;
-        this.f2809x = z5;
-        this.f2810y = z6;
-        this.f2811z = str7;
+        this.f2806w = z4;
+        this.f2807x = z5;
+        this.f2808y = z6;
+        this.f2809z = str7;
         this.A = bool;
         this.B = j6;
         this.C = list;
@@ -117,7 +117,7 @@ public final class zzn extends AbstractSafeParcelable {
         boolean z3 = this.q;
         d.z2(parcel, 10, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        long j3 = this.f2807r;
+        long j3 = this.f2805r;
         d.z2(parcel, 11, 8);
         parcel.writeLong(j3);
         d.s2(parcel, 12, this.s, false);
@@ -130,16 +130,16 @@ public final class zzn extends AbstractSafeParcelable {
         int i2 = this.v;
         d.z2(parcel, 15, 4);
         parcel.writeInt(i2);
-        boolean z4 = this.f2808w;
+        boolean z4 = this.f2806w;
         d.z2(parcel, 16, 4);
         parcel.writeInt(z4 ? 1 : 0);
-        boolean z5 = this.f2809x;
+        boolean z5 = this.f2807x;
         d.z2(parcel, 17, 4);
         parcel.writeInt(z5 ? 1 : 0);
-        boolean z6 = this.f2810y;
+        boolean z6 = this.f2808y;
         d.z2(parcel, 18, 4);
         parcel.writeInt(z6 ? 1 : 0);
-        d.s2(parcel, 19, this.f2811z, false);
+        d.s2(parcel, 19, this.f2809z, false);
         Boolean bool = this.A;
         if (bool != null) {
             d.z2(parcel, 21, 4);
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java
index 12356881b6..44010f9b86 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java
@@ -19,7 +19,7 @@ public final class zzz extends AbstractSafeParcelable {
     public zzaq q;
 
     /* renamed from: r  reason: collision with root package name */
-    public long f2812r;
+    public long f2810r;
     public zzaq s;
 
     public zzz(zzz zzz) {
@@ -32,7 +32,7 @@ public final class zzz extends AbstractSafeParcelable {
         this.o = zzz.o;
         this.p = zzz.p;
         this.q = zzz.q;
-        this.f2812r = zzz.f2812r;
+        this.f2810r = zzz.f2810r;
         this.s = zzz.s;
     }
 
@@ -46,7 +46,7 @@ public final class zzz extends AbstractSafeParcelable {
         this.o = zzaq;
         this.p = j2;
         this.q = zzaq2;
-        this.f2812r = j3;
+        this.f2810r = j3;
         this.s = zzaq3;
     }
 
@@ -68,7 +68,7 @@ public final class zzz extends AbstractSafeParcelable {
         d.z2(parcel, 9, 8);
         parcel.writeLong(j2);
         d.r2(parcel, 10, this.q, i, false);
-        long j3 = this.f2812r;
+        long j3 = this.f2810r;
         d.z2(parcel, 11, 8);
         parcel.writeLong(j3);
         d.r2(parcel, 12, this.s, i, false);
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java b/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java
index 9284dad2ca..4e3f089f93 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java
@@ -22,7 +22,7 @@ public class Strategy extends AbstractSafeParcelable {
     public final int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final int f2813r;
+    public final int f2811r;
 
     static {
         d.o(true, "mTtlSeconds(%d) must either be TTL_SECONDS_INFINITE, or it must be between 1 and TTL_SECONDS_MAX(%d) inclusive", Integer.MAX_VALUE, 86400);
@@ -55,14 +55,14 @@ public class Strategy extends AbstractSafeParcelable {
                     this.p = i6;
                 }
             }
-            this.f2813r = i8;
+            this.f2811r = i8;
         }
         this.q = i7;
         this.n = i5;
         this.o = z2;
         if (!z2) {
         }
-        this.f2813r = i8;
+        this.f2811r = i8;
     }
 
     @Override // java.lang.Object
@@ -74,12 +74,12 @@ public class Strategy extends AbstractSafeParcelable {
             return false;
         }
         Strategy strategy = (Strategy) obj;
-        return this.k == strategy.k && this.q == strategy.q && this.m == strategy.m && this.n == strategy.n && this.p == strategy.p && this.f2813r == strategy.f2813r;
+        return this.k == strategy.k && this.q == strategy.q && this.m == strategy.m && this.n == strategy.n && this.p == strategy.p && this.f2811r == strategy.f2811r;
     }
 
     @Override // java.lang.Object
     public int hashCode() {
-        return (((((((((this.k * 31) + this.q) * 31) + this.m) * 31) + this.n) * 31) + this.p) * 31) + this.f2813r;
+        return (((((((((this.k * 31) + this.q) * 31) + this.m) * 31) + this.n) * 31) + this.p) * 31) + this.f2811r;
     }
 
     @Override // java.lang.Object
@@ -116,7 +116,7 @@ public class Strategy extends AbstractSafeParcelable {
             }
             str2 = arrayList2.isEmpty() ? a.f(19, "UNKNOWN:", i5) : arrayList2.toString();
         }
-        int i6 = this.f2813r;
+        int i6 = this.f2811r;
         if (i6 != 0) {
             str3 = i6 != 1 ? a.f(20, "UNKNOWN: ", i6) : "ALWAYS_ON";
         }
@@ -153,7 +153,7 @@ public class Strategy extends AbstractSafeParcelable {
         int i7 = this.q;
         d.z2(parcel, 6, 4);
         parcel.writeInt(i7);
-        int i8 = this.f2813r;
+        int i8 = this.f2811r;
         d.z2(parcel, 7, 4);
         parcel.writeInt(i8);
         int i9 = this.k;
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java b/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java
index 3be2750def..8e1c9a73ee 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java
@@ -9,7 +9,7 @@ public final class SubscribeOptions {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public final d f2814c = null;
+    public final d f2812c = null;
     public final boolean d = false;
 
     static {
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java
index 6ce94ac3fc..2f77922ad4 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java
@@ -39,7 +39,7 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
     @Nullable
 
     /* renamed from: r  reason: collision with root package name */
-    public final byte[] f2815r;
+    public final byte[] f2813r;
     @Deprecated
     public final boolean s;
     @Nullable
@@ -50,13 +50,13 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
     public final ClientAppContext v;
 
     /* renamed from: w  reason: collision with root package name */
-    public final boolean f2816w;
+    public final boolean f2814w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final int f2817x;
+    public final int f2815x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2818y;
+    public final int f2816y;
 
     public SubscribeRequest(int i, @Nullable IBinder iBinder, Strategy strategy, IBinder iBinder2, MessageFilter messageFilter, @Nullable PendingIntent pendingIntent, int i2, @Nullable String str, @Nullable String str2, @Nullable byte[] bArr, boolean z2, @Nullable IBinder iBinder3, boolean z3, @Nullable ClientAppContext clientAppContext, boolean z4, int i3, int i4) {
         o0 o0Var;
@@ -83,7 +83,7 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         this.o = i2;
         this.p = str;
         this.q = str2;
-        this.f2815r = bArr;
+        this.f2813r = bArr;
         this.s = z2;
         if (iBinder3 != null) {
             IInterface queryLocalInterface3 = iBinder3.queryLocalInterface("com.google.android.gms.nearby.messages.internal.ISubscribeCallback");
@@ -92,9 +92,9 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         this.t = aVar;
         this.u = z3;
         this.v = ClientAppContext.v0(clientAppContext, str2, str, z3);
-        this.f2816w = z4;
-        this.f2817x = i3;
-        this.f2818y = i4;
+        this.f2814w = z4;
+        this.f2815x = i3;
+        this.f2816y = i4;
     }
 
     @Override // java.lang.Object
@@ -105,7 +105,7 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         String valueOf3 = String.valueOf(this.l);
         String valueOf4 = String.valueOf(this.m);
         String valueOf5 = String.valueOf(this.n);
-        byte[] bArr = this.f2815r;
+        byte[] bArr = this.f2813r;
         if (bArr == null) {
             str = null;
         } else {
@@ -119,11 +119,11 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         String valueOf6 = String.valueOf(this.t);
         boolean z2 = this.u;
         String valueOf7 = String.valueOf(this.v);
-        boolean z3 = this.f2816w;
+        boolean z3 = this.f2814w;
         String str2 = this.p;
         String str3 = this.q;
         boolean z4 = this.s;
-        int i = this.f2818y;
+        int i = this.f2816y;
         StringBuilder N = c.d.b.a.a.N(c.d.b.a.a.b(str3, c.d.b.a.a.b(str2, valueOf7.length() + valueOf6.length() + c.d.b.a.a.b(str, valueOf5.length() + valueOf4.length() + valueOf3.length() + valueOf2.length() + valueOf.length() + 291))), "SubscribeRequest{messageListener=", valueOf, ", strategy=", valueOf2);
         c.d.b.a.a.n0(N, ", callback=", valueOf3, ", filter=", valueOf4);
         c.d.b.a.a.n0(N, ", pendingIntent=", valueOf5, ", hint=", str);
@@ -163,7 +163,7 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         parcel.writeInt(i3);
         d.s2(parcel, 8, this.p, false);
         d.s2(parcel, 9, this.q, false);
-        d.p2(parcel, 10, this.f2815r, false);
+        d.p2(parcel, 10, this.f2813r, false);
         boolean z2 = this.s;
         d.z2(parcel, 11, 4);
         parcel.writeInt(z2 ? 1 : 0);
@@ -176,13 +176,13 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         d.z2(parcel, 13, 4);
         parcel.writeInt(z3 ? 1 : 0);
         d.r2(parcel, 14, this.v, i, false);
-        boolean z4 = this.f2816w;
+        boolean z4 = this.f2814w;
         d.z2(parcel, 15, 4);
         parcel.writeInt(z4 ? 1 : 0);
-        int i4 = this.f2817x;
+        int i4 = this.f2815x;
         d.z2(parcel, 16, 4);
         parcel.writeInt(i4);
-        int i5 = this.f2818y;
+        int i5 = this.f2816y;
         d.z2(parcel, 17, 4);
         parcel.writeInt(i5);
         d.B2(parcel, w2);
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java
index 5027b599d2..0918146c48 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java
@@ -34,7 +34,7 @@ public final class zzbz extends AbstractSafeParcelable {
     @Deprecated
 
     /* renamed from: r  reason: collision with root package name */
-    public final ClientAppContext f2819r;
+    public final ClientAppContext f2817r;
     public final int s;
 
     public zzbz(int i, zzaf zzaf, Strategy strategy, IBinder iBinder, @Nullable String str, @Nullable String str2, boolean z2, @Nullable IBinder iBinder2, boolean z3, @Nullable ClientAppContext clientAppContext, int i2) {
@@ -59,7 +59,7 @@ public final class zzbz extends AbstractSafeParcelable {
         }
         this.p = w0Var;
         this.q = z3;
-        this.f2819r = ClientAppContext.v0(clientAppContext, str2, str, z3);
+        this.f2817r = ClientAppContext.v0(clientAppContext, str2, str, z3);
         this.s = i2;
     }
 
@@ -82,7 +82,7 @@ public final class zzbz extends AbstractSafeParcelable {
         boolean z3 = this.q;
         d.z2(parcel, 9, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        d.r2(parcel, 10, this.f2819r, i, false);
+        d.r2(parcel, 10, this.f2817r, i, false);
         int i3 = this.s;
         d.z2(parcel, 11, 4);
         parcel.writeInt(i3);
diff --git a/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java b/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
index 5b74506a25..f9af8d0860 100644
--- a/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
+++ b/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
@@ -167,13 +167,13 @@ public class AppBarLayout extends LinearLayout implements CoordinatorLayout.Atta
             public final /* synthetic */ AppBarLayout b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ View f2821c;
+            public final /* synthetic */ View f2819c;
             public final /* synthetic */ int d;
 
             public b(CoordinatorLayout coordinatorLayout, AppBarLayout appBarLayout, View view, int i) {
                 this.a = coordinatorLayout;
                 this.b = appBarLayout;
-                this.f2821c = view;
+                this.f2819c = view;
                 this.d = i;
             }
 
@@ -181,7 +181,7 @@ public class AppBarLayout extends LinearLayout implements CoordinatorLayout.Atta
             /* JADX WARN: Multi-variable type inference failed */
             @Override // androidx.core.view.accessibility.AccessibilityViewCommand
             public boolean perform(@NonNull View view, @Nullable AccessibilityViewCommand.CommandArguments commandArguments) {
-                BaseBehavior.this.onNestedPreScroll(this.a, (CoordinatorLayout) this.b, this.f2821c, 0, this.d, new int[]{0, 0}, 1);
+                BaseBehavior.this.onNestedPreScroll(this.a, (CoordinatorLayout) this.b, this.f2819c, 0, this.d, new int[]{0, 0}, 1);
                 return true;
             }
         }
diff --git a/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java b/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java
index 2383194a36..1653802ae2 100644
--- a/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java
+++ b/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java
@@ -120,7 +120,7 @@ public class SwipeDismissBehavior<V extends View> extends CoordinatorLayout.Beha
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:21:0x0054, code lost:
-            if (java.lang.Math.abs(r8.getLeft() - r7.a) >= java.lang.Math.round(((float) r8.getWidth()) * r7.f2822c.dragDismissThreshold)) goto L_0x002a;
+            if (java.lang.Math.abs(r8.getLeft() - r7.a) >= java.lang.Math.round(((float) r8.getWidth()) * r7.f2820c.dragDismissThreshold)) goto L_0x002a;
          */
         /* JADX WARNING: Removed duplicated region for block: B:23:0x0059  */
         /* JADX WARNING: Removed duplicated region for block: B:28:0x0066  */
diff --git a/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java b/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
index db7775d878..c2e68af973 100644
--- a/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
+++ b/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
@@ -355,12 +355,12 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
         public final /* synthetic */ ActionMenuView b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ int f2823c;
+        public final /* synthetic */ int f2821c;
         public final /* synthetic */ boolean d;
 
         public g(ActionMenuView actionMenuView, int i, boolean z2) {
             this.b = actionMenuView;
-            this.f2823c = i;
+            this.f2821c = i;
             this.d = z2;
         }
 
@@ -375,7 +375,7 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
                 boolean z2 = BottomAppBar.access$2000(BottomAppBar.this) != 0;
                 BottomAppBar bottomAppBar = BottomAppBar.this;
                 bottomAppBar.replaceMenu(BottomAppBar.access$2000(bottomAppBar));
-                BottomAppBar.access$2100(BottomAppBar.this, this.b, this.f2823c, this.d, z2);
+                BottomAppBar.access$2100(BottomAppBar.this, this.b, this.f2821c, this.d, z2);
             }
         }
     }
diff --git a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java
index d17e31d339..121625e553 100644
--- a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java
+++ b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java
@@ -18,7 +18,7 @@ import com.google.android.material.internal.ParcelableSparseArray;
 public class BottomNavigationPresenter implements MenuPresenter {
 
     /* renamed from: id  reason: collision with root package name */
-    private int f2824id;
+    private int f2822id;
     private MenuBuilder menu;
     private BottomNavigationMenuView menuView;
     private boolean updateSuspended = false;
@@ -82,7 +82,7 @@ public class BottomNavigationPresenter implements MenuPresenter {
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
     public int getId() {
-        return this.f2824id;
+        return this.f2822id;
     }
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
@@ -132,7 +132,7 @@ public class BottomNavigationPresenter implements MenuPresenter {
     }
 
     public void setId(int i) {
-        this.f2824id = i;
+        this.f2822id = i;
     }
 
     public void setUpdateSuspended(boolean z2) {
diff --git a/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java b/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java
index 8306e7b57c..45847689f0 100644
--- a/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java
+++ b/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java
@@ -104,13 +104,13 @@ public class MaterialButtonToggleGroup extends LinearLayout {
         public CornerSize b;
 
         /* renamed from: c  reason: collision with root package name */
-        public CornerSize f2825c;
+        public CornerSize f2823c;
         public CornerSize d;
         public CornerSize e;
 
         public d(CornerSize cornerSize, CornerSize cornerSize2, CornerSize cornerSize3, CornerSize cornerSize4) {
             this.b = cornerSize;
-            this.f2825c = cornerSize3;
+            this.f2823c = cornerSize3;
             this.d = cornerSize4;
             this.e = cornerSize2;
         }
@@ -265,7 +265,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
                 CornerSize cornerSize = d.a;
                 if (ViewUtils.isLayoutRtl(this)) {
                     CornerSize cornerSize2 = d.a;
-                    return new d(cornerSize2, cornerSize2, dVar.f2825c, dVar.d);
+                    return new d(cornerSize2, cornerSize2, dVar.f2823c, dVar.d);
                 }
                 CornerSize cornerSize3 = dVar.b;
                 CornerSize cornerSize4 = dVar.e;
@@ -274,7 +274,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
             }
             CornerSize cornerSize6 = dVar.b;
             CornerSize cornerSize7 = d.a;
-            return new d(cornerSize6, cornerSize7, dVar.f2825c, cornerSize7);
+            return new d(cornerSize6, cornerSize7, dVar.f2823c, cornerSize7);
         } else if (i != i3) {
             return null;
         } else {
@@ -287,7 +287,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
                     return new d(cornerSize9, cornerSize10, cornerSize11, cornerSize11);
                 }
                 CornerSize cornerSize12 = d.a;
-                return new d(cornerSize12, cornerSize12, dVar.f2825c, dVar.d);
+                return new d(cornerSize12, cornerSize12, dVar.f2823c, dVar.d);
             }
             CornerSize cornerSize13 = d.a;
             return new d(cornerSize13, dVar.e, cornerSize13, dVar.d);
@@ -356,7 +356,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
         if (dVar == null) {
             builder.setAllCornerSizes(0.0f);
         } else {
-            builder.setTopLeftCornerSize(dVar.b).setBottomLeftCornerSize(dVar.e).setTopRightCornerSize(dVar.f2825c).setBottomRightCornerSize(dVar.d);
+            builder.setTopLeftCornerSize(dVar.b).setBottomLeftCornerSize(dVar.e).setTopRightCornerSize(dVar.f2823c).setBottomRightCornerSize(dVar.d);
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java b/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java
index fffeba7c0e..b3d335771c 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java
@@ -19,7 +19,7 @@ public class MonthsPagerAdapter extends RecyclerView.Adapter<ViewHolder> {
     public final CalendarConstraints b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final DateSelector<?> f2828c;
+    public final DateSelector<?> f2826c;
     public final MaterialCalendar.l d;
     public final int e;
 
@@ -51,7 +51,7 @@ public class MonthsPagerAdapter extends RecyclerView.Adapter<ViewHolder> {
             this.a = context;
             this.e = dayHeight + dayHeight2;
             this.b = calendarConstraints;
-            this.f2828c = dateSelector;
+            this.f2826c = dateSelector;
             this.d = lVar;
             setHasStableIds(true);
         } else {
@@ -86,7 +86,7 @@ public class MonthsPagerAdapter extends RecyclerView.Adapter<ViewHolder> {
         viewHolder2.monthTitle.setText(m.l(viewHolder2.itemView.getContext()));
         MaterialCalendarGridView materialCalendarGridView = (MaterialCalendarGridView) viewHolder2.monthGrid.findViewById(R.id.month_grid);
         if (materialCalendarGridView.getAdapter() == null || !m.equals(materialCalendarGridView.getAdapter().j)) {
-            g gVar = new g(m, this.f2828c, this.b);
+            g gVar = new g(m, this.f2826c, this.b);
             materialCalendarGridView.setNumColumns(m.l);
             materialCalendarGridView.setAdapter((ListAdapter) gVar);
         } else {
diff --git a/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java b/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
index 8e161476dc..247ab5fab5 100644
--- a/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
+++ b/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
@@ -278,11 +278,11 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
         public final /* synthetic */ c.i.a.g.e.j b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ OnChangedCallback f2831c;
+        public final /* synthetic */ OnChangedCallback f2829c;
 
         public c(ExtendedFloatingActionButton extendedFloatingActionButton, c.i.a.g.e.j jVar, OnChangedCallback onChangedCallback) {
             this.b = jVar;
-            this.f2831c = onChangedCallback;
+            this.f2829c = onChangedCallback;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
@@ -295,7 +295,7 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
         public void onAnimationEnd(Animator animator) {
             this.b.e();
             if (!this.a) {
-                this.b.g(this.f2831c);
+                this.b.g(this.f2829c);
             }
         }
 
diff --git a/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java b/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
index 5fce98c0bc..5c97657cd2 100644
--- a/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
+++ b/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
@@ -43,7 +43,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
     public ColorStateList iconTintList;
 
     /* renamed from: id  reason: collision with root package name */
-    private int f2832id;
+    private int f2830id;
     public boolean isBehindStatusBar = true;
     public Drawable itemBackground;
     public int itemHorizontalPadding;
@@ -95,15 +95,15 @@ public class NavigationMenuPresenter implements MenuPresenter {
         public MenuItemImpl b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f2833c;
+        public boolean f2831c;
 
         public c() {
             a();
         }
 
         public final void a() {
-            if (!this.f2833c) {
-                this.f2833c = true;
+            if (!this.f2831c) {
+                this.f2831c = true;
                 this.a.clear();
                 this.a.add(new d());
                 int i = -1;
@@ -186,7 +186,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                     i2++;
                     z2 = false;
                 }
-                this.f2833c = false;
+                this.f2831c = false;
             }
         }
 
@@ -418,7 +418,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
     public int getId() {
-        return this.f2832id;
+        return this.f2830id;
     }
 
     @Nullable
@@ -510,7 +510,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                 Objects.requireNonNull(cVar);
                 int i2 = bundle2.getInt("android:menu:checked", 0);
                 if (i2 != 0) {
-                    cVar.f2833c = true;
+                    cVar.f2831c = true;
                     int size = cVar.a.size();
                     int i3 = 0;
                     while (true) {
@@ -524,7 +524,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                         }
                         i3++;
                     }
-                    cVar.f2833c = false;
+                    cVar.f2831c = false;
                     cVar.a();
                 }
                 SparseArray sparseParcelableArray2 = bundle2.getSparseParcelableArray("android:menu:action_views");
@@ -617,7 +617,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
     }
 
     public void setId(int i2) {
-        this.f2832id = i2;
+        this.f2830id = i2;
     }
 
     public void setItemBackground(@Nullable Drawable drawable) {
@@ -675,7 +675,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
     public void setUpdateSuspended(boolean z2) {
         c cVar = this.adapter;
         if (cVar != null) {
-            cVar.f2833c = z2;
+            cVar.f2831c = z2;
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/internal/ViewUtils.java b/app/src/main/java/com/google/android/material/internal/ViewUtils.java
index 62f197b192..6401bac06c 100644
--- a/app/src/main/java/com/google/android/material/internal/ViewUtils.java
+++ b/app/src/main/java/com/google/android/material/internal/ViewUtils.java
@@ -67,13 +67,13 @@ public class ViewUtils {
         public final /* synthetic */ boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ boolean f2834c;
+        public final /* synthetic */ boolean f2832c;
         public final /* synthetic */ OnApplyWindowInsetsListener d;
 
         public b(boolean z2, boolean z3, boolean z4, OnApplyWindowInsetsListener onApplyWindowInsetsListener) {
             this.a = z2;
             this.b = z3;
-            this.f2834c = z4;
+            this.f2832c = z4;
             this.d = onApplyWindowInsetsListener;
         }
 
@@ -91,7 +91,7 @@ public class ViewUtils {
                     relativePadding.start = windowInsetsCompat.getSystemWindowInsetLeft() + relativePadding.start;
                 }
             }
-            if (this.f2834c) {
+            if (this.f2832c) {
                 if (isLayoutRtl) {
                     relativePadding.start = windowInsetsCompat.getSystemWindowInsetRight() + relativePadding.start;
                 } else {
diff --git a/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java b/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java
index 0eecbb32c1..b9b978838d 100644
--- a/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java
+++ b/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java
@@ -118,7 +118,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public ColorFilter f2836c;
+        public ColorFilter f2834c;
         @Nullable
         public ColorStateList d = null;
         @Nullable
@@ -141,7 +141,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
         public int q = 0;
 
         /* renamed from: r  reason: collision with root package name */
-        public int f2837r = 0;
+        public int f2835r = 0;
         public int s = 0;
         public int t = 0;
         public boolean u = false;
@@ -151,7 +151,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
             this.a = cVar.a;
             this.b = cVar.b;
             this.l = cVar.l;
-            this.f2836c = cVar.f2836c;
+            this.f2834c = cVar.f2834c;
             this.d = cVar.d;
             this.e = cVar.e;
             this.h = cVar.h;
@@ -165,7 +165,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
             this.n = cVar.n;
             this.o = cVar.o;
             this.p = cVar.p;
-            this.f2837r = cVar.f2837r;
+            this.f2835r = cVar.f2835r;
             this.t = cVar.t;
             this.f = cVar.f;
             this.v = cVar.v;
@@ -328,10 +328,10 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
         for (int i = 0; i < 4; i++) {
             ShapePath.d dVar = this.cornerShadowOperation[i];
             ShadowRenderer shadowRenderer = this.shadowRenderer;
-            int i2 = this.drawableState.f2837r;
+            int i2 = this.drawableState.f2835r;
             Matrix matrix = ShapePath.d.a;
             dVar.a(matrix, shadowRenderer, i2, canvas);
-            this.edgeShadowOperation[i].a(matrix, this.shadowRenderer, this.drawableState.f2837r, canvas);
+            this.edgeShadowOperation[i].a(matrix, this.shadowRenderer, this.drawableState.f2835r, canvas);
         }
         if (this.shadowBitmapDrawingEnable) {
             int shadowOffsetX = getShadowOffsetX();
@@ -377,7 +377,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
     private boolean hasCompatShadow() {
         c cVar = this.drawableState;
         int i = cVar.q;
-        return i != 1 && cVar.f2837r > 0 && (i == 2 || requiresCompatShadow());
+        return i != 1 && cVar.f2835r > 0 && (i == 2 || requiresCompatShadow());
     }
 
     private boolean hasFill() {
@@ -408,10 +408,10 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
             if (width < 0 || height < 0) {
                 throw new IllegalStateException("Invalid shadow bounds. Check that the treatments result in a valid path.");
             }
-            Bitmap createBitmap = Bitmap.createBitmap((this.drawableState.f2837r * 2) + ((int) this.pathBounds.width()) + width, (this.drawableState.f2837r * 2) + ((int) this.pathBounds.height()) + height, Bitmap.Config.ARGB_8888);
+            Bitmap createBitmap = Bitmap.createBitmap((this.drawableState.f2835r * 2) + ((int) this.pathBounds.width()) + width, (this.drawableState.f2835r * 2) + ((int) this.pathBounds.height()) + height, Bitmap.Config.ARGB_8888);
             Canvas canvas2 = new Canvas(createBitmap);
-            float f = (float) ((getBounds().left - this.drawableState.f2837r) - width);
-            float f2 = (float) ((getBounds().top - this.drawableState.f2837r) - height);
+            float f = (float) ((getBounds().left - this.drawableState.f2835r) - width);
+            float f2 = (float) ((getBounds().top - this.drawableState.f2835r) - height);
             canvas2.translate(-f, -f2);
             drawCompatShadow(canvas2);
             canvas.drawBitmap(createBitmap, f, f2, (Paint) null);
@@ -463,7 +463,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
 
     private void updateZ() {
         float z2 = getZ();
-        this.drawableState.f2837r = (int) Math.ceil((double) (0.75f * z2));
+        this.drawableState.f2835r = (int) Math.ceil((double) (0.75f * z2));
         this.drawableState.s = (int) Math.ceil((double) (z2 * 0.25f));
         updateTintFilter();
         invalidateSelfIgnoreShape();
@@ -621,7 +621,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
     }
 
     public int getShadowRadius() {
-        return this.drawableState.f2837r;
+        return this.drawableState.f2835r;
     }
 
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
@@ -770,7 +770,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
 
     @Override // android.graphics.drawable.Drawable
     public void setColorFilter(@Nullable ColorFilter colorFilter) {
-        this.drawableState.f2836c = colorFilter;
+        this.drawableState.f2834c = colorFilter;
         invalidateSelfIgnoreShape();
     }
 
@@ -881,7 +881,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
 
     @Deprecated
     public void setShadowRadius(int i) {
-        this.drawableState.f2837r = i;
+        this.drawableState.f2835r = i;
     }
 
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
diff --git a/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java b/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java
index e16d2c2b31..e8dc9313b5 100644
--- a/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java
+++ b/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java
@@ -42,7 +42,7 @@ public class ShapeAppearancePathProvider {
         @NonNull
 
         /* renamed from: c  reason: collision with root package name */
-        public final RectF f2838c;
+        public final RectF f2836c;
         @Nullable
         public final PathListener d;
         public final float e;
@@ -51,7 +51,7 @@ public class ShapeAppearancePathProvider {
             this.d = pathListener;
             this.a = shapeAppearanceModel;
             this.e = f;
-            this.f2838c = rectF;
+            this.f2836c = rectF;
             this.b = path;
         }
     }
@@ -100,7 +100,7 @@ public class ShapeAppearancePathProvider {
         float f = fArr[0];
         float[] fArr2 = this.scratch2;
         float max = Math.max(((float) Math.hypot((double) (f - fArr2[0]), (double) (fArr[1] - fArr2[1]))) - 0.001f, 0.0f);
-        float edgeCenterForIndex = getEdgeCenterForIndex(bVar.f2838c, i);
+        float edgeCenterForIndex = getEdgeCenterForIndex(bVar.f2836c, i);
         this.shapePath.reset(0.0f, 0.0f);
         EdgeTreatment edgeTreatmentForIndex = getEdgeTreatmentForIndex(i, bVar.a);
         edgeTreatmentForIndex.getEdgePath(max, edgeCenterForIndex, bVar.e, this.shapePath);
@@ -181,10 +181,10 @@ public class ShapeAppearancePathProvider {
     }
 
     private void setCornerPathAndTransform(@NonNull b bVar, int i) {
-        getCornerTreatmentForIndex(i, bVar.a).getCornerPath(this.cornerPaths[i], 90.0f, bVar.e, bVar.f2838c, getCornerSizeForIndex(i, bVar.a));
+        getCornerTreatmentForIndex(i, bVar.a).getCornerPath(this.cornerPaths[i], 90.0f, bVar.e, bVar.f2836c, getCornerSizeForIndex(i, bVar.a));
         float angleOfEdge = angleOfEdge(i);
         this.cornerTransforms[i].reset();
-        getCoordinatesOfCorner(i, bVar.f2838c, this.pointF);
+        getCoordinatesOfCorner(i, bVar.f2836c, this.pointF);
         Matrix matrix = this.cornerTransforms[i];
         PointF pointF = this.pointF;
         matrix.setTranslate(pointF.x, pointF.y);
diff --git a/app/src/main/java/com/google/android/material/shape/ShapePath.java b/app/src/main/java/com/google/android/material/shape/ShapePath.java
index 41ac110773..4247f34f84 100644
--- a/app/src/main/java/com/google/android/material/shape/ShapePath.java
+++ b/app/src/main/java/com/google/android/material/shape/ShapePath.java
@@ -220,26 +220,26 @@ public class ShapePath {
     public static class PathLineOperation extends PathOperation {
 
         /* renamed from: x  reason: collision with root package name */
-        private float f2839x;
+        private float f2837x;
 
         /* renamed from: y  reason: collision with root package name */
-        private float f2840y;
+        private float f2838y;
 
         public static /* synthetic */ float access$000(PathLineOperation pathLineOperation) {
-            return pathLineOperation.f2839x;
+            return pathLineOperation.f2837x;
         }
 
         public static /* synthetic */ float access$002(PathLineOperation pathLineOperation, float f) {
-            pathLineOperation.f2839x = f;
+            pathLineOperation.f2837x = f;
             return f;
         }
 
         public static /* synthetic */ float access$100(PathLineOperation pathLineOperation) {
-            return pathLineOperation.f2840y;
+            return pathLineOperation.f2838y;
         }
 
         public static /* synthetic */ float access$102(PathLineOperation pathLineOperation, float f) {
-            pathLineOperation.f2840y = f;
+            pathLineOperation.f2838y = f;
             return f;
         }
 
@@ -248,7 +248,7 @@ public class ShapePath {
             Matrix matrix2 = this.matrix;
             matrix.invert(matrix2);
             path.transform(matrix2);
-            path.lineTo(this.f2839x, this.f2840y);
+            path.lineTo(this.f2837x, this.f2838y);
             path.transform(matrix);
         }
     }
@@ -331,17 +331,17 @@ public class ShapePath {
         public final /* synthetic */ List b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ Matrix f2841c;
+        public final /* synthetic */ Matrix f2839c;
 
         public a(ShapePath shapePath, List list, Matrix matrix) {
             this.b = list;
-            this.f2841c = matrix;
+            this.f2839c = matrix;
         }
 
         @Override // com.google.android.material.shape.ShapePath.d
         public void a(Matrix matrix, ShadowRenderer shadowRenderer, int i, Canvas canvas) {
             for (d dVar : this.b) {
-                dVar.a(this.f2841c, shadowRenderer, i, canvas);
+                dVar.a(this.f2839c, shadowRenderer, i, canvas);
             }
         }
     }
@@ -363,26 +363,26 @@ public class ShapePath {
         public final PathLineOperation b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final float f2842c;
+        public final float f2840c;
         public final float d;
 
         public c(PathLineOperation pathLineOperation, float f, float f2) {
             this.b = pathLineOperation;
-            this.f2842c = f;
+            this.f2840c = f;
             this.d = f2;
         }
 
         @Override // com.google.android.material.shape.ShapePath.d
         public void a(Matrix matrix, @NonNull ShadowRenderer shadowRenderer, int i, @NonNull Canvas canvas) {
-            RectF rectF = new RectF(0.0f, 0.0f, (float) Math.hypot((double) (PathLineOperation.access$100(this.b) - this.d), (double) (PathLineOperation.access$000(this.b) - this.f2842c)), 0.0f);
+            RectF rectF = new RectF(0.0f, 0.0f, (float) Math.hypot((double) (PathLineOperation.access$100(this.b) - this.d), (double) (PathLineOperation.access$000(this.b) - this.f2840c)), 0.0f);
             Matrix matrix2 = new Matrix(matrix);
-            matrix2.preTranslate(this.f2842c, this.d);
+            matrix2.preTranslate(this.f2840c, this.d);
             matrix2.preRotate(b());
             shadowRenderer.drawEdgeShadow(canvas, matrix2, rectF, i);
         }
 
         public float b() {
-            return (float) Math.toDegrees(Math.atan((double) ((PathLineOperation.access$100(this.b) - this.d) / (PathLineOperation.access$000(this.b) - this.f2842c))));
+            return (float) Math.toDegrees(Math.atan((double) ((PathLineOperation.access$100(this.b) - this.d) / (PathLineOperation.access$000(this.b) - this.f2840c))));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/tabs/TabLayout.java b/app/src/main/java/com/google/android/material/tabs/TabLayout.java
index 377e21d300..1f115fb212 100644
--- a/app/src/main/java/com/google/android/material/tabs/TabLayout.java
+++ b/app/src/main/java/com/google/android/material/tabs/TabLayout.java
@@ -183,7 +183,7 @@ public class TabLayout extends HorizontalScrollView {
         private Drawable icon;
 
         /* renamed from: id  reason: collision with root package name */
-        private int f2845id = -1;
+        private int f2843id = -1;
         @LabelVisibility
         private int labelVisibilityMode = 1;
         @Nullable
@@ -197,7 +197,7 @@ public class TabLayout extends HorizontalScrollView {
         public TabView view;
 
         public static /* synthetic */ int access$000(Tab tab) {
-            return tab.f2845id;
+            return tab.f2843id;
         }
 
         public static /* synthetic */ int access$1100(Tab tab) {
@@ -237,7 +237,7 @@ public class TabLayout extends HorizontalScrollView {
         }
 
         public int getId() {
-            return this.f2845id;
+            return this.f2843id;
         }
 
         @NonNull
@@ -281,7 +281,7 @@ public class TabLayout extends HorizontalScrollView {
             this.view = null;
             this.tag = null;
             this.icon = null;
-            this.f2845id = -1;
+            this.f2843id = -1;
             this.text = null;
             this.contentDesc = null;
             this.position = -1;
@@ -350,7 +350,7 @@ public class TabLayout extends HorizontalScrollView {
 
         @NonNull
         public Tab setId(int i) {
-            this.f2845id = i;
+            this.f2843id = i;
             TabView tabView = this.view;
             if (tabView != null) {
                 tabView.setId(i);
diff --git a/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java b/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java
index a7388d38f8..5a7404892a 100644
--- a/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java
+++ b/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java
@@ -69,7 +69,7 @@ public final class TabLayoutMediator {
         public int b = 0;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2847c = 0;
+        public int f2845c = 0;
 
         public b(TabLayout tabLayout) {
             this.a = new WeakReference<>(tabLayout);
@@ -77,15 +77,15 @@ public final class TabLayoutMediator {
 
         @Override // androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
         public void onPageScrollStateChanged(int i) {
-            this.b = this.f2847c;
-            this.f2847c = i;
+            this.b = this.f2845c;
+            this.f2845c = i;
         }
 
         @Override // androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
         public void onPageScrolled(int i, float f, int i2) {
             TabLayout tabLayout = this.a.get();
             if (tabLayout != null) {
-                int i3 = this.f2847c;
+                int i3 = this.f2845c;
                 boolean z2 = false;
                 boolean z3 = i3 != 2 || this.b == 1;
                 if (!(i3 == 2 && this.b == 0)) {
@@ -99,7 +99,7 @@ public final class TabLayoutMediator {
         public void onPageSelected(int i) {
             TabLayout tabLayout = this.a.get();
             if (tabLayout != null && tabLayout.getSelectedTabPosition() != i && i < tabLayout.getTabCount()) {
-                int i2 = this.f2847c;
+                int i2 = this.f2845c;
                 tabLayout.selectTab(tabLayout.getTabAt(i), i2 == 0 || (i2 == 2 && this.b == 0));
             }
         }
diff --git a/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java b/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java
index d29204a130..061ab70625 100644
--- a/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java
+++ b/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java
@@ -37,7 +37,7 @@ public class ClockFaceView extends e implements ClockHandView.OnRotateListener {
     public final int[] q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final float[] f2848r = {0.0f, 0.9f, 1.0f};
+    public final float[] f2846r = {0.0f, 0.9f, 1.0f};
     public final int s;
     public String[] t;
     public float u;
@@ -79,7 +79,7 @@ public class ClockFaceView extends e implements ClockHandView.OnRotateListener {
                 this.m.offset(textView.getPaddingLeft(), textView.getPaddingTop());
                 offsetDescendantRectToMyCoords(textView, this.m);
                 this.n.set(this.m);
-                textView.getPaint().setShader(!RectF.intersects(rectF, this.n) ? null : new RadialGradient(rectF.centerX() - this.n.left, rectF.centerY() - this.n.top, 0.5f * rectF.width(), this.q, this.f2848r, Shader.TileMode.CLAMP));
+                textView.getPaint().setShader(!RectF.intersects(rectF, this.n) ? null : new RadialGradient(rectF.centerX() - this.n.left, rectF.centerY() - this.n.top, 0.5f * rectF.width(), this.q, this.f2846r, Shader.TileMode.CLAMP));
                 textView.invalidate();
             }
         }
diff --git a/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java b/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java
index 1d48abd62d..9bc03e5e0c 100644
--- a/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java
+++ b/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java
@@ -34,7 +34,7 @@ public class ClockHandView extends View {
     public final int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final float f2849r;
+    public final float f2847r;
     public final Paint s;
     public final RectF t;
     @Px
@@ -42,16 +42,16 @@ public class ClockHandView extends View {
     public float v;
 
     /* renamed from: w  reason: collision with root package name */
-    public boolean f2850w;
+    public boolean f2848w;
 
     /* renamed from: x  reason: collision with root package name */
-    public OnActionUpListener f2851x;
+    public OnActionUpListener f2849x;
 
     /* renamed from: y  reason: collision with root package name */
-    public double f2852y;
+    public double f2850y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2853z;
+    public int f2851z;
 
     public interface OnActionUpListener {
         void onActionUp(@FloatRange(from = 0.0d, to = 360.0d) float f, boolean z2);
@@ -92,11 +92,11 @@ public class ClockHandView extends View {
         this.s = paint;
         this.t = new RectF();
         TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.ClockHandView, i2, R.style.Widget_MaterialComponents_TimePicker_Clock);
-        this.f2853z = obtainStyledAttributes.getDimensionPixelSize(R.styleable.ClockHandView_materialCircleRadius, 0);
+        this.f2851z = obtainStyledAttributes.getDimensionPixelSize(R.styleable.ClockHandView_materialCircleRadius, 0);
         this.q = obtainStyledAttributes.getDimensionPixelSize(R.styleable.ClockHandView_selectorSize, 0);
         Resources resources = getResources();
         this.u = resources.getDimensionPixelSize(R.dimen.material_clock_hand_stroke_width);
-        this.f2849r = (float) resources.getDimensionPixelSize(R.dimen.material_clock_hand_center_dot_radius);
+        this.f2847r = (float) resources.getDimensionPixelSize(R.dimen.material_clock_hand_center_dot_radius);
         int color = obtainStyledAttributes.getColor(R.styleable.ClockHandView_clockHandColor, 0);
         paint.setAntiAlias(true);
         paint.setColor(color);
@@ -141,9 +141,9 @@ public class ClockHandView extends View {
     public final void c(@FloatRange(from = 0.0d, to = 360.0d) float f, boolean z2) {
         float f2 = f % 360.0f;
         this.v = f2;
-        this.f2852y = Math.toRadians((double) (f2 - 90.0f));
-        float cos = (((float) this.f2853z) * ((float) Math.cos(this.f2852y))) + ((float) (getWidth() / 2));
-        float sin = (((float) this.f2853z) * ((float) Math.sin(this.f2852y))) + ((float) (getHeight() / 2));
+        this.f2850y = Math.toRadians((double) (f2 - 90.0f));
+        float cos = (((float) this.f2851z) * ((float) Math.cos(this.f2850y))) + ((float) (getWidth() / 2));
+        float sin = (((float) this.f2851z) * ((float) Math.sin(this.f2850y))) + ((float) (getHeight() / 2));
         RectF rectF = this.t;
         int i2 = this.q;
         rectF.set(cos - ((float) i2), sin - ((float) i2), cos + ((float) i2), sin + ((float) i2));
@@ -161,13 +161,13 @@ public class ClockHandView extends View {
         float f = (float) width;
         float f2 = (float) height;
         this.s.setStrokeWidth(0.0f);
-        canvas.drawCircle((((float) this.f2853z) * ((float) Math.cos(this.f2852y))) + f, (((float) this.f2853z) * ((float) Math.sin(this.f2852y))) + f2, (float) this.q, this.s);
-        double sin = Math.sin(this.f2852y);
-        double cos = Math.cos(this.f2852y);
-        double d = (double) ((float) (this.f2853z - this.q));
+        canvas.drawCircle((((float) this.f2851z) * ((float) Math.cos(this.f2850y))) + f, (((float) this.f2851z) * ((float) Math.sin(this.f2850y))) + f2, (float) this.q, this.s);
+        double sin = Math.sin(this.f2850y);
+        double cos = Math.cos(this.f2850y);
+        double d = (double) ((float) (this.f2851z - this.q));
         this.s.setStrokeWidth((float) this.u);
         canvas.drawLine(f, f2, (float) (width + ((int) (cos * d))), (float) (height + ((int) (d * sin))), this.s);
-        canvas.drawCircle(f, f2, this.f2849r, this.s);
+        canvas.drawCircle(f, f2, this.f2847r, this.s);
     }
 
     @Override // android.view.View
@@ -192,7 +192,7 @@ public class ClockHandView extends View {
                 int i2 = (int) (x2 - this.l);
                 int i3 = (int) (y2 - this.m);
                 this.n = (i3 * i3) + (i2 * i2) > this.o;
-                z3 = this.f2850w;
+                z3 = this.f2848w;
                 z4 = actionMasked == 1;
             } else {
                 z4 = false;
@@ -203,12 +203,12 @@ public class ClockHandView extends View {
             this.l = x2;
             this.m = y2;
             this.n = true;
-            this.f2850w = false;
+            this.f2848w = false;
             z4 = false;
             z3 = false;
             z2 = true;
         }
-        boolean z6 = this.f2850w;
+        boolean z6 = this.f2848w;
         float a2 = (float) a(x2, y2);
         boolean z7 = this.v != a2;
         if (!z2 || !z7) {
@@ -219,15 +219,15 @@ public class ClockHandView extends View {
                 b(a2, z5);
             }
             boolean z8 = z5 | z6;
-            this.f2850w = z8;
-            if (z8 && z4 && (onActionUpListener = this.f2851x) != null) {
+            this.f2848w = z8;
+            if (z8 && z4 && (onActionUpListener = this.f2849x) != null) {
                 onActionUpListener.onActionUp((float) a(x2, y2), this.n);
             }
             return true;
         }
         z5 = true;
         boolean z8 = z5 | z6;
-        this.f2850w = z8;
+        this.f2848w = z8;
         onActionUpListener.onActionUp((float) a(x2, y2), this.n);
         return true;
     }
diff --git a/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java b/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
index b888a05d5b..1a1cffc5cd 100644
--- a/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
+++ b/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
@@ -61,20 +61,20 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation
         public final /* synthetic */ View b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ View f2854c;
+        public final /* synthetic */ View f2852c;
 
         public a(FabTransformationBehavior fabTransformationBehavior, boolean z2, View view, View view2) {
             this.a = z2;
             this.b = view;
-            this.f2854c = view2;
+            this.f2852c = view2;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
             if (!this.a) {
                 this.b.setVisibility(4);
-                this.f2854c.setAlpha(1.0f);
-                this.f2854c.setVisibility(0);
+                this.f2852c.setAlpha(1.0f);
+                this.f2852c.setVisibility(0);
             }
         }
 
@@ -82,8 +82,8 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation
         public void onAnimationStart(Animator animator) {
             if (this.a) {
                 this.b.setVisibility(0);
-                this.f2854c.setAlpha(0.0f);
-                this.f2854c.setVisibility(4);
+                this.f2852c.setAlpha(0.0f);
+                this.f2852c.setVisibility(4);
             }
         }
     }
diff --git a/app/src/main/java/com/google/android/material/transition/FadeProvider.java b/app/src/main/java/com/google/android/material/transition/FadeProvider.java
index 346d05441b..0f0458740f 100644
--- a/app/src/main/java/com/google/android/material/transition/FadeProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/FadeProvider.java
@@ -17,21 +17,21 @@ public final class FadeProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2855c;
+        public final /* synthetic */ float f2853c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2855c = f2;
+            this.f2853c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2855c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2853c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java b/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java
index 0436722e30..f804cc5cc8 100644
--- a/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java
@@ -17,21 +17,21 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2856c;
+        public final /* synthetic */ float f2854c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2856c = f2;
+            this.f2854c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2856c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2854c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java b/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
index 2975d8cf92..b3a07332cd 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
@@ -180,13 +180,13 @@ public final class MaterialContainerTransform extends Transition {
         public final /* synthetic */ d b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ View f2857c;
+        public final /* synthetic */ View f2855c;
         public final /* synthetic */ View d;
 
         public b(View view, d dVar, View view2, View view3) {
             this.a = view;
             this.b = dVar;
-            this.f2857c = view2;
+            this.f2855c = view2;
             this.d = view3;
         }
 
@@ -194,7 +194,7 @@ public final class MaterialContainerTransform extends Transition {
         public void onTransitionEnd(@NonNull Transition transition) {
             MaterialContainerTransform.this.removeListener(this);
             if (!MaterialContainerTransform.access$300(MaterialContainerTransform.this)) {
-                this.f2857c.setAlpha(1.0f);
+                this.f2855c.setAlpha(1.0f);
                 this.d.setAlpha(1.0f);
                 ViewUtils.getOverlay(this.a).remove(this.b);
             }
@@ -203,7 +203,7 @@ public final class MaterialContainerTransform extends Transition {
         @Override // androidx.transition.Transition.TransitionListener
         public void onTransitionStart(@NonNull Transition transition) {
             ViewUtils.getOverlay(this.a).add(this.b);
-            this.f2857c.setAlpha(0.0f);
+            this.f2855c.setAlpha(0.0f);
             this.d.setAlpha(0.0f);
         }
     }
@@ -216,14 +216,14 @@ public final class MaterialContainerTransform extends Transition {
         @NonNull
 
         /* renamed from: c  reason: collision with root package name */
-        public final ProgressThresholds f2858c;
+        public final ProgressThresholds f2856c;
         @NonNull
         public final ProgressThresholds d;
 
         public c(ProgressThresholds progressThresholds, ProgressThresholds progressThresholds2, ProgressThresholds progressThresholds3, ProgressThresholds progressThresholds4, a aVar) {
             this.a = progressThresholds;
             this.b = progressThresholds2;
-            this.f2858c = progressThresholds3;
+            this.f2856c = progressThresholds3;
             this.d = progressThresholds4;
         }
     }
@@ -245,7 +245,7 @@ public final class MaterialContainerTransform extends Transition {
         public final RectF b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ShapeAppearanceModel f2859c;
+        public final ShapeAppearanceModel f2857c;
         public final float d;
         public final View e;
         public final RectF f;
@@ -262,23 +262,23 @@ public final class MaterialContainerTransform extends Transition {
         public final float[] q;
 
         /* renamed from: r  reason: collision with root package name */
-        public final boolean f2860r;
+        public final boolean f2858r;
         public final float s;
         public final float t;
         public final boolean u;
         public final MaterialShapeDrawable v;
 
         /* renamed from: w  reason: collision with root package name */
-        public final RectF f2861w;
+        public final RectF f2859w;
 
         /* renamed from: x  reason: collision with root package name */
-        public final RectF f2862x;
+        public final RectF f2860x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final RectF f2863y;
+        public final RectF f2861y;
 
         /* renamed from: z  reason: collision with root package name */
-        public final RectF f2864z;
+        public final RectF f2862z;
 
         public class a implements k.a {
             public a() {
@@ -319,13 +319,13 @@ public final class MaterialContainerTransform extends Transition {
             this.F = new Path();
             this.a = view;
             this.b = rectF;
-            this.f2859c = shapeAppearanceModel;
+            this.f2857c = shapeAppearanceModel;
             this.d = f;
             this.e = view2;
             this.f = rectF2;
             this.g = shapeAppearanceModel2;
             this.h = f2;
-            this.f2860r = z2;
+            this.f2858r = z2;
             this.u = z3;
             this.B = aVar;
             this.C = dVar;
@@ -343,11 +343,11 @@ public final class MaterialContainerTransform extends Transition {
             materialShapeDrawable.setShadowBitmapDrawingEnable(false);
             materialShapeDrawable.setShadowColor(-7829368);
             RectF rectF3 = new RectF(rectF);
-            this.f2861w = rectF3;
-            this.f2862x = new RectF(rectF3);
+            this.f2859w = rectF3;
+            this.f2860x = new RectF(rectF3);
             RectF rectF4 = new RectF(rectF3);
-            this.f2863y = rectF4;
-            this.f2864z = new RectF(rectF4);
+            this.f2861y = rectF4;
+            this.f2862z = new RectF(rectF4);
             PointF c2 = c(rectF);
             PointF c3 = c(rectF2);
             PathMeasure pathMeasure = new PathMeasure(pathMotion.getPath(c2.x, c2.y, c3.x, c3.y), false);
@@ -370,14 +370,14 @@ public final class MaterialContainerTransform extends Transition {
         public final void a(Canvas canvas) {
             d(canvas, this.k);
             Rect bounds = getBounds();
-            RectF rectF = this.f2863y;
+            RectF rectF = this.f2861y;
             k.h(canvas, bounds, rectF.left, rectF.top, this.H.b, this.G.b, new b());
         }
 
         public final void b(Canvas canvas) {
             d(canvas, this.j);
             Rect bounds = getBounds();
-            RectF rectF = this.f2861w;
+            RectF rectF = this.f2859w;
             k.h(canvas, bounds, rectF.left, rectF.top, this.H.a, this.G.a, new a());
         }
 
@@ -432,7 +432,7 @@ public final class MaterialContainerTransform extends Transition {
             }
             if (this.D) {
                 canvas.restoreToCount(save);
-                RectF rectF2 = this.f2861w;
+                RectF rectF2 = this.f2859w;
                 Path path = this.F;
                 PointF c2 = c(rectF2);
                 if (this.L == 0.0f) {
@@ -443,16 +443,16 @@ public final class MaterialContainerTransform extends Transition {
                     this.E.setColor(-65281);
                     canvas.drawPath(path, this.E);
                 }
-                RectF rectF3 = this.f2862x;
+                RectF rectF3 = this.f2860x;
                 this.E.setColor(InputDeviceCompat.SOURCE_ANY);
                 canvas.drawRect(rectF3, this.E);
-                RectF rectF4 = this.f2861w;
+                RectF rectF4 = this.f2859w;
                 this.E.setColor(-16711936);
                 canvas.drawRect(rectF4, this.E);
-                RectF rectF5 = this.f2864z;
+                RectF rectF5 = this.f2862z;
                 this.E.setColor(-16711681);
                 canvas.drawRect(rectF5, this.E);
-                RectF rectF6 = this.f2863y;
+                RectF rectF6 = this.f2861y;
                 this.E.setColor(-16776961);
                 canvas.drawRect(rectF6, this.E);
             }
@@ -462,7 +462,7 @@ public final class MaterialContainerTransform extends Transition {
             float f2;
             float f3;
             this.L = f;
-            this.m.setAlpha((int) (this.f2860r ? k.d(0.0f, 255.0f, f) : k.d(255.0f, 0.0f, f)));
+            this.m.setAlpha((int) (this.f2858r ? k.d(0.0f, 255.0f, f) : k.d(255.0f, 0.0f, f)));
             this.o.getPosTan(this.p * f, this.q, null);
             float[] fArr = this.q;
             boolean z2 = false;
@@ -486,31 +486,31 @@ public final class MaterialContainerTransform extends Transition {
             }
             f a2 = this.C.a(f, ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.b)))).floatValue(), ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.b)))).floatValue(), this.b.width(), this.b.height(), this.f.width(), this.f.height());
             this.H = a2;
-            RectF rectF = this.f2861w;
+            RectF rectF = this.f2859w;
             float f8 = a2.f1343c / 2.0f;
             rectF.set(f4 - f8, f5, f8 + f4, a2.d + f5);
-            RectF rectF2 = this.f2863y;
+            RectF rectF2 = this.f2861y;
             f fVar = this.H;
             float f9 = fVar.e / 2.0f;
             rectF2.set(f4 - f9, f5, f9 + f4, fVar.f + f5);
-            this.f2862x.set(this.f2861w);
-            this.f2864z.set(this.f2863y);
-            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2858c)))).floatValue();
-            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2858c)))).floatValue();
+            this.f2860x.set(this.f2859w);
+            this.f2862z.set(this.f2861y);
+            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2856c)))).floatValue();
+            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2856c)))).floatValue();
             boolean b2 = this.C.b(this.H);
-            RectF rectF3 = b2 ? this.f2862x : this.f2864z;
+            RectF rectF3 = b2 ? this.f2860x : this.f2862z;
             float e = k.e(0.0f, 1.0f, floatValue, floatValue2, f);
             if (!b2) {
                 e = 1.0f - e;
             }
             this.C.c(rectF3, e, this.H);
-            this.I = new RectF(Math.min(this.f2862x.left, this.f2864z.left), Math.min(this.f2862x.top, this.f2864z.top), Math.max(this.f2862x.right, this.f2864z.right), Math.max(this.f2862x.bottom, this.f2864z.bottom));
+            this.I = new RectF(Math.min(this.f2860x.left, this.f2862z.left), Math.min(this.f2860x.top, this.f2862z.top), Math.max(this.f2860x.right, this.f2862z.right), Math.max(this.f2860x.bottom, this.f2862z.bottom));
             g gVar = this.n;
-            ShapeAppearanceModel shapeAppearanceModel = this.f2859c;
+            ShapeAppearanceModel shapeAppearanceModel = this.f2857c;
             ShapeAppearanceModel shapeAppearanceModel2 = this.g;
-            RectF rectF4 = this.f2861w;
-            RectF rectF5 = this.f2862x;
-            RectF rectF6 = this.f2864z;
+            RectF rectF4 = this.f2859w;
+            RectF rectF5 = this.f2860x;
+            RectF rectF6 = this.f2862z;
             ProgressThresholds progressThresholds = this.A.d;
             Objects.requireNonNull(gVar);
             float start = progressThresholds.getStart();
@@ -653,7 +653,7 @@ public final class MaterialContainerTransform extends Transition {
         if (!z2) {
             cVar = cVar2;
         }
-        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2858c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
+        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2856c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
     }
 
     @StyleRes
diff --git a/app/src/main/java/com/google/android/material/transition/ScaleProvider.java b/app/src/main/java/com/google/android/material/transition/ScaleProvider.java
index 7b2fcab294..9638cdac98 100644
--- a/app/src/main/java/com/google/android/material/transition/ScaleProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/ScaleProvider.java
@@ -21,18 +21,18 @@ public final class ScaleProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2865c;
+        public final /* synthetic */ float f2863c;
 
         public a(View view, float f, float f2) {
             this.a = view;
             this.b = f;
-            this.f2865c = f2;
+            this.f2863c = f2;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
             this.a.setScaleX(this.b);
-            this.a.setScaleY(this.f2865c);
+            this.a.setScaleY(this.f2863c);
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java b/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java
index 0a9697e210..eed88bac4c 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java
@@ -19,21 +19,21 @@ public final class FadeProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2866c;
+        public final /* synthetic */ float f2864c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2866c = f2;
+            this.f2864c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2866c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2864c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java b/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java
index 66b74cdeb4..86003d0d09 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java
@@ -19,21 +19,21 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2867c;
+        public final /* synthetic */ float f2865c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2867c = f2;
+            this.f2865c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2867c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2865c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
index 8b41010b12..220e44e5a8 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
@@ -182,13 +182,13 @@ public final class MaterialContainerTransform extends Transition {
         public final /* synthetic */ d b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ View f2868c;
+        public final /* synthetic */ View f2866c;
         public final /* synthetic */ View d;
 
         public b(View view, d dVar, View view2, View view3) {
             this.a = view;
             this.b = dVar;
-            this.f2868c = view2;
+            this.f2866c = view2;
             this.d = view3;
         }
 
@@ -196,7 +196,7 @@ public final class MaterialContainerTransform extends Transition {
         public void onTransitionEnd(@NonNull Transition transition) {
             MaterialContainerTransform.this.removeListener(this);
             if (!MaterialContainerTransform.access$300(MaterialContainerTransform.this)) {
-                this.f2868c.setAlpha(1.0f);
+                this.f2866c.setAlpha(1.0f);
                 this.d.setAlpha(1.0f);
                 ViewUtils.getOverlay(this.a).remove(this.b);
             }
@@ -205,7 +205,7 @@ public final class MaterialContainerTransform extends Transition {
         @Override // c.i.a.g.l.l.i, android.transition.Transition.TransitionListener
         public void onTransitionStart(@NonNull Transition transition) {
             ViewUtils.getOverlay(this.a).add(this.b);
-            this.f2868c.setAlpha(0.0f);
+            this.f2866c.setAlpha(0.0f);
             this.d.setAlpha(0.0f);
         }
     }
@@ -218,14 +218,14 @@ public final class MaterialContainerTransform extends Transition {
         @NonNull
 
         /* renamed from: c  reason: collision with root package name */
-        public final ProgressThresholds f2869c;
+        public final ProgressThresholds f2867c;
         @NonNull
         public final ProgressThresholds d;
 
         public c(ProgressThresholds progressThresholds, ProgressThresholds progressThresholds2, ProgressThresholds progressThresholds3, ProgressThresholds progressThresholds4, a aVar) {
             this.a = progressThresholds;
             this.b = progressThresholds2;
-            this.f2869c = progressThresholds3;
+            this.f2867c = progressThresholds3;
             this.d = progressThresholds4;
         }
     }
@@ -247,7 +247,7 @@ public final class MaterialContainerTransform extends Transition {
         public final RectF b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ShapeAppearanceModel f2870c;
+        public final ShapeAppearanceModel f2868c;
         public final float d;
         public final View e;
         public final RectF f;
@@ -264,23 +264,23 @@ public final class MaterialContainerTransform extends Transition {
         public final float[] q;
 
         /* renamed from: r  reason: collision with root package name */
-        public final boolean f2871r;
+        public final boolean f2869r;
         public final float s;
         public final float t;
         public final boolean u;
         public final MaterialShapeDrawable v;
 
         /* renamed from: w  reason: collision with root package name */
-        public final RectF f2872w;
+        public final RectF f2870w;
 
         /* renamed from: x  reason: collision with root package name */
-        public final RectF f2873x;
+        public final RectF f2871x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final RectF f2874y;
+        public final RectF f2872y;
 
         /* renamed from: z  reason: collision with root package name */
-        public final RectF f2875z;
+        public final RectF f2873z;
 
         public class a implements k.a {
             public a() {
@@ -321,13 +321,13 @@ public final class MaterialContainerTransform extends Transition {
             this.F = new Path();
             this.a = view;
             this.b = rectF;
-            this.f2870c = shapeAppearanceModel;
+            this.f2868c = shapeAppearanceModel;
             this.d = f;
             this.e = view2;
             this.f = rectF2;
             this.g = shapeAppearanceModel2;
             this.h = f2;
-            this.f2871r = z2;
+            this.f2869r = z2;
             this.u = z3;
             this.B = aVar;
             this.C = dVar;
@@ -345,11 +345,11 @@ public final class MaterialContainerTransform extends Transition {
             materialShapeDrawable.setShadowBitmapDrawingEnable(false);
             materialShapeDrawable.setShadowColor(-7829368);
             RectF rectF3 = new RectF(rectF);
-            this.f2872w = rectF3;
-            this.f2873x = new RectF(rectF3);
+            this.f2870w = rectF3;
+            this.f2871x = new RectF(rectF3);
             RectF rectF4 = new RectF(rectF3);
-            this.f2874y = rectF4;
-            this.f2875z = new RectF(rectF4);
+            this.f2872y = rectF4;
+            this.f2873z = new RectF(rectF4);
             PointF c2 = c(rectF);
             PointF c3 = c(rectF2);
             PathMeasure pathMeasure = new PathMeasure(pathMotion.getPath(c2.x, c2.y, c3.x, c3.y), false);
@@ -372,14 +372,14 @@ public final class MaterialContainerTransform extends Transition {
         public final void a(Canvas canvas) {
             d(canvas, this.k);
             Rect bounds = getBounds();
-            RectF rectF = this.f2874y;
+            RectF rectF = this.f2872y;
             k.h(canvas, bounds, rectF.left, rectF.top, this.H.b, this.G.b, new b());
         }
 
         public final void b(Canvas canvas) {
             d(canvas, this.j);
             Rect bounds = getBounds();
-            RectF rectF = this.f2872w;
+            RectF rectF = this.f2870w;
             k.h(canvas, bounds, rectF.left, rectF.top, this.H.a, this.G.a, new a());
         }
 
@@ -434,7 +434,7 @@ public final class MaterialContainerTransform extends Transition {
             }
             if (this.D) {
                 canvas.restoreToCount(save);
-                RectF rectF2 = this.f2872w;
+                RectF rectF2 = this.f2870w;
                 Path path = this.F;
                 PointF c2 = c(rectF2);
                 if (this.L == 0.0f) {
@@ -445,16 +445,16 @@ public final class MaterialContainerTransform extends Transition {
                     this.E.setColor(-65281);
                     canvas.drawPath(path, this.E);
                 }
-                RectF rectF3 = this.f2873x;
+                RectF rectF3 = this.f2871x;
                 this.E.setColor(InputDeviceCompat.SOURCE_ANY);
                 canvas.drawRect(rectF3, this.E);
-                RectF rectF4 = this.f2872w;
+                RectF rectF4 = this.f2870w;
                 this.E.setColor(-16711936);
                 canvas.drawRect(rectF4, this.E);
-                RectF rectF5 = this.f2875z;
+                RectF rectF5 = this.f2873z;
                 this.E.setColor(-16711681);
                 canvas.drawRect(rectF5, this.E);
-                RectF rectF6 = this.f2874y;
+                RectF rectF6 = this.f2872y;
                 this.E.setColor(-16776961);
                 canvas.drawRect(rectF6, this.E);
             }
@@ -464,7 +464,7 @@ public final class MaterialContainerTransform extends Transition {
             float f2;
             float f3;
             this.L = f;
-            this.m.setAlpha((int) (this.f2871r ? k.d(0.0f, 255.0f, f) : k.d(255.0f, 0.0f, f)));
+            this.m.setAlpha((int) (this.f2869r ? k.d(0.0f, 255.0f, f) : k.d(255.0f, 0.0f, f)));
             this.o.getPosTan(this.p * f, this.q, null);
             float[] fArr = this.q;
             boolean z2 = false;
@@ -488,31 +488,31 @@ public final class MaterialContainerTransform extends Transition {
             }
             f a2 = this.C.a(f, ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.b)))).floatValue(), ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.b)))).floatValue(), this.b.width(), this.b.height(), this.f.width(), this.f.height());
             this.H = a2;
-            RectF rectF = this.f2872w;
+            RectF rectF = this.f2870w;
             float f8 = a2.f1347c / 2.0f;
             rectF.set(f4 - f8, f5, f8 + f4, a2.d + f5);
-            RectF rectF2 = this.f2874y;
+            RectF rectF2 = this.f2872y;
             f fVar = this.H;
             float f9 = fVar.e / 2.0f;
             rectF2.set(f4 - f9, f5, f9 + f4, fVar.f + f5);
-            this.f2873x.set(this.f2872w);
-            this.f2875z.set(this.f2874y);
-            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2869c)))).floatValue();
-            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2869c)))).floatValue();
+            this.f2871x.set(this.f2870w);
+            this.f2873z.set(this.f2872y);
+            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2867c)))).floatValue();
+            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2867c)))).floatValue();
             boolean b2 = this.C.b(this.H);
-            RectF rectF3 = b2 ? this.f2873x : this.f2875z;
+            RectF rectF3 = b2 ? this.f2871x : this.f2873z;
             float e = k.e(0.0f, 1.0f, floatValue, floatValue2, f);
             if (!b2) {
                 e = 1.0f - e;
             }
             this.C.c(rectF3, e, this.H);
-            this.I = new RectF(Math.min(this.f2873x.left, this.f2875z.left), Math.min(this.f2873x.top, this.f2875z.top), Math.max(this.f2873x.right, this.f2875z.right), Math.max(this.f2873x.bottom, this.f2875z.bottom));
+            this.I = new RectF(Math.min(this.f2871x.left, this.f2873z.left), Math.min(this.f2871x.top, this.f2873z.top), Math.max(this.f2871x.right, this.f2873z.right), Math.max(this.f2871x.bottom, this.f2873z.bottom));
             g gVar = this.n;
-            ShapeAppearanceModel shapeAppearanceModel = this.f2870c;
+            ShapeAppearanceModel shapeAppearanceModel = this.f2868c;
             ShapeAppearanceModel shapeAppearanceModel2 = this.g;
-            RectF rectF4 = this.f2872w;
-            RectF rectF5 = this.f2873x;
-            RectF rectF6 = this.f2875z;
+            RectF rectF4 = this.f2870w;
+            RectF rectF5 = this.f2871x;
+            RectF rectF6 = this.f2873z;
             ProgressThresholds progressThresholds = this.A.d;
             Objects.requireNonNull(gVar);
             float start = progressThresholds.getStart();
@@ -655,7 +655,7 @@ public final class MaterialContainerTransform extends Transition {
         if (!z2) {
             cVar = cVar2;
         }
-        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2869c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
+        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2867c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
     }
 
     @StyleRes
diff --git a/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java b/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java
index bd73bb9204..08d38ff697 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java
@@ -23,18 +23,18 @@ public final class ScaleProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2876c;
+        public final /* synthetic */ float f2874c;
 
         public a(View view, float f, float f2) {
             this.a = view;
             this.b = f;
-            this.f2876c = f2;
+            this.f2874c = f2;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
             this.a.setScaleX(this.b);
-            this.a.setScaleY(this.f2876c);
+            this.a.setScaleY(this.f2874c);
         }
     }
 
diff --git a/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java b/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java
index 661f04fac9..4a73c014b0 100644
--- a/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java
+++ b/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java
@@ -45,7 +45,7 @@ public class FirebaseInstanceId {
     public static w b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pattern f2877c = Pattern.compile("\\AA[\\w-]{38}\\z");
+    public static final Pattern f2875c = Pattern.compile("\\AA[\\w-]{38}\\z");
     public static ScheduledExecutorService d;
     public final Executor e;
     public final c f;
@@ -105,7 +105,7 @@ public class FirebaseInstanceId {
         cVar.a();
         c.c.a.a0.d.p(cVar.f.b.contains(":"), "Please set your Application ID. A valid Firebase App ID is required to communicate with Firebase server APIs: It identifies your application with Firebase.Please refer to https://firebase.google.com/support/privacy/init-options.");
         cVar.a();
-        c.c.a.a0.d.p(f2877c.matcher(cVar.f.a).matches(), "Please set a valid API key. A Firebase API key is required to communicate with Firebase server APIs: It authenticates your project with Google.Please refer to https://firebase.google.com/support/privacy/init-options.");
+        c.c.a.a0.d.p(f2875c.matcher(cVar.f.a).matches(), "Please set a valid API key. A Firebase API key is required to communicate with Firebase server APIs: It authenticates your project with Google.Please refer to https://firebase.google.com/support/privacy/init-options.");
     }
 
     @NonNull
diff --git a/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
index 7762277dfc..f5e4d81ab1 100644
--- a/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
+++ b/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
@@ -39,7 +39,7 @@ public class FirebaseMessaging {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f2878c;
+    public final c f2876c;
     public final FirebaseInstanceId d;
     public final a e;
     public final Executor f;
@@ -52,7 +52,7 @@ public class FirebaseMessaging {
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public b<c.i.c.a> f2879c;
+        public b<c.i.c.a> f2877c;
         @Nullable
         public Boolean d;
 
@@ -66,7 +66,7 @@ public class FirebaseMessaging {
                 this.d = c2;
                 if (c2 == null) {
                     j jVar = new j(this);
-                    this.f2879c = jVar;
+                    this.f2877c = jVar;
                     this.a.a(c.i.c.a.class, jVar);
                 }
                 this.b = true;
@@ -79,14 +79,14 @@ public class FirebaseMessaging {
             if (bool != null) {
                 return bool.booleanValue();
             }
-            return FirebaseMessaging.this.f2878c.g();
+            return FirebaseMessaging.this.f2876c.g();
         }
 
         @Nullable
         public final Boolean c() {
             ApplicationInfo applicationInfo;
             Bundle bundle;
-            c cVar = FirebaseMessaging.this.f2878c;
+            c cVar = FirebaseMessaging.this.f2876c;
             cVar.a();
             Context context = cVar.d;
             SharedPreferences sharedPreferences = context.getSharedPreferences("com.google.firebase.messaging", 0);
@@ -109,7 +109,7 @@ public class FirebaseMessaging {
         try {
             Class.forName("com.google.firebase.iid.FirebaseInstanceIdReceiver");
             a = gVar2;
-            this.f2878c = cVar;
+            this.f2876c = cVar;
             this.d = firebaseInstanceId;
             this.e = new a(dVar);
             cVar.a();
diff --git a/app/src/main/java/com/google/gson/Gson.java b/app/src/main/java/com/google/gson/Gson.java
index dc790ff260..6082bdd5c3 100644
--- a/app/src/main/java/com/google/gson/Gson.java
+++ b/app/src/main/java/com/google/gson/Gson.java
@@ -46,7 +46,7 @@ public final class Gson {
     public final ThreadLocal<Map<TypeToken<?>, FutureTypeAdapter<?>>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<TypeToken<?>, TypeAdapter<?>> f2880c;
+    public final Map<TypeToken<?>, TypeAdapter<?>> f2878c;
     public final g d;
     public final JsonAdapterAnnotationTypeAdapterFactory e;
     public final List<o> f;
@@ -227,7 +227,7 @@ public final class Gson {
 
     public Gson(Excluder excluder, d dVar, Map<Type, f<?>> map, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, boolean z8, n nVar, String str, int i, int i2, List<o> list, List<o> list2, List<o> list3) {
         this.b = new ThreadLocal<>();
-        this.f2880c = new ConcurrentHashMap();
+        this.f2878c = new ConcurrentHashMap();
         this.g = map;
         this.d = new g(map);
         this.h = z2;
@@ -251,13 +251,13 @@ public final class Gson {
         arrayList.add(new TypeAdapters.AnonymousClass33(Long.TYPE, Long.class, r3));
         arrayList.add(new TypeAdapters.AnonymousClass33(Double.TYPE, Double.class, z8 ? TypeAdapters.v : new AnonymousClass1(this)));
         arrayList.add(new TypeAdapters.AnonymousClass33(Float.TYPE, Float.class, z8 ? TypeAdapters.u : new AnonymousClass2(this)));
-        arrayList.add(TypeAdapters.f2890x);
+        arrayList.add(TypeAdapters.f2888x);
         arrayList.add(TypeAdapters.o);
         arrayList.add(TypeAdapters.q);
         arrayList.add(new TypeAdapters.AnonymousClass32(AtomicLong.class, new AnonymousClass4(r3).nullSafe()));
         arrayList.add(new TypeAdapters.AnonymousClass32(AtomicLongArray.class, new AnonymousClass5(r3).nullSafe()));
         arrayList.add(TypeAdapters.s);
-        arrayList.add(TypeAdapters.f2892z);
+        arrayList.add(TypeAdapters.f2890z);
         arrayList.add(TypeAdapters.F);
         arrayList.add(TypeAdapters.H);
         arrayList.add(new TypeAdapters.AnonymousClass32(BigDecimal.class, TypeAdapters.B));
@@ -362,7 +362,7 @@ public final class Gson {
     }
 
     public <T> TypeAdapter<T> h(TypeToken<T> typeToken) {
-        TypeAdapter<T> typeAdapter = (TypeAdapter<T>) this.f2880c.get(typeToken == null ? a : typeToken);
+        TypeAdapter<T> typeAdapter = (TypeAdapter<T>) this.f2878c.get(typeToken == null ? a : typeToken);
         if (typeAdapter != null) {
             return typeAdapter;
         }
@@ -385,7 +385,7 @@ public final class Gson {
                 if (create != null) {
                     if (futureTypeAdapter2.a == null) {
                         futureTypeAdapter2.a = create;
-                        this.f2880c.put(typeToken, create);
+                        this.f2878c.put(typeToken, create);
                         return create;
                     }
                     throw new AssertionError();
diff --git a/app/src/main/java/com/google/gson/internal/Excluder.java b/app/src/main/java/com/google/gson/internal/Excluder.java
index 0f0a06e53c..0d301a0b50 100644
--- a/app/src/main/java/com/google/gson/internal/Excluder.java
+++ b/app/src/main/java/com/google/gson/internal/Excluder.java
@@ -26,13 +26,13 @@ public final class Excluder implements o, Cloneable {
         public final /* synthetic */ boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ boolean f2881c;
+        public final /* synthetic */ boolean f2879c;
         public final /* synthetic */ Gson d;
         public final /* synthetic */ TypeToken e;
 
         public AnonymousClass1(boolean z2, boolean z3, Gson gson, TypeToken typeToken) {
             this.b = z2;
-            this.f2881c = z3;
+            this.f2879c = z3;
             this.d = gson;
             this.e = typeToken;
         }
@@ -54,7 +54,7 @@ public final class Excluder implements o, Cloneable {
 
         @Override // com.google.gson.TypeAdapter
         public void write(JsonWriter jsonWriter, T t) throws IOException {
-            if (this.f2881c) {
+            if (this.f2879c) {
                 jsonWriter.s();
                 return;
             }
diff --git a/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java b/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
index e8e1b9b4b3..7a002489fd 100644
--- a/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
+++ b/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
@@ -18,7 +18,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
     public final Class<E> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final TypeAdapter<E> f2882c;
+    public final TypeAdapter<E> f2880c;
 
     /* renamed from: com.google.gson.internal.bind.ArrayTypeAdapter$1  reason: invalid class name */
     public class AnonymousClass1 implements o {
@@ -35,7 +35,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
     }
 
     public ArrayTypeAdapter(Gson gson, TypeAdapter<E> typeAdapter, Class<E> cls) {
-        this.f2882c = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter, cls);
+        this.f2880c = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter, cls);
         this.b = cls;
     }
 
@@ -48,7 +48,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
         ArrayList arrayList = new ArrayList();
         jsonReader.a();
         while (jsonReader.r()) {
-            arrayList.add(this.f2882c.read(jsonReader));
+            arrayList.add(this.f2880c.read(jsonReader));
         }
         jsonReader.e();
         int size = arrayList.size();
@@ -70,7 +70,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
         jsonWriter.b();
         int length = Array.getLength(obj);
         for (int i = 0; i < length; i++) {
-            this.f2882c.write(jsonWriter, Array.get(obj, i));
+            this.f2880c.write(jsonWriter, Array.get(obj, i));
         }
         jsonWriter.e();
     }
diff --git a/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java b/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
index 85bb7395a7..d6fa8d747b 100644
--- a/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
@@ -33,12 +33,12 @@ public final class MapTypeAdapterFactory implements o {
         public final TypeAdapter<V> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final r<? extends Map<K, V>> f2883c;
+        public final r<? extends Map<K, V>> f2881c;
 
         public Adapter(Gson gson, Type type, TypeAdapter<K> typeAdapter, Type type2, TypeAdapter<V> typeAdapter2, r<? extends Map<K, V>> rVar) {
             this.a = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter, type);
             this.b = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter2, type2);
-            this.f2883c = rVar;
+            this.f2881c = rVar;
         }
 
         @Override // com.google.gson.TypeAdapter
@@ -48,7 +48,7 @@ public final class MapTypeAdapterFactory implements o {
                 jsonReader.H();
                 return null;
             }
-            Map map = (Map) this.f2883c.a();
+            Map map = (Map) this.f2881c.a();
             if (N == JsonToken.BEGIN_ARRAY) {
                 jsonReader.a();
                 while (jsonReader.r()) {
diff --git a/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index a2893c3d57..fd19c331b2 100644
--- a/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -51,7 +51,7 @@ public final class ReflectiveTypeAdapterFactory implements o {
                 while (jsonReader.r()) {
                     a aVar = this.b.get(jsonReader.C());
                     if (aVar != null) {
-                        if (aVar.f2884c) {
+                        if (aVar.f2882c) {
                             aVar.a(jsonReader, a);
                         }
                     }
@@ -92,12 +92,12 @@ public final class ReflectiveTypeAdapterFactory implements o {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2884c;
+        public final boolean f2882c;
 
         public a(String str, boolean z2, boolean z3) {
             this.a = str;
             this.b = z2;
-            this.f2884c = z3;
+            this.f2882c = z3;
         }
 
         public abstract void a(JsonReader jsonReader, Object obj) throws IOException, IllegalAccessException;
diff --git a/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java b/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
index 46c5d0f1db..bd56d44b99 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
@@ -20,7 +20,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
     public final i<T> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Gson f2885c;
+    public final Gson f2883c;
     public final TypeToken<T> d;
     public final o e;
     public final TreeTypeAdapter<T>.b f = new b(this, null);
@@ -62,7 +62,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
     public TreeTypeAdapter(m<T> mVar, i<T> iVar, Gson gson, TypeToken<T> typeToken, o oVar) {
         this.a = mVar;
         this.b = iVar;
-        this.f2885c = gson;
+        this.f2883c = gson;
         this.d = typeToken;
         this.e = oVar;
     }
@@ -72,7 +72,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
         if (this.b == null) {
             TypeAdapter<T> typeAdapter = this.g;
             if (typeAdapter == null) {
-                typeAdapter = this.f2885c.j(this.e, this.d);
+                typeAdapter = this.f2883c.j(this.e, this.d);
                 this.g = typeAdapter;
             }
             return typeAdapter.read(jsonReader);
@@ -91,7 +91,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
         if (mVar == null) {
             TypeAdapter<T> typeAdapter = this.g;
             if (typeAdapter == null) {
-                typeAdapter = this.f2885c.j(this.e, this.d);
+                typeAdapter = this.f2883c.j(this.e, this.d);
                 this.g = typeAdapter;
             }
             typeAdapter.write(jsonWriter, t);
diff --git a/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index 5225799f42..aa0fc6ff25 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -14,12 +14,12 @@ public final class TypeAdapterRuntimeTypeWrapper<T> extends TypeAdapter<T> {
     public final TypeAdapter<T> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Type f2886c;
+    public final Type f2884c;
 
     public TypeAdapterRuntimeTypeWrapper(Gson gson, TypeAdapter<T> typeAdapter, Type type) {
         this.a = gson;
         this.b = typeAdapter;
-        this.f2886c = type;
+        this.f2884c = type;
     }
 
     @Override // com.google.gson.TypeAdapter
@@ -30,11 +30,11 @@ public final class TypeAdapterRuntimeTypeWrapper<T> extends TypeAdapter<T> {
     @Override // com.google.gson.TypeAdapter
     public void write(JsonWriter jsonWriter, T t) throws IOException {
         TypeAdapter<T> typeAdapter = this.b;
-        Type type = this.f2886c;
+        Type type = this.f2884c;
         if (t != null && (type == Object.class || (type instanceof TypeVariable) || (type instanceof Class))) {
             type = t.getClass();
         }
-        if (type != this.f2886c) {
+        if (type != this.f2884c) {
             typeAdapter = this.a.h(TypeToken.get(type));
             if (typeAdapter instanceof ReflectiveTypeAdapterFactory.Adapter) {
                 TypeAdapter<T> typeAdapter2 = this.b;
diff --git a/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java b/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
index 7c1b8624bb..c99fb48ddf 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
@@ -75,7 +75,7 @@ public final class TypeAdapters {
     public static final o b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final TypeAdapter<BitSet> f2887c;
+    public static final TypeAdapter<BitSet> f2885c;
     public static final o d;
     public static final TypeAdapter<Boolean> e;
     public static final TypeAdapter<Boolean> f = new AnonymousClass4();
@@ -92,23 +92,23 @@ public final class TypeAdapters {
     public static final o q;
 
     /* renamed from: r  reason: collision with root package name */
-    public static final TypeAdapter<AtomicIntegerArray> f2888r;
+    public static final TypeAdapter<AtomicIntegerArray> f2886r;
     public static final o s;
     public static final TypeAdapter<Number> t = new AnonymousClass11();
     public static final TypeAdapter<Number> u = new AnonymousClass12();
     public static final TypeAdapter<Number> v = new AnonymousClass13();
 
     /* renamed from: w  reason: collision with root package name */
-    public static final TypeAdapter<Number> f2889w;
+    public static final TypeAdapter<Number> f2887w;
 
     /* renamed from: x  reason: collision with root package name */
-    public static final o f2890x;
+    public static final o f2888x;
 
     /* renamed from: y  reason: collision with root package name */
-    public static final TypeAdapter<Character> f2891y;
+    public static final TypeAdapter<Character> f2889y;
 
     /* renamed from: z  reason: collision with root package name */
-    public static final o f2892z;
+    public static final o f2890z;
 
     /* renamed from: com.google.gson.internal.bind.TypeAdapters$1  reason: invalid class name */
     public class AnonymousClass1 extends TypeAdapter<Class> {
@@ -1144,7 +1144,7 @@ public final class TypeAdapters {
         a = nullSafe;
         b = new AnonymousClass32(Class.class, nullSafe);
         TypeAdapter<BitSet> nullSafe2 = new AnonymousClass2().nullSafe();
-        f2887c = nullSafe2;
+        f2885c = nullSafe2;
         d = new AnonymousClass32(BitSet.class, nullSafe2);
         AnonymousClass3 r0 = new AnonymousClass3();
         e = r0;
@@ -1165,14 +1165,14 @@ public final class TypeAdapters {
         p = nullSafe4;
         q = new AnonymousClass32(AtomicBoolean.class, nullSafe4);
         TypeAdapter<AtomicIntegerArray> nullSafe5 = new AnonymousClass10().nullSafe();
-        f2888r = nullSafe5;
+        f2886r = nullSafe5;
         s = new AnonymousClass32(AtomicIntegerArray.class, nullSafe5);
         AnonymousClass14 r05 = new AnonymousClass14();
-        f2889w = r05;
-        f2890x = new AnonymousClass32(Number.class, r05);
+        f2887w = r05;
+        f2888x = new AnonymousClass32(Number.class, r05);
         AnonymousClass15 r06 = new AnonymousClass15();
-        f2891y = r06;
-        f2892z = new AnonymousClass33(Character.TYPE, Character.class, r06);
+        f2889y = r06;
+        f2890z = new AnonymousClass33(Character.TYPE, Character.class, r06);
         AnonymousClass16 r07 = new AnonymousClass16();
         A = r07;
         D = new AnonymousClass32(String.class, r07);
diff --git a/app/src/main/java/com/google/gson/stream/JsonReader.java b/app/src/main/java/com/google/gson/stream/JsonReader.java
index b543459d5b..0510ab8b98 100644
--- a/app/src/main/java/com/google/gson/stream/JsonReader.java
+++ b/app/src/main/java/com/google/gson/stream/JsonReader.java
@@ -19,17 +19,17 @@ public class JsonReader implements Closeable {
     public int q = 0;
 
     /* renamed from: r  reason: collision with root package name */
-    public long f2893r;
+    public long f2891r;
     public int s;
     public String t;
     public int[] u;
     public int v;
 
     /* renamed from: w  reason: collision with root package name */
-    public String[] f2894w;
+    public String[] f2892w;
 
     /* renamed from: x  reason: collision with root package name */
-    public int[] f2895x;
+    public int[] f2893x;
 
     public class a extends p {
     }
@@ -44,8 +44,8 @@ public class JsonReader implements Closeable {
         this.v = 0;
         this.v = 0 + 1;
         iArr[0] = 6;
-        this.f2894w = new String[32];
-        this.f2895x = new int[32];
+        this.f2892w = new String[32];
+        this.f2893x = new int[32];
         Objects.requireNonNull(reader, "in == null");
         this.j = reader;
     }
@@ -57,10 +57,10 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 15) {
             this.q = 0;
-            int[] iArr = this.f2895x;
+            int[] iArr = this.f2893x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
-            return this.f2893r;
+            return this.f2891r;
         }
         if (i2 == 16) {
             this.t = new String(this.l, this.m, this.s);
@@ -74,7 +74,7 @@ public class JsonReader implements Closeable {
             try {
                 long parseLong = Long.parseLong(this.t);
                 this.q = 0;
-                int[] iArr2 = this.f2895x;
+                int[] iArr2 = this.f2893x;
                 int i4 = this.v - 1;
                 iArr2[i4] = iArr2[i4] + 1;
                 return parseLong;
@@ -92,7 +92,7 @@ public class JsonReader implements Closeable {
         if (((double) j) == parseDouble) {
             this.t = null;
             this.q = 0;
-            int[] iArr3 = this.f2895x;
+            int[] iArr3 = this.f2893x;
             int i5 = this.v - 1;
             iArr3[i5] = iArr3[i5] + 1;
             return j;
@@ -122,7 +122,7 @@ public class JsonReader implements Closeable {
             throw new IllegalStateException(O.toString());
         }
         this.q = 0;
-        this.f2894w[this.v - 1] = str;
+        this.f2892w[this.v - 1] = str;
         return str;
     }
 
@@ -221,7 +221,7 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 7) {
             this.q = 0;
-            int[] iArr = this.f2895x;
+            int[] iArr = this.f2893x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
             return;
@@ -301,7 +301,7 @@ public class JsonReader implements Closeable {
             str = this.t;
             this.t = null;
         } else if (i2 == 15) {
-            str = Long.toString(this.f2893r);
+            str = Long.toString(this.f2891r);
         } else if (i2 == 16) {
             str = new String(this.l, this.m, this.s);
             this.m += this.s;
@@ -312,7 +312,7 @@ public class JsonReader implements Closeable {
             throw new IllegalStateException(O.toString());
         }
         this.q = 0;
-        int[] iArr = this.f2895x;
+        int[] iArr = this.f2893x;
         int i3 = this.v - 1;
         iArr[i3] = iArr[i3] + 1;
         return str;
@@ -420,8 +420,8 @@ public class JsonReader implements Closeable {
         if (i3 == iArr.length) {
             int i4 = i3 * 2;
             this.u = Arrays.copyOf(iArr, i4);
-            this.f2895x = Arrays.copyOf(this.f2895x, i4);
-            this.f2894w = (String[]) Arrays.copyOf(this.f2894w, i4);
+            this.f2893x = Arrays.copyOf(this.f2893x, i4);
+            this.f2892w = (String[]) Arrays.copyOf(this.f2892w, i4);
         }
         int[] iArr2 = this.u;
         int i5 = this.v;
@@ -620,11 +620,11 @@ public class JsonReader implements Closeable {
             i3++;
             this.q = 0;
         } while (i3 != 0);
-        int[] iArr = this.f2895x;
+        int[] iArr = this.f2893x;
         int i6 = this.v;
         int i7 = i6 - 1;
         iArr[i7] = iArr[i7] + 1;
-        this.f2894w[i6 - 1] = "null";
+        this.f2892w[i6 - 1] = "null";
     }
 
     public final IOException V(String str) throws IOException {
@@ -640,7 +640,7 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 3) {
             Q(1);
-            this.f2895x[this.v - 1] = 0;
+            this.f2893x[this.v - 1] = 0;
             this.q = 0;
             return;
         }
@@ -709,7 +709,7 @@ public class JsonReader implements Closeable {
         r10 = -r10;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:155:0x021d, code lost:
-        r19.f2893r = r10;
+        r19.f2891r = r10;
         r19.m += r9;
         r6 = 15;
         r19.q = 15;
@@ -1021,7 +1021,7 @@ public class JsonReader implements Closeable {
         if (i2 == 4) {
             int i3 = this.v - 1;
             this.v = i3;
-            int[] iArr = this.f2895x;
+            int[] iArr = this.f2893x;
             int i4 = i3 - 1;
             iArr[i4] = iArr[i4] + 1;
             this.q = 0;
@@ -1041,8 +1041,8 @@ public class JsonReader implements Closeable {
         if (i2 == 2) {
             int i3 = this.v - 1;
             this.v = i3;
-            this.f2894w[i3] = null;
-            int[] iArr = this.f2895x;
+            this.f2892w[i3] = null;
+            int[] iArr = this.f2893x;
             int i4 = i3 - 1;
             iArr[i4] = iArr[i4] + 1;
             this.q = 0;
@@ -1061,11 +1061,11 @@ public class JsonReader implements Closeable {
             int i4 = this.u[i3];
             if (i4 == 1 || i4 == 2) {
                 M.append('[');
-                M.append(this.f2895x[i3]);
+                M.append(this.f2893x[i3]);
                 M.append(']');
             } else if (i4 == 3 || i4 == 4 || i4 == 5) {
                 M.append('.');
-                String[] strArr = this.f2894w;
+                String[] strArr = this.f2892w;
                 if (strArr[i3] != null) {
                     M.append(strArr[i3]);
                 }
@@ -1164,13 +1164,13 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 5) {
             this.q = 0;
-            int[] iArr = this.f2895x;
+            int[] iArr = this.f2893x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
             return true;
         } else if (i2 == 6) {
             this.q = 0;
-            int[] iArr2 = this.f2895x;
+            int[] iArr2 = this.f2893x;
             int i4 = this.v - 1;
             iArr2[i4] = iArr2[i4] + 1;
             return false;
@@ -1189,10 +1189,10 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 15) {
             this.q = 0;
-            int[] iArr = this.f2895x;
+            int[] iArr = this.f2893x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
-            return (double) this.f2893r;
+            return (double) this.f2891r;
         }
         if (i2 == 16) {
             this.t = new String(this.l, this.m, this.s);
@@ -1212,7 +1212,7 @@ public class JsonReader implements Closeable {
         if (this.k || (!Double.isNaN(parseDouble) && !Double.isInfinite(parseDouble))) {
             this.t = null;
             this.q = 0;
-            int[] iArr2 = this.f2895x;
+            int[] iArr2 = this.f2893x;
             int i4 = this.v - 1;
             iArr2[i4] = iArr2[i4] + 1;
             return parseDouble;
@@ -1226,17 +1226,17 @@ public class JsonReader implements Closeable {
             i2 = d();
         }
         if (i2 == 15) {
-            long j = this.f2893r;
+            long j = this.f2891r;
             int i3 = (int) j;
             if (j == ((long) i3)) {
                 this.q = 0;
-                int[] iArr = this.f2895x;
+                int[] iArr = this.f2893x;
                 int i4 = this.v - 1;
                 iArr[i4] = iArr[i4] + 1;
                 return i3;
             }
             StringBuilder O = c.d.b.a.a.O("Expected an int but was ");
-            O.append(this.f2893r);
+            O.append(this.f2891r);
             O.append(t());
             throw new NumberFormatException(O.toString());
         }
@@ -1252,7 +1252,7 @@ public class JsonReader implements Closeable {
             try {
                 int parseInt = Integer.parseInt(this.t);
                 this.q = 0;
-                int[] iArr2 = this.f2895x;
+                int[] iArr2 = this.f2893x;
                 int i5 = this.v - 1;
                 iArr2[i5] = iArr2[i5] + 1;
                 return parseInt;
@@ -1270,7 +1270,7 @@ public class JsonReader implements Closeable {
         if (((double) i6) == parseDouble) {
             this.t = null;
             this.q = 0;
-            int[] iArr3 = this.f2895x;
+            int[] iArr3 = this.f2893x;
             int i7 = this.v - 1;
             iArr3[i7] = iArr3[i7] + 1;
             return i6;
diff --git a/app/src/main/java/com/google/gson/stream/JsonWriter.java b/app/src/main/java/com/google/gson/stream/JsonWriter.java
index f9142464b6..174a8214f1 100644
--- a/app/src/main/java/com/google/gson/stream/JsonWriter.java
+++ b/app/src/main/java/com/google/gson/stream/JsonWriter.java
@@ -19,7 +19,7 @@ public class JsonWriter implements Closeable, Flushable {
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public String f2897r;
+    public String f2895r;
     public boolean s;
 
     static {
@@ -100,7 +100,7 @@ public class JsonWriter implements Closeable, Flushable {
     }
 
     public final void K() throws IOException {
-        if (this.f2897r != null) {
+        if (this.f2895r != null) {
             int t = t();
             if (t == 5) {
                 this.k.write(44);
@@ -109,8 +109,8 @@ public class JsonWriter implements Closeable, Flushable {
             }
             r();
             x(4);
-            z(this.f2897r);
-            this.f2897r = null;
+            z(this.f2895r);
+            this.f2895r = null;
         }
     }
 
@@ -167,7 +167,7 @@ public class JsonWriter implements Closeable, Flushable {
         int t = t();
         if (t != i3 && t != i2) {
             throw new IllegalStateException("Nesting problem.");
-        } else if (this.f2897r == null) {
+        } else if (this.f2895r == null) {
             this.m--;
             if (t == i3) {
                 r();
@@ -176,7 +176,7 @@ public class JsonWriter implements Closeable, Flushable {
             return this;
         } else {
             StringBuilder O = a.O("Dangling name: ");
-            O.append(this.f2897r);
+            O.append(this.f2895r);
             throw new IllegalStateException(O.toString());
         }
     }
@@ -202,10 +202,10 @@ public class JsonWriter implements Closeable, Flushable {
 
     public JsonWriter p(String str) throws IOException {
         Objects.requireNonNull(str, "name == null");
-        if (this.f2897r != null) {
+        if (this.f2895r != null) {
             throw new IllegalStateException();
         } else if (this.m != 0) {
-            this.f2897r = str;
+            this.f2895r = str;
             return this;
         } else {
             throw new IllegalStateException("JsonWriter is closed.");
@@ -223,11 +223,11 @@ public class JsonWriter implements Closeable, Flushable {
     }
 
     public JsonWriter s() throws IOException {
-        if (this.f2897r != null) {
+        if (this.f2895r != null) {
             if (this.s) {
                 K();
             } else {
-                this.f2897r = null;
+                this.f2895r = null;
                 return this;
             }
         }
diff --git a/app/src/main/java/com/google/zxing/Result.java b/app/src/main/java/com/google/zxing/Result.java
index 19052ca978..45a8321f97 100644
--- a/app/src/main/java/com/google/zxing/Result.java
+++ b/app/src/main/java/com/google/zxing/Result.java
@@ -10,14 +10,14 @@ public final class Result {
     public final byte[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public k[] f2898c;
+    public k[] f2896c;
     public final a d;
     public Map<j, Object> e = null;
 
     public Result(String str, byte[] bArr, int i, k[] kVarArr, a aVar, long j) {
         this.a = str;
         this.b = bArr;
-        this.f2898c = kVarArr;
+        this.f2896c = kVarArr;
         this.d = aVar;
     }
 
@@ -25,7 +25,7 @@ public final class Result {
         System.currentTimeMillis();
         this.a = str;
         this.b = bArr;
-        this.f2898c = kVarArr;
+        this.f2896c = kVarArr;
         this.d = aVar;
     }
 
diff --git a/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java b/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java
index 40c9a1eb40..6e9030815a 100644
--- a/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java
+++ b/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java
@@ -21,7 +21,7 @@ public class HCaptchaConfig implements Serializable {
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Boolean f2899c;
+        public Boolean f2897c;
         public String d;
         public boolean e;
         public String f;
@@ -40,7 +40,7 @@ public class HCaptchaConfig implements Serializable {
             StringBuilder O = c.d.b.a.a.O("HCaptchaConfig.HCaptchaConfigBuilder(siteKey=");
             O.append(this.a);
             O.append(", sentry$value=");
-            O.append(this.f2899c);
+            O.append(this.f2897c);
             O.append(", rqdata=");
             O.append(this.d);
             O.append(", apiEndpoint$value=");
@@ -319,7 +319,7 @@ public class HCaptchaConfig implements Serializable {
         String str = this.siteKey;
         Objects.requireNonNull(str, "siteKey is marked non-null but is null");
         aVar.a = str;
-        aVar.f2899c = this.sentry;
+        aVar.f2897c = this.sentry;
         aVar.b = true;
         aVar.d = this.rqdata;
         aVar.f = this.apiEndpoint;
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
index 8eaaf62180..431637a2bc 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
@@ -37,7 +37,7 @@ public class ColorPanelView extends View {
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2900r = -9539986;
+    public int f2898r = -9539986;
     public int s = ViewCompat.MEASURED_STATE_MASK;
     public int t;
 
@@ -48,11 +48,11 @@ public class ColorPanelView extends View {
         boolean z2 = obtainStyledAttributes.getBoolean(R.f.ColorPanelView_cpv_showOldColor, false);
         this.q = z2;
         if (!z2 || this.t == 1) {
-            this.f2900r = obtainStyledAttributes.getColor(R.f.ColorPanelView_cpv_borderColor, -9539986);
+            this.f2898r = obtainStyledAttributes.getColor(R.f.ColorPanelView_cpv_borderColor, -9539986);
             obtainStyledAttributes.recycle();
-            if (this.f2900r == -9539986) {
+            if (this.f2898r == -9539986) {
                 TypedArray obtainStyledAttributes2 = context.obtainStyledAttributes(new TypedValue().data, new int[]{16842808});
-                this.f2900r = obtainStyledAttributes2.getColor(0, this.f2900r);
+                this.f2898r = obtainStyledAttributes2.getColor(0, this.f2898r);
                 obtainStyledAttributes2.recycle();
             }
             Paint paint = new Paint();
@@ -107,7 +107,7 @@ public class ColorPanelView extends View {
     }
 
     public int getBorderColor() {
-        return this.f2900r;
+        return this.f2898r;
     }
 
     public int getColor() {
@@ -120,7 +120,7 @@ public class ColorPanelView extends View {
 
     @Override // android.view.View
     public void onDraw(Canvas canvas) {
-        this.j.setColor(this.f2900r);
+        this.j.setColor(this.f2898r);
         this.k.setColor(this.s);
         int i = this.t;
         if (i == 0) {
@@ -198,7 +198,7 @@ public class ColorPanelView extends View {
     }
 
     public void setBorderColor(int i) {
-        this.f2900r = i;
+        this.f2898r = i;
         invalidate();
     }
 
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
index 5e444999a4..6ad94fb8b3 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
@@ -67,23 +67,23 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2901r;
+    public int f2899r;
     public c.k.a.a.b s;
     public LinearLayout t;
     public SeekBar u;
     public TextView v;
 
     /* renamed from: w  reason: collision with root package name */
-    public ColorPickerView f2902w;
+    public ColorPickerView f2900w;
 
     /* renamed from: x  reason: collision with root package name */
-    public ColorPanelView f2903x;
+    public ColorPanelView f2901x;
 
     /* renamed from: y  reason: collision with root package name */
-    public EditText f2904y;
+    public EditText f2902y;
 
     /* renamed from: z  reason: collision with root package name */
-    public EditText f2905z;
+    public EditText f2903z;
 
     public class a implements View.OnLongClickListener {
         public final /* synthetic */ ColorPanelView i;
@@ -105,13 +105,13 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
         @Override // android.view.View.OnTouchListener
         public boolean onTouch(View view, MotionEvent motionEvent) {
-            EditText editText = ColorPickerDialog.this.f2905z;
+            EditText editText = ColorPickerDialog.this.f2903z;
             if (view == editText || !editText.hasFocus()) {
                 return false;
             }
-            ColorPickerDialog.this.f2905z.clearFocus();
-            ((InputMethodManager) ColorPickerDialog.this.getActivity().getSystemService("input_method")).hideSoftInputFromWindow(ColorPickerDialog.this.f2905z.getWindowToken(), 0);
-            ColorPickerDialog.this.f2905z.clearFocus();
+            ColorPickerDialog.this.f2903z.clearFocus();
+            ((InputMethodManager) ColorPickerDialog.this.getActivity().getSystemService("input_method")).hideSoftInputFromWindow(ColorPickerDialog.this.f2903z.getWindowToken(), 0);
+            ColorPickerDialog.this.f2903z.clearFocus();
             return true;
         }
     }
@@ -189,7 +189,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
         @Override // android.view.View.OnClickListener
         public void onClick(View view) {
-            int color = ColorPickerDialog.this.f2903x.getColor();
+            int color = ColorPickerDialog.this.f2901x.getColor();
             ColorPickerDialog colorPickerDialog = ColorPickerDialog.this;
             int i = colorPickerDialog.n;
             if (color == i) {
@@ -206,7 +206,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         @Override // android.view.View.OnFocusChangeListener
         public void onFocusChange(View view, boolean z2) {
             if (z2) {
-                ((InputMethodManager) ColorPickerDialog.this.getActivity().getSystemService("input_method")).showSoftInput(ColorPickerDialog.this.f2905z, 1);
+                ((InputMethodManager) ColorPickerDialog.this.getActivity().getSystemService("input_method")).showSoftInput(ColorPickerDialog.this.f2903z, 1);
             }
         }
     }
@@ -273,7 +273,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         @StringRes
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2906c = R.e.cpv_custom;
+        public int f2904c = R.e.cpv_custom;
         @StringRes
         public int d = R.e.cpv_select;
         @StringRes
@@ -297,7 +297,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         @ColorInt
 
         /* renamed from: r  reason: collision with root package name */
-        public int f2907r = 0;
+        public int f2905r = 0;
         @ColorInt
         public int s = 0;
         @ColorInt
@@ -309,19 +309,19 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         @ColorInt
 
         /* renamed from: w  reason: collision with root package name */
-        public int f2908w = 0;
+        public int f2906w = 0;
         @FontRes
 
         /* renamed from: x  reason: collision with root package name */
-        public int f2909x = 0;
+        public int f2907x = 0;
         @FontRes
 
         /* renamed from: y  reason: collision with root package name */
-        public int f2910y = 0;
+        public int f2908y = 0;
         @FontRes
 
         /* renamed from: z  reason: collision with root package name */
-        public int f2911z = 0;
+        public int f2909z = 0;
 
         public ColorPickerDialog a() {
             ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
@@ -338,21 +338,21 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
             bundle.putBoolean("showColorShades", this.m);
             bundle.putInt("colorShape", this.n);
             bundle.putInt("presetsButtonText", this.b);
-            bundle.putInt("customButtonText", this.f2906c);
+            bundle.putInt("customButtonText", this.f2904c);
             bundle.putInt("customButtonColor", this.o);
             bundle.putInt("customButtonTextColor", this.v);
             bundle.putInt("selectedButtonText", this.d);
             bundle.putInt("selectedButtonColor", this.p);
-            bundle.putInt("selectedButtonTextColor", this.f2908w);
+            bundle.putInt("selectedButtonTextColor", this.f2906w);
             bundle.putInt("resetButtonText", this.e);
-            bundle.putInt("buttonFont", this.f2910y);
-            bundle.putInt("titleTextColor", this.f2907r);
-            bundle.putInt("titleFont", this.f2909x);
+            bundle.putInt("buttonFont", this.f2908y);
+            bundle.putInt("titleTextColor", this.f2905r);
+            bundle.putInt("titleFont", this.f2907x);
             bundle.putInt("dividerColor", this.q);
             bundle.putInt("backgroundColor", this.s);
             bundle.putInt("inputTextColor", this.t);
             bundle.putInt("inputBackground", this.u);
-            bundle.putInt("inputFont", this.f2911z);
+            bundle.putInt("inputFont", this.f2909z);
             colorPickerDialog.setArguments(bundle);
             return colorPickerDialog;
         }
@@ -385,7 +385,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         int parseInt;
         int parseInt2;
         int parseInt3;
-        if (this.f2905z.isFocused()) {
+        if (this.f2903z.isFocused()) {
             String obj = editable.toString();
             if (obj.startsWith("#")) {
                 obj = obj.substring(1);
@@ -410,9 +410,9 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
                     i2 = i5;
                     i8 = 255;
                     argb = Color.argb(i8, i3, i7, i2);
-                    if (argb == this.f2902w.getColor()) {
+                    if (argb == this.f2900w.getColor()) {
                         this.H = true;
-                        this.f2902w.b(argb, true);
+                        this.f2900w.b(argb, true);
                         return;
                     }
                     return;
@@ -441,7 +441,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
                         i7 = -1;
                     }
                     argb = Color.argb(i8, i3, i7, i2);
-                    if (argb == this.f2902w.getColor()) {
+                    if (argb == this.f2900w.getColor()) {
                     }
                 }
                 i5 = parseInt3;
@@ -451,7 +451,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
                 i2 = i5;
                 i8 = 255;
                 argb = Color.argb(i8, i3, i7, i2);
-                if (argb == this.f2902w.getColor()) {
+                if (argb == this.f2900w.getColor()) {
                 }
             }
             i5 = i6;
@@ -460,7 +460,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
             i2 = i5;
             i8 = 255;
             argb = Color.argb(i8, i3, i7, i2);
-            if (argb == this.f2902w.getColor()) {
+            if (argb == this.f2900w.getColor()) {
             }
         }
     }
@@ -486,7 +486,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         int dimensionPixelSize = getResources().getDimensionPixelSize(R.a.cpv_item_horizontal_padding);
         while (i3 < 12) {
             int i4 = iArr[i3];
-            View inflate = View.inflate(getActivity(), this.f2901r == 0 ? R.d.cpv_color_item_square : R.d.cpv_color_item_circle, null);
+            View inflate = View.inflate(getActivity(), this.f2899r == 0 ? R.d.cpv_color_item_square : R.d.cpv_color_item_circle, null);
             ColorPanelView colorPanelView2 = (ColorPanelView) inflate.findViewById(R.c.cpv_color_panel_view);
             ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) colorPanelView2.getLayoutParams();
             marginLayoutParams.rightMargin = dimensionPixelSize;
@@ -503,27 +503,27 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
     public View i() {
         View inflate = View.inflate(getActivity(), R.d.cpv_dialog_color_picker, null);
-        this.f2902w = (ColorPickerView) inflate.findViewById(R.c.cpv_color_picker_view);
-        this.f2903x = (ColorPanelView) inflate.findViewById(R.c.cpv_color_panel_new);
-        this.f2905z = (EditText) inflate.findViewById(R.c.cpv_hex);
-        this.f2904y = (EditText) inflate.findViewById(R.c.cpv_hex_prefix);
+        this.f2900w = (ColorPickerView) inflate.findViewById(R.c.cpv_color_picker_view);
+        this.f2901x = (ColorPanelView) inflate.findViewById(R.c.cpv_color_panel_new);
+        this.f2903z = (EditText) inflate.findViewById(R.c.cpv_hex);
+        this.f2902y = (EditText) inflate.findViewById(R.c.cpv_hex_prefix);
         this.A = inflate.findViewById(R.c.cpv_hex_container);
-        this.f2902w.setAlphaSliderVisible(this.F);
-        this.f2902w.b(this.n, true);
-        this.f2903x.setColor(this.n);
+        this.f2900w.setAlphaSliderVisible(this.F);
+        this.f2900w.b(this.n, true);
+        this.f2901x.setColor(this.n);
         l(this.n);
         if (!this.F) {
-            this.f2905z.setFilters(new InputFilter[]{new InputFilter.LengthFilter(6)});
+            this.f2903z.setFilters(new InputFilter[]{new InputFilter.LengthFilter(6)});
         }
-        this.f2903x.setOnClickListener(new f());
+        this.f2901x.setOnClickListener(new f());
         inflate.setOnTouchListener(this.J);
-        this.f2902w.setOnColorChangedListener(this);
-        this.f2905z.addTextChangedListener(this);
-        this.f2905z.setOnFocusChangeListener(new g());
+        this.f2900w.setOnColorChangedListener(this);
+        this.f2903z.addTextChangedListener(this);
+        this.f2903z.setOnFocusChangeListener(new g());
         int i2 = getArguments().getInt("inputTextColor", 0);
         if (i2 != 0) {
-            this.f2905z.setTextColor(i2);
-            this.f2904y.setTextColor(i2);
+            this.f2903z.setTextColor(i2);
+            this.f2902y.setTextColor(i2);
         }
         int i3 = getArguments().getInt("inputBackground", 0);
         if (i3 != 0) {
@@ -531,8 +531,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         }
         int i4 = getArguments().getInt("inputFont", 0);
         if (i4 != 0) {
-            this.f2905z.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
-            this.f2904y.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
+            this.f2903z.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
+            this.f2902y.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
         }
         return inflate;
     }
@@ -624,7 +624,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
                 i8++;
             }
         }
-        c.k.a.a.b bVar = new c.k.a.a.b(hVar, iArr5, i8, this.f2901r);
+        c.k.a.a.b bVar = new c.k.a.a.b(hVar, iArr5, i8, this.f2899r);
         this.s = bVar;
         gridView.setAdapter((ListAdapter) bVar);
         if (this.F) {
@@ -642,15 +642,15 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
     public void k(int i2) {
         this.n = i2;
-        ColorPanelView colorPanelView = this.f2903x;
+        ColorPanelView colorPanelView = this.f2901x;
         if (colorPanelView != null) {
             colorPanelView.setColor(i2);
         }
-        if (!this.H && this.f2905z != null) {
+        if (!this.H && this.f2903z != null) {
             l(i2);
-            if (this.f2905z.hasFocus()) {
-                ((InputMethodManager) getActivity().getSystemService("input_method")).hideSoftInputFromWindow(this.f2905z.getWindowToken(), 0);
-                this.f2905z.clearFocus();
+            if (this.f2903z.hasFocus()) {
+                ((InputMethodManager) getActivity().getSystemService("input_method")).hideSoftInputFromWindow(this.f2903z.getWindowToken(), 0);
+                this.f2903z.clearFocus();
             }
         }
         this.H = false;
@@ -658,9 +658,9 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
     public final void l(int i2) {
         if (this.F) {
-            this.f2905z.setText(String.format("%08X", Integer.valueOf(i2)));
+            this.f2903z.setText(String.format("%08X", Integer.valueOf(i2)));
         } else {
-            this.f2905z.setText(String.format("%06X", Integer.valueOf(i2 & ViewCompat.MEASURED_SIZE_MASK)));
+            this.f2903z.setText(String.format("%06X", Integer.valueOf(i2 & ViewCompat.MEASURED_SIZE_MASK)));
         }
     }
 
@@ -710,7 +710,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         this.p = getArguments().getInt(ModelAuditLogEntry.CHANGE_KEY_ID);
         this.F = getArguments().getBoolean(Key.ALPHA);
         this.q = getArguments().getBoolean("showColorShades");
-        this.f2901r = getArguments().getInt("colorShape");
+        this.f2899r = getArguments().getInt("colorShape");
         if (bundle == null) {
             this.n = getArguments().getInt(ModelAuditLogEntry.CHANGE_KEY_COLOR);
             this.o = getArguments().getInt("dialogType");
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
index 1232491694..cb44ae2d38 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
@@ -47,30 +47,30 @@ public class ColorPickerView extends View {
     public Paint q;
 
     /* renamed from: r  reason: collision with root package name */
-    public Paint f2912r;
+    public Paint f2910r;
     public Paint s;
     public Paint t;
     public Shader u;
     public Shader v;
 
     /* renamed from: w  reason: collision with root package name */
-    public Shader f2913w;
+    public Shader f2911w;
 
     /* renamed from: x  reason: collision with root package name */
-    public b f2914x;
+    public b f2912x;
 
     /* renamed from: y  reason: collision with root package name */
-    public b f2915y;
+    public b f2913y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2916z = 255;
+    public int f2914z = 255;
 
     public class b {
         public Canvas a;
         public Bitmap b;
 
         /* renamed from: c  reason: collision with root package name */
-        public float f2917c;
+        public float f2915c;
 
         public b(ColorPickerView colorPickerView, a aVar) {
         }
@@ -105,7 +105,7 @@ public class ColorPickerView extends View {
         this.p = new Paint();
         this.s = new Paint();
         this.q = new Paint();
-        this.f2912r = new Paint();
+        this.f2910r = new Paint();
         this.t = new Paint();
         this.p.setStyle(Paint.Style.STROKE);
         this.p.setStrokeWidth((float) c.i.a.f.e.o.c.z(getContext(), 2.0f));
@@ -114,11 +114,11 @@ public class ColorPickerView extends View {
         this.s.setStyle(Paint.Style.STROKE);
         this.s.setStrokeWidth((float) c.i.a.f.e.o.c.z(getContext(), 2.0f));
         this.s.setAntiAlias(true);
-        this.f2912r.setColor(-14935012);
-        this.f2912r.setTextSize((float) c.i.a.f.e.o.c.z(getContext(), 14.0f));
-        this.f2912r.setAntiAlias(true);
-        this.f2912r.setTextAlign(Paint.Align.CENTER);
-        this.f2912r.setFakeBoldText(true);
+        this.f2910r.setColor(-14935012);
+        this.f2910r.setTextSize((float) c.i.a.f.e.o.c.z(getContext(), 14.0f));
+        this.f2910r.setAntiAlias(true);
+        this.f2910r.setTextAlign(Paint.Align.CENTER);
+        this.f2910r.setFakeBoldText(true);
         setFocusable(true);
         setFocusableInTouchMode(true);
     }
@@ -184,7 +184,7 @@ public class ColorPickerView extends View {
             if (x3 >= i4) {
                 i = x3 > rect4.right ? width2 : x3 - i4;
             }
-            this.f2916z = 255 - ((i * 255) / width2);
+            this.f2914z = 255 - ((i * 255) / width2);
         }
         return true;
     }
@@ -194,7 +194,7 @@ public class ColorPickerView extends View {
         int alpha = Color.alpha(i);
         float[] fArr = new float[3];
         Color.RGBToHSV(Color.red(i), Color.green(i), Color.blue(i), fArr);
-        this.f2916z = alpha;
+        this.f2914z = alpha;
         float f = fArr[0];
         this.A = f;
         float f2 = fArr[1];
@@ -216,7 +216,7 @@ public class ColorPickerView extends View {
     }
 
     public int getColor() {
-        return Color.HSVToColor(this.f2916z, new float[]{this.A, this.B, this.C});
+        return Color.HSVToColor(this.f2914z, new float[]{this.A, this.B, this.C});
     }
 
     @Override // android.view.View
@@ -255,28 +255,28 @@ public class ColorPickerView extends View {
                 float f = (float) rect2.left;
                 this.u = new LinearGradient(f, (float) rect2.top, f, (float) rect2.bottom, -1, (int) ViewCompat.MEASURED_STATE_MASK, Shader.TileMode.CLAMP);
             }
-            b bVar = this.f2914x;
-            if (bVar == null || bVar.f2917c != this.A) {
+            b bVar = this.f2912x;
+            if (bVar == null || bVar.f2915c != this.A) {
                 if (bVar == null) {
-                    this.f2914x = new b(this, null);
+                    this.f2912x = new b(this, null);
                 }
-                b bVar2 = this.f2914x;
+                b bVar2 = this.f2912x;
                 if (bVar2.b == null) {
                     bVar2.b = Bitmap.createBitmap(rect2.width(), rect2.height(), Bitmap.Config.ARGB_8888);
                 }
-                b bVar3 = this.f2914x;
+                b bVar3 = this.f2912x;
                 if (bVar3.a == null) {
-                    bVar3.a = new Canvas(this.f2914x.b);
+                    bVar3.a = new Canvas(this.f2912x.b);
                 }
                 int HSVToColor = Color.HSVToColor(new float[]{this.A, 1.0f, 1.0f});
                 float f2 = (float) rect2.top;
                 this.v = new LinearGradient((float) rect2.left, f2, (float) rect2.right, f2, -1, HSVToColor, Shader.TileMode.CLAMP);
                 this.o.setShader(new ComposeShader(this.u, this.v, PorterDuff.Mode.MULTIPLY));
-                b bVar4 = this.f2914x;
-                bVar4.a.drawRect(0.0f, 0.0f, (float) bVar4.b.getWidth(), (float) this.f2914x.b.getHeight(), this.o);
-                this.f2914x.f2917c = this.A;
+                b bVar4 = this.f2912x;
+                bVar4.a.drawRect(0.0f, 0.0f, (float) bVar4.b.getWidth(), (float) this.f2912x.b.getHeight(), this.o);
+                this.f2912x.f2915c = this.A;
             }
-            canvas.drawBitmap(this.f2914x.b, (Rect) null, rect2, (Paint) null);
+            canvas.drawBitmap(this.f2912x.b, (Rect) null, rect2, (Paint) null);
             float f3 = this.B;
             float f4 = this.C;
             Rect rect4 = this.I;
@@ -290,11 +290,11 @@ public class ColorPickerView extends View {
             Rect rect5 = this.J;
             this.t.setColor(this.G);
             canvas.drawRect((float) (rect5.left - 1), (float) (rect5.top - 1), (float) (rect5.right + 1), (float) (rect5.bottom + 1), this.t);
-            if (this.f2915y == null) {
+            if (this.f2913y == null) {
                 b bVar5 = new b(this, null);
-                this.f2915y = bVar5;
+                this.f2913y = bVar5;
                 bVar5.b = Bitmap.createBitmap(rect5.width(), rect5.height(), Bitmap.Config.ARGB_8888);
-                this.f2915y.a = new Canvas(this.f2915y.b);
+                this.f2913y.a = new Canvas(this.f2913y.b);
                 int height = (int) (((float) rect5.height()) + 0.5f);
                 int[] iArr = new int[height];
                 float f5 = 360.0f;
@@ -306,12 +306,12 @@ public class ColorPickerView extends View {
                 paint.setStrokeWidth(0.0f);
                 for (int i2 = 0; i2 < height; i2++) {
                     paint.setColor(iArr[i2]);
-                    b bVar6 = this.f2915y;
+                    b bVar6 = this.f2913y;
                     float f6 = (float) i2;
                     bVar6.a.drawLine(0.0f, f6, (float) bVar6.b.getWidth(), f6, paint);
                 }
             }
-            canvas.drawBitmap(this.f2915y.b, (Rect) null, rect5, (Paint) null);
+            canvas.drawBitmap(this.f2913y.b, (Rect) null, rect5, (Paint) null);
             float f7 = this.A;
             Rect rect6 = this.J;
             float height2 = (float) rect6.height();
@@ -337,14 +337,14 @@ public class ColorPickerView extends View {
                 int HSVToColor3 = Color.HSVToColor(0, fArr);
                 float f8 = (float) rect.top;
                 LinearGradient linearGradient = new LinearGradient((float) rect.left, f8, (float) rect.right, f8, HSVToColor2, HSVToColor3, Shader.TileMode.CLAMP);
-                this.f2913w = linearGradient;
+                this.f2911w = linearGradient;
                 this.q.setShader(linearGradient);
                 canvas.drawRect(rect, this.q);
                 String str = this.E;
                 if (str != null && !str.equals("")) {
-                    canvas.drawText(this.E, (float) rect.centerX(), (float) (c.i.a.f.e.o.c.z(getContext(), 4.0f) + rect.centerY()), this.f2912r);
+                    canvas.drawText(this.E, (float) rect.centerX(), (float) (c.i.a.f.e.o.c.z(getContext(), 4.0f) + rect.centerY()), this.f2910r);
                 }
-                int i7 = this.f2916z;
+                int i7 = this.f2914z;
                 Rect rect7 = this.K;
                 float width = (float) rect7.width();
                 Point point3 = new Point();
@@ -429,7 +429,7 @@ public class ColorPickerView extends View {
     public void onRestoreInstanceState(Parcelable parcelable) {
         if (parcelable instanceof Bundle) {
             Bundle bundle = (Bundle) parcelable;
-            this.f2916z = bundle.getInt(Key.ALPHA);
+            this.f2914z = bundle.getInt(Key.ALPHA);
             this.A = bundle.getFloat("hue");
             this.B = bundle.getFloat("sat");
             this.C = bundle.getFloat("val");
@@ -444,7 +444,7 @@ public class ColorPickerView extends View {
     public Parcelable onSaveInstanceState() {
         Bundle bundle = new Bundle();
         bundle.putParcelable("instanceState", super.onSaveInstanceState());
-        bundle.putInt(Key.ALPHA, this.f2916z);
+        bundle.putInt(Key.ALPHA, this.f2914z);
         bundle.putFloat("hue", this.A);
         bundle.putFloat("sat", this.B);
         bundle.putFloat("val", this.C);
@@ -464,9 +464,9 @@ public class ColorPickerView extends View {
         this.H.bottom = i2 - getPaddingBottom();
         this.u = null;
         this.v = null;
-        this.f2913w = null;
-        this.f2914x = null;
-        this.f2915y = null;
+        this.f2911w = null;
+        this.f2912x = null;
+        this.f2913y = null;
         Rect rect2 = this.H;
         int i5 = rect2.left + 1;
         int i6 = rect2.top + 1;
@@ -508,7 +508,7 @@ public class ColorPickerView extends View {
         }
         c cVar = this.N;
         if (cVar != null) {
-            ((ColorPickerDialog) cVar).k(Color.HSVToColor(this.f2916z, new float[]{this.A, this.B, this.C}));
+            ((ColorPickerDialog) cVar).k(Color.HSVToColor(this.f2914z, new float[]{this.A, this.B, this.C}));
         }
         invalidate();
         return true;
@@ -528,9 +528,9 @@ public class ColorPickerView extends View {
             this.D = z2;
             this.u = null;
             this.v = null;
-            this.f2913w = null;
-            this.f2915y = null;
-            this.f2914x = null;
+            this.f2911w = null;
+            this.f2913y = null;
+            this.f2912x = null;
             requestLayout();
         }
     }
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
index d26fa42679..53e87919cb 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
@@ -26,7 +26,7 @@ public class ColorPreferenceCompat extends Preference implements f {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int[] f2918r;
+    public int[] f2916r;
     public int s;
 
     public ColorPreferenceCompat(Context context, AttributeSet attributeSet) {
@@ -44,9 +44,9 @@ public class ColorPreferenceCompat extends Preference implements f {
         int resourceId = obtainStyledAttributes.getResourceId(R.f.ColorPreference_cpv_colorPresets, 0);
         this.s = obtainStyledAttributes.getResourceId(R.f.ColorPreference_cpv_dialogTitle, R.e.cpv_default_title);
         if (resourceId != 0) {
-            this.f2918r = getContext().getResources().getIntArray(resourceId);
+            this.f2916r = getContext().getResources().getIntArray(resourceId);
         } else {
-            this.f2918r = ColorPickerDialog.i;
+            this.f2916r = ColorPickerDialog.i;
         }
         if (this.l == 1) {
             setWidgetLayoutResource(this.q == 1 ? R.d.cpv_preference_circle_large : R.d.cpv_preference_circle);
@@ -102,7 +102,7 @@ public class ColorPreferenceCompat extends Preference implements f {
             kVar.f = this.k;
             kVar.a = this.s;
             kVar.n = this.l;
-            kVar.g = this.f2918r;
+            kVar.g = this.f2916r;
             kVar.j = this.m;
             kVar.k = this.n;
             kVar.i = this.o;
diff --git a/app/src/main/java/com/linecorp/apng/decoder/Apng.java b/app/src/main/java/com/linecorp/apng/decoder/Apng.java
index 7cbe6b5886..75b2ca81ab 100644
--- a/app/src/main/java/com/linecorp/apng/decoder/Apng.java
+++ b/app/src/main/java/com/linecorp/apng/decoder/Apng.java
@@ -19,7 +19,7 @@ public final class Apng {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2919c;
+    public final int f2917c;
     public final int d;
     public final int e;
     public final int f;
@@ -150,7 +150,7 @@ public final class Apng {
 
     public Apng(int i, int i2, int i3, @IntRange(from = 1, to = 2147483647L) int i4, int[] iArr, @IntRange(from = 0, to = 2147483647L) int i5, @IntRange(from = 0, to = 2147483647L) long j) {
         m.checkNotNullParameter(iArr, "frameDurations");
-        this.f2919c = i;
+        this.f2917c = i;
         this.d = i2;
         this.e = i3;
         this.f = i4;
@@ -167,7 +167,7 @@ public final class Apng {
     }
 
     public static final /* synthetic */ int access$getId$p(Apng apng) {
-        return apng.f2919c;
+        return apng.f2917c;
     }
 
     public final Apng copy() {
@@ -179,7 +179,7 @@ public final class Apng {
         m.checkNotNullParameter(rect2, "dst");
         m.checkNotNullParameter(paint, "paint");
         Trace.beginSection("Apng#draw");
-        ApngDecoderJni.draw(this.f2919c, i, this.a);
+        ApngDecoderJni.draw(this.f2917c, i, this.a);
         Trace.endSection();
         canvas.drawBitmap(this.a, rect, rect2, paint);
     }
@@ -231,6 +231,6 @@ public final class Apng {
     }
 
     public final void recycle() {
-        ApngDecoderJni.recycle(this.f2919c);
+        ApngDecoderJni.recycle(this.f2917c);
     }
 }
diff --git a/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java b/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java
index a2cb4642d6..ef64ae959a 100644
--- a/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java
+++ b/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java
@@ -79,7 +79,7 @@ public final class AttachmentPreviewAdapter<T extends Attachment<? extends Objec
             int i2 = aVar.a().getLayoutParams().height;
             ImageRequestBuilder b = ImageRequestBuilder.b(t.getUri());
             b.d = f.a;
-            b.f2683c = new e(i2, i2);
+            b.f2681c = new e(i2, i2);
             d a2 = c.f.g.a.a.b.a();
             a2.n = aVar.a().getController();
             a2.m = true;
diff --git a/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java b/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
index cc2793b37c..58e8283330 100644
--- a/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
+++ b/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
@@ -49,7 +49,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
     public List<? extends Attachment<? extends File>> b = n.emptyList();
 
     /* renamed from: c  reason: collision with root package name */
-    public final ContentResolver f2921c;
+    public final ContentResolver f2919c;
 
     /* compiled from: FileListAdapter.kt */
     public static final class a extends AsyncTask<File, Boolean, List<? extends Attachment<? extends File>>> {
@@ -103,7 +103,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
         public final AnimatorSet b;
 
         /* renamed from: c  reason: collision with root package name */
-        public SimpleDraweeView f2922c;
+        public SimpleDraweeView f2920c;
         public ImageView d;
         public TextView e;
         public TextView f;
@@ -171,7 +171,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             this.h = fileListAdapter;
             View findViewById = view.findViewById(R.e.thumb_iv);
             m.checkNotNullExpressionValue(findViewById, "itemView.findViewById(R.id.thumb_iv)");
-            this.f2922c = (SimpleDraweeView) findViewById;
+            this.f2920c = (SimpleDraweeView) findViewById;
             View findViewById2 = view.findViewById(R.e.type_iv);
             m.checkNotNullExpressionValue(findViewById2, "itemView.findViewById(R.id.type_iv)");
             this.d = (ImageView) findViewById2;
@@ -189,12 +189,12 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             Objects.requireNonNull(loadAnimator, "null cannot be cast to non-null type android.animation.AnimatorSet");
             AnimatorSet animatorSet = (AnimatorSet) loadAnimator;
             this.a = animatorSet;
-            animatorSet.setTarget(this.f2922c);
+            animatorSet.setTarget(this.f2920c);
             Animator loadAnimator2 = AnimatorInflater.loadAnimator(view.getContext(), R.a.selection_grow);
             Objects.requireNonNull(loadAnimator2, "null cannot be cast to non-null type android.animation.AnimatorSet");
             AnimatorSet animatorSet2 = (AnimatorSet) loadAnimator2;
             this.b = animatorSet2;
-            animatorSet2.setTarget(this.f2922c);
+            animatorSet2.setTarget(this.f2920c);
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:25:0x009d, code lost:
@@ -217,7 +217,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
          */
         public final void a(File file) {
             Bitmap thumbnail;
-            Cursor query = this.h.f2921c.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, new String[]{"_id", "mini_thumb_magic"}, "_data=?", new String[]{file.getPath()}, null);
+            Cursor query = this.h.f2919c.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, new String[]{"_id", "mini_thumb_magic"}, "_data=?", new String[]{file.getPath()}, null);
             if (query == null) {
                 return;
             }
@@ -226,10 +226,10 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                 return;
             }
             long j = query.getLong(0);
-            if (query.getLong(1) == 0 && (thumbnail = MediaStore.Images.Thumbnails.getThumbnail(this.h.f2921c, j, 1, null)) != null) {
+            if (query.getLong(1) == 0 && (thumbnail = MediaStore.Images.Thumbnails.getThumbnail(this.h.f2919c, j, 1, null)) != null) {
                 thumbnail.recycle();
             }
-            Cursor query2 = this.h.f2921c.query(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, new String[]{"_id"}, "image_id=?", new String[]{String.valueOf(j)}, null);
+            Cursor query2 = this.h.f2919c.query(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, new String[]{"_id"}, "image_id=?", new String[]{String.valueOf(j)}, null);
             if (query2 != null) {
                 if (!query2.moveToFirst()) {
                     c0.y.b.closeFinally(query2, null);
@@ -237,9 +237,9 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                     return;
                 }
                 String string = query2.getString(0);
-                SimpleDraweeView simpleDraweeView = this.f2922c;
+                SimpleDraweeView simpleDraweeView = this.f2920c;
                 d a2 = c.f.g.a.a.b.a();
-                a2.n = this.f2922c.getController();
+                a2.n = this.f2920c.getController();
                 d f = a2.f(Uri.withAppendedPath(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, string));
                 f.l = true;
                 simpleDraweeView.setController(f.a());
@@ -254,10 +254,10 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             view.setSelected(z2);
             C0303b bVar = new C0303b(z3);
             if (z2) {
-                if (this.f2922c.getScaleX() == 1.0f) {
+                if (this.f2920c.getScaleX() == 1.0f) {
                     bVar.a(this.a);
                 }
-            } else if (this.f2922c.getScaleX() != 1.0f) {
+            } else if (this.f2920c.getScaleX() != 1.0f) {
                 bVar.a(this.b);
             }
         }
@@ -266,7 +266,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
     public FileListAdapter(ContentResolver contentResolver, SelectionCoordinator<?, Attachment<File>> selectionCoordinator) {
         m.checkNotNullParameter(contentResolver, "contentResolver");
         m.checkNotNullParameter(selectionCoordinator, "selectionCoordinator");
-        this.f2921c = contentResolver;
+        this.f2919c = contentResolver;
         Objects.requireNonNull(selectionCoordinator);
         m.checkNotNullParameter(this, "adapter");
         selectionCoordinator.a = this;
@@ -314,7 +314,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             bVar2.e.setText((CharSequence) null);
             bVar2.f.setText((CharSequence) null);
         }
-        SimpleDraweeView simpleDraweeView = bVar2.f2922c;
+        SimpleDraweeView simpleDraweeView = bVar2.f2920c;
         simpleDraweeView.setImageURI((Uri) null, simpleDraweeView.getContext());
         bVar2.d.setVisibility(8);
         boolean z2 = true;
@@ -331,7 +331,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                     z2 = false;
                 }
                 if (z2) {
-                    bVar2.f2922c.setImageURI(Uri.fromFile(file), bVar2.f2922c.getContext());
+                    bVar2.f2920c.setImageURI(Uri.fromFile(file), bVar2.f2920c.getContext());
                     if (t.startsWith$default(str, "image", false, 2, null)) {
                         ImageView imageView = bVar2.d;
                         imageView.setImageResource(DrawableCompat.getThemedDrawableRes$default(imageView, R.b.ic_flex_input_image, 0, 2, (Object) null));
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java
index a7bf79c7c9..75db111217 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java
@@ -49,7 +49,7 @@ public class CameraFragment extends Fragment {
     public File q;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2923r;
+    public boolean f2921r;
 
     /* compiled from: java-style lambda group */
     public static final class a implements View.OnClickListener {
@@ -184,7 +184,7 @@ public class CameraFragment extends Fragment {
                 } else {
                     CameraFragment cameraFragment3 = (CameraFragment) this.j;
                     cameraFragment3.q = null;
-                    cameraFragment3.f2923r = true;
+                    cameraFragment3.f2921r = true;
                     CameraView cameraView7 = cameraFragment3.k;
                     if (cameraView7 == null) {
                         m.throwUninitializedPropertyAccessException("cameraView");
@@ -196,7 +196,7 @@ public class CameraFragment extends Fragment {
                 if (cameraView8 == null) {
                     m.throwUninitializedPropertyAccessException("cameraView");
                 }
-                cameraView8.f2932x.O0(new l.a());
+                cameraView8.f2930x.O0(new l.a());
             }
         }
     }
@@ -262,7 +262,7 @@ public class CameraFragment extends Fragment {
         @Override // c.o.a.a
         public void a() {
             CameraFragment cameraFragment = this.a;
-            if (cameraFragment.f2923r) {
+            if (cameraFragment.f2921r) {
                 c.b.a.b<Object> k = cameraFragment.k();
                 FileManager fileManager = k != null ? k.getFileManager() : null;
                 File b = fileManager != null ? fileManager.b() : null;
@@ -435,7 +435,7 @@ public class CameraFragment extends Fragment {
             }
             cameraView.open();
             this.q = null;
-            this.f2923r = false;
+            this.f2921r = false;
         }
     }
 
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
index 9bff95e143..d1b9187cee 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
@@ -230,7 +230,7 @@ public class FilesFragment extends Fragment {
     public void onDestroyView() {
         SelectionCoordinator<Attachment<Object>, Attachment<File>> selectionCoordinator = this.selectionCoordinator;
         if (selectionCoordinator != null) {
-            selectionCoordinator.f2928c.unregister();
+            selectionCoordinator.f2926c.unregister();
         }
         super.onDestroyView();
     }
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java
index d6d0212c8c..cbda374e19 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java
@@ -74,14 +74,14 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
     public d.a[] q;
 
     /* renamed from: r  reason: collision with root package name */
-    public FlexInputViewModel f2924r;
+    public FlexInputViewModel f2922r;
     public Subscription s;
     public Subscription t;
     public Subscription u;
     public final List<Function0<Unit>> v = new ArrayList();
 
     /* renamed from: w  reason: collision with root package name */
-    public List<Function0<Unit>> f2925w = new ArrayList();
+    public List<Function0<Unit>> f2923w = new ArrayList();
 
     /* compiled from: java-style lambda group */
     public static final class a implements View.OnClickListener {
@@ -97,7 +97,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
         public final void onClick(View view) {
             int i = this.i;
             if (i == 0) {
-                FlexInputViewModel flexInputViewModel = ((FlexInputFragment) this.j).f2924r;
+                FlexInputViewModel flexInputViewModel = ((FlexInputFragment) this.j).f2922r;
                 if (flexInputViewModel != null) {
                     flexInputViewModel.onInputTextClicked();
                 }
@@ -108,7 +108,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                 }
                 attachmentPreviewAdapter.a.clear();
                 attachmentPreviewAdapter.notifyDataSetChanged();
-                FlexInputViewModel flexInputViewModel2 = ((FlexInputFragment) this.j).f2924r;
+                FlexInputViewModel flexInputViewModel2 = ((FlexInputFragment) this.j).f2922r;
                 if (flexInputViewModel2 != null) {
                     flexInputViewModel2.onAttachmentsUpdated(n.emptyList());
                 }
@@ -290,7 +290,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                 if (flexInputState2.e) {
                     String str = flexInputState2.a;
                     Objects.requireNonNull(str, "null cannot be cast to non-null type kotlin.CharSequence");
-                    if ((w.trim(str).toString().length() > 0) || flexInputState2.f2929c.size() > 0) {
+                    if ((w.trim(str).toString().length() > 0) || flexInputState2.f2927c.size() > 0) {
                         z2 = true;
                         ImageView imageView = flexInputFragment.j().p;
                         m.checkNotNullExpressionValue(imageView, "binding.sendBtnImage");
@@ -298,7 +298,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                         FrameLayout frameLayout = flexInputFragment.j().o;
                         m.checkNotNullExpressionValue(frameLayout, "binding.sendBtnContainer");
                         frameLayout.setEnabled(z2);
-                        boolean z4 = !(flexInputState2.a.length() <= 0) || flexInputState2.f2929c.size() > 0;
+                        boolean z4 = !(flexInputState2.a.length() <= 0) || flexInputState2.f2927c.size() > 0;
                         FrameLayout frameLayout2 = flexInputFragment.j().o;
                         m.checkNotNullExpressionValue(frameLayout2, "binding.sendBtnContainer");
                         frameLayout2.setVisibility(!z4 ? 0 : 8);
@@ -311,7 +311,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                         LinearLayout linearLayout2 = flexInputFragment.j().n;
                         m.checkNotNullExpressionValue(linearLayout2, "binding.mainInputContainer");
                         linearLayout2.setLayoutParams(layoutParams2);
-                        if (flexInputState2.f2929c.isEmpty()) {
+                        if (flexInputState2.f2927c.isEmpty()) {
                             AttachmentPreviewAdapter<Attachment<Object>> attachmentPreviewAdapter = flexInputFragment.p;
                             if (attachmentPreviewAdapter == null) {
                                 m.throwUninitializedPropertyAccessException("attachmentPreviewAdapter");
@@ -321,7 +321,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                         }
                         LinearLayout linearLayout3 = flexInputFragment.j().f259c;
                         m.checkNotNullExpressionValue(linearLayout3, "binding.attachmentPreviewContainer");
-                        linearLayout3.setVisibility((flexInputState2.f2929c.size() > 0 || !flexInputState2.e) ? 8 : 0);
+                        linearLayout3.setVisibility((flexInputState2.f2927c.size() > 0 || !flexInputState2.e) ? 8 : 0);
                         AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().l;
                         m.checkNotNullExpressionValue(appCompatImageButton4, "binding.galleryBtn");
                         ViewExtensions.setEnabledAlpha$default(appCompatImageButton4, !flexInputState2.e && flexInputState2.f, 0.0f, 2, null);
@@ -378,11 +378,11 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                 LinearLayout linearLayout2 = flexInputFragment.j().n;
                 m.checkNotNullExpressionValue(linearLayout2, "binding.mainInputContainer");
                 linearLayout2.setLayoutParams(layoutParams2);
-                if (flexInputState2.f2929c.isEmpty()) {
+                if (flexInputState2.f2927c.isEmpty()) {
                 }
                 LinearLayout linearLayout3 = flexInputFragment.j().f259c;
                 m.checkNotNullExpressionValue(linearLayout3, "binding.attachmentPreviewContainer");
-                linearLayout3.setVisibility((flexInputState2.f2929c.size() > 0 || !flexInputState2.e) ? 8 : 0);
+                linearLayout3.setVisibility((flexInputState2.f2927c.size() > 0 || !flexInputState2.e) ? 8 : 0);
                 AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().l;
                 m.checkNotNullExpressionValue(appCompatImageButton4, "binding.galleryBtn");
                 ViewExtensions.setEnabledAlpha$default(appCompatImageButton4, !flexInputState2.e && flexInputState2.f, 0.0f, 2, null);
@@ -458,7 +458,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
         public Unit invoke(Editable editable) {
             Editable editable2 = editable;
             m.checkNotNullParameter(editable2, "it");
-            FlexInputViewModel flexInputViewModel = this.this$0.f2924r;
+            FlexInputViewModel flexInputViewModel = this.this$0.f2922r;
             if (flexInputViewModel != null) {
                 c.i.a.f.e.o.c.d0(flexInputViewModel, editable2.toString(), null, 2, null);
             }
@@ -478,7 +478,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
             if (viewPager2 != null) {
                 viewPager2.setCurrentItem(i2);
             }
-            FlexInputViewModel flexInputViewModel = flexInputFragment.f2924r;
+            FlexInputViewModel flexInputViewModel = flexInputFragment.f2922r;
             if (flexInputViewModel != null) {
                 flexInputViewModel.onContentDialogPageChanged(i2);
             }
@@ -532,8 +532,8 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
         SelectionCoordinator<Attachment<Object>, ?> selectionCoordinator = new SelectionCoordinator<>(null, null, 3);
         b().registerSelectionCoordinator(selectionCoordinator);
         selectionCoordinator.c(attachment, 0);
-        selectionCoordinator.f2928c.unregister();
-        FlexInputViewModel flexInputViewModel = this.f2924r;
+        selectionCoordinator.f2926c.unregister();
+        FlexInputViewModel flexInputViewModel = this.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onAttachmentsUpdated(b().getAttachments());
         }
@@ -551,7 +551,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
 
     @Override // c.b.a.b
     public boolean hasMediaPermissions() {
-        FlexInputViewModel flexInputViewModel = this.f2924r;
+        FlexInputViewModel flexInputViewModel = this.f2922r;
         if (flexInputViewModel != null) {
             return flexInputViewModel.hasMediaPermissions();
         }
@@ -624,7 +624,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
 
     @Override // androidx.fragment.app.Fragment
     public void onPause() {
-        FlexInputViewModel flexInputViewModel = this.f2924r;
+        FlexInputViewModel flexInputViewModel = this.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onFlexInputFragmentPause();
         }
@@ -646,12 +646,12 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
     @Override // androidx.fragment.app.Fragment
     public void onResume() {
         super.onResume();
-        FlexInputViewModel flexInputViewModel = this.f2924r;
+        FlexInputViewModel flexInputViewModel = this.f2922r;
         if (flexInputViewModel != null) {
-            this.s = flexInputViewModel.observeState().q().U(new c.b.a.a.n(new d(this)));
-            FlexInputViewModel flexInputViewModel2 = this.f2924r;
+            this.s = flexInputViewModel.observeState().q().V(new c.b.a.a.n(new d(this)));
+            FlexInputViewModel flexInputViewModel2 = this.f2922r;
             if (flexInputViewModel2 != null) {
-                this.t = flexInputViewModel2.observeEvents().U(new c.b.a.a.n(new e(this)));
+                this.t = flexInputViewModel2.observeEvents().V(new c.b.a.a.n(new e(this)));
             }
         }
     }
@@ -725,12 +725,12 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
             if (parcelableArrayList != null && parcelableArrayList.size() > 0) {
                 b().initFrom(parcelableArrayList);
             }
-            FlexInputViewModel flexInputViewModel2 = this.f2924r;
+            FlexInputViewModel flexInputViewModel2 = this.f2922r;
             if (flexInputViewModel2 != null) {
                 flexInputViewModel2.onAttachmentsUpdated(b().getAttachments());
             }
             String string = bundle.getString("FlexInput.TEXT");
-            if (!(string == null || (flexInputViewModel = this.f2924r) == null)) {
+            if (!(string == null || (flexInputViewModel = this.f2922r) == null)) {
                 flexInputViewModel.onInputTextChanged(string, null);
             }
         }
@@ -748,7 +748,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
     @Override // c.b.a.b
     public void requestMediaPermissions(Function0<Unit> function0) {
         m.checkNotNullParameter(function0, "onSuccess");
-        FlexInputViewModel flexInputViewModel = this.f2924r;
+        FlexInputViewModel flexInputViewModel = this.f2922r;
         if (flexInputViewModel != null) {
             flexInputViewModel.requestMediaPermissions(function0);
         }
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
index ee5fd521a7..33e3a96b2c 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
@@ -99,19 +99,19 @@ public class MediaFragment extends Fragment {
         public final /* synthetic */ i b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ MediaFragment f2926c;
+        public final /* synthetic */ MediaFragment f2924c;
         public final /* synthetic */ c.b.a.b d;
 
         public b(View view, i iVar, MediaFragment mediaFragment, c.b.a.b bVar) {
             this.a = view;
             this.b = iVar;
-            this.f2926c = mediaFragment;
+            this.f2924c = mediaFragment;
             this.d = bVar;
         }
 
         @Override // androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
         public final void onRefresh() {
-            if (MediaFragment.access$hasPermissions(this.f2926c, MediaFragment.REQUIRED_PERMISSION)) {
+            if (MediaFragment.access$hasPermissions(this.f2924c, MediaFragment.REQUIRED_PERMISSION)) {
                 i iVar = this.b;
                 Context context = this.a.getContext();
                 m.checkNotNullExpressionValue(context, "context");
@@ -119,7 +119,7 @@ public class MediaFragment extends Fragment {
                 m.checkNotNullExpressionValue(contentResolver, "context.contentResolver");
                 iVar.b(contentResolver);
             }
-            SwipeRefreshLayout access$getSwipeRefreshLayout$p = MediaFragment.access$getSwipeRefreshLayout$p(this.f2926c);
+            SwipeRefreshLayout access$getSwipeRefreshLayout$p = MediaFragment.access$getSwipeRefreshLayout$p(this.f2924c);
             if (access$getSwipeRefreshLayout$p != null) {
                 access$getSwipeRefreshLayout$p.setRefreshing(false);
             }
@@ -219,7 +219,7 @@ public class MediaFragment extends Fragment {
     public void onDestroyView() {
         SelectionCoordinator<Attachment<Object>, Media> selectionCoordinator = this.selectionCoordinator;
         m.checkNotNull(selectionCoordinator);
-        selectionCoordinator.f2928c.unregister();
+        selectionCoordinator.f2926c.unregister();
         super.onDestroyView();
     }
 
diff --git a/app/src/main/java/com/lytefast/flexinput/model/Attachment.java b/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
index ba16e705e8..fd12e9bab1 100644
--- a/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
+++ b/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
@@ -24,7 +24,7 @@ public class Attachment<T> implements Parcelable {
     private final String displayName;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2927id;
+    private final long f2925id;
     private final Uri uri;
 
     /* compiled from: Attachment.kt */
@@ -158,7 +158,7 @@ public class Attachment<T> implements Parcelable {
     public Attachment(long j, Uri uri, String str, T t) {
         m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "displayName");
-        this.f2927id = j;
+        this.f2925id = j;
         this.uri = uri;
         this.displayName = str;
         this.data = t;
@@ -203,7 +203,7 @@ public class Attachment<T> implements Parcelable {
             return false;
         }
         Attachment attachment = (Attachment) obj;
-        return this.f2927id == attachment.f2927id && m.areEqual(this.uri, attachment.uri);
+        return this.f2925id == attachment.f2925id && m.areEqual(this.uri, attachment.uri);
     }
 
     public final T getData() {
@@ -215,7 +215,7 @@ public class Attachment<T> implements Parcelable {
     }
 
     public final long getId() {
-        return this.f2927id;
+        return this.f2925id;
     }
 
     public final Uri getUri() {
@@ -224,14 +224,14 @@ public class Attachment<T> implements Parcelable {
 
     @Override // java.lang.Object
     public int hashCode() {
-        return d.N0(Long.valueOf(this.f2927id), this.uri);
+        return d.N0(Long.valueOf(this.f2925id), this.uri);
     }
 
     @Override // android.os.Parcelable
     @CallSuper
     public void writeToParcel(Parcel parcel, int i) {
         m.checkNotNullParameter(parcel, "dest");
-        parcel.writeLong(this.f2927id);
+        parcel.writeLong(this.f2925id);
         parcel.writeParcelable(this.uri, i);
         parcel.writeString(this.displayName);
     }
diff --git a/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java b/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
index 119da1d4b6..0543d98adf 100644
--- a/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
+++ b/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
@@ -234,7 +234,7 @@ public class SelectionAggregator<T extends Attachment<? extends Object>> {
         a aVar = new a(this, selectionCoordinator);
         Objects.requireNonNull(selectionCoordinator);
         m.checkNotNullParameter(aVar, "<set-?>");
-        selectionCoordinator.f2928c = aVar;
+        selectionCoordinator.f2926c = aVar;
         this.childSelectionCoordinators.add(selectionCoordinator);
     }
 
diff --git a/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java b/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
index 3f1ac7f0f9..6c1ff40495 100644
--- a/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
+++ b/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
@@ -15,7 +15,7 @@ public class SelectionCoordinator<I, T extends I> {
     public final ArrayMap<T, Integer> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public ItemSelectionListener<? super I> f2928c;
+    public ItemSelectionListener<? super I> f2926c;
 
     /* compiled from: SelectionCoordinator.kt */
     public interface ItemSelectionListener<I> {
@@ -88,7 +88,7 @@ public class SelectionCoordinator<I, T extends I> {
         m.checkNotNullParameter(arrayMap2, "selectedItemPositionMap");
         m.checkNotNullParameter(bVar, "itemSelectionListener");
         this.b = arrayMap2;
-        this.f2928c = bVar;
+        this.f2926c = bVar;
     }
 
     public final boolean a(T t, int i) {
@@ -127,7 +127,7 @@ public class SelectionCoordinator<I, T extends I> {
         if (adapter != null) {
             adapter.notifyItemChanged(i, new a(t, true));
         }
-        this.f2928c.onItemSelected(t);
+        this.f2926c.onItemSelected(t);
     }
 
     public final boolean d(I i) {
@@ -142,7 +142,7 @@ public class SelectionCoordinator<I, T extends I> {
         if (adapter != null) {
             adapter.notifyItemChanged(intValue, new a(i, false));
         }
-        this.f2928c.onItemUnselected(i);
+        this.f2926c.onItemUnselected(i);
         return true;
     }
 }
diff --git a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
index 3d929f4f7c..815451e2ef 100644
--- a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
+++ b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
@@ -12,7 +12,7 @@ public final class FlexInputState {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<Attachment<Object>> f2929c;
+    public final List<Attachment<Object>> f2927c;
     public final Integer d;
     public final boolean e;
     public final boolean f;
@@ -33,7 +33,7 @@ public final class FlexInputState {
         m.checkNotNullParameter(list, "attachments");
         this.a = str;
         this.b = z2;
-        this.f2929c = list;
+        this.f2927c = list;
         this.d = num;
         this.e = z3;
         this.f = z4;
@@ -55,7 +55,7 @@ public final class FlexInputState {
     public static FlexInputState a(FlexInputState flexInputState, String str, boolean z2, List list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, Long l, Long l2, int i) {
         String str2 = (i & 1) != 0 ? flexInputState.a : str;
         boolean z8 = (i & 2) != 0 ? flexInputState.b : z2;
-        List list2 = (i & 4) != 0 ? flexInputState.f2929c : list;
+        List list2 = (i & 4) != 0 ? flexInputState.f2927c : list;
         Integer num2 = (i & 8) != 0 ? flexInputState.d : num;
         boolean z9 = (i & 16) != 0 ? flexInputState.e : z3;
         boolean z10 = (i & 32) != 0 ? flexInputState.f : z4;
@@ -78,7 +78,7 @@ public final class FlexInputState {
             return false;
         }
         FlexInputState flexInputState = (FlexInputState) obj;
-        return m.areEqual(this.a, flexInputState.a) && this.b == flexInputState.b && m.areEqual(this.f2929c, flexInputState.f2929c) && m.areEqual(this.d, flexInputState.d) && this.e == flexInputState.e && this.f == flexInputState.f && this.g == flexInputState.g && this.h == flexInputState.h && this.i == flexInputState.i && m.areEqual(this.j, flexInputState.j) && m.areEqual(this.k, flexInputState.k);
+        return m.areEqual(this.a, flexInputState.a) && this.b == flexInputState.b && m.areEqual(this.f2927c, flexInputState.f2927c) && m.areEqual(this.d, flexInputState.d) && this.e == flexInputState.e && this.f == flexInputState.f && this.g == flexInputState.g && this.h == flexInputState.h && this.i == flexInputState.i && m.areEqual(this.j, flexInputState.j) && m.areEqual(this.k, flexInputState.k);
     }
 
     public int hashCode() {
@@ -94,7 +94,7 @@ public final class FlexInputState {
         int i4 = z2 ? 1 : 0;
         int i5 = z2 ? 1 : 0;
         int i6 = (hashCode + i3) * 31;
-        List<Attachment<Object>> list = this.f2929c;
+        List<Attachment<Object>> list = this.f2927c;
         int hashCode2 = (i6 + (list != null ? list.hashCode() : 0)) * 31;
         Integer num = this.d;
         int hashCode3 = (hashCode2 + (num != null ? num.hashCode() : 0)) * 31;
@@ -150,7 +150,7 @@ public final class FlexInputState {
         O.append(", showExpandedButtons=");
         O.append(this.b);
         O.append(", attachments=");
-        O.append(this.f2929c);
+        O.append(this.f2927c);
         O.append(", showContentDialogIndex=");
         O.append(this.d);
         O.append(", ableToSendMessages=");
diff --git a/app/src/main/java/com/otaliastudios/cameraview/CameraView.java b/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
index ffdc7ba4ab..5a108b5188 100644
--- a/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
+++ b/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
@@ -89,7 +89,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     public c.o.a.o.b q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2930r;
+    public int f2928r;
     public Handler s;
     public Executor t;
     @VisibleForTesting
@@ -97,16 +97,16 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     public c.o.a.w.a v;
 
     /* renamed from: w  reason: collision with root package name */
-    public c.o.a.r.f f2931w;
+    public c.o.a.r.f f2929w;
 
     /* renamed from: x  reason: collision with root package name */
-    public i f2932x;
+    public i f2930x;
 
     /* renamed from: y  reason: collision with root package name */
-    public c.o.a.x.b f2933y;
+    public c.o.a.x.b f2931y;
 
     /* renamed from: z  reason: collision with root package name */
-    public MediaActionSound f2934z;
+    public MediaActionSound f2932z;
 
     public class a implements ThreadFactory {
         public final AtomicInteger i = new AtomicInteger(1);
@@ -256,10 +256,10 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                 CameraView cameraView;
                 boolean z2;
                 if (this.i && (z2 = (cameraView = CameraView.this).k) && z2) {
-                    if (cameraView.f2934z == null) {
-                        cameraView.f2934z = new MediaActionSound();
+                    if (cameraView.f2932z == null) {
+                        cameraView.f2932z = new MediaActionSound();
                     }
-                    cameraView.f2934z.play(1);
+                    cameraView.f2932z.play(1);
                 }
                 c.o.a.s.a aVar = CameraView.this.A;
                 if (aVar != null) {
@@ -317,10 +317,10 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         }
 
         public void h() {
-            c.o.a.x.b C = CameraView.this.f2932x.C(c.o.a.n.t.b.VIEW);
+            c.o.a.x.b C = CameraView.this.f2930x.C(c.o.a.n.t.b.VIEW);
             if (C == null) {
                 throw new RuntimeException("Preview stream size should not be null here.");
-            } else if (C.equals(CameraView.this.f2933y)) {
+            } else if (C.equals(CameraView.this.f2931y)) {
                 this.b.a(1, "onCameraPreviewStreamSizeChanged:", "swallowing because the preview size has not changed.", C);
             } else {
                 this.b.a(1, "onCameraPreviewStreamSizeChanged: posting a requestLayout call.", "Preview stream size:", C);
@@ -548,7 +548,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             e(c.o.a.q.a.SCROLL_VERTICAL, c.o.a.q.b.f(integer28));
             setAutoFocusMarker(aVar);
             setFilter(bVar);
-            this.f2931w = new c.o.a.r.f(context, this.u);
+            this.f2929w = new c.o.a.r.f(context, this.u);
         }
     }
 
@@ -622,20 +622,20 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         } else {
             iVar = new c.o.a.n.d(bVar2);
         }
-        this.f2932x = iVar;
+        this.f2930x = iVar;
         bVar.a(2, "doInstantiateEngine:", "instantiated. engine:", iVar.getClass().getSimpleName());
-        this.f2932x.o0(this.L);
+        this.f2930x.o0(this.L);
     }
 
     public final boolean c() {
-        i iVar = this.f2932x;
+        i iVar = this.f2930x;
         return iVar.m.f == c.o.a.n.v.e.OFF && !iVar.O();
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     public void close() {
         if (!this.K) {
-            c.o.a.r.f fVar = this.f2931w;
+            c.o.a.r.f fVar = this.f2929w;
             if (fVar.h) {
                 fVar.h = false;
                 fVar.d.disable();
@@ -643,7 +643,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                 fVar.g = -1;
                 fVar.e = -1;
             }
-            this.f2932x.L0(false);
+            this.f2930x.L0(false);
             c.o.a.w.a aVar = this.v;
             if (aVar != null) {
                 aVar.p();
@@ -652,9 +652,9 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public boolean d() {
-        c.o.a.n.v.e eVar = this.f2932x.m.f;
+        c.o.a.n.v.e eVar = this.f2930x.m.f;
         c.o.a.n.v.e eVar2 = c.o.a.n.v.e.ENGINE;
-        return eVar.f(eVar2) && this.f2932x.m.g.f(eVar2);
+        return eVar.f(eVar2) && this.f2930x.m.g.f(eVar2);
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
@@ -664,9 +664,9 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             boolean z2 = this.C.size() > 0;
             this.C.clear();
             if (z2) {
-                this.f2932x.k0(false);
+                this.f2930x.k0(false);
             }
-            this.f2932x.d(true, 0);
+            this.f2930x.d(true, 0);
             c.o.a.w.a aVar = this.v;
             if (aVar != null) {
                 aVar.o();
@@ -742,29 +742,29 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                     rectF2.set(Math.max(rectF.left, aVar2.i.left), Math.max(rectF.top, aVar2.i.top), Math.min(rectF.right, aVar2.i.right), Math.min(rectF.bottom, aVar2.i.bottom));
                     arrayList2.add(new c.o.a.t.a(rectF2, aVar2.j));
                 }
-                this.f2932x.I0(aVar, new c.o.a.t.b(arrayList2), pointFArr[0]);
+                this.f2930x.I0(aVar, new c.o.a.t.b(arrayList2), pointFArr[0]);
                 return;
             case 2:
-                this.f2932x.O0(new l.a());
+                this.f2930x.O0(new l.a());
                 return;
             case 3:
-                this.f2932x.P0(new l.a());
+                this.f2930x.P0(new l.a());
                 return;
             case 4:
-                float N = this.f2932x.N();
+                float N = this.f2930x.N();
                 float a3 = cVar.a(N, 0.0f, 1.0f);
                 if (a3 != N) {
-                    this.f2932x.G0(a3, pointFArr, true);
+                    this.f2930x.G0(a3, pointFArr, true);
                     return;
                 }
                 return;
             case 5:
-                float k = this.f2932x.k();
+                float k = this.f2930x.k();
                 float f = cVar2.m;
                 float f2 = cVar2.n;
                 float a4 = cVar.a(k, f, f2);
                 if (a4 != k) {
-                    this.f2932x.d0(a4, new float[]{f, f2}, pointFArr, true);
+                    this.f2930x.d0(a4, new float[]{f, f2}, pointFArr, true);
                     return;
                 }
                 return;
@@ -819,25 +819,25 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @NonNull
     public c.o.a.m.a getAudio() {
-        return this.f2932x.f();
+        return this.f2930x.f();
     }
 
     public int getAudioBitRate() {
-        return this.f2932x.g();
+        return this.f2930x.g();
     }
 
     @NonNull
     public c.o.a.m.b getAudioCodec() {
-        return this.f2932x.h();
+        return this.f2930x.h();
     }
 
     public long getAutoFocusResetDelay() {
-        return this.f2932x.i();
+        return this.f2930x.i();
     }
 
     @Nullable
     public c.o.a.c getCameraOptions() {
-        return this.f2932x.j();
+        return this.f2930x.j();
     }
 
     @NonNull
@@ -846,12 +846,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public float getExposureCorrection() {
-        return this.f2932x.k();
+        return this.f2930x.k();
     }
 
     @NonNull
     public c.o.a.m.e getFacing() {
-        return this.f2932x.l();
+        return this.f2930x.l();
     }
 
     @NonNull
@@ -870,27 +870,27 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @NonNull
     public c.o.a.m.f getFlash() {
-        return this.f2932x.m();
+        return this.f2930x.m();
     }
 
     public int getFrameProcessingExecutors() {
-        return this.f2930r;
+        return this.f2928r;
     }
 
     public int getFrameProcessingFormat() {
-        return this.f2932x.n();
+        return this.f2930x.n();
     }
 
     public int getFrameProcessingMaxHeight() {
-        return this.f2932x.o();
+        return this.f2930x.o();
     }
 
     public int getFrameProcessingMaxWidth() {
-        return this.f2932x.p();
+        return this.f2930x.p();
     }
 
     public int getFrameProcessingPoolSize() {
-        return this.f2932x.q();
+        return this.f2930x.q();
     }
 
     @NonNull
@@ -904,35 +904,35 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @NonNull
     public h getHdr() {
-        return this.f2932x.r();
+        return this.f2930x.r();
     }
 
     @Nullable
     public Location getLocation() {
-        return this.f2932x.s();
+        return this.f2930x.s();
     }
 
     @NonNull
     public c.o.a.m.i getMode() {
-        return this.f2932x.t();
+        return this.f2930x.t();
     }
 
     @NonNull
     public j getPictureFormat() {
-        return this.f2932x.u();
+        return this.f2930x.u();
     }
 
     public boolean getPictureMetering() {
-        return this.f2932x.v();
+        return this.f2930x.v();
     }
 
     @Nullable
     public c.o.a.x.b getPictureSize() {
-        return this.f2932x.w(c.o.a.n.t.b.OUTPUT);
+        return this.f2930x.w(c.o.a.n.t.b.OUTPUT);
     }
 
     public boolean getPictureSnapshotMetering() {
-        return this.f2932x.y();
+        return this.f2930x.y();
     }
 
     public boolean getPlaySounds() {
@@ -945,26 +945,26 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public float getPreviewFrameRate() {
-        return this.f2932x.A();
+        return this.f2930x.A();
     }
 
     public boolean getPreviewFrameRateExact() {
-        return this.f2932x.B();
+        return this.f2930x.B();
     }
 
     public int getSnapshotMaxHeight() {
-        return this.f2932x.D();
+        return this.f2930x.D();
     }
 
     public int getSnapshotMaxWidth() {
-        return this.f2932x.E();
+        return this.f2930x.E();
     }
 
     @Nullable
     public c.o.a.x.b getSnapshotSize() {
         c.o.a.x.b bVar = null;
         if (!(getWidth() == 0 || getHeight() == 0)) {
-            i iVar = this.f2932x;
+            i iVar = this.f2930x;
             c.o.a.n.t.b bVar2 = c.o.a.n.t.b.VIEW;
             c.o.a.x.b F = iVar.F(bVar2);
             if (F == null) {
@@ -972,7 +972,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             }
             Rect v = c.i.a.f.e.o.c.v(F, c.o.a.x.a.f(getWidth(), getHeight()));
             bVar = new c.o.a.x.b(v.width(), v.height());
-            if (this.f2932x.e().b(bVar2, c.o.a.n.t.b.OUTPUT)) {
+            if (this.f2930x.e().b(bVar2, c.o.a.n.t.b.OUTPUT)) {
                 return bVar.f();
             }
         }
@@ -984,34 +984,34 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public int getVideoBitRate() {
-        return this.f2932x.G();
+        return this.f2930x.G();
     }
 
     @NonNull
     public c.o.a.m.l getVideoCodec() {
-        return this.f2932x.H();
+        return this.f2930x.H();
     }
 
     public int getVideoMaxDuration() {
-        return this.f2932x.I();
+        return this.f2930x.I();
     }
 
     public long getVideoMaxSize() {
-        return this.f2932x.J();
+        return this.f2930x.J();
     }
 
     @Nullable
     public c.o.a.x.b getVideoSize() {
-        return this.f2932x.K(c.o.a.n.t.b.OUTPUT);
+        return this.f2930x.K(c.o.a.n.t.b.OUTPUT);
     }
 
     @NonNull
     public m getWhiteBalance() {
-        return this.f2932x.M();
+        return this.f2930x.M();
     }
 
     public float getZoom() {
-        return this.f2932x.N();
+        return this.f2930x.N();
     }
 
     @Override // android.view.View, android.view.ViewGroup
@@ -1034,7 +1034,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             }
             this.v = aVar;
             bVar.a(2, "doInstantiateEngine:", "instantiated. preview:", aVar.getClass().getSimpleName());
-            this.f2932x.u0(this.v);
+            this.f2930x.u0(this.v);
             c.o.a.o.b bVar2 = this.q;
             if (bVar2 != null) {
                 setFilter(bVar2);
@@ -1045,7 +1045,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @Override // android.view.View, android.view.ViewGroup
     public void onDetachedFromWindow() {
-        this.f2933y = null;
+        this.f2931y = null;
         super.onDetachedFromWindow();
     }
 
@@ -1060,8 +1060,8 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             super.onMeasure(View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i2), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i3), BasicMeasure.EXACTLY));
             return;
         }
-        c.o.a.x.b C = this.f2932x.C(c.o.a.n.t.b.VIEW);
-        this.f2933y = C;
+        c.o.a.x.b C = this.f2930x.C(c.o.a.n.t.b.VIEW);
+        this.f2931y = C;
         if (C == null) {
             j.a(2, "onMeasure:", "surface is not ready. Calling default behavior.");
             super.onMeasure(i2, i3);
@@ -1071,7 +1071,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         int mode2 = View.MeasureSpec.getMode(i3);
         int size = View.MeasureSpec.getSize(i2);
         int size2 = View.MeasureSpec.getSize(i3);
-        c.o.a.x.b bVar = this.f2933y;
+        c.o.a.x.b bVar = this.f2931y;
         float f = (float) bVar.i;
         float f2 = (float) bVar.j;
         ViewGroup.LayoutParams layoutParams = getLayoutParams();
@@ -1144,7 +1144,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         if (!d()) {
             return true;
         }
-        c.o.a.c j2 = this.f2932x.j();
+        c.o.a.c j2 = this.f2930x.j();
         if (j2 != null) {
             e eVar = this.E;
             if (!eVar.a ? false : eVar.c(motionEvent)) {
@@ -1176,19 +1176,19 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                 aVar.q();
             }
             if (a(getAudio())) {
-                c.o.a.r.f fVar = this.f2931w;
+                c.o.a.r.f fVar = this.f2929w;
                 if (!fVar.h) {
                     fVar.h = true;
                     fVar.g = fVar.a();
                     ((DisplayManager) fVar.b.getSystemService("display")).registerDisplayListener(fVar.f, fVar.a);
                     fVar.d.enable();
                 }
-                c.o.a.n.t.a e = this.f2932x.e();
-                int i2 = this.f2931w.g;
+                c.o.a.n.t.a e = this.f2930x.e();
+                int i2 = this.f2929w.g;
                 e.e(i2);
                 e.d = i2;
                 e.d();
-                this.f2932x.H0();
+                this.f2930x.H0();
             }
         }
     }
@@ -1236,20 +1236,20 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     public void setAudio(@NonNull c.o.a.m.a aVar) {
         if (aVar == getAudio() || c()) {
-            this.f2932x.Z(aVar);
+            this.f2930x.Z(aVar);
         } else if (a(aVar)) {
-            this.f2932x.Z(aVar);
+            this.f2930x.Z(aVar);
         } else {
             close();
         }
     }
 
     public void setAudioBitRate(int i2) {
-        this.f2932x.a0(i2);
+        this.f2930x.a0(i2);
     }
 
     public void setAudioCodec(@NonNull c.o.a.m.b bVar) {
-        this.f2932x.b0(bVar);
+        this.f2930x.b0(bVar);
     }
 
     public void setAutoFocusMarker(@Nullable c.o.a.s.a aVar) {
@@ -1267,17 +1267,17 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setAutoFocusResetDelay(long j2) {
-        this.f2932x.c0(j2);
+        this.f2930x.c0(j2);
     }
 
     public void setEngine(@NonNull c.o.a.m.d dVar) {
         if (c()) {
             this.p = dVar;
-            i iVar = this.f2932x;
+            i iVar = this.f2930x;
             b();
             c.o.a.w.a aVar = this.v;
             if (aVar != null) {
-                this.f2932x.u0(aVar);
+                this.f2930x.u0(aVar);
             }
             setFacing(iVar.l());
             setFlash(iVar.m());
@@ -1303,7 +1303,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             setFrameProcessingMaxHeight(iVar.o());
             setFrameProcessingFormat(0);
             setFrameProcessingPoolSize(iVar.q());
-            this.f2932x.k0(!this.C.isEmpty());
+            this.f2930x.k0(!this.C.isEmpty());
         }
     }
 
@@ -1322,12 +1322,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             if (f > f3) {
                 f = f3;
             }
-            this.f2932x.d0(f, new float[]{f2, f3}, null, false);
+            this.f2930x.d0(f, new float[]{f2, f3}, null, false);
         }
     }
 
     public void setFacing(@NonNull c.o.a.m.e eVar) {
-        this.f2932x.e0(eVar);
+        this.f2930x.e0(eVar);
     }
 
     public void setFilter(@NonNull c.o.a.o.b bVar) {
@@ -1347,12 +1347,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setFlash(@NonNull c.o.a.m.f fVar) {
-        this.f2932x.f0(fVar);
+        this.f2930x.f0(fVar);
     }
 
     public void setFrameProcessingExecutors(int i2) {
         if (i2 >= 1) {
-            this.f2930r = i2;
+            this.f2928r = i2;
             ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(i2, i2, 4, TimeUnit.SECONDS, new LinkedBlockingQueue(), new a(this));
             threadPoolExecutor.allowCoreThreadTimeOut(true);
             this.t = threadPoolExecutor;
@@ -1362,19 +1362,19 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setFrameProcessingFormat(int i2) {
-        this.f2932x.g0(i2);
+        this.f2930x.g0(i2);
     }
 
     public void setFrameProcessingMaxHeight(int i2) {
-        this.f2932x.h0(i2);
+        this.f2930x.h0(i2);
     }
 
     public void setFrameProcessingMaxWidth(int i2) {
-        this.f2932x.i0(i2);
+        this.f2930x.i0(i2);
     }
 
     public void setFrameProcessingPoolSize(int i2) {
-        this.f2932x.j0(i2);
+        this.f2930x.j0(i2);
     }
 
     public void setGrid(@NonNull c.o.a.m.g gVar) {
@@ -1386,7 +1386,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setHdr(@NonNull h hVar) {
-        this.f2932x.l0(hVar);
+        this.f2930x.l0(hVar);
     }
 
     public void setLifecycleOwner(@Nullable LifecycleOwner lifecycleOwner) {
@@ -1410,32 +1410,32 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setLocation(@Nullable Location location) {
-        this.f2932x.m0(location);
+        this.f2930x.m0(location);
     }
 
     public void setMode(@NonNull c.o.a.m.i iVar) {
-        this.f2932x.n0(iVar);
+        this.f2930x.n0(iVar);
     }
 
     public void setPictureFormat(@NonNull j jVar) {
-        this.f2932x.p0(jVar);
+        this.f2930x.p0(jVar);
     }
 
     public void setPictureMetering(boolean z2) {
-        this.f2932x.q0(z2);
+        this.f2930x.q0(z2);
     }
 
     public void setPictureSize(@NonNull c.o.a.x.c cVar) {
-        this.f2932x.r0(cVar);
+        this.f2930x.r0(cVar);
     }
 
     public void setPictureSnapshotMetering(boolean z2) {
-        this.f2932x.s0(z2);
+        this.f2930x.s0(z2);
     }
 
     public void setPlaySounds(boolean z2) {
         this.k = z2;
-        this.f2932x.t0(z2);
+        this.f2930x.t0(z2);
     }
 
     public void setPreview(@NonNull k kVar) {
@@ -1454,15 +1454,15 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setPreviewFrameRate(float f) {
-        this.f2932x.v0(f);
+        this.f2930x.v0(f);
     }
 
     public void setPreviewFrameRateExact(boolean z2) {
-        this.f2932x.w0(z2);
+        this.f2930x.w0(z2);
     }
 
     public void setPreviewStreamSize(@NonNull c.o.a.x.c cVar) {
-        this.f2932x.x0(cVar);
+        this.f2930x.x0(cVar);
     }
 
     public void setRequestPermissions(boolean z2) {
@@ -1470,11 +1470,11 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setSnapshotMaxHeight(int i2) {
-        this.f2932x.y0(i2);
+        this.f2930x.y0(i2);
     }
 
     public void setSnapshotMaxWidth(int i2) {
-        this.f2932x.z0(i2);
+        this.f2930x.z0(i2);
     }
 
     public void setUseDeviceOrientation(boolean z2) {
@@ -1482,27 +1482,27 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setVideoBitRate(int i2) {
-        this.f2932x.A0(i2);
+        this.f2930x.A0(i2);
     }
 
     public void setVideoCodec(@NonNull c.o.a.m.l lVar) {
-        this.f2932x.B0(lVar);
+        this.f2930x.B0(lVar);
     }
 
     public void setVideoMaxDuration(int i2) {
-        this.f2932x.C0(i2);
+        this.f2930x.C0(i2);
     }
 
     public void setVideoMaxSize(long j2) {
-        this.f2932x.D0(j2);
+        this.f2930x.D0(j2);
     }
 
     public void setVideoSize(@NonNull c.o.a.x.c cVar) {
-        this.f2932x.E0(cVar);
+        this.f2930x.E0(cVar);
     }
 
     public void setWhiteBalance(@NonNull m mVar) {
-        this.f2932x.F0(mVar);
+        this.f2930x.F0(mVar);
     }
 
     public void setZoom(float f) {
@@ -1512,6 +1512,6 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         if (f > 1.0f) {
             f = 1.0f;
         }
-        this.f2932x.G0(f, null, false);
+        this.f2930x.G0(f, null, false);
     }
 }
diff --git a/app/src/main/java/com/yalantis/ucrop/UCropActivity.java b/app/src/main/java/com/yalantis/ucrop/UCropActivity.java
index e626853f00..f903787dbb 100644
--- a/app/src/main/java/com/yalantis/ucrop/UCropActivity.java
+++ b/app/src/main/java/com/yalantis/ucrop/UCropActivity.java
@@ -75,23 +75,23 @@ public class UCropActivity extends AppCompatActivity {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2936r;
+    public int f2934r;
     public boolean s;
     public boolean t = true;
     public UCropView u;
     public GestureCropImageView v;
 
     /* renamed from: w  reason: collision with root package name */
-    public OverlayView f2937w;
+    public OverlayView f2935w;
 
     /* renamed from: x  reason: collision with root package name */
-    public ViewGroup f2938x;
+    public ViewGroup f2936x;
 
     /* renamed from: y  reason: collision with root package name */
-    public ViewGroup f2939y;
+    public ViewGroup f2937y;
 
     /* renamed from: z  reason: collision with root package name */
-    public ViewGroup f2940z;
+    public ViewGroup f2938z;
 
     public class a implements c.a {
         public a() {
@@ -150,13 +150,13 @@ public class UCropActivity extends AppCompatActivity {
 
     public final void c(@IdRes int i2) {
         if (this.s) {
-            ViewGroup viewGroup = this.f2938x;
+            ViewGroup viewGroup = this.f2936x;
             int i3 = R.d.state_aspect_ratio;
             viewGroup.setSelected(i2 == i3);
-            ViewGroup viewGroup2 = this.f2939y;
+            ViewGroup viewGroup2 = this.f2937y;
             int i4 = R.d.state_rotate;
             viewGroup2.setSelected(i2 == i4);
-            ViewGroup viewGroup3 = this.f2940z;
+            ViewGroup viewGroup3 = this.f2938z;
             int i5 = R.d.state_scale;
             viewGroup3.setSelected(i2 == i5);
             int i6 = 8;
@@ -164,9 +164,9 @@ public class UCropActivity extends AppCompatActivity {
             this.B.setVisibility(i2 == i4 ? 0 : 8);
             this.C.setVisibility(i2 == i5 ? 0 : 8);
             TransitionManager.beginDelayedTransition((ViewGroup) findViewById(R.d.ucrop_photobox), this.H);
-            this.f2940z.findViewById(R.d.text_view_scale).setVisibility(i2 == i5 ? 0 : 8);
-            this.f2938x.findViewById(R.d.text_view_crop).setVisibility(i2 == i3 ? 0 : 8);
-            View findViewById = this.f2939y.findViewById(R.d.text_view_rotate);
+            this.f2938z.findViewById(R.d.text_view_scale).setVisibility(i2 == i5 ? 0 : 8);
+            this.f2936x.findViewById(R.d.text_view_crop).setVisibility(i2 == i3 ? 0 : 8);
+            View findViewById = this.f2937y.findViewById(R.d.text_view_rotate);
             if (i2 == i4) {
                 i6 = 0;
             }
@@ -198,7 +198,7 @@ public class UCropActivity extends AppCompatActivity {
             stringExtra = getResources().getString(R.g.ucrop_label_edit_photo);
         }
         this.j = stringExtra;
-        this.f2936r = intent.getIntExtra("com.yalantis.ucrop.UcropLogoColor", ContextCompat.getColor(this, R.a.ucrop_color_default_logo));
+        this.f2934r = intent.getIntExtra("com.yalantis.ucrop.UcropLogoColor", ContextCompat.getColor(this, R.a.ucrop_color_default_logo));
         this.s = !intent.getBooleanExtra("com.yalantis.ucrop.HideBottomControls", false);
         this.o = intent.getIntExtra("com.yalantis.ucrop.UcropRootViewBackgroundColor", ContextCompat.getColor(this, R.a.ucrop_color_crop_background));
         int i2 = this.l;
@@ -224,9 +224,9 @@ public class UCropActivity extends AppCompatActivity {
         UCropView uCropView = (UCropView) findViewById(R.d.ucrop);
         this.u = uCropView;
         this.v = uCropView.getCropImageView();
-        this.f2937w = this.u.getOverlayView();
+        this.f2935w = this.u.getOverlayView();
         this.v.setTransformImageListener(this.L);
-        ((ImageView) findViewById(R.d.image_view_logo)).setColorFilter(this.f2936r, PorterDuff.Mode.SRC_ATOP);
+        ((ImageView) findViewById(R.d.image_view_logo)).setColorFilter(this.f2934r, PorterDuff.Mode.SRC_ATOP);
         int i3 = R.d.ucrop_frame;
         findViewById(i3).setBackgroundColor(this.o);
         if (!this.s) {
@@ -242,13 +242,13 @@ public class UCropActivity extends AppCompatActivity {
             this.H = autoTransition;
             autoTransition.setDuration(50L);
             ViewGroup viewGroup3 = (ViewGroup) findViewById(R.d.state_aspect_ratio);
-            this.f2938x = viewGroup3;
+            this.f2936x = viewGroup3;
             viewGroup3.setOnClickListener(this.M);
             ViewGroup viewGroup4 = (ViewGroup) findViewById(R.d.state_rotate);
-            this.f2939y = viewGroup4;
+            this.f2937y = viewGroup4;
             viewGroup4.setOnClickListener(this.M);
             ViewGroup viewGroup5 = (ViewGroup) findViewById(R.d.state_scale);
-            this.f2940z = viewGroup5;
+            this.f2938z = viewGroup5;
             viewGroup5.setOnClickListener(this.M);
             int i4 = R.d.layout_aspect_ratio;
             this.A = (ViewGroup) findViewById(i4);
@@ -326,23 +326,23 @@ public class UCropActivity extends AppCompatActivity {
         this.v.setMaxBitmapSize(intent.getIntExtra("com.yalantis.ucrop.MaxBitmapSize", 0));
         this.v.setMaxScaleMultiplier(intent.getFloatExtra("com.yalantis.ucrop.MaxScaleMultiplier", 10.0f));
         this.v.setImageToWrapCropBoundsAnimDuration((long) intent.getIntExtra("com.yalantis.ucrop.ImageToCropBoundsAnimDuration", 500));
-        this.f2937w.setFreestyleCropEnabled(intent.getBooleanExtra("com.yalantis.ucrop.FreeStyleCrop", false));
-        this.f2937w.setDimmedColor(intent.getIntExtra("com.yalantis.ucrop.DimmedLayerColor", getResources().getColor(R.a.ucrop_color_default_dimmed)));
-        this.f2937w.setCircleDimmedLayer(intent.getBooleanExtra("com.yalantis.ucrop.CircleDimmedLayer", false));
-        this.f2937w.setShowCropFrame(intent.getBooleanExtra("com.yalantis.ucrop.ShowCropFrame", true));
-        this.f2937w.setCropFrameColor(intent.getIntExtra("com.yalantis.ucrop.CropFrameColor", getResources().getColor(R.a.ucrop_color_default_crop_frame)));
-        this.f2937w.setCropFrameStrokeWidth(intent.getIntExtra("com.yalantis.ucrop.CropFrameStrokeWidth", getResources().getDimensionPixelSize(R.b.ucrop_default_crop_frame_stoke_width)));
-        this.f2937w.setShowCropGrid(intent.getBooleanExtra("com.yalantis.ucrop.ShowCropGrid", true));
-        this.f2937w.setCropGridRowCount(intent.getIntExtra("com.yalantis.ucrop.CropGridRowCount", 2));
-        this.f2937w.setCropGridColumnCount(intent.getIntExtra("com.yalantis.ucrop.CropGridColumnCount", 2));
-        this.f2937w.setCropGridColor(intent.getIntExtra("com.yalantis.ucrop.CropGridColor", getResources().getColor(R.a.ucrop_color_default_crop_grid)));
-        this.f2937w.setCropGridStrokeWidth(intent.getIntExtra("com.yalantis.ucrop.CropGridStrokeWidth", getResources().getDimensionPixelSize(R.b.ucrop_default_crop_grid_stoke_width)));
+        this.f2935w.setFreestyleCropEnabled(intent.getBooleanExtra("com.yalantis.ucrop.FreeStyleCrop", false));
+        this.f2935w.setDimmedColor(intent.getIntExtra("com.yalantis.ucrop.DimmedLayerColor", getResources().getColor(R.a.ucrop_color_default_dimmed)));
+        this.f2935w.setCircleDimmedLayer(intent.getBooleanExtra("com.yalantis.ucrop.CircleDimmedLayer", false));
+        this.f2935w.setShowCropFrame(intent.getBooleanExtra("com.yalantis.ucrop.ShowCropFrame", true));
+        this.f2935w.setCropFrameColor(intent.getIntExtra("com.yalantis.ucrop.CropFrameColor", getResources().getColor(R.a.ucrop_color_default_crop_frame)));
+        this.f2935w.setCropFrameStrokeWidth(intent.getIntExtra("com.yalantis.ucrop.CropFrameStrokeWidth", getResources().getDimensionPixelSize(R.b.ucrop_default_crop_frame_stoke_width)));
+        this.f2935w.setShowCropGrid(intent.getBooleanExtra("com.yalantis.ucrop.ShowCropGrid", true));
+        this.f2935w.setCropGridRowCount(intent.getIntExtra("com.yalantis.ucrop.CropGridRowCount", 2));
+        this.f2935w.setCropGridColumnCount(intent.getIntExtra("com.yalantis.ucrop.CropGridColumnCount", 2));
+        this.f2935w.setCropGridColor(intent.getIntExtra("com.yalantis.ucrop.CropGridColor", getResources().getColor(R.a.ucrop_color_default_crop_grid)));
+        this.f2935w.setCropGridStrokeWidth(intent.getIntExtra("com.yalantis.ucrop.CropGridStrokeWidth", getResources().getDimensionPixelSize(R.b.ucrop_default_crop_grid_stoke_width)));
         float floatExtra = intent.getFloatExtra("com.yalantis.ucrop.AspectRatioX", 0.0f);
         float floatExtra2 = intent.getFloatExtra("com.yalantis.ucrop.AspectRatioY", 0.0f);
         int intExtra2 = intent.getIntExtra("com.yalantis.ucrop.AspectRatioSelectedByDefault", 0);
         ArrayList parcelableArrayListExtra2 = intent.getParcelableArrayListExtra("com.yalantis.ucrop.AspectRatioOptions");
         if (floatExtra > 0.0f && floatExtra2 > 0.0f) {
-            ViewGroup viewGroup7 = this.f2938x;
+            ViewGroup viewGroup7 = this.f2936x;
             if (viewGroup7 != null) {
                 viewGroup7.setVisibility(8);
             }
@@ -373,7 +373,7 @@ public class UCropActivity extends AppCompatActivity {
         }
         if (!this.s) {
             a(0);
-        } else if (this.f2938x.getVisibility() == 0) {
+        } else if (this.f2936x.getVisibility() == 0) {
             c(R.d.state_aspect_ratio);
         } else {
             c(R.d.state_scale);
diff --git a/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java b/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java
index 3df2307fb1..e6112dfed3 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java
@@ -37,23 +37,23 @@ public class OverlayView extends View {
     public float[] q = null;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2941r;
+    public boolean f2939r;
     public boolean s;
     public boolean t;
     public int u;
     public Path v = new Path();
 
     /* renamed from: w  reason: collision with root package name */
-    public Paint f2942w = new Paint(1);
+    public Paint f2940w = new Paint(1);
 
     /* renamed from: x  reason: collision with root package name */
-    public Paint f2943x = new Paint(1);
+    public Paint f2941x = new Paint(1);
 
     /* renamed from: y  reason: collision with root package name */
-    public Paint f2944y = new Paint(1);
+    public Paint f2942y = new Paint(1);
 
     /* renamed from: z  reason: collision with root package name */
-    public Paint f2945z = new Paint(1);
+    public Paint f2943z = new Paint(1);
 
     public OverlayView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
@@ -92,7 +92,7 @@ public class OverlayView extends View {
         canvas.drawColor(this.u);
         canvas.restore();
         if (this.t) {
-            canvas.drawCircle(this.i.centerX(), this.i.centerY(), Math.min(this.i.width(), this.i.height()) / 2.0f, this.f2942w);
+            canvas.drawCircle(this.i.centerX(), this.i.centerY(), Math.min(this.i.width(), this.i.height()) / 2.0f, this.f2940w);
         }
         if (this.s) {
             if (this.q == null && !this.i.isEmpty()) {
@@ -134,11 +134,11 @@ public class OverlayView extends View {
             }
             float[] fArr5 = this.q;
             if (fArr5 != null) {
-                canvas.drawLines(fArr5, this.f2943x);
+                canvas.drawLines(fArr5, this.f2941x);
             }
         }
-        if (this.f2941r) {
-            canvas.drawRect(this.i, this.f2944y);
+        if (this.f2939r) {
+            canvas.drawRect(this.i, this.f2942y);
         }
         if (this.A != 0) {
             canvas.save();
@@ -152,7 +152,7 @@ public class OverlayView extends View {
             int i11 = this.G;
             rectF6.inset((float) (-i11), (float) i11);
             canvas.clipRect(this.j, Region.Op.DIFFERENCE);
-            canvas.drawRect(this.i, this.f2945z);
+            canvas.drawRect(this.i, this.f2943z);
             canvas.restore();
         }
     }
@@ -263,15 +263,15 @@ public class OverlayView extends View {
     }
 
     public void setCropFrameColor(@ColorInt int i) {
-        this.f2944y.setColor(i);
+        this.f2942y.setColor(i);
     }
 
     public void setCropFrameStrokeWidth(@IntRange(from = 0) int i) {
-        this.f2944y.setStrokeWidth((float) i);
+        this.f2942y.setStrokeWidth((float) i);
     }
 
     public void setCropGridColor(@ColorInt int i) {
-        this.f2943x.setColor(i);
+        this.f2941x.setColor(i);
     }
 
     public void setCropGridColumnCount(@IntRange(from = 0) int i) {
@@ -285,7 +285,7 @@ public class OverlayView extends View {
     }
 
     public void setCropGridStrokeWidth(@IntRange(from = 0) int i) {
-        this.f2943x.setStrokeWidth((float) i);
+        this.f2941x.setStrokeWidth((float) i);
     }
 
     public void setDimmedColor(@ColorInt int i) {
@@ -307,7 +307,7 @@ public class OverlayView extends View {
     }
 
     public void setShowCropFrame(boolean z2) {
-        this.f2941r = z2;
+        this.f2939r = z2;
     }
 
     public void setShowCropGrid(boolean z2) {
diff --git a/app/src/main/java/com/yalantis/ucrop/view/UCropView.java b/app/src/main/java/com/yalantis/ucrop/view/UCropView.java
index a31beef6c0..471797d4a3 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/UCropView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/UCropView.java
@@ -26,22 +26,22 @@ public class UCropView extends FrameLayout {
         overlayView.t = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_circle_dimmed_layer, false);
         int color = obtainStyledAttributes.getColor(R.h.ucrop_UCropView_ucrop_dimmed_color, overlayView.getResources().getColor(R.a.ucrop_color_default_dimmed));
         overlayView.u = color;
-        overlayView.f2942w.setColor(color);
-        overlayView.f2942w.setStyle(Paint.Style.STROKE);
-        overlayView.f2942w.setStrokeWidth(1.0f);
+        overlayView.f2940w.setColor(color);
+        overlayView.f2940w.setStyle(Paint.Style.STROKE);
+        overlayView.f2940w.setStrokeWidth(1.0f);
         int dimensionPixelSize = obtainStyledAttributes.getDimensionPixelSize(R.h.ucrop_UCropView_ucrop_frame_stroke_size, overlayView.getResources().getDimensionPixelSize(R.b.ucrop_default_crop_frame_stoke_width));
         int color2 = obtainStyledAttributes.getColor(R.h.ucrop_UCropView_ucrop_frame_color, overlayView.getResources().getColor(R.a.ucrop_color_default_crop_frame));
-        overlayView.f2944y.setStrokeWidth((float) dimensionPixelSize);
-        overlayView.f2944y.setColor(color2);
-        overlayView.f2944y.setStyle(Paint.Style.STROKE);
-        overlayView.f2945z.setStrokeWidth((float) (dimensionPixelSize * 3));
-        overlayView.f2945z.setColor(color2);
-        overlayView.f2945z.setStyle(Paint.Style.STROKE);
-        overlayView.f2941r = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_show_frame, true);
+        overlayView.f2942y.setStrokeWidth((float) dimensionPixelSize);
+        overlayView.f2942y.setColor(color2);
+        overlayView.f2942y.setStyle(Paint.Style.STROKE);
+        overlayView.f2943z.setStrokeWidth((float) (dimensionPixelSize * 3));
+        overlayView.f2943z.setColor(color2);
+        overlayView.f2943z.setStyle(Paint.Style.STROKE);
+        overlayView.f2939r = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_show_frame, true);
         int dimensionPixelSize2 = obtainStyledAttributes.getDimensionPixelSize(R.h.ucrop_UCropView_ucrop_grid_stroke_size, overlayView.getResources().getDimensionPixelSize(R.b.ucrop_default_crop_grid_stoke_width));
         int color3 = obtainStyledAttributes.getColor(R.h.ucrop_UCropView_ucrop_grid_color, overlayView.getResources().getColor(R.a.ucrop_color_default_crop_grid));
-        overlayView.f2943x.setStrokeWidth((float) dimensionPixelSize2);
-        overlayView.f2943x.setColor(color3);
+        overlayView.f2941x.setStrokeWidth((float) dimensionPixelSize2);
+        overlayView.f2941x.setColor(color3);
         overlayView.n = obtainStyledAttributes.getInt(R.h.ucrop_UCropView_ucrop_grid_row_count, 2);
         overlayView.o = obtainStyledAttributes.getInt(R.h.ucrop_UCropView_ucrop_grid_column_count, 2);
         overlayView.s = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_show_grid, true);
diff --git a/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java b/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
index 86ad89bcc0..b3f9669bfe 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
@@ -22,7 +22,7 @@ public class HorizontalProgressWheelView extends View {
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public float f2946r;
+    public float f2944r;
     public int s = ContextCompat.getColor(getContext(), R.a.ucrop_color_widget_rotate_mid_line);
 
     public interface a {
@@ -55,7 +55,7 @@ public class HorizontalProgressWheelView extends View {
         int i = this.n;
         int i2 = this.p;
         int i3 = width / (i + i2);
-        float f = this.f2946r % ((float) (i2 + i));
+        float f = this.f2944r % ((float) (i2 + i));
         for (int i4 = 0; i4 < i3; i4++) {
             int i5 = i3 / 4;
             if (i4 < i5) {
@@ -96,12 +96,12 @@ public class HorizontalProgressWheelView extends View {
                         aVar2.c();
                     }
                 }
-                this.f2946r -= x2;
+                this.f2944r -= x2;
                 postInvalidate();
                 this.k = motionEvent.getX();
                 a aVar3 = this.j;
                 if (aVar3 != null) {
-                    aVar3.b(-x2, this.f2946r);
+                    aVar3.b(-x2, this.f2944r);
                 }
             }
         }
diff --git a/app/src/main/java/d0/a/a/a/a.java b/app/src/main/java/d0/a/a/a/a.java
index 70d0f40012..2053aeb58b 100644
--- a/app/src/main/java/d0/a/a/a/a.java
+++ b/app/src/main/java/d0/a/a/a/a.java
@@ -27,7 +27,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     @ColorInt
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2947r = getResources().getColor(R.a.viewfinder_laser);
+    public int f2945r = getResources().getColor(R.a.viewfinder_laser);
     @ColorInt
     public int s = getResources().getColor(R.a.viewfinder_border);
     public int t = getResources().getColor(R.a.viewfinder_mask);
@@ -35,16 +35,16 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     public int v = getResources().getInteger(R.b.viewfinder_border_length);
 
     /* renamed from: w  reason: collision with root package name */
-    public boolean f2948w = false;
+    public boolean f2946w = false;
 
     /* renamed from: x  reason: collision with root package name */
-    public int f2949x = 0;
+    public int f2947x = 0;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f2950y = false;
+    public boolean f2948y = false;
 
     /* renamed from: z  reason: collision with root package name */
-    public float f2951z = 1.0f;
+    public float f2949z = 1.0f;
 
     /* JADX INFO: finally extract failed */
     public a(Context context, AttributeSet attributeSet) {
@@ -53,27 +53,27 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
         try {
             setShouldScaleToFill(obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_shouldScaleToFill, true));
             this.q = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_laserEnabled, this.q);
-            this.f2947r = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_laserColor, this.f2947r);
+            this.f2945r = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_laserColor, this.f2945r);
             this.s = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_borderColor, this.s);
             this.t = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_maskColor, this.t);
             this.u = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_borderWidth, this.u);
             this.v = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_borderLength, this.v);
-            this.f2948w = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_roundedCorner, this.f2948w);
-            this.f2949x = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_cornerRadius, this.f2949x);
-            this.f2950y = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_squaredFinder, this.f2950y);
-            this.f2951z = obtainStyledAttributes.getFloat(R.c.BarcodeScannerView_borderAlpha, this.f2951z);
+            this.f2946w = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_roundedCorner, this.f2946w);
+            this.f2947x = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_cornerRadius, this.f2947x);
+            this.f2948y = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_squaredFinder, this.f2948y);
+            this.f2949z = obtainStyledAttributes.getFloat(R.c.BarcodeScannerView_borderAlpha, this.f2949z);
             this.A = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_finderOffset, this.A);
             obtainStyledAttributes.recycle();
             g gVar = new g(getContext());
             gVar.setBorderColor(this.s);
-            gVar.setLaserColor(this.f2947r);
+            gVar.setLaserColor(this.f2945r);
             gVar.setLaserEnabled(this.q);
             gVar.setBorderStrokeWidth(this.u);
             gVar.setBorderLineLength(this.v);
             gVar.setMaskColor(this.t);
-            gVar.setBorderCornerRounded(this.f2948w);
-            gVar.setBorderCornerRadius(this.f2949x);
-            gVar.setSquareViewFinder(this.f2950y);
+            gVar.setBorderCornerRounded(this.f2946w);
+            gVar.setBorderCornerRadius(this.f2947x);
+            gVar.setSquareViewFinder(this.f2948y);
             gVar.setViewFinderOffset(this.A);
             this.k = gVar;
         } catch (Throwable th) {
@@ -120,7 +120,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setBorderAlpha(float f) {
-        this.f2951z = f;
+        this.f2949z = f;
         ((g) this.k).setBorderAlpha(f);
         g gVar = (g) this.k;
         gVar.a();
@@ -136,7 +136,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setBorderCornerRadius(int i) {
-        this.f2949x = i;
+        this.f2947x = i;
         ((g) this.k).setBorderCornerRadius(i);
         g gVar = (g) this.k;
         gVar.a();
@@ -180,7 +180,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setIsBorderCornerRounded(boolean z2) {
-        this.f2948w = z2;
+        this.f2946w = z2;
         ((g) this.k).setBorderCornerRounded(z2);
         g gVar = (g) this.k;
         gVar.a();
@@ -188,7 +188,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setLaserColor(int i) {
-        this.f2947r = i;
+        this.f2945r = i;
         ((g) this.k).setLaserColor(i);
         g gVar = (g) this.k;
         gVar.a();
@@ -216,7 +216,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setSquareViewFinder(boolean z2) {
-        this.f2950y = z2;
+        this.f2948y = z2;
         ((g) this.k).setSquareViewFinder(z2);
         g gVar = (g) this.k;
         gVar.a();
diff --git a/app/src/main/java/d0/a/a/a/d.java b/app/src/main/java/d0/a/a/a/d.java
index 1af53652e6..fc7e07dfe7 100644
--- a/app/src/main/java/d0/a/a/a/d.java
+++ b/app/src/main/java/d0/a/a/a/d.java
@@ -25,7 +25,7 @@ public class d extends SurfaceView implements SurfaceHolder.Callback {
     public Runnable q = new a();
 
     /* renamed from: r  reason: collision with root package name */
-    public Camera.AutoFocusCallback f2952r = new b();
+    public Camera.AutoFocusCallback f2950r = new b();
 
     /* compiled from: CameraPreview */
     public class a implements Runnable {
@@ -99,7 +99,7 @@ public class d extends SurfaceView implements SurfaceHolder.Callback {
 
     public void a() {
         try {
-            this.i.a.autoFocus(this.f2952r);
+            this.i.a.autoFocus(this.f2950r);
         } catch (RuntimeException unused) {
             b();
         }
diff --git a/app/src/main/java/d0/a/a/a/g.java b/app/src/main/java/d0/a/a/a/g.java
index 8d905d0247..ffe0b0ccb8 100644
--- a/app/src/main/java/d0/a/a/a/g.java
+++ b/app/src/main/java/d0/a/a/a/g.java
@@ -23,14 +23,14 @@ public class g extends View implements f {
     public Paint q;
 
     /* renamed from: r  reason: collision with root package name */
-    public Paint f2953r;
+    public Paint f2951r;
     public Paint s;
     public int t;
     public boolean u;
     public boolean v;
 
     /* renamed from: w  reason: collision with root package name */
-    public int f2954w = 0;
+    public int f2952w = 0;
 
     public g(Context context) {
         super(context);
@@ -49,7 +49,7 @@ public class g extends View implements f {
         paint.setColor(color);
         this.q.setStyle(Paint.Style.FILL);
         Paint paint2 = new Paint();
-        this.f2953r = paint2;
+        this.f2951r = paint2;
         paint2.setColor(color2);
         Paint paint3 = new Paint();
         this.s = paint3;
@@ -84,7 +84,7 @@ public class g extends View implements f {
         }
         int i4 = (point.x - i3) / 2;
         int i5 = (point.y - i2) / 2;
-        int i6 = this.f2954w;
+        int i6 = this.f2952w;
         this.j = new Rect(i4 + i6, i5 + i6, (i4 + i3) - i6, (i5 + i2) - i6);
     }
 
@@ -99,10 +99,10 @@ public class g extends View implements f {
             int height = canvas.getHeight();
             Rect framingRect = getFramingRect();
             float f = (float) width;
-            canvas.drawRect(0.0f, 0.0f, f, (float) framingRect.top, this.f2953r);
-            canvas.drawRect(0.0f, (float) framingRect.top, (float) framingRect.left, (float) (framingRect.bottom + 1), this.f2953r);
-            canvas.drawRect((float) (framingRect.right + 1), (float) framingRect.top, f, (float) (framingRect.bottom + 1), this.f2953r);
-            canvas.drawRect(0.0f, (float) (framingRect.bottom + 1), f, (float) height, this.f2953r);
+            canvas.drawRect(0.0f, 0.0f, f, (float) framingRect.top, this.f2951r);
+            canvas.drawRect(0.0f, (float) framingRect.top, (float) framingRect.left, (float) (framingRect.bottom + 1), this.f2951r);
+            canvas.drawRect((float) (framingRect.right + 1), (float) framingRect.top, f, (float) (framingRect.bottom + 1), this.f2951r);
+            canvas.drawRect(0.0f, (float) (framingRect.bottom + 1), f, (float) height, this.f2951r);
             Rect framingRect2 = getFramingRect();
             Path path = new Path();
             path.moveTo((float) framingRect2.left, (float) (framingRect2.top + this.t));
@@ -176,7 +176,7 @@ public class g extends View implements f {
     }
 
     public void setMaskColor(int i2) {
-        this.f2953r.setColor(i2);
+        this.f2951r.setColor(i2);
     }
 
     public void setSquareViewFinder(boolean z2) {
@@ -184,6 +184,6 @@ public class g extends View implements f {
     }
 
     public void setViewFinderOffset(int i2) {
-        this.f2954w = i2;
+        this.f2952w = i2;
     }
 }
diff --git a/app/src/main/java/defpackage/e.java b/app/src/main/java/defpackage/e.java
index 00077db1ed..0e597ad08e 100644
--- a/app/src/main/java/defpackage/e.java
+++ b/app/src/main/java/defpackage/e.java
@@ -33,7 +33,7 @@ public final class e implements View.OnClickListener {
         int i = this.i;
         if (i == 0) {
             OverlayMenuView overlayMenuView = (OverlayMenuView) this.j;
-            Long valueOf = Long.valueOf(((OverlayMenuView.a) this.k).f2618c.getChannel().h());
+            Long valueOf = Long.valueOf(((OverlayMenuView.a) this.k).f2616c.getChannel().h());
             int i2 = OverlayMenuView.i;
             Objects.requireNonNull(overlayMenuView);
             if (valueOf != null) {
@@ -43,7 +43,7 @@ public final class e implements View.OnClickListener {
             }
         } else if (i == 1) {
             OverlayMenuView overlayMenuView2 = (OverlayMenuView) this.j;
-            Long valueOf2 = Long.valueOf(((OverlayMenuView.a) this.k).f2618c.getChannel().h());
+            Long valueOf2 = Long.valueOf(((OverlayMenuView.a) this.k).f2616c.getChannel().h());
             int i3 = OverlayMenuView.i;
             Objects.requireNonNull(overlayMenuView2);
             overlayMenuView2.getContext().startActivity(IntentUtils.RouteBuilders.INSTANCE.connectVoice(valueOf2 != null ? valueOf2.longValue() : 0).setClass(overlayMenuView2.getContext(), AppActivity.Main.class).addFlags(268435456));
diff --git a/app/src/main/java/defpackage/g.java b/app/src/main/java/defpackage/g.java
index b64fae1a57..973e741b99 100644
--- a/app/src/main/java/defpackage/g.java
+++ b/app/src/main/java/defpackage/g.java
@@ -18,28 +18,28 @@ public final class g implements View.OnClickListener {
     public final void onClick(View view) {
         int i = this.i;
         if (i == 0) {
-            FlexInputViewModel flexInputViewModel = ((FlexInputFragment) this.j).f2924r;
+            FlexInputViewModel flexInputViewModel = ((FlexInputFragment) this.j).f2922r;
             if (flexInputViewModel != null) {
                 flexInputViewModel.onExpressionTrayButtonClicked();
             }
         } else if (i == 1) {
             FlexInputFragment flexInputFragment = (FlexInputFragment) this.j;
-            FlexInputViewModel flexInputViewModel2 = flexInputFragment.f2924r;
+            FlexInputViewModel flexInputViewModel2 = flexInputFragment.f2922r;
             if (flexInputViewModel2 != null) {
                 flexInputViewModel2.onSendButtonClicked(flexInputFragment.n);
             }
         } else if (i == 2) {
-            FlexInputViewModel flexInputViewModel3 = ((FlexInputFragment) this.j).f2924r;
+            FlexInputViewModel flexInputViewModel3 = ((FlexInputFragment) this.j).f2922r;
             if (flexInputViewModel3 != null) {
                 flexInputViewModel3.onGalleryButtonClicked();
             }
         } else if (i == 3) {
-            FlexInputViewModel flexInputViewModel4 = ((FlexInputFragment) this.j).f2924r;
+            FlexInputViewModel flexInputViewModel4 = ((FlexInputFragment) this.j).f2922r;
             if (flexInputViewModel4 != null) {
                 flexInputViewModel4.onGiftButtonClicked();
             }
         } else if (i == 4) {
-            FlexInputViewModel flexInputViewModel5 = ((FlexInputFragment) this.j).f2924r;
+            FlexInputViewModel flexInputViewModel5 = ((FlexInputFragment) this.j).f2922r;
             if (flexInputViewModel5 != null) {
                 flexInputViewModel5.onExpandButtonClicked();
             }
diff --git a/app/src/main/java/defpackage/h.java b/app/src/main/java/defpackage/h.java
index 462215e965..489ce5b224 100644
--- a/app/src/main/java/defpackage/h.java
+++ b/app/src/main/java/defpackage/h.java
@@ -30,7 +30,7 @@ public final class h implements View.OnClickListener {
         if (i2 != 0) {
             boolean z2 = true;
             if (i2 == 1) {
-                List<DiscordAudioManager.AudioDevice> audioDevices = ((OverlayMenuView.a) this.j).f2618c.getAudioManagerState().getAudioDevices();
+                List<DiscordAudioManager.AudioDevice> audioDevices = ((OverlayMenuView.a) this.j).f2616c.getAudioManagerState().getAudioDevices();
                 if (!(audioDevices instanceof Collection) || !audioDevices.isEmpty()) {
                     i = 0;
                     for (DiscordAudioManager.AudioDevice audioDevice : audioDevices) {
@@ -57,10 +57,10 @@ public final class h implements View.OnClickListener {
                     return;
                 }
                 throw null;
-            } else if (((OverlayMenuView.a) this.j).f2618c.isSuppressed()) {
+            } else if (((OverlayMenuView.a) this.j).f2616c.isSuppressed()) {
                 m.checkNotNullExpressionValue(view, "view");
                 c.a.d.m.g(view.getContext(), R.string.suppressed_permission_body, 0, null, 12);
-            } else if (((OverlayMenuView.a) this.j).f2618c.isMuted()) {
+            } else if (((OverlayMenuView.a) this.j).f2616c.isMuted()) {
                 m.checkNotNullExpressionValue(view, "view");
                 c.a.d.m.g(view.getContext(), R.string.server_muted_dialog_body, 0, null, 12);
             } else {
diff --git a/app/src/main/java/e0/a.java b/app/src/main/java/e0/a.java
index 9d8d235534..099bcf3499 100644
--- a/app/src/main/java/e0/a.java
+++ b/app/src/main/java/e0/a.java
@@ -19,7 +19,7 @@ public final class a {
     public final List<y> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<m> f2955c;
+    public final List<m> f2953c;
     public final s d;
     public final SocketFactory e;
     public final SSLSocketFactory f;
@@ -64,7 +64,7 @@ public final class a {
                 aVar.f = i;
                 this.a = aVar.b();
                 this.b = c.z(list);
-                this.f2955c = c.z(list2);
+                this.f2953c = c.z(list2);
                 return;
             }
             throw new IllegalArgumentException(c.d.b.a.a.l("unexpected port: ", i).toString());
@@ -74,7 +74,7 @@ public final class a {
 
     public final boolean a(a aVar) {
         m.checkParameterIsNotNull(aVar, "that");
-        return m.areEqual(this.d, aVar.d) && m.areEqual(this.i, aVar.i) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2955c, aVar.f2955c) && m.areEqual(this.k, aVar.k) && m.areEqual(this.j, aVar.j) && m.areEqual(this.f, aVar.f) && m.areEqual(this.g, aVar.g) && m.areEqual(this.h, aVar.h) && this.a.h == aVar.a.h;
+        return m.areEqual(this.d, aVar.d) && m.areEqual(this.i, aVar.i) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2953c, aVar.f2953c) && m.areEqual(this.k, aVar.k) && m.areEqual(this.j, aVar.j) && m.areEqual(this.f, aVar.f) && m.areEqual(this.g, aVar.g) && m.areEqual(this.h, aVar.h) && this.a.h == aVar.a.h;
     }
 
     public boolean equals(Object obj) {
@@ -91,7 +91,7 @@ public final class a {
         int hashCode = this.d.hashCode();
         int hashCode2 = this.i.hashCode();
         int hashCode3 = this.b.hashCode();
-        int hashCode4 = this.f2955c.hashCode();
+        int hashCode4 = this.f2953c.hashCode();
         int hashCode5 = this.k.hashCode();
         int hashCode6 = Objects.hashCode(this.j);
         int hashCode7 = Objects.hashCode(this.f);
diff --git a/app/src/main/java/e0/c0.java b/app/src/main/java/e0/c0.java
index 7ffd9bb998..4c2ce7c122 100644
--- a/app/src/main/java/e0/c0.java
+++ b/app/src/main/java/e0/c0.java
@@ -10,7 +10,7 @@ public final class c0 {
     public final Proxy b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final InetSocketAddress f2956c;
+    public final InetSocketAddress f2954c;
 
     public c0(a aVar, Proxy proxy, InetSocketAddress inetSocketAddress) {
         m.checkParameterIsNotNull(aVar, "address");
@@ -18,7 +18,7 @@ public final class c0 {
         m.checkParameterIsNotNull(inetSocketAddress, "socketAddress");
         this.a = aVar;
         this.b = proxy;
-        this.f2956c = inetSocketAddress;
+        this.f2954c = inetSocketAddress;
     }
 
     public final boolean a() {
@@ -28,7 +28,7 @@ public final class c0 {
     public boolean equals(Object obj) {
         if (obj instanceof c0) {
             c0 c0Var = (c0) obj;
-            if (m.areEqual(c0Var.a, this.a) && m.areEqual(c0Var.b, this.b) && m.areEqual(c0Var.f2956c, this.f2956c)) {
+            if (m.areEqual(c0Var.a, this.a) && m.areEqual(c0Var.b, this.b) && m.areEqual(c0Var.f2954c, this.f2954c)) {
                 return true;
             }
         }
@@ -37,12 +37,12 @@ public final class c0 {
 
     public int hashCode() {
         int hashCode = this.b.hashCode();
-        return this.f2956c.hashCode() + ((hashCode + ((this.a.hashCode() + 527) * 31)) * 31);
+        return this.f2954c.hashCode() + ((hashCode + ((this.a.hashCode() + 527) * 31)) * 31);
     }
 
     public String toString() {
         StringBuilder O = a.O("Route{");
-        O.append(this.f2956c);
+        O.append(this.f2954c);
         O.append('}');
         return O.toString();
     }
diff --git a/app/src/main/java/e0/d.java b/app/src/main/java/e0/d.java
index 4be466531d..abfb6639cf 100644
--- a/app/src/main/java/e0/d.java
+++ b/app/src/main/java/e0/d.java
@@ -14,7 +14,7 @@ public final class d {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2957c;
+    public final boolean f2955c;
     public final int d;
     public final int e;
     public final boolean f;
@@ -204,7 +204,7 @@ public final class d {
 
     public d(boolean z2, boolean z3, int i, int i2, boolean z4, boolean z5, boolean z6, int i3, int i4, boolean z7, boolean z8, boolean z9, String str, DefaultConstructorMarker defaultConstructorMarker) {
         this.b = z2;
-        this.f2957c = z3;
+        this.f2955c = z3;
         this.d = i;
         this.e = i2;
         this.f = z4;
@@ -227,7 +227,7 @@ public final class d {
         if (this.b) {
             sb.append("no-cache, ");
         }
-        if (this.f2957c) {
+        if (this.f2955c) {
             sb.append("no-store, ");
         }
         if (this.d != -1) {
diff --git a/app/src/main/java/e0/e0/c.java b/app/src/main/java/e0/e0/c.java
index afdb832596..5d12ff896e 100644
--- a/app/src/main/java/e0/e0/c.java
+++ b/app/src/main/java/e0/e0/c.java
@@ -43,7 +43,7 @@ public final class c {
     public static final Headers b = Headers.i.c(new String[0]);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ResponseBody f2958c;
+    public static final ResponseBody f2956c;
     public static final o d;
     public static final TimeZone e;
     public static final Regex f = new Regex("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)");
@@ -56,7 +56,7 @@ public final class c {
         e eVar = new e();
         eVar.R(bArr);
         m.checkParameterIsNotNull(eVar, "$this$asResponseBody");
-        f2958c = new b0(eVar, null, (long) 0);
+        f2956c = new b0(eVar, null, (long) 0);
         RequestBody.Companion.d(RequestBody.Companion, bArr, null, 0, 0, 7);
         o.a aVar = o.j;
         ByteString.a aVar2 = ByteString.j;
diff --git a/app/src/main/java/e0/e0/d/b.java b/app/src/main/java/e0/e0/d/b.java
index 5403e76c5f..c870d51a4f 100644
--- a/app/src/main/java/e0/e0/d/b.java
+++ b/app/src/main/java/e0/e0/d/b.java
@@ -135,7 +135,7 @@ public final class b implements c {
                             m.checkParameterIsNotNull(request, "request");
                             new LinkedHashMap();
                             wVar = request.b;
-                            String str6 = request.f3127c;
+                            String str6 = request.f3125c;
                             RequestBody requestBody = request.e;
                             Map linkedHashMap = !request.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(request.f);
                             Headers.a e3 = request.d.e();
@@ -175,7 +175,7 @@ public final class b implements c {
                         m.checkParameterIsNotNull(request, "request");
                         new LinkedHashMap();
                         wVar = request.b;
-                        String str6 = request.f3127c;
+                        String str6 = request.f3125c;
                         RequestBody requestBody = request.e;
                         if (!request.f.isEmpty()) {
                         }
@@ -211,7 +211,7 @@ public final class b implements c {
                 try {
                     e.b(eVar, arrayList);
                 } catch (EOFException e4) {
-                    h.a aVar2 = h.f2993c;
+                    h.a aVar2 = h.f2991c;
                     h.a.i("Unable to parse challenge", 5, e4);
                 }
             }
diff --git a/app/src/main/java/e0/e0/e/a.java b/app/src/main/java/e0/e0/e/a.java
index 0193546c0f..a0296416ab 100644
--- a/app/src/main/java/e0/e0/e/a.java
+++ b/app/src/main/java/e0/e0/e/a.java
@@ -42,7 +42,7 @@ public final class a implements Interceptor {
             Headers.a e = response.n.e();
             Response response2 = response.p;
             Response response3 = response.q;
-            Response response4 = response.f3130r;
+            Response response4 = response.f3128r;
             long j = response.s;
             long j2 = response.t;
             c cVar = response.u;
@@ -90,9 +90,9 @@ public final class a implements Interceptor {
             Response.a aVar = new Response.a();
             aVar.g(gVar.f);
             aVar.f(y.HTTP_1_1);
-            aVar.f3131c = 504;
+            aVar.f3129c = 504;
             aVar.e("Unsatisfiable Request (only-if-cached)");
-            aVar.g = e0.e0.c.f2958c;
+            aVar.g = e0.e0.c.f2956c;
             aVar.k = -1;
             aVar.l = System.currentTimeMillis();
             Response a = aVar.a();
diff --git a/app/src/main/java/e0/e0/f/a.java b/app/src/main/java/e0/e0/f/a.java
index 99f040cd61..00d94f7763 100644
--- a/app/src/main/java/e0/e0/f/a.java
+++ b/app/src/main/java/e0/e0/f/a.java
@@ -8,12 +8,12 @@ public abstract class a {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2959c;
+    public final String f2957c;
     public final boolean d;
 
     public a(String str, boolean z2) {
         m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
-        this.f2959c = str;
+        this.f2957c = str;
         this.d = z2;
         this.b = -1;
     }
@@ -26,6 +26,6 @@ public abstract class a {
     public abstract long a();
 
     public String toString() {
-        return this.f2959c;
+        return this.f2957c;
     }
 }
diff --git a/app/src/main/java/e0/e0/f/c.java b/app/src/main/java/e0/e0/f/c.java
index 6ba4d1d96f..b98704adf8 100644
--- a/app/src/main/java/e0/e0/f/c.java
+++ b/app/src/main/java/e0/e0/f/c.java
@@ -16,7 +16,7 @@ public final class c {
     public a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<a> f2960c = new ArrayList();
+    public final List<a> f2958c = new ArrayList();
     public boolean d;
     public final d e;
     public final String f;
@@ -55,14 +55,14 @@ public final class c {
             }
         }
         boolean z2 = false;
-        for (int size = this.f2960c.size() - 1; size >= 0; size--) {
-            if (this.f2960c.get(size).d) {
-                a aVar2 = this.f2960c.get(size);
-                Objects.requireNonNull(d.f2961c);
+        for (int size = this.f2958c.size() - 1; size >= 0; size--) {
+            if (this.f2958c.get(size).d) {
+                a aVar2 = this.f2958c.get(size);
+                Objects.requireNonNull(d.f2959c);
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar2, this, "canceled");
                 }
-                this.f2960c.remove(size);
+                this.f2958c.remove(size);
                 z2 = true;
             }
         }
@@ -77,12 +77,12 @@ public final class c {
                     this.e.e(this);
                 }
             } else if (aVar.d) {
-                Objects.requireNonNull(d.f2961c);
+                Objects.requireNonNull(d.f2959c);
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar, this, "schedule canceled (queue is shutdown)");
                 }
             } else {
-                Objects.requireNonNull(d.f2961c);
+                Objects.requireNonNull(d.f2959c);
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar, this, "schedule failed (queue is shutdown)");
                 }
@@ -106,19 +106,19 @@ public final class c {
         }
         long c2 = this.e.j.c();
         long j2 = c2 + j;
-        int indexOf = this.f2960c.indexOf(aVar);
+        int indexOf = this.f2958c.indexOf(aVar);
         if (indexOf != -1) {
             if (aVar.b <= j2) {
-                d.b bVar = d.f2961c;
+                d.b bVar = d.f2959c;
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar, this, "already scheduled");
                 }
                 return false;
             }
-            this.f2960c.remove(indexOf);
+            this.f2958c.remove(indexOf);
         }
         aVar.b = j2;
-        d.b bVar2 = d.f2961c;
+        d.b bVar2 = d.f2959c;
         if (d.b.isLoggable(Level.FINE)) {
             if (z2) {
                 StringBuilder O = c.d.b.a.a.O("run again after ");
@@ -131,7 +131,7 @@ public final class c {
             }
             a.c(aVar, this, str);
         }
-        Iterator<a> it = this.f2960c.iterator();
+        Iterator<a> it = this.f2958c.iterator();
         int i = 0;
         while (true) {
             if (!it.hasNext()) {
@@ -144,9 +144,9 @@ public final class c {
             i++;
         }
         if (i == -1) {
-            i = this.f2960c.size();
+            i = this.f2958c.size();
         }
-        this.f2960c.add(i, aVar);
+        this.f2958c.add(i, aVar);
         return i == 0;
     }
 
diff --git a/app/src/main/java/e0/e0/f/d.java b/app/src/main/java/e0/e0/f/d.java
index e8e6aadb84..0a57fe34d4 100644
--- a/app/src/main/java/e0/e0/f/d.java
+++ b/app/src/main/java/e0/e0/f/d.java
@@ -20,7 +20,7 @@ public final class d {
     public static final Logger b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b f2961c = new b(null);
+    public static final b f2959c = new b(null);
     public int d = 10000;
     public boolean e;
     public long f;
@@ -105,7 +105,7 @@ public final class d {
                         m.throwNpe();
                     }
                     long j = -1;
-                    b bVar = d.f2961c;
+                    b bVar = d.f2959c;
                     boolean isLoggable = d.b.isLoggable(Level.FINE);
                     if (isLoggable) {
                         j = cVar.e.j.c();
@@ -155,7 +155,7 @@ public final class d {
         Thread currentThread = Thread.currentThread();
         m.checkExpressionValueIsNotNull(currentThread, "currentThread");
         String name = currentThread.getName();
-        currentThread.setName(aVar.f2959c);
+        currentThread.setName(aVar.f2957c);
         try {
             long a2 = aVar.a();
             synchronized (dVar) {
@@ -185,7 +185,7 @@ public final class d {
             if (j != -1 && !z2 && !cVar.a) {
                 cVar.e(aVar, j, true);
             }
-            if (!cVar.f2960c.isEmpty()) {
+            if (!cVar.f2958c.isEmpty()) {
                 this.h.add(cVar);
                 return;
             }
@@ -207,7 +207,7 @@ public final class d {
                     z2 = false;
                     break;
                 }
-                a aVar2 = it.next().f2960c.get(0);
+                a aVar2 = it.next().f2958c.get(0);
                 long max = Math.max(0L, aVar2.b - c2);
                 if (max > 0) {
                     j = Math.min(max, j);
@@ -225,7 +225,7 @@ public final class d {
                 if (cVar == null) {
                     m.throwNpe();
                 }
-                cVar.f2960c.remove(aVar);
+                cVar.f2958c.remove(aVar);
                 this.h.remove(cVar);
                 cVar.b = aVar;
                 this.g.add(cVar);
@@ -262,7 +262,7 @@ public final class d {
         for (int size2 = this.h.size() - 1; size2 >= 0; size2--) {
             c cVar = this.h.get(size2);
             cVar.b();
-            if (cVar.f2960c.isEmpty()) {
+            if (cVar.f2958c.isEmpty()) {
                 this.h.remove(size2);
             }
         }
@@ -272,7 +272,7 @@ public final class d {
         m.checkParameterIsNotNull(cVar, "taskQueue");
         byte[] bArr = e0.e0.c.a;
         if (cVar.b == null) {
-            if (!cVar.f2960c.isEmpty()) {
+            if (!cVar.f2958c.isEmpty()) {
                 List<c> list = this.h;
                 m.checkParameterIsNotNull(list, "$this$addIfAbsent");
                 if (!list.contains(cVar)) {
diff --git a/app/src/main/java/e0/e0/g/a.java b/app/src/main/java/e0/e0/g/a.java
index 49fd73d0f8..6ba183216f 100644
--- a/app/src/main/java/e0/e0/g/a.java
+++ b/app/src/main/java/e0/e0/g/a.java
@@ -25,7 +25,7 @@ public final class a implements Interceptor {
                 throw new IllegalStateException("released".toString());
             } else if (!(!eVar.s)) {
                 throw new IllegalStateException("Check failed.".toString());
-            } else if (!(!eVar.f2965r)) {
+            } else if (!(!eVar.f2963r)) {
                 throw new IllegalStateException("Check failed.".toString());
             }
         }
@@ -33,16 +33,16 @@ public final class a implements Interceptor {
         if (dVar == null) {
             m.throwNpe();
         }
-        x xVar = eVar.f2967x;
+        x xVar = eVar.f2965x;
         Objects.requireNonNull(dVar);
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(gVar, "chain");
         try {
-            c cVar = new c(eVar, eVar.j, dVar, dVar.a(gVar.g, gVar.h, gVar.i, xVar.L, xVar.q, !m.areEqual(gVar.f.f3127c, ShareTarget.METHOD_GET)).k(xVar, gVar));
+            c cVar = new c(eVar, eVar.j, dVar, dVar.a(gVar.g, gVar.h, gVar.i, xVar.L, xVar.q, !m.areEqual(gVar.f.f3125c, ShareTarget.METHOD_GET)).k(xVar, gVar));
             eVar.q = cVar;
             eVar.v = cVar;
             synchronized (eVar) {
-                eVar.f2965r = true;
+                eVar.f2963r = true;
                 eVar.s = true;
             }
             if (!eVar.u) {
diff --git a/app/src/main/java/e0/e0/g/b.java b/app/src/main/java/e0/e0/g/b.java
index 229ce7e6ca..836256b4ea 100644
--- a/app/src/main/java/e0/e0/g/b.java
+++ b/app/src/main/java/e0/e0/g/b.java
@@ -17,7 +17,7 @@ public final class b {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2962c;
+    public boolean f2960c;
     public final List<m> d;
 
     public b(List<m> list) {
@@ -47,7 +47,7 @@ public final class b {
         }
         if (mVar == null) {
             StringBuilder O = a.O("Unable to find acceptable protocols. isFallback=");
-            O.append(this.f2962c);
+            O.append(this.f2960c);
             O.append(',');
             O.append(" modes=");
             O.append(this.d);
@@ -76,7 +76,7 @@ public final class b {
             }
         }
         this.b = z2;
-        boolean z3 = this.f2962c;
+        boolean z3 = this.f2960c;
         c0.z.d.m.checkParameterIsNotNull(sSLSocket, "sslSocket");
         if (mVar.g != null) {
             String[] enabledCipherSuites = sSLSocket.getEnabledCipherSuites();
diff --git a/app/src/main/java/e0/e0/g/c.java b/app/src/main/java/e0/e0/g/c.java
index fa59fa5095..5443521b14 100644
--- a/app/src/main/java/e0/e0/g/c.java
+++ b/app/src/main/java/e0/e0/g/c.java
@@ -28,7 +28,7 @@ public final class c {
     public final j b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f2963c;
+    public final e f2961c;
     public final t d;
     public final d e;
     public final d f;
@@ -138,7 +138,7 @@ public final class c {
                 this.k = false;
                 c cVar = this.o;
                 t tVar = cVar.d;
-                e eVar = cVar.f2963c;
+                e eVar = cVar.f2961c;
                 Objects.requireNonNull(tVar);
                 m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             }
@@ -168,7 +168,7 @@ public final class c {
                         this.k = false;
                         c cVar = this.o;
                         t tVar = cVar.d;
-                        e eVar2 = cVar.f2963c;
+                        e eVar2 = cVar.f2961c;
                         Objects.requireNonNull(tVar);
                         m.checkParameterIsNotNull(eVar2, NotificationCompat.CATEGORY_CALL);
                     }
@@ -202,7 +202,7 @@ public final class c {
         m.checkParameterIsNotNull(tVar, "eventListener");
         m.checkParameterIsNotNull(dVar, "finder");
         m.checkParameterIsNotNull(dVar2, "codec");
-        this.f2963c = eVar;
+        this.f2961c = eVar;
         this.d = tVar;
         this.e = dVar;
         this.f = dVar2;
@@ -216,13 +216,13 @@ public final class c {
         if (z3) {
             if (e != null) {
                 t tVar = this.d;
-                e eVar = this.f2963c;
+                e eVar = this.f2961c;
                 Objects.requireNonNull(tVar);
                 m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(e, "ioe");
             } else {
                 t tVar2 = this.d;
-                e eVar2 = this.f2963c;
+                e eVar2 = this.f2961c;
                 Objects.requireNonNull(tVar2);
                 m.checkParameterIsNotNull(eVar2, NotificationCompat.CATEGORY_CALL);
             }
@@ -230,18 +230,18 @@ public final class c {
         if (z2) {
             if (e != null) {
                 t tVar3 = this.d;
-                e eVar3 = this.f2963c;
+                e eVar3 = this.f2961c;
                 Objects.requireNonNull(tVar3);
                 m.checkParameterIsNotNull(eVar3, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(e, "ioe");
             } else {
                 t tVar4 = this.d;
-                e eVar4 = this.f2963c;
+                e eVar4 = this.f2961c;
                 Objects.requireNonNull(tVar4);
                 m.checkParameterIsNotNull(eVar4, NotificationCompat.CATEGORY_CALL);
             }
         }
-        return (E) this.f2963c.k(this, z3, z2, e);
+        return (E) this.f2961c.k(this, z3, z2, e);
     }
 
     public final v b(Request request, boolean z2) throws IOException {
@@ -253,7 +253,7 @@ public final class c {
         }
         long contentLength = requestBody.contentLength();
         t tVar = this.d;
-        e eVar = this.f2963c;
+        e eVar = this.f2961c;
         Objects.requireNonNull(tVar);
         m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         return new a(this, this.f.h(request, contentLength), contentLength);
@@ -264,7 +264,7 @@ public final class c {
             this.f.f();
         } catch (IOException e) {
             t tVar = this.d;
-            e eVar = this.f2963c;
+            e eVar = this.f2961c;
             Objects.requireNonNull(tVar);
             m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(e, "ioe");
@@ -274,11 +274,11 @@ public final class c {
     }
 
     public final d.c d() throws SocketException {
-        this.f2963c.n();
+        this.f2961c.n();
         j e = this.f.e();
         Objects.requireNonNull(e);
         m.checkParameterIsNotNull(this, "exchange");
-        Socket socket = e.f2970c;
+        Socket socket = e.f2968c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -305,7 +305,7 @@ public final class c {
             return d;
         } catch (IOException e) {
             t tVar = this.d;
-            e eVar = this.f2963c;
+            e eVar = this.f2961c;
             Objects.requireNonNull(tVar);
             m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(e, "ioe");
@@ -316,7 +316,7 @@ public final class c {
 
     public final void f() {
         t tVar = this.d;
-        e eVar = this.f2963c;
+        e eVar = this.f2961c;
         Objects.requireNonNull(tVar);
         m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
     }
@@ -324,7 +324,7 @@ public final class c {
     public final void g(IOException iOException) {
         this.e.c(iOException);
         j e = this.f.e();
-        e eVar = this.f2963c;
+        e eVar = this.f2961c;
         synchronized (e) {
             m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             if (iOException instanceof StreamResetException) {
@@ -342,7 +342,7 @@ public final class c {
             } else if (!e.j() || (iOException instanceof ConnectionShutdownException)) {
                 e.i = true;
                 if (e.l == 0) {
-                    e.d(eVar.f2967x, e.q, iOException);
+                    e.d(eVar.f2965x, e.q, iOException);
                     e.k++;
                 }
             }
diff --git a/app/src/main/java/e0/e0/g/d.java b/app/src/main/java/e0/e0/g/d.java
index fbbd2565a0..b1dbecdb3e 100644
--- a/app/src/main/java/e0/e0/g/d.java
+++ b/app/src/main/java/e0/e0/g/d.java
@@ -30,7 +30,7 @@ public final class d {
     public m b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2964c;
+    public int f2962c;
     public int d;
     public int e;
     public c0 f;
@@ -112,7 +112,7 @@ public final class d {
                     c0.z.d.m.checkParameterIsNotNull(jVar, "connection");
                 }
             }
-            this.f2964c = 0;
+            this.f2962c = 0;
             this.d = 0;
             this.e = 0;
             if (this.g.a(this.h, this.i, null, false)) {
@@ -132,7 +132,7 @@ public final class d {
                         if (mVar2 == null) {
                             a aVar3 = this.h;
                             e eVar2 = this.i;
-                            mVar2 = new m(aVar3, eVar2.f2967x.N, eVar2, this.j);
+                            mVar2 = new m(aVar3, eVar2.f2965x.N, eVar2, this.j);
                             this.b = mVar2;
                         }
                         if (mVar2.a()) {
@@ -144,7 +144,7 @@ public final class d {
                                     mVar2.b = i6 + 1;
                                     Proxy proxy = (Proxy) list2.get(i6);
                                     ArrayList arrayList2 = new ArrayList();
-                                    mVar2.f2972c = arrayList2;
+                                    mVar2.f2970c = arrayList2;
                                     if (proxy.type() == Proxy.Type.DIRECT || proxy.type() == Proxy.Type.SOCKS) {
                                         w wVar = mVar2.e.a;
                                         str = wVar.g;
@@ -193,7 +193,7 @@ public final class d {
                                                 throw new UnknownHostException(mVar2.e.d + " returned no addresses for " + str);
                                             }
                                         }
-                                        for (InetSocketAddress inetSocketAddress2 : mVar2.f2972c) {
+                                        for (InetSocketAddress inetSocketAddress2 : mVar2.f2970c) {
                                             c0 c0Var2 = new c0(mVar2.e, proxy, inetSocketAddress2);
                                             l lVar2 = mVar2.f;
                                             synchronized (lVar2) {
@@ -238,10 +238,10 @@ public final class d {
                             } else {
                                 c0Var = aVar4.b();
                                 j jVar2 = new j(this.g, c0Var);
-                                this.i.f2966w = jVar2;
+                                this.i.f2964w = jVar2;
                                 jVar2.c(i, i2, i3, i4, z2, this.i, this.j);
-                                this.i.f2966w = null;
-                                lVar = this.i.f2967x.N;
+                                this.i.f2964w = null;
+                                lVar = this.i.f2965x.N;
                                 c0 c0Var3 = jVar2.q;
                                 synchronized (lVar) {
                                     c0.z.d.m.checkParameterIsNotNull(c0Var3, "route");
@@ -263,7 +263,7 @@ public final class d {
                                         c0.z.d.m.checkParameterIsNotNull(jVar2, "connection");
                                         byte[] bArr = c.a;
                                         kVar.d.add(jVar2);
-                                        e0.e0.f.c.d(kVar.b, kVar.f2971c, 0, 2);
+                                        e0.e0.f.c.d(kVar.b, kVar.f2969c, 0, 2);
                                         this.i.f(jVar2);
                                     }
                                     t tVar4 = this.j;
@@ -290,16 +290,16 @@ public final class d {
                 }
                 list = null;
                 j jVar2 = new j(this.g, c0Var);
-                this.i.f2966w = jVar2;
+                this.i.f2964w = jVar2;
                 try {
                     jVar2.c(i, i2, i3, i4, z2, this.i, this.j);
-                    this.i.f2966w = null;
-                    lVar = this.i.f2967x.N;
+                    this.i.f2964w = null;
+                    lVar = this.i.f2965x.N;
                     c0 c0Var3 = jVar2.q;
                     synchronized (lVar) {
                     }
                 } catch (Throwable th) {
-                    this.i.f2966w = null;
+                    this.i.f2964w = null;
                     throw th;
                 }
             }
@@ -320,7 +320,7 @@ public final class d {
         c0.z.d.m.checkParameterIsNotNull(iOException, "e");
         this.f = null;
         if ((iOException instanceof StreamResetException) && ((StreamResetException) iOException).errorCode == e0.e0.j.a.REFUSED_STREAM) {
-            this.f2964c++;
+            this.f2962c++;
         } else if (iOException instanceof ConnectionShutdownException) {
             this.d++;
         } else {
diff --git a/app/src/main/java/e0/e0/g/e.java b/app/src/main/java/e0/e0/g/e.java
index 1d865b8203..23ccef0141 100644
--- a/app/src/main/java/e0/e0/g/e.java
+++ b/app/src/main/java/e0/e0/g/e.java
@@ -37,23 +37,23 @@ public final class e implements e0.e {
     public c q;
 
     /* renamed from: r  reason: collision with root package name */
-    public boolean f2965r;
+    public boolean f2963r;
     public boolean s;
     public boolean t = true;
     public volatile boolean u;
     public volatile c v;
 
     /* renamed from: w  reason: collision with root package name */
-    public volatile j f2966w;
+    public volatile j f2964w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final x f2967x;
+    public final x f2965x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final Request f2968y;
+    public final Request f2966y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final boolean f2969z;
+    public final boolean f2967z;
 
     /* compiled from: RealCall.kt */
     public final class a implements Runnable {
@@ -68,7 +68,7 @@ public final class e implements e0.e {
         }
 
         public final String a() {
-            return this.k.f2968y.b.g;
+            return this.k.f2966y.b.g;
         }
 
         /* JADX WARNING: Removed duplicated region for block: B:18:0x0053 A[Catch:{ IOException -> 0x0076, all -> 0x004b, all -> 0x0074 }] */
@@ -80,7 +80,7 @@ public final class e implements e0.e {
             e eVar;
             Throwable th;
             StringBuilder O = c.d.b.a.a.O("OkHttp ");
-            O.append(this.k.f2968y.b.h());
+            O.append(this.k.f2966y.b.h());
             String sb = O.toString();
             Thread currentThread = Thread.currentThread();
             m.checkExpressionValueIsNotNull(currentThread, "currentThread");
@@ -99,7 +99,7 @@ public final class e implements e0.e {
                         if (!z2) {
                         }
                         eVar = this.k;
-                        eVar.f2967x.l.c(this);
+                        eVar.f2965x.l.c(this);
                     } catch (Throwable th2) {
                         th = th2;
                         z2 = true;
@@ -111,19 +111,19 @@ public final class e implements e0.e {
                 } catch (IOException e3) {
                     e = e3;
                     if (!z2) {
-                        h.a aVar = h.f2993c;
+                        h.a aVar = h.f2991c;
                         h hVar = h.a;
                         hVar.i("Callback failure for " + e.b(this.k), 4, e);
                     } else {
                         this.j.b(this.k, e);
                     }
                     eVar = this.k;
-                    eVar.f2967x.l.c(this);
+                    eVar.f2965x.l.c(this);
                 } catch (Throwable th3) {
-                    this.k.f2967x.l.c(this);
+                    this.k.f2965x.l.c(this);
                     throw th3;
                 }
-                eVar.f2967x.l.c(this);
+                eVar.f2965x.l.c(this);
             } finally {
                 currentThread.setName(name);
             }
@@ -159,9 +159,9 @@ public final class e implements e0.e {
     public e(x xVar, Request request, boolean z2) {
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(request, "originalRequest");
-        this.f2967x = xVar;
-        this.f2968y = request;
-        this.f2969z = z2;
+        this.f2965x = xVar;
+        this.f2966y = request;
+        this.f2967z = z2;
         this.i = xVar.m.a;
         this.j = xVar.p.a(this);
         c cVar = new c(this);
@@ -172,15 +172,15 @@ public final class e implements e0.e {
     public static final String b(e eVar) {
         StringBuilder sb = new StringBuilder();
         sb.append(eVar.u ? "canceled " : "");
-        sb.append(eVar.f2969z ? "web socket" : NotificationCompat.CATEGORY_CALL);
+        sb.append(eVar.f2967z ? "web socket" : NotificationCompat.CATEGORY_CALL);
         sb.append(" to ");
-        sb.append(eVar.f2968y.b.h());
+        sb.append(eVar.f2966y.b.h());
         return sb.toString();
     }
 
     @Override // e0.e
     public Request c() {
-        return this.f2968y;
+        return this.f2966y;
     }
 
     @Override // e0.e
@@ -192,7 +192,7 @@ public final class e implements e0.e {
             if (cVar != null) {
                 cVar.f.cancel();
             }
-            j jVar = this.f2966w;
+            j jVar = this.f2964w;
             if (!(jVar == null || (socket = jVar.b) == null)) {
                 e0.e0.c.e(socket);
             }
@@ -203,7 +203,7 @@ public final class e implements e0.e {
 
     @Override // java.lang.Object
     public Object clone() {
-        return new e(this.f2967x, this.f2968y, this.f2969z);
+        return new e(this.f2965x, this.f2966y, this.f2967z);
     }
 
     @Override // e0.e
@@ -217,15 +217,15 @@ public final class e implements e0.e {
         m.checkParameterIsNotNull(fVar, "responseCallback");
         if (this.l.compareAndSet(false, true)) {
             h();
-            q qVar = this.f2967x.l;
+            q qVar = this.f2965x.l;
             a aVar2 = new a(this, fVar);
             Objects.requireNonNull(qVar);
             m.checkParameterIsNotNull(aVar2, NotificationCompat.CATEGORY_CALL);
             synchronized (qVar) {
                 qVar.b.add(aVar2);
-                if (!aVar2.k.f2969z) {
+                if (!aVar2.k.f2967z) {
                     String a2 = aVar2.a();
-                    Iterator<a> it = qVar.f3016c.iterator();
+                    Iterator<a> it = qVar.f3014c.iterator();
                     while (true) {
                         if (!it.hasNext()) {
                             Iterator<a> it2 = qVar.b.iterator();
@@ -265,14 +265,14 @@ public final class e implements e0.e {
             this.k.i();
             h();
             try {
-                q qVar2 = this.f2967x.l;
+                q qVar2 = this.f2965x.l;
                 synchronized (qVar2) {
                     m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
                     qVar2.d.add(this);
                 }
                 return j();
             } finally {
-                qVar = this.f2967x.l;
+                qVar = this.f2965x.l;
                 Objects.requireNonNull(qVar);
                 m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
                 qVar.b(qVar.d, this);
@@ -341,7 +341,7 @@ public final class e implements e0.e {
     }
 
     public final void h() {
-        h.a aVar = h.f2993c;
+        h.a aVar = h.f2991c;
         this.m = h.a.g("response.body().close()");
         Objects.requireNonNull(this.j);
         m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
@@ -356,7 +356,7 @@ public final class e implements e0.e {
         }
         if (z2 && (cVar = this.v) != null) {
             cVar.f.cancel();
-            cVar.f2963c.k(cVar, true, true, null);
+            cVar.f2961c.k(cVar, true, true, null);
         }
         this.q = null;
     }
@@ -400,22 +400,22 @@ public final class e implements e0.e {
     /* JADX WARNING: Removed duplicated region for block: B:28:0x0095  */
     public final Response j() throws IOException {
         ArrayList arrayList = new ArrayList();
-        r.addAll(arrayList, this.f2967x.n);
-        arrayList.add(new i(this.f2967x));
-        arrayList.add(new e0.e0.h.a(this.f2967x.u));
-        Objects.requireNonNull(this.f2967x);
+        r.addAll(arrayList, this.f2965x.n);
+        arrayList.add(new i(this.f2965x));
+        arrayList.add(new e0.e0.h.a(this.f2965x.u));
+        Objects.requireNonNull(this.f2965x);
         arrayList.add(new e0.e0.e.a());
         arrayList.add(a.b);
-        if (!this.f2969z) {
-            r.addAll(arrayList, this.f2967x.o);
+        if (!this.f2967z) {
+            r.addAll(arrayList, this.f2965x.o);
         }
-        arrayList.add(new e0.e0.h.b(this.f2969z));
-        Request request = this.f2968y;
-        x xVar = this.f2967x;
+        arrayList.add(new e0.e0.h.b(this.f2967z));
+        Request request = this.f2966y;
+        x xVar = this.f2965x;
         g gVar = new g(this, arrayList, 0, null, request, xVar.I, xVar.J, xVar.K);
         boolean z2 = false;
         try {
-            Response a2 = gVar.a(this.f2968y);
+            Response a2 = gVar.a(this.f2966y);
             if (!this.u) {
                 l(null);
                 return a2;
@@ -443,15 +443,15 @@ public final class e implements e0.e {
             z4 = false;
             if (z2) {
                 try {
-                    if (!this.f2965r) {
+                    if (!this.f2963r) {
                     }
                     if (z2) {
-                        this.f2965r = false;
+                        this.f2963r = false;
                     }
                     if (z3) {
                         this.s = false;
                     }
-                    boolean z6 = this.f2965r;
+                    boolean z6 = this.f2963r;
                     boolean z7 = z6 && !this.s;
                     if (!z6 && !this.s && !this.t) {
                         z4 = true;
@@ -469,7 +469,7 @@ public final class e implements e0.e {
             }
             if (z3) {
             }
-            boolean z6 = this.f2965r;
+            boolean z6 = this.f2963r;
             if (z6) {
             }
             z4 = true;
@@ -494,7 +494,7 @@ public final class e implements e0.e {
             z2 = false;
             if (this.t) {
                 this.t = false;
-                if (!this.f2965r && !this.s) {
+                if (!this.f2963r && !this.s) {
                     z2 = true;
                 }
             }
@@ -539,7 +539,7 @@ public final class e implements e0.e {
                     }
                     z2 = true;
                 } else {
-                    e0.e0.f.c.d(kVar.b, kVar.f2971c, 0, 2);
+                    e0.e0.f.c.d(kVar.b, kVar.f2969c, 0, 2);
                 }
                 if (z2) {
                     return jVar.n();
diff --git a/app/src/main/java/e0/e0/g/j.java b/app/src/main/java/e0/e0/g/j.java
index 05f6f97484..47c02eee54 100644
--- a/app/src/main/java/e0/e0/g/j.java
+++ b/app/src/main/java/e0/e0/g/j.java
@@ -67,7 +67,7 @@ public final class j extends e.c implements k {
     public Socket b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Socket f2970c;
+    public Socket f2968c;
     public v d;
     public y e;
     public e f;
@@ -116,13 +116,13 @@ public final class j extends e.c implements k {
         m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(tVar, "eventListener");
         if (this.e == null) {
-            List<e0.m> list = this.q.a.f2955c;
+            List<e0.m> list = this.q.a.f2953c;
             b bVar = new b(list);
             e0.a aVar = this.q.a;
             if (aVar.f == null) {
                 if (list.contains(e0.m.d)) {
                     String str = this.q.a.a.g;
-                    h.a aVar2 = h.f2993c;
+                    h.a aVar2 = h.f2991c;
                     if (!h.a.h(str)) {
                         throw new RouteException(new UnknownServiceException(c.d.b.a.a.v("CLEARTEXT communication to ", str, " not permitted by network security policy")));
                     }
@@ -149,13 +149,13 @@ public final class j extends e.c implements k {
                             e(i, i2, eVar, tVar);
                         } catch (IOException e2) {
                             e = e2;
-                            socket = this.f2970c;
+                            socket = this.f2968c;
                             if (socket != null) {
                             }
                             socket2 = this.b;
                             if (socket2 != null) {
                             }
-                            this.f2970c = null;
+                            this.f2968c = null;
                             this.b = null;
                             this.g = null;
                             this.h = null;
@@ -164,7 +164,7 @@ public final class j extends e.c implements k {
                             this.f = null;
                             this.n = 1;
                             c0 c0Var = this.q;
-                            InetSocketAddress inetSocketAddress = c0Var.f2956c;
+                            InetSocketAddress inetSocketAddress = c0Var.f2954c;
                             Proxy proxy = c0Var.b;
                             Objects.requireNonNull(tVar);
                             m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
@@ -181,7 +181,7 @@ public final class j extends e.c implements k {
                     try {
                         g(bVar, i4, eVar, tVar);
                         c0 c0Var2 = this.q;
-                        InetSocketAddress inetSocketAddress2 = c0Var2.f2956c;
+                        InetSocketAddress inetSocketAddress2 = c0Var2.f2954c;
                         Proxy proxy2 = c0Var2.b;
                         Objects.requireNonNull(tVar);
                         m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
@@ -196,7 +196,7 @@ public final class j extends e.c implements k {
                     }
                 } catch (IOException e4) {
                     e = e4;
-                    socket = this.f2970c;
+                    socket = this.f2968c;
                     if (socket != null) {
                         c.e(socket);
                     }
@@ -204,7 +204,7 @@ public final class j extends e.c implements k {
                     if (socket2 != null) {
                         c.e(socket2);
                     }
-                    this.f2970c = null;
+                    this.f2968c = null;
                     this.b = null;
                     this.g = null;
                     this.h = null;
@@ -213,7 +213,7 @@ public final class j extends e.c implements k {
                     this.f = null;
                     this.n = 1;
                     c0 c0Var = this.q;
-                    InetSocketAddress inetSocketAddress = c0Var.f2956c;
+                    InetSocketAddress inetSocketAddress = c0Var.f2954c;
                     Proxy proxy = c0Var.b;
                     Objects.requireNonNull(tVar);
                     m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
@@ -229,7 +229,7 @@ public final class j extends e.c implements k {
                         break;
                     }
                     m.checkParameterIsNotNull(e, "e");
-                    bVar.f2962c = true;
+                    bVar.f2960c = true;
                     if (bVar.b && !(e instanceof ProtocolException) && !(e instanceof InterruptedIOException) && ((!(e instanceof SSLHandshakeException) || !(e.getCause() instanceof CertificateException)) && !(e instanceof SSLPeerUnverifiedException) && (e instanceof SSLException))) {
                         z3 = true;
                         continue;
@@ -278,15 +278,15 @@ public final class j extends e.c implements k {
             socket = new Socket(proxy);
         }
         this.b = socket;
-        InetSocketAddress inetSocketAddress = this.q.f2956c;
+        InetSocketAddress inetSocketAddress = this.q.f2954c;
         Objects.requireNonNull(tVar);
         m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(inetSocketAddress, "inetSocketAddress");
         m.checkParameterIsNotNull(proxy, "proxy");
         socket.setSoTimeout(i2);
         try {
-            h.a aVar2 = h.f2993c;
-            h.a.e(socket, this.q.f2956c, i);
+            h.a aVar2 = h.f2991c;
+            h.a.e(socket, this.q.f2954c, i);
             try {
                 f0.x R = c.q.a.k.a.R(socket);
                 m.checkParameterIsNotNull(R, "$this$buffer");
@@ -301,7 +301,7 @@ public final class j extends e.c implements k {
             }
         } catch (ConnectException e2) {
             StringBuilder O = c.d.b.a.a.O("Failed to connect to ");
-            O.append(this.q.f2956c);
+            O.append(this.q.f2954c);
             ConnectException connectException = new ConnectException(O.toString());
             connectException.initCause(e2);
             throw connectException;
@@ -321,9 +321,9 @@ public final class j extends e.c implements k {
         Response.a aVar2 = new Response.a();
         aVar2.g(a);
         aVar2.f(y.HTTP_1_1);
-        aVar2.f3131c = 407;
+        aVar2.f3129c = 407;
         aVar2.e("Preemptive Authenticate");
-        aVar2.g = c.f2958c;
+        aVar2.g = c.f2956c;
         aVar2.k = -1;
         aVar2.l = -1;
         m.checkParameterIsNotNull("Proxy-Authenticate", ModelAuditLogEntry.CHANGE_KEY_NAME);
@@ -411,7 +411,7 @@ public final class j extends e.c implements k {
                 this.h = null;
                 this.g = null;
                 c0 c0Var3 = this.q;
-                InetSocketAddress inetSocketAddress = c0Var3.f2956c;
+                InetSocketAddress inetSocketAddress = c0Var3.f2954c;
                 Proxy proxy = c0Var3.b;
                 Objects.requireNonNull(tVar);
                 m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
@@ -437,12 +437,12 @@ public final class j extends e.c implements k {
             List<y> list = aVar.b;
             y yVar2 = y.H2_PRIOR_KNOWLEDGE;
             if (list.contains(yVar2)) {
-                this.f2970c = this.b;
+                this.f2968c = this.b;
                 this.e = yVar2;
                 o(i);
                 return;
             }
-            this.f2970c = this.b;
+            this.f2968c = this.b;
             this.e = yVar;
             return;
         }
@@ -471,7 +471,7 @@ public final class j extends e.c implements k {
             try {
                 e0.m a = bVar.a(sSLSocket);
                 if (a.f) {
-                    h.a aVar3 = h.f2993c;
+                    h.a aVar3 = h.f2991c;
                     h.a.d(sSLSocket, aVar2.a.g, aVar2.b);
                 }
                 sSLSocket.startHandshake();
@@ -512,15 +512,15 @@ public final class j extends e.c implements k {
                 if (gVar == null) {
                     m.throwNpe();
                 }
-                this.d = new v(a2.b, a2.f3019c, a2.d, new g(gVar, a2, aVar2));
+                this.d = new v(a2.b, a2.f3017c, a2.d, new g(gVar, a2, aVar2));
                 gVar.a(aVar2.a.g, new h(this));
                 if (a.f) {
-                    h.a aVar4 = h.f2993c;
+                    h.a aVar4 = h.f2991c;
                     str = h.a.f(sSLSocket);
                 } else {
                     str = null;
                 }
-                this.f2970c = sSLSocket;
+                this.f2968c = sSLSocket;
                 f0.x R = c.q.a.k.a.R(sSLSocket);
                 m.checkParameterIsNotNull(R, "$this$buffer");
                 this.g = new r(R);
@@ -531,7 +531,7 @@ public final class j extends e.c implements k {
                     yVar = y.p.a(str);
                 }
                 this.e = yVar;
-                h.a aVar5 = h.f2993c;
+                h.a aVar5 = h.f2991c;
                 h.a.a(sSLSocket);
                 m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                 if (this.e == y.HTTP_2) {
@@ -540,7 +540,7 @@ public final class j extends e.c implements k {
             } catch (Throwable th3) {
                 th = th3;
                 if (sSLSocket != null) {
-                    h.a aVar6 = h.f2993c;
+                    h.a aVar6 = h.f2991c;
                     h.a.a(sSLSocket);
                 }
                 if (sSLSocket != null) {
@@ -584,7 +584,7 @@ public final class j extends e.c implements k {
                         break;
                     }
                     c0 c0Var = (c0) it.next();
-                    if (c0Var.b.type() == Proxy.Type.DIRECT && this.q.b.type() == Proxy.Type.DIRECT && m.areEqual(this.q.f2956c, c0Var.f2956c)) {
+                    if (c0Var.b.type() == Proxy.Type.DIRECT && this.q.b.type() == Proxy.Type.DIRECT && m.areEqual(this.q.f2954c, c0Var.f2954c)) {
                         z5 = true;
                         continue;
                     } else {
@@ -669,7 +669,7 @@ public final class j extends e.c implements k {
         if (socket == null) {
             m.throwNpe();
         }
-        Socket socket2 = this.f2970c;
+        Socket socket2 = this.f2968c;
         if (socket2 == null) {
             m.throwNpe();
         }
@@ -686,7 +686,7 @@ public final class j extends e.c implements k {
                 if (eVar.q) {
                     return false;
                 }
-                return eVar.f2986z >= eVar.f2985y || nanoTime < eVar.B;
+                return eVar.f2984z >= eVar.f2983y || nanoTime < eVar.B;
             }
         }
         synchronized (this) {
@@ -722,7 +722,7 @@ public final class j extends e.c implements k {
     public final e0.e0.h.d k(x xVar, e0.e0.h.g gVar) throws SocketException {
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(gVar, "chain");
-        Socket socket = this.f2970c;
+        Socket socket = this.f2968c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -758,7 +758,7 @@ public final class j extends e.c implements k {
     }
 
     public Socket n() {
-        Socket socket = this.f2970c;
+        Socket socket = this.f2968c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -767,7 +767,7 @@ public final class j extends e.c implements k {
 
     public final void o(int i) throws IOException {
         String str;
-        Socket socket = this.f2970c;
+        Socket socket = this.f2968c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -794,7 +794,7 @@ public final class j extends e.c implements k {
             str = c.d.b.a.a.u("MockWebServer ", str2);
         }
         bVar.b = str;
-        bVar.f2987c = gVar;
+        bVar.f2985c = gVar;
         bVar.d = bufferedSink;
         m.checkParameterIsNotNull(this, "listener");
         bVar.e = this;
@@ -856,10 +856,10 @@ public final class j extends e.c implements k {
         O.append(" proxy=");
         O.append(this.q.b);
         O.append(" hostAddress=");
-        O.append(this.q.f2956c);
+        O.append(this.q.f2954c);
         O.append(" cipherSuite=");
         v vVar = this.d;
-        if (vVar == null || (obj = vVar.f3019c) == null) {
+        if (vVar == null || (obj = vVar.f3017c) == null) {
             obj = "none";
         }
         O.append(obj);
diff --git a/app/src/main/java/e0/e0/g/k.java b/app/src/main/java/e0/e0/g/k.java
index aab8e8eb73..f2c10ae1f5 100644
--- a/app/src/main/java/e0/e0/g/k.java
+++ b/app/src/main/java/e0/e0/g/k.java
@@ -18,7 +18,7 @@ public final class k {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2971c = new a(this, c.d.b.a.a.G(new StringBuilder(), e0.e0.c.g, " ConnectionPool"));
+    public final a f2969c = new a(this, c.d.b.a.a.G(new StringBuilder(), e0.e0.c.g, " ConnectionPool"));
     public final ConcurrentLinkedQueue<j> d = new ConcurrentLinkedQueue<>();
     public final int e;
 
@@ -135,7 +135,7 @@ public final class k {
                 O.append(" was leaked. ");
                 O.append("Did you forget to close a response body?");
                 String sb = O.toString();
-                h.a aVar = h.f2993c;
+                h.a aVar = h.f2991c;
                 h.a.k(sb, ((e.b) reference).a);
                 list.remove(i);
                 jVar.i = true;
diff --git a/app/src/main/java/e0/e0/g/m.java b/app/src/main/java/e0/e0/g/m.java
index 5218f0dede..0c6623ab10 100644
--- a/app/src/main/java/e0/e0/g/m.java
+++ b/app/src/main/java/e0/e0/g/m.java
@@ -18,7 +18,7 @@ public final class m {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public List<? extends InetSocketAddress> f2972c = n.emptyList();
+    public List<? extends InetSocketAddress> f2970c = n.emptyList();
     public final List<c0> d = new ArrayList();
     public final e0.a e;
     public final l f;
diff --git a/app/src/main/java/e0/e0/h/b.java b/app/src/main/java/e0/e0/h/b.java
index b654fb24ae..414e4ba81c 100644
--- a/app/src/main/java/e0/e0/h/b.java
+++ b/app/src/main/java/e0/e0/h/b.java
@@ -50,18 +50,18 @@ public final class b implements Interceptor {
         m.checkParameterIsNotNull(request, "request");
         try {
             t tVar = cVar.d;
-            e eVar = cVar.f2963c;
+            e eVar = cVar.f2961c;
             Objects.requireNonNull(tVar);
             m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             cVar.f.b(request);
             t tVar2 = cVar.d;
-            e eVar2 = cVar.f2963c;
+            e eVar2 = cVar.f2961c;
             Objects.requireNonNull(tVar2);
             m.checkParameterIsNotNull(eVar2, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(request, "request");
             Response.a aVar2 = null;
-            if (!f.a(request.f3127c) || requestBody == null) {
-                cVar.f2963c.k(cVar, true, false, null);
+            if (!f.a(request.f3125c) || requestBody == null) {
+                cVar.f2961c.k(cVar, true, false, null);
                 z2 = true;
             } else {
                 if (c0.g0.t.equals("100-continue", request.b("Expect"), true)) {
@@ -74,7 +74,7 @@ public final class b implements Interceptor {
                     aVar = null;
                 }
                 if (aVar != null) {
-                    cVar.f2963c.k(cVar, true, false, null);
+                    cVar.f2961c.k(cVar, true, false, null);
                     if (!cVar.b.j()) {
                         cVar.f.e().l();
                     }
@@ -97,7 +97,7 @@ public final class b implements Interceptor {
                     cVar.f.a();
                 } catch (IOException e) {
                     t tVar3 = cVar.d;
-                    e eVar3 = cVar.f2963c;
+                    e eVar3 = cVar.f2961c;
                     Objects.requireNonNull(tVar3);
                     m.checkParameterIsNotNull(eVar3, NotificationCompat.CATEGORY_CALL);
                     m.checkParameterIsNotNull(e, "ioe");
@@ -138,7 +138,7 @@ public final class b implements Interceptor {
             }
             m.checkParameterIsNotNull(a, "response");
             t tVar4 = cVar.d;
-            e eVar4 = cVar.f2963c;
+            e eVar4 = cVar.f2961c;
             Objects.requireNonNull(tVar4);
             m.checkParameterIsNotNull(eVar4, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(a, "response");
@@ -152,7 +152,7 @@ public final class b implements Interceptor {
                 Headers.a e3 = a.n.e();
                 Response response2 = a.p;
                 Response response3 = a.q;
-                Response response4 = a.f3130r;
+                Response response4 = a.f3128r;
                 long j = a.s;
                 long j2 = a.t;
                 c cVar2 = a.u;
@@ -177,7 +177,7 @@ public final class b implements Interceptor {
                     }
                 } catch (IOException e4) {
                     t tVar5 = cVar.d;
-                    e eVar5 = cVar.f2963c;
+                    e eVar5 = cVar.f2961c;
                     Objects.requireNonNull(tVar5);
                     m.checkParameterIsNotNull(eVar5, NotificationCompat.CATEGORY_CALL);
                     m.checkParameterIsNotNull(e4, "ioe");
@@ -194,11 +194,11 @@ public final class b implements Interceptor {
                 Headers.a e5 = a.n.e();
                 Response response5 = a.p;
                 Response response6 = a.q;
-                Response response7 = a.f3130r;
+                Response response7 = a.f3128r;
                 long j3 = a.s;
                 long j4 = a.t;
                 c cVar3 = a.u;
-                ResponseBody responseBody = e0.e0.c.f2958c;
+                ResponseBody responseBody = e0.e0.c.f2956c;
                 if (!(i4 >= 0)) {
                     throw new IllegalStateException(a.l("code < 0: ", i4).toString());
                 } else if (request3 == null) {
@@ -233,7 +233,7 @@ public final class b implements Interceptor {
             return response;
         } catch (IOException e6) {
             t tVar6 = cVar.d;
-            e eVar6 = cVar.f2963c;
+            e eVar6 = cVar.f2961c;
             Objects.requireNonNull(tVar6);
             m.checkParameterIsNotNull(eVar6, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(e6, "ioe");
diff --git a/app/src/main/java/e0/e0/h/c.java b/app/src/main/java/e0/e0/h/c.java
index 82420bc6ee..daf69762ff 100644
--- a/app/src/main/java/e0/e0/h/c.java
+++ b/app/src/main/java/e0/e0/h/c.java
@@ -9,7 +9,7 @@ public final class c {
     public static final String[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final DateFormat[] f2973c;
+    public static final DateFormat[] f2971c;
 
     /* compiled from: dates.kt */
     public static final class a extends ThreadLocal<DateFormat> {
@@ -26,6 +26,6 @@ public final class c {
     static {
         String[] strArr = {"EEE, dd MMM yyyy HH:mm:ss zzz", "EEEE, dd-MMM-yy HH:mm:ss zzz", "EEE MMM d HH:mm:ss yyyy", "EEE, dd-MMM-yyyy HH:mm:ss z", "EEE, dd-MMM-yyyy HH-mm-ss z", "EEE, dd MMM yy HH:mm:ss z", "EEE dd-MMM-yyyy HH:mm:ss z", "EEE dd MMM yyyy HH:mm:ss z", "EEE dd-MMM-yyyy HH-mm-ss z", "EEE dd-MMM-yy HH:mm:ss z", "EEE dd MMM yy HH:mm:ss z", "EEE,dd-MMM-yy HH:mm:ss z", "EEE,dd-MMM-yyyy HH:mm:ss z", "EEE, dd-MM-yyyy HH:mm:ss z", "EEE MMM d yyyy HH:mm:ss z"};
         b = strArr;
-        f2973c = new DateFormat[strArr.length];
+        f2971c = new DateFormat[strArr.length];
     }
 }
diff --git a/app/src/main/java/e0/e0/h/e.java b/app/src/main/java/e0/e0/h/e.java
index 550053eae8..845de57f0d 100644
--- a/app/src/main/java/e0/e0/h/e.java
+++ b/app/src/main/java/e0/e0/h/e.java
@@ -39,7 +39,7 @@ public final class e {
 
     public static final boolean a(Response response) {
         m.checkParameterIsNotNull(response, "$this$promisesBody");
-        if (m.areEqual(response.i.f3127c, "HEAD")) {
+        if (m.areEqual(response.i.f3125c, "HEAD")) {
             return false;
         }
         int i = response.l;
@@ -161,7 +161,7 @@ public final class e {
         if (r5.b(r0, r8) == false) goto L_0x0225;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:110:0x0223, code lost:
-        if (okhttp3.internal.publicsuffix.PublicSuffixDatabase.f3132c.a(r8) == null) goto L_0x0225;
+        if (okhttp3.internal.publicsuffix.PublicSuffixDatabase.f3130c.a(r8) == null) goto L_0x0225;
      */
     /* JADX WARNING: Removed duplicated region for block: B:129:0x0277  */
     /* JADX WARNING: Removed duplicated region for block: B:150:0x0282 A[SYNTHETIC] */
diff --git a/app/src/main/java/e0/e0/h/g.java b/app/src/main/java/e0/e0/h/g.java
index 4e71a14417..471717a89d 100644
--- a/app/src/main/java/e0/e0/h/g.java
+++ b/app/src/main/java/e0/e0/h/g.java
@@ -17,7 +17,7 @@ public final class g implements Interceptor.Chain {
     public final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<Interceptor> f2974c;
+    public final List<Interceptor> f2972c;
     public final int d;
     public final c e;
     public final Request f;
@@ -32,7 +32,7 @@ public final class g implements Interceptor.Chain {
         m.checkParameterIsNotNull(list, "interceptors");
         m.checkParameterIsNotNull(request, "request");
         this.b = eVar;
-        this.f2974c = list;
+        this.f2972c = list;
         this.d = i;
         this.e = cVar;
         this.f = request;
@@ -49,37 +49,37 @@ public final class g implements Interceptor.Chain {
         int i8 = (i5 & 16) != 0 ? gVar.h : i3;
         int i9 = (i5 & 32) != 0 ? gVar.i : i4;
         m.checkParameterIsNotNull(request2, "request");
-        return new g(gVar.b, gVar.f2974c, i6, cVar2, request2, i7, i8, i9);
+        return new g(gVar.b, gVar.f2972c, i6, cVar2, request2, i7, i8, i9);
     }
 
     @Override // okhttp3.Interceptor.Chain
     public Response a(Request request) throws IOException {
         m.checkParameterIsNotNull(request, "request");
         boolean z2 = false;
-        if (this.d < this.f2974c.size()) {
+        if (this.d < this.f2972c.size()) {
             this.a++;
             c cVar = this.e;
             if (cVar != null) {
                 if (cVar.e.b(request.b)) {
                     if (!(this.a == 1)) {
                         StringBuilder O = a.O("network interceptor ");
-                        O.append(this.f2974c.get(this.d - 1));
+                        O.append(this.f2972c.get(this.d - 1));
                         O.append(" must call proceed() exactly once");
                         throw new IllegalStateException(O.toString().toString());
                     }
                 } else {
                     StringBuilder O2 = a.O("network interceptor ");
-                    O2.append(this.f2974c.get(this.d - 1));
+                    O2.append(this.f2972c.get(this.d - 1));
                     O2.append(" must retain the same host and port");
                     throw new IllegalStateException(O2.toString().toString());
                 }
             }
             g d = d(this, this.d + 1, null, request, 0, 0, 0, 58);
-            Interceptor interceptor = this.f2974c.get(this.d);
+            Interceptor interceptor = this.f2972c.get(this.d);
             Response intercept = interceptor.intercept(d);
             if (intercept != null) {
                 if (this.e != null) {
-                    if (!(this.d + 1 >= this.f2974c.size() || d.a == 1)) {
+                    if (!(this.d + 1 >= this.f2972c.size() || d.a == 1)) {
                         throw new IllegalStateException(("network interceptor " + interceptor + " must call proceed() exactly once").toString());
                     }
                 }
diff --git a/app/src/main/java/e0/e0/h/h.java b/app/src/main/java/e0/e0/h/h.java
index 9c313da8c9..69afed0f0d 100644
--- a/app/src/main/java/e0/e0/h/h.java
+++ b/app/src/main/java/e0/e0/h/h.java
@@ -28,7 +28,7 @@ public final class h extends ResponseBody {
         if (str == null) {
             return null;
         }
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
         return MediaType.a.b(str);
     }
 
diff --git a/app/src/main/java/e0/e0/h/i.java b/app/src/main/java/e0/e0/h/i.java
index 9b600fe0c2..f784c7d277 100644
--- a/app/src/main/java/e0/e0/h/i.java
+++ b/app/src/main/java/e0/e0/h/i.java
@@ -56,11 +56,11 @@ public final class i implements Interceptor {
         c0 c0Var = (cVar == null || (jVar = cVar.b) == null) ? null : jVar.q;
         int i = response.l;
         Request request = response.i;
-        String str = request.f3127c;
+        String str = request.f3125c;
         boolean z2 = false;
         if (!(i == 307 || i == 308)) {
             if (i == 401) {
-                return this.b.f3022r.a(c0Var, response);
+                return this.b.f3020r.a(c0Var, response);
             }
             if (i == 421) {
                 RequestBody requestBody2 = request.e;
@@ -73,7 +73,7 @@ public final class i implements Interceptor {
                 }
                 return response.i;
             } else if (i == 503) {
-                Response response2 = response.f3130r;
+                Response response2 = response.f3128r;
                 if ((response2 == null || response2.l != 503) && c(response, Integer.MAX_VALUE) == 0) {
                     return response.i;
                 }
@@ -83,7 +83,7 @@ public final class i implements Interceptor {
                     m.throwNpe();
                 }
                 if (c0Var.b.type() == Proxy.Type.HTTP) {
-                    return this.b.f3025y.a(c0Var, response);
+                    return this.b.f3023y.a(c0Var, response);
                 }
                 throw new ProtocolException("Received HTTP_PROXY_AUTH (407) code while not using proxy");
             } else if (i != 408) {
@@ -103,7 +103,7 @@ public final class i implements Interceptor {
                 if (requestBody3 != null && requestBody3.isOneShot()) {
                     return null;
                 }
-                Response response3 = response.f3130r;
+                Response response3 = response.f3128r;
                 if ((response3 == null || response3.l != 408) && c(response, 0) <= 0) {
                     return response.i;
                 }
@@ -173,7 +173,7 @@ public final class i implements Interceptor {
         if (dVar == null) {
             m.throwNpe();
         }
-        int i = dVar.f2964c;
+        int i = dVar.f2962c;
         if (i == 0 && dVar.d == 0 && dVar.e == 0) {
             z3 = false;
         } else {
@@ -262,7 +262,7 @@ public final class i implements Interceptor {
                     try {
                         if (!(eVar4.s ^ z3)) {
                             throw new IllegalStateException("cannot make a new request because the previous response is still open: please call response.close()".toString());
-                        } else if (!(eVar4.f2965r ^ z3)) {
+                        } else if (!(eVar4.f2963r ^ z3)) {
                             eVar = eVar4;
                             try {
                                 throw new IllegalStateException("Check failed.".toString());
@@ -280,8 +280,8 @@ public final class i implements Interceptor {
                 if (z4) {
                     k kVar = eVar4.i;
                     w wVar = request3.b;
-                    if (wVar.f3020c) {
-                        x xVar = eVar4.f2967x;
+                    if (wVar.f3018c) {
+                        x xVar = eVar4.f2965x;
                         SSLSocketFactory sSLSocketFactory2 = xVar.A;
                         if (sSLSocketFactory2 != null) {
                             HostnameVerifier hostnameVerifier2 = xVar.E;
@@ -298,11 +298,11 @@ public final class i implements Interceptor {
                     }
                     String str2 = wVar.g;
                     int i4 = wVar.h;
-                    x xVar2 = eVar4.f2967x;
+                    x xVar2 = eVar4.f2965x;
                     list = emptyList;
                     i = i3;
                     response = response5;
-                    eVar4.n = new d(kVar, new a(str2, i4, xVar2.v, xVar2.f3026z, sSLSocketFactory, hostnameVerifier, gVar2, xVar2.f3025y, xVar2.f3023w, xVar2.D, xVar2.C, xVar2.f3024x), eVar4, eVar4.j);
+                    eVar4.n = new d(kVar, new a(str2, i4, xVar2.v, xVar2.f3024z, sSLSocketFactory, hostnameVerifier, gVar2, xVar2.f3023y, xVar2.f3021w, xVar2.D, xVar2.C, xVar2.f3022x), eVar4, eVar4.j);
                 } else {
                     list = emptyList;
                     response = response5;
@@ -346,7 +346,7 @@ public final class i implements Interceptor {
                                     Headers.a e2 = response.n.e();
                                     Response response6 = response.p;
                                     Response response7 = response.q;
-                                    Response response8 = response.f3130r;
+                                    Response response8 = response.f3128r;
                                     long j3 = response.s;
                                     long j4 = response.t;
                                     c cVar2 = response.u;
diff --git a/app/src/main/java/e0/e0/h/j.java b/app/src/main/java/e0/e0/h/j.java
index d074d7ce09..5fd6e030b2 100644
--- a/app/src/main/java/e0/e0/h/j.java
+++ b/app/src/main/java/e0/e0/h/j.java
@@ -12,14 +12,14 @@ public final class j {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2975c;
+    public final String f2973c;
 
     public j(y yVar, int i, String str) {
         m.checkParameterIsNotNull(yVar, "protocol");
         m.checkParameterIsNotNull(str, "message");
         this.a = yVar;
         this.b = i;
-        this.f2975c = str;
+        this.f2973c = str;
     }
 
     public static final j a(String str) throws IOException {
@@ -77,7 +77,7 @@ public final class j {
         sb.append(' ');
         sb.append(this.b);
         sb.append(' ');
-        sb.append(this.f2975c);
+        sb.append(this.f2973c);
         String sb2 = sb.toString();
         m.checkExpressionValueIsNotNull(sb2, "StringBuilder().apply(builderAction).toString()");
         return sb2;
diff --git a/app/src/main/java/e0/e0/i/b.java b/app/src/main/java/e0/e0/i/b.java
index 7b415d25b2..56cd0dc1e4 100644
--- a/app/src/main/java/e0/e0/i/b.java
+++ b/app/src/main/java/e0/e0/i/b.java
@@ -29,7 +29,7 @@ public final class b implements e0.e0.h.d {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Headers f2976c;
+    public Headers f2974c;
     public final x d;
     public final j e;
     public final g f;
@@ -178,14 +178,14 @@ public final class b implements e0.e0.h.d {
                                     if (this.l == 0) {
                                         this.m = false;
                                         b bVar = this.o;
-                                        bVar.f2976c = bVar.b.a();
+                                        bVar.f2974c = bVar.b.a();
                                         x xVar = this.o.d;
                                         if (xVar == null) {
                                             m.throwNpe();
                                         }
                                         p pVar = xVar.u;
                                         w wVar = this.n;
-                                        Headers headers = this.o.f2976c;
+                                        Headers headers = this.o.f2974c;
                                         if (headers == null) {
                                             m.throwNpe();
                                         }
@@ -384,10 +384,10 @@ public final class b implements e0.e0.h.d {
         m.checkParameterIsNotNull(request, "request");
         m.checkParameterIsNotNull(type, "proxyType");
         StringBuilder sb = new StringBuilder();
-        sb.append(request.f3127c);
+        sb.append(request.f3125c);
         sb.append(' ');
         w wVar = request.b;
-        if (!wVar.f3020c && type == Proxy.Type.HTTP) {
+        if (!wVar.f3018c && type == Proxy.Type.HTTP) {
             sb.append(wVar);
         } else {
             m.checkParameterIsNotNull(wVar, "url");
@@ -461,8 +461,8 @@ public final class b implements e0.e0.h.d {
                 e0.e0.h.j a2 = e0.e0.h.j.a(this.b.b());
                 Response.a aVar = new Response.a();
                 aVar.f(a2.a);
-                aVar.f3131c = a2.b;
-                aVar.e(a2.f2975c);
+                aVar.f3129c = a2.b;
+                aVar.e(a2.f2973c);
                 aVar.d(this.b.a());
                 if (z2 && a2.b == 100) {
                     return null;
diff --git a/app/src/main/java/e0/e0/j/b.java b/app/src/main/java/e0/e0/j/b.java
index ea439e4957..ae4153467c 100644
--- a/app/src/main/java/e0/e0/j/b.java
+++ b/app/src/main/java/e0/e0/j/b.java
@@ -9,7 +9,7 @@ public final class b {
     public static final ByteString b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ByteString f2977c;
+    public static final ByteString f2975c;
     public static final ByteString d;
     public static final ByteString e;
     public static final ByteString f;
@@ -21,7 +21,7 @@ public final class b {
         ByteString.a aVar = ByteString.j;
         a = aVar.c(":");
         b = aVar.c(":status");
-        f2977c = aVar.c(":method");
+        f2975c = aVar.c(":method");
         d = aVar.c(":path");
         e = aVar.c(":scheme");
         f = aVar.c(":authority");
diff --git a/app/src/main/java/e0/e0/j/c.java b/app/src/main/java/e0/e0/j/c.java
index 9a70508fa2..ced01f8a93 100644
--- a/app/src/main/java/e0/e0/j/c.java
+++ b/app/src/main/java/e0/e0/j/c.java
@@ -26,7 +26,7 @@ public final class c {
     public static final Map<ByteString, Integer> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2978c = new c();
+    public static final c f2976c = new c();
 
     /* compiled from: Hpack.kt */
     public static final class a {
@@ -34,7 +34,7 @@ public final class c {
         public final g b;
 
         /* renamed from: c  reason: collision with root package name */
-        public b[] f2979c;
+        public b[] f2977c;
         public int d;
         public int e;
         public int f;
@@ -49,13 +49,13 @@ public final class c {
             this.a = new ArrayList();
             m.checkParameterIsNotNull(xVar, "$this$buffer");
             this.b = new r(xVar);
-            this.f2979c = new b[8];
+            this.f2977c = new b[8];
             this.d = 7;
         }
 
         public final void a() {
-            j.fill$default(this.f2979c, null, 0, 0, 6, null);
-            this.d = this.f2979c.length - 1;
+            j.fill$default(this.f2977c, null, 0, 0, 6, null);
+            this.d = this.f2977c.length - 1;
             this.e = 0;
             this.f = 0;
         }
@@ -68,14 +68,14 @@ public final class c {
             int i2;
             int i3 = 0;
             if (i > 0) {
-                int length = this.f2979c.length;
+                int length = this.f2977c.length;
                 while (true) {
                     length--;
                     i2 = this.d;
                     if (length < i2 || i <= 0) {
                         break;
                     }
-                    b bVar = this.f2979c[length];
+                    b bVar = this.f2977c[length];
                     if (bVar == null) {
                         m.throwNpe();
                     }
@@ -85,7 +85,7 @@ public final class c {
                     this.e--;
                     i3++;
                 }
-                b[] bVarArr = this.f2979c;
+                b[] bVarArr = this.f2977c;
                 System.arraycopy(bVarArr, i2 + 1, bVarArr, i2 + 1 + i3, this.e);
                 this.d += i3;
             }
@@ -97,17 +97,17 @@ public final class c {
         public final ByteString d(int i) throws IOException {
             boolean z2;
             if (i >= 0) {
-                c cVar = c.f2978c;
+                c cVar = c.f2976c;
                 if (i <= c.a.length - 1) {
                     z2 = true;
                     if (!z2) {
-                        c cVar2 = c.f2978c;
+                        c cVar2 = c.f2976c;
                         return c.a[i].h;
                     }
-                    c cVar3 = c.f2978c;
+                    c cVar3 = c.f2976c;
                     int b = b(i - c.a.length);
                     if (b >= 0) {
-                        b[] bVarArr = this.f2979c;
+                        b[] bVarArr = this.f2977c;
                         if (b < bVarArr.length) {
                             b bVar = bVarArr[b];
                             if (bVar == null) {
@@ -130,7 +130,7 @@ public final class c {
             this.a.add(bVar);
             int i2 = bVar.g;
             if (i != -1) {
-                b bVar2 = this.f2979c[this.d + 1 + i];
+                b bVar2 = this.f2977c[this.d + 1 + i];
                 if (bVar2 == null) {
                     m.throwNpe();
                 }
@@ -144,19 +144,19 @@ public final class c {
             int c2 = c((this.f + i2) - i3);
             if (i == -1) {
                 int i4 = this.e + 1;
-                b[] bVarArr = this.f2979c;
+                b[] bVarArr = this.f2977c;
                 if (i4 > bVarArr.length) {
                     b[] bVarArr2 = new b[(bVarArr.length * 2)];
                     System.arraycopy(bVarArr, 0, bVarArr2, bVarArr.length, bVarArr.length);
-                    this.d = this.f2979c.length - 1;
-                    this.f2979c = bVarArr2;
+                    this.d = this.f2977c.length - 1;
+                    this.f2977c = bVarArr2;
                 }
                 int i5 = this.d;
                 this.d = i5 - 1;
-                this.f2979c[i5] = bVar;
+                this.f2977c[i5] = bVar;
                 this.e++;
             } else {
-                this.f2979c[this.d + 1 + i + c2 + i] = bVar;
+                this.f2977c[this.d + 1 + i + c2 + i] = bVar;
             }
             this.f += i2;
         }
@@ -176,7 +176,7 @@ public final class c {
             g gVar = this.b;
             m.checkParameterIsNotNull(gVar, "source");
             m.checkParameterIsNotNull(eVar, "sink");
-            p.a aVar = p.f2990c;
+            p.a aVar = p.f2988c;
             int i3 = 0;
             for (long j = 0; j < g; j++) {
                 byte readByte2 = gVar.readByte();
@@ -196,8 +196,8 @@ public final class c {
                     }
                     if (aVar.a == null) {
                         eVar.T(aVar.b);
-                        i3 -= aVar.f2991c;
-                        aVar = p.f2990c;
+                        i3 -= aVar.f2989c;
+                        aVar = p.f2988c;
                     } else {
                         i3 = i4;
                     }
@@ -213,12 +213,12 @@ public final class c {
                 if (aVar2 == null) {
                     m.throwNpe();
                 }
-                if (aVar2.a != null || aVar2.f2991c > i3) {
+                if (aVar2.a != null || aVar2.f2989c > i3) {
                     break;
                 }
                 eVar.T(aVar2.b);
-                i3 -= aVar2.f2991c;
-                aVar = p.f2990c;
+                i3 -= aVar2.f2989c;
+                aVar = p.f2988c;
             }
             return eVar.x();
         }
@@ -248,7 +248,7 @@ public final class c {
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2980c;
+        public int f2978c;
         public b[] d;
         public int e;
         public int f;
@@ -265,7 +265,7 @@ public final class c {
             this.i = z2;
             this.j = eVar;
             this.a = Integer.MAX_VALUE;
-            this.f2980c = i;
+            this.f2978c = i;
             this.d = new b[8];
             this.e = 7;
         }
@@ -314,7 +314,7 @@ public final class c {
 
         public final void c(b bVar) {
             int i = bVar.g;
-            int i2 = this.f2980c;
+            int i2 = this.f2978c;
             if (i > i2) {
                 a();
                 return;
@@ -390,19 +390,19 @@ public final class c {
             m.checkParameterIsNotNull(list, "headerBlock");
             if (this.b) {
                 int i3 = this.a;
-                if (i3 < this.f2980c) {
+                if (i3 < this.f2978c) {
                     f(i3, 31, 32);
                 }
                 this.b = false;
                 this.a = Integer.MAX_VALUE;
-                f(this.f2980c, 31, 32);
+                f(this.f2978c, 31, 32);
             }
             int size = list.size();
             for (int i4 = 0; i4 < size; i4++) {
                 b bVar = list.get(i4);
                 ByteString p = bVar.h.p();
                 ByteString byteString = bVar.i;
-                c cVar = c.f2978c;
+                c cVar = c.f2976c;
                 Integer num = c.b.get(p);
                 if (num != null) {
                     i2 = num.intValue() + 1;
@@ -439,11 +439,11 @@ public final class c {
                             }
                             if (m.areEqual(bVar3.i, byteString)) {
                                 int i6 = i5 - this.e;
-                                c cVar2 = c.f2978c;
+                                c cVar2 = c.f2976c;
                                 i2 = c.a.length + i6;
                                 break;
                             } else if (i == -1) {
-                                c cVar3 = c.f2978c;
+                                c cVar3 = c.f2976c;
                                 i = (i5 - this.e) + c.a.length;
                             }
                         }
@@ -490,7 +490,7 @@ public final class c {
 
     static {
         b bVar = new b(b.f, "");
-        ByteString byteString = b.f2977c;
+        ByteString byteString = b.f2975c;
         ByteString byteString2 = b.d;
         ByteString byteString3 = b.e;
         ByteString byteString4 = b.b;
diff --git a/app/src/main/java/e0/e0/j/d.java b/app/src/main/java/e0/e0/j/d.java
index 34691a162e..d300631b44 100644
--- a/app/src/main/java/e0/e0/j/d.java
+++ b/app/src/main/java/e0/e0/j/d.java
@@ -11,7 +11,7 @@ public final class d {
     public static final String[] b = {"DATA", "HEADERS", "PRIORITY", "RST_STREAM", "SETTINGS", "PUSH_PROMISE", "PING", "GOAWAY", "WINDOW_UPDATE", "CONTINUATION"};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String[] f2981c = new String[64];
+    public static final String[] f2979c = new String[64];
     public static final String[] d;
     public static final d e = new d();
 
@@ -23,17 +23,17 @@ public final class d {
             strArr[i] = t.replace$default(c.j("%8s", binaryString), ' ', '0', false, 4, (Object) null);
         }
         d = strArr;
-        String[] strArr2 = f2981c;
+        String[] strArr2 = f2979c;
         strArr2[0] = "";
         strArr2[1] = "END_STREAM";
         int[] iArr = {1};
         strArr2[8] = "PADDED";
         for (int i2 = 0; i2 < 1; i2++) {
             int i3 = iArr[i2];
-            String[] strArr3 = f2981c;
+            String[] strArr3 = f2979c;
             strArr3[i3 | 8] = m.stringPlus(strArr3[i3], "|PADDED");
         }
-        String[] strArr4 = f2981c;
+        String[] strArr4 = f2979c;
         strArr4[4] = "END_HEADERS";
         strArr4[32] = "PRIORITY";
         strArr4[36] = "END_HEADERS|PRIORITY";
@@ -42,7 +42,7 @@ public final class d {
             int i5 = iArr2[i4];
             for (int i6 = 0; i6 < 1; i6++) {
                 int i7 = iArr[i6];
-                String[] strArr5 = f2981c;
+                String[] strArr5 = f2979c;
                 int i8 = i7 | i5;
                 strArr5[i8] = strArr5[i7] + "|" + strArr5[i5];
                 StringBuilder sb = new StringBuilder();
@@ -51,9 +51,9 @@ public final class d {
                 strArr5[i8 | 8] = a.G(sb, strArr5[i5], "|PADDED");
             }
         }
-        int length = f2981c.length;
+        int length = f2979c.length;
         for (int i9 = 0; i9 < length; i9++) {
-            String[] strArr6 = f2981c;
+            String[] strArr6 = f2979c;
             if (strArr6[i9] == null) {
                 strArr6[i9] = d[i9];
             }
@@ -76,7 +76,7 @@ public final class d {
                 if (i3 == 4 || i3 == 6) {
                     str = i4 == 1 ? "ACK" : d[i4];
                 } else if (!(i3 == 7 || i3 == 8)) {
-                    String[] strArr = f2981c;
+                    String[] strArr = f2979c;
                     if (i4 < strArr.length) {
                         str2 = strArr[i4];
                         if (str2 == null) {
diff --git a/app/src/main/java/e0/e0/j/e.java b/app/src/main/java/e0/e0/j/e.java
index 74ea3e5684..c861560c47 100644
--- a/app/src/main/java/e0/e0/j/e.java
+++ b/app/src/main/java/e0/e0/j/e.java
@@ -50,23 +50,23 @@ public final class e implements Closeable {
     public boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final e0.e0.f.d f2982r;
+    public final e0.e0.f.d f2980r;
     public final e0.e0.f.c s;
     public final e0.e0.f.c t;
     public final e0.e0.f.c u;
     public final r v;
 
     /* renamed from: w  reason: collision with root package name */
-    public long f2983w;
+    public long f2981w;
 
     /* renamed from: x  reason: collision with root package name */
-    public long f2984x;
+    public long f2982x;
 
     /* renamed from: y  reason: collision with root package name */
-    public long f2985y;
+    public long f2983y;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f2986z;
+    public long f2984z;
 
     /* compiled from: TaskQueue.kt */
     public static final class a extends e0.e0.f.a {
@@ -86,12 +86,12 @@ public final class e implements Closeable {
             boolean z2;
             synchronized (this.e) {
                 eVar = this.e;
-                long j = eVar.f2984x;
-                long j2 = eVar.f2983w;
+                long j = eVar.f2982x;
+                long j2 = eVar.f2981w;
                 if (j < j2) {
                     z2 = true;
                 } else {
-                    eVar.f2983w = j2 + 1;
+                    eVar.f2981w = j2 + 1;
                     z2 = false;
                 }
             }
@@ -111,7 +111,7 @@ public final class e implements Closeable {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public g f2987c;
+        public g f2985c;
         public BufferedSink d;
         public c e = c.a;
         public r f = r.a;
@@ -172,7 +172,7 @@ public final class e implements Closeable {
                     this.f.j.l.b(this.e);
                     return -1;
                 } catch (IOException e) {
-                    h.a aVar = h.f2993c;
+                    h.a aVar = h.f2991c;
                     h hVar = h.a;
                     StringBuilder O = c.d.b.a.a.O("Http2Connection.Listener failure for ");
                     O.append(this.f.j.n);
@@ -387,7 +387,7 @@ public final class e implements Closeable {
                                 eVar3.o = i;
                                 eVar3.m.put(Integer.valueOf(i), nVar);
                                 String str2 = this.j.n + '[' + i + "] onStream";
-                                this.j.f2982r.f().c(new a(str2, true, str2, true, nVar, this, b2, i, list, z2), 0);
+                                this.j.f2980r.f().c(new a(str2, true, str2, true, nVar, this, b2, i, list, z2), 0);
                                 return;
                             }
                             return;
@@ -513,9 +513,9 @@ public final class e implements Closeable {
             if (z2) {
                 synchronized (this.j) {
                     if (i == 1) {
-                        this.j.f2984x++;
+                        this.j.f2982x++;
                     } else if (i == 2) {
-                        this.j.f2986z++;
+                        this.j.f2984z++;
                     } else if (i == 3) {
                         e eVar = this.j;
                         eVar.A++;
@@ -720,7 +720,7 @@ public final class e implements Closeable {
         this.n = str;
         this.p = bVar.h ? 3 : 2;
         e0.e0.f.d dVar = bVar.i;
-        this.f2982r = dVar;
+        this.f2980r = dVar;
         e0.e0.f.c f2 = dVar.f();
         this.s = f2;
         this.t = dVar.f();
@@ -744,7 +744,7 @@ public final class e implements Closeable {
             c0.z.d.m.throwUninitializedPropertyAccessException("sink");
         }
         this.J = new o(bufferedSink, z2);
-        g gVar = bVar.f2987c;
+        g gVar = bVar.f2985c;
         if (gVar == null) {
             c0.z.d.m.throwUninitializedPropertyAccessException("source");
         }
diff --git a/app/src/main/java/e0/e0/j/l.java b/app/src/main/java/e0/e0/j/l.java
index ebc29f6f7e..3f11024132 100644
--- a/app/src/main/java/e0/e0/j/l.java
+++ b/app/src/main/java/e0/e0/j/l.java
@@ -32,7 +32,7 @@ public final class l implements d {
     public static final List<String> b = c.m("connection", "host", "keep-alive", "proxy-connection", "te", "transfer-encoding", "encoding", "upgrade");
 
     /* renamed from: c  reason: collision with root package name */
-    public volatile n f2988c;
+    public volatile n f2986c;
     public final y d;
     public volatile boolean e;
     public final j f;
@@ -54,7 +54,7 @@ public final class l implements d {
 
     @Override // e0.e0.h.d
     public void a() {
-        n nVar = this.f2988c;
+        n nVar = this.f2986c;
         if (nVar == null) {
             m.throwNpe();
         }
@@ -66,13 +66,13 @@ public final class l implements d {
         int i;
         n nVar;
         m.checkParameterIsNotNull(request, "request");
-        if (this.f2988c == null) {
+        if (this.f2986c == null) {
             boolean z2 = false;
             boolean z3 = request.e != null;
             m.checkParameterIsNotNull(request, "request");
             Headers headers = request.d;
             ArrayList arrayList = new ArrayList(headers.size() + 4);
-            arrayList.add(new b(b.f2977c, request.f3127c));
+            arrayList.add(new b(b.f2975c, request.f3125c));
             ByteString byteString = b.d;
             w wVar = request.b;
             m.checkParameterIsNotNull(wVar, "url");
@@ -115,7 +115,7 @@ public final class l implements d {
                         i = eVar.p;
                         eVar.p = i + 2;
                         nVar = new n(i, eVar, z4, false, null);
-                        if (!z3 || eVar.G >= eVar.H || nVar.f2989c >= nVar.d) {
+                        if (!z3 || eVar.G >= eVar.H || nVar.f2987c >= nVar.d) {
                             z2 = true;
                         }
                         if (nVar.i()) {
@@ -130,22 +130,22 @@ public final class l implements d {
             if (z2) {
                 eVar.J.flush();
             }
-            this.f2988c = nVar;
+            this.f2986c = nVar;
             if (this.e) {
-                n nVar2 = this.f2988c;
+                n nVar2 = this.f2986c;
                 if (nVar2 == null) {
                     m.throwNpe();
                 }
                 nVar2.e(a.CANCEL);
                 throw new IOException("Canceled");
             }
-            n nVar3 = this.f2988c;
+            n nVar3 = this.f2986c;
             if (nVar3 == null) {
                 m.throwNpe();
             }
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
             nVar3.i.g((long) this.g.h, timeUnit);
-            n nVar4 = this.f2988c;
+            n nVar4 = this.f2986c;
             if (nVar4 == null) {
                 m.throwNpe();
             }
@@ -156,7 +156,7 @@ public final class l implements d {
     @Override // e0.e0.h.d
     public f0.x c(Response response) {
         m.checkParameterIsNotNull(response, "response");
-        n nVar = this.f2988c;
+        n nVar = this.f2986c;
         if (nVar == null) {
             m.throwNpe();
         }
@@ -166,7 +166,7 @@ public final class l implements d {
     @Override // e0.e0.h.d
     public void cancel() {
         this.e = true;
-        n nVar = this.f2988c;
+        n nVar = this.f2986c;
         if (nVar != null) {
             nVar.e(a.CANCEL);
         }
@@ -176,7 +176,7 @@ public final class l implements d {
     @Override // e0.e0.h.d
     public Response.a d(boolean z2) {
         Headers headers;
-        n nVar = this.f2988c;
+        n nVar = this.f2986c;
         if (nVar == null) {
             m.throwNpe();
         }
@@ -228,12 +228,12 @@ public final class l implements d {
         if (jVar != null) {
             Response.a aVar2 = new Response.a();
             aVar2.f(yVar);
-            aVar2.f3131c = jVar.b;
-            aVar2.e(jVar.f2975c);
+            aVar2.f3129c = jVar.b;
+            aVar2.e(jVar.f2973c);
             Object[] array = arrayList.toArray(new String[0]);
             if (array != null) {
                 aVar2.d(new Headers((String[]) array, null));
-                if (!z2 || aVar2.f3131c != 100) {
+                if (!z2 || aVar2.f3129c != 100) {
                     return aVar2;
                 }
                 return null;
@@ -265,7 +265,7 @@ public final class l implements d {
     @Override // e0.e0.h.d
     public v h(Request request, long j) {
         m.checkParameterIsNotNull(request, "request");
-        n nVar = this.f2988c;
+        n nVar = this.f2986c;
         if (nVar == null) {
             m.throwNpe();
         }
diff --git a/app/src/main/java/e0/e0/j/m.java b/app/src/main/java/e0/e0/j/m.java
index 3751e1c7d0..a014770c6c 100644
--- a/app/src/main/java/e0/e0/j/m.java
+++ b/app/src/main/java/e0/e0/j/m.java
@@ -424,17 +424,17 @@ public final class m implements Closeable {
             } else if ((i6 & 128) == 128) {
                 int g = aVar2.g(i6, 127) - 1;
                 if (g >= 0) {
-                    c cVar = c.f2978c;
+                    c cVar = c.f2976c;
                     if (g <= c.a.length - 1) {
                         z2 = true;
                         if (!z2) {
-                            c cVar2 = c.f2978c;
+                            c cVar2 = c.f2976c;
                             aVar2.a.add(c.a[g]);
                         } else {
-                            c cVar3 = c.f2978c;
+                            c cVar3 = c.f2976c;
                             int b2 = aVar2.b(g - c.a.length);
                             if (b2 >= 0) {
-                                b[] bVarArr = aVar2.f2979c;
+                                b[] bVarArr = aVar2.f2977c;
                                 if (b2 < bVarArr.length) {
                                     List<b> list = aVar2.a;
                                     b bVar = bVarArr[b2];
@@ -454,7 +454,7 @@ public final class m implements Closeable {
                 if (!z2) {
                 }
             } else if (i6 == 64) {
-                c cVar4 = c.f2978c;
+                c cVar4 = c.f2976c;
                 ByteString f = aVar2.f();
                 cVar4.a(f);
                 aVar2.e(-1, new b(f, aVar2.f()));
@@ -477,7 +477,7 @@ public final class m implements Closeable {
                     }
                 }
             } else if (i6 == 16 || i6 == 0) {
-                c cVar5 = c.f2978c;
+                c cVar5 = c.f2976c;
                 ByteString f2 = aVar2.f();
                 cVar5.a(f2);
                 aVar2.a.add(new b(f2, aVar2.f()));
diff --git a/app/src/main/java/e0/e0/j/n.java b/app/src/main/java/e0/e0/j/n.java
index ccf9ee91e3..3b2b7cad66 100644
--- a/app/src/main/java/e0/e0/j/n.java
+++ b/app/src/main/java/e0/e0/j/n.java
@@ -20,7 +20,7 @@ public final class n {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f2989c;
+    public long f2987c;
     public long d;
     public final ArrayDeque<Headers> e;
     public boolean f;
@@ -57,7 +57,7 @@ public final class n {
                         n.this.j.m();
                         throw th;
                     }
-                    if (nVar.f2989c < nVar.d || this.k || this.j || nVar.f() != null) {
+                    if (nVar.f2987c < nVar.d || this.k || this.j || nVar.f() != null) {
                         break;
                     }
                     n.this.l();
@@ -65,9 +65,9 @@ public final class n {
                 n.this.j.m();
                 n.this.b();
                 n nVar2 = n.this;
-                min = Math.min(nVar2.d - nVar2.f2989c, this.i.j);
+                min = Math.min(nVar2.d - nVar2.f2987c, this.i.j);
                 n nVar3 = n.this;
-                nVar3.f2989c += min;
+                nVar3.f2987c += min;
                 z3 = z2 && min == this.i.j && nVar3.f() == null;
             }
             n.this.j.i();
@@ -277,10 +277,10 @@ public final class n {
             n.this.e(a.CANCEL);
             e eVar = n.this.n;
             synchronized (eVar) {
-                long j = eVar.f2986z;
-                long j2 = eVar.f2985y;
+                long j = eVar.f2984z;
+                long j2 = eVar.f2983y;
                 if (j >= j2) {
-                    eVar.f2985y = j2 + 1;
+                    eVar.f2983y = j2 + 1;
                     eVar.B = System.nanoTime() + ((long) 1000000000);
                     e0.e0.f.c cVar = eVar.s;
                     String G = c.d.b.a.a.G(new StringBuilder(), eVar.n, " ping");
diff --git a/app/src/main/java/e0/e0/j/o.java b/app/src/main/java/e0/e0/j/o.java
index d8d87caa84..13984d0562 100644
--- a/app/src/main/java/e0/e0/j/o.java
+++ b/app/src/main/java/e0/e0/j/o.java
@@ -48,13 +48,13 @@ public final class o implements Closeable {
                 }
                 bVar.h = i5;
                 int min = Math.min(i5, 16384);
-                int i6 = bVar.f2980c;
+                int i6 = bVar.f2978c;
                 if (i6 != min) {
                     if (min < i6) {
                         bVar.a = Math.min(bVar.a, min);
                     }
                     bVar.b = true;
-                    bVar.f2980c = min;
+                    bVar.f2978c = min;
                     int i7 = bVar.g;
                     if (min < i7) {
                         if (min == 0) {
diff --git a/app/src/main/java/e0/e0/j/p.java b/app/src/main/java/e0/e0/j/p.java
index 26f9ed3de2..ec21c134e9 100644
--- a/app/src/main/java/e0/e0/j/p.java
+++ b/app/src/main/java/e0/e0/j/p.java
@@ -9,7 +9,7 @@ public final class p {
     public static final byte[] b = {13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28, 6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10, 13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6, 15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5, 6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28, 20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23, 24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24, 22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23, 21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23, 26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25, 19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27, 20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23, 26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2990c = new a();
+    public static final a f2988c = new a();
     public static final p d;
 
     /* compiled from: Huffman.kt */
@@ -18,19 +18,19 @@ public final class p {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2991c;
+        public final int f2989c;
 
         public a() {
             this.a = new a[256];
             this.b = 0;
-            this.f2991c = 0;
+            this.f2989c = 0;
         }
 
         public a(int i, int i2) {
             this.a = null;
             this.b = i;
             int i3 = i2 & 7;
-            this.f2991c = i3 == 0 ? 8 : i3;
+            this.f2989c = i3 == 0 ? 8 : i3;
         }
     }
 
@@ -44,7 +44,7 @@ public final class p {
 
     public final void a(int i, int i2, int i3) {
         a aVar = new a(i, i3);
-        a aVar2 = f2990c;
+        a aVar2 = f2988c;
         while (i3 > 8) {
             i3 -= 8;
             int i4 = (i2 >>> i3) & 255;
diff --git a/app/src/main/java/e0/e0/k/a.java b/app/src/main/java/e0/e0/k/a.java
index 332fb35ea6..f70a49dd7c 100644
--- a/app/src/main/java/e0/e0/k/a.java
+++ b/app/src/main/java/e0/e0/k/a.java
@@ -21,7 +21,7 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.X509TrustManager;
 /* compiled from: Android10Platform.kt */
 public final class a extends h {
-    public static final boolean d = (h.f2993c.c() && Build.VERSION.SDK_INT >= 29);
+    public static final boolean d = (h.f2991c.c() && Build.VERSION.SDK_INT >= 29);
     public static final a e = null;
     public final List<k> f;
 
diff --git a/app/src/main/java/e0/e0/k/b.java b/app/src/main/java/e0/e0/k/b.java
index ed055bf156..880d6c4c22 100644
--- a/app/src/main/java/e0/e0/k/b.java
+++ b/app/src/main/java/e0/e0/k/b.java
@@ -106,7 +106,7 @@ public final class b extends h {
 
     static {
         boolean z2 = false;
-        if (h.f2993c.c() && Build.VERSION.SDK_INT < 30) {
+        if (h.f2991c.c() && Build.VERSION.SDK_INT < 30) {
             z2 = true;
         }
         d = z2;
@@ -291,7 +291,7 @@ public final class b extends h {
         boolean z2 = false;
         if (obj != null) {
             try {
-                Method method = hVar.f2996c;
+                Method method = hVar.f2994c;
                 if (method == null) {
                     m.throwNpe();
                 }
diff --git a/app/src/main/java/e0/e0/k/e.java b/app/src/main/java/e0/e0/k/e.java
index 131fb112a7..5671989f06 100644
--- a/app/src/main/java/e0/e0/k/e.java
+++ b/app/src/main/java/e0/e0/k/e.java
@@ -27,11 +27,11 @@ public final class e extends h {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<String> f2992c;
+        public final List<String> f2990c;
 
         public a(List<String> list) {
             m.checkParameterIsNotNull(list, "protocols");
-            this.f2992c = list;
+            this.f2990c = list;
         }
 
         @Override // java.lang.reflect.InvocationHandler
@@ -49,7 +49,7 @@ public final class e extends h {
             if (!m.areEqual(name, "unsupported") || !m.areEqual(Void.TYPE, returnType)) {
                 if (m.areEqual(name, "protocols")) {
                     if (objArr.length == 0) {
-                        return this.f2992c;
+                        return this.f2990c;
                     }
                 }
                 if ((m.areEqual(name, "selectProtocol") || m.areEqual(name, "select")) && m.areEqual(String.class, returnType) && objArr.length == 1 && (objArr[0] instanceof List)) {
@@ -63,7 +63,7 @@ public final class e extends h {
                                 Object obj3 = list.get(i);
                                 if (obj3 != null) {
                                     String str = (String) obj3;
-                                    if (!this.f2992c.contains(str)) {
+                                    if (!this.f2990c.contains(str)) {
                                         if (i == size) {
                                             break;
                                         }
@@ -77,7 +77,7 @@ public final class e extends h {
                                 }
                             }
                         }
-                        String str2 = this.f2992c.get(0);
+                        String str2 = this.f2990c.get(0);
                         this.b = str2;
                         return str2;
                     }
diff --git a/app/src/main/java/e0/e0/k/h.java b/app/src/main/java/e0/e0/k/h.java
index 0ae66ac5fd..1fefbf357c 100644
--- a/app/src/main/java/e0/e0/k/h.java
+++ b/app/src/main/java/e0/e0/k/h.java
@@ -44,7 +44,7 @@ public class h {
     public static final Logger b = Logger.getLogger(x.class.getName());
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2993c;
+    public static final a f2991c;
 
     /* compiled from: Platform.kt */
     public static final class a {
@@ -100,9 +100,9 @@ public class h {
         h hVar;
         h hVar2 = null;
         a aVar = new a(null);
-        f2993c = aVar;
+        f2991c = aVar;
         if (aVar.c()) {
-            c cVar = c.f2994c;
+            c cVar = c.f2992c;
             for (Map.Entry<String, String> entry : c.b.entrySet()) {
                 String value = entry.getValue();
                 Logger logger = Logger.getLogger(entry.getKey());
diff --git a/app/src/main/java/e0/e0/k/i/a.java b/app/src/main/java/e0/e0/k/i/a.java
index c36ed63894..0e13c0359a 100644
--- a/app/src/main/java/e0/e0/k/i/a.java
+++ b/app/src/main/java/e0/e0/k/i/a.java
@@ -22,7 +22,7 @@ public final class a implements k {
 
     @Override // e0.e0.k.i.k
     public boolean b() {
-        return h.f2993c.c() && Build.VERSION.SDK_INT >= 29;
+        return h.f2991c.c() && Build.VERSION.SDK_INT >= 29;
     }
 
     @Override // e0.e0.k.i.k
@@ -45,7 +45,7 @@ public final class a implements k {
             SSLSockets.setUseSessionTickets(sSLSocket, true);
             SSLParameters sSLParameters = sSLSocket.getSSLParameters();
             m.checkExpressionValueIsNotNull(sSLParameters, "sslParameters");
-            Object[] array = h.f2993c.a(list).toArray(new String[0]);
+            Object[] array = h.f2991c.a(list).toArray(new String[0]);
             if (array != null) {
                 sSLParameters.setApplicationProtocols((String[]) array);
                 sSLSocket.setSSLParameters(sSLParameters);
diff --git a/app/src/main/java/e0/e0/k/i/c.java b/app/src/main/java/e0/e0/k/i/c.java
index 2b1c2986b1..3133d502c4 100644
--- a/app/src/main/java/e0/e0/k/i/c.java
+++ b/app/src/main/java/e0/e0/k/i/c.java
@@ -14,7 +14,7 @@ public final class c {
     public static final Map<String, String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2994c = null;
+    public static final c f2992c = null;
 
     static {
         LinkedHashMap linkedHashMap = new LinkedHashMap();
diff --git a/app/src/main/java/e0/e0/k/i/d.java b/app/src/main/java/e0/e0/k/i/d.java
index f3110e1e7a..20c644f1de 100644
--- a/app/src/main/java/e0/e0/k/i/d.java
+++ b/app/src/main/java/e0/e0/k/i/d.java
@@ -25,7 +25,7 @@ public final class d extends Handler {
     public void publish(LogRecord logRecord) {
         int min;
         m.checkParameterIsNotNull(logRecord, "record");
-        c cVar = c.f2994c;
+        c cVar = c.f2992c;
         String loggerName = logRecord.getLoggerName();
         m.checkExpressionValueIsNotNull(loggerName, "record.loggerName");
         int i = logRecord.getLevel().intValue() > Level.INFO.intValue() ? 5 : logRecord.getLevel().intValue() == Level.INFO.intValue() ? 4 : 3;
diff --git a/app/src/main/java/e0/e0/k/i/f.java b/app/src/main/java/e0/e0/k/i/f.java
index 3159e29a69..41cd90add4 100644
--- a/app/src/main/java/e0/e0/k/i/f.java
+++ b/app/src/main/java/e0/e0/k/i/f.java
@@ -19,7 +19,7 @@ public class f implements k {
     public static final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Method f2995c;
+    public final Method f2993c;
     public final Method d;
     public final Method e;
     public final Method f;
@@ -43,7 +43,7 @@ public class f implements k {
         this.g = cls;
         Method declaredMethod = cls.getDeclaredMethod("setUseSessionTickets", Boolean.TYPE);
         m.checkExpressionValueIsNotNull(declaredMethod, "sslSocketClass.getDeclar…:class.javaPrimitiveType)");
-        this.f2995c = declaredMethod;
+        this.f2993c = declaredMethod;
         this.d = cls.getMethod("setHostname", String.class);
         this.e = cls.getMethod("getAlpnSelectedProtocol", new Class[0]);
         this.f = cls.getMethod("setAlpnProtocols", byte[].class);
@@ -93,11 +93,11 @@ public class f implements k {
         m.checkParameterIsNotNull(list, "protocols");
         if (a(sSLSocket)) {
             try {
-                this.f2995c.invoke(sSLSocket, Boolean.TRUE);
+                this.f2993c.invoke(sSLSocket, Boolean.TRUE);
                 if (str != null) {
                     this.d.invoke(sSLSocket, str);
                 }
-                this.f.invoke(sSLSocket, h.f2993c.b(list));
+                this.f.invoke(sSLSocket, h.f2991c.b(list));
             } catch (IllegalAccessException e) {
                 throw new AssertionError(e);
             } catch (InvocationTargetException e2) {
diff --git a/app/src/main/java/e0/e0/k/i/g.java b/app/src/main/java/e0/e0/k/i/g.java
index 4d8209c1fe..9c96aa7284 100644
--- a/app/src/main/java/e0/e0/k/i/g.java
+++ b/app/src/main/java/e0/e0/k/i/g.java
@@ -60,7 +60,7 @@ public final class g implements k {
             BCSSLSocket bCSSLSocket = (BCSSLSocket) sSLSocket;
             BCSSLParameters parameters = bCSSLSocket.getParameters();
             m.checkExpressionValueIsNotNull(parameters, "sslParameters");
-            Object[] array = h.f2993c.a(list).toArray(new String[0]);
+            Object[] array = h.f2991c.a(list).toArray(new String[0]);
             if (array != null) {
                 parameters.setApplicationProtocols((String[]) array);
                 bCSSLSocket.setParameters(parameters);
diff --git a/app/src/main/java/e0/e0/k/i/h.java b/app/src/main/java/e0/e0/k/i/h.java
index 0902c3e13c..48013c98d6 100644
--- a/app/src/main/java/e0/e0/k/i/h.java
+++ b/app/src/main/java/e0/e0/k/i/h.java
@@ -7,11 +7,11 @@ public final class h {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Method f2996c;
+    public final Method f2994c;
 
     public h(Method method, Method method2, Method method3) {
         this.a = method;
         this.b = method2;
-        this.f2996c = method3;
+        this.f2994c = method3;
     }
 }
diff --git a/app/src/main/java/e0/e0/k/i/i.java b/app/src/main/java/e0/e0/k/i/i.java
index 761a396582..21f33fffec 100644
--- a/app/src/main/java/e0/e0/k/i/i.java
+++ b/app/src/main/java/e0/e0/k/i/i.java
@@ -56,7 +56,7 @@ public final class i implements k {
         m.checkParameterIsNotNull(list, "protocols");
         if (a(sSLSocket)) {
             Conscrypt.setUseSessionTickets(sSLSocket, true);
-            Object[] array = h.f2993c.a(list).toArray(new String[0]);
+            Object[] array = h.f2991c.a(list).toArray(new String[0]);
             if (array != null) {
                 Conscrypt.setApplicationProtocols(sSLSocket, (String[]) array);
                 return;
diff --git a/app/src/main/java/e0/e0/n/d.java b/app/src/main/java/e0/e0/n/d.java
index 9f5a2d811f..41740daf9d 100644
--- a/app/src/main/java/e0/e0/n/d.java
+++ b/app/src/main/java/e0/e0/n/d.java
@@ -37,7 +37,7 @@ public final class d implements WebSocket, h.a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public e0.e f2997c;
+    public e0.e f2995c;
     public e0.e0.f.a d;
     public h e;
     public i f;
@@ -54,23 +54,23 @@ public final class d implements WebSocket, h.a {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f2998r;
+    public int f2996r;
     public int s;
     public boolean t;
     public final Request u;
     public final WebSocketListener v;
 
     /* renamed from: w  reason: collision with root package name */
-    public final Random f2999w;
+    public final Random f2997w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final long f3000x;
+    public final long f2998x;
 
     /* renamed from: y  reason: collision with root package name */
-    public f f3001y = null;
+    public f f2999y = null;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f3002z;
+    public long f3000z;
 
     /* compiled from: RealWebSocket.kt */
     public static final class a {
@@ -78,12 +78,12 @@ public final class d implements WebSocket, h.a {
         public final ByteString b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f3003c;
+        public final long f3001c;
 
         public a(int i, ByteString byteString, long j) {
             this.a = i;
             this.b = byteString;
-            this.f3003c = j;
+            this.f3001c = j;
         }
     }
 
@@ -156,7 +156,7 @@ public final class d implements WebSocket, h.a {
                         dVar.t = true;
                         if (i != -1) {
                             StringBuilder O = c.d.b.a.a.O("sent ping but didn't receive pong within ");
-                            O.append(dVar.f3000x);
+                            O.append(dVar.f2998x);
                             O.append("ms (after ");
                             O.append(i - 1);
                             O.append(" successful ping/pongs)");
@@ -189,7 +189,7 @@ public final class d implements WebSocket, h.a {
 
         @Override // e0.e0.f.a
         public long a() {
-            e0.e eVar = this.e.f2997c;
+            e0.e eVar = this.e.f2995c;
             if (eVar == null) {
                 c0.z.d.m.throwNpe();
             }
@@ -205,14 +205,14 @@ public final class d implements WebSocket, h.a {
         c0.z.d.m.checkParameterIsNotNull(random, "random");
         this.u = request;
         this.v = webSocketListener;
-        this.f2999w = random;
-        this.f3000x = j;
-        this.f3002z = j2;
+        this.f2997w = random;
+        this.f2998x = j;
+        this.f3000z = j2;
         this.g = dVar.f();
         this.j = new ArrayDeque<>();
         this.k = new ArrayDeque<>();
         this.n = -1;
-        if (c0.z.d.m.areEqual(ShareTarget.METHOD_GET, request.f3127c)) {
+        if (c0.z.d.m.areEqual(ShareTarget.METHOD_GET, request.f3125c)) {
             ByteString.a aVar = ByteString.j;
             byte[] bArr = new byte[16];
             random.nextBytes(bArr);
@@ -220,7 +220,7 @@ public final class d implements WebSocket, h.a {
             return;
         }
         StringBuilder O = c.d.b.a.a.O("Request must be GET: ");
-        O.append(request.f3127c);
+        O.append(request.f3125c);
         throw new IllegalArgumentException(O.toString().toString());
     }
 
@@ -264,7 +264,7 @@ public final class d implements WebSocket, h.a {
             if (!this.m || !this.k.isEmpty()) {
                 this.j.add(byteString);
                 l();
-                this.f2998r++;
+                this.f2996r++;
             }
         }
     }
@@ -528,7 +528,7 @@ public final class d implements WebSocket, h.a {
     public final void j(String str, c cVar) throws IOException {
         c0.z.d.m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         c0.z.d.m.checkParameterIsNotNull(cVar, "streams");
-        f fVar = this.f3001y;
+        f fVar = this.f2999y;
         if (fVar == null) {
             c0.z.d.m.throwNpe();
         }
@@ -536,9 +536,9 @@ public final class d implements WebSocket, h.a {
             this.h = str;
             this.i = cVar;
             boolean z2 = cVar.i;
-            this.f = new i(z2, cVar.k, this.f2999w, fVar.a, z2 ? fVar.f3004c : fVar.e, this.f3002z);
+            this.f = new i(z2, cVar.k, this.f2997w, fVar.a, z2 ? fVar.f3002c : fVar.e, this.f3000z);
             this.d = new C0313d();
-            long j = this.f3000x;
+            long j = this.f2998x;
             if (j != 0) {
                 long nanos = TimeUnit.MILLISECONDS.toNanos(j);
                 String str2 = str + " ping";
@@ -549,7 +549,7 @@ public final class d implements WebSocket, h.a {
             }
         }
         boolean z3 = cVar.i;
-        this.e = new h(z3, cVar.j, this, fVar.a, z3 ^ true ? fVar.f3004c : fVar.e);
+        this.e = new h(z3, cVar.j, this, fVar.a, z3 ^ true ? fVar.f3002c : fVar.e);
     }
 
     public final void k() throws IOException {
@@ -577,7 +577,7 @@ public final class d implements WebSocket, h.a {
                                 eVar.w(aVar);
                                 hVar.s.b(hVar.p.j - hVar.k);
                                 e.a aVar2 = hVar.s;
-                                byte[] bArr = hVar.f3005r;
+                                byte[] bArr = hVar.f3003r;
                                 if (bArr == null) {
                                     c0.z.d.m.throwNpe();
                                 }
@@ -589,7 +589,7 @@ public final class d implements WebSocket, h.a {
                             if (hVar.n) {
                                 c cVar = hVar.q;
                                 if (cVar == null) {
-                                    cVar = new c(hVar.f3007x);
+                                    cVar = new c(hVar.f3005x);
                                     hVar.q = cVar;
                                 }
                                 f0.e eVar2 = hVar.p;
@@ -706,7 +706,7 @@ public final class d implements WebSocket, h.a {
                     } else {
                         a aVar = ref$ObjectRef8.element;
                         if (aVar != null) {
-                            long j = aVar.f3003c;
+                            long j = aVar.f3001c;
                             String str = this.h + " cancel";
                             byteString = poll;
                             iVar = iVar4;
diff --git a/app/src/main/java/e0/e0/n/e.java b/app/src/main/java/e0/e0/n/e.java
index 07ed2503e2..ef57012f85 100644
--- a/app/src/main/java/e0/e0/n/e.java
+++ b/app/src/main/java/e0/e0/n/e.java
@@ -112,7 +112,7 @@ public final class e implements f {
                 i2++;
                 i = 0;
             }
-            this.a.f3001y = new f(z2, num, z3, num2, z4, z5);
+            this.a.f2999y = new f(z2, num, z3, num2, z4, z5);
             if (!(!z5 && num == null && (num2 == null || (8 <= (intValue = num2.intValue()) && 15 >= intValue)))) {
                 synchronized (this.a) {
                     this.a.k.clear();
diff --git a/app/src/main/java/e0/e0/n/f.java b/app/src/main/java/e0/e0/n/f.java
index dcac340e15..f2d57807eb 100644
--- a/app/src/main/java/e0/e0/n/f.java
+++ b/app/src/main/java/e0/e0/n/f.java
@@ -8,7 +8,7 @@ public final class f {
     public final Integer b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f3004c;
+    public final boolean f3002c;
     public final Integer d;
     public final boolean e;
     public final boolean f;
@@ -16,7 +16,7 @@ public final class f {
     public f() {
         this.a = false;
         this.b = null;
-        this.f3004c = false;
+        this.f3002c = false;
         this.d = null;
         this.e = false;
         this.f = false;
@@ -25,7 +25,7 @@ public final class f {
     public f(boolean z2, Integer num, boolean z3, Integer num2, boolean z4, boolean z5) {
         this.a = z2;
         this.b = num;
-        this.f3004c = z3;
+        this.f3002c = z3;
         this.d = num2;
         this.e = z4;
         this.f = z5;
@@ -39,7 +39,7 @@ public final class f {
             return false;
         }
         f fVar = (f) obj;
-        return this.a == fVar.a && m.areEqual(this.b, fVar.b) && this.f3004c == fVar.f3004c && m.areEqual(this.d, fVar.d) && this.e == fVar.e && this.f == fVar.f;
+        return this.a == fVar.a && m.areEqual(this.b, fVar.b) && this.f3002c == fVar.f3002c && m.areEqual(this.d, fVar.d) && this.e == fVar.e && this.f == fVar.f;
     }
 
     public int hashCode() {
@@ -55,7 +55,7 @@ public final class f {
         Integer num = this.b;
         int i6 = 0;
         int hashCode = (i5 + (num != null ? num.hashCode() : 0)) * 31;
-        boolean z3 = this.f3004c;
+        boolean z3 = this.f3002c;
         if (z3) {
             z3 = true;
         }
@@ -89,7 +89,7 @@ public final class f {
         O.append(", clientMaxWindowBits=");
         O.append(this.b);
         O.append(", clientNoContextTakeover=");
-        O.append(this.f3004c);
+        O.append(this.f3002c);
         O.append(", serverMaxWindowBits=");
         O.append(this.d);
         O.append(", serverNoContextTakeover=");
diff --git a/app/src/main/java/e0/e0/n/h.java b/app/src/main/java/e0/e0/n/h.java
index 379c660911..c38ae4e668 100644
--- a/app/src/main/java/e0/e0/n/h.java
+++ b/app/src/main/java/e0/e0/n/h.java
@@ -22,17 +22,17 @@ public final class h implements Closeable {
     public c q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final byte[] f3005r;
+    public final byte[] f3003r;
     public final e.a s;
     public final boolean t;
     public final g u;
     public final a v;
 
     /* renamed from: w  reason: collision with root package name */
-    public final boolean f3006w;
+    public final boolean f3004w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final boolean f3007x;
+    public final boolean f3005x;
 
     /* compiled from: WebSocketReader.kt */
     public interface a {
@@ -53,10 +53,10 @@ public final class h implements Closeable {
         this.t = z2;
         this.u = gVar;
         this.v = aVar;
-        this.f3006w = z3;
-        this.f3007x = z4;
+        this.f3004w = z3;
+        this.f3005x = z4;
         e.a aVar2 = null;
-        this.f3005r = z2 ? null : new byte[4];
+        this.f3003r = z2 ? null : new byte[4];
         this.s = !z2 ? new e.a() : aVar2;
     }
 
@@ -74,7 +74,7 @@ public final class h implements Closeable {
                 eVar.w(aVar);
                 this.s.b(0);
                 e.a aVar2 = this.s;
-                byte[] bArr = this.f3005r;
+                byte[] bArr = this.f3003r;
                 if (bArr == null) {
                     m.throwNpe();
                 }
@@ -138,7 +138,7 @@ public final class h implements Closeable {
                     if (i2 == 1 || i2 == 2) {
                         if (!z5) {
                             this.n = false;
-                        } else if (this.f3006w) {
+                        } else if (this.f3004w) {
                             this.n = true;
                         } else {
                             throw new ProtocolException("Unexpected rsv1 flag");
@@ -175,7 +175,7 @@ public final class h implements Closeable {
                                 throw new ProtocolException("Control frame must be less than 125B.");
                             } else if (z2) {
                                 g gVar = this.u;
-                                byte[] bArr2 = this.f3005r;
+                                byte[] bArr2 = this.f3003r;
                                 if (bArr2 == null) {
                                     m.throwNpe();
                                 }
diff --git a/app/src/main/java/e0/e0/n/i.java b/app/src/main/java/e0/e0/n/i.java
index ebc937aba3..51d25bb59a 100644
--- a/app/src/main/java/e0/e0/n/i.java
+++ b/app/src/main/java/e0/e0/n/i.java
@@ -23,7 +23,7 @@ public final class i implements Closeable {
     public final Random q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final boolean f3008r;
+    public final boolean f3006r;
     public final boolean s;
     public final long t;
 
@@ -33,7 +33,7 @@ public final class i implements Closeable {
         this.o = z2;
         this.p = bufferedSink;
         this.q = random;
-        this.f3008r = z3;
+        this.f3006r = z3;
         this.s = z4;
         this.t = j;
         this.j = bufferedSink.g();
@@ -125,7 +125,7 @@ public final class i implements Closeable {
         if (!this.k) {
             this.i.Q(byteString);
             int i2 = i | 128;
-            if (this.f3008r && ((long) byteString.j()) >= this.t) {
+            if (this.f3006r && ((long) byteString.j()) >= this.t) {
                 a aVar = this.l;
                 if (aVar == null) {
                     aVar = new a(this.s);
@@ -194,7 +194,7 @@ public final class i implements Closeable {
                 e eVar5 = this.j;
                 s N = eVar5.N(8);
                 byte[] bArr = N.a;
-                int i5 = N.f3033c;
+                int i5 = N.f3031c;
                 int i6 = i5 + 1;
                 bArr[i5] = (byte) ((int) ((j4 >>> 56) & 255));
                 int i7 = i6 + 1;
@@ -210,7 +210,7 @@ public final class i implements Closeable {
                 int i12 = i11 + 1;
                 bArr[i11] = (byte) ((int) ((j4 >>> 8) & 255));
                 bArr[i12] = (byte) ((int) (j4 & 255));
-                N.f3033c = i12 + 1;
+                N.f3031c = i12 + 1;
                 eVar5.j += 8;
             }
             if (this.o) {
diff --git a/app/src/main/java/e0/f0/a.java b/app/src/main/java/e0/f0/a.java
index bfab29ad46..e943eeb333 100644
--- a/app/src/main/java/e0/f0/a.java
+++ b/app/src/main/java/e0/f0/a.java
@@ -27,7 +27,7 @@ public final class a implements Interceptor {
     public volatile Set<String> b = n0.emptySet();
 
     /* renamed from: c  reason: collision with root package name */
-    public volatile EnumC0314a f3009c = EnumC0314a.NONE;
+    public volatile EnumC0314a f3007c = EnumC0314a.NONE;
     public final b d;
 
     /* compiled from: HttpLoggingInterceptor.kt */
@@ -78,7 +78,7 @@ public final class a implements Interceptor {
         Charset charset;
         Charset charset2;
         m.checkParameterIsNotNull(chain, "chain");
-        EnumC0314a aVar = this.f3009c;
+        EnumC0314a aVar = this.f3007c;
         g gVar = (g) chain;
         Request request = gVar.f;
         if (aVar == EnumC0314a.NONE) {
@@ -89,7 +89,7 @@ public final class a implements Interceptor {
         RequestBody requestBody = request.e;
         k b2 = gVar.b();
         StringBuilder O = c.d.b.a.a.O("--> ");
-        O.append(request.f3127c);
+        O.append(request.f3125c);
         O.append(' ');
         O.append(request.b);
         if (b2 != null) {
@@ -129,24 +129,24 @@ public final class a implements Interceptor {
             if (!z2 || requestBody == null) {
                 b bVar2 = this.d;
                 StringBuilder O4 = c.d.b.a.a.O("--> END ");
-                O4.append(request.f3127c);
+                O4.append(request.f3125c);
                 bVar2.log(O4.toString());
             } else if (a(request.d)) {
                 b bVar3 = this.d;
                 StringBuilder O5 = c.d.b.a.a.O("--> END ");
-                O5.append(request.f3127c);
+                O5.append(request.f3125c);
                 O5.append(" (encoded body omitted)");
                 bVar3.log(O5.toString());
             } else if (requestBody.isDuplex()) {
                 b bVar4 = this.d;
                 StringBuilder O6 = c.d.b.a.a.O("--> END ");
-                O6.append(request.f3127c);
+                O6.append(request.f3125c);
                 O6.append(" (duplex request body omitted)");
                 bVar4.log(O6.toString());
             } else if (requestBody.isOneShot()) {
                 b bVar5 = this.d;
                 StringBuilder O7 = c.d.b.a.a.O("--> END ");
-                O7.append(request.f3127c);
+                O7.append(request.f3125c);
                 O7.append(" (one-shot body omitted)");
                 bVar5.log(O7.toString());
             } else {
@@ -162,7 +162,7 @@ public final class a implements Interceptor {
                     this.d.log(eVar.L(charset2));
                     b bVar6 = this.d;
                     StringBuilder O8 = c.d.b.a.a.O("--> END ");
-                    O8.append(request.f3127c);
+                    O8.append(request.f3125c);
                     O8.append(" (");
                     O8.append(requestBody.contentLength());
                     O8.append("-byte body)");
@@ -170,7 +170,7 @@ public final class a implements Interceptor {
                 } else {
                     b bVar7 = this.d;
                     StringBuilder O9 = c.d.b.a.a.O("--> END ");
-                    O9.append(request.f3127c);
+                    O9.append(request.f3125c);
                     O9.append(" (binary ");
                     O9.append(requestBody.contentLength());
                     O9.append("-byte body omitted)");
diff --git a/app/src/main/java/e0/g.java b/app/src/main/java/e0/g.java
index 4a1aadae60..391780c7dd 100644
--- a/app/src/main/java/e0/g.java
+++ b/app/src/main/java/e0/g.java
@@ -27,7 +27,7 @@ public final class g {
     public static final a b = new a(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<b> f3010c;
+    public final Set<b> f3008c;
     public final c d;
 
     /* compiled from: CertificatePinner.kt */
@@ -87,14 +87,14 @@ public final class g {
 
     public g(Set<b> set, c cVar) {
         m.checkParameterIsNotNull(set, "pins");
-        this.f3010c = set;
+        this.f3008c = set;
         this.d = cVar;
     }
 
     public g(Set set, c cVar, int i) {
         int i2 = i & 2;
         m.checkParameterIsNotNull(set, "pins");
-        this.f3010c = set;
+        this.f3008c = set;
         this.d = null;
     }
 
@@ -102,7 +102,7 @@ public final class g {
         m.checkParameterIsNotNull(str, "hostname");
         m.checkParameterIsNotNull(function0, "cleanedPeerCertificatesFn");
         m.checkParameterIsNotNull(str, "hostname");
-        Set<b> set = this.f3010c;
+        Set<b> set = this.f3008c;
         List<b> emptyList = n.emptyList();
         for (Object obj : set) {
             Objects.requireNonNull((b) obj);
@@ -165,13 +165,13 @@ public final class g {
 
     public final g b(c cVar) {
         m.checkParameterIsNotNull(cVar, "certificateChainCleaner");
-        return m.areEqual(this.d, cVar) ? this : new g(this.f3010c, cVar);
+        return m.areEqual(this.d, cVar) ? this : new g(this.f3008c, cVar);
     }
 
     public boolean equals(Object obj) {
         if (obj instanceof g) {
             g gVar = (g) obj;
-            if (m.areEqual(gVar.f3010c, this.f3010c) && m.areEqual(gVar.d, this.d)) {
+            if (m.areEqual(gVar.f3008c, this.f3008c) && m.areEqual(gVar.d, this.d)) {
                 return true;
             }
         }
@@ -179,7 +179,7 @@ public final class g {
     }
 
     public int hashCode() {
-        int hashCode = (this.f3010c.hashCode() + 1517) * 41;
+        int hashCode = (this.f3008c.hashCode() + 1517) * 41;
         c cVar = this.d;
         return hashCode + (cVar != null ? cVar.hashCode() : 0);
     }
diff --git a/app/src/main/java/e0/j.java b/app/src/main/java/e0/j.java
index d9eaa83048..20aeda6fa3 100644
--- a/app/src/main/java/e0/j.java
+++ b/app/src/main/java/e0/j.java
@@ -14,7 +14,7 @@ public final class j {
     public static final Map<String, j> b = new LinkedHashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final j f3011c;
+    public static final j f3009c;
     public static final j d;
     public static final j e;
     public static final j f;
@@ -31,7 +31,7 @@ public final class j {
     public static final j q;
 
     /* renamed from: r  reason: collision with root package name */
-    public static final j f3012r;
+    public static final j f3010r;
     public static final b s;
     public final String t;
 
@@ -131,7 +131,7 @@ public final class j {
         b.a(bVar, "SSL_RSA_WITH_RC4_128_SHA", 5);
         b.a(bVar, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", 8);
         b.a(bVar, "SSL_RSA_WITH_DES_CBC_SHA", 9);
-        f3011c = b.a(bVar, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", 10);
+        f3009c = b.a(bVar, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", 10);
         b.a(bVar, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", 17);
         b.a(bVar, "SSL_DHE_DSS_WITH_DES_CBC_SHA", 18);
         b.a(bVar, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", 19);
@@ -240,7 +240,7 @@ public final class j {
         b.a(bVar, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256", 52396);
         p = b.a(bVar, "TLS_AES_128_GCM_SHA256", 4865);
         q = b.a(bVar, "TLS_AES_256_GCM_SHA384", 4866);
-        f3012r = b.a(bVar, "TLS_CHACHA20_POLY1305_SHA256", 4867);
+        f3010r = b.a(bVar, "TLS_CHACHA20_POLY1305_SHA256", 4867);
         b.a(bVar, "TLS_AES_128_CCM_SHA256", 4868);
         b.a(bVar, "TLS_AES_128_CCM_8_SHA256", 4869);
     }
diff --git a/app/src/main/java/e0/m.java b/app/src/main/java/e0/m.java
index 6d11fdd940..efbed1ef66 100644
--- a/app/src/main/java/e0/m.java
+++ b/app/src/main/java/e0/m.java
@@ -16,7 +16,7 @@ public final class m {
     public static final j[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final m f3013c;
+    public static final m f3011c;
     public static final m d = new m(false, false, null, null);
     public final boolean e;
     public final boolean f;
@@ -29,14 +29,14 @@ public final class m {
         public String[] b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String[] f3014c;
+        public String[] f3012c;
         public boolean d;
 
         public a(m mVar) {
             c0.z.d.m.checkParameterIsNotNull(mVar, "connectionSpec");
             this.a = mVar.e;
             this.b = mVar.g;
-            this.f3014c = mVar.h;
+            this.f3012c = mVar.h;
             this.d = mVar.f;
         }
 
@@ -45,7 +45,7 @@ public final class m {
         }
 
         public final m a() {
-            return new m(this.a, this.d, this.b, this.f3014c);
+            return new m(this.a, this.d, this.b, this.f3012c);
         }
 
         public final a b(String... strArr) {
@@ -96,7 +96,7 @@ public final class m {
                 if (!(strArr.length == 0)) {
                     Object clone = strArr.clone();
                     if (clone != null) {
-                        this.f3014c = (String[]) clone;
+                        this.f3012c = (String[]) clone;
                         return this;
                     }
                     throw new TypeCastException("null cannot be cast to non-null type kotlin.Array<kotlin.String>");
@@ -128,7 +128,7 @@ public final class m {
     static {
         j jVar = j.p;
         j jVar2 = j.q;
-        j jVar3 = j.f3012r;
+        j jVar3 = j.f3010r;
         j jVar4 = j.j;
         j jVar5 = j.l;
         j jVar6 = j.k;
@@ -137,7 +137,7 @@ public final class m {
         j jVar9 = j.n;
         j[] jVarArr = {jVar, jVar2, jVar3, jVar4, jVar5, jVar6, jVar7, jVar8, jVar9};
         a = jVarArr;
-        j[] jVarArr2 = {jVar, jVar2, jVar3, jVar4, jVar5, jVar6, jVar7, jVar8, jVar9, j.h, j.i, j.f, j.g, j.d, j.e, j.f3011c};
+        j[] jVarArr2 = {jVar, jVar2, jVar3, jVar4, jVar5, jVar6, jVar7, jVar8, jVar9, j.h, j.i, j.f, j.g, j.d, j.e, j.f3009c};
         b = jVarArr2;
         a aVar = new a(true);
         aVar.c((j[]) Arrays.copyOf(jVarArr, jVarArr.length));
@@ -150,7 +150,7 @@ public final class m {
         aVar2.c((j[]) Arrays.copyOf(jVarArr2, jVarArr2.length));
         aVar2.f(d0Var, d0Var2);
         aVar2.d(true);
-        f3013c = aVar2.a();
+        f3011c = aVar2.a();
         a aVar3 = new a(true);
         aVar3.c((j[]) Arrays.copyOf(jVarArr2, jVarArr2.length));
         aVar3.f(d0Var, d0Var2, d0.TLS_1_1, d0.TLS_1_0);
diff --git a/app/src/main/java/e0/n.java b/app/src/main/java/e0/n.java
index ea8bc1697a..ac87b2367b 100644
--- a/app/src/main/java/e0/n.java
+++ b/app/src/main/java/e0/n.java
@@ -21,7 +21,7 @@ public final class n {
     public static final Pattern b = Pattern.compile("(?i)(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pattern f3015c = Pattern.compile("(\\d{1,2})[^\\d]*");
+    public static final Pattern f3013c = Pattern.compile("(\\d{1,2})[^\\d]*");
     public static final Pattern d = Pattern.compile("(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[^\\d]*");
     public static final a e = new a(null);
     public final String f;
@@ -86,7 +86,7 @@ public final class n {
                     String group3 = matcher.group(3);
                     m.checkExpressionValueIsNotNull(group3, "matcher.group(3)");
                     i8 = Integer.parseInt(group3);
-                } else if (i5 != -1 || !matcher.usePattern(n.f3015c).matches()) {
+                } else if (i5 != -1 || !matcher.usePattern(n.f3013c).matches()) {
                     if (i6 == -1) {
                         Pattern pattern = n.b;
                         if (matcher.usePattern(pattern).matches()) {
@@ -194,7 +194,7 @@ public final class n {
         if (!(m.areEqual(b2, str3) || (t.startsWith$default(b2, str3, false, 2, null) && (t.endsWith$default(str3, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, false, 2, null) || b2.charAt(str3.length()) == '/')))) {
             return false;
         }
-        return !this.k || wVar.f3020c;
+        return !this.k || wVar.f3018c;
     }
 
     public boolean equals(Object obj) {
diff --git a/app/src/main/java/e0/q.java b/app/src/main/java/e0/q.java
index e7d1302ff7..f6fc7d2fd9 100644
--- a/app/src/main/java/e0/q.java
+++ b/app/src/main/java/e0/q.java
@@ -23,7 +23,7 @@ public final class q {
     public final ArrayDeque<e.a> b = new ArrayDeque<>();
 
     /* renamed from: c  reason: collision with root package name */
-    public final ArrayDeque<e.a> f3016c = new ArrayDeque<>();
+    public final ArrayDeque<e.a> f3014c = new ArrayDeque<>();
     public final ArrayDeque<e> d = new ArrayDeque<>();
 
     public final synchronized void a() {
@@ -31,7 +31,7 @@ public final class q {
         while (it.hasNext()) {
             it.next().k.cancel();
         }
-        Iterator<e.a> it2 = this.f3016c.iterator();
+        Iterator<e.a> it2 = this.f3014c.iterator();
         while (it2.hasNext()) {
             it2.next().k.cancel();
         }
@@ -53,7 +53,7 @@ public final class q {
     public final void c(e.a aVar) {
         m.checkParameterIsNotNull(aVar, NotificationCompat.CATEGORY_CALL);
         aVar.i.decrementAndGet();
-        b(this.f3016c, aVar);
+        b(this.f3014c, aVar);
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:25:0x0067  */
@@ -72,18 +72,18 @@ public final class q {
                     break;
                 }
                 e.a next = it.next();
-                if (this.f3016c.size() >= 64) {
+                if (this.f3014c.size() >= 64) {
                     break;
                 } else if (next.i.get() < 5) {
                     it.remove();
                     next.i.incrementAndGet();
                     m.checkExpressionValueIsNotNull(next, "asyncCall");
                     arrayList.add(next);
-                    this.f3016c.add(next);
+                    this.f3014c.add(next);
                 }
             }
             synchronized (this) {
-                size = this.f3016c.size() + this.d.size();
+                size = this.f3014c.size() + this.d.size();
             }
             size2 = arrayList.size();
             for (i = 0; i < size2; i++) {
@@ -103,7 +103,7 @@ public final class q {
                 }
                 Objects.requireNonNull(aVar);
                 m.checkParameterIsNotNull(executorService, "executorService");
-                q qVar = aVar.k.f2967x.l;
+                q qVar = aVar.k.f2965x.l;
                 byte[] bArr2 = c.a;
                 try {
                     executorService.execute(aVar);
@@ -112,9 +112,9 @@ public final class q {
                     interruptedIOException.initCause(e);
                     aVar.k.l(interruptedIOException);
                     aVar.j.b(aVar.k, interruptedIOException);
-                    aVar.k.f2967x.l.c(aVar);
+                    aVar.k.f2965x.l.c(aVar);
                 } catch (Throwable th) {
-                    aVar.k.f2967x.l.c(aVar);
+                    aVar.k.f2965x.l.c(aVar);
                     throw th;
                 }
             }
diff --git a/app/src/main/java/e0/u.java b/app/src/main/java/e0/u.java
index fbfd224fb5..99c38f0220 100644
--- a/app/src/main/java/e0/u.java
+++ b/app/src/main/java/e0/u.java
@@ -17,7 +17,7 @@ public final class u extends RequestBody {
     public final List<String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<String> f3017c;
+    public final List<String> f3015c;
 
     /* compiled from: FormBody.kt */
     public static final class a {
@@ -25,18 +25,18 @@ public final class u extends RequestBody {
         public final List<String> b = new ArrayList();
 
         /* renamed from: c  reason: collision with root package name */
-        public final Charset f3018c = null;
+        public final Charset f3016c = null;
     }
 
     static {
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
     }
 
     public u(List<String> list, List<String> list2) {
         m.checkParameterIsNotNull(list, "encodedNames");
         m.checkParameterIsNotNull(list2, "encodedValues");
         this.b = c.z(list);
-        this.f3017c = c.z(list2);
+        this.f3015c = c.z(list2);
     }
 
     public final long a(BufferedSink bufferedSink, boolean z2) {
@@ -56,7 +56,7 @@ public final class u extends RequestBody {
             }
             eVar.b0(this.b.get(i));
             eVar.T(61);
-            eVar.b0(this.f3017c.get(i));
+            eVar.b0(this.f3015c.get(i));
         }
         if (!z2) {
             return 0;
diff --git a/app/src/main/java/e0/v.java b/app/src/main/java/e0/v.java
index 02b90760d9..3ce26d51b3 100644
--- a/app/src/main/java/e0/v.java
+++ b/app/src/main/java/e0/v.java
@@ -21,7 +21,7 @@ public final class v {
     public final d0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final j f3019c;
+    public final j f3017c;
     public final List<Certificate> d;
 
     /* compiled from: Handshake.kt */
@@ -72,7 +72,7 @@ public final class v {
         m.checkParameterIsNotNull(list, "localCertificates");
         m.checkParameterIsNotNull(function0, "peerCertificatesFn");
         this.b = d0Var;
-        this.f3019c = jVar;
+        this.f3017c = jVar;
         this.d = list;
         this.a = g.lazy(new b(function0));
     }
@@ -126,7 +126,7 @@ public final class v {
     public boolean equals(Object obj) {
         if (obj instanceof v) {
             v vVar = (v) obj;
-            if (vVar.b == this.b && m.areEqual(vVar.f3019c, this.f3019c) && m.areEqual(vVar.c(), c()) && m.areEqual(vVar.d, this.d)) {
+            if (vVar.b == this.b && m.areEqual(vVar.f3017c, this.f3017c) && m.areEqual(vVar.c(), c()) && m.areEqual(vVar.d, this.d)) {
                 return true;
             }
         }
@@ -134,7 +134,7 @@ public final class v {
     }
 
     public int hashCode() {
-        int hashCode = this.f3019c.hashCode();
+        int hashCode = this.f3017c.hashCode();
         int hashCode2 = c().hashCode();
         return this.d.hashCode() + ((hashCode2 + ((hashCode + ((this.b.hashCode() + 527) * 31)) * 31)) * 31);
     }
@@ -150,7 +150,7 @@ public final class v {
         S.append(this.b);
         S.append(' ');
         S.append("cipherSuite=");
-        S.append(this.f3019c);
+        S.append(this.f3017c);
         S.append(' ');
         S.append("peerCertificates=");
         S.append(obj);
diff --git a/app/src/main/java/e0/w.java b/app/src/main/java/e0/w.java
index d67b6d9d4a..52c0e5316f 100644
--- a/app/src/main/java/e0/w.java
+++ b/app/src/main/java/e0/w.java
@@ -26,7 +26,7 @@ public final class w {
     public static final b b = new b(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f3020c;
+    public final boolean f3018c;
     public final String d;
     public final String e;
     public final String f;
@@ -43,7 +43,7 @@ public final class w {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f3021c = "";
+        public String f3019c = "";
         public String d = "";
         public String e;
         public int f = -1;
@@ -88,7 +88,7 @@ public final class w {
             String str = this.b;
             if (str != null) {
                 b bVar = w.b;
-                String d = b.d(bVar, this.f3021c, 0, 0, false, 7);
+                String d = b.d(bVar, this.f3019c, 0, 0, false, 7);
                 String d2 = b.d(bVar, this.d, 0, 0, false, 7);
                 String str2 = this.e;
                 if (str2 != null) {
@@ -279,9 +279,9 @@ public final class w {
                             i19 = g;
                             String a2 = b.a(bVar, str, i23, f, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240);
                             if (z4) {
-                                a2 = this.f3021c + "%40" + a2;
+                                a2 = this.f3019c + "%40" + a2;
                             }
-                            this.f3021c = a2;
+                            this.f3019c = a2;
                             if (f != i19) {
                                 this.d = b.a(bVar, str, f + 1, i19, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240);
                                 z2 = true;
@@ -386,7 +386,7 @@ public final class w {
                     throw new IllegalArgumentException(O3.toString().toString());
                 }
             } else {
-                this.f3021c = wVar.e();
+                this.f3019c = wVar.e();
                 this.d = wVar.a();
                 this.e = wVar.g;
                 this.f = wVar.h;
@@ -557,9 +557,9 @@ public final class w {
                 sb.append("//");
             }
             boolean z2 = true;
-            if (!(this.f3021c.length() > 0)) {
+            if (!(this.f3019c.length() > 0)) {
             }
-            sb.append(this.f3021c);
+            sb.append(this.f3019c);
             if (this.d.length() <= 0) {
                 z2 = false;
             }
@@ -878,7 +878,7 @@ public final class w {
         this.j = list2;
         this.k = str5;
         this.l = str6;
-        this.f3020c = m.areEqual(str, Constants.SCHEME);
+        this.f3018c = m.areEqual(str, Constants.SCHEME);
     }
 
     public final String a() {
@@ -976,7 +976,7 @@ public final class w {
         aVar.b = this.d;
         String e = e();
         m.checkParameterIsNotNull(e, "<set-?>");
-        aVar.f3021c = e;
+        aVar.f3019c = e;
         String a2 = a();
         m.checkParameterIsNotNull(a2, "<set-?>");
         aVar.d = a2;
@@ -1056,7 +1056,7 @@ public final class w {
         Objects.requireNonNull(g);
         m.checkParameterIsNotNull("", "username");
         b bVar = b;
-        g.f3021c = b.a(bVar, "", 0, 0, " \"':;<=>@[]^`{}|/\\?#", false, false, false, false, null, 251);
+        g.f3019c = b.a(bVar, "", 0, 0, " \"':;<=>@[]^`{}|/\\?#", false, false, false, false, null, 251);
         m.checkParameterIsNotNull("", "password");
         g.d = b.a(bVar, "", 0, 0, " \"':;<=>@[]^`{}|/\\?#", false, false, false, false, null, 251);
         return g.b().l;
diff --git a/app/src/main/java/e0/x.java b/app/src/main/java/e0/x.java
index 26d04671dc..ce889ef3f8 100644
--- a/app/src/main/java/e0/x.java
+++ b/app/src/main/java/e0/x.java
@@ -33,7 +33,7 @@ import okhttp3.WebSocketListener;
 /* compiled from: OkHttpClient.kt */
 public class x implements Cloneable, e.a {
     public static final List<y> i = c.m(y.HTTP_2, y.HTTP_1_1);
-    public static final List<m> j = c.m(m.f3013c, m.d);
+    public static final List<m> j = c.m(m.f3011c, m.d);
     public static final b k = new b(null);
     public final SSLSocketFactory A;
     public final X509TrustManager B;
@@ -57,23 +57,23 @@ public class x implements Cloneable, e.a {
     public final boolean q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final c f3022r;
+    public final c f3020r;
     public final boolean s;
     public final boolean t;
     public final p u;
     public final s v;
 
     /* renamed from: w  reason: collision with root package name */
-    public final Proxy f3023w;
+    public final Proxy f3021w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final ProxySelector f3024x;
+    public final ProxySelector f3022x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final c f3025y;
+    public final c f3023y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final SocketFactory f3026z;
+    public final SocketFactory f3024z;
 
     /* compiled from: OkHttpClient.kt */
     public static final class a {
@@ -84,7 +84,7 @@ public class x implements Cloneable, e.a {
         public l b = new l();
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<Interceptor> f3027c = new ArrayList();
+        public final List<Interceptor> f3025c = new ArrayList();
         public final List<Interceptor> d = new ArrayList();
         public t.b e;
         public boolean f;
@@ -101,23 +101,23 @@ public class x implements Cloneable, e.a {
         public X509TrustManager q;
 
         /* renamed from: r  reason: collision with root package name */
-        public List<m> f3028r;
+        public List<m> f3026r;
         public List<? extends y> s;
         public HostnameVerifier t;
         public g u;
         public e0.e0.m.c v;
 
         /* renamed from: w  reason: collision with root package name */
-        public int f3029w;
+        public int f3027w;
 
         /* renamed from: x  reason: collision with root package name */
-        public int f3030x;
+        public int f3028x;
 
         /* renamed from: y  reason: collision with root package name */
-        public int f3031y;
+        public int f3029y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f3032z;
+        public int f3030z;
 
         public a() {
             t tVar = t.a;
@@ -135,19 +135,19 @@ public class x implements Cloneable, e.a {
             m.checkExpressionValueIsNotNull(socketFactory, "SocketFactory.getDefault()");
             this.o = socketFactory;
             b bVar = x.k;
-            this.f3028r = x.j;
+            this.f3026r = x.j;
             this.s = x.i;
             this.t = d.a;
             this.u = g.a;
-            this.f3030x = 10000;
-            this.f3031y = 10000;
-            this.f3032z = 10000;
+            this.f3028x = 10000;
+            this.f3029y = 10000;
+            this.f3030z = 10000;
             this.B = Permission.VIEW_CHANNEL;
         }
 
         public final a a(long j, TimeUnit timeUnit) {
             m.checkParameterIsNotNull(timeUnit, "unit");
-            this.f3031y = c.b("timeout", j, timeUnit);
+            this.f3029y = c.b("timeout", j, timeUnit);
             return this;
         }
 
@@ -159,7 +159,7 @@ public class x implements Cloneable, e.a {
             }
             this.p = sSLSocketFactory;
             m.checkParameterIsNotNull(x509TrustManager, "trustManager");
-            h.a aVar = h.f2993c;
+            h.a aVar = h.f2991c;
             this.v = h.a.b(x509TrustManager);
             this.q = x509TrustManager;
             return this;
@@ -189,17 +189,17 @@ public class x implements Cloneable, e.a {
         m.checkParameterIsNotNull(aVar, "builder");
         this.l = aVar.a;
         this.m = aVar.b;
-        this.n = c.z(aVar.f3027c);
+        this.n = c.z(aVar.f3025c);
         this.o = c.z(aVar.d);
         this.p = aVar.e;
         this.q = aVar.f;
-        this.f3022r = aVar.g;
+        this.f3020r = aVar.g;
         this.s = aVar.h;
         this.t = aVar.i;
         this.u = aVar.j;
         this.v = aVar.k;
         Proxy proxy = aVar.l;
-        this.f3023w = proxy;
+        this.f3021w = proxy;
         if (proxy != null) {
             proxySelector = e0.e0.l.a.a;
         } else {
@@ -209,17 +209,17 @@ public class x implements Cloneable, e.a {
                 proxySelector = e0.e0.l.a.a;
             }
         }
-        this.f3024x = proxySelector;
-        this.f3025y = aVar.n;
-        this.f3026z = aVar.o;
-        List<m> list2 = aVar.f3028r;
+        this.f3022x = proxySelector;
+        this.f3023y = aVar.n;
+        this.f3024z = aVar.o;
+        List<m> list2 = aVar.f3026r;
         this.C = list2;
         this.D = aVar.s;
         this.E = aVar.t;
-        this.H = aVar.f3029w;
-        this.I = aVar.f3030x;
-        this.J = aVar.f3031y;
-        this.K = aVar.f3032z;
+        this.H = aVar.f3027w;
+        this.I = aVar.f3028x;
+        this.J = aVar.f3029y;
+        this.K = aVar.f3030z;
         this.L = aVar.A;
         this.M = aVar.B;
         l lVar = aVar.C;
@@ -262,7 +262,7 @@ public class x implements Cloneable, e.a {
                     }
                     this.F = gVar.b(cVar);
                 } else {
-                    h.a aVar2 = h.f2993c;
+                    h.a aVar2 = h.f2991c;
                     X509TrustManager n = h.a.n();
                     this.B = n;
                     h hVar = h.a;
@@ -366,30 +366,30 @@ public class x implements Cloneable, e.a {
         a aVar = new a();
         aVar.a = this.l;
         aVar.b = this.m;
-        r.addAll(aVar.f3027c, this.n);
+        r.addAll(aVar.f3025c, this.n);
         r.addAll(aVar.d, this.o);
         aVar.e = this.p;
         aVar.f = this.q;
-        aVar.g = this.f3022r;
+        aVar.g = this.f3020r;
         aVar.h = this.s;
         aVar.i = this.t;
         aVar.j = this.u;
         aVar.k = this.v;
-        aVar.l = this.f3023w;
-        aVar.m = this.f3024x;
-        aVar.n = this.f3025y;
-        aVar.o = this.f3026z;
+        aVar.l = this.f3021w;
+        aVar.m = this.f3022x;
+        aVar.n = this.f3023y;
+        aVar.o = this.f3024z;
         aVar.p = this.A;
         aVar.q = this.B;
-        aVar.f3028r = this.C;
+        aVar.f3026r = this.C;
         aVar.s = this.D;
         aVar.t = this.E;
         aVar.u = this.F;
         aVar.v = this.G;
-        aVar.f3029w = this.H;
-        aVar.f3030x = this.I;
-        aVar.f3031y = this.J;
-        aVar.f3032z = this.K;
+        aVar.f3027w = this.H;
+        aVar.f3028x = this.I;
+        aVar.f3029y = this.J;
+        aVar.f3030z = this.K;
         aVar.A = this.L;
         aVar.B = this.M;
         aVar.C = this.N;
@@ -440,7 +440,7 @@ public class x implements Cloneable, e.a {
                     aVar.b("Sec-WebSocket-Extensions", "permessage-deflate");
                     Request a2 = aVar.a();
                     e0.e0.g.e eVar = new e0.e0.g.e(xVar, a2, true);
-                    dVar.f2997c = eVar;
+                    dVar.f2995c = eVar;
                     eVar.e(new e0.e0.n.e(dVar, a2));
                 } else {
                     throw new IllegalArgumentException("protocols must not contain null".toString());
diff --git a/app/src/main/java/f0/c.java b/app/src/main/java/f0/c.java
index 7471c37f21..dc16caee5a 100644
--- a/app/src/main/java/f0/c.java
+++ b/app/src/main/java/f0/c.java
@@ -79,7 +79,7 @@ public final class c implements v {
                     if (j2 >= ((long) 65536)) {
                         break;
                     }
-                    j2 += (long) (sVar.f3033c - sVar.b);
+                    j2 += (long) (sVar.f3031c - sVar.b);
                     if (j2 >= j) {
                         j2 = j;
                         break;
diff --git a/app/src/main/java/f0/e.java b/app/src/main/java/f0/e.java
index 8d39a10d6d..70368bfa3a 100644
--- a/app/src/main/java/f0/e.java
+++ b/app/src/main/java/f0/e.java
@@ -51,10 +51,10 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 if (sVar2 == null) {
                                     m.throwNpe();
                                 }
-                                int i3 = sVar2.f3033c;
+                                int i3 = sVar2.f3031c;
                                 long j4 = (long) (i3 - sVar2.b);
                                 if (j4 > j3) {
-                                    sVar2.f3033c = i3 - ((int) j3);
+                                    sVar2.f3031c = i3 - ((int) j3);
                                     break;
                                 }
                                 eVar.i = sVar2.a();
@@ -77,9 +77,9 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     boolean z2 = true;
                     while (j5 > 0) {
                         s N = eVar.N(i);
-                        int min = (int) Math.min(j5, (long) (8192 - N.f3033c));
-                        int i4 = N.f3033c + min;
-                        N.f3033c = i4;
+                        int min = (int) Math.min(j5, (long) (8192 - N.f3031c));
+                        int i4 = N.f3031c + min;
+                        N.f3031c = i4;
                         j5 -= (long) min;
                         if (z2) {
                             this.k = N;
@@ -141,7 +141,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 if (sVar == null) {
                                     m.throwNpe();
                                 }
-                                int i2 = sVar.f3033c;
+                                int i2 = sVar.f3031c;
                                 int i3 = sVar.b;
                                 if (j < ((long) (i2 - i3)) + j2) {
                                     break;
@@ -158,7 +158,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 if (sVar2 == null) {
                                     m.throwNpe();
                                 }
-                                j3 -= (long) (sVar2.f3033c - sVar2.b);
+                                j3 -= (long) (sVar2.f3031c - sVar2.b);
                             }
                             sVar = sVar2;
                             j2 = j3;
@@ -171,7 +171,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 byte[] bArr = sVar.a;
                                 byte[] copyOf = Arrays.copyOf(bArr, bArr.length);
                                 m.checkExpressionValueIsNotNull(copyOf, "java.util.Arrays.copyOf(this, size)");
-                                s sVar4 = new s(copyOf, sVar.b, sVar.f3033c, false, true);
+                                s sVar4 = new s(copyOf, sVar.b, sVar.f3031c, false, true);
                                 if (eVar.i == sVar) {
                                     eVar.i = sVar4;
                                 }
@@ -192,7 +192,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         this.m = sVar.a;
                         int i4 = sVar.b + ((int) (j - j2));
                         this.n = i4;
-                        int i5 = sVar.f3033c;
+                        int i5 = sVar.f3031c;
                         this.o = i5;
                         return i5 - i4;
                     }
@@ -284,7 +284,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i2 = sVar.b;
-            if (((long) i2) + j > ((long) sVar.f3033c)) {
+            if (((long) i2) + j > ((long) sVar.f3031c)) {
                 return new String(Y(j), charset);
             }
             int i3 = (int) j;
@@ -292,7 +292,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             int i4 = sVar.b + i3;
             sVar.b = i4;
             this.j -= j;
-            if (i4 == sVar.f3033c) {
+            if (i4 == sVar.f3031c) {
                 this.i = sVar.a();
                 t.a(sVar);
             }
@@ -423,7 +423,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             if (sVar == null) {
                 m.throwNpe();
             }
-            int i5 = sVar.f3033c;
+            int i5 = sVar.f3031c;
             int i6 = sVar.b;
             if (i5 != i6) {
                 i3 += i5 - i6;
@@ -442,7 +442,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             bArr[i7] = sVar2.a;
-            i2 += sVar2.f3033c - sVar2.b;
+            i2 += sVar2.f3031c - sVar2.b;
             iArr[i7] = Math.min(i2, i);
             iArr[i7 + i4] = sVar2.b;
             sVar2.d = true;
@@ -473,7 +473,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             if (sVar2 == null) {
                 m.throwNpe();
             }
-            if (sVar2.f3033c + i <= 8192 && sVar2.e) {
+            if (sVar2.f3031c + i <= 8192 && sVar2.e) {
                 return sVar2;
             }
             s b3 = t.b();
@@ -515,10 +515,10 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         int i3 = i2 + i;
         while (i < i3) {
             s N = N(1);
-            int min = Math.min(i3 - i, 8192 - N.f3033c);
+            int min = Math.min(i3 - i, 8192 - N.f3031c);
             int i4 = i + min;
-            j.copyInto(bArr, N.a, N.f3033c, i, i4);
-            N.f3033c += min;
+            j.copyInto(bArr, N.a, N.f3031c, i, i4);
+            N.f3031c += min;
             i = i4;
         }
         this.j += j;
@@ -528,8 +528,8 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     public e T(int i) {
         s N = N(1);
         byte[] bArr = N.a;
-        int i2 = N.f3033c;
-        N.f3033c = i2 + 1;
+        int i2 = N.f3031c;
+        N.f3031c = i2 + 1;
         bArr[i2] = (byte) i;
         this.j++;
         return this;
@@ -565,7 +565,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             }
             s N = N(i2);
             byte[] bArr = N.a;
-            int i3 = N.f3033c + i2;
+            int i3 = N.f3031c + i2;
             while (j != 0) {
                 long j2 = (long) 10;
                 i3--;
@@ -575,7 +575,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             if (z2) {
                 bArr[i3 - 1] = (byte) 45;
             }
-            N.f3033c += i2;
+            N.f3031c += i2;
             this.j += (long) i2;
         }
         return this;
@@ -600,12 +600,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             int i = (int) ((((j12 & 63) + ((j12 >>> 32) & 63)) + ((long) 3)) / ((long) 4));
             s N = N(i);
             byte[] bArr = N.a;
-            int i2 = N.f3033c;
+            int i2 = N.f3031c;
             for (int i3 = (i2 + i) - 1; i3 >= i2; i3--) {
                 bArr[i3] = f0.z.a.a[(int) (15 & j)];
                 j >>>= 4;
             }
-            N.f3033c += i;
+            N.f3031c += i;
             this.j += (long) i;
         }
         return this;
@@ -614,7 +614,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     public e W(int i) {
         s N = N(4);
         byte[] bArr = N.a;
-        int i2 = N.f3033c;
+        int i2 = N.f3031c;
         int i3 = i2 + 1;
         bArr[i2] = (byte) ((i >>> 24) & 255);
         int i4 = i3 + 1;
@@ -622,7 +622,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         int i5 = i4 + 1;
         bArr[i4] = (byte) ((i >>> 8) & 255);
         bArr[i5] = (byte) (i & 255);
-        N.f3033c = i5 + 1;
+        N.f3031c = i5 + 1;
         this.j += 4;
         return this;
     }
@@ -648,11 +648,11 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     public e a0(int i) {
         s N = N(2);
         byte[] bArr = N.a;
-        int i2 = N.f3033c;
+        int i2 = N.f3031c;
         int i3 = i2 + 1;
         bArr[i2] = (byte) ((i >>> 8) & 255);
         bArr[i3] = (byte) (i & 255);
-        N.f3033c = i3 + 1;
+        N.f3031c = i3 + 1;
         this.j += 2;
         return this;
     }
@@ -701,7 +701,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         if (charAt2 < 128) {
                             s N = N(1);
                             byte[] bArr = N.a;
-                            int i3 = N.f3033c - i;
+                            int i3 = N.f3031c - i;
                             int min = Math.min(i2, 8192 - i3);
                             int i4 = i + 1;
                             bArr[i + i3] = (byte) charAt2;
@@ -713,27 +713,27 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 i4 = i + 1;
                                 bArr[i + i3] = (byte) charAt;
                             }
-                            int i5 = N.f3033c;
+                            int i5 = N.f3031c;
                             int i6 = (i3 + i) - i5;
-                            N.f3033c = i5 + i6;
+                            N.f3031c = i5 + i6;
                             this.j += (long) i6;
                         } else {
                             if (charAt2 < 2048) {
                                 s N2 = N(2);
                                 byte[] bArr2 = N2.a;
-                                int i7 = N2.f3033c;
+                                int i7 = N2.f3031c;
                                 bArr2[i7] = (byte) ((charAt2 >> 6) | 192);
                                 bArr2[i7 + 1] = (byte) ((charAt2 & '?') | 128);
-                                N2.f3033c = i7 + 2;
+                                N2.f3031c = i7 + 2;
                                 this.j += 2;
                             } else if (charAt2 < 55296 || charAt2 > 57343) {
                                 s N3 = N(3);
                                 byte[] bArr3 = N3.a;
-                                int i8 = N3.f3033c;
+                                int i8 = N3.f3031c;
                                 bArr3[i8] = (byte) ((charAt2 >> '\f') | 224);
                                 bArr3[i8 + 1] = (byte) ((63 & (charAt2 >> 6)) | 128);
                                 bArr3[i8 + 2] = (byte) ((charAt2 & '?') | 128);
-                                N3.f3033c = i8 + 3;
+                                N3.f3031c = i8 + 3;
                                 this.j += 3;
                             } else {
                                 int i9 = i + 1;
@@ -745,12 +745,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                     int i10 = (((charAt2 & 1023) << 10) | (charAt3 & 1023)) + 65536;
                                     s N4 = N(4);
                                     byte[] bArr4 = N4.a;
-                                    int i11 = N4.f3033c;
+                                    int i11 = N4.f3031c;
                                     bArr4[i11] = (byte) ((i10 >> 18) | 240);
                                     bArr4[i11 + 1] = (byte) (((i10 >> 12) & 63) | 128);
                                     bArr4[i11 + 2] = (byte) (((i10 >> 6) & 63) | 128);
                                     bArr4[i11 + 3] = (byte) ((i10 & 63) | 128);
-                                    N4.f3033c = i11 + 4;
+                                    N4.f3031c = i11 + 4;
                                     this.j += 4;
                                     i += 2;
                                 }
@@ -786,31 +786,31 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         } else if (i < 2048) {
             s N = N(2);
             byte[] bArr = N.a;
-            int i2 = N.f3033c;
+            int i2 = N.f3031c;
             bArr[i2] = (byte) ((i >> 6) | 192);
             bArr[i2 + 1] = (byte) ((i & 63) | 128);
-            N.f3033c = i2 + 2;
+            N.f3031c = i2 + 2;
             this.j += 2;
         } else if (55296 <= i && 57343 >= i) {
             T(63);
         } else if (i < 65536) {
             s N2 = N(3);
             byte[] bArr2 = N2.a;
-            int i3 = N2.f3033c;
+            int i3 = N2.f3031c;
             bArr2[i3] = (byte) ((i >> 12) | 224);
             bArr2[i3 + 1] = (byte) (((i >> 6) & 63) | 128);
             bArr2[i3 + 2] = (byte) ((i & 63) | 128);
-            N2.f3033c = i3 + 3;
+            N2.f3031c = i3 + 3;
             this.j += 3;
         } else if (i <= 1114111) {
             s N3 = N(4);
             byte[] bArr3 = N3.a;
-            int i4 = N3.f3033c;
+            int i4 = N3.f3031c;
             bArr3[i4] = (byte) ((i >> 18) | 240);
             bArr3[i4 + 1] = (byte) (((i >> 12) & 63) | 128);
             bArr3[i4 + 2] = (byte) (((i >> 6) & 63) | 128);
             bArr3[i4 + 3] = (byte) ((i & 63) | 128);
-            N3.f3033c = i4 + 4;
+            N3.f3031c = i4 + 4;
             this.j += 4;
         } else {
             StringBuilder O = c.d.b.a.a.O("Unexpected code point: 0x");
@@ -855,7 +855,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 int i2 = sVar2.b;
                 long j2 = 0;
                 while (j2 < this.j) {
-                    long min = (long) Math.min(sVar.f3033c - i, sVar2.f3033c - i2);
+                    long min = (long) Math.min(sVar.f3031c - i, sVar2.f3031c - i2);
                     long j3 = 0;
                     while (j3 < min) {
                         int i3 = i + 1;
@@ -867,14 +867,14 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         i = i3;
                         i2 = i4;
                     }
-                    if (i == sVar.f3033c) {
+                    if (i == sVar.f3031c) {
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
                         }
                         i = sVar.b;
                     }
-                    if (i2 == sVar2.f3033c) {
+                    if (i2 == sVar2.f3031c) {
                         sVar2 = sVar2.f;
                         if (sVar2 == null) {
                             m.throwNpe();
@@ -901,7 +901,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         if (sVar2 == null) {
             m.throwNpe();
         }
-        int i = sVar2.f3033c;
+        int i = sVar2.f3031c;
         if (i < 8192 && sVar2.e) {
             j -= (long) (i - sVar2.b);
         }
@@ -942,7 +942,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         }
         int i = 1;
         do {
-            int i2 = sVar.f3033c;
+            int i2 = sVar.f3031c;
             for (int i3 = sVar.b; i3 < i2; i3++) {
                 i = (i * 31) + sVar.a[i3];
             }
@@ -1011,7 +1011,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 if (sVar == null) {
                     m.throwNpe();
                 }
-                int i = sVar.f3033c;
+                int i = sVar.f3031c;
                 int i2 = sVar.b;
                 if (j < ((long) (i - i2))) {
                     break;
@@ -1026,7 +1026,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 s c2 = sVar.c();
                 int i3 = c2.b + ((int) j);
                 c2.b = i3;
-                c2.f3033c = Math.min(i3 + ((int) j2), c2.f3033c);
+                c2.f3031c = Math.min(i3 + ((int) j2), c2.f3031c);
                 s sVar2 = eVar.i;
                 if (sVar2 == null) {
                     c2.g = c2;
@@ -1042,7 +1042,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     sVar3.b(c2);
                 }
-                j2 -= (long) (c2.f3033c - c2.b);
+                j2 -= (long) (c2.f3031c - c2.b);
                 sVar = sVar.f;
                 j = 0;
             }
@@ -1061,13 +1061,13 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     if (sVar == null) {
                         m.throwNpe();
                     }
-                    j2 -= (long) (sVar.f3033c - sVar.b);
+                    j2 -= (long) (sVar.f3031c - sVar.b);
                 }
                 return sVar.a[(int) ((((long) sVar.b) + j) - j2)];
             }
             long j3 = 0;
             while (true) {
-                int i = sVar.f3033c;
+                int i = sVar.f3031c;
                 int i2 = sVar.b;
                 long j4 = ((long) (i - i2)) + j3;
                 if (j4 > j) {
@@ -1100,7 +1100,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 }
                 byte[] bArr = sVar.a;
                 int i3 = sVar.b;
-                int i4 = sVar.f3033c;
+                int i4 = sVar.f3031c;
                 while (true) {
                     if (i3 >= i4) {
                         break;
@@ -1159,12 +1159,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         if (sVar == null) {
             return -1;
         }
-        int min = Math.min(byteBuffer.remaining(), sVar.f3033c - sVar.b);
+        int min = Math.min(byteBuffer.remaining(), sVar.f3031c - sVar.b);
         byteBuffer.put(sVar.a, sVar.b, min);
         int i = sVar.b + min;
         sVar.b = i;
         this.j -= (long) min;
-        if (i == sVar.f3033c) {
+        if (i == sVar.f3031c) {
             this.i = sVar.a();
             t.a(sVar);
         }
@@ -1178,14 +1178,14 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         if (sVar == null) {
             return -1;
         }
-        int min = Math.min(i2, sVar.f3033c - sVar.b);
+        int min = Math.min(i2, sVar.f3031c - sVar.b);
         byte[] bArr2 = sVar.a;
         int i3 = sVar.b;
         j.copyInto(bArr2, bArr, i, i3, i3 + min);
         int i4 = sVar.b + min;
         sVar.b = i4;
         this.j -= (long) min;
-        if (i4 != sVar.f3033c) {
+        if (i4 != sVar.f3031c) {
             return min;
         }
         this.i = sVar.a();
@@ -1201,7 +1201,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f3033c;
+            int i2 = sVar.f3031c;
             int i3 = i + 1;
             byte b2 = sVar.a[i];
             this.j--;
@@ -1238,7 +1238,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f3033c;
+            int i2 = sVar.f3031c;
             if (((long) (i2 - i)) < 4) {
                 return ((readByte() & 255) << 24) | ((readByte() & 255) << 16) | ((readByte() & 255) << 8) | (readByte() & 255);
             }
@@ -1270,7 +1270,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f3033c;
+            int i2 = sVar.f3031c;
             if (((long) (i2 - i)) < 8) {
                 return ((((long) readInt()) & 4294967295L) << 32) | (4294967295L & ((long) readInt()));
             }
@@ -1307,7 +1307,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f3033c;
+            int i2 = sVar.f3031c;
             if (i2 - i < 2) {
                 return (short) (((readByte() & 255) << 8) | (readByte() & 255));
             }
@@ -1342,17 +1342,17 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         if (sVar == null) {
                             m.throwNpe();
                         }
-                        j4 -= (long) (sVar.f3033c - sVar.b);
+                        j4 -= (long) (sVar.f3031c - sVar.b);
                     }
                     while (j4 < j2) {
                         byte[] bArr = sVar.a;
-                        int min = (int) Math.min((long) sVar.f3033c, (((long) sVar.b) + j2) - j4);
+                        int min = (int) Math.min((long) sVar.f3031c, (((long) sVar.b) + j2) - j4);
                         for (int i = (int) ((((long) sVar.b) + j) - j4); i < min; i++) {
                             if (bArr[i] == b2) {
                                 return ((long) (i - sVar.b)) + j4;
                             }
                         }
-                        j4 += (long) (sVar.f3033c - sVar.b);
+                        j4 += (long) (sVar.f3031c - sVar.b);
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
@@ -1361,7 +1361,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                 } else {
                     while (true) {
-                        long j5 = ((long) (sVar.f3033c - sVar.b)) + j3;
+                        long j5 = ((long) (sVar.f3031c - sVar.b)) + j3;
                         if (j5 > j) {
                             break;
                         }
@@ -1373,13 +1373,13 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     while (j3 < j2) {
                         byte[] bArr2 = sVar.a;
-                        int min2 = (int) Math.min((long) sVar.f3033c, (((long) sVar.b) + j2) - j3);
+                        int min2 = (int) Math.min((long) sVar.f3031c, (((long) sVar.b) + j2) - j3);
                         for (int i2 = (int) ((((long) sVar.b) + j) - j3); i2 < min2; i2++) {
                             if (bArr2[i2] == b2) {
                                 return ((long) (i2 - sVar.b)) + j3;
                             }
                         }
-                        j3 += (long) (sVar.f3033c - sVar.b);
+                        j3 += (long) (sVar.f3031c - sVar.b);
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
@@ -1404,13 +1404,13 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         while (j > 0) {
             s sVar = this.i;
             if (sVar != null) {
-                int min = (int) Math.min(j, (long) (sVar.f3033c - sVar.b));
+                int min = (int) Math.min(j, (long) (sVar.f3031c - sVar.b));
                 long j2 = (long) min;
                 this.j -= j2;
                 j -= j2;
                 int i = sVar.b + min;
                 sVar.b = i;
-                if (i == sVar.f3033c) {
+                if (i == sVar.f3031c) {
                     this.i = sVar.a();
                     t.a(sVar);
                 }
@@ -1440,7 +1440,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     if (sVar == null) {
                         m.throwNpe();
                     }
-                    j4 -= (long) (sVar.f3033c - sVar.b);
+                    j4 -= (long) (sVar.f3031c - sVar.b);
                 }
                 if (byteString.j() == 2) {
                     byte m = byteString.m(0);
@@ -1448,7 +1448,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     while (j4 < this.j) {
                         byte[] bArr = sVar.a;
                         i3 = (int) ((((long) sVar.b) + j2) - j4);
-                        int i5 = sVar.f3033c;
+                        int i5 = sVar.f3031c;
                         while (i3 < i5) {
                             byte b2 = bArr[i3];
                             if (b2 == m || b2 == m2) {
@@ -1457,7 +1457,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 i3++;
                             }
                         }
-                        j4 += (long) (sVar.f3033c - sVar.b);
+                        j4 += (long) (sVar.f3031c - sVar.b);
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
@@ -1470,7 +1470,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 while (j4 < this.j) {
                     byte[] bArr2 = sVar.a;
                     i3 = (int) ((((long) sVar.b) + j2) - j4);
-                    int i6 = sVar.f3033c;
+                    int i6 = sVar.f3031c;
                     while (i3 < i6) {
                         byte b3 = bArr2[i3];
                         for (byte b4 : l) {
@@ -1480,7 +1480,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         }
                         i3++;
                     }
-                    j4 += (long) (sVar.f3033c - sVar.b);
+                    j4 += (long) (sVar.f3031c - sVar.b);
                     sVar = sVar.f;
                     if (sVar == null) {
                         m.throwNpe();
@@ -1491,7 +1491,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 return ((long) (i3 - i4)) + j4;
             }
             while (true) {
-                long j5 = ((long) (sVar.f3033c - sVar.b)) + j3;
+                long j5 = ((long) (sVar.f3031c - sVar.b)) + j3;
                 if (j5 > j2) {
                     break;
                 }
@@ -1507,7 +1507,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 while (j3 < this.j) {
                     byte[] bArr3 = sVar.a;
                     i = (int) ((((long) sVar.b) + j2) - j3);
-                    int i7 = sVar.f3033c;
+                    int i7 = sVar.f3031c;
                     while (i < i7) {
                         byte b5 = bArr3[i];
                         if (b5 == m3 || b5 == m4) {
@@ -1516,7 +1516,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                             i++;
                         }
                     }
-                    j3 += (long) (sVar.f3033c - sVar.b);
+                    j3 += (long) (sVar.f3031c - sVar.b);
                     sVar = sVar.f;
                     if (sVar == null) {
                         m.throwNpe();
@@ -1529,7 +1529,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             while (j3 < this.j) {
                 byte[] bArr4 = sVar.a;
                 i = (int) ((((long) sVar.b) + j2) - j3);
-                int i8 = sVar.f3033c;
+                int i8 = sVar.f3031c;
                 while (i < i8) {
                     byte b6 = bArr4[i];
                     for (byte b7 : l2) {
@@ -1539,7 +1539,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     i++;
                 }
-                j3 += (long) (sVar.f3033c - sVar.b);
+                j3 += (long) (sVar.f3031c - sVar.b);
                 sVar = sVar.f;
                 if (sVar == null) {
                     m.throwNpe();
@@ -1606,10 +1606,10 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         int i = remaining;
         while (i > 0) {
             s N = N(1);
-            int min = Math.min(i, 8192 - N.f3033c);
-            byteBuffer.get(N.a, N.f3033c, min);
+            int min = Math.min(i, 8192 - N.f3031c);
+            byteBuffer.get(N.a, N.f3031c, min);
             i -= min;
-            N.f3033c += min;
+            N.f3031c += min;
         }
         this.j += (long) remaining;
         return remaining;
@@ -1641,7 +1641,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 if (sVar3 == null) {
                     m.throwNpe();
                 }
-                int i2 = sVar3.f3033c;
+                int i2 = sVar3.f3031c;
                 s sVar4 = eVar.i;
                 if (sVar4 == null) {
                     m.throwNpe();
@@ -1657,7 +1657,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         sVar = null;
                     }
                     if (sVar != null && sVar.e) {
-                        if ((((long) sVar.f3033c) + j2) - ((long) (sVar.d ? 0 : sVar.b)) <= ((long) 8192)) {
+                        if ((((long) sVar.f3031c) + j2) - ((long) (sVar.d ? 0 : sVar.b)) <= ((long) 8192)) {
                             s sVar6 = eVar.i;
                             if (sVar6 == null) {
                                 m.throwNpe();
@@ -1674,7 +1674,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     int i3 = (int) j2;
                     Objects.requireNonNull(sVar7);
-                    if (i3 > 0 && i3 <= sVar7.f3033c - sVar7.b) {
+                    if (i3 > 0 && i3 <= sVar7.f3031c - sVar7.b) {
                         if (i3 >= 1024) {
                             sVar2 = sVar7.c();
                         } else {
@@ -1684,7 +1684,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                             int i4 = sVar7.b;
                             j.copyInto$default(bArr, bArr2, 0, i4, i4 + i3, 2, (Object) null);
                         }
-                        sVar2.f3033c = sVar2.b + i3;
+                        sVar2.f3031c = sVar2.b + i3;
                         sVar7.b += i3;
                         s sVar8 = sVar7.g;
                         if (sVar8 == null) {
@@ -1700,7 +1700,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 if (sVar9 == null) {
                     m.throwNpe();
                 }
-                long j3 = (long) (sVar9.f3033c - sVar9.b);
+                long j3 = (long) (sVar9.f3031c - sVar9.b);
                 eVar.i = sVar9.a();
                 s sVar10 = this.i;
                 if (sVar10 == null) {
@@ -1722,12 +1722,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                             m.throwNpe();
                         }
                         if (sVar12.e) {
-                            int i5 = sVar9.f3033c - sVar9.b;
+                            int i5 = sVar9.f3031c - sVar9.b;
                             s sVar13 = sVar9.g;
                             if (sVar13 == null) {
                                 m.throwNpe();
                             }
-                            int i6 = 8192 - sVar13.f3033c;
+                            int i6 = 8192 - sVar13.f3031c;
                             s sVar14 = sVar9.g;
                             if (sVar14 == null) {
                                 m.throwNpe();
diff --git a/app/src/main/java/f0/h.java b/app/src/main/java/f0/h.java
index f849f1822d..7d61f8d27a 100644
--- a/app/src/main/java/f0/h.java
+++ b/app/src/main/java/f0/h.java
@@ -33,23 +33,23 @@ public final class h implements v {
             if (z2) {
                 Deflater deflater = this.k;
                 byte[] bArr = N.a;
-                int i2 = N.f3033c;
+                int i2 = N.f3031c;
                 i = deflater.deflate(bArr, i2, 8192 - i2, 2);
             } else {
                 Deflater deflater2 = this.k;
                 byte[] bArr2 = N.a;
-                int i3 = N.f3033c;
+                int i3 = N.f3031c;
                 i = deflater2.deflate(bArr2, i3, 8192 - i3);
             }
             if (i > 0) {
-                N.f3033c += i;
+                N.f3031c += i;
                 g.j += (long) i;
                 this.j.E();
             } else if (this.k.needsInput()) {
                 break;
             }
         }
-        if (N.b == N.f3033c) {
+        if (N.b == N.f3031c) {
             g.i = N.a();
             t.a(N);
         }
@@ -114,14 +114,14 @@ public final class h implements v {
             if (sVar == null) {
                 m.throwNpe();
             }
-            int min = (int) Math.min(j, (long) (sVar.f3033c - sVar.b));
+            int min = (int) Math.min(j, (long) (sVar.f3031c - sVar.b));
             this.k.setInput(sVar.a, sVar.b, min);
             a(false);
             long j2 = (long) min;
             eVar.j -= j2;
             int i = sVar.b + min;
             sVar.b = i;
-            if (i == sVar.f3033c) {
+            if (i == sVar.f3031c) {
                 eVar.i = sVar.a();
                 t.a(sVar);
             }
diff --git a/app/src/main/java/f0/l.java b/app/src/main/java/f0/l.java
index c7799da4a2..e39daa3a0c 100644
--- a/app/src/main/java/f0/l.java
+++ b/app/src/main/java/f0/l.java
@@ -39,7 +39,7 @@ public final class l implements x {
             m.throwNpe();
         }
         while (true) {
-            int i = sVar.f3033c;
+            int i = sVar.f3031c;
             int i2 = sVar.b;
             if (j < ((long) (i - i2))) {
                 break;
@@ -52,7 +52,7 @@ public final class l implements x {
         }
         while (j2 > 0) {
             int i3 = (int) (((long) sVar.b) + j);
-            int min = (int) Math.min((long) (sVar.f3033c - i3), j2);
+            int min = (int) Math.min((long) (sVar.f3031c - i3), j2);
             this.m.update(sVar.a, i3, min);
             j2 -= (long) min;
             sVar = sVar.f;
diff --git a/app/src/main/java/f0/m.java b/app/src/main/java/f0/m.java
index edc0a11d65..ef991ecf4b 100644
--- a/app/src/main/java/f0/m.java
+++ b/app/src/main/java/f0/m.java
@@ -42,21 +42,21 @@ public final class m implements x {
         } else {
             try {
                 s N = eVar.N(1);
-                int min = (int) Math.min(j, (long) (8192 - N.f3033c));
+                int min = (int) Math.min(j, (long) (8192 - N.f3031c));
                 if (this.l.needsInput()) {
                     if (!this.k.v()) {
                         s sVar = this.k.g().i;
                         if (sVar == null) {
                             c0.z.d.m.throwNpe();
                         }
-                        int i2 = sVar.f3033c;
+                        int i2 = sVar.f3031c;
                         int i3 = sVar.b;
                         int i4 = i2 - i3;
                         this.i = i4;
                         this.l.setInput(sVar.a, i3, i4);
                     }
                 }
-                int inflate = this.l.inflate(N.a, N.f3033c, min);
+                int inflate = this.l.inflate(N.a, N.f3031c, min);
                 int i5 = this.i;
                 if (i5 != 0) {
                     int remaining = i5 - this.l.getRemaining();
@@ -64,12 +64,12 @@ public final class m implements x {
                     this.k.skip((long) remaining);
                 }
                 if (inflate > 0) {
-                    N.f3033c += inflate;
+                    N.f3031c += inflate;
                     long j2 = (long) inflate;
                     eVar.j += j2;
                     return j2;
                 }
-                if (N.b == N.f3033c) {
+                if (N.b == N.f3031c) {
                     eVar.i = N.a();
                     t.a(N);
                 }
diff --git a/app/src/main/java/f0/n.java b/app/src/main/java/f0/n.java
index b26acbcc18..c19d61ba94 100644
--- a/app/src/main/java/f0/n.java
+++ b/app/src/main/java/f0/n.java
@@ -32,13 +32,13 @@ public final class n implements x {
             try {
                 this.j.f();
                 s N = eVar.N(1);
-                int read = this.i.read(N.a, N.f3033c, (int) Math.min(j, (long) (8192 - N.f3033c)));
+                int read = this.i.read(N.a, N.f3031c, (int) Math.min(j, (long) (8192 - N.f3031c)));
                 if (read != -1) {
-                    N.f3033c += read;
+                    N.f3031c += read;
                     long j2 = (long) read;
                     eVar.j += j2;
                     return j2;
-                } else if (N.b != N.f3033c) {
+                } else if (N.b != N.f3031c) {
                     return -1;
                 } else {
                     eVar.i = N.a();
diff --git a/app/src/main/java/f0/p.java b/app/src/main/java/f0/p.java
index 953a4e927c..77510859d5 100644
--- a/app/src/main/java/f0/p.java
+++ b/app/src/main/java/f0/p.java
@@ -48,14 +48,14 @@ public final class p implements v {
             if (sVar == null) {
                 m.throwNpe();
             }
-            int min = (int) Math.min(j, (long) (sVar.f3033c - sVar.b));
+            int min = (int) Math.min(j, (long) (sVar.f3031c - sVar.b));
             this.i.write(sVar.a, sVar.b, min);
             int i = sVar.b + min;
             sVar.b = i;
             long j2 = (long) min;
             j -= j2;
             eVar.j -= j2;
-            if (i == sVar.f3033c) {
+            if (i == sVar.f3031c) {
                 eVar.i = sVar.a();
                 t.a(sVar);
             }
diff --git a/app/src/main/java/f0/s.java b/app/src/main/java/f0/s.java
index 9aad5b9c7d..9f5502af2d 100644
--- a/app/src/main/java/f0/s.java
+++ b/app/src/main/java/f0/s.java
@@ -8,7 +8,7 @@ public final class s {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f3033c;
+    public int f3031c;
     public boolean d;
     public boolean e;
     public s f;
@@ -24,7 +24,7 @@ public final class s {
         m.checkParameterIsNotNull(bArr, "data");
         this.a = bArr;
         this.b = i;
-        this.f3033c = i2;
+        this.f3031c = i2;
         this.d = z2;
         this.e = z3;
     }
@@ -64,20 +64,20 @@ public final class s {
 
     public final s c() {
         this.d = true;
-        return new s(this.a, this.b, this.f3033c, true, false);
+        return new s(this.a, this.b, this.f3031c, true, false);
     }
 
     public final void d(s sVar, int i) {
         m.checkParameterIsNotNull(sVar, "sink");
         if (sVar.e) {
-            int i2 = sVar.f3033c;
+            int i2 = sVar.f3031c;
             if (i2 + i > 8192) {
                 if (!sVar.d) {
                     int i3 = sVar.b;
                     if ((i2 + i) - i3 <= 8192) {
                         byte[] bArr = sVar.a;
                         j.copyInto$default(bArr, bArr, 0, i3, i2, 2, (Object) null);
-                        sVar.f3033c -= sVar.b;
+                        sVar.f3031c -= sVar.b;
                         sVar.b = 0;
                     } else {
                         throw new IllegalArgumentException();
@@ -88,10 +88,10 @@ public final class s {
             }
             byte[] bArr2 = this.a;
             byte[] bArr3 = sVar.a;
-            int i4 = sVar.f3033c;
+            int i4 = sVar.f3031c;
             int i5 = this.b;
             j.copyInto(bArr2, bArr3, i4, i5, i5 + i);
-            sVar.f3033c += i;
+            sVar.f3031c += i;
             this.b += i;
             return;
         }
diff --git a/app/src/main/java/f0/t.java b/app/src/main/java/f0/t.java
index 7fbd603831..fdd2e3abd4 100644
--- a/app/src/main/java/f0/t.java
+++ b/app/src/main/java/f0/t.java
@@ -8,7 +8,7 @@ public final class t {
     public static final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicReference<s>[] f3034c;
+    public static final AtomicReference<s>[] f3032c;
     public static final t d = new t();
 
     static {
@@ -18,7 +18,7 @@ public final class t {
         for (int i = 0; i < highestOneBit; i++) {
             atomicReferenceArr[i] = new AtomicReference<>();
         }
-        f3034c = atomicReferenceArr;
+        f3032c = atomicReferenceArr;
     }
 
     public static final void a(s sVar) {
@@ -28,14 +28,14 @@ public final class t {
         } else if (!sVar.d) {
             Thread currentThread = Thread.currentThread();
             m.checkExpressionValueIsNotNull(currentThread, "Thread.currentThread()");
-            AtomicReference<s> atomicReference = f3034c[(int) (currentThread.getId() & (((long) b) - 1))];
+            AtomicReference<s> atomicReference = f3032c[(int) (currentThread.getId() & (((long) b) - 1))];
             s sVar2 = atomicReference.get();
             if (sVar2 != a) {
-                int i = sVar2 != null ? sVar2.f3033c : 0;
+                int i = sVar2 != null ? sVar2.f3031c : 0;
                 if (i < 65536) {
                     sVar.f = sVar2;
                     sVar.b = 0;
-                    sVar.f3033c = i + 8192;
+                    sVar.f3031c = i + 8192;
                     if (!atomicReference.compareAndSet(sVar2, sVar)) {
                         sVar.f = null;
                     }
@@ -47,7 +47,7 @@ public final class t {
     public static final s b() {
         Thread currentThread = Thread.currentThread();
         m.checkExpressionValueIsNotNull(currentThread, "Thread.currentThread()");
-        AtomicReference<s> atomicReference = f3034c[(int) (currentThread.getId() & (((long) b) - 1))];
+        AtomicReference<s> atomicReference = f3032c[(int) (currentThread.getId() & (((long) b) - 1))];
         s sVar = a;
         s andSet = atomicReference.getAndSet(sVar);
         if (andSet == sVar) {
@@ -59,7 +59,7 @@ public final class t {
         }
         atomicReference.set(andSet.f);
         andSet.f = null;
-        andSet.f3033c = 0;
+        andSet.f3031c = 0;
         return andSet;
     }
 }
diff --git a/app/src/main/java/f0/y.java b/app/src/main/java/f0/y.java
index faf5bc98f3..bcd7bde5a3 100644
--- a/app/src/main/java/f0/y.java
+++ b/app/src/main/java/f0/y.java
@@ -10,7 +10,7 @@ public class y {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f3035c;
+    public long f3033c;
     public long d;
 
     /* compiled from: Timeout.kt */
@@ -43,14 +43,14 @@ public class y {
 
     public long c() {
         if (this.b) {
-            return this.f3035c;
+            return this.f3033c;
         }
         throw new IllegalStateException("No deadline".toString());
     }
 
     public y d(long j) {
         this.b = true;
-        this.f3035c = j;
+        this.f3033c = j;
         return this;
     }
 
@@ -62,7 +62,7 @@ public class y {
         if (Thread.interrupted()) {
             Thread.currentThread().interrupt();
             throw new InterruptedIOException("interrupted");
-        } else if (this.b && this.f3035c - System.nanoTime() <= 0) {
+        } else if (this.b && this.f3033c - System.nanoTime() <= 0) {
             throw new InterruptedIOException("deadline reached");
         }
     }
diff --git a/app/src/main/java/f0/z/a.java b/app/src/main/java/f0/z/a.java
index 83c0389c8b..53f76e1f92 100644
--- a/app/src/main/java/f0/z/a.java
+++ b/app/src/main/java/f0/z/a.java
@@ -45,7 +45,7 @@ public final class a {
         }
         byte[] bArr = sVar2.a;
         int i5 = sVar2.b;
-        int i6 = sVar2.f3033c;
+        int i6 = sVar2.f3031c;
         int[] iArr = oVar.l;
         s sVar3 = sVar2;
         int i7 = 0;
@@ -81,7 +81,7 @@ public final class a {
                         }
                         i4 = sVar4.b;
                         byte[] bArr2 = sVar4.a;
-                        i3 = sVar4.f3033c;
+                        i3 = sVar4.f3031c;
                         if (sVar4 != sVar2) {
                             sVar = sVar4;
                             bArr = bArr2;
@@ -122,7 +122,7 @@ public final class a {
                             }
                             i = sVar3.b;
                             bArr = sVar3.a;
-                            i6 = sVar3.f3033c;
+                            i6 = sVar3.f3031c;
                             if (sVar3 == sVar2) {
                                 sVar3 = null;
                             }
diff --git a/app/src/main/java/g0/a/a/a.java b/app/src/main/java/g0/a/a/a.java
index 4611a63420..400a9def48 100644
--- a/app/src/main/java/g0/a/a/a.java
+++ b/app/src/main/java/g0/a/a/a.java
@@ -7,7 +7,7 @@ public final class a {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f3036c;
+    public final c f3034c;
     public final int d;
     public int e;
     public final a f;
@@ -16,7 +16,7 @@ public final class a {
     public a(v vVar, boolean z2, c cVar, a aVar) {
         this.a = vVar;
         this.b = z2;
-        this.f3036c = cVar;
+        this.f3034c = cVar;
         int i = cVar.b;
         this.d = i == 0 ? -1 : i - 2;
         this.f = aVar;
@@ -53,7 +53,7 @@ public final class a {
             }
             cVar.j(i6);
             while (aVar2 != null) {
-                c cVar2 = aVar2.f3036c;
+                c cVar2 = aVar2.f3034c;
                 cVar.h(cVar2.a, 0, cVar2.b);
                 aVar2 = aVar2.g;
             }
@@ -66,7 +66,7 @@ public final class a {
         }
         int i = 8;
         for (a aVar = this; aVar != null; aVar = aVar.f) {
-            i += aVar.f3036c.b;
+            i += aVar.f3034c.b;
         }
         return i;
     }
@@ -77,7 +77,7 @@ public final class a {
         a aVar = null;
         for (a aVar2 = this; aVar2 != null; aVar2 = aVar2.f) {
             aVar2.g();
-            i2 += aVar2.f3036c.b;
+            i2 += aVar2.f3034c.b;
             i3++;
             aVar = aVar2;
         }
@@ -85,7 +85,7 @@ public final class a {
         cVar.i(i2);
         cVar.j(i3);
         while (aVar != null) {
-            c cVar2 = aVar.f3036c;
+            c cVar2 = aVar.f3034c;
             cVar.h(cVar2.a, 0, cVar2.b);
             aVar = aVar.g;
         }
@@ -94,77 +94,77 @@ public final class a {
     public void e(String str, Object obj) {
         this.e++;
         if (this.b) {
-            this.f3036c.j(this.a.l(str));
+            this.f3034c.j(this.a.l(str));
         }
         if (obj instanceof String) {
-            this.f3036c.e(115, this.a.l((String) obj));
+            this.f3034c.e(115, this.a.l((String) obj));
         } else if (obj instanceof Byte) {
-            this.f3036c.e(66, this.a.e(((Byte) obj).byteValue()).a);
+            this.f3034c.e(66, this.a.e(((Byte) obj).byteValue()).a);
         } else if (obj instanceof Boolean) {
-            this.f3036c.e(90, this.a.e(((Boolean) obj).booleanValue() ? 1 : 0).a);
+            this.f3034c.e(90, this.a.e(((Boolean) obj).booleanValue() ? 1 : 0).a);
         } else if (obj instanceof Character) {
-            this.f3036c.e(67, this.a.e(((Character) obj).charValue()).a);
+            this.f3034c.e(67, this.a.e(((Character) obj).charValue()).a);
         } else if (obj instanceof Short) {
-            this.f3036c.e(83, this.a.e(((Short) obj).shortValue()).a);
+            this.f3034c.e(83, this.a.e(((Short) obj).shortValue()).a);
         } else if (obj instanceof w) {
-            this.f3036c.e(99, this.a.l(((w) obj).d()));
+            this.f3034c.e(99, this.a.l(((w) obj).d()));
         } else {
             int i = 0;
             if (obj instanceof byte[]) {
                 byte[] bArr = (byte[]) obj;
-                this.f3036c.e(91, bArr.length);
+                this.f3034c.e(91, bArr.length);
                 int length = bArr.length;
                 while (i < length) {
-                    this.f3036c.e(66, this.a.e(bArr[i]).a);
+                    this.f3034c.e(66, this.a.e(bArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof boolean[]) {
                 boolean[] zArr = (boolean[]) obj;
-                this.f3036c.e(91, zArr.length);
+                this.f3034c.e(91, zArr.length);
                 int length2 = zArr.length;
                 while (i < length2) {
-                    this.f3036c.e(90, this.a.e(zArr[i] ? 1 : 0).a);
+                    this.f3034c.e(90, this.a.e(zArr[i] ? 1 : 0).a);
                     i++;
                 }
             } else if (obj instanceof short[]) {
                 short[] sArr = (short[]) obj;
-                this.f3036c.e(91, sArr.length);
+                this.f3034c.e(91, sArr.length);
                 int length3 = sArr.length;
                 while (i < length3) {
-                    this.f3036c.e(83, this.a.e(sArr[i]).a);
+                    this.f3034c.e(83, this.a.e(sArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof char[]) {
                 char[] cArr = (char[]) obj;
-                this.f3036c.e(91, cArr.length);
+                this.f3034c.e(91, cArr.length);
                 int length4 = cArr.length;
                 while (i < length4) {
-                    this.f3036c.e(67, this.a.e(cArr[i]).a);
+                    this.f3034c.e(67, this.a.e(cArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof int[]) {
                 int[] iArr = (int[]) obj;
-                this.f3036c.e(91, iArr.length);
+                this.f3034c.e(91, iArr.length);
                 int length5 = iArr.length;
                 while (i < length5) {
-                    this.f3036c.e(73, this.a.e(iArr[i]).a);
+                    this.f3034c.e(73, this.a.e(iArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof long[]) {
                 long[] jArr = (long[]) obj;
-                this.f3036c.e(91, jArr.length);
+                this.f3034c.e(91, jArr.length);
                 int length6 = jArr.length;
                 while (i < length6) {
-                    this.f3036c.e(74, this.a.g(5, jArr[i]).a);
+                    this.f3034c.e(74, this.a.g(5, jArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof float[]) {
                 float[] fArr = (float[]) obj;
-                this.f3036c.e(91, fArr.length);
+                this.f3034c.e(91, fArr.length);
                 int length7 = fArr.length;
                 while (i < length7) {
                     float f = fArr[i];
-                    c cVar = this.f3036c;
+                    c cVar = this.f3034c;
                     v vVar = this.a;
                     Objects.requireNonNull(vVar);
                     cVar.e(70, vVar.f(4, Float.floatToRawIntBits(f)).a);
@@ -172,11 +172,11 @@ public final class a {
                 }
             } else if (obj instanceof double[]) {
                 double[] dArr = (double[]) obj;
-                this.f3036c.e(91, dArr.length);
+                this.f3034c.e(91, dArr.length);
                 int length8 = dArr.length;
                 while (i < length8) {
                     double d = dArr[i];
-                    c cVar2 = this.f3036c;
+                    c cVar2 = this.f3034c;
                     v vVar2 = this.a;
                     Objects.requireNonNull(vVar2);
                     cVar2.e(68, vVar2.g(6, Double.doubleToRawLongBits(d)).a);
@@ -184,7 +184,7 @@ public final class a {
                 }
             } else {
                 u b = this.a.b(obj);
-                this.f3036c.e(".s.IFJDCS".charAt(b.b), b.a);
+                this.f3034c.e(".s.IFJDCS".charAt(b.b), b.a);
             }
         }
     }
@@ -192,16 +192,16 @@ public final class a {
     public a f(String str) {
         this.e++;
         if (this.b) {
-            this.f3036c.j(this.a.l(str));
+            this.f3034c.j(this.a.l(str));
         }
-        this.f3036c.e(91, 0);
-        return new a(this.a, false, this.f3036c, null);
+        this.f3034c.e(91, 0);
+        return new a(this.a, false, this.f3034c, null);
     }
 
     public void g() {
         int i = this.d;
         if (i != -1) {
-            byte[] bArr = this.f3036c.a;
+            byte[] bArr = this.f3034c.a;
             int i2 = this.e;
             bArr[i] = (byte) (i2 >>> 8);
             bArr[i + 1] = (byte) i2;
diff --git a/app/src/main/java/g0/a/a/b.java b/app/src/main/java/g0/a/a/b.java
index 5134094f43..eb33a6c094 100644
--- a/app/src/main/java/g0/a/a/b.java
+++ b/app/src/main/java/g0/a/a/b.java
@@ -5,7 +5,7 @@ public class b {
     public byte[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public b f3037c;
+    public b f3035c;
 
     /* compiled from: Attribute */
     public static final class a {
@@ -40,7 +40,7 @@ public class b {
                     this.a = i3 + 1;
                     bVarArr3[i3] = bVar;
                 }
-                bVar = bVar.f3037c;
+                bVar = bVar.f3035c;
             }
         }
     }
@@ -56,7 +56,7 @@ public class b {
     public final int b(v vVar, byte[] bArr, int i, int i2, int i3) {
         f fVar = vVar.a;
         int i4 = 0;
-        for (b bVar = this; bVar != null; bVar = bVar.f3037c) {
+        for (b bVar = this; bVar != null; bVar = bVar.f3035c) {
             vVar.l(bVar.a);
             i4 += bVar.b.length + 6;
         }
@@ -65,7 +65,7 @@ public class b {
 
     public final int c() {
         int i = 0;
-        for (b bVar = this; bVar != null; bVar = bVar.f3037c) {
+        for (b bVar = this; bVar != null; bVar = bVar.f3035c) {
             i++;
         }
         return i;
@@ -77,7 +77,7 @@ public class b {
 
     public final void e(v vVar, byte[] bArr, int i, int i2, int i3, c cVar) {
         f fVar = vVar.a;
-        for (b bVar = this; bVar != null; bVar = bVar.f3037c) {
+        for (b bVar = this; bVar != null; bVar = bVar.f3035c) {
             byte[] bArr2 = bVar.b;
             int length = bArr2.length;
             c.d.b.a.a.o0(vVar, bVar.a, cVar, length);
diff --git a/app/src/main/java/g0/a/a/d.java b/app/src/main/java/g0/a/a/d.java
index 5771699ac6..4801f28465 100644
--- a/app/src/main/java/g0/a/a/d.java
+++ b/app/src/main/java/g0/a/a/d.java
@@ -14,7 +14,7 @@ public class d {
     public final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String[] f3038c;
+    public final String[] f3036c;
     public final g[] d;
     public final int[] e;
     public final int f;
@@ -34,7 +34,7 @@ public class d {
         }
         int u = u(i + 8);
         this.b = new int[u];
-        this.f3038c = new String[u];
+        this.f3036c = new String[u];
         int i4 = i + 10;
         int i5 = 1;
         int i6 = 0;
@@ -320,7 +320,7 @@ public class d {
         int i37;
         int i38;
         byte[] bArr = this.a;
-        char[] cArr = hVar.f3046c;
+        char[] cArr = hVar.f3044c;
         int u3 = u(i);
         int u4 = u(i + 2);
         int l = l(i + 4);
@@ -762,7 +762,7 @@ public class d {
                                         i31 = i50;
                                         i30 = i33;
                                         b e = e(hVar.a, t2, i57, l4, cArr, i, pVarArr5);
-                                        e.f3037c = bVar3;
+                                        e.f3035c = bVar3;
                                         bVar3 = e;
                                         iArr8 = iArr6;
                                     } else if ((hVar.b & 4) == 0) {
@@ -807,8 +807,8 @@ public class d {
                                     int i62 = i60 + 4;
                                     a(u10, pVarArr8);
                                     p pVar = pVarArr8[u10];
-                                    if (pVar.f3053c == 0) {
-                                        pVar.f3053c = (short) u11;
+                                    if (pVar.f3051c == 0) {
+                                        pVar.f3051c = (short) u11;
                                         i35 = i62;
                                         iArr7 = iArr8;
                                         pVarArr7 = pVarArr8;
@@ -870,7 +870,7 @@ public class d {
                             hVar.p = 0;
                             Object[] objArr = new Object[u4];
                             hVar.q = objArr;
-                            hVar.f3047r = 0;
+                            hVar.f3045r = 0;
                             hVar.s = new Object[u3];
                             if (z12) {
                                 String str2 = hVar.f;
@@ -878,7 +878,7 @@ public class d {
                                     if ("<init>".equals(hVar.e)) {
                                         objArr[0] = t.g;
                                     } else {
-                                        objArr[0] = g(this.g + 2, hVar.f3046c);
+                                        objArr[0] = g(this.g + 2, hVar.f3044c);
                                     }
                                     i28 = 1;
                                 } else {
@@ -891,7 +891,7 @@ public class d {
                                     char charAt = str2.charAt(i67);
                                     if (charAt == 'F') {
                                         i29 = i66 + 1;
-                                        objArr[i66] = t.f3063c;
+                                        objArr[i66] = t.f3061c;
                                     } else if (charAt != 'L') {
                                         if (!(charAt == 'S' || charAt == 'I')) {
                                             if (charAt == 'J') {
@@ -1009,7 +1009,7 @@ public class d {
                             if (pVar2 != null) {
                                 boolean z14 = (hVar.b & 2) == 0;
                                 qVar.i(pVar2);
-                                if (z14 && (s = pVar2.f3053c) != 0) {
+                                if (z14 && (s = pVar2.f3051c) != 0) {
                                     qVar.k(s & 65535, pVar2);
                                     if (pVar2.d != null) {
                                         i7 = i75;
@@ -1034,14 +1034,14 @@ public class d {
                                                                 i19 = u4;
                                                                 i20 = i6;
                                                                 i21 = i8;
-                                                                qVar.c(-1, hVar.o, hVar.q, hVar.f3047r, hVar.s);
+                                                                qVar.c(-1, hVar.o, hVar.q, hVar.f3045r, hVar.s);
                                                             } else {
                                                                 i19 = u4;
                                                                 i21 = i8;
                                                                 i20 = i6;
                                                                 iArr4 = iArr13;
                                                                 iArr3 = iArr12;
-                                                                qVar.c(hVar.n, hVar.p, hVar.q, hVar.f3047r, hVar.s);
+                                                                qVar.c(hVar.n, hVar.p, hVar.q, hVar.f3045r, hVar.s);
                                                             }
                                                             z10 = false;
                                                         } else {
@@ -1053,7 +1053,7 @@ public class d {
                                                             z10 = z2;
                                                         }
                                                         if (i21 < i2) {
-                                                            char[] cArr2 = hVar.f3046c;
+                                                            char[] cArr2 = hVar.f3044c;
                                                             p[] pVarArr10 = hVar.g;
                                                             if (z11) {
                                                                 i23 = i21 + 1;
@@ -1068,7 +1068,7 @@ public class d {
                                                             hVar.p = i24;
                                                             if (i22 < 64) {
                                                                 hVar.n = 3;
-                                                                hVar.f3047r = i24;
+                                                                hVar.f3045r = i24;
                                                                 i26 = i23;
                                                                 pVarArr3 = pVarArr10;
                                                                 i25 = i2;
@@ -1079,7 +1079,7 @@ public class d {
                                                                     pVarArr3 = pVarArr10;
                                                                     i26 = x(i23, hVar.s, 0, cArr2, pVarArr3);
                                                                     hVar.n = 4;
-                                                                    hVar.f3047r = 1;
+                                                                    hVar.f3045r = 1;
                                                                 } else {
                                                                     pVarArr3 = pVarArr10;
                                                                     i25 = i2;
@@ -1089,17 +1089,17 @@ public class d {
                                                                         if (i22 == 247) {
                                                                             i26 = x(i82, hVar.s, 0, cArr2, pVarArr3);
                                                                             hVar.n = 4;
-                                                                            hVar.f3047r = 1;
+                                                                            hVar.f3045r = 1;
                                                                         } else {
                                                                             if (i22 >= 248 && i22 < 251) {
                                                                                 hVar.n = 2;
                                                                                 int i83 = 251 - i22;
                                                                                 hVar.p = i83;
                                                                                 hVar.o -= i83;
-                                                                                hVar.f3047r = 0;
+                                                                                hVar.f3045r = 0;
                                                                             } else if (i22 == 251) {
                                                                                 hVar.n = 3;
-                                                                                hVar.f3047r = 0;
+                                                                                hVar.f3045r = 0;
                                                                             } else if (i22 < 255) {
                                                                                 int i84 = i22 - 251;
                                                                                 int i85 = z12 ? hVar.o : 0;
@@ -1114,7 +1114,7 @@ public class d {
                                                                                 hVar.n = 1;
                                                                                 hVar.p = i84;
                                                                                 hVar.o += i84;
-                                                                                hVar.f3047r = 0;
+                                                                                hVar.f3045r = 0;
                                                                             } else {
                                                                                 int u12 = u(i82);
                                                                                 int i87 = i82 + 2;
@@ -1126,7 +1126,7 @@ public class d {
                                                                                 }
                                                                                 int u13 = u(i87);
                                                                                 i82 = i87 + 2;
-                                                                                hVar.f3047r = u13;
+                                                                                hVar.f3045r = u13;
                                                                                 for (int i89 = 0; i89 < u13; i89++) {
                                                                                     i82 = x(i82, hVar.s, i89, cArr2, pVarArr3);
                                                                                 }
@@ -2292,10 +2292,10 @@ public class d {
                         }
                         b bVar4 = bVar;
                         while (bVar4 != null) {
-                            b bVar5 = bVar4.f3037c;
-                            bVar4.f3037c = null;
+                            b bVar5 = bVar4.f3035c;
+                            bVar4.f3035c = null;
                             r rVar5 = (r) qVar;
-                            bVar4.f3037c = rVar5.M;
+                            bVar4.f3035c = rVar5.M;
                             rVar5.M = bVar4;
                             bVar4 = bVar5;
                         }
@@ -2382,9 +2382,9 @@ public class d {
                     String t3 = t(i4 + 2, cArr);
                     aVar.e++;
                     if (aVar.b) {
-                        aVar.f3036c.j(aVar.a.l(str));
+                        aVar.f3034c.j(aVar.a.l(str));
                     }
-                    c cVar = aVar.f3036c;
+                    c cVar = aVar.f3034c;
                     cVar.e(101, aVar.a.l(t2));
                     cVar.j(aVar.a.l(t3));
                     return i4 + 4;
@@ -2500,12 +2500,12 @@ public class d {
         String t4 = t(i4, cArr);
         aVar.e++;
         if (aVar.b) {
-            aVar.f3036c.j(aVar.a.l(str));
+            aVar.f3034c.j(aVar.a.l(str));
         }
-        c cVar2 = aVar.f3036c;
+        c cVar2 = aVar.f3034c;
         cVar2.e(64, aVar.a.l(t4));
         cVar2.j(0);
-        return k(new a(aVar.a, true, aVar.f3036c, null), i4 + 2, true, cArr);
+        return k(new a(aVar.a, true, aVar.f3034c, null), i4 + 2, true, cArr);
     }
 
     public final int k(a aVar, int i, boolean z2, char[] cArr) {
@@ -2563,7 +2563,7 @@ public class d {
         } else {
             rVar.F = i3;
         }
-        char[] cArr = hVar.f3046c;
+        char[] cArr = hVar.f3044c;
         for (int i4 = 0; i4 < i3; i4++) {
             int u = u(i2);
             i2 += 2;
@@ -2688,7 +2688,7 @@ public class d {
     public final int[] s(q qVar, h hVar, int i, boolean z2) {
         int i2;
         a aVar;
-        char[] cArr = hVar.f3046c;
+        char[] cArr = hVar.f3044c;
         int u = u(i);
         int[] iArr = new int[u];
         int i3 = i + 2;
@@ -2757,11 +2757,11 @@ public class d {
                     cVar.j(rVar.d.l(t));
                     cVar.j(0);
                     if (z2) {
-                        aVar = new a(rVar.d, true, cVar, rVar.f3058w);
-                        rVar.f3058w = aVar;
+                        aVar = new a(rVar.d, true, cVar, rVar.f3056w);
+                        rVar.f3056w = aVar;
                     } else {
-                        aVar = new a(rVar.d, true, cVar, rVar.f3059x);
-                        rVar.f3059x = aVar;
+                        aVar = new a(rVar.d, true, cVar, rVar.f3057x);
+                        rVar.f3057x = aVar;
                     }
                     i3 = k(aVar, i8, true, cArr);
                 } else {
@@ -2819,7 +2819,7 @@ public class d {
     }
 
     public final String w(int i, char[] cArr) {
-        String[] strArr = this.f3038c;
+        String[] strArr = this.f3036c;
         String str = strArr[i];
         if (str != null) {
             return str;
@@ -2840,7 +2840,7 @@ public class d {
                 objArr[i2] = t.b;
                 return i3;
             case 2:
-                objArr[i2] = t.f3063c;
+                objArr[i2] = t.f3061c;
                 return i3;
             case 3:
                 objArr[i2] = t.d;
diff --git a/app/src/main/java/g0/a/a/f.java b/app/src/main/java/g0/a/a/f.java
index 3f9b11e7a8..560d837ed5 100644
--- a/app/src/main/java/g0/a/a/f.java
+++ b/app/src/main/java/g0/a/a/f.java
@@ -12,7 +12,7 @@ public class f extends e {
     public final v b = new v(this);
 
     /* renamed from: c  reason: collision with root package name */
-    public int f3039c;
+    public int f3037c;
     public int d;
     public int e;
     public int f;
@@ -29,23 +29,23 @@ public class f extends e {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public c f3040r;
+    public c f3038r;
     public a s;
     public a t;
     public a u;
     public a v;
 
     /* renamed from: w  reason: collision with root package name */
-    public s f3041w;
+    public s f3039w;
 
     /* renamed from: x  reason: collision with root package name */
-    public int f3042x;
+    public int f3040x;
 
     /* renamed from: y  reason: collision with root package name */
-    public int f3043y;
+    public int f3041y;
 
     /* renamed from: z  reason: collision with root package name */
-    public c f3044z;
+    public c f3042z;
 
     public f(int i) {
         super(458752);
@@ -59,7 +59,7 @@ public class f extends e {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:395:0x0aa5, code lost:
-        if (r1.f3060y != 0) goto L_0x0acf;
+        if (r1.f3058y != 0) goto L_0x0acf;
      */
     /* JADX WARNING: Removed duplicated region for block: B:407:0x0ad2  */
     /* JADX WARNING: Removed duplicated region for block: B:408:0x0ad7  */
@@ -139,10 +139,10 @@ public class f extends e {
         this.t = null;
         this.u = null;
         this.v = null;
-        this.f3041w = null;
-        this.f3042x = 0;
-        this.f3043y = 0;
-        this.f3044z = null;
+        this.f3039w = null;
+        this.f3040x = 0;
+        this.f3041y = 0;
+        this.f3042z = null;
         this.A = null;
         this.B = z2 ? 3 : 0;
         d dVar2 = new d(bArr, 0, false);
@@ -151,7 +151,7 @@ public class f extends e {
         hVar2.a = bVarArr;
         hVar2.b = i10;
         char[] cArr = new char[dVar2.f];
-        hVar2.f3046c = cArr;
+        hVar2.f3044c = cArr;
         int i11 = dVar2.g;
         int u = dVar2.u(i11);
         String g = dVar2.g(i11 + 2, cArr);
@@ -244,7 +244,7 @@ public class f extends e {
                         i7 = i14;
                         strArr3 = strArr5;
                         bVar = dVar2.e(bVarArr, t, i6, l, cArr, -1, null);
-                        bVar.f3037c = bVar;
+                        bVar.f3035c = bVar;
                     } else {
                         str33 = str34;
                         i6 = i24;
@@ -297,11 +297,11 @@ public class f extends e {
             if (str37 != null) {
                 c cVar = new c();
                 cVar.a(str37, 0, Integer.MAX_VALUE);
-                fVar.f3040r = cVar;
+                fVar.f3038r = cVar;
             }
         }
         if (i15 != 0) {
-            char[] cArr2 = hVar3.f3046c;
+            char[] cArr2 = hVar3.f3044c;
             String t2 = dVar3.t(dVar3.b[dVar3.u(i15)], cArr2);
             int u4 = dVar3.u(i15 + 2);
             String t3 = dVar3.t(i15 + 4, cArr2);
@@ -309,7 +309,7 @@ public class f extends e {
             v vVar = fVar.b;
             str5 = "RuntimeVisibleAnnotations";
             s sVar = new s(vVar, vVar.m(19, t2).a, u4, t3 == null ? 0 : fVar.b.l(t3));
-            fVar.f3041w = sVar;
+            fVar.f3039w = sVar;
             if (str != null) {
                 sVar.q = vVar.m(7, str).a;
             }
@@ -461,7 +461,7 @@ public class f extends e {
             str6 = str2;
         }
         if (str36 != null) {
-            fVar.f3042x = fVar.b.m(7, str36).a;
+            fVar.f3040x = fVar.b.m(7, str36).a;
         }
         if (i17 != 0) {
             String g4 = dVar3.g(i17, cArr);
@@ -525,9 +525,9 @@ public class f extends e {
         }
         b bVar2 = bVar;
         while (bVar2 != null) {
-            b bVar3 = bVar2.f3037c;
-            bVar2.f3037c = null;
-            bVar2.f3037c = fVar.A;
+            b bVar3 = bVar2.f3035c;
+            bVar2.f3035c = null;
+            bVar2.f3035c = fVar.A;
             fVar.A = bVar2;
             bVar2 = bVar3;
         }
@@ -540,11 +540,11 @@ public class f extends e {
                     break;
                 }
                 String g5 = dVar3.g(i53, cArr);
-                if (fVar.f3044z == null) {
-                    fVar.f3044z = new c();
+                if (fVar.f3042z == null) {
+                    fVar.f3042z = new c();
                 }
-                fVar.f3043y++;
-                fVar.f3044z.j(fVar.b.m(7, g5).a);
+                fVar.f3041y++;
+                fVar.f3042z.j(fVar.b.m(7, g5).a);
                 i53 += 2;
                 u22 = i54;
             }
@@ -584,7 +584,7 @@ public class f extends e {
             if (u25 <= 0) {
                 break;
             }
-            char[] cArr3 = hVar3.f3046c;
+            char[] cArr3 = hVar3.f3044c;
             int u26 = dVar3.u(i57);
             String t8 = dVar3.t(i57 + 2, cArr3);
             String t9 = dVar3.t(i57 + 4, cArr3);
@@ -731,7 +731,7 @@ public class f extends e {
                                         str22 = str31;
                                         hVar = hVar3;
                                         b e = dVar3.e(hVar3.a, t10, i66, l2, cArr3, -1, null);
-                                        e.f3037c = bVar4;
+                                        e.f3035c = bVar4;
                                         bVar4 = e;
                                         i60 = i60;
                                         i64 = i4;
@@ -856,9 +856,9 @@ public class f extends e {
             }
             b bVar5 = bVar4;
             while (bVar5 != null) {
-                b bVar6 = bVar5.f3037c;
-                bVar5.f3037c = null;
-                bVar5.f3037c = lVar2.l;
+                b bVar6 = bVar5.f3035c;
+                bVar5.f3035c = null;
+                bVar5.f3035c = lVar2.l;
                 lVar2.l = bVar5;
                 bVar5 = bVar6;
             }
@@ -890,7 +890,7 @@ public class f extends e {
             if (u33 <= 0) {
                 return b();
             }
-            char[] cArr4 = hVar4.f3046c;
+            char[] cArr4 = hVar4.f3044c;
             hVar4.d = dVar4.u(i76);
             hVar4.e = dVar4.t(i76 + 2, cArr4);
             int i78 = i76 + 4;
@@ -1097,7 +1097,7 @@ public class f extends e {
                                                         str11 = str47;
                                                         str13 = str15;
                                                         b e2 = dVar4.e(hVar4.a, t11, i93, l3, cArr4, -1, null);
-                                                        e2.f3037c = bVar7;
+                                                        e2.f3035c = bVar7;
                                                         z5 = z5;
                                                         i82 = i82;
                                                         bVar7 = e2;
@@ -1195,15 +1195,15 @@ public class f extends e {
             if (dVar4 == vVar2.b && u36 == rVar2.h && i85 == rVar2.A) {
                 int i98 = rVar2.e;
                 if (z6 == ((i98 & 131072) != 0)) {
-                    if (z3 == (vVar2.f3065c < 49 && (i98 & 4096) != 0)) {
+                    if (z3 == (vVar2.f3063c < 49 && (i98 & 4096) != 0)) {
                         if (i82 != 0) {
-                            if (dVar4.u(i82) == rVar2.f3060y) {
+                            if (dVar4.u(i82) == rVar2.f3058y) {
                                 int i99 = i82 + 2;
                                 int i100 = 0;
                                 while (true) {
-                                    if (i100 >= rVar2.f3060y) {
+                                    if (i100 >= rVar2.f3058y) {
                                         break;
-                                    } else if (dVar4.u(i99) != rVar2.f3061z[i100]) {
+                                    } else if (dVar4.u(i99) != rVar2.f3059z[i100]) {
                                         break;
                                     } else {
                                         i99 += 2;
@@ -1212,8 +1212,8 @@ public class f extends e {
                                 }
                             }
                         }
-                        rVar2.f3055a0 = i79;
-                        rVar2.f3056b0 = i97 - 6;
+                        rVar2.f3053a0 = i79;
+                        rVar2.f3054b0 = i97 - 6;
                         z4 = true;
                         if (z4) {
                             if (i83 != 0) {
@@ -1302,9 +1302,9 @@ public class f extends e {
                             }
                             b bVar8 = bVar7;
                             while (bVar8 != null) {
-                                b bVar9 = bVar8.f3037c;
-                                bVar8.f3037c = null;
-                                bVar8.f3037c = rVar2.M;
+                                b bVar9 = bVar8.f3035c;
+                                bVar8.f3035c = null;
+                                bVar8.f3035c = rVar2.M;
                                 rVar2.M = bVar8;
                                 bVar8 = bVar9;
                             }
@@ -1379,9 +1379,9 @@ public class f extends e {
             } else {
                 i = 8;
             }
-            if ((lVar.f3049c & 4096) != 0) {
+            if ((lVar.f3047c & 4096) != 0) {
                 v vVar = lVar.b;
-                if (vVar.f3065c < 49) {
+                if (vVar.f3063c < 49) {
                     vVar.l("Synthetic");
                     i += 6;
                 }
@@ -1390,7 +1390,7 @@ public class f extends e {
                 lVar.b.l("Signature");
                 i += 8;
             }
-            if ((lVar.f3049c & 131072) != 0) {
+            if ((lVar.f3047c & 131072) != 0) {
                 lVar.b.l("Deprecated");
                 i += 6;
             }
@@ -1423,8 +1423,8 @@ public class f extends e {
             boolean z2 = true;
             if (rVar != null) {
                 int i14 = i13 + 1;
-                if (rVar.f3055a0 != 0) {
-                    i9 = rVar.f3056b0 + 6;
+                if (rVar.f3053a0 != 0) {
+                    i9 = rVar.f3054b0 + 6;
                     i8 = i14;
                 } else {
                     int i15 = rVar.l.b;
@@ -1442,7 +1442,7 @@ public class f extends e {
                         if (rVar.v != null) {
                             v vVar2 = rVar.d;
                             i8 = i14;
-                            vVar2.l(vVar2.f3065c >= 50 ? "StackMapTable" : "StackMap");
+                            vVar2.l(vVar2.f3063c >= 50 ? "StackMapTable" : "StackMap");
                             i10 += rVar.v.b + 8;
                         } else {
                             i8 = i14;
@@ -1451,31 +1451,31 @@ public class f extends e {
                             rVar.d.l("LineNumberTable");
                             i10 += rVar.p.b + 8;
                         }
-                        if (rVar.f3057r != null) {
+                        if (rVar.f3055r != null) {
                             rVar.d.l("LocalVariableTable");
-                            i10 += rVar.f3057r.b + 8;
+                            i10 += rVar.f3055r.b + 8;
                         }
                         if (rVar.t != null) {
                             rVar.d.l("LocalVariableTypeTable");
                             i10 += rVar.t.b + 8;
                         }
-                        a aVar5 = rVar.f3058w;
+                        a aVar5 = rVar.f3056w;
                         if (aVar5 != null) {
                             i10 += aVar5.a("RuntimeVisibleTypeAnnotations");
                         }
-                        a aVar6 = rVar.f3059x;
+                        a aVar6 = rVar.f3057x;
                         if (aVar6 != null) {
                             i10 += aVar6.a("RuntimeInvisibleTypeAnnotations");
                         }
                     } else {
                         throw new MethodTooLargeException(rVar.d.d, rVar.g, rVar.i, rVar.l.b);
                     }
-                    if (rVar.f3060y > 0) {
+                    if (rVar.f3058y > 0) {
                         rVar.d.l("Exceptions");
-                        i10 += (rVar.f3060y * 2) + 8;
+                        i10 += (rVar.f3058y * 2) + 8;
                     }
                     v vVar3 = rVar.d;
-                    if (vVar3.f3065c >= 49) {
+                    if (vVar3.f3063c >= 49) {
                         z2 = false;
                     }
                     if ((rVar.e & 4096) != 0 && z2) {
@@ -1555,7 +1555,7 @@ public class f extends e {
                     i11 += 10;
                     this.b.l("EnclosingMethod");
                 }
-                if ((this.f3039c & 4096) != 0) {
+                if ((this.f3037c & 4096) != 0) {
                     str = "EnclosingMethod";
                     if ((this.a & 65535) < 49) {
                         i2++;
@@ -1575,13 +1575,13 @@ public class f extends e {
                     i11 += 8;
                     this.b.l("SourceFile");
                 }
-                c cVar2 = this.f3040r;
+                c cVar2 = this.f3038r;
                 if (cVar2 != null) {
                     i2++;
                     i11 += cVar2.b + 6;
                     this.b.l("SourceDebugExtension");
                 }
-                if ((this.f3039c & 131072) != 0) {
+                if ((this.f3037c & 131072) != 0) {
                     i2++;
                     i11 += 6;
                     this.b.l("Deprecated");
@@ -1624,7 +1624,7 @@ public class f extends e {
                     }
                     i11 += i7;
                 }
-                s sVar = this.f3041w;
+                s sVar = this.f3039w;
                 String str6 = "ModuleMainClass";
                 if (sVar != null) {
                     str3 = "RuntimeInvisibleTypeAnnotations";
@@ -1645,12 +1645,12 @@ public class f extends e {
                     str3 = "RuntimeInvisibleTypeAnnotations";
                     str2 = "RuntimeVisibleTypeAnnotations";
                 }
-                if (this.f3042x != 0) {
+                if (this.f3040x != 0) {
                     i2++;
                     i11 += 8;
                     this.b.l("NestHost");
                 }
-                c cVar3 = this.f3044z;
+                c cVar3 = this.f3042z;
                 if (cVar3 != null) {
                     i2++;
                     i11 += cVar3.b + 8;
@@ -1673,7 +1673,7 @@ public class f extends e {
                     cVar4.j(vVar7.g);
                     c cVar5 = vVar7.h;
                     cVar4.h(cVar5.a, 0, cVar5.b);
-                    cVar4.j((~((this.a & 65535) < 49 ? 4096 : 0)) & this.f3039c);
+                    cVar4.j((~((this.a & 65535) < 49 ? 4096 : 0)) & this.f3037c);
                     cVar4.j(this.d);
                     cVar4.j(this.e);
                     cVar4.j(this.f);
@@ -1683,12 +1683,12 @@ public class f extends e {
                     cVar4.j(i12);
                     l lVar2 = this.h;
                     while (lVar2 != null) {
-                        boolean z3 = lVar2.b.f3065c < 49;
-                        cVar4.j((~(z3 ? 4096 : 0)) & lVar2.f3049c);
+                        boolean z3 = lVar2.b.f3063c < 49;
+                        cVar4.j((~(z3 ? 4096 : 0)) & lVar2.f3047c);
                         cVar4.j(lVar2.d);
                         cVar4.j(lVar2.e);
                         int i24 = lVar2.g != 0 ? 1 : 0;
-                        int i25 = lVar2.f3049c;
+                        int i25 = lVar2.f3047c;
                         if ((i25 & 4096) != 0 && z3) {
                             i24++;
                         }
@@ -1719,14 +1719,14 @@ public class f extends e {
                             a.o0(lVar2.b, "ConstantValue", cVar4, 2);
                             cVar4.j(lVar2.g);
                         }
-                        if ((lVar2.f3049c & 4096) != 0 && z3) {
+                        if ((lVar2.f3047c & 4096) != 0 && z3) {
                             a.o0(lVar2.b, "Synthetic", cVar4, 0);
                         }
                         if (lVar2.f != 0) {
                             a.o0(lVar2.b, "Signature", cVar4, 2);
                             cVar4.j(lVar2.f);
                         }
-                        if ((lVar2.f3049c & 131072) != 0) {
+                        if ((lVar2.f3047c & 131072) != 0) {
                             a.o0(lVar2.b, "Deprecated", cVar4, 0);
                         }
                         a aVar15 = lVar2.h;
@@ -1781,7 +1781,7 @@ public class f extends e {
                         cVar4.j(this.n);
                         cVar4.j(this.o);
                     }
-                    if ((this.f3039c & 4096) != 0 && (this.a & 65535) < 49) {
+                    if ((this.f3037c & 4096) != 0 && (this.a & 65535) < 49) {
                         a.o0(this.b, "Synthetic", cVar4, 0);
                     }
                     if (this.p != 0) {
@@ -1795,16 +1795,16 @@ public class f extends e {
                         a.o0(this.b, "SourceFile", cVar4, i4);
                         cVar4.j(this.q);
                     }
-                    c cVar7 = this.f3040r;
+                    c cVar7 = this.f3038r;
                     if (cVar7 != null) {
                         int i26 = cVar7.b;
                         a.o0(this.b, "SourceDebugExtension", cVar4, i26);
                         i5 = 0;
-                        cVar4.h(this.f3040r.a, 0, i26);
+                        cVar4.h(this.f3038r.a, 0, i26);
                     } else {
                         i5 = 0;
                     }
-                    if ((this.f3039c & 131072) != 0) {
+                    if ((this.f3037c & 131072) != 0) {
                         a.o0(this.b, "Deprecated", cVar4, i5);
                     }
                     a aVar19 = this.s;
@@ -1831,11 +1831,11 @@ public class f extends e {
                         c cVar8 = vVar8.j;
                         cVar4.h(cVar8.a, 0, cVar8.b);
                     }
-                    s sVar2 = this.f3041w;
+                    s sVar2 = this.f3039w;
                     if (sVar2 != null) {
                         a.o0(sVar2.a, "Module", cVar4, sVar2.f.b + 16 + sVar2.h.b + sVar2.j.b + sVar2.l.b + sVar2.n.b);
                         cVar4.j(sVar2.b);
-                        cVar4.j(sVar2.f3062c);
+                        cVar4.j(sVar2.f3060c);
                         cVar4.j(sVar2.d);
                         cVar4.j(sVar2.e);
                         c cVar9 = sVar2.f;
@@ -1863,15 +1863,15 @@ public class f extends e {
                             i6 = 2;
                             a.o0(sVar2.a, str6, cVar4, 2);
                             cVar4.j(sVar2.q);
-                            if (this.f3042x != 0) {
+                            if (this.f3040x != 0) {
                                 a.o0(this.b, "NestHost", cVar4, i6);
-                                cVar4.j(this.f3042x);
+                                cVar4.j(this.f3040x);
                             }
-                            if (this.f3044z != null) {
+                            if (this.f3042z != null) {
                                 cVar4.j(this.b.l("NestMembers"));
-                                cVar4.i(this.f3044z.b + 2);
-                                cVar4.j(this.f3043y);
-                                c cVar15 = this.f3044z;
+                                cVar4.i(this.f3042z.b + 2);
+                                cVar4.j(this.f3041y);
+                                c cVar15 = this.f3042z;
                                 cVar4.h(cVar15.a, 0, cVar15.b);
                             }
                             bVar = this.A;
@@ -1882,9 +1882,9 @@ public class f extends e {
                         }
                     }
                     i6 = 2;
-                    if (this.f3042x != 0) {
+                    if (this.f3040x != 0) {
                     }
-                    if (this.f3044z != null) {
+                    if (this.f3042z != null) {
                     }
                     bVar = this.A;
                     if (bVar != null) {
@@ -1900,10 +1900,10 @@ public class f extends e {
 
     public final void c(int i, int i2, String str, String str2, String str3, String[] strArr) {
         this.a = i;
-        this.f3039c = i2;
+        this.f3037c = i2;
         v vVar = this.b;
         int i3 = i & 65535;
-        vVar.f3065c = i3;
+        vVar.f3063c = i3;
         vVar.d = str;
         this.d = vVar.m(7, str).a;
         if (str2 != null) {
diff --git a/app/src/main/java/g0/a/a/g.java b/app/src/main/java/g0/a/a/g.java
index 8849149457..9839c25a7c 100644
--- a/app/src/main/java/g0/a/a/g.java
+++ b/app/src/main/java/g0/a/a/g.java
@@ -7,13 +7,13 @@ public final class g {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f3045c;
+    public final n f3043c;
     public final Object[] d;
 
     public g(String str, String str2, n nVar, Object... objArr) {
         this.a = str;
         this.b = str2;
-        this.f3045c = nVar;
+        this.f3043c = nVar;
         this.d = objArr;
     }
 
@@ -25,14 +25,14 @@ public final class g {
             return false;
         }
         g gVar = (g) obj;
-        return this.a.equals(gVar.a) && this.b.equals(gVar.b) && this.f3045c.equals(gVar.f3045c) && Arrays.equals(this.d, gVar.d);
+        return this.a.equals(gVar.a) && this.b.equals(gVar.b) && this.f3043c.equals(gVar.f3043c) && Arrays.equals(this.d, gVar.d);
     }
 
     public int hashCode() {
-        return ((this.a.hashCode() ^ Integer.rotateLeft(this.b.hashCode(), 8)) ^ Integer.rotateLeft(this.f3045c.hashCode(), 16)) ^ Integer.rotateLeft(Arrays.hashCode(this.d), 24);
+        return ((this.a.hashCode() ^ Integer.rotateLeft(this.b.hashCode(), 8)) ^ Integer.rotateLeft(this.f3043c.hashCode(), 16)) ^ Integer.rotateLeft(Arrays.hashCode(this.d), 24);
     }
 
     public String toString() {
-        return this.a + " : " + this.b + ' ' + this.f3045c + ' ' + Arrays.toString(this.d);
+        return this.a + " : " + this.b + ' ' + this.f3043c + ' ' + Arrays.toString(this.d);
     }
 }
diff --git a/app/src/main/java/g0/a/a/h.java b/app/src/main/java/g0/a/a/h.java
index 9a0e297971..0019f64eb2 100644
--- a/app/src/main/java/g0/a/a/h.java
+++ b/app/src/main/java/g0/a/a/h.java
@@ -5,7 +5,7 @@ public final class h {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public char[] f3046c;
+    public char[] f3044c;
     public int d;
     public String e;
     public String f;
@@ -22,6 +22,6 @@ public final class h {
     public Object[] q;
 
     /* renamed from: r  reason: collision with root package name */
-    public int f3047r;
+    public int f3045r;
     public Object[] s;
 }
diff --git a/app/src/main/java/g0/a/a/i.java b/app/src/main/java/g0/a/a/i.java
index abb6e3064b..64dd1d6e5a 100644
--- a/app/src/main/java/g0/a/a/i.java
+++ b/app/src/main/java/g0/a/a/i.java
@@ -11,7 +11,7 @@ public final class i extends m {
         m mVar = new m(null);
         h(vVar, mVar, 0);
         this.b = mVar.b;
-        this.f3050c = mVar.f3050c;
+        this.f3048c = mVar.f3048c;
         this.f = 0;
         this.d = mVar.d;
         this.e = mVar.e;
diff --git a/app/src/main/java/g0/a/a/j.java b/app/src/main/java/g0/a/a/j.java
index 094d8b2b1b..b23726a701 100644
--- a/app/src/main/java/g0/a/a/j.java
+++ b/app/src/main/java/g0/a/a/j.java
@@ -5,11 +5,11 @@ public final class j {
     public final p b;
 
     /* renamed from: c  reason: collision with root package name */
-    public j f3048c;
+    public j f3046c;
 
     public j(int i, p pVar, j jVar) {
         this.a = i;
         this.b = pVar;
-        this.f3048c = jVar;
+        this.f3046c = jVar;
     }
 }
diff --git a/app/src/main/java/g0/a/a/l.java b/app/src/main/java/g0/a/a/l.java
index 89aaeb6fa3..3d51b29941 100644
--- a/app/src/main/java/g0/a/a/l.java
+++ b/app/src/main/java/g0/a/a/l.java
@@ -6,7 +6,7 @@ public final class l extends k {
     public final v b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f3049c;
+    public final int f3047c;
     public final int d;
     public final int e;
     public int f;
@@ -20,7 +20,7 @@ public final class l extends k {
     public l(v vVar, int i, String str, String str2, String str3, Object obj) {
         super(458752);
         this.b = vVar;
-        this.f3049c = i;
+        this.f3047c = i;
         this.d = vVar.l(str);
         this.e = vVar.l(str2);
         if (str3 != null) {
diff --git a/app/src/main/java/g0/a/a/m.java b/app/src/main/java/g0/a/a/m.java
index fd67130a8f..841889172f 100644
--- a/app/src/main/java/g0/a/a/m.java
+++ b/app/src/main/java/g0/a/a/m.java
@@ -10,7 +10,7 @@ public class m {
     public int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int[] f3050c;
+    public int[] f3048c;
     public int[] d;
     public int[] e;
     public short f;
@@ -222,7 +222,7 @@ public class m {
             } while (i == 16777216);
             i4 += i5;
         }
-        int[] iArr2 = this.f3050c;
+        int[] iArr2 = this.f3048c;
         int i7 = 0;
         int i8 = 0;
         while (i7 < iArr2.length) {
@@ -307,7 +307,7 @@ public class m {
                     i2 = this.b[i7];
                 } else {
                     if (i6 == 83886080) {
-                        int[] iArr = this.f3050c;
+                        int[] iArr = this.f3048c;
                         i2 = iArr[iArr.length - i7];
                     }
                     if (i != i4) {
@@ -358,7 +358,7 @@ public class m {
         int i3;
         int i4;
         int length = this.b.length;
-        int length2 = this.f3050c.length;
+        int length2 = this.f3048c.length;
         if (mVar.b == null) {
             mVar.b = new int[length];
             z2 = true;
@@ -384,7 +384,7 @@ public class m {
                         }
                         i3 = i4;
                     } else if (i8 == 83886080) {
-                        i4 = i7 + this.f3050c[length2 - (i6 & 1048575)];
+                        i4 = i7 + this.f3048c[length2 - (i6 & 1048575)];
                         if ((i6 & 1048576) != 0) {
                             if (i4 != 16777220) {
                             }
@@ -405,27 +405,27 @@ public class m {
             for (int i9 = 0; i9 < length; i9++) {
                 z2 |= g(vVar, this.b[i9], mVar.b, i9);
             }
-            if (mVar.f3050c == null) {
-                mVar.f3050c = new int[1];
+            if (mVar.f3048c == null) {
+                mVar.f3048c = new int[1];
                 z4 = true;
             } else {
                 z4 = z2;
             }
-            return g(vVar, i, mVar.f3050c, 0) | z4;
+            return g(vVar, i, mVar.f3048c, 0) | z4;
         }
-        int length3 = this.f3050c.length + this.f;
-        if (mVar.f3050c == null) {
-            mVar.f3050c = new int[(this.g + length3)];
+        int length3 = this.f3048c.length + this.f;
+        if (mVar.f3048c == null) {
+            mVar.f3048c = new int[(this.g + length3)];
             z3 = true;
         } else {
             z3 = z2;
         }
         for (int i10 = 0; i10 < length3; i10++) {
-            int i11 = this.f3050c[i10];
+            int i11 = this.f3048c[i10];
             if (this.i != null) {
                 i11 = e(vVar, i11);
             }
-            z3 |= g(vVar, i11, mVar.f3050c, i10);
+            z3 |= g(vVar, i11, mVar.f3048c, i10);
         }
         for (int i12 = 0; i12 < this.g; i12++) {
             int i13 = this.e[i12];
@@ -441,10 +441,10 @@ public class m {
                 if (this.i != null) {
                     i13 = e(vVar, i13);
                 }
-                z3 |= g(vVar, i13, mVar.f3050c, length3 + i12);
+                z3 |= g(vVar, i13, mVar.f3048c, length3 + i12);
             } else {
                 if (i15 == 83886080) {
-                    i2 = i14 + this.f3050c[length2 - (i13 & 1048575)];
+                    i2 = i14 + this.f3048c[length2 - (i13 & 1048575)];
                     if ((i13 & 1048576) != 0) {
                         if (i2 != 16777220) {
                         }
@@ -453,12 +453,12 @@ public class m {
                 }
                 if (this.i != null) {
                 }
-                z3 |= g(vVar, i13, mVar.f3050c, length3 + i12);
+                z3 |= g(vVar, i13, mVar.f3048c, length3 + i12);
             }
             i13 = 16777216;
             if (this.i != null) {
             }
-            z3 |= g(vVar, i13, mVar.f3050c, length3 + i12);
+            z3 |= g(vVar, i13, mVar.f3048c, length3 + i12);
         }
         return z3;
     }
@@ -537,7 +537,7 @@ public class m {
     public final void n(v vVar, int i, String str, int i2) {
         int[] iArr = new int[i2];
         this.b = iArr;
-        this.f3050c = new int[0];
+        this.f3048c = new int[0];
         int i3 = 1;
         if ((i & 8) != 0) {
             i3 = 0;
diff --git a/app/src/main/java/g0/a/a/n.java b/app/src/main/java/g0/a/a/n.java
index b30568bf72..f508991226 100644
--- a/app/src/main/java/g0/a/a/n.java
+++ b/app/src/main/java/g0/a/a/n.java
@@ -7,14 +7,14 @@ public final class n {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f3051c;
+    public final String f3049c;
     public final String d;
     public final boolean e;
 
     public n(int i, String str, String str2, String str3, boolean z2) {
         this.a = i;
         this.b = str;
-        this.f3051c = str2;
+        this.f3049c = str2;
         this.d = str3;
         this.e = z2;
     }
@@ -27,18 +27,18 @@ public final class n {
             return false;
         }
         n nVar = (n) obj;
-        return this.a == nVar.a && this.e == nVar.e && this.b.equals(nVar.b) && this.f3051c.equals(nVar.f3051c) && this.d.equals(nVar.d);
+        return this.a == nVar.a && this.e == nVar.e && this.b.equals(nVar.b) && this.f3049c.equals(nVar.f3049c) && this.d.equals(nVar.d);
     }
 
     public int hashCode() {
-        return (this.d.hashCode() * this.f3051c.hashCode() * this.b.hashCode()) + this.a + (this.e ? 64 : 0);
+        return (this.d.hashCode() * this.f3049c.hashCode() * this.b.hashCode()) + this.a + (this.e ? 64 : 0);
     }
 
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(this.b);
         sb.append('.');
-        sb.append(this.f3051c);
+        sb.append(this.f3049c);
         sb.append(this.d);
         sb.append(" (");
         sb.append(this.a);
diff --git a/app/src/main/java/g0/a/a/o.java b/app/src/main/java/g0/a/a/o.java
index 023149d186..4d8cd504b2 100644
--- a/app/src/main/java/g0/a/a/o.java
+++ b/app/src/main/java/g0/a/a/o.java
@@ -5,18 +5,18 @@ public final class o {
     public final p b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final p f3052c;
+    public final p f3050c;
     public final int d;
     public final String e;
     public o f;
 
     public o(o oVar, p pVar, p pVar2) {
-        p pVar3 = oVar.f3052c;
+        p pVar3 = oVar.f3050c;
         int i = oVar.d;
         String str = oVar.e;
         this.a = pVar;
         this.b = pVar2;
-        this.f3052c = pVar3;
+        this.f3050c = pVar3;
         this.d = i;
         this.e = str;
         this.f = oVar.f;
@@ -25,7 +25,7 @@ public final class o {
     public o(p pVar, p pVar2, p pVar3, int i, String str) {
         this.a = pVar;
         this.b = pVar2;
-        this.f3052c = pVar3;
+        this.f3050c = pVar3;
         this.d = i;
         this.e = str;
     }
diff --git a/app/src/main/java/g0/a/a/p.java b/app/src/main/java/g0/a/a/p.java
index a0881f4292..c1d4e90362 100644
--- a/app/src/main/java/g0/a/a/p.java
+++ b/app/src/main/java/g0/a/a/p.java
@@ -7,7 +7,7 @@ public class p {
     public short b;
 
     /* renamed from: c  reason: collision with root package name */
-    public short f3053c;
+    public short f3051c;
     public int[] d;
     public int e;
     public int[] f;
@@ -62,14 +62,14 @@ public class p {
     public final p d(p pVar) {
         j jVar = this.m;
         while (jVar != null) {
-            if (!((this.b & 16) != 0 && jVar == this.m.f3048c)) {
+            if (!((this.b & 16) != 0 && jVar == this.m.f3046c)) {
                 p pVar2 = jVar.b;
                 if (pVar2.n == null) {
                     pVar2.n = pVar;
                     pVar = pVar2;
                 }
             }
-            jVar = jVar.f3048c;
+            jVar = jVar.f3046c;
         }
         return pVar;
     }
diff --git a/app/src/main/java/g0/a/a/r.java b/app/src/main/java/g0/a/a/r.java
index 0480b96443..be856d81a2 100644
--- a/app/src/main/java/g0/a/a/r.java
+++ b/app/src/main/java/g0/a/a/r.java
@@ -8,7 +8,7 @@ import g0.a.a.v;
 public final class r extends q {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f3054c = {0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 1, 0, 0, 1, 2, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, -1, -1, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3, -4, -3, -4, -3, -3, -3, -3, -1, -2, 1, 1, 1, 2, 2, 2, 0, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -2, -1, -2, -1, -2, 0, 1, 0, 1, -1, -1, 0, 0, 1, 1, -1, 0, -1, 0, 0, 0, -3, -1, -1, -3, -3, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 0, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, -1, -1, 0, 0};
+    public static final int[] f3052c = {0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 1, 0, 0, 1, 2, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, -1, -1, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3, -4, -3, -4, -3, -3, -3, -3, -1, -2, 1, 1, 1, 2, 2, 2, 0, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -2, -1, -2, -1, -2, 0, 1, 0, 1, -1, -1, 0, 0, 1, 1, -1, 0, -1, 0, 0, 0, -3, -1, -1, -3, -3, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 0, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, -1, -1, 0, 0};
     public final int A;
     public a B;
     public a C;
@@ -37,10 +37,10 @@ public final class r extends q {
     public int Z;
 
     /* renamed from: a0  reason: collision with root package name */
-    public int f3055a0;
+    public int f3053a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public int f3056b0;
+    public int f3054b0;
     public final v d;
     public final int e;
     public final int f;
@@ -57,23 +57,23 @@ public final class r extends q {
     public int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public c f3057r;
+    public c f3055r;
     public int s;
     public c t;
     public int u;
     public c v;
 
     /* renamed from: w  reason: collision with root package name */
-    public a f3058w;
+    public a f3056w;
 
     /* renamed from: x  reason: collision with root package name */
-    public a f3059x;
+    public a f3057x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f3060y;
+    public final int f3058y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final int[] f3061z;
+    public final int[] f3059z;
 
     public r(v vVar, int i, String str, String str2, String str3, String[] strArr, int i2) {
         super(458752);
@@ -85,14 +85,14 @@ public final class r extends q {
         this.i = str2;
         this.A = str3 == null ? 0 : vVar.l(str3);
         if (strArr == null || strArr.length <= 0) {
-            this.f3060y = 0;
-            this.f3061z = null;
+            this.f3058y = 0;
+            this.f3059z = null;
         } else {
             int length = strArr.length;
-            this.f3060y = length;
-            this.f3061z = new int[length];
-            for (int i3 = 0; i3 < this.f3060y; i3++) {
-                this.f3061z[i3] = vVar.c(strArr[i3]).a;
+            this.f3058y = length;
+            this.f3059z = new int[length];
+            for (int i3 = 0; i3 < this.f3058y; i3++) {
+                this.f3059z[i3] = vVar.c(strArr[i3]).a;
             }
         }
         this.N = i2;
@@ -258,13 +258,13 @@ public final class r extends q {
                                 i10++;
                             }
                         }
-                        mVar.f3050c = new int[(i10 + i3)];
+                        mVar.f3048c = new int[(i10 + i3)];
                         int i12 = 0;
                         for (int i13 = 0; i13 < i3; i13++) {
                             int i14 = i12 + 1;
-                            mVar.f3050c[i12] = m.c(vVar, objArr2[i13]);
+                            mVar.f3048c[i12] = m.c(vVar, objArr2[i13]);
                             if (objArr2[i13] == t.e || objArr2[i13] == t.d) {
-                                mVar.f3050c[i14] = 16777216;
+                                mVar.f3048c[i14] = 16777216;
                                 i12 = i14 + 1;
                             } else {
                                 i12 = i14;
@@ -409,7 +409,7 @@ public final class r extends q {
             if (i2 == 4 || i2 == 3) {
                 pVar.k.b(i, 0, null, null);
             } else {
-                int i3 = this.R + f3054c[i];
+                int i3 = this.R + f3052c[i];
                 if (i3 > this.S) {
                     this.S = i3;
                 }
@@ -429,12 +429,12 @@ public final class r extends q {
         cVar.j(this.d.l(str));
         cVar.j(0);
         if (z2) {
-            a aVar = new a(this.d, true, cVar, this.f3058w);
-            this.f3058w = aVar;
+            a aVar = new a(this.d, true, cVar, this.f3056w);
+            this.f3056w = aVar;
             return aVar;
         }
-        a aVar2 = new a(this.d, true, cVar, this.f3059x);
-        this.f3059x = aVar2;
+        a aVar2 = new a(this.d, true, cVar, this.f3057x);
+        this.f3057x = aVar2;
         return aVar2;
     }
 
@@ -513,7 +513,7 @@ public final class r extends q {
             } else if (i4 == 3) {
                 pVar2.k.b(i3, 0, null, null);
             } else if (i4 == 2) {
-                this.R += f3054c[i3];
+                this.R += f3052c[i3];
             } else if (i3 == 168) {
                 short s = pVar.b;
                 if ((s & 32) == 0) {
@@ -524,7 +524,7 @@ public final class r extends q {
                 u(this.R + 1, pVar);
                 pVar3 = new p();
             } else {
-                int i5 = this.R + f3054c[i3];
+                int i5 = this.R + f3052c[i3];
                 this.R = i5;
                 u(i5, pVar);
             }
@@ -658,11 +658,11 @@ public final class r extends q {
             cVar.j(this.d.l(str3));
             cVar.j(i);
         }
-        if (this.f3057r == null) {
-            this.f3057r = new c();
+        if (this.f3055r == null) {
+            this.f3055r = new c();
         }
         this.q++;
-        c cVar2 = this.f3057r;
+        c cVar2 = this.f3055r;
         cVar2.j(pVar.e);
         cVar2.j(pVar2.e - pVar.e);
         cVar2.j(this.d.l(str));
@@ -694,12 +694,12 @@ public final class r extends q {
         cVar.j(this.d.l(str));
         cVar.j(0);
         if (z2) {
-            a aVar = new a(this.d, true, cVar, this.f3058w);
-            this.f3058w = aVar;
+            a aVar = new a(this.d, true, cVar, this.f3056w);
+            this.f3056w = aVar;
             return aVar;
         }
-        a aVar2 = new a(this.d, true, cVar, this.f3059x);
-        this.f3059x = aVar2;
+        a aVar2 = new a(this.d, true, cVar, this.f3057x);
+        this.f3057x = aVar2;
         return aVar2;
     }
 
@@ -719,7 +719,7 @@ public final class r extends q {
                     str = str2;
                 }
                 int n = 33554432 | this.d.n(str);
-                p b = oVar.f3052c.b();
+                p b = oVar.f3050c.b();
                 b.b = (short) (b.b | 2);
                 p b2 = oVar.b.b();
                 for (p b3 = oVar.a.b(); b3 != b2; b3 = b3.l) {
@@ -737,11 +737,11 @@ public final class r extends q {
                 p pVar2 = pVar.n;
                 pVar.n = null;
                 pVar.b = (short) (pVar.b | 8);
-                int length = pVar.k.f3050c.length + pVar.i;
+                int length = pVar.k.f3048c.length + pVar.i;
                 if (length > i4) {
                     i4 = length;
                 }
-                for (j jVar = pVar.m; jVar != null; jVar = jVar.f3048c) {
+                for (j jVar = pVar.m; jVar != null; jVar = jVar.f3046c) {
                     p b4 = jVar.b.b();
                     if (pVar.k.h(this.d, b4.k, jVar.a) && b4.n == null) {
                         b4.n = pVar2;
@@ -774,14 +774,14 @@ public final class r extends q {
             this.j = i4;
         } else if (i3 == 1) {
             for (o oVar2 = this.m; oVar2 != null; oVar2 = oVar2.f) {
-                p pVar5 = oVar2.f3052c;
+                p pVar5 = oVar2.f3050c;
                 p pVar6 = oVar2.b;
                 for (p pVar7 = oVar2.a; pVar7 != pVar6; pVar7 = pVar7.l) {
                     if ((pVar7.b & 16) == 0) {
                         pVar7.m = new j(Integer.MAX_VALUE, pVar5, pVar7.m);
                     } else {
-                        j jVar2 = pVar7.m.f3048c;
-                        jVar2.f3048c = new j(Integer.MAX_VALUE, pVar5, jVar2.f3048c);
+                        j jVar2 = pVar7.m.f3046c;
+                        jVar2.f3046c = new j(Integer.MAX_VALUE, pVar5, jVar2.f3046c);
                     }
                 }
             }
@@ -791,7 +791,7 @@ public final class r extends q {
                 for (short s2 = 1; s2 <= s; s2 = (short) (s2 + 1)) {
                     for (p pVar8 = this.O; pVar8 != null; pVar8 = pVar8.l) {
                         if ((pVar8.b & 16) != 0 && pVar8.j == s2) {
-                            p pVar9 = pVar8.m.f3048c.b;
+                            p pVar9 = pVar8.m.f3046c.b;
                             if (pVar9.j == 0) {
                                 s = (short) (s + 1);
                                 pVar9.c(s);
@@ -801,7 +801,7 @@ public final class r extends q {
                 }
                 for (p pVar10 = this.O; pVar10 != null; pVar10 = pVar10.l) {
                     if ((pVar10.b & 16) != 0) {
-                        p pVar11 = pVar10.m.f3048c.b;
+                        p pVar11 = pVar10.m.f3046c.b;
                         p pVar12 = p.a;
                         pVar11.n = pVar12;
                         while (pVar11 != p.a) {
@@ -833,7 +833,7 @@ public final class r extends q {
                 }
                 j jVar3 = pVar15.m;
                 if ((pVar15.b & 16) != 0) {
-                    jVar3 = jVar3.f3048c;
+                    jVar3 = jVar3.f3046c;
                 }
                 pVar15 = pVar16;
                 while (jVar3 != null) {
@@ -844,7 +844,7 @@ public final class r extends q {
                         pVar17.n = pVar15;
                         pVar15 = pVar17;
                     }
-                    jVar3 = jVar3.f3048c;
+                    jVar3 = jVar3.f3046c;
                 }
             }
             this.j = i8;
@@ -959,7 +959,7 @@ public final class r extends q {
                 pVar.h = (short) this.R;
                 v();
             } else {
-                int i4 = this.R + f3054c[i];
+                int i4 = this.R + f3052c[i];
                 if (i4 > this.S) {
                     this.S = i4;
                 }
@@ -1085,17 +1085,17 @@ public final class r extends q {
 
     public void y(c cVar) {
         int i;
-        boolean z2 = this.d.f3065c < 49;
+        boolean z2 = this.d.f3063c < 49;
         cVar.j((~(z2 ? 4096 : 0)) & this.e);
         cVar.j(this.f);
         cVar.j(this.h);
-        int i2 = this.f3055a0;
+        int i2 = this.f3053a0;
         if (i2 != 0) {
-            cVar.h(this.d.b.a, i2, this.f3056b0);
+            cVar.h(this.d.b.a, i2, this.f3054b0);
             return;
         }
         int i3 = this.l.b > 0 ? 1 : 0;
-        if (this.f3060y > 0) {
+        if (this.f3058y > 0) {
             i3++;
         }
         int i4 = this.e;
@@ -1157,7 +1157,7 @@ public final class r extends q {
                 i8 += cVar3.b + 8;
                 i++;
             }
-            c cVar4 = this.f3057r;
+            c cVar4 = this.f3055r;
             if (cVar4 != null) {
                 i8 += cVar4.b + 8;
                 i++;
@@ -1167,12 +1167,12 @@ public final class r extends q {
                 i8 += cVar5.b + 8;
                 i++;
             }
-            a aVar = this.f3058w;
+            a aVar = this.f3056w;
             if (aVar != null) {
                 i8 += aVar.a("RuntimeVisibleTypeAnnotations");
                 i++;
             }
-            a aVar2 = this.f3059x;
+            a aVar2 = this.f3057x;
             if (aVar2 != null) {
                 i8 += aVar2.a("RuntimeInvisibleTypeAnnotations");
                 i++;
@@ -1192,14 +1192,14 @@ public final class r extends q {
             while (oVar2 != null) {
                 cVar.j(oVar2.a.e);
                 cVar.j(oVar2.b.e);
-                cVar.j(oVar2.f3052c.e);
+                cVar.j(oVar2.f3050c.e);
                 cVar.j(oVar2.d);
                 oVar2 = oVar2.f;
             }
             cVar.j(i);
             if (this.v != null) {
                 v vVar = this.d;
-                cVar.j(vVar.l(vVar.f3065c >= 50 ? "StackMapTable" : "StackMap"));
+                cVar.j(vVar.l(vVar.f3063c >= 50 ? "StackMapTable" : "StackMap"));
                 cVar.i(this.v.b + 2);
                 cVar.j(this.u);
                 c cVar7 = this.v;
@@ -1212,11 +1212,11 @@ public final class r extends q {
                 c cVar8 = this.p;
                 cVar.h(cVar8.a, 0, cVar8.b);
             }
-            if (this.f3057r != null) {
+            if (this.f3055r != null) {
                 cVar.j(this.d.l("LocalVariableTable"));
-                cVar.i(this.f3057r.b + 2);
+                cVar.i(this.f3055r.b + 2);
                 cVar.j(this.q);
-                c cVar9 = this.f3057r;
+                c cVar9 = this.f3055r;
                 cVar.h(cVar9.a, 0, cVar9.b);
             }
             if (this.t != null) {
@@ -1226,20 +1226,20 @@ public final class r extends q {
                 c cVar10 = this.t;
                 cVar.h(cVar10.a, 0, cVar10.b);
             }
-            a aVar3 = this.f3058w;
+            a aVar3 = this.f3056w;
             if (aVar3 != null) {
                 aVar3.c(this.d.l("RuntimeVisibleTypeAnnotations"), cVar);
             }
-            a aVar4 = this.f3059x;
+            a aVar4 = this.f3057x;
             if (aVar4 != null) {
                 aVar4.c(this.d.l("RuntimeInvisibleTypeAnnotations"), cVar);
             }
         }
-        if (this.f3060y > 0) {
+        if (this.f3058y > 0) {
             cVar.j(this.d.l("Exceptions"));
-            cVar.i((this.f3060y * 2) + 2);
-            cVar.j(this.f3060y);
-            for (int i10 : this.f3061z) {
+            cVar.i((this.f3058y * 2) + 2);
+            cVar.j(this.f3058y);
+            for (int i10 : this.f3059z) {
                 cVar.j(i10);
             }
         }
@@ -1320,7 +1320,7 @@ public final class r extends q {
             int i = iArr2[1];
             int i2 = iArr2[2];
             int i3 = 0;
-            if (this.d.f3065c < 50) {
+            if (this.d.f3063c < 50) {
                 c cVar = this.v;
                 cVar.j(iArr2[0]);
                 cVar.j(i);
diff --git a/app/src/main/java/g0/a/a/s.java b/app/src/main/java/g0/a/a/s.java
index d60754353f..35a46221c3 100644
--- a/app/src/main/java/g0/a/a/s.java
+++ b/app/src/main/java/g0/a/a/s.java
@@ -5,7 +5,7 @@ public final class s {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f3062c;
+    public final int f3060c;
     public final int d;
     public int e;
     public final c f = new c();
@@ -24,7 +24,7 @@ public final class s {
     public s(v vVar, int i, int i2, int i3) {
         this.a = vVar;
         this.b = i;
-        this.f3062c = i2;
+        this.f3060c = i2;
         this.d = i3;
     }
 }
diff --git a/app/src/main/java/g0/a/a/t.java b/app/src/main/java/g0/a/a/t.java
index 13c80b176b..d72db1b953 100644
--- a/app/src/main/java/g0/a/a/t.java
+++ b/app/src/main/java/g0/a/a/t.java
@@ -5,7 +5,7 @@ public interface t {
     public static final Integer b = 1;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Integer f3063c = 2;
+    public static final Integer f3061c = 2;
     public static final Integer d = 3;
     public static final Integer e = 4;
     public static final Integer f = 5;
diff --git a/app/src/main/java/g0/a/a/u.java b/app/src/main/java/g0/a/a/u.java
index bdee4a0438..39df28ca2a 100644
--- a/app/src/main/java/g0/a/a/u.java
+++ b/app/src/main/java/g0/a/a/u.java
@@ -5,7 +5,7 @@ public abstract class u {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f3064c;
+    public final String f3062c;
     public final String d;
     public final String e;
     public final long f;
@@ -14,7 +14,7 @@ public abstract class u {
     public u(int i, int i2, String str, String str2, String str3, long j) {
         this.a = i;
         this.b = i2;
-        this.f3064c = str;
+        this.f3062c = str;
         this.d = str2;
         this.e = str3;
         this.f = j;
diff --git a/app/src/main/java/g0/a/a/v.java b/app/src/main/java/g0/a/a/v.java
index 2378c448c8..15f32f4090 100644
--- a/app/src/main/java/g0/a/a/v.java
+++ b/app/src/main/java/g0/a/a/v.java
@@ -5,7 +5,7 @@ public final class v {
     public final d b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f3065c;
+    public int f3063c;
     public String d;
     public int e;
     public a[] f = new a[256];
@@ -78,7 +78,7 @@ public final class v {
             b(obj);
         }
         int i = cVar.b;
-        cVar.j(i(nVar.a, nVar.b, nVar.f3051c, nVar.d, nVar.e).a);
+        cVar.j(i(nVar.a, nVar.b, nVar.f3049c, nVar.d, nVar.e).a);
         cVar.j(objArr.length);
         for (Object obj2 : objArr) {
             cVar.j(b(obj2).a);
@@ -153,10 +153,10 @@ public final class v {
             return i == 10 ? c(wVar.g()) : i == 11 ? m(16, wVar.d()) : c(wVar.d());
         } else if (obj instanceof n) {
             n nVar = (n) obj;
-            return i(nVar.a, nVar.b, nVar.f3051c, nVar.d, nVar.e);
+            return i(nVar.a, nVar.b, nVar.f3049c, nVar.d, nVar.e);
         } else if (obj instanceof g) {
             g gVar = (g) obj;
-            return d(17, gVar.a, gVar.b, a(gVar.f3045c, gVar.d).a);
+            return d(17, gVar.a, gVar.b, a(gVar.f3043c, gVar.d).a);
         } else {
             throw new IllegalArgumentException(c.d.b.a.a.t("value ", obj));
         }
@@ -244,7 +244,7 @@ public final class v {
     public final a h(int i, String str, String str2, String str3) {
         int t = t(i, str, str2, str3);
         for (a q = q(t); q != null; q = q.i) {
-            if (q.b == i && q.h == t && q.f3064c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
+            if (q.b == i && q.h == t && q.f3062c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
                 return q;
             }
         }
@@ -259,7 +259,7 @@ public final class v {
     public u i(int i, String str, String str2, String str3, boolean z2) {
         int u = u(15, str, str2, str3, i);
         for (a q = q(u); q != null; q = q.i) {
-            if (q.b == 15 && q.h == u && q.f == ((long) i) && q.f3064c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
+            if (q.b == 15 && q.h == u && q.f == ((long) i) && q.f3062c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
                 return q;
             }
         }
diff --git a/app/src/main/java/g0/a/a/w.java b/app/src/main/java/g0/a/a/w.java
index 55377d3524..d464751921 100644
--- a/app/src/main/java/g0/a/a/w.java
+++ b/app/src/main/java/g0/a/a/w.java
@@ -9,7 +9,7 @@ public final class w {
     public static final w b = new w(1, "VZCBSIFJD", 1, 2);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final w f3066c = new w(2, "VZCBSIFJD", 2, 3);
+    public static final w f3064c = new w(2, "VZCBSIFJD", 2, 3);
     public static final w d = new w(3, "VZCBSIFJD", 3, 4);
     public static final w e = new w(4, "VZCBSIFJD", 4, 5);
     public static final w f = new w(5, "VZCBSIFJD", 5, 6);
@@ -157,7 +157,7 @@ public final class w {
                 return d;
             }
             if (cls == Character.TYPE) {
-                return f3066c;
+                return f3064c;
             }
             if (cls == Short.TYPE) {
                 return e;
@@ -208,7 +208,7 @@ public final class w {
             case 'B':
                 return d;
             case 'C':
-                return f3066c;
+                return f3064c;
             case 'D':
                 return i;
             default:
diff --git a/app/src/main/java/g0/b/a/b/b.java b/app/src/main/java/g0/b/a/b/b.java
index 517aa73bcc..badc5fc810 100644
--- a/app/src/main/java/g0/b/a/b/b.java
+++ b/app/src/main/java/g0/b/a/b/b.java
@@ -11,7 +11,7 @@ public class b<T> implements a<T> {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Integer f3067c;
+    public final Integer f3065c;
 
     public b(Class<T> cls) {
         this.a = cls;
@@ -22,7 +22,7 @@ public class b<T> implements a<T> {
             try {
                 Method declaredMethod2 = ObjectStreamClass.class.getDeclaredMethod("getConstructorId", Class.class);
                 declaredMethod2.setAccessible(true);
-                this.f3067c = (Integer) declaredMethod2.invoke(null, Object.class);
+                this.f3065c = (Integer) declaredMethod2.invoke(null, Object.class);
             } catch (RuntimeException e) {
                 throw new ObjenesisException(e);
             } catch (NoSuchMethodException e2) {
@@ -43,7 +43,7 @@ public class b<T> implements a<T> {
     public T newInstance() {
         try {
             Class<T> cls = this.a;
-            return cls.cast(this.b.invoke(null, cls, this.f3067c));
+            return cls.cast(this.b.invoke(null, cls, this.f3065c));
         } catch (Exception e) {
             throw new ObjenesisException(e);
         }
diff --git a/app/src/main/java/g0/b/a/b/c.java b/app/src/main/java/g0/b/a/b/c.java
index dd05390eae..0d83249ddc 100644
--- a/app/src/main/java/g0/b/a/b/c.java
+++ b/app/src/main/java/g0/b/a/b/c.java
@@ -11,7 +11,7 @@ public class c<T> implements a<T> {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Long f3068c;
+    public final Long f3066c;
 
     public c(Class<T> cls) {
         this.a = cls;
@@ -22,7 +22,7 @@ public class c<T> implements a<T> {
             try {
                 Method declaredMethod2 = ObjectStreamClass.class.getDeclaredMethod("getConstructorId", Class.class);
                 declaredMethod2.setAccessible(true);
-                this.f3068c = (Long) declaredMethod2.invoke(null, Object.class);
+                this.f3066c = (Long) declaredMethod2.invoke(null, Object.class);
             } catch (RuntimeException e) {
                 throw new ObjenesisException(e);
             } catch (NoSuchMethodException e2) {
@@ -43,7 +43,7 @@ public class c<T> implements a<T> {
     public T newInstance() {
         try {
             Class<T> cls = this.a;
-            return cls.cast(this.b.invoke(null, cls, this.f3068c));
+            return cls.cast(this.b.invoke(null, cls, this.f3066c));
         } catch (Exception e) {
             throw new ObjenesisException(e);
         }
diff --git a/app/src/main/java/g0/b/a/d/a.java b/app/src/main/java/g0/b/a/d/a.java
index c125a626c3..ca9a99ffb2 100644
--- a/app/src/main/java/g0/b/a/d/a.java
+++ b/app/src/main/java/g0/b/a/d/a.java
@@ -11,7 +11,7 @@ public class a<T> extends b<T> {
     @Override // g0.b.a.a
     public T newInstance() {
         try {
-            Class<T> cls = this.f3069c;
+            Class<T> cls = this.f3067c;
             return cls.cast(b.a.invoke(b.b, cls, Object.class));
         } catch (RuntimeException e) {
             throw new ObjenesisException(e);
diff --git a/app/src/main/java/g0/b/a/d/b.java b/app/src/main/java/g0/b/a/d/b.java
index a4338c55f2..0c8b560d52 100644
--- a/app/src/main/java/g0/b/a/d/b.java
+++ b/app/src/main/java/g0/b/a/d/b.java
@@ -10,14 +10,14 @@ public abstract class b<T> implements g0.b.a.a<T> {
     public static ObjectInputStream b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Class<T> f3069c;
+    public final Class<T> f3067c;
 
     /* compiled from: GCJInstantiatorBase */
     public static class a extends ObjectInputStream {
     }
 
     public b(Class<T> cls) {
-        this.f3069c = cls;
+        this.f3067c = cls;
         if (a == null) {
             try {
                 Method declaredMethod = ObjectInputStream.class.getDeclaredMethod("newObject", Class.class, Class.class);
diff --git a/app/src/main/java/g0/b/b/b.java b/app/src/main/java/g0/b/b/b.java
index fdd363c214..333952fcb4 100644
--- a/app/src/main/java/g0/b/b/b.java
+++ b/app/src/main/java/g0/b/b/b.java
@@ -7,7 +7,7 @@ public final class b {
     public static final int b = a();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final boolean f3070c;
+    public static final boolean f3068c;
     public static final String d = System.getProperty("com.google.appengine.runtime.version");
 
     static {
@@ -21,7 +21,7 @@ public final class b {
         if (!(a() == 0 || (property = System.getProperty("java.boot.class.path")) == null || !property.toLowerCase().contains("core-oj.jar"))) {
             z2 = true;
         }
-        f3070c = z2;
+        f3068c = z2;
     }
 
     public static int a() {
diff --git a/app/src/main/java/g0/b/b/c.java b/app/src/main/java/g0/b/b/c.java
index 74190112da..a7991ff7f8 100644
--- a/app/src/main/java/g0/b/b/c.java
+++ b/app/src/main/java/g0/b/b/c.java
@@ -12,7 +12,7 @@ public class c implements a {
         } else if (!b.b("Dalvik")) {
             return b.b("BEA") ? new g0.b.a.f.a(cls) : b.b("GNU libgcj") ? new g0.b.a.d.a(cls) : b.b("PERC") ? new g0.b.a.e.a(cls) : new g0.b.a.f.b(cls);
         } else {
-            if (b.f3070c) {
+            if (b.f3068c) {
                 return new g0.b.a.f.b(cls);
             }
             int i = b.b;
diff --git a/app/src/main/java/h0/d0/a/f.java b/app/src/main/java/h0/d0/a/f.java
index 49eab2e3dc..7e53a8ee79 100644
--- a/app/src/main/java/h0/d0/a/f.java
+++ b/app/src/main/java/h0/d0/a/f.java
@@ -15,14 +15,14 @@ public final class f<R> implements e<R, Object> {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f3071c;
+    public final boolean f3069c;
     public final boolean d;
     public final boolean e;
 
     public f(Type type, Scheduler scheduler, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6) {
         this.a = type;
         this.b = z3;
-        this.f3071c = z4;
+        this.f3069c = z4;
         this.d = z5;
         this.e = z6;
     }
@@ -41,7 +41,7 @@ public final class f<R> implements e<R, Object> {
         if (this.b) {
             aVar = new e(cVar);
         } else {
-            if (this.f3071c) {
+            if (this.f3069c) {
                 aVar = new a(cVar);
             }
             Observable observable = new Observable(l.a(cVar));
diff --git a/app/src/main/java/h0/e0/a/b.java b/app/src/main/java/h0/e0/a/b.java
index 0a6d17457e..026f13459e 100644
--- a/app/src/main/java/h0/e0/a/b.java
+++ b/app/src/main/java/h0/e0/a/b.java
@@ -18,15 +18,15 @@ public final class b<T> implements h<T, RequestBody> {
     public static final Charset b = Charset.forName(Constants.ENCODING);
 
     /* renamed from: c  reason: collision with root package name */
-    public final Gson f3072c;
+    public final Gson f3070c;
     public final TypeAdapter<T> d;
 
     static {
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
     }
 
     public b(Gson gson, TypeAdapter<T> typeAdapter) {
-        this.f3072c = gson;
+        this.f3070c = gson;
         this.d = typeAdapter;
     }
 
@@ -34,7 +34,7 @@ public final class b<T> implements h<T, RequestBody> {
     @Override // h0.h
     public RequestBody convert(Object obj) throws IOException {
         e eVar = new e();
-        JsonWriter l = this.f3072c.l(new OutputStreamWriter(new f(eVar), b));
+        JsonWriter l = this.f3070c.l(new OutputStreamWriter(new f(eVar), b));
         this.d.write(l, obj);
         l.close();
         return RequestBody.create(a, eVar.x());
diff --git a/app/src/main/java/h0/e0/b/a.java b/app/src/main/java/h0/e0/b/a.java
index da686cd1b8..610ac67b3f 100644
--- a/app/src/main/java/h0/e0/b/a.java
+++ b/app/src/main/java/h0/e0/b/a.java
@@ -10,7 +10,7 @@ public final class a<T> implements h<T, RequestBody> {
     public static final MediaType b = MediaType.a.a("text/plain; charset=UTF-8");
 
     static {
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/h0/j.java b/app/src/main/java/h0/j.java
index db7db1a8a7..4d01023cd9 100644
--- a/app/src/main/java/h0/j.java
+++ b/app/src/main/java/h0/j.java
@@ -11,7 +11,7 @@ public abstract class j<ResponseT, ReturnT> extends z<ReturnT> {
     public final e.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final h<ResponseBody, ResponseT> f3073c;
+    public final h<ResponseBody, ResponseT> f3071c;
 
     /* compiled from: HttpServiceMethod */
     public static final class a<ResponseT, ReturnT> extends j<ResponseT, ReturnT> {
@@ -87,12 +87,12 @@ public abstract class j<ResponseT, ReturnT> extends z<ReturnT> {
     public j(w wVar, e.a aVar, h<ResponseBody, ResponseT> hVar) {
         this.a = wVar;
         this.b = aVar;
-        this.f3073c = hVar;
+        this.f3071c = hVar;
     }
 
     @Override // h0.z
     public final ReturnT a(Object[] objArr) {
-        return c(new p(this.a, objArr, this.b, this.f3073c), objArr);
+        return c(new p(this.a, objArr, this.b, this.f3071c), objArr);
     }
 
     public abstract ReturnT c(d<ResponseT> dVar, Object[] objArr);
diff --git a/app/src/main/java/h0/p.java b/app/src/main/java/h0/p.java
index 4e026d8bc5..a18bd41825 100644
--- a/app/src/main/java/h0/p.java
+++ b/app/src/main/java/h0/p.java
@@ -200,7 +200,7 @@ public final class p<T> implements d<T> {
         t<?>[] tVarArr = wVar2.j;
         int length = objArr.length;
         if (length == tVarArr.length) {
-            v vVar = new v(wVar2.f3085c, wVar2.b, wVar2.d, wVar2.e, wVar2.f, wVar2.g, wVar2.h, wVar2.i);
+            v vVar = new v(wVar2.f3083c, wVar2.b, wVar2.d, wVar2.e, wVar2.f, wVar2.g, wVar2.h, wVar2.i);
             if (wVar2.k) {
                 length--;
             }
@@ -255,8 +255,8 @@ public final class p<T> implements d<T> {
             aVar6.g(wVar);
             Headers c2 = vVar.h.c();
             m.checkParameterIsNotNull(c2, "headers");
-            aVar6.f3128c = c2.e();
-            aVar6.c(vVar.f3084c, aVar5);
+            aVar6.f3126c = c2.e();
+            aVar6.c(vVar.f3082c, aVar5);
             aVar6.e(k.class, new k(wVar2.a, arrayList));
             e b2 = aVar.b(aVar6.a());
             Objects.requireNonNull(b2, "Call.Factory returned null.");
@@ -359,7 +359,7 @@ public final class p<T> implements d<T> {
         Headers.a e = response.n.e();
         Response response2 = response.p;
         Response response3 = response.q;
-        Response response4 = response.f3130r;
+        Response response4 = response.f3128r;
         long j = response.s;
         long j2 = response.t;
         e0.e0.g.c cVar = response.u;
diff --git a/app/src/main/java/h0/t.java b/app/src/main/java/h0/t.java
index d746efc1e0..e343cd6c9b 100644
--- a/app/src/main/java/h0/t.java
+++ b/app/src/main/java/h0/t.java
@@ -16,19 +16,19 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, RequestBody> f3074c;
+        public final h<T, RequestBody> f3072c;
 
         public a(Method method, int i, h<T, RequestBody> hVar) {
             this.a = method;
             this.b = i;
-            this.f3074c = hVar;
+            this.f3072c = hVar;
         }
 
         @Override // h0.t
         public void a(v vVar, T t) {
             if (t != null) {
                 try {
-                    vVar.m = this.f3074c.convert(t);
+                    vVar.m = this.f3072c.convert(t);
                 } catch (IOException e) {
                     Method method = this.a;
                     int i = this.b;
@@ -46,20 +46,20 @@ public abstract class t<T> {
         public final h<T, String> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f3075c;
+        public final boolean f3073c;
 
         public b(String str, h<T, String> hVar, boolean z2) {
             Objects.requireNonNull(str, "name == null");
             this.a = str;
             this.b = hVar;
-            this.f3075c = z2;
+            this.f3073c = z2;
         }
 
         @Override // h0.t
         public void a(v vVar, T t) throws IOException {
             String convert;
             if (t != null && (convert = this.b.convert(t)) != null) {
-                vVar.a(this.a, convert, this.f3075c);
+                vVar.a(this.a, convert, this.f3073c);
             }
         }
     }
@@ -70,13 +70,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, String> f3076c;
+        public final h<T, String> f3074c;
         public final boolean d;
 
         public c(Method method, int i, h<T, String> hVar, boolean z2) {
             this.a = method;
             this.b = i;
-            this.f3076c = hVar;
+            this.f3074c = hVar;
             this.d = z2;
         }
 
@@ -91,13 +91,13 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            String str2 = (String) this.f3076c.convert(value);
+                            String str2 = (String) this.f3074c.convert(value);
                             if (str2 != null) {
                                 vVar.a(str, str2, this.d);
                             } else {
                                 Method method = this.a;
                                 int i = this.b;
-                                throw c0.l(method, i, "Field map value '" + value + "' converted to null by " + this.f3076c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
+                                throw c0.l(method, i, "Field map value '" + value + "' converted to null by " + this.f3074c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
                             }
                         } else {
                             throw c0.l(this.a, this.b, c.d.b.a.a.v("Field map contained null value for key '", str, "'."), new Object[0]);
@@ -138,12 +138,12 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, String> f3077c;
+        public final h<T, String> f3075c;
 
         public e(Method method, int i, h<T, String> hVar) {
             this.a = method;
             this.b = i;
-            this.f3077c = hVar;
+            this.f3075c = hVar;
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r3v1, resolved type: h0.h<T, java.lang.String> */
@@ -157,7 +157,7 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            vVar.b(str, (String) this.f3077c.convert(value));
+                            vVar.b(str, (String) this.f3075c.convert(value));
                         } else {
                             throw c0.l(this.a, this.b, c.d.b.a.a.v("Header map contained null value for key '", str, "'."), new Object[0]);
                         }
@@ -205,13 +205,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Headers f3078c;
+        public final Headers f3076c;
         public final h<T, RequestBody> d;
 
         public g(Method method, int i, Headers headers, h<T, RequestBody> hVar) {
             this.a = method;
             this.b = i;
-            this.f3078c = headers;
+            this.f3076c = headers;
             this.d = hVar;
         }
 
@@ -219,7 +219,7 @@ public abstract class t<T> {
         public void a(v vVar, T t) {
             if (t != null) {
                 try {
-                    vVar.c(this.f3078c, this.d.convert(t));
+                    vVar.c(this.f3076c, this.d.convert(t));
                 } catch (IOException e) {
                     Method method = this.a;
                     int i = this.b;
@@ -235,13 +235,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, RequestBody> f3079c;
+        public final h<T, RequestBody> f3077c;
         public final String d;
 
         public h(Method method, int i, h<T, RequestBody> hVar, String str) {
             this.a = method;
             this.b = i;
-            this.f3079c = hVar;
+            this.f3077c = hVar;
             this.d = str;
         }
 
@@ -256,7 +256,7 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            vVar.c(Headers.i.c("Content-Disposition", c.d.b.a.a.v("form-data; name=\"", str, "\""), "Content-Transfer-Encoding", this.d), (RequestBody) this.f3079c.convert(value));
+                            vVar.c(Headers.i.c("Content-Disposition", c.d.b.a.a.v("form-data; name=\"", str, "\""), "Content-Transfer-Encoding", this.d), (RequestBody) this.f3077c.convert(value));
                         } else {
                             throw c0.l(this.a, this.b, c.d.b.a.a.v("Part map contained null value for key '", str, "'."), new Object[0]);
                         }
@@ -276,7 +276,7 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f3080c;
+        public final String f3078c;
         public final h<T, String> d;
         public final boolean e;
 
@@ -284,7 +284,7 @@ public abstract class t<T> {
             this.a = method;
             this.b = i;
             Objects.requireNonNull(str, "name == null");
-            this.f3080c = str;
+            this.f3078c = str;
             this.d = hVar;
             this.e = z2;
         }
@@ -295,7 +295,7 @@ public abstract class t<T> {
             int i;
             int i2;
             if (t != null) {
-                String str2 = this.f3080c;
+                String str2 = this.f3078c;
                 String convert = this.d.convert(t);
                 boolean z2 = this.e;
                 if (vVar.e != null) {
@@ -351,7 +351,7 @@ public abstract class t<T> {
                 }
                 throw new AssertionError();
             }
-            throw c0.l(this.a, this.b, c.d.b.a.a.G(c.d.b.a.a.O("Path parameter \""), this.f3080c, "\" value must not be null."), new Object[0]);
+            throw c0.l(this.a, this.b, c.d.b.a.a.G(c.d.b.a.a.O("Path parameter \""), this.f3078c, "\" value must not be null."), new Object[0]);
         }
     }
 
@@ -361,20 +361,20 @@ public abstract class t<T> {
         public final h<T, String> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f3081c;
+        public final boolean f3079c;
 
         public j(String str, h<T, String> hVar, boolean z2) {
             Objects.requireNonNull(str, "name == null");
             this.a = str;
             this.b = hVar;
-            this.f3081c = z2;
+            this.f3079c = z2;
         }
 
         @Override // h0.t
         public void a(v vVar, T t) throws IOException {
             String convert;
             if (t != null && (convert = this.b.convert(t)) != null) {
-                vVar.d(this.a, convert, this.f3081c);
+                vVar.d(this.a, convert, this.f3079c);
             }
         }
     }
@@ -385,13 +385,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, String> f3082c;
+        public final h<T, String> f3080c;
         public final boolean d;
 
         public k(Method method, int i, h<T, String> hVar, boolean z2) {
             this.a = method;
             this.b = i;
-            this.f3082c = hVar;
+            this.f3080c = hVar;
             this.d = z2;
         }
 
@@ -406,13 +406,13 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            String str2 = (String) this.f3082c.convert(value);
+                            String str2 = (String) this.f3080c.convert(value);
                             if (str2 != null) {
                                 vVar.d(str, str2, this.d);
                             } else {
                                 Method method = this.a;
                                 int i = this.b;
-                                throw c0.l(method, i, "Query map value '" + value + "' converted to null by " + this.f3082c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
+                                throw c0.l(method, i, "Query map value '" + value + "' converted to null by " + this.f3080c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
                             }
                         } else {
                             throw c0.l(this.a, this.b, c.d.b.a.a.v("Query map contained null value for key '", str, "'."), new Object[0]);
diff --git a/app/src/main/java/h0/u.java b/app/src/main/java/h0/u.java
index eec902906c..6296e6ccaf 100644
--- a/app/src/main/java/h0/u.java
+++ b/app/src/main/java/h0/u.java
@@ -14,7 +14,7 @@ public class u {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Constructor<MethodHandles.Lookup> f3083c;
+    public final Constructor<MethodHandles.Lookup> f3081c;
 
     /* compiled from: Platform */
     public static final class a extends u {
@@ -59,7 +59,7 @@ public class u {
             } catch (NoClassDefFoundError | NoSuchMethodException unused) {
             }
         }
-        this.f3083c = constructor;
+        this.f3081c = constructor;
     }
 
     public Executor a() {
@@ -68,7 +68,7 @@ public class u {
 
     @IgnoreJRERequirement
     public Object b(Method method, Class<?> cls, Object obj, Object... objArr) throws Throwable {
-        Constructor<MethodHandles.Lookup> constructor = this.f3083c;
+        Constructor<MethodHandles.Lookup> constructor = this.f3081c;
         return (constructor != null ? constructor.newInstance(cls, -1) : MethodHandles.lookup()).unreflectSpecial(method, cls).bindTo(obj).invokeWithArguments(objArr);
     }
 }
diff --git a/app/src/main/java/h0/v.java b/app/src/main/java/h0/v.java
index 8f65a60375..2fd22ac5dd 100644
--- a/app/src/main/java/h0/v.java
+++ b/app/src/main/java/h0/v.java
@@ -21,7 +21,7 @@ public final class v {
     public static final Pattern b = Pattern.compile("(.*/)?(\\.|%2e|%2E){1,2}(/.*)?");
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f3084c;
+    public final String f3082c;
     public final w d;
     public String e;
     public w.a f;
@@ -60,7 +60,7 @@ public final class v {
     }
 
     public v(String str, w wVar, String str2, Headers headers, MediaType mediaType, boolean z2, boolean z3, boolean z4) {
-        this.f3084c = str;
+        this.f3082c = str;
         this.d = wVar;
         this.e = str2;
         this.i = mediaType;
@@ -87,8 +87,8 @@ public final class v {
             m.checkParameterIsNotNull(str2, "value");
             List<String> list = aVar.a;
             w.b bVar = w.b;
-            list.add(w.b.a(bVar, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f3018c, 83));
-            aVar.b.add(w.b.a(bVar, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f3018c, 83));
+            list.add(w.b.a(bVar, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f3016c, 83));
+            aVar.b.add(w.b.a(bVar, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f3016c, 83));
             return;
         }
         u.a aVar2 = this.l;
@@ -97,14 +97,14 @@ public final class v {
         m.checkParameterIsNotNull(str2, "value");
         List<String> list2 = aVar2.a;
         w.b bVar2 = w.b;
-        list2.add(w.b.a(bVar2, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f3018c, 91));
-        aVar2.b.add(w.b.a(bVar2, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f3018c, 91));
+        list2.add(w.b.a(bVar2, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f3016c, 91));
+        aVar2.b.add(w.b.a(bVar2, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f3016c, 91));
     }
 
     public void b(String str, String str2) {
         if ("Content-Type".equalsIgnoreCase(str)) {
             try {
-                MediaType.a aVar = MediaType.f3124c;
+                MediaType.a aVar = MediaType.f3122c;
                 this.i = MediaType.a.a(str2);
             } catch (IllegalArgumentException e) {
                 throw new IllegalArgumentException(c.d.b.a.a.u("Malformed content type: ", str2), e);
diff --git a/app/src/main/java/h0/w.java b/app/src/main/java/h0/w.java
index 41dc2f9990..972c6c1bbd 100644
--- a/app/src/main/java/h0/w.java
+++ b/app/src/main/java/h0/w.java
@@ -15,7 +15,7 @@ public final class w {
     public final e0.w b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f3085c;
+    public final String f3083c;
     public final String d;
     public final Headers e;
     public final MediaType f;
@@ -31,7 +31,7 @@ public final class w {
         public static final Pattern b = Pattern.compile("[a-zA-Z][a-zA-Z0-9_-]*");
 
         /* renamed from: c  reason: collision with root package name */
-        public final y f3086c;
+        public final y f3084c;
         public final Method d;
         public final Annotation[] e;
         public final Annotation[][] f;
@@ -48,23 +48,23 @@ public final class w {
         public boolean q;
 
         /* renamed from: r  reason: collision with root package name */
-        public boolean f3087r;
+        public boolean f3085r;
         public boolean s;
         public String t;
         public Headers u;
         public MediaType v;
 
         /* renamed from: w  reason: collision with root package name */
-        public Set<String> f3088w;
+        public Set<String> f3086w;
 
         /* renamed from: x  reason: collision with root package name */
-        public t<?>[] f3089x;
+        public t<?>[] f3087x;
 
         /* renamed from: y  reason: collision with root package name */
-        public boolean f3090y;
+        public boolean f3088y;
 
         public a(y yVar, Method method) {
-            this.f3086c = yVar;
+            this.f3084c = yVar;
             this.d = method;
             this.e = method.getAnnotations();
             this.g = method.getGenericParameterTypes();
@@ -94,7 +94,7 @@ public final class w {
                     while (matcher.find()) {
                         linkedHashSet.add(matcher.group(1));
                     }
-                    this.f3088w = linkedHashSet;
+                    this.f3086w = linkedHashSet;
                     return;
                 }
                 return;
@@ -111,15 +111,15 @@ public final class w {
 
     public w(a aVar) {
         this.a = aVar.d;
-        this.b = aVar.f3086c.f3092c;
-        this.f3085c = aVar.p;
+        this.b = aVar.f3084c.f3090c;
+        this.f3083c = aVar.p;
         this.d = aVar.t;
         this.e = aVar.u;
         this.f = aVar.v;
         this.g = aVar.q;
-        this.h = aVar.f3087r;
+        this.h = aVar.f3085r;
         this.i = aVar.s;
-        this.j = aVar.f3089x;
-        this.k = aVar.f3090y;
+        this.j = aVar.f3087x;
+        this.k = aVar.f3088y;
     }
 }
diff --git a/app/src/main/java/h0/x.java b/app/src/main/java/h0/x.java
index eb93001515..621ae0550a 100644
--- a/app/src/main/java/h0/x.java
+++ b/app/src/main/java/h0/x.java
@@ -8,12 +8,12 @@ public class x implements InvocationHandler {
     public final Object[] b = new Object[0];
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Class f3091c;
+    public final /* synthetic */ Class f3089c;
     public final /* synthetic */ y d;
 
     public x(y yVar, Class cls) {
         this.d = yVar;
-        this.f3091c = cls;
+        this.f3089c = cls;
     }
 
     @Override // java.lang.reflect.InvocationHandler
@@ -24,6 +24,6 @@ public class x implements InvocationHandler {
         if (objArr == null) {
             objArr = this.b;
         }
-        return this.a.b && method.isDefault() ? this.a.b(method, this.f3091c, obj, objArr) : this.d.b(method).a(objArr);
+        return this.a.b && method.isDefault() ? this.a.b(method, this.f3089c, obj, objArr) : this.d.b(method).a(objArr);
     }
 }
diff --git a/app/src/main/java/h0/y.java b/app/src/main/java/h0/y.java
index 9d446a3680..a0d1984f4b 100644
--- a/app/src/main/java/h0/y.java
+++ b/app/src/main/java/h0/y.java
@@ -21,14 +21,14 @@ public final class y {
     public final e.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final w f3092c;
+    public final w f3090c;
     public final List<h.a> d;
     public final List<e.a> e;
     public final boolean f;
 
     public y(e.a aVar, w wVar, List<h.a> list, List<e.a> list2, Executor executor, boolean z2) {
         this.b = aVar;
-        this.f3092c = wVar;
+        this.f3090c = wVar;
         this.d = list;
         this.e = list2;
         this.f = z2;
diff --git a/app/src/main/java/h0/z.java b/app/src/main/java/h0/z.java
index 0e2a3fb3b8..ce3c6c01f6 100644
--- a/app/src/main/java/h0/z.java
+++ b/app/src/main/java/h0/z.java
@@ -106,7 +106,7 @@ public abstract class z<T> {
                     throw c0.j(aVar.d, "@Headers annotation is empty.", new Object[0]);
                 }
             } else if (annotation instanceof l) {
-                if (!aVar.f3087r) {
+                if (!aVar.f3085r) {
                     aVar.s = true;
                 } else {
                     throw c0.j(aVar.d, "Only one encoding annotation is allowed.", new Object[0]);
@@ -114,7 +114,7 @@ public abstract class z<T> {
             } else if (!(annotation instanceof e)) {
                 continue;
             } else if (!aVar.s) {
-                aVar.f3087r = true;
+                aVar.f3085r = true;
             } else {
                 throw c0.j(aVar.d, "Only one encoding annotation is allowed.", new Object[0]);
             }
@@ -123,16 +123,16 @@ public abstract class z<T> {
             if (!aVar.q) {
                 if (aVar.s) {
                     throw c0.j(aVar.d, "Multipart can only be specified on HTTP methods with request body (e.g., @POST).", new Object[0]);
-                } else if (aVar.f3087r) {
+                } else if (aVar.f3085r) {
                     throw c0.j(aVar.d, "FormUrlEncoded can only be specified on HTTP methods with request body (e.g., @POST).", new Object[0]);
                 }
             }
             int length = aVar.f.length;
-            aVar.f3089x = new t[length];
+            aVar.f3087x = new t[length];
             int i7 = length - 1;
             int i8 = 0;
             while (i8 < length) {
-                t<?>[] tVarArr = aVar.f3089x;
+                t<?>[] tVarArr = aVar.f3087x;
                 Type type2 = aVar.g[i8];
                 Annotation[] annotationArr2 = aVar.f[i8];
                 boolean z3 = i8 == i7;
@@ -185,10 +185,10 @@ public abstract class z<T> {
                                     String value2 = sVar.value();
                                     if (!w.a.b.matcher(value2).matches()) {
                                         throw c0.l(aVar.d, i8, "@Path parameter name must match %s. Found: %s", w.a.a.pattern(), value2);
-                                    } else if (aVar.f3088w.contains(value2)) {
+                                    } else if (aVar.f3086w.contains(value2)) {
                                         i3 = i9;
                                         i6 = length2;
-                                        tVar3 = new t.i<>(aVar.d, i8, value2, aVar.f3086c.e(type2, annotationArr2), sVar.encoded());
+                                        tVar3 = new t.i<>(aVar.d, i8, value2, aVar.f3084c.e(type2, annotationArr2), sVar.encoded());
                                     } else {
                                         throw c0.l(aVar.d, i8, "URL \"%s\" does not contain \"{%s}\".", aVar.t, value2);
                                     }
@@ -207,14 +207,14 @@ public abstract class z<T> {
                                     aVar.l = true;
                                     if (Iterable.class.isAssignableFrom(f)) {
                                         if (type2 instanceof ParameterizedType) {
-                                            tVar3 = new r(new t.j(value3, aVar.f3086c.e(c0.e(0, (ParameterizedType) type2), annotationArr2), encoded));
+                                            tVar3 = new r(new t.j(value3, aVar.f3084c.e(c0.e(0, (ParameterizedType) type2), annotationArr2), encoded));
                                         } else {
                                             throw c0.l(aVar.d, i8, a.k(f, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                         }
                                     } else if (f.isArray()) {
-                                        tVar3 = new s(new t.j(value3, aVar.f3086c.e(w.a.a(f.getComponentType()), annotationArr2), encoded));
+                                        tVar3 = new s(new t.j(value3, aVar.f3084c.e(w.a.a(f.getComponentType()), annotationArr2), encoded));
                                     } else {
-                                        tVar4 = new t.j<>(value3, aVar.f3086c.e(type2, annotationArr2), encoded);
+                                        tVar4 = new t.j<>(value3, aVar.f3084c.e(type2, annotationArr2), encoded);
                                     }
                                 } else {
                                     if (annotation2 instanceof v) {
@@ -224,14 +224,14 @@ public abstract class z<T> {
                                         aVar.m = true;
                                         if (Iterable.class.isAssignableFrom(f2)) {
                                             if (type2 instanceof ParameterizedType) {
-                                                tVar3 = new r(new t.l(aVar.f3086c.e(c0.e(0, (ParameterizedType) type2), annotationArr2), encoded2));
+                                                tVar3 = new r(new t.l(aVar.f3084c.e(c0.e(0, (ParameterizedType) type2), annotationArr2), encoded2));
                                             } else {
                                                 throw c0.l(aVar.d, i8, a.k(f2, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                             }
                                         } else if (f2.isArray()) {
-                                            tVar3 = new s(new t.l(aVar.f3086c.e(w.a.a(f2.getComponentType()), annotationArr2), encoded2));
+                                            tVar3 = new s(new t.l(aVar.f3084c.e(w.a.a(f2.getComponentType()), annotationArr2), encoded2));
                                         } else {
-                                            cVar = new t.l<>(aVar.f3086c.e(type2, annotationArr2), encoded2);
+                                            cVar = new t.l<>(aVar.f3084c.e(type2, annotationArr2), encoded2);
                                         }
                                     } else if (annotation2 instanceof u) {
                                         aVar.c(i8, type2);
@@ -243,7 +243,7 @@ public abstract class z<T> {
                                                 ParameterizedType parameterizedType = (ParameterizedType) g;
                                                 Type e2 = c0.e(0, parameterizedType);
                                                 if (String.class == e2) {
-                                                    cVar = new t.k<>(aVar.d, i8, aVar.f3086c.e(c0.e(1, parameterizedType), annotationArr2), ((u) annotation2).encoded());
+                                                    cVar = new t.k<>(aVar.d, i8, aVar.f3084c.e(c0.e(1, parameterizedType), annotationArr2), ((u) annotation2).encoded());
                                                 } else {
                                                     throw c0.l(aVar.d, i8, a.w("@QueryMap keys must be of type String: ", e2), new Object[0]);
                                                 }
@@ -259,14 +259,14 @@ public abstract class z<T> {
                                         Class<?> f4 = c0.f(type2);
                                         if (Iterable.class.isAssignableFrom(f4)) {
                                             if (type2 instanceof ParameterizedType) {
-                                                tVar3 = new r(new t.d(value4, aVar.f3086c.e(c0.e(0, (ParameterizedType) type2), annotationArr2)));
+                                                tVar3 = new r(new t.d(value4, aVar.f3084c.e(c0.e(0, (ParameterizedType) type2), annotationArr2)));
                                             } else {
                                                 throw c0.l(aVar.d, i8, a.k(f4, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                             }
                                         } else if (f4.isArray()) {
-                                            tVar3 = new s(new t.d(value4, aVar.f3086c.e(w.a.a(f4.getComponentType()), annotationArr2)));
+                                            tVar3 = new s(new t.d(value4, aVar.f3084c.e(w.a.a(f4.getComponentType()), annotationArr2)));
                                         } else {
-                                            cVar = new t.d<>(value4, aVar.f3086c.e(type2, annotationArr2));
+                                            cVar = new t.d<>(value4, aVar.f3084c.e(type2, annotationArr2));
                                         }
                                     } else {
                                         if (annotation2 instanceof j) {
@@ -281,7 +281,7 @@ public abstract class z<T> {
                                                         ParameterizedType parameterizedType2 = (ParameterizedType) g2;
                                                         Type e3 = c0.e(0, parameterizedType2);
                                                         if (String.class == e3) {
-                                                            tVar5 = new t.e<>(aVar.d, i8, aVar.f3086c.e(c0.e(1, parameterizedType2), annotationArr2));
+                                                            tVar5 = new t.e<>(aVar.d, i8, aVar.f3084c.e(c0.e(1, parameterizedType2), annotationArr2));
                                                         } else {
                                                             throw c0.l(aVar.d, i8, a.w("@HeaderMap keys must be of type String: ", e3), new Object[0]);
                                                         }
@@ -294,7 +294,7 @@ public abstract class z<T> {
                                             }
                                         } else if (annotation2 instanceof c) {
                                             aVar.c(i8, type2);
-                                            if (aVar.f3087r) {
+                                            if (aVar.f3085r) {
                                                 c cVar2 = (c) annotation2;
                                                 String value5 = cVar2.value();
                                                 boolean encoded3 = cVar2.encoded();
@@ -302,21 +302,21 @@ public abstract class z<T> {
                                                 Class<?> f6 = c0.f(type2);
                                                 if (Iterable.class.isAssignableFrom(f6)) {
                                                     if (type2 instanceof ParameterizedType) {
-                                                        tVar3 = new r(new t.b(value5, aVar.f3086c.e(c0.e(0, (ParameterizedType) type2), annotationArr2), encoded3));
+                                                        tVar3 = new r(new t.b(value5, aVar.f3084c.e(c0.e(0, (ParameterizedType) type2), annotationArr2), encoded3));
                                                     } else {
                                                         throw c0.l(aVar.d, i8, a.k(f6, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                                     }
                                                 } else if (f6.isArray()) {
-                                                    tVar3 = new s(new t.b(value5, aVar.f3086c.e(w.a.a(f6.getComponentType()), annotationArr2), encoded3));
+                                                    tVar3 = new s(new t.b(value5, aVar.f3084c.e(w.a.a(f6.getComponentType()), annotationArr2), encoded3));
                                                 } else {
-                                                    tVar4 = new t.b<>(value5, aVar.f3086c.e(type2, annotationArr2), encoded3);
+                                                    tVar4 = new t.b<>(value5, aVar.f3084c.e(type2, annotationArr2), encoded3);
                                                 }
                                             } else {
                                                 throw c0.l(aVar.d, i8, "@Field parameters can only be used with form encoding.", new Object[0]);
                                             }
                                         } else if (annotation2 instanceof d) {
                                             aVar.c(i8, type2);
-                                            if (aVar.f3087r) {
+                                            if (aVar.f3085r) {
                                                 Class<?> f7 = c0.f(type2);
                                                 if (Map.class.isAssignableFrom(f7)) {
                                                     Type g3 = c0.g(type2, f7, Map.class);
@@ -324,7 +324,7 @@ public abstract class z<T> {
                                                         ParameterizedType parameterizedType3 = (ParameterizedType) g3;
                                                         Type e4 = c0.e(0, parameterizedType3);
                                                         if (String.class == e4) {
-                                                            h<T, String> e5 = aVar.f3086c.e(c0.e(1, parameterizedType3), annotationArr2);
+                                                            h<T, String> e5 = aVar.f3084c.e(c0.e(1, parameterizedType3), annotationArr2);
                                                             aVar.h = true;
                                                             cVar = new t.c<>(aVar.d, i8, e5, ((d) annotation2).encoded());
                                                         } else {
@@ -353,7 +353,7 @@ public abstract class z<T> {
                                                         if (type2 instanceof ParameterizedType) {
                                                             Type e6 = c0.e(0, (ParameterizedType) type2);
                                                             if (!MultipartBody.Part.class.isAssignableFrom(c0.f(e6))) {
-                                                                tVar2 = new r(new t.g(aVar.d, i8, c2, aVar.f3086c.c(e6, annotationArr2, aVar.e)));
+                                                                tVar2 = new r(new t.g(aVar.d, i8, c2, aVar.f3084c.c(e6, annotationArr2, aVar.e)));
                                                             } else {
                                                                 throw c0.l(aVar.d, i8, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation.", new Object[0]);
                                                             }
@@ -363,12 +363,12 @@ public abstract class z<T> {
                                                     } else if (f8.isArray()) {
                                                         Class<?> a = w.a.a(f8.getComponentType());
                                                         if (!MultipartBody.Part.class.isAssignableFrom(a)) {
-                                                            tVar2 = new s(new t.g(aVar.d, i8, c2, aVar.f3086c.c(a, annotationArr2, aVar.e)));
+                                                            tVar2 = new s(new t.g(aVar.d, i8, c2, aVar.f3084c.c(a, annotationArr2, aVar.e)));
                                                         } else {
                                                             throw c0.l(aVar.d, i8, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation.", new Object[0]);
                                                         }
                                                     } else if (!MultipartBody.Part.class.isAssignableFrom(f8)) {
-                                                        tVar3 = new t.g<>(aVar.d, i8, c2, aVar.f3086c.c(type2, annotationArr2, aVar.e));
+                                                        tVar3 = new t.g<>(aVar.d, i8, c2, aVar.f3084c.c(type2, annotationArr2, aVar.e));
                                                         tVar2 = tVar3;
                                                     } else {
                                                         throw c0.l(aVar.d, i8, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation.", new Object[0]);
@@ -410,7 +410,7 @@ public abstract class z<T> {
                                                             if (String.class == e7) {
                                                                 Type e8 = c0.e(1, parameterizedType4);
                                                                 if (!MultipartBody.Part.class.isAssignableFrom(c0.f(e8))) {
-                                                                    tVar2 = new t.h<>(aVar.d, i8, aVar.f3086c.c(e8, annotationArr2, aVar.e), ((r) annotation2).encoding());
+                                                                    tVar2 = new t.h<>(aVar.d, i8, aVar.f3084c.c(e8, annotationArr2, aVar.e), ((r) annotation2).encoding());
                                                                 } else {
                                                                     throw c0.l(aVar.d, i8, "@PartMap values cannot be MultipartBody.Part. Use @Part List<Part> or a different value type instead.", new Object[0]);
                                                                 }
@@ -428,11 +428,11 @@ public abstract class z<T> {
                                                 }
                                             } else if (annotation2 instanceof h0.f0.a) {
                                                 aVar.c(i8, type2);
-                                                if (aVar.f3087r || aVar.s) {
+                                                if (aVar.f3085r || aVar.s) {
                                                     throw c0.l(aVar.d, i8, "@Body parameters cannot be used with form or multi-part encoding.", new Object[0]);
                                                 } else if (!aVar.j) {
                                                     try {
-                                                        h<T, RequestBody> c3 = aVar.f3086c.c(type2, annotationArr2, aVar.e);
+                                                        h<T, RequestBody> c3 = aVar.f3084c.c(type2, annotationArr2, aVar.e);
                                                         aVar.j = true;
                                                         tVar2 = new t.a<>(aVar.d, i8, c3);
                                                     } catch (RuntimeException e9) {
@@ -445,7 +445,7 @@ public abstract class z<T> {
                                                 aVar.c(i8, type2);
                                                 Class<?> f10 = c0.f(type2);
                                                 for (int i10 = i8 - 1; i10 >= 0; i10--) {
-                                                    t<?> tVar7 = aVar.f3089x[i10];
+                                                    t<?> tVar7 = aVar.f3087x[i10];
                                                     if ((tVar7 instanceof t.o) && ((t.o) tVar7).a.equals(f10)) {
                                                         Method method2 = aVar.d;
                                                         StringBuilder O = a.O("@Tag type ");
@@ -496,7 +496,7 @@ public abstract class z<T> {
                     if (z3) {
                         try {
                             if (c0.f(type2) == Continuation.class) {
-                                aVar.f3090y = true;
+                                aVar.f3088y = true;
                                 tVar = null;
                             }
                         } catch (NoClassDefFoundError unused) {
@@ -510,7 +510,7 @@ public abstract class z<T> {
                 i7 = i;
             }
             if (aVar.t != null || aVar.o) {
-                boolean z4 = aVar.f3087r;
+                boolean z4 = aVar.f3085r;
                 if (!z4 && !aVar.s && !aVar.q && aVar.j) {
                     throw c0.j(aVar.d, "Non-body HTTP method cannot contain @Body.", new Object[0]);
                 } else if (z4 && !aVar.h) {
@@ -556,7 +556,7 @@ public abstract class z<T> {
                                 throw c0.j(method, O2.toString(), new Object[0]);
                             } else if (a3 == Response.class) {
                                 throw c0.j(method, "Response must include generic type (e.g., Response<String>)", new Object[0]);
-                            } else if (!wVar.f3085c.equals("HEAD") || Void.class.equals(a3)) {
+                            } else if (!wVar.f3083c.equals("HEAD") || Void.class.equals(a3)) {
                                 try {
                                     h<ResponseBody, T> d = yVar.d(a3, method.getAnnotations());
                                     e.a aVar3 = yVar.b;
diff --git a/app/src/main/java/i0/c.java b/app/src/main/java/i0/c.java
index a19f3d9655..e62e3ec4a5 100644
--- a/app/src/main/java/i0/c.java
+++ b/app/src/main/java/i0/c.java
@@ -16,6 +16,6 @@ public final class c implements d.a {
         e eVar2 = eVar;
         b bVar = new b(this, eVar2);
         eVar2.a(bVar);
-        this.i.h0(bVar);
+        this.i.i0(bVar);
     }
 }
diff --git a/app/src/main/java/i0/f.java b/app/src/main/java/i0/f.java
index 76188202aa..81a6c8df26 100644
--- a/app/src/main/java/i0/f.java
+++ b/app/src/main/java/i0/f.java
@@ -5,7 +5,7 @@ public final class f<T> {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Throwable f3093c;
+    public final Throwable f3091c;
     public final T d;
 
     /* compiled from: Notification */
@@ -17,12 +17,12 @@ public final class f<T> {
 
     public f(a aVar, T t, Throwable th) {
         this.d = t;
-        this.f3093c = th;
+        this.f3091c = th;
         this.b = aVar;
     }
 
     public boolean a() {
-        return (this.b == a.OnError) && this.f3093c != null;
+        return (this.b == a.OnError) && this.f3091c != null;
     }
 
     public boolean b() {
@@ -48,8 +48,8 @@ public final class f<T> {
         if (t != t2 && (t == null || !t.equals(t2))) {
             return false;
         }
-        Throwable th = this.f3093c;
-        Throwable th2 = fVar.f3093c;
+        Throwable th = this.f3091c;
+        Throwable th2 = fVar.f3091c;
         return th == th2 || (th != null && th.equals(th2));
     }
 
@@ -58,7 +58,7 @@ public final class f<T> {
         if (b()) {
             hashCode = (hashCode * 31) + this.d.hashCode();
         }
-        return a() ? (hashCode * 31) + this.f3093c.hashCode() : hashCode;
+        return a() ? (hashCode * 31) + this.f3091c.hashCode() : hashCode;
     }
 
     public String toString() {
@@ -73,7 +73,7 @@ public final class f<T> {
         }
         if (a()) {
             sb.append(' ');
-            sb.append(this.f3093c.getMessage());
+            sb.append(this.f3091c.getMessage());
         }
         sb.append(']');
         return sb.toString();
diff --git a/app/src/main/java/i0/h.java b/app/src/main/java/i0/h.java
index ce985de239..09a98367c3 100644
--- a/app/src/main/java/i0/h.java
+++ b/app/src/main/java/i0/h.java
@@ -12,7 +12,7 @@ public class h<T> {
     }
 
     public h(a<T> aVar) {
-        b<a, a> bVar = l.f3118c;
+        b<a, a> bVar = l.f3116c;
         this.a = bVar != null ? bVar.call(aVar) : aVar;
     }
 }
diff --git a/app/src/main/java/i0/l/a/a2.java b/app/src/main/java/i0/l/a/a2.java
index e693e71249..9b7ce04d83 100644
--- a/app/src/main/java/i0/l/a/a2.java
+++ b/app/src/main/java/i0/l/a/a2.java
@@ -18,7 +18,7 @@ public class a2 implements Producer {
         if (i > 0) {
             y1.c cVar = this.i;
             synchronized (cVar) {
-                producer = cVar.f3106r;
+                producer = cVar.f3104r;
                 cVar.q = a.d(cVar.q, j);
             }
             if (producer != null) {
diff --git a/app/src/main/java/i0/l/a/c.java b/app/src/main/java/i0/l/a/c.java
index baa898e2de..65513b6509 100644
--- a/app/src/main/java/i0/l/a/c.java
+++ b/app/src/main/java/i0/l/a/c.java
@@ -6,7 +6,7 @@ import rx.Subscriber;
 public enum c implements Observable.a<Object> {
     INSTANCE;
     
-    public static final Observable<Object> j = Observable.g0(INSTANCE);
+    public static final Observable<Object> j = Observable.h0(INSTANCE);
 
     @Override // rx.functions.Action1
     public void call(Object obj) {
diff --git a/app/src/main/java/i0/l/a/c0.java b/app/src/main/java/i0/l/a/c0.java
index 0bc6d3c53f..b3f32f14a7 100644
--- a/app/src/main/java/i0/l/a/c0.java
+++ b/app/src/main/java/i0/l/a/c0.java
@@ -26,7 +26,7 @@ public final class c0<T> implements Observable.a<T> {
         if (this.k.incrementAndGet() == 1) {
             AtomicBoolean atomicBoolean = new AtomicBoolean(true);
             try {
-                this.i.j0(new z(this, subscriber, atomicBoolean));
+                this.i.k0(new z(this, subscriber, atomicBoolean));
             } finally {
                 if (atomicBoolean.get()) {
                     this.l.unlock();
@@ -36,7 +36,7 @@ public final class c0<T> implements Observable.a<T> {
             try {
                 CompositeSubscription compositeSubscription = this.j;
                 subscriber.add(new a(new b0(this, compositeSubscription)));
-                this.i.h0(new a0(this, subscriber, subscriber, compositeSubscription));
+                this.i.i0(new a0(this, subscriber, subscriber, compositeSubscription));
             } finally {
                 this.l.unlock();
             }
diff --git a/app/src/main/java/i0/l/a/d.java b/app/src/main/java/i0/l/a/d.java
index 4c2c6e7ce2..037efa38bf 100644
--- a/app/src/main/java/i0/l/a/d.java
+++ b/app/src/main/java/i0/l/a/d.java
@@ -6,7 +6,7 @@ import rx.Subscriber;
 public enum d implements Observable.a<Object> {
     INSTANCE;
     
-    public static final Observable<Object> j = Observable.g0(INSTANCE);
+    public static final Observable<Object> j = Observable.h0(INSTANCE);
 
     @Override // rx.functions.Action1
     public void call(Object obj) {
diff --git a/app/src/main/java/i0/l/a/e0.java b/app/src/main/java/i0/l/a/e0.java
index ee5b4ee913..14b2eced7f 100644
--- a/app/src/main/java/i0/l/a/e0.java
+++ b/app/src/main/java/i0/l/a/e0.java
@@ -16,6 +16,6 @@ public class e0<T> implements h.a<T> {
         i iVar = (i) obj;
         d0 d0Var = new d0(this, iVar);
         iVar.i.a(d0Var);
-        this.i.h0(d0Var);
+        this.i.i0(d0Var);
     }
 }
diff --git a/app/src/main/java/i0/l/a/e1.java b/app/src/main/java/i0/l/a/e1.java
index 1d88cf39d3..37f5017168 100644
--- a/app/src/main/java/i0/l/a/e1.java
+++ b/app/src/main/java/i0/l/a/e1.java
@@ -71,7 +71,7 @@ public class e1 extends Subscriber<T> {
             if (j != 0) {
                 this.l.b(j);
             }
-            ((Observable) this.n.i.call(th)).h0(aVar);
+            ((Observable) this.n.i.call(th)).i0(aVar);
         } catch (Throwable th2) {
             Subscriber subscriber = this.k;
             c.q.a.k.a.b0(th2);
diff --git a/app/src/main/java/i0/l/a/f.java b/app/src/main/java/i0/l/a/f.java
index 9dba643f41..ff4876ad85 100644
--- a/app/src/main/java/i0/l/a/f.java
+++ b/app/src/main/java/i0/l/a/f.java
@@ -325,7 +325,7 @@ public final class f<T, R> implements Observable.a<R> {
         bVar.actual.add(bVar);
         bVar.actual.setProducer(bVar);
         for (int i4 = 0; i4 < length && !bVar.cancelled; i4++) {
-            observableArr[i4].T(aVarArr[i4]);
+            observableArr[i4].U(aVarArr[i4]);
         }
     }
 }
diff --git a/app/src/main/java/i0/l/a/f2.java b/app/src/main/java/i0/l/a/f2.java
index 6619ad1a94..7e1f479090 100644
--- a/app/src/main/java/i0/l/a/f2.java
+++ b/app/src/main/java/i0/l/a/f2.java
@@ -20,7 +20,7 @@ public final class f2<T, E> implements Observable.b<T, T> {
         serializedSubscriber.add(d2Var);
         serializedSubscriber.add(e2Var);
         subscriber.add(serializedSubscriber);
-        this.i.h0(e2Var);
+        this.i.i0(e2Var);
         return d2Var;
     }
 }
diff --git a/app/src/main/java/i0/l/a/g0.java b/app/src/main/java/i0/l/a/g0.java
index 55a42fba7a..fd8ecbebe2 100644
--- a/app/src/main/java/i0/l/a/g0.java
+++ b/app/src/main/java/i0/l/a/g0.java
@@ -63,7 +63,7 @@ public final class g0<T> implements Observable.a<T> {
         public final i0.l.d.a q;
 
         /* renamed from: r  reason: collision with root package name */
-        public long f3094r;
+        public long f3092r;
 
         /* compiled from: OnSubscribeTimeoutTimedWithFallback */
         public final class a implements Action0 {
@@ -82,13 +82,13 @@ public final class g0<T> implements Observable.a<T> {
                         bVar.i.onError(new TimeoutException());
                         return;
                     }
-                    long j = bVar.f3094r;
+                    long j = bVar.f3092r;
                     if (j != 0) {
                         bVar.n.b(j);
                     }
                     a aVar = new a(bVar.i, bVar.n);
                     if (bVar.q.a(aVar)) {
-                        bVar.m.T(aVar);
+                        bVar.m.U(aVar);
                     }
                 }
             }
@@ -137,7 +137,7 @@ public final class g0<T> implements Observable.a<T> {
                     if (subscription != null) {
                         subscription.unsubscribe();
                     }
-                    this.f3094r++;
+                    this.f3092r++;
                     this.i.onNext(t);
                     this.p.a(this.l.b(new a(j2), this.j, this.k));
                 }
@@ -165,6 +165,6 @@ public final class g0<T> implements Observable.a<T> {
         subscriber.add(bVar.q);
         subscriber.setProducer(bVar.n);
         bVar.p.a(bVar.l.b(new b.a(0), bVar.j, bVar.k));
-        this.i.T(bVar);
+        this.i.U(bVar);
     }
 }
diff --git a/app/src/main/java/i0/l/a/h.java b/app/src/main/java/i0/l/a/h.java
index e9b8a79db0..f67f0969fb 100644
--- a/app/src/main/java/i0/l/a/h.java
+++ b/app/src/main/java/i0/l/a/h.java
@@ -37,7 +37,7 @@ public final class h<T, R> implements Observable.a<R> {
                 c<T, R> cVar = this.j;
                 cVar.i.onNext(this.i);
                 cVar.l.b(1);
-                cVar.f3095r = false;
+                cVar.f3093r = false;
                 cVar.a();
             }
         }
@@ -59,7 +59,7 @@ public final class h<T, R> implements Observable.a<R> {
             if (j != 0) {
                 cVar.l.b(j);
             }
-            cVar.f3095r = false;
+            cVar.f3093r = false;
             cVar.a();
         }
 
@@ -79,7 +79,7 @@ public final class h<T, R> implements Observable.a<R> {
                 if (j != 0) {
                     cVar.l.b(j);
                 }
-                cVar.f3095r = false;
+                cVar.f3093r = false;
                 cVar.a();
             }
         }
@@ -109,7 +109,7 @@ public final class h<T, R> implements Observable.a<R> {
         public volatile boolean q;
 
         /* renamed from: r  reason: collision with root package name */
-        public volatile boolean f3095r;
+        public volatile boolean f3093r;
 
         public c(Subscriber<? super R> subscriber, i0.k.b<? super T, ? extends Observable<? extends R>> bVar, int i, int i2) {
             this.i = subscriber;
@@ -124,7 +124,7 @@ public final class h<T, R> implements Observable.a<R> {
             if (this.n.getAndIncrement() == 0) {
                 int i = this.k;
                 while (!this.i.isUnsubscribed()) {
-                    if (!this.f3095r) {
+                    if (!this.f3093r) {
                         if (i != 1 || this.o.get() == null) {
                             boolean z2 = this.q;
                             Object poll = this.m.poll();
@@ -148,14 +148,14 @@ public final class h<T, R> implements Observable.a<R> {
                                         return;
                                     } else if (observable != c.j) {
                                         if (observable instanceof j) {
-                                            this.f3095r = true;
+                                            this.f3093r = true;
                                             this.l.c(new a(((j) observable).k, this));
                                         } else {
                                             b bVar = new b(this);
                                             this.p.a(bVar);
                                             if (!bVar.isUnsubscribed()) {
-                                                this.f3095r = true;
-                                                observable.h0(bVar);
+                                                this.f3093r = true;
+                                                observable.i0(bVar);
                                             } else {
                                                 return;
                                             }
@@ -251,7 +251,7 @@ public final class h<T, R> implements Observable.a<R> {
         subscriber.add(cVar.p);
         subscriber.setProducer(new g(this, cVar));
         if (!subscriber.isUnsubscribed()) {
-            this.i.h0(cVar);
+            this.i.i0(cVar);
         }
     }
 }
diff --git a/app/src/main/java/i0/l/a/h1.java b/app/src/main/java/i0/l/a/h1.java
index 1ef7ad0010..8a7441e0f3 100644
--- a/app/src/main/java/i0/l/a/h1.java
+++ b/app/src/main/java/i0/l/a/h1.java
@@ -356,7 +356,7 @@ public final class h1<T> extends i0.m.b<T> {
     }
 
     @Override // i0.m.b
-    public void j0(Action1<? super Subscription> action1) {
+    public void k0(Action1<? super Subscription> action1) {
         b<T> bVar;
         while (true) {
             bVar = this.k.get();
@@ -376,7 +376,7 @@ public final class h1<T> extends i0.m.b<T> {
         }
         ((z) action1).call(bVar);
         if (z2) {
-            this.j.h0(bVar);
+            this.j.i0(bVar);
         }
     }
 }
diff --git a/app/src/main/java/i0/l/a/j.java b/app/src/main/java/i0/l/a/j.java
index bfbd49ae4c..71eb11d720 100644
--- a/app/src/main/java/i0/l/a/j.java
+++ b/app/src/main/java/i0/l/a/j.java
@@ -17,7 +17,7 @@ public final class j<T> implements Observable.a<T> {
     public void call(Object obj) {
         Subscriber subscriber = (Subscriber) obj;
         try {
-            ((Observable) this.i.call()).h0(new e(subscriber, subscriber));
+            ((Observable) this.i.call()).i0(new e(subscriber, subscriber));
         } catch (Throwable th) {
             a.b0(th);
             subscriber.onError(th);
diff --git a/app/src/main/java/i0/l/a/j1.java b/app/src/main/java/i0/l/a/j1.java
index 06e7ab2e7e..71128bbe4d 100644
--- a/app/src/main/java/i0/l/a/j1.java
+++ b/app/src/main/java/i0/l/a/j1.java
@@ -307,17 +307,17 @@ public final class j1<T> extends i0.m.b<T> implements Subscription {
         public final AtomicBoolean q = new AtomicBoolean();
 
         /* renamed from: r  reason: collision with root package name */
-        public boolean f3096r;
+        public boolean f3094r;
         public boolean s;
         public long t;
         public long u;
         public volatile Producer v;
 
         /* renamed from: w  reason: collision with root package name */
-        public List<c<T>> f3097w;
+        public List<c<T>> f3095w;
 
         /* renamed from: x  reason: collision with root package name */
-        public boolean f3098x;
+        public boolean f3096x;
 
         public f(e<T> eVar) {
             this.j = eVar;
@@ -366,21 +366,21 @@ public final class j1<T> extends i0.m.b<T> implements Subscription {
             long j2;
             if (!isUnsubscribed()) {
                 synchronized (this) {
-                    if (this.f3096r) {
+                    if (this.f3094r) {
                         if (cVar != null) {
-                            List list2 = this.f3097w;
+                            List list2 = this.f3095w;
                             if (list2 == null) {
                                 list2 = new ArrayList();
-                                this.f3097w = list2;
+                                this.f3095w = list2;
                             }
                             list2.add(cVar);
                         } else {
-                            this.f3098x = true;
+                            this.f3096x = true;
                         }
                         this.s = true;
                         return;
                     }
-                    this.f3096r = true;
+                    this.f3094r = true;
                 }
                 long j3 = this.t;
                 if (cVar != null) {
@@ -399,14 +399,14 @@ public final class j1<T> extends i0.m.b<T> implements Subscription {
                 while (!isUnsubscribed()) {
                     synchronized (this) {
                         if (!this.s) {
-                            this.f3096r = false;
+                            this.f3094r = false;
                             return;
                         }
                         this.s = false;
-                        list = this.f3097w;
-                        this.f3097w = null;
-                        z2 = this.f3098x;
-                        this.f3098x = false;
+                        list = this.f3095w;
+                        this.f3095w = null;
+                        z2 = this.f3096x;
+                        this.f3096x = false;
                     }
                     long j5 = this.t;
                     if (list != null) {
@@ -622,7 +622,7 @@ public final class j1<T> extends i0.m.b<T> implements Subscription {
     }
 
     @Override // i0.m.b
-    public void j0(Action1<? super Subscription> action1) {
+    public void k0(Action1<? super Subscription> action1) {
         f<T> fVar;
         while (true) {
             fVar = this.l.get();
@@ -642,7 +642,7 @@ public final class j1<T> extends i0.m.b<T> implements Subscription {
         }
         ((z) action1).call(fVar);
         if (z2) {
-            this.k.h0(fVar);
+            this.k.i0(fVar);
         }
     }
 
diff --git a/app/src/main/java/i0/l/a/k.java b/app/src/main/java/i0/l/a/k.java
index 16bd99d292..09f5b7e327 100644
--- a/app/src/main/java/i0/l/a/k.java
+++ b/app/src/main/java/i0/l/a/k.java
@@ -73,6 +73,6 @@ public class k<T> implements Observable.a<T> {
 
     @Override // rx.functions.Action1
     public void call(Object obj) {
-        this.j.h0(new a((Subscriber) obj, this.i));
+        this.j.i0(new a((Subscriber) obj, this.i));
     }
 }
diff --git a/app/src/main/java/i0/l/a/l.java b/app/src/main/java/i0/l/a/l.java
index bf25c7ebd2..48290befa9 100644
--- a/app/src/main/java/i0/l/a/l.java
+++ b/app/src/main/java/i0/l/a/l.java
@@ -71,6 +71,6 @@ public final class l<T> implements Observable.a<T> {
         Subscriber subscriber = (Subscriber) obj;
         a aVar = new a(subscriber, this.j);
         subscriber.add(aVar);
-        this.i.h0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/i0/l/a/l0.java b/app/src/main/java/i0/l/a/l0.java
index 3d34bed98d..7a583ea592 100644
--- a/app/src/main/java/i0/l/a/l0.java
+++ b/app/src/main/java/i0/l/a/l0.java
@@ -71,7 +71,7 @@ public final class l0<T, K, V> implements Observable.a<Map<K, V>>, Func0<Map<K,
             Subscriber<? super R> subscriber2 = aVar.i;
             subscriber2.add(aVar);
             subscriber2.setProducer(new a.C0324a(aVar));
-            observable.h0(aVar);
+            observable.i0(aVar);
         } catch (Throwable th) {
             c.q.a.k.a.b0(th);
             subscriber.onError(th);
diff --git a/app/src/main/java/i0/l/a/n.java b/app/src/main/java/i0/l/a/n.java
index fe7b67dad0..70ee40ff0e 100644
--- a/app/src/main/java/i0/l/a/n.java
+++ b/app/src/main/java/i0/l/a/n.java
@@ -35,7 +35,7 @@ public final class n<T, R> implements Observable.a<R> {
         public long q;
 
         /* renamed from: r  reason: collision with root package name */
-        public Iterator<? extends R> f3099r;
+        public Iterator<? extends R> f3097r;
 
         public a(Subscriber<? super R> subscriber, i0.k.b<? super T, ? extends Iterable<? extends R>> bVar, int i) {
             this.i = subscriber;
@@ -57,7 +57,7 @@ public final class n<T, R> implements Observable.a<R> {
         public boolean a(boolean z2, boolean z3, Subscriber<?> subscriber, Queue<?> queue) {
             if (subscriber.isUnsubscribed()) {
                 queue.clear();
-                this.f3099r = null;
+                this.f3097r = null;
                 return true;
             } else if (!z2) {
                 return false;
@@ -66,7 +66,7 @@ public final class n<T, R> implements Observable.a<R> {
                     Throwable h = d.h(this.m);
                     unsubscribe();
                     queue.clear();
-                    this.f3099r = null;
+                    this.f3097r = null;
                     subscriber.onError(h);
                     return true;
                 } else if (!z3) {
@@ -96,7 +96,7 @@ public final class n<T, R> implements Observable.a<R> {
                 Queue<?> queue = this.l;
                 int i2 = 1;
                 while (true) {
-                    it = this.f3099r;
+                    it = this.f3097r;
                     boolean z2 = false;
                     if (it == null) {
                         boolean z3 = this.p;
@@ -117,7 +117,7 @@ public final class n<T, R> implements Observable.a<R> {
                                     if (!it.hasNext()) {
                                         i2 = i;
                                     } else {
-                                        this.f3099r = it;
+                                        this.f3097r = it;
                                         if (it == null) {
                                             j = this.n.get();
                                             j2 = 0;
@@ -131,12 +131,12 @@ public final class n<T, R> implements Observable.a<R> {
                                                             j2++;
                                                             try {
                                                                 if (!it.hasNext()) {
-                                                                    this.f3099r = null;
+                                                                    this.f3097r = null;
                                                                     break;
                                                                 }
                                                             } catch (Throwable th) {
                                                                 c.q.a.k.a.b0(th);
-                                                                this.f3099r = null;
+                                                                this.f3097r = null;
                                                                 onError(th);
                                                             }
                                                         } else {
@@ -144,7 +144,7 @@ public final class n<T, R> implements Observable.a<R> {
                                                         }
                                                     } catch (Throwable th2) {
                                                         c.q.a.k.a.b0(th2);
-                                                        this.f3099r = null;
+                                                        this.f3097r = null;
                                                         onError(th2);
                                                     }
                                                 } else {
@@ -269,6 +269,6 @@ public final class n<T, R> implements Observable.a<R> {
         a aVar = new a(subscriber, this.j, this.k);
         subscriber.add(aVar);
         subscriber.setProducer(new m(this, aVar));
-        this.i.h0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/i0/l/a/p0.java b/app/src/main/java/i0/l/a/p0.java
index ddc7891ba9..8a58715ec9 100644
--- a/app/src/main/java/i0/l/a/p0.java
+++ b/app/src/main/java/i0/l/a/p0.java
@@ -33,11 +33,11 @@ public class p0 extends Subscriber<T> {
             SerializedSubscriber serializedSubscriber = p0Var.m;
             Subscriber<?> subscriber = p0Var.j;
             synchronized (aVar) {
-                if (!aVar.e && aVar.f3100c) {
+                if (!aVar.e && aVar.f3098c) {
                     if (i == aVar.a) {
                         t = aVar.b;
                         aVar.b = null;
-                        aVar.f3100c = false;
+                        aVar.f3098c = false;
                         aVar.e = true;
                     }
                 }
@@ -79,9 +79,9 @@ public class p0 extends Subscriber<T> {
                 return;
             }
             t = aVar.b;
-            z2 = aVar.f3100c;
+            z2 = aVar.f3098c;
             aVar.b = null;
-            aVar.f3100c = false;
+            aVar.f3098c = false;
             aVar.e = true;
         }
         if (z2) {
@@ -103,7 +103,7 @@ public class p0 extends Subscriber<T> {
         synchronized (aVar) {
             aVar.a++;
             aVar.b = null;
-            aVar.f3100c = false;
+            aVar.f3098c = false;
         }
     }
 
@@ -113,7 +113,7 @@ public class p0 extends Subscriber<T> {
         q0.a<T> aVar = this.i;
         synchronized (aVar) {
             aVar.b = t;
-            aVar.f3100c = true;
+            aVar.f3098c = true;
             i = aVar.a + 1;
             aVar.a = i;
         }
diff --git a/app/src/main/java/i0/l/a/q0.java b/app/src/main/java/i0/l/a/q0.java
index 6e127e9672..099e7dcad0 100644
--- a/app/src/main/java/i0/l/a/q0.java
+++ b/app/src/main/java/i0/l/a/q0.java
@@ -18,7 +18,7 @@ public final class q0<T> implements Observable.b<T, T> {
         public T b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f3100c;
+        public boolean f3098c;
         public boolean d;
         public boolean e;
     }
diff --git a/app/src/main/java/i0/l/a/q2.java b/app/src/main/java/i0/l/a/q2.java
index 30e4117f13..94a440f073 100644
--- a/app/src/main/java/i0/l/a/q2.java
+++ b/app/src/main/java/i0/l/a/q2.java
@@ -85,7 +85,7 @@ public final class q2<R> implements Observable.b<R, Observable<?>[]> {
             this.requested = atomicLong;
             this.subscribers = objArr;
             for (int i3 = 0; i3 < observableArr.length; i3++) {
-                observableArr[i3].h0((C0325a) objArr[i3]);
+                observableArr[i3].i0((C0325a) objArr[i3]);
             }
         }
 
diff --git a/app/src/main/java/i0/l/a/s.java b/app/src/main/java/i0/l/a/s.java
index 44f69bb73f..81d15c505f 100644
--- a/app/src/main/java/i0/l/a/s.java
+++ b/app/src/main/java/i0/l/a/s.java
@@ -66,6 +66,6 @@ public final class s<T, R> implements Observable.a<R> {
         Subscriber subscriber = (Subscriber) obj;
         a aVar = new a(subscriber, this.j);
         subscriber.add(aVar);
-        this.i.h0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/i0/l/a/t.java b/app/src/main/java/i0/l/a/t.java
index cfb96ac626..57ea36a202 100644
--- a/app/src/main/java/i0/l/a/t.java
+++ b/app/src/main/java/i0/l/a/t.java
@@ -77,7 +77,7 @@ public class t implements Action0 {
         if (!this.i.isUnsubscribed()) {
             a aVar = new a();
             this.m.a(aVar);
-            this.n.i.h0(aVar);
+            this.n.i.i0(aVar);
         }
     }
 }
diff --git a/app/src/main/java/i0/l/a/u.java b/app/src/main/java/i0/l/a/u.java
index d9ea47531e..77206b4a22 100644
--- a/app/src/main/java/i0/l/a/u.java
+++ b/app/src/main/java/i0/l/a/u.java
@@ -38,7 +38,7 @@ public class u extends Subscriber<f<?>> {
             if (!z2 || !this.j.i.l) {
                 this.i.onNext(fVar);
             } else {
-                this.i.onError(fVar.f3093c);
+                this.i.onError(fVar.f3091c);
             }
         } else {
             this.i.onCompleted();
diff --git a/app/src/main/java/i0/l/a/w.java b/app/src/main/java/i0/l/a/w.java
index 48f3677db5..fd23e5b386 100644
--- a/app/src/main/java/i0/l/a/w.java
+++ b/app/src/main/java/i0/l/a/w.java
@@ -63,6 +63,6 @@ public class w implements Action0 {
 
     @Override // rx.functions.Action0
     public void call() {
-        this.i.h0(new a(this.j));
+        this.i.i0(new a(this.j));
     }
 }
diff --git a/app/src/main/java/i0/l/a/x0.java b/app/src/main/java/i0/l/a/x0.java
index a65a6ee339..fcf7159d33 100644
--- a/app/src/main/java/i0/l/a/x0.java
+++ b/app/src/main/java/i0/l/a/x0.java
@@ -82,10 +82,10 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             if (j != 0) {
                 synchronized (eVar) {
                     j = eVar.m.get();
-                    if (eVar.f3101r || j == 0) {
+                    if (eVar.f3099r || j == 0) {
                         z2 = false;
                     } else {
-                        eVar.f3101r = true;
+                        eVar.f3099r = true;
                         z2 = true;
                     }
                 }
@@ -113,7 +113,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                 a(1);
                 synchronized (eVar) {
                     if (!eVar.s) {
-                        eVar.f3101r = false;
+                        eVar.f3099r = false;
                         return;
                     }
                     eVar.s = false;
@@ -126,7 +126,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             return;
             if (!z3) {
                 synchronized (eVar) {
-                    eVar.f3101r = false;
+                    eVar.f3099r = false;
                 }
             }
             throw th;
@@ -180,34 +180,34 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
         public volatile boolean q;
 
         /* renamed from: r  reason: collision with root package name */
-        public boolean f3101r;
+        public boolean f3099r;
         public boolean s;
         public final Object t = new Object();
         public volatile c<?>[] u = i;
         public long v;
 
         /* renamed from: w  reason: collision with root package name */
-        public long f3102w;
+        public long f3100w;
 
         /* renamed from: x  reason: collision with root package name */
-        public int f3103x;
+        public int f3101x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final int f3104y;
+        public final int f3102y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f3105z;
+        public int f3103z;
 
         public e(Subscriber<? super T> subscriber, boolean z2, int i2) {
             this.j = subscriber;
             this.k = z2;
             this.l = i2;
             if (i2 == Integer.MAX_VALUE) {
-                this.f3104y = Integer.MAX_VALUE;
+                this.f3102y = Integer.MAX_VALUE;
                 request(RecyclerView.FOREVER_NS);
                 return;
             }
-            this.f3104y = Math.max(1, i2 >> 1);
+            this.f3102y = Math.max(1, i2 >> 1);
             request((long) i2);
         }
 
@@ -229,11 +229,11 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
 
         public void b() {
             synchronized (this) {
-                if (this.f3101r) {
+                if (this.f3099r) {
                     this.s = true;
                     return;
                 }
-                this.f3101r = true;
+                this.f3099r = true;
                 c();
             }
         }
@@ -294,7 +294,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                     z2 = true;
                                     if (!z2) {
                                         synchronized (this) {
-                                            this.f3101r = false;
+                                            this.f3099r = false;
                                         }
                                     }
                                     throw th;
@@ -326,8 +326,8 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                 int length = cVarArr.length;
                 if (!z5 || ((queue2 != null && !queue2.isEmpty()) || length != 0)) {
                     if (length > 0) {
-                        long j4 = this.f3102w;
-                        int i6 = this.f3103x;
+                        long j4 = this.f3100w;
+                        int i6 = this.f3101x;
                         if (length <= i6 || cVarArr[i6].k != j4) {
                             if (length <= i6) {
                                 i6 = 0;
@@ -338,8 +338,8 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                     i6 = 0;
                                 }
                             }
-                            this.f3103x = i6;
-                            this.f3102w = cVarArr[i6].k;
+                            this.f3101x = i6;
+                            this.f3100w = cVarArr[i6].k;
                         }
                         int i8 = 0;
                         z3 = false;
@@ -416,8 +416,8 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                 return;
                             }
                         }
-                        this.f3103x = i6;
-                        this.f3102w = cVarArr[i6].k;
+                        this.f3101x = i6;
+                        this.f3100w = cVarArr[i6].k;
                     } else {
                         subscriber2 = subscriber;
                         z3 = false;
@@ -430,7 +430,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                             try {
                                 if (!this.s) {
                                     try {
-                                        this.f3101r = false;
+                                        this.f3099r = false;
                                         return;
                                     } catch (Throwable th6) {
                                         th2 = th6;
@@ -595,13 +595,13 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             if (observable != null) {
                 z2 = true;
                 if (observable == c.j) {
-                    int i2 = this.f3105z + 1;
-                    if (i2 == this.f3104y) {
-                        this.f3105z = 0;
+                    int i2 = this.f3103z + 1;
+                    if (i2 == this.f3102y) {
+                        this.f3103z = 0;
                         request((long) i2);
                         return;
                     }
-                    this.f3105z = i2;
+                    this.f3103z = i2;
                     return;
                 } else if (observable instanceof j) {
                     T t = ((j) observable).k;
@@ -609,10 +609,10 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                     if (j != 0) {
                         synchronized (this) {
                             j = this.m.get();
-                            if (this.f3101r || j == 0) {
+                            if (this.f3099r || j == 0) {
                                 z3 = false;
                             } else {
-                                this.f3101r = true;
+                                this.f3099r = true;
                                 z3 = true;
                             }
                         }
@@ -630,16 +630,16 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                             if (j != RecyclerView.FOREVER_NS) {
                                 this.m.a(1);
                             }
-                            int i3 = this.f3105z + 1;
-                            if (i3 == this.f3104y) {
-                                this.f3105z = 0;
+                            int i3 = this.f3103z + 1;
+                            if (i3 == this.f3102y) {
+                                this.f3103z = 0;
                                 request((long) i3);
                             } else {
-                                this.f3105z = i3;
+                                this.f3103z = i3;
                             }
                             synchronized (this) {
                                 if (!this.s) {
-                                    this.f3101r = false;
+                                    this.f3099r = false;
                                     return;
                                 }
                                 this.s = false;
@@ -682,7 +682,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                         cVarArr2[length] = cVar;
                         this.u = cVarArr2;
                     }
-                    observable.h0(cVar);
+                    observable.i0(cVar);
                     b();
                     return;
                 }
@@ -691,7 +691,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             }
             if (!z2) {
                 synchronized (this) {
-                    this.f3101r = false;
+                    this.f3099r = false;
                 }
             }
             throw th;
diff --git a/app/src/main/java/i0/l/a/x1.java b/app/src/main/java/i0/l/a/x1.java
index 7a175281a5..fd9275175e 100644
--- a/app/src/main/java/i0/l/a/x1.java
+++ b/app/src/main/java/i0/l/a/x1.java
@@ -68,7 +68,7 @@ public final class x1<T> implements Observable.a<T> {
             Observable<T> observable = this.l;
             this.l = null;
             this.m = Thread.currentThread();
-            observable.h0(this);
+            observable.i0(this);
         }
 
         @Override // i0.g
diff --git a/app/src/main/java/i0/l/a/y.java b/app/src/main/java/i0/l/a/y.java
index c865215a8d..303a9512ec 100644
--- a/app/src/main/java/i0/l/a/y.java
+++ b/app/src/main/java/i0/l/a/y.java
@@ -36,11 +36,11 @@ public final class y<T> implements Observable.a<T> {
         subscriber.add(aVar);
         SerialSubscription serialSubscription = new SerialSubscription();
         subscriber.add(serialSubscription);
-        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.j0());
-        serializedSubject.T(new d(a.a));
+        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.k0());
+        serializedSubject.U(new d(a.a));
         i0.l.b.a aVar2 = new i0.l.b.a();
         t tVar = new t(this, subscriber, serializedSubject, aVar2, atomicLong, serialSubscription);
-        aVar.a(new w(this, (Observable) this.j.call(Observable.g0(new r(serializedSubject.i, new v(this)))), subscriber, atomicLong, aVar, tVar, atomicBoolean));
+        aVar.a(new w(this, (Observable) this.j.call(Observable.h0(new r(serializedSubject.i, new v(this)))), subscriber, atomicLong, aVar, tVar, atomicBoolean));
         subscriber.setProducer(new x(this, atomicLong, aVar2, atomicBoolean, aVar, tVar));
     }
 }
diff --git a/app/src/main/java/i0/l/a/y1.java b/app/src/main/java/i0/l/a/y1.java
index 2e3d1df41d..61429d6c39 100644
--- a/app/src/main/java/i0/l/a/y1.java
+++ b/app/src/main/java/i0/l/a/y1.java
@@ -38,7 +38,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
             synchronized (cVar) {
                 if (cVar.m.get() == j) {
                     cVar.u = false;
-                    cVar.f3106r = null;
+                    cVar.f3104r = null;
                     cVar.b();
                 }
             }
@@ -53,7 +53,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
                 if (cVar.m.get() == j) {
                     z2 = cVar.c(th);
                     cVar.u = false;
-                    cVar.f3106r = null;
+                    cVar.f3104r = null;
                 } else {
                     z2 = true;
                 }
@@ -87,7 +87,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
             synchronized (cVar) {
                 if (cVar.m.get() == j) {
                     long j2 = cVar.q;
-                    cVar.f3106r = producer;
+                    cVar.f3104r = producer;
                     producer.j(j2);
                 }
             }
@@ -107,7 +107,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
         public long q;
 
         /* renamed from: r  reason: collision with root package name */
-        public Producer f3106r;
+        public Producer f3104r;
         public volatile boolean s;
         public Throwable t;
         public boolean u;
@@ -270,10 +270,10 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
             synchronized (this) {
                 bVar = new b(incrementAndGet, this);
                 this.u = true;
-                this.f3106r = null;
+                this.f3104r = null;
             }
             this.k.a(bVar);
-            observable.h0(bVar);
+            observable.i0(bVar);
         }
     }
 
diff --git a/app/src/main/java/i0/l/a/z.java b/app/src/main/java/i0/l/a/z.java
index 59bf8e9433..634f82f6ea 100644
--- a/app/src/main/java/i0/l/a/z.java
+++ b/app/src/main/java/i0/l/a/z.java
@@ -28,7 +28,7 @@ public class z implements Action1<Subscription> {
             Subscriber subscriber = this.i;
             CompositeSubscription compositeSubscription = c0Var.j;
             subscriber.add(new a(new b0(c0Var, compositeSubscription)));
-            c0Var.i.h0(new a0(c0Var, subscriber, subscriber, compositeSubscription));
+            c0Var.i.i0(new a0(c0Var, subscriber, subscriber, compositeSubscription));
         } finally {
             this.k.l.unlock();
             this.j.set(z2);
diff --git a/app/src/main/java/i0/l/a/z0.java b/app/src/main/java/i0/l/a/z0.java
index 587f469a51..d88980b4e9 100644
--- a/app/src/main/java/i0/l/a/z0.java
+++ b/app/src/main/java/i0/l/a/z0.java
@@ -32,7 +32,7 @@ public final class z0<T> implements Observable.b<T, T> {
         public Throwable q;
 
         /* renamed from: r  reason: collision with root package name */
-        public long f3107r;
+        public long f3105r;
 
         public a(Scheduler scheduler, Subscriber<? super T> subscriber, boolean z2, int i) {
             this.i = subscriber;
@@ -104,7 +104,7 @@ public final class z0<T> implements Observable.b<T, T> {
         @Override // rx.functions.Action0
         public void call() {
             int i;
-            long j = this.f3107r;
+            long j = this.f3105r;
             Queue<Object> queue = this.l;
             Subscriber<? super T> subscriber = this.i;
             long j2 = 1;
@@ -134,7 +134,7 @@ public final class z0<T> implements Observable.b<T, T> {
                     }
                 }
                 if (i != 0 || !a(this.n, queue.isEmpty(), subscriber, queue)) {
-                    this.f3107r = j;
+                    this.f3105r = j;
                     j2 = this.p.addAndGet(-j2);
                 } else {
                     return;
diff --git a/app/src/main/java/i0/l/a/z1.java b/app/src/main/java/i0/l/a/z1.java
index 041e00e26a..69520950eb 100644
--- a/app/src/main/java/i0/l/a/z1.java
+++ b/app/src/main/java/i0/l/a/z1.java
@@ -14,7 +14,7 @@ public class z1 implements Action0 {
     public void call() {
         y1.c cVar = this.i;
         synchronized (cVar) {
-            cVar.f3106r = null;
+            cVar.f3104r = null;
         }
     }
 }
diff --git a/app/src/main/java/i0/l/c/a.java b/app/src/main/java/i0/l/c/a.java
index f08cc22878..65fb38a959 100644
--- a/app/src/main/java/i0/l/c/a.java
+++ b/app/src/main/java/i0/l/c/a.java
@@ -23,7 +23,7 @@ public final class a extends Scheduler implements k {
     public static final TimeUnit b = TimeUnit.SECONDS;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f3108c;
+    public static final c f3106c;
     public static final C0329a d;
     public final ThreadFactory e;
     public final AtomicReference<C0329a> f;
@@ -35,7 +35,7 @@ public final class a extends Scheduler implements k {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ConcurrentLinkedQueue<c> f3109c;
+        public final ConcurrentLinkedQueue<c> f3107c;
         public final CompositeSubscription d;
         public final ScheduledExecutorService e;
         public final Future<?> f;
@@ -66,15 +66,15 @@ public final class a extends Scheduler implements k {
             @Override // java.lang.Runnable
             public void run() {
                 C0329a aVar = C0329a.this;
-                if (!aVar.f3109c.isEmpty()) {
+                if (!aVar.f3107c.isEmpty()) {
                     long nanoTime = System.nanoTime();
-                    Iterator<c> it = aVar.f3109c.iterator();
+                    Iterator<c> it = aVar.f3107c.iterator();
                     while (it.hasNext()) {
                         c next = it.next();
                         if (next.q > nanoTime) {
                             return;
                         }
-                        if (aVar.f3109c.remove(next)) {
+                        if (aVar.f3107c.remove(next)) {
                             aVar.d.c(next);
                         }
                     }
@@ -87,7 +87,7 @@ public final class a extends Scheduler implements k {
             this.a = threadFactory;
             long nanos = timeUnit != null ? timeUnit.toNanos(j) : 0;
             this.b = nanos;
-            this.f3109c = new ConcurrentLinkedQueue<>();
+            this.f3107c = new ConcurrentLinkedQueue<>();
             this.d = new CompositeSubscription();
             ScheduledExecutorService scheduledExecutorService = null;
             if (timeUnit != null) {
@@ -147,15 +147,15 @@ public final class a extends Scheduler implements k {
             this.j = aVar;
             this.l = new AtomicBoolean();
             if (aVar.d.j) {
-                cVar = a.f3108c;
+                cVar = a.f3106c;
             } else {
                 while (true) {
-                    if (aVar.f3109c.isEmpty()) {
+                    if (aVar.f3107c.isEmpty()) {
                         cVar2 = new c(aVar.a);
                         aVar.d.a(cVar2);
                         break;
                     }
-                    cVar2 = aVar.f3109c.poll();
+                    cVar2 = aVar.f3107c.poll();
                     if (cVar2 != null) {
                         break;
                     }
@@ -187,7 +187,7 @@ public final class a extends Scheduler implements k {
             c cVar = this.k;
             Objects.requireNonNull(aVar);
             cVar.q = System.nanoTime() + aVar.b;
-            aVar.f3109c.offer(cVar);
+            aVar.f3107c.offer(cVar);
         }
 
         @Override // rx.Subscription
@@ -215,7 +215,7 @@ public final class a extends Scheduler implements k {
 
     static {
         c cVar = new c(i.i);
-        f3108c = cVar;
+        f3106c = cVar;
         cVar.unsubscribe();
         C0329a aVar = new C0329a(null, 0, null);
         d = aVar;
diff --git a/app/src/main/java/i0/l/c/b.java b/app/src/main/java/i0/l/c/b.java
index 99d4de0b9c..c0c41653ad 100644
--- a/app/src/main/java/i0/l/c/b.java
+++ b/app/src/main/java/i0/l/c/b.java
@@ -17,7 +17,7 @@ public final class b extends Scheduler implements k {
     public static final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final C0334b f3110c = new C0334b(null, 0);
+    public static final C0334b f3108c = new C0334b(null, 0);
     public final ThreadFactory d;
     public final AtomicReference<C0334b> e;
 
@@ -119,7 +119,7 @@ public final class b extends Scheduler implements k {
         public final c[] b;
 
         /* renamed from: c  reason: collision with root package name */
-        public long f3111c;
+        public long f3109c;
 
         public C0334b(ThreadFactory threadFactory, int i) {
             this.a = i;
@@ -135,8 +135,8 @@ public final class b extends Scheduler implements k {
                 return b.b;
             }
             c[] cVarArr = this.b;
-            long j = this.f3111c;
-            this.f3111c = 1 + j;
+            long j = this.f3109c;
+            this.f3109c = 1 + j;
             return cVarArr[(int) (j % ((long) i))];
         }
     }
@@ -162,7 +162,7 @@ public final class b extends Scheduler implements k {
 
     public b(ThreadFactory threadFactory) {
         this.d = threadFactory;
-        C0334b bVar = f3110c;
+        C0334b bVar = f3108c;
         AtomicReference<C0334b> atomicReference = new AtomicReference<>(bVar);
         this.e = atomicReference;
         C0334b bVar2 = new C0334b(threadFactory, a);
@@ -184,7 +184,7 @@ public final class b extends Scheduler implements k {
         C0334b bVar2;
         do {
             bVar = this.e.get();
-            bVar2 = f3110c;
+            bVar2 = f3108c;
             if (bVar == bVar2) {
                 return;
             }
diff --git a/app/src/main/java/i0/l/c/c.java b/app/src/main/java/i0/l/c/c.java
index 8bbaee288d..296c99b50f 100644
--- a/app/src/main/java/i0/l/c/c.java
+++ b/app/src/main/java/i0/l/c/c.java
@@ -65,7 +65,7 @@ public final class c extends Scheduler {
         public a(Executor executor) {
             ScheduledExecutorService scheduledExecutorService;
             this.i = executor;
-            ScheduledExecutorService[] scheduledExecutorServiceArr = d.f3112c.e.get();
+            ScheduledExecutorService[] scheduledExecutorServiceArr = d.f3110c.e.get();
             if (scheduledExecutorServiceArr == d.a) {
                 scheduledExecutorService = d.b;
             } else {
diff --git a/app/src/main/java/i0/l/c/d.java b/app/src/main/java/i0/l/c/d.java
index 18f8885863..e1244c8554 100644
--- a/app/src/main/java/i0/l/c/d.java
+++ b/app/src/main/java/i0/l/c/d.java
@@ -10,7 +10,7 @@ public final class d implements k {
     public static final ScheduledExecutorService b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d f3112c = new d();
+    public static final d f3110c = new d();
     public static int d;
     public final AtomicReference<ScheduledExecutorService[]> e = new AtomicReference<>(a);
 
diff --git a/app/src/main/java/i0/l/c/h.java b/app/src/main/java/i0/l/c/h.java
index d64b6f3ad6..17c3902f3f 100644
--- a/app/src/main/java/i0/l/c/h.java
+++ b/app/src/main/java/i0/l/c/h.java
@@ -19,7 +19,7 @@ public final class h implements Action0 {
     public final /* synthetic */ Scheduler.Worker q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final /* synthetic */ long f3113r;
+    public final /* synthetic */ long f3111r;
 
     public h(long j, long j2, Action0 action0, a aVar, i.a aVar2, Scheduler.Worker worker, long j3) {
         this.l = j;
@@ -28,7 +28,7 @@ public final class h implements Action0 {
         this.o = aVar;
         this.p = aVar2;
         this.q = worker;
-        this.f3113r = j3;
+        this.f3111r = j3;
         this.j = j;
         this.k = j2;
     }
@@ -50,7 +50,7 @@ public final class h implements Action0 {
             long j3 = i.a;
             long j4 = this.j;
             if (j + j3 >= j4) {
-                long j5 = this.f3113r;
+                long j5 = this.f3111r;
                 if (j < j4 + j5 + j3) {
                     long j6 = this.k;
                     long j7 = this.i + 1;
@@ -60,7 +60,7 @@ public final class h implements Action0 {
                     this.o.a(this.q.b(this, j2 - j, TimeUnit.NANOSECONDS));
                 }
             }
-            long j8 = this.f3113r;
+            long j8 = this.f3111r;
             j2 = j + j8;
             long j9 = this.i + 1;
             this.i = j9;
diff --git a/app/src/main/java/i0/l/e/e.java b/app/src/main/java/i0/l/e/e.java
index a64c2c9eab..49570107d4 100644
--- a/app/src/main/java/i0/l/e/e.java
+++ b/app/src/main/java/i0/l/e/e.java
@@ -27,7 +27,7 @@ public enum e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // i0.k.b
         public Throwable call(f<?> fVar) {
-            return fVar.f3093c;
+            return fVar.f3091c;
         }
     }
 
@@ -43,7 +43,7 @@ public enum e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // i0.k.b
         public Observable<?> call(Observable<? extends f<?>> observable) {
-            return (Observable) this.i.call(observable.E(e.i));
+            return (Observable) this.i.call(observable.F(e.i));
         }
     }
 
@@ -59,7 +59,7 @@ public enum e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // i0.k.b
         public Observable<?> call(Observable<? extends f<?>> observable) {
-            return (Observable) this.i.call(observable.E(e.j));
+            return (Observable) this.i.call(observable.F(e.j));
         }
     }
 
diff --git a/app/src/main/java/i0/l/e/f.java b/app/src/main/java/i0/l/e/f.java
index 8252637345..6e0445a41c 100644
--- a/app/src/main/java/i0/l/e/f.java
+++ b/app/src/main/java/i0/l/e/f.java
@@ -7,13 +7,13 @@ public final class f<T> {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f3114c;
+    public int f3112c;
     public T[] d;
 
     public f() {
         int O = a.O(16);
         this.a = O - 1;
-        this.f3114c = (int) (((float) O) * 0.75f);
+        this.f3112c = (int) (((float) O) * 0.75f);
         this.d = (T[]) new Object[O];
     }
 
@@ -43,7 +43,7 @@ public final class f<T> {
         tArr[b] = t;
         int i2 = this.b + 1;
         this.b = i2;
-        if (i2 >= this.f3114c) {
+        if (i2 >= this.f3112c) {
             T[] tArr2 = this.d;
             int length = tArr2.length;
             int i3 = length << 1;
@@ -67,7 +67,7 @@ public final class f<T> {
                 i2 = i5;
             }
             this.a = i4;
-            this.f3114c = (int) (((float) i3) * 0.75f);
+            this.f3112c = (int) (((float) i3) * 0.75f);
             this.d = tArr3;
         }
         return true;
diff --git a/app/src/main/java/i0/l/e/j.java b/app/src/main/java/i0/l/e/j.java
index 878b9f5cb2..c37e32bd46 100644
--- a/app/src/main/java/i0/l/e/j.java
+++ b/app/src/main/java/i0/l/e/j.java
@@ -65,7 +65,7 @@ public final class j<T> extends Observable<T> {
                 subscriber.setProducer(j.j ? new i0.l.b.c(subscriber, t) : new g(subscriber, t));
                 return;
             }
-            observable.h0(new i0.n.e(subscriber, subscriber));
+            observable.i0(new i0.n.e(subscriber, subscriber));
         }
     }
 
@@ -193,11 +193,11 @@ public final class j<T> extends Observable<T> {
         this.k = t;
     }
 
-    public <R> Observable<R> j0(i0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
-        return Observable.g0(new c(bVar));
+    public <R> Observable<R> k0(i0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
+        return Observable.h0(new c(bVar));
     }
 
-    public Observable<T> k0(Scheduler scheduler) {
-        return Observable.g0(new e(this.k, scheduler instanceof i0.l.c.b ? new a(this, (i0.l.c.b) scheduler) : new b(this, scheduler)));
+    public Observable<T> l0(Scheduler scheduler) {
+        return Observable.h0(new e(this.k, scheduler instanceof i0.l.c.b ? new a(this, (i0.l.c.b) scheduler) : new b(this, scheduler)));
     }
 }
diff --git a/app/src/main/java/i0/l/e/m/e.java b/app/src/main/java/i0/l/e/m/e.java
index d27bf06877..211a29b331 100644
--- a/app/src/main/java/i0/l/e/m/e.java
+++ b/app/src/main/java/i0/l/e/m/e.java
@@ -19,7 +19,7 @@ public final class e<T> implements Queue<T> {
     public AtomicReferenceArray<Object> q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final AtomicLong f3115r = new AtomicLong();
+    public final AtomicLong f3113r = new AtomicLong();
 
     public e(int i2) {
         int O = a.O(i2);
@@ -44,7 +44,7 @@ public final class e<T> implements Queue<T> {
     }
 
     public final long c() {
-        return this.f3115r.get();
+        return this.f3113r.get();
     }
 
     @Override // java.util.Collection
@@ -145,7 +145,7 @@ public final class e<T> implements Queue<T> {
     @Override // java.util.Queue
     public T peek() {
         AtomicReferenceArray<Object> atomicReferenceArray = this.q;
-        int i2 = ((int) this.f3115r.get()) & this.p;
+        int i2 = ((int) this.f3113r.get()) & this.p;
         T t = (T) atomicReferenceArray.get(i2);
         if (t != j) {
             return t;
@@ -158,13 +158,13 @@ public final class e<T> implements Queue<T> {
     @Override // java.util.Queue
     public T poll() {
         AtomicReferenceArray<Object> atomicReferenceArray = this.q;
-        long j2 = this.f3115r.get();
+        long j2 = this.f3113r.get();
         int i2 = this.p & ((int) j2);
         T t = (T) atomicReferenceArray.get(i2);
         boolean z2 = t == j;
         if (t != null && !z2) {
             atomicReferenceArray.lazySet(i2, null);
-            this.f3115r.lazySet(j2 + 1);
+            this.f3113r.lazySet(j2 + 1);
             return t;
         } else if (!z2) {
             return null;
@@ -176,7 +176,7 @@ public final class e<T> implements Queue<T> {
                 return null;
             }
             atomicReferenceArray2.lazySet(i2, null);
-            this.f3115r.lazySet(j2 + 1);
+            this.f3113r.lazySet(j2 + 1);
             return t2;
         }
     }
diff --git a/app/src/main/java/i0/l/e/m/g.java b/app/src/main/java/i0/l/e/m/g.java
index e6dc916198..44456c9bfc 100644
--- a/app/src/main/java/i0/l/e/m/g.java
+++ b/app/src/main/java/i0/l/e/m/g.java
@@ -20,7 +20,7 @@ public final class g<T> implements Queue<T> {
     public AtomicReferenceArray<Object> q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final AtomicLong f3116r = new AtomicLong();
+    public final AtomicLong f3114r = new AtomicLong();
 
     public g(int i2) {
         int O = a.O(Math.max(8, i2));
@@ -48,7 +48,7 @@ public final class g<T> implements Queue<T> {
     }
 
     public final long c() {
-        return this.f3116r.get();
+        return this.f3114r.get();
     }
 
     @Override // java.util.Collection
@@ -128,7 +128,7 @@ public final class g<T> implements Queue<T> {
     @Override // java.util.Queue
     public T peek() {
         AtomicReferenceArray<Object> atomicReferenceArray = this.q;
-        int i2 = ((int) this.f3116r.get()) & this.p;
+        int i2 = ((int) this.f3114r.get()) & this.p;
         T t = (T) atomicReferenceArray.get(i2);
         if (t != j) {
             return t;
@@ -141,12 +141,12 @@ public final class g<T> implements Queue<T> {
     @Override // java.util.Queue
     public T poll() {
         AtomicReferenceArray<Object> atomicReferenceArray = this.q;
-        long j2 = this.f3116r.get();
+        long j2 = this.f3114r.get();
         int i2 = this.p & ((int) j2);
         T t = (T) atomicReferenceArray.get(i2);
         boolean z2 = t == j;
         if (t != null && !z2) {
-            this.f3116r.lazySet(j2 + 1);
+            this.f3114r.lazySet(j2 + 1);
             atomicReferenceArray.lazySet(i2, null);
             return t;
         } else if (!z2) {
@@ -158,7 +158,7 @@ public final class g<T> implements Queue<T> {
             if (t2 == null) {
                 return null;
             }
-            this.f3116r.lazySet(j2 + 1);
+            this.f3114r.lazySet(j2 + 1);
             atomicReferenceArray2.lazySet(i2, null);
             return t2;
         }
diff --git a/app/src/main/java/i0/l/e/n/t.java b/app/src/main/java/i0/l/e/n/t.java
index b802f1162d..3824948369 100644
--- a/app/src/main/java/i0/l/e/n/t.java
+++ b/app/src/main/java/i0/l/e/n/t.java
@@ -11,7 +11,7 @@ public class t<E> extends v<E> {
     public static final long q;
 
     /* renamed from: r  reason: collision with root package name */
-    public static final long f3117r;
+    public static final long f3115r;
     public static final int s;
     public static final Object t = new Object();
 
@@ -25,7 +25,7 @@ public class t<E> extends v<E> {
         } else {
             throw new IllegalStateException("Unknown pointer size");
         }
-        f3117r = (long) unsafe.arrayBaseOffset(Object[].class);
+        f3115r = (long) unsafe.arrayBaseOffset(Object[].class);
         try {
             p = unsafe.objectFieldOffset(x.class.getDeclaredField("producerIndex"));
             try {
@@ -56,7 +56,7 @@ public class t<E> extends v<E> {
     }
 
     public static long c(long j) {
-        return f3117r + (j << s);
+        return f3115r + (j << s);
     }
 
     public static long d(long j, long j2) {
diff --git a/app/src/main/java/i0/m/a.java b/app/src/main/java/i0/m/a.java
index c479341573..7f1e8a82a0 100644
--- a/app/src/main/java/i0/m/a.java
+++ b/app/src/main/java/i0/m/a.java
@@ -47,12 +47,12 @@ public final class a<T> {
         AtomicReference atomicReference = new AtomicReference();
         AtomicReference atomicReference2 = new AtomicReference();
         CountDownLatch countDownLatch = new CountDownLatch(1);
-        Subscription T = observable.T(new C0338a(this, countDownLatch, atomicReference2, atomicReference));
+        Subscription U = observable.U(new C0338a(this, countDownLatch, atomicReference2, atomicReference));
         if (countDownLatch.getCount() != 0) {
             try {
                 countDownLatch.await();
             } catch (InterruptedException e) {
-                T.unsubscribe();
+                U.unsubscribe();
                 Thread.currentThread().interrupt();
                 throw new IllegalStateException("Interrupted while waiting for subscription to complete.", e);
             }
@@ -65,6 +65,6 @@ public final class a<T> {
     }
 
     public T b() {
-        return a(this.a.Q());
+        return a(this.a.R());
     }
 }
diff --git a/app/src/main/java/i0/m/b.java b/app/src/main/java/i0/m/b.java
index 713d453f3a..4f941b377e 100644
--- a/app/src/main/java/i0/m/b.java
+++ b/app/src/main/java/i0/m/b.java
@@ -9,5 +9,5 @@ public abstract class b<T> extends Observable<T> {
         super(aVar);
     }
 
-    public abstract void j0(Action1<? super Subscription> action1);
+    public abstract void k0(Action1<? super Subscription> action1);
 }
diff --git a/app/src/main/java/i0/o/l.java b/app/src/main/java/i0/o/l.java
index 983efdd3ad..2fac1259c3 100644
--- a/app/src/main/java/i0/o/l.java
+++ b/app/src/main/java/i0/o/l.java
@@ -16,7 +16,7 @@ public final class l {
     public static volatile b<Observable.a, Observable.a> b = new c();
 
     /* renamed from: c  reason: collision with root package name */
-    public static volatile b<h.a, h.a> f3118c = new d();
+    public static volatile b<h.a, h.a> f3116c = new d();
     public static volatile b<d.a, d.a> d = new e();
     public static volatile Func2<Observable, Observable.a, Observable.a> e = new g();
     public static volatile b<Action0, Action0> f = new i();
diff --git a/app/src/main/java/i0/o/o.java b/app/src/main/java/i0/o/o.java
index 72ed5074cf..e72e2cfbce 100644
--- a/app/src/main/java/i0/o/o.java
+++ b/app/src/main/java/i0/o/o.java
@@ -10,7 +10,7 @@ public class o {
     public static final b b = new a();
 
     /* renamed from: c  reason: collision with root package name */
-    public final AtomicReference<b> f3119c = new AtomicReference<>();
+    public final AtomicReference<b> f3117c = new AtomicReference<>();
     public final AtomicReference<m> d = new AtomicReference<>();
     public final AtomicReference<q> e = new AtomicReference<>();
     public final AtomicReference<a> f = new AtomicReference<>();
@@ -88,15 +88,15 @@ public class o {
     }
 
     public b b() {
-        if (this.f3119c.get() == null) {
+        if (this.f3117c.get() == null) {
             Object d = d(b.class, g());
             if (d == null) {
-                this.f3119c.compareAndSet(null, b);
+                this.f3117c.compareAndSet(null, b);
             } else {
-                this.f3119c.compareAndSet(null, (b) d);
+                this.f3117c.compareAndSet(null, (b) d);
             }
         }
-        return this.f3119c.get();
+        return this.f3117c.get();
     }
 
     public m c() {
diff --git a/app/src/main/java/i0/p/a.java b/app/src/main/java/i0/p/a.java
index 32607bd5c5..d42eab5cb8 100644
--- a/app/src/main/java/i0/p/a.java
+++ b/app/src/main/java/i0/p/a.java
@@ -14,7 +14,7 @@ public final class a {
     public final Scheduler b = new b(new i("RxComputationScheduler-"));
 
     /* renamed from: c  reason: collision with root package name */
-    public final Scheduler f3120c = new i0.l.c.a(new i("RxIoScheduler-"));
+    public final Scheduler f3118c = new i0.l.c.a(new i("RxIoScheduler-"));
     public final Scheduler d = new f(new i("RxNewThreadScheduler-"));
 
     public a() {
@@ -41,7 +41,7 @@ public final class a {
                 if (scheduler instanceof k) {
                     ((k) scheduler).shutdown();
                 }
-                Scheduler scheduler2 = aVar2.f3120c;
+                Scheduler scheduler2 = aVar2.f3118c;
                 if (scheduler2 instanceof k) {
                     ((k) scheduler2).shutdown();
                 }
@@ -54,6 +54,6 @@ public final class a {
     }
 
     public static Scheduler c() {
-        return b().f3120c;
+        return b().f3118c;
     }
 }
diff --git a/app/src/main/java/i0/q/a.java b/app/src/main/java/i0/q/a.java
index 6e4668490e..e3fdc90a60 100644
--- a/app/src/main/java/i0/q/a.java
+++ b/app/src/main/java/i0/q/a.java
@@ -65,7 +65,7 @@ public final class a<T> extends Subject<T, T> {
         public volatile C0341a<T> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public C0341a<T> f3121c;
+        public C0341a<T> f3119c;
         public int d;
         public volatile boolean e;
         public Throwable f;
@@ -84,7 +84,7 @@ public final class a<T> extends Subject<T, T> {
         public c(int i) {
             this.a = i;
             C0341a<T> aVar = new C0341a<>(null);
-            this.f3121c = aVar;
+            this.f3119c = aVar;
             this.b = aVar;
         }
 
@@ -276,8 +276,8 @@ public final class a<T> extends Subject<T, T> {
             c cVar = (c) aVar;
             Objects.requireNonNull(cVar);
             c.C0341a<T> aVar2 = new c.C0341a<>(t);
-            cVar.f3121c.set(aVar2);
-            cVar.f3121c = aVar2;
+            cVar.f3119c.set(aVar2);
+            cVar.f3119c = aVar2;
             int i2 = cVar.d;
             if (i2 == cVar.a) {
                 cVar.b = cVar.b.get();
diff --git a/app/src/main/java/i0/q/c.java b/app/src/main/java/i0/q/c.java
index acc680cb14..d052e2a8e2 100644
--- a/app/src/main/java/i0/q/c.java
+++ b/app/src/main/java/i0/q/c.java
@@ -24,7 +24,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
         public static final a b;
 
         /* renamed from: c  reason: collision with root package name */
-        public static final a f3122c;
+        public static final a f3120c;
         public final boolean d;
         public final b[] e;
 
@@ -32,7 +32,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
             b[] bVarArr = new b[0];
             a = bVarArr;
             b = new a(true, bVarArr);
-            f3122c = new a(false, bVarArr);
+            f3120c = new a(false, bVarArr);
         }
 
         public a(boolean z2, b[] bVarArr) {
@@ -87,7 +87,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
     }
 
     public c() {
-        super(a.f3122c);
+        super(a.f3120c);
         a.C0323a aVar = i0.k.a.a;
         this.onStart = aVar;
         this.onAdded = aVar;
@@ -103,7 +103,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
                 b<T>[] bVarArr = aVar.e;
                 int length = bVarArr.length;
                 if (length == 1 && bVarArr[0] == bVar) {
-                    aVar2 = a.f3122c;
+                    aVar2 = a.f3120c;
                 } else {
                     if (length != 0) {
                         int i = length - 1;
@@ -122,7 +122,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
                                 }
                                 i2++;
                             } else if (i3 == 0) {
-                                aVar2 = a.f3122c;
+                                aVar2 = a.f3120c;
                             } else {
                                 if (i3 < i) {
                                     b[] bVarArr3 = new b[i3];
diff --git a/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java b/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
index b43c621436..b26d84cbb4 100644
--- a/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
+++ b/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
@@ -13,7 +13,7 @@ public final class CodedOutputStream {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f3123c;
+    public int f3121c;
     public int d = 0;
     public final OutputStream e;
 
@@ -26,7 +26,7 @@ public final class CodedOutputStream {
     public CodedOutputStream(OutputStream outputStream, byte[] bArr) {
         this.e = outputStream;
         this.a = bArr;
-        this.f3123c = 0;
+        this.f3121c = 0;
         this.b = bArr.length;
     }
 
@@ -212,8 +212,8 @@ public final class CodedOutputStream {
     public final void a() throws IOException {
         OutputStream outputStream = this.e;
         if (outputStream != null) {
-            outputStream.write(this.a, 0, this.f3123c);
-            this.f3123c = 0;
+            outputStream.write(this.a, 0, this.f3121c);
+            this.f3121c = 0;
             return;
         }
         throw new OutOfSpaceException();
@@ -329,12 +329,12 @@ public final class CodedOutputStream {
     }
 
     public void writeRawByte(byte b) throws IOException {
-        if (this.f3123c == this.b) {
+        if (this.f3121c == this.b) {
             a();
         }
         byte[] bArr = this.a;
-        int i = this.f3123c;
-        this.f3123c = i + 1;
+        int i = this.f3121c;
+        this.f3121c = i + 1;
         bArr[i] = b;
         this.d++;
     }
@@ -349,10 +349,10 @@ public final class CodedOutputStream {
 
     public void writeRawBytes(c cVar, int i, int i2) throws IOException {
         int i3 = this.b;
-        int i4 = this.f3123c;
+        int i4 = this.f3121c;
         if (i3 - i4 >= i2) {
             cVar.copyTo(this.a, i, i4, i2);
-            this.f3123c += i2;
+            this.f3121c += i2;
             this.d += i2;
             return;
         }
@@ -360,12 +360,12 @@ public final class CodedOutputStream {
         cVar.copyTo(this.a, i, i4, i5);
         int i6 = i + i5;
         int i7 = i2 - i5;
-        this.f3123c = this.b;
+        this.f3121c = this.b;
         this.d += i5;
         a();
         if (i7 <= this.b) {
             cVar.copyTo(this.a, i6, 0, i7);
-            this.f3123c = i7;
+            this.f3121c = i7;
         } else {
             OutputStream outputStream = this.e;
             if (i6 < 0) {
@@ -390,10 +390,10 @@ public final class CodedOutputStream {
 
     public void writeRawBytes(byte[] bArr, int i, int i2) throws IOException {
         int i3 = this.b;
-        int i4 = this.f3123c;
+        int i4 = this.f3121c;
         if (i3 - i4 >= i2) {
             System.arraycopy(bArr, i, this.a, i4, i2);
-            this.f3123c += i2;
+            this.f3121c += i2;
             this.d += i2;
             return;
         }
@@ -401,12 +401,12 @@ public final class CodedOutputStream {
         System.arraycopy(bArr, i, this.a, i4, i5);
         int i6 = i + i5;
         int i7 = i2 - i5;
-        this.f3123c = this.b;
+        this.f3121c = this.b;
         this.d += i5;
         a();
         if (i7 <= this.b) {
             System.arraycopy(bArr, i6, this.a, 0, i7);
-            this.f3123c = i7;
+            this.f3121c = i7;
         } else {
             this.e.write(bArr, i6, i7);
         }
diff --git a/app/src/main/java/okhttp3/MediaType.java b/app/src/main/java/okhttp3/MediaType.java
index c14fc0cbb5..5f853838c3 100644
--- a/app/src/main/java/okhttp3/MediaType.java
+++ b/app/src/main/java/okhttp3/MediaType.java
@@ -19,7 +19,7 @@ public final class MediaType {
     public static final Pattern b = Pattern.compile(";\\s*(?:([a-zA-Z0-9-!#$%&'*+.^_`{|}~]+)=(?:([a-zA-Z0-9-!#$%&'*+.^_`{|}~]+)|\"([^\"]*)\"))?");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f3124c = null;
+    public static final a f3122c = null;
     public final String d;
     public final String e;
     public final String f;
diff --git a/app/src/main/java/okhttp3/MultipartBody.java b/app/src/main/java/okhttp3/MultipartBody.java
index a5e4ee35a9..967563c5b7 100644
--- a/app/src/main/java/okhttp3/MultipartBody.java
+++ b/app/src/main/java/okhttp3/MultipartBody.java
@@ -21,7 +21,7 @@ public final class MultipartBody extends RequestBody {
     public static final MediaType b = MediaType.a.a(ShareTarget.ENCODING_TYPE_MULTIPART);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final byte[] f3125c = {(byte) 58, (byte) 32};
+    public static final byte[] f3123c = {(byte) 58, (byte) 32};
     public static final byte[] d = {(byte) 13, (byte) 10};
     public static final byte[] e;
     public static final b f = new b(null);
@@ -99,7 +99,7 @@ public final class MultipartBody extends RequestBody {
         public MediaType b = MultipartBody.a;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<Part> f3126c = new ArrayList();
+        public final List<Part> f3124c = new ArrayList();
 
         public a() {
             String uuid = UUID.randomUUID().toString();
@@ -110,13 +110,13 @@ public final class MultipartBody extends RequestBody {
 
         public final a a(Part part) {
             m.checkParameterIsNotNull(part, "part");
-            this.f3126c.add(part);
+            this.f3124c.add(part);
             return this;
         }
 
         public final MultipartBody b() {
-            if (!this.f3126c.isEmpty()) {
-                return new MultipartBody(this.a, this.b, c.z(this.f3126c));
+            if (!this.f3124c.isEmpty()) {
+                return new MultipartBody(this.a, this.b, c.z(this.f3124c));
             }
             throw new IllegalStateException("Multipart body must have at least one part.".toString());
         }
@@ -158,7 +158,7 @@ public final class MultipartBody extends RequestBody {
     }
 
     static {
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
         MediaType.a.a("multipart/alternative");
         MediaType.a.a("multipart/digest");
         MediaType.a.a("multipart/parallel");
@@ -173,7 +173,7 @@ public final class MultipartBody extends RequestBody {
         this.i = byteString;
         this.j = mediaType;
         this.k = list;
-        MediaType.a aVar = MediaType.f3124c;
+        MediaType.a aVar = MediaType.f3122c;
         this.g = MediaType.a.a(mediaType + "; boundary=" + byteString.q());
     }
 
@@ -204,7 +204,7 @@ public final class MultipartBody extends RequestBody {
             if (headers != null) {
                 int size2 = headers.size();
                 for (int i2 = 0; i2 < size2; i2++) {
-                    bufferedSink.J(headers.d(i2)).write(f3125c).J(headers.g(i2)).write(d);
+                    bufferedSink.J(headers.d(i2)).write(f3123c).J(headers.g(i2)).write(d);
                 }
             }
             MediaType contentType = requestBody.contentType();
diff --git a/app/src/main/java/okhttp3/Request.java b/app/src/main/java/okhttp3/Request.java
index 4f9868292d..fbaed64395 100644
--- a/app/src/main/java/okhttp3/Request.java
+++ b/app/src/main/java/okhttp3/Request.java
@@ -23,7 +23,7 @@ public final class Request {
     public final w b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f3127c;
+    public final String f3125c;
     public final Headers d;
     public final RequestBody e;
     public final Map<Class<?>, Object> f;
@@ -34,24 +34,24 @@ public final class Request {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Headers.a f3128c;
+        public Headers.a f3126c;
         public RequestBody d;
         public Map<Class<?>, Object> e;
 
         public a() {
             this.e = new LinkedHashMap();
             this.b = ShareTarget.METHOD_GET;
-            this.f3128c = new Headers.a();
+            this.f3126c = new Headers.a();
         }
 
         public a(Request request) {
             m.checkParameterIsNotNull(request, "request");
             this.e = new LinkedHashMap();
             this.a = request.b;
-            this.b = request.f3127c;
+            this.b = request.f3125c;
             this.d = request.e;
             this.e = request.f.isEmpty() ? new LinkedHashMap<>() : h0.toMutableMap(request.f);
-            this.f3128c = request.d.e();
+            this.f3126c = request.d.e();
         }
 
         public Request a() {
@@ -59,7 +59,7 @@ public final class Request {
             w wVar = this.a;
             if (wVar != null) {
                 String str = this.b;
-                Headers c2 = this.f3128c.c();
+                Headers c2 = this.f3126c.c();
                 RequestBody requestBody = this.d;
                 Map<Class<?>, Object> map2 = this.e;
                 byte[] bArr = c.a;
@@ -78,7 +78,7 @@ public final class Request {
         public a b(String str, String str2) {
             m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
-            Headers.a aVar = this.f3128c;
+            Headers.a aVar = this.f3126c;
             Objects.requireNonNull(aVar);
             m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
@@ -114,7 +114,7 @@ public final class Request {
 
         public a d(String str) {
             m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
-            this.f3128c.d(str);
+            this.f3126c.d(str);
             return this;
         }
 
@@ -171,7 +171,7 @@ public final class Request {
         m.checkParameterIsNotNull(headers, "headers");
         m.checkParameterIsNotNull(map, ModelAuditLogEntry.CHANGE_KEY_TAGS);
         this.b = wVar;
-        this.f3127c = str;
+        this.f3125c = str;
         this.d = headers;
         this.e = requestBody;
         this.f = map;
@@ -194,7 +194,7 @@ public final class Request {
 
     public String toString() {
         StringBuilder O = c.d.b.a.a.O("Request{method=");
-        O.append(this.f3127c);
+        O.append(this.f3125c);
         O.append(", url=");
         O.append(this.b);
         if (this.d.size() != 0) {
diff --git a/app/src/main/java/okhttp3/RequestBody.java b/app/src/main/java/okhttp3/RequestBody.java
index aa16ce76ef..253b2f00cd 100644
--- a/app/src/main/java/okhttp3/RequestBody.java
+++ b/app/src/main/java/okhttp3/RequestBody.java
@@ -26,19 +26,19 @@ public abstract class RequestBody {
             public final /* synthetic */ MediaType b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ int f3129c;
+            public final /* synthetic */ int f3127c;
             public final /* synthetic */ int d;
 
             public a(byte[] bArr, MediaType mediaType, int i, int i2) {
                 this.a = bArr;
                 this.b = mediaType;
-                this.f3129c = i;
+                this.f3127c = i;
                 this.d = i2;
             }
 
             @Override // okhttp3.RequestBody
             public long contentLength() {
-                return (long) this.f3129c;
+                return (long) this.f3127c;
             }
 
             @Override // okhttp3.RequestBody
@@ -49,7 +49,7 @@ public abstract class RequestBody {
             @Override // okhttp3.RequestBody
             public void writeTo(BufferedSink bufferedSink) {
                 m.checkParameterIsNotNull(bufferedSink, "sink");
-                bufferedSink.write(this.a, this.d, this.f3129c);
+                bufferedSink.write(this.a, this.d, this.f3127c);
             }
         }
 
@@ -91,7 +91,7 @@ public abstract class RequestBody {
                 Pattern pattern = MediaType.a;
                 Charset a2 = mediaType.a(null);
                 if (a2 == null) {
-                    MediaType.a aVar = MediaType.f3124c;
+                    MediaType.a aVar = MediaType.f3122c;
                     mediaType = MediaType.a.b(mediaType + "; charset=utf-8");
                 } else {
                     charset = a2;
diff --git a/app/src/main/java/okhttp3/Response.java b/app/src/main/java/okhttp3/Response.java
index f2aaf3aa5e..624f7f05c2 100644
--- a/app/src/main/java/okhttp3/Response.java
+++ b/app/src/main/java/okhttp3/Response.java
@@ -21,7 +21,7 @@ public final class Response implements Closeable {
     public final Response q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final Response f3130r;
+    public final Response f3128r;
     public final long s;
     public final long t;
     public final c u;
@@ -32,7 +32,7 @@ public final class Response implements Closeable {
         public y b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f3131c;
+        public int f3129c;
         public String d;
         public v e;
         public Headers.a f;
@@ -45,30 +45,30 @@ public final class Response implements Closeable {
         public c m;
 
         public a() {
-            this.f3131c = -1;
+            this.f3129c = -1;
             this.f = new Headers.a();
         }
 
         public a(Response response) {
             m.checkParameterIsNotNull(response, "response");
-            this.f3131c = -1;
+            this.f3129c = -1;
             this.a = response.i;
             this.b = response.j;
-            this.f3131c = response.l;
+            this.f3129c = response.l;
             this.d = response.k;
             this.e = response.m;
             this.f = response.n.e();
             this.g = response.o;
             this.h = response.p;
             this.i = response.q;
-            this.j = response.f3130r;
+            this.j = response.f3128r;
             this.k = response.s;
             this.l = response.t;
             this.m = response.u;
         }
 
         public Response a() {
-            int i = this.f3131c;
+            int i = this.f3129c;
             if (i >= 0) {
                 Request request = this.a;
                 if (request != null) {
@@ -85,7 +85,7 @@ public final class Response implements Closeable {
                 throw new IllegalStateException("request == null".toString());
             }
             StringBuilder O = c.d.b.a.a.O("code < 0: ");
-            O.append(this.f3131c);
+            O.append(this.f3129c);
             throw new IllegalStateException(O.toString().toString());
         }
 
@@ -101,7 +101,7 @@ public final class Response implements Closeable {
                 if (response.o == null) {
                     if (response.p == null) {
                         if (response.q == null) {
-                            if (response.f3130r == null) {
+                            if (response.f3128r == null) {
                                 z2 = true;
                             }
                             if (!z2) {
@@ -156,7 +156,7 @@ public final class Response implements Closeable {
         this.o = responseBody;
         this.p = response;
         this.q = response2;
-        this.f3130r = response3;
+        this.f3128r = response3;
         this.s = j;
         this.t = j2;
         this.u = cVar;
diff --git a/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java b/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java
index 748ec315e6..67137780b5 100644
--- a/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java
+++ b/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java
@@ -28,7 +28,7 @@ public final class PublicSuffixDatabase {
     public static final List<String> b = m.listOf("*");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final PublicSuffixDatabase f3132c = new PublicSuffixDatabase();
+    public static final PublicSuffixDatabase f3130c = new PublicSuffixDatabase();
     public static final a d = new a(null);
     public final AtomicBoolean e = new AtomicBoolean(false);
     public final CountDownLatch f = new CountDownLatch(1);
@@ -153,7 +153,7 @@ public final class PublicSuffixDatabase {
                     Thread.interrupted();
                     z2 = true;
                 } catch (IOException e) {
-                    h.a aVar = h.f2993c;
+                    h.a aVar = h.f2991c;
                     h.a.i("Failed to read public suffix list", 5, e);
                     if (z2) {
                         Thread.currentThread().interrupt();
diff --git a/app/src/main/java/org/webrtc/DataChannel.java b/app/src/main/java/org/webrtc/DataChannel.java
index 2ef970a96a..b43917e3a8 100644
--- a/app/src/main/java/org/webrtc/DataChannel.java
+++ b/app/src/main/java/org/webrtc/DataChannel.java
@@ -19,7 +19,7 @@ public class DataChannel {
     public static class Init {
 
         /* renamed from: id  reason: collision with root package name */
-        public int f3133id = -1;
+        public int f3131id = -1;
         public int maxRetransmitTimeMs = -1;
         public int maxRetransmits = -1;
         public boolean negotiated;
@@ -28,7 +28,7 @@ public class DataChannel {
 
         @CalledByNative("Init")
         public int getId() {
-            return this.f3133id;
+            return this.f3131id;
         }
 
         @CalledByNative("Init")
diff --git a/app/src/main/java/org/webrtc/RTCStats.java b/app/src/main/java/org/webrtc/RTCStats.java
index 38ad7e34fe..3a31c4f79f 100644
--- a/app/src/main/java/org/webrtc/RTCStats.java
+++ b/app/src/main/java/org/webrtc/RTCStats.java
@@ -5,7 +5,7 @@ import java.util.Map;
 public class RTCStats {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f3134id;
+    private final String f3132id;
     private final Map<String, Object> members;
     private final long timestampUs;
     private final String type;
@@ -13,7 +13,7 @@ public class RTCStats {
     public RTCStats(long j, String str, String str2, Map<String, Object> map) {
         this.timestampUs = j;
         this.type = str;
-        this.f3134id = str2;
+        this.f3132id = str2;
         this.members = map;
     }
 
@@ -43,7 +43,7 @@ public class RTCStats {
     }
 
     public String getId() {
-        return this.f3134id;
+        return this.f3132id;
     }
 
     public Map<String, Object> getMembers() {
@@ -64,7 +64,7 @@ public class RTCStats {
         O.append(", type: ");
         O.append(this.type);
         O.append(", id: ");
-        O.append(this.f3134id);
+        O.append(this.f3132id);
         for (Map.Entry<String, Object> entry : this.members.entrySet()) {
             O.append(", ");
             O.append(entry.getKey());
diff --git a/app/src/main/java/org/webrtc/RtpParameters.java b/app/src/main/java/org/webrtc/RtpParameters.java
index 285e55b37f..4c2b3f69a9 100644
--- a/app/src/main/java/org/webrtc/RtpParameters.java
+++ b/app/src/main/java/org/webrtc/RtpParameters.java
@@ -173,13 +173,13 @@ public class RtpParameters {
         private final boolean encrypted;
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f3135id;
+        private final int f3133id;
         private final String uri;
 
         @CalledByNative("HeaderExtension")
         public HeaderExtension(String str, int i, boolean z2) {
             this.uri = str;
-            this.f3135id = i;
+            this.f3133id = i;
             this.encrypted = z2;
         }
 
@@ -190,7 +190,7 @@ public class RtpParameters {
 
         @CalledByNative("HeaderExtension")
         public int getId() {
-            return this.f3135id;
+            return this.f3133id;
         }
 
         @CalledByNative("HeaderExtension")
diff --git a/app/src/main/java/org/webrtc/StatsReport.java b/app/src/main/java/org/webrtc/StatsReport.java
index 9592741b13..d04dbaea70 100644
--- a/app/src/main/java/org/webrtc/StatsReport.java
+++ b/app/src/main/java/org/webrtc/StatsReport.java
@@ -4,7 +4,7 @@ import c.d.b.a.a;
 public class StatsReport {
 
     /* renamed from: id  reason: collision with root package name */
-    public final String f3136id;
+    public final String f3134id;
     public final double timestamp;
     public final String type;
     public final Value[] values;
@@ -29,7 +29,7 @@ public class StatsReport {
 
     @CalledByNative
     public StatsReport(String str, String str2, double d, Value[] valueArr) {
-        this.f3136id = str;
+        this.f3134id = str;
         this.type = str2;
         this.timestamp = d;
         this.values = valueArr;
@@ -37,7 +37,7 @@ public class StatsReport {
 
     public String toString() {
         StringBuilder O = a.O("id: ");
-        O.append(this.f3136id);
+        O.append(this.f3134id);
         O.append(", type: ");
         O.append(this.type);
         O.append(", timestamp: ");
diff --git a/app/src/main/java/org/webrtc/TextureBufferImpl.java b/app/src/main/java/org/webrtc/TextureBufferImpl.java
index 23de072332..89a4bd20c4 100644
--- a/app/src/main/java/org/webrtc/TextureBufferImpl.java
+++ b/app/src/main/java/org/webrtc/TextureBufferImpl.java
@@ -10,7 +10,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
     private final int height;
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f3137id;
+    private final int f3135id;
     private final RefCountDelegate refCountDelegate;
     private final RefCountMonitor refCountMonitor;
     private final Handler toI420Handler;
@@ -81,7 +81,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
         this.width = i3;
         this.height = i4;
         this.type = type;
-        this.f3137id = i5;
+        this.f3135id = i5;
         this.transformMatrix = matrix;
         this.toI420Handler = handler;
         this.yuvConverter = yuvConverter;
@@ -105,7 +105,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
         Matrix matrix2 = new Matrix(this.transformMatrix);
         matrix2.preConcat(matrix);
         retain();
-        return new TextureBufferImpl(i, i2, i3, i4, this.type, this.f3137id, matrix2, this.toI420Handler, this.yuvConverter, new AnonymousClass2());
+        return new TextureBufferImpl(i, i2, i3, i4, this.type, this.f3135id, matrix2, this.toI420Handler, this.yuvConverter, new AnonymousClass2());
     }
 
     public /* synthetic */ VideoFrame.I420Buffer a() {
@@ -132,7 +132,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
 
     @Override // org.webrtc.VideoFrame.TextureBuffer
     public int getTextureId() {
-        return this.f3137id;
+        return this.f3135id;
     }
 
     public Handler getToI420Handler() {
diff --git a/app/src/main/java/r/a/a/a.java b/app/src/main/java/r/a/a/a.java
index 274008ddd0..148aff9cae 100644
--- a/app/src/main/java/r/a/a/a.java
+++ b/app/src/main/java/r/a/a/a.java
@@ -12,7 +12,7 @@ public final class a {
     public static final Function2<Object, CoroutineContext.Element, Object> b = b.i;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Function2<s1<?>, CoroutineContext.Element, s1<?>> f3138c = c.i;
+    public static final Function2<s1<?>, CoroutineContext.Element, s1<?>> f3136c = c.i;
     public static final Function2<x, CoroutineContext.Element, x> d = C0344a.j;
     public static final Function2<x, CoroutineContext.Element, x> e = C0344a.i;
 
@@ -38,7 +38,7 @@ public final class a {
                 x xVar2 = xVar;
                 CoroutineContext.Element element2 = element;
                 if (element2 instanceof s1) {
-                    CoroutineContext coroutineContext = xVar2.f3142c;
+                    CoroutineContext coroutineContext = xVar2.f3140c;
                     Object[] objArr = xVar2.a;
                     int i3 = xVar2.b;
                     xVar2.b = i3 + 1;
@@ -49,7 +49,7 @@ public final class a {
                 x xVar3 = xVar;
                 CoroutineContext.Element element3 = element;
                 if (element3 instanceof s1) {
-                    Object C = ((s1) element3).C(xVar3.f3142c);
+                    Object C = ((s1) element3).C(xVar3.f3140c);
                     Object[] objArr2 = xVar3.a;
                     int i4 = xVar3.b;
                     xVar3.b = i4 + 1;
@@ -117,7 +117,7 @@ public final class a {
                 coroutineContext.fold(obj, e);
                 return;
             }
-            Object fold = coroutineContext.fold(null, f3138c);
+            Object fold = coroutineContext.fold(null, f3136c);
             Objects.requireNonNull(fold, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement<kotlin.Any?>");
             ((s1) fold).x(coroutineContext, obj);
         }
diff --git a/app/src/main/java/r/a/a/b.java b/app/src/main/java/r/a/a/b.java
index bb9ba0342a..ea36b1805a 100644
--- a/app/src/main/java/r/a/a/b.java
+++ b/app/src/main/java/r/a/a/b.java
@@ -5,5 +5,5 @@ public class b<T> {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f3139c;
+    public int f3137c;
 }
diff --git a/app/src/main/java/r/a/a/k.java b/app/src/main/java/r/a/a/k.java
index 7c1d0e47ad..05966af2bd 100644
--- a/app/src/main/java/r/a/a/k.java
+++ b/app/src/main/java/r/a/a/k.java
@@ -18,10 +18,10 @@ public class k {
         public k b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final k f3140c;
+        public final k f3138c;
 
         public a(k kVar) {
-            this.f3140c = kVar;
+            this.f3138c = kVar;
         }
 
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
@@ -29,9 +29,9 @@ public class k {
         public void b(k kVar, Object obj) {
             k kVar2 = kVar;
             boolean z2 = obj == null;
-            k kVar3 = z2 ? this.f3140c : this.b;
+            k kVar3 = z2 ? this.f3138c : this.b;
             if (kVar3 != null && k.i.compareAndSet(kVar2, this, kVar3) && z2) {
-                k kVar4 = this.f3140c;
+                k kVar4 = this.f3138c;
                 k kVar5 = this.b;
                 m.checkNotNull(kVar5);
                 kVar4.g(kVar5);
diff --git a/app/src/main/java/r/a/a/l.java b/app/src/main/java/r/a/a/l.java
index 3f47f9d02f..408f663e54 100644
--- a/app/src/main/java/r/a/a/l.java
+++ b/app/src/main/java/r/a/a/l.java
@@ -45,7 +45,7 @@ public class l<E> {
         while (true) {
             m mVar = (m) this._cur;
             E e = (E) mVar.e();
-            if (e != m.f3141c) {
+            if (e != m.f3139c) {
                 return e;
             }
             a.compareAndSet(this, mVar, mVar.d());
diff --git a/app/src/main/java/r/a/a/m.java b/app/src/main/java/r/a/a/m.java
index 7ab4060112..66eb64758e 100644
--- a/app/src/main/java/r/a/a/m.java
+++ b/app/src/main/java/r/a/a/m.java
@@ -10,7 +10,7 @@ public final class m<E> {
     public static final AtomicLongFieldUpdater b = AtomicLongFieldUpdater.newUpdater(m.class, "_state");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final t f3141c = new t("REMOVE_FROZEN");
+    public static final t f3139c = new t("REMOVE_FROZEN");
     public static final a d = new a(null);
     public volatile Object _next = null;
     public volatile long _state = 0;
@@ -156,7 +156,7 @@ public final class m<E> {
         while (true) {
             long j = this._state;
             if ((j & 1152921504606846976L) != 0) {
-                return f3141c;
+                return f3139c;
             }
             int i = (int) ((j & 1073741823) >> 0);
             int i2 = this.e;
diff --git a/app/src/main/java/r/a/a/x.java b/app/src/main/java/r/a/a/x.java
index da67699550..8dc6b4718a 100644
--- a/app/src/main/java/r/a/a/x.java
+++ b/app/src/main/java/r/a/a/x.java
@@ -7,10 +7,10 @@ public final class x {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final CoroutineContext f3142c;
+    public final CoroutineContext f3140c;
 
     public x(CoroutineContext coroutineContext, int i) {
-        this.f3142c = coroutineContext;
+        this.f3140c = coroutineContext;
         this.a = new Object[i];
     }
 }
diff --git a/app/src/main/java/r/a/b2/a.java b/app/src/main/java/r/a/b2/a.java
index d90eb6edc0..6a50dc4095 100644
--- a/app/src/main/java/r/a/b2/a.java
+++ b/app/src/main/java/r/a/b2/a.java
@@ -33,7 +33,7 @@ public final class a implements Executor, Closeable {
     public final int q;
 
     /* renamed from: r  reason: collision with root package name */
-    public final long f3143r;
+    public final long f3141r;
     public final String s;
 
     /* compiled from: CoroutineScheduler.kt */
@@ -256,9 +256,9 @@ public final class a implements Executor, Closeable {
                                     e(3);
                                     Thread.interrupted();
                                     if (this.l == 0) {
-                                        this.l = System.nanoTime() + a.this.f3143r;
+                                        this.l = System.nanoTime() + a.this.f3141r;
                                     }
-                                    LockSupport.parkNanos(a.this.f3143r);
+                                    LockSupport.parkNanos(a.this.f3141r);
                                     if (System.nanoTime() - this.l >= 0) {
                                         this.l = 0;
                                         synchronized (a.this.o) {
@@ -331,7 +331,7 @@ public final class a implements Executor, Closeable {
     public a(int i2, int i3, long j2, String str) {
         this.p = i2;
         this.q = i3;
-        this.f3143r = j2;
+        this.f3141r = j2;
         this.s = str;
         if (i2 >= 1) {
             if (i3 >= i2) {
diff --git a/app/src/main/java/r/a/b2/c.java b/app/src/main/java/r/a/b2/c.java
index 2e4e33e26d..fd670b5434 100644
--- a/app/src/main/java/r/a/b2/c.java
+++ b/app/src/main/java/r/a/b2/c.java
@@ -14,7 +14,7 @@ public class c extends ExecutorCoroutineDispatcher {
 
     public c(int i, int i2, String str, int i3) {
         i = (i3 & 1) != 0 ? k.b : i;
-        i2 = (i3 & 2) != 0 ? k.f3144c : i2;
+        i2 = (i3 & 2) != 0 ? k.f3142c : i2;
         String str2 = (i3 & 4) != 0 ? "DefaultDispatcher" : null;
         long j = k.d;
         this.j = i;
diff --git a/app/src/main/java/r/a/b2/k.java b/app/src/main/java/r/a/b2/k.java
index 37d7a0736e..86a1fa5baa 100644
--- a/app/src/main/java/r/a/b2/k.java
+++ b/app/src/main/java/r/a/b2/k.java
@@ -10,7 +10,7 @@ public final class k {
     public static final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f3144c;
+    public static final int f3142c;
     public static final long d = TimeUnit.SECONDS.toNanos(a.Z("kotlinx.coroutines.scheduler.keep.alive.sec", 60, 0, 0, 12, null));
     public static l e = f.a;
 
@@ -19,6 +19,6 @@ public final class k {
         int i = u.a;
         int Y = a.Y("kotlinx.coroutines.scheduler.core.pool.size", f.coerceAtLeast(i, 2), 1, 0, 8, null);
         b = Y;
-        f3144c = a.Y("kotlinx.coroutines.scheduler.max.pool.size", f.coerceIn(i * 128, Y, 2097150), 0, 2097150, 4, null);
+        f3142c = a.Y("kotlinx.coroutines.scheduler.max.pool.size", f.coerceIn(i * 128, Y, 2097150), 0, 2097150, 4, null);
     }
 }
diff --git a/app/src/main/java/r/a/b2/m.java b/app/src/main/java/r/a/b2/m.java
index b73563eacc..2bee861275 100644
--- a/app/src/main/java/r/a/b2/m.java
+++ b/app/src/main/java/r/a/b2/m.java
@@ -9,7 +9,7 @@ public final class m {
     public static final AtomicIntegerFieldUpdater b = AtomicIntegerFieldUpdater.newUpdater(m.class, "producerIndex");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicIntegerFieldUpdater f3145c = AtomicIntegerFieldUpdater.newUpdater(m.class, "consumerIndex");
+    public static final AtomicIntegerFieldUpdater f3143c = AtomicIntegerFieldUpdater.newUpdater(m.class, "consumerIndex");
     public static final AtomicIntegerFieldUpdater d = AtomicIntegerFieldUpdater.newUpdater(m.class, "blockingTasksInBuffer");
     public volatile int blockingTasksInBuffer = 0;
     public volatile int consumerIndex = 0;
@@ -69,7 +69,7 @@ public final class m {
                 return null;
             }
             int i2 = i & 127;
-            if (f3145c.compareAndSet(this, i, i + 1) && (andSet = this.e.getAndSet(i2, null)) != null) {
+            if (f3143c.compareAndSet(this, i, i + 1) && (andSet = this.e.getAndSet(i2, null)) != null) {
                 boolean z2 = true;
                 if (andSet.j.s() != 1) {
                     z2 = false;
diff --git a/app/src/main/java/r/a/g1.java b/app/src/main/java/r/a/g1.java
index 6d409153e0..e8f22938e5 100644
--- a/app/src/main/java/r/a/g1.java
+++ b/app/src/main/java/r/a/g1.java
@@ -408,7 +408,7 @@ public class g1 implements Job, q, o1 {
                 }
                 throw new IllegalStateException(str, th);
             }
-        } while (V == h1.f3146c);
+        } while (V == h1.f3144c);
         return V;
     }
 
@@ -529,12 +529,12 @@ public class g1 implements Job, q, o1 {
                 Q(obj2);
                 u(y0Var, obj2);
             }
-            return z2 ? obj2 : h1.f3146c;
+            return z2 ? obj2 : h1.f3144c;
         }
         y0 y0Var2 = (y0) obj;
         l1 E = E(y0Var2);
         if (E == null) {
-            return h1.f3146c;
+            return h1.f3144c;
         }
         p pVar = null;
         b bVar = (b) (!(y0Var2 instanceof b) ? null : y0Var2);
@@ -557,7 +557,7 @@ public class g1 implements Job, q, o1 {
                     th = null;
                 }
             } else {
-                return h1.f3146c;
+                return h1.f3144c;
             }
         }
         if (th != null) {
@@ -724,7 +724,7 @@ public class g1 implements Job, q, o1 {
                 Object F = F();
                 if ((F instanceof y0) && (!(F instanceof b) || ((b) F)._isCompleting == 0)) {
                     tVar2 = V(F, new v(v(obj), false, 2));
-                    if (tVar2 != h1.f3146c) {
+                    if (tVar2 != h1.f3144c) {
                         break;
                     }
                 } else {
@@ -767,7 +767,7 @@ public class g1 implements Job, q, o1 {
                     } else {
                         Object V = V(F2, new v(th2, false, 2));
                         if (V != h1.a) {
-                            if (V != h1.f3146c) {
+                            if (V != h1.f3144c) {
                                 tVar2 = V;
                                 break;
                             }
diff --git a/app/src/main/java/r/a/h1.java b/app/src/main/java/r/a/h1.java
index 46fba886ca..3f580bf7b4 100644
--- a/app/src/main/java/r/a/h1.java
+++ b/app/src/main/java/r/a/h1.java
@@ -7,7 +7,7 @@ public final class h1 {
     public static final t b = new t("COMPLETING_WAITING_CHILDREN");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final t f3146c = new t("COMPLETING_RETRY");
+    public static final t f3144c = new t("COMPLETING_RETRY");
     public static final t d = new t("TOO_LATE_TO_CANCEL");
     public static final t e = new t("SEALED");
     public static final o0 f = new o0(false);
diff --git a/app/src/main/java/r/a/k.java b/app/src/main/java/r/a/k.java
index 5de92ac8b5..d6436fbf9c 100644
--- a/app/src/main/java/r/a/k.java
+++ b/app/src/main/java/r/a/k.java
@@ -125,7 +125,7 @@ public class k<T> extends i0<T> implements CancellableContinuation<T>, Coroutine
                             if (iVar != null) {
                                 p(iVar, th);
                             }
-                            Function1<Throwable, Unit> function1 = uVar.f3148c;
+                            Function1<Throwable, Unit> function1 = uVar.f3146c;
                             if (function1 != null) {
                                 q(function1, th);
                                 return;
@@ -457,7 +457,7 @@ public class k<T> extends i0<T> implements CancellableContinuation<T>, Coroutine
                 if (obj2 instanceof m) {
                     m mVar = (m) obj2;
                     Objects.requireNonNull(mVar);
-                    if (m.f3147c.compareAndSet(mVar, 0, 1)) {
+                    if (m.f3145c.compareAndSet(mVar, 0, 1)) {
                         if (function1 != null) {
                             q(function1, mVar.b);
                             return;
diff --git a/app/src/main/java/r/a/m.java b/app/src/main/java/r/a/m.java
index e58c11626f..7fc0880c05 100644
--- a/app/src/main/java/r/a/m.java
+++ b/app/src/main/java/r/a/m.java
@@ -7,7 +7,7 @@ import kotlin.coroutines.Continuation;
 public final class m extends v {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicIntegerFieldUpdater f3147c = AtomicIntegerFieldUpdater.newUpdater(m.class, "_resumed");
+    public static final AtomicIntegerFieldUpdater f3145c = AtomicIntegerFieldUpdater.newUpdater(m.class, "_resumed");
     public volatile int _resumed;
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/r/a/p0.java b/app/src/main/java/r/a/p0.java
index 4c5f47250f..d74b12364a 100644
--- a/app/src/main/java/r/a/p0.java
+++ b/app/src/main/java/r/a/p0.java
@@ -33,10 +33,10 @@ public abstract class p0 extends CoroutineDispatcher {
             this.k = bVar;
         }
         Object[] objArr = bVar.a;
-        int i = bVar.f3139c;
+        int i = bVar.f3137c;
         objArr[i] = i0Var;
         int length = (objArr.length - 1) & (i + 1);
-        bVar.f3139c = length;
+        bVar.f3137c = length;
         int i2 = bVar.b;
         if (length == i2) {
             int length2 = objArr.length;
@@ -48,7 +48,7 @@ public abstract class p0 extends CoroutineDispatcher {
             j.copyInto$default(objArr3, objArr2, length3 - i3, 0, i3, 4, (Object) null);
             bVar.a = objArr2;
             bVar.b = 0;
-            bVar.f3139c = length2;
+            bVar.f3137c = length2;
         }
     }
 
@@ -70,7 +70,7 @@ public abstract class p0 extends CoroutineDispatcher {
         if (bVar != null) {
             int i = bVar.b;
             i0 i0Var = null;
-            if (i != bVar.f3139c) {
+            if (i != bVar.f3137c) {
                 ?? r3 = bVar.a;
                 ?? r6 = r3[i];
                 r3[i] = 0;
diff --git a/app/src/main/java/r/a/q0.java b/app/src/main/java/r/a/q0.java
index 6d7a1f8abb..c1b438d0e9 100644
--- a/app/src/main/java/r/a/q0.java
+++ b/app/src/main/java/r/a/q0.java
@@ -195,7 +195,7 @@ public abstract class q0 extends r0 implements g0 {
 
     public boolean U() {
         r.a.a.b<i0<?>> bVar = this.k;
-        if (!(bVar == null || bVar.b == bVar.f3139c)) {
+        if (!(bVar == null || bVar.b == bVar.f3137c)) {
             return false;
         }
         d dVar = (d) this._delayed;
@@ -252,7 +252,7 @@ public abstract class q0 extends r0 implements g0 {
                 } else {
                     m mVar = (m) obj;
                     Object e = mVar.e();
-                    if (e != m.f3141c) {
+                    if (e != m.f3139c) {
                         runnable = (Runnable) e;
                         break;
                     }
@@ -268,7 +268,7 @@ public abstract class q0 extends r0 implements g0 {
         }
         r.a.a.b<i0<?>> bVar = this.k;
         if (bVar != null) {
-            if (bVar.b != bVar.f3139c) {
+            if (bVar.b != bVar.f3137c) {
                 z2 = false;
             }
             if (!z2) {
diff --git a/app/src/main/java/r/a/u.java b/app/src/main/java/r/a/u.java
index 8fd4089a5b..37f30b9a7e 100644
--- a/app/src/main/java/r/a/u.java
+++ b/app/src/main/java/r/a/u.java
@@ -11,7 +11,7 @@ public final class u {
     public final i b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<Throwable, Unit> f3148c;
+    public final Function1<Throwable, Unit> f3146c;
     public final Object d;
     public final Throwable e;
 
@@ -20,7 +20,7 @@ public final class u {
     public u(Object obj, i iVar, Function1<? super Throwable, Unit> function1, Object obj2, Throwable th) {
         this.a = obj;
         this.b = iVar;
-        this.f3148c = function1;
+        this.f3146c = function1;
         this.d = obj2;
         this.e = th;
     }
@@ -32,7 +32,7 @@ public final class u {
         th = (i & 16) != 0 ? null : th;
         this.a = obj;
         this.b = iVar;
-        this.f3148c = function1;
+        this.f3146c = function1;
         this.d = obj2;
         this.e = th;
     }
@@ -43,7 +43,7 @@ public final class u {
         if ((i & 2) != 0) {
             iVar = uVar.b;
         }
-        Function1<Throwable, Unit> function12 = (i & 4) != 0 ? uVar.f3148c : null;
+        Function1<Throwable, Unit> function12 = (i & 4) != 0 ? uVar.f3146c : null;
         if ((i & 8) != 0) {
             obj3 = uVar.d;
         }
@@ -62,7 +62,7 @@ public final class u {
             return false;
         }
         u uVar = (u) obj;
-        return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && m.areEqual(this.f3148c, uVar.f3148c) && m.areEqual(this.d, uVar.d) && m.areEqual(this.e, uVar.e);
+        return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && m.areEqual(this.f3146c, uVar.f3146c) && m.areEqual(this.d, uVar.d) && m.areEqual(this.e, uVar.e);
     }
 
     public int hashCode() {
@@ -71,7 +71,7 @@ public final class u {
         int hashCode = (obj != null ? obj.hashCode() : 0) * 31;
         i iVar = this.b;
         int hashCode2 = (hashCode + (iVar != null ? iVar.hashCode() : 0)) * 31;
-        Function1<Throwable, Unit> function1 = this.f3148c;
+        Function1<Throwable, Unit> function1 = this.f3146c;
         int hashCode3 = (hashCode2 + (function1 != null ? function1.hashCode() : 0)) * 31;
         Object obj2 = this.d;
         int hashCode4 = (hashCode3 + (obj2 != null ? obj2.hashCode() : 0)) * 31;
@@ -88,7 +88,7 @@ public final class u {
         O.append(", cancelHandler=");
         O.append(this.b);
         O.append(", onCancellation=");
-        O.append(this.f3148c);
+        O.append(this.f3146c);
         O.append(", idempotentResume=");
         O.append(this.d);
         O.append(", cancelCause=");
diff --git a/app/src/main/java/r/a/z1/b.java b/app/src/main/java/r/a/z1/b.java
index 3045ffe7df..662319a058 100644
--- a/app/src/main/java/r/a/z1/b.java
+++ b/app/src/main/java/r/a/z1/b.java
@@ -7,6 +7,6 @@ public final class b {
     public static final t b = new t("OFFER_SUCCESS");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final t f3149c = new t("OFFER_FAILED");
+    public static final t f3147c = new t("OFFER_FAILED");
     public static final t d = new t("POLL_FAILED");
 }
diff --git a/app/src/main/java/r/a/z1/c.java b/app/src/main/java/r/a/z1/c.java
index 89210a7d36..f1b1012d7e 100644
--- a/app/src/main/java/r/a/z1/c.java
+++ b/app/src/main/java/r/a/z1/c.java
@@ -100,7 +100,7 @@ public abstract class c<E> implements l<E> {
         if (e2 == b.b) {
             return true;
         }
-        if (e2 == b.f3149c) {
+        if (e2 == b.f3147c) {
             f<?> b = b();
             if (b == null) {
                 return false;
diff --git a/app/src/main/java/r/a/z1/g.java b/app/src/main/java/r/a/z1/g.java
index e02b26bbf2..5f459caa6d 100644
--- a/app/src/main/java/r/a/z1/g.java
+++ b/app/src/main/java/r/a/z1/g.java
@@ -11,7 +11,7 @@ import r.a.a.t;
 public class g<E> extends a<E> {
 
     /* renamed from: c  reason: collision with root package name */
-    public final ReentrantLock f3150c = new ReentrantLock();
+    public final ReentrantLock f3148c = new ReentrantLock();
     public Object d = b.a;
 
     public g(Function1<? super E, Unit> function1) {
@@ -30,7 +30,7 @@ public class g<E> extends a<E> {
     public Object e(E e) {
         Function1<E, Unit> function1;
         j<E> j;
-        ReentrantLock reentrantLock = this.f3150c;
+        ReentrantLock reentrantLock = this.f3148c;
         reentrantLock.lock();
         try {
             f<?> b = b();
@@ -74,7 +74,7 @@ public class g<E> extends a<E> {
 
     @Override // r.a.z1.a
     public boolean f(h<? super E> hVar) {
-        ReentrantLock reentrantLock = this.f3150c;
+        ReentrantLock reentrantLock = this.f3148c;
         reentrantLock.lock();
         try {
             return super.f(hVar);
@@ -95,7 +95,7 @@ public class g<E> extends a<E> {
 
     @Override // r.a.z1.a
     public Object i() {
-        ReentrantLock reentrantLock = this.f3150c;
+        ReentrantLock reentrantLock = this.f3148c;
         reentrantLock.lock();
         try {
             Object obj = this.d;
diff --git a/app/src/main/java/retrofit2/Response.java b/app/src/main/java/retrofit2/Response.java
index 363e235433..4725301b9a 100644
--- a/app/src/main/java/retrofit2/Response.java
+++ b/app/src/main/java/retrofit2/Response.java
@@ -6,12 +6,12 @@ public final class Response<T> {
     public final T b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ResponseBody f3151c;
+    public final ResponseBody f3149c;
 
     public Response(okhttp3.Response response, T t, ResponseBody responseBody) {
         this.a = response;
         this.b = t;
-        this.f3151c = responseBody;
+        this.f3149c = responseBody;
     }
 
     public static <T> Response<T> b(T t, okhttp3.Response response) {
diff --git a/app/src/main/java/rx/Observable.java b/app/src/main/java/rx/Observable.java
index e49802bad3..5c6414415c 100644
--- a/app/src/main/java/rx/Observable.java
+++ b/app/src/main/java/rx/Observable.java
@@ -89,58 +89,62 @@ public class Observable<T> {
         this.i = aVar;
     }
 
-    public static <T> Observable<T> A(T[] tArr) {
+    public static <T> Observable<T> A(Iterable<? extends T> iterable) {
+        return h0(new q(iterable));
+    }
+
+    public static <T> Observable<T> B(T[] tArr) {
         int length = tArr.length;
-        return length == 0 ? (Observable<T>) i0.l.a.c.j : length == 1 ? new j(tArr[0]) : g0(new o(tArr));
+        return length == 0 ? (Observable<T>) i0.l.a.c.j : length == 1 ? new j(tArr[0]) : h0(new o(tArr));
     }
 
-    public static <T> Observable<T> B(Callable<? extends T> callable) {
-        return g0(new p(callable));
+    public static <T> Observable<T> C(Callable<? extends T> callable) {
+        return h0(new p(callable));
     }
 
-    public static Observable<Long> C(long j, long j2, TimeUnit timeUnit) {
-        return D(j, j2, timeUnit, i0.p.a.a());
+    public static Observable<Long> D(long j, long j2, TimeUnit timeUnit) {
+        return E(j, j2, timeUnit, i0.p.a.a());
     }
 
-    public static Observable<Long> D(long j, long j2, TimeUnit timeUnit, Scheduler scheduler) {
-        return g0(new k0(j, j2, timeUnit, scheduler));
+    public static Observable<Long> E(long j, long j2, TimeUnit timeUnit, Scheduler scheduler) {
+        return h0(new k0(j, j2, timeUnit, scheduler));
     }
 
-    public static <T> Observable<T> F(Observable<? extends Observable<? extends T>> observable) {
+    public static <T> Observable<T> G(Observable<? extends Observable<? extends T>> observable) {
         if (observable.getClass() == j.class) {
-            return ((j) observable).j0(l.INSTANCE);
+            return ((j) observable).k0(l.INSTANCE);
         }
-        return g0(new r(observable.i, x0.b.a));
+        return h0(new r(observable.i, x0.b.a));
     }
 
-    public static <T> Observable<T> G(Observable<? extends T> observable, Observable<? extends T> observable2) {
-        return F(A(new Observable[]{observable, observable2}));
+    public static <T> Observable<T> H(Observable<? extends T> observable, Observable<? extends T> observable2) {
+        return G(B(new Observable[]{observable, observable2}));
     }
 
     public static <T, R> Observable<R> b(List<? extends Observable<? extends T>> list, FuncN<? extends R> funcN) {
-        return g0(new f(list, funcN));
+        return h0(new f(list, funcN));
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> c(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Observable<? extends T8> observable8, Observable<? extends T9> observable9, Func9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> func9) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), new i0.k.c(func9));
     }
 
-    public static Observable<Long> c0(long j, TimeUnit timeUnit) {
-        return d0(j, timeUnit, i0.p.a.a());
-    }
-
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> d(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Observable<? extends T8> observable8, Func8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> func8) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8), new i0.k.j(func8));
     }
 
-    public static Observable<Long> d0(long j, TimeUnit timeUnit, Scheduler scheduler) {
-        return g0(new i0(j, timeUnit, scheduler));
+    public static Observable<Long> d0(long j, TimeUnit timeUnit) {
+        return e0(j, timeUnit, i0.p.a.a());
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> e(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Func7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> func7) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6, observable7), new i(func7));
     }
 
+    public static Observable<Long> e0(long j, TimeUnit timeUnit, Scheduler scheduler) {
+        return h0(new i0(j, timeUnit, scheduler));
+    }
+
     public static <T1, T2, T3, T4, T5, T6, R> Observable<R> f(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Func6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> func6) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6), new h(func6));
     }
@@ -149,73 +153,69 @@ public class Observable<T> {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5), new g(func5));
     }
 
-    public static <T> Observable<T> g0(a<T> aVar) {
-        return new Observable<>(i0.o.l.a(aVar));
-    }
-
     public static <T1, T2, T3, T4, R> Observable<R> h(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Func4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> func4) {
         return b(Arrays.asList(observable, observable2, observable3, observable4), new i0.k.f(func4));
     }
 
+    public static <T> Observable<T> h0(a<T> aVar) {
+        return new Observable<>(i0.o.l.a(aVar));
+    }
+
     public static <T1, T2, T3, R> Observable<R> i(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Func3<? super T1, ? super T2, ? super T3, ? extends R> func3) {
         return b(Arrays.asList(observable, observable2, observable3), new e(func3));
     }
 
-    public static <T1, T2, R> Observable<R> i0(Observable<? extends T1> observable, Observable<? extends T2> observable2, Func2<? super T1, ? super T2, ? extends R> func2) {
-        return g0(new r(new j(new Observable[]{observable, observable2}).i, new q2(func2)));
-    }
-
     public static <T1, T2, R> Observable<R> j(Observable<? extends T1> observable, Observable<? extends T2> observable2, Func2<? super T1, ? super T2, ? extends R> func2) {
         return b(Arrays.asList(observable, observable2), new d(func2));
     }
 
+    public static <T1, T2, R> Observable<R> j0(Observable<? extends T1> observable, Observable<? extends T2> observable2, Func2<? super T1, ? super T2, ? extends R> func2) {
+        return h0(new r(new j(new Observable[]{observable, observable2}).i, new q2(func2)));
+    }
+
     public static <T> Observable<T> l(Observable<? extends Observable<? extends T>> observable) {
         l lVar = l.INSTANCE;
         Objects.requireNonNull(observable);
-        return observable instanceof j ? ((j) observable).j0(lVar) : g0(new i0.l.a.h(observable, lVar, 2, 0));
+        return observable instanceof j ? ((j) observable).k0(lVar) : h0(new i0.l.a.h(observable, lVar, 2, 0));
     }
 
     public static <T> Observable<T> m(Observable<? extends T> observable, Observable<? extends T> observable2) {
-        return l(A(new Object[]{observable, observable2}));
+        return l(B(new Object[]{observable, observable2}));
     }
 
     public static <T> Observable<T> n(Action1<Emitter<T>> action1, Emitter.BackpressureMode backpressureMode) {
-        return g0(new i0.l.a.i(action1, backpressureMode));
+        return h0(new i0.l.a.i(action1, backpressureMode));
     }
 
-    public static <T> Observable<T> v(Throwable th) {
-        return g0(new f0(th));
+    public static <T> Observable<T> w(Throwable th) {
+        return h0(new f0(th));
     }
 
-    public static <T> Observable<T> z(Iterable<? extends T> iterable) {
-        return g0(new q(iterable));
+    public final <R> Observable<R> F(i0.k.b<? super T, ? extends R> bVar) {
+        return h0(new s(this, bVar));
     }
 
-    public final <R> Observable<R> E(i0.k.b<? super T, ? extends R> bVar) {
-        return g0(new s(this, bVar));
-    }
-
-    public final Observable<T> H(Scheduler scheduler) {
+    public final Observable<T> I(Scheduler scheduler) {
         int i = i0.l.e.h.i;
         if (this instanceof j) {
-            return ((j) this).k0(scheduler);
+            return ((j) this).l0(scheduler);
         }
-        return g0(new r(this.i, new z0(scheduler, false, i)));
-    }
-
-    public final Observable<T> I() {
-        return g0(new r(this.i, a1.b.a));
+        return h0(new r(this.i, new z0(scheduler, false, i)));
     }
 
     public final Observable<T> J() {
-        return g0(new r(this.i, b1.a.a));
+        return h0(new r(this.i, a1.b.a));
     }
 
-    public final Observable<T> K(i0.k.b<? super Throwable, ? extends T> bVar) {
-        return g0(new r(this.i, new f1(new c1(bVar))));
+    public final Observable<T> K() {
+        return h0(new r(this.i, b1.a.a));
     }
 
-    public final i0.m.b<T> L(int i) {
+    public final Observable<T> L(i0.k.b<? super Throwable, ? extends T> bVar) {
+        return h0(new r(this.i, new f1(new c1(bVar))));
+    }
+
+    public final i0.m.b<T> M(int i) {
         if (i == Integer.MAX_VALUE) {
             Func0 func0 = j1.j;
             AtomicReference atomicReference = new AtomicReference();
@@ -226,39 +226,39 @@ public class Observable<T> {
         return new j1(new l1(atomicReference2, k1Var), this, atomicReference2, k1Var);
     }
 
-    public final Observable<T> M(i0.k.b<? super Observable<? extends Throwable>, ? extends Observable<?>> bVar) {
+    public final Observable<T> N(i0.k.b<? super Observable<? extends Throwable>, ? extends Observable<?>> bVar) {
         e.d dVar = new e.d(bVar);
         AtomicReference<i0.p.a> atomicReference = i0.p.a.a;
-        return g0(new y(this, dVar, true, false, m.a));
+        return h0(new y(this, dVar, true, false, m.a));
     }
 
-    public final Observable<T> N(long j, TimeUnit timeUnit) {
-        return g0(new r(this.i, new n1(j, timeUnit, i0.p.a.a())));
+    public final Observable<T> O(long j, TimeUnit timeUnit) {
+        return h0(new r(this.i, new n1(j, timeUnit, i0.p.a.a())));
     }
 
-    public final <R> Observable<R> O(R r2, Func2<R, ? super T, R> func2) {
-        return g0(new r(this.i, new o1(r2, func2)));
-    }
-
-    public final Observable<T> P() {
-        AtomicReference atomicReference = new AtomicReference();
-        return g0(new c0(new h1(new g1(atomicReference), this, atomicReference)));
+    public final <R> Observable<R> P(R r2, Func2<R, ? super T, R> func2) {
+        return h0(new r(this.i, new o1(r2, func2)));
     }
 
     public final Observable<T> Q() {
-        return g0(new r(this.i, r1.a.a));
+        AtomicReference atomicReference = new AtomicReference();
+        return h0(new c0(new h1(new g1(atomicReference), this, atomicReference)));
     }
 
-    public final Observable<T> R(int i) {
-        return g0(new r(this.i, new t1(i)));
+    public final Observable<T> R() {
+        return h0(new r(this.i, r1.a.a));
     }
 
-    public final Observable<T> S(T t) {
+    public final Observable<T> S(int i) {
+        return h0(new r(this.i, new t1(i)));
+    }
+
+    public final Observable<T> T(T t) {
         return m(new j(t), this);
     }
 
     /* JADX WARN: Multi-variable type inference failed */
-    public final Subscription T(Subscriber<? super T> subscriber) {
+    public final Subscription U(Subscriber<? super T> subscriber) {
         if (subscriber == null) {
             throw new IllegalArgumentException("subscriber can not be null");
         } else if (this.i != null) {
@@ -290,60 +290,60 @@ public class Observable<T> {
         }
     }
 
-    public final Subscription U(Action1<? super T> action1) {
-        return T(new i0.l.e.b(action1, i0.l.e.e.k, i0.k.a.a));
+    public final Subscription V(Action1<? super T> action1) {
+        return U(new i0.l.e.b(action1, i0.l.e.e.k, i0.k.a.a));
     }
 
-    public final Subscription V(Action1<? super T> action1, Action1<Throwable> action12) {
+    public final Subscription W(Action1<? super T> action1, Action1<Throwable> action12) {
         if (action1 == null) {
             throw new IllegalArgumentException("onNext can not be null");
         } else if (action12 != null) {
-            return T(new i0.l.e.b(action1, action12, i0.k.a.a));
+            return U(new i0.l.e.b(action1, action12, i0.k.a.a));
         } else {
             throw new IllegalArgumentException("onError can not be null");
         }
     }
 
-    public final Observable<T> W(Scheduler scheduler) {
-        return this instanceof j ? ((j) this).k0(scheduler) : g0(new x1(this, scheduler, !(this.i instanceof i0.l.a.i)));
+    public final Observable<T> X(Scheduler scheduler) {
+        return this instanceof j ? ((j) this).l0(scheduler) : h0(new x1(this, scheduler, !(this.i instanceof i0.l.a.i)));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: i0.k.b<? super T, ? extends rx.Observable<? extends R>> */
     /* JADX WARN: Multi-variable type inference failed */
-    public final <R> Observable<R> X(i0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
-        Observable<R> E = E(bVar);
-        return g0(new r(E.i, y1.a.a));
+    public final <R> Observable<R> Y(i0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
+        Observable<R> F = F(bVar);
+        return h0(new r(F.i, y1.a.a));
     }
 
-    public final Observable<T> Y(int i) {
-        return g0(new r(this.i, new c2(i)));
-    }
-
-    public final <E> Observable<T> Z(Observable<? extends E> observable) {
-        return g0(new r(this.i, new f2(observable)));
+    public final Observable<T> Z(int i) {
+        return h0(new r(this.i, new c2(i)));
     }
 
     public final Observable<List<T>> a(long j, TimeUnit timeUnit) {
-        return g0(new r(this.i, new n0(j, j, timeUnit, Integer.MAX_VALUE, i0.p.a.a())));
+        return h0(new r(this.i, new n0(j, j, timeUnit, Integer.MAX_VALUE, i0.p.a.a())));
     }
 
-    public final Observable<T> a0(i0.k.b<? super T, Boolean> bVar) {
-        return g0(new r(this.i, new h2(bVar)));
+    public final <E> Observable<T> a0(Observable<? extends E> observable) {
+        return h0(new r(this.i, new f2(observable)));
     }
 
-    public final Observable<T> b0(long j, TimeUnit timeUnit) {
-        return g0(new g0(this, j, timeUnit, i0.p.a.a(), null));
+    public final Observable<T> b0(i0.k.b<? super T, Boolean> bVar) {
+        return h0(new r(this.i, new h2(bVar)));
     }
 
-    public final Observable<List<T>> e0() {
-        return g0(new r(this.i, n2.a.a));
+    public final Observable<T> c0(long j, TimeUnit timeUnit) {
+        return h0(new g0(this, j, timeUnit, i0.p.a.a(), null));
     }
 
-    public final <K, V> Observable<Map<K, V>> f0(i0.k.b<? super T, ? extends K> bVar, i0.k.b<? super T, ? extends V> bVar2) {
-        return g0(new l0(this, bVar, bVar2));
+    public final Observable<List<T>> f0() {
+        return h0(new r(this.i, n2.a.a));
     }
 
-    public final Subscription h0(Subscriber<? super T> subscriber) {
+    public final <K, V> Observable<Map<K, V>> g0(i0.k.b<? super T, ? extends K> bVar, i0.k.b<? super T, ? extends V> bVar2) {
+        return h0(new l0(this, bVar, bVar2));
+    }
+
+    public final Subscription i0(Subscriber<? super T> subscriber) {
         try {
             subscriber.onStart();
             a aVar = this.i;
@@ -370,46 +370,50 @@ public class Observable<T> {
     }
 
     public final Observable<T> o(long j, TimeUnit timeUnit) {
-        return g0(new r(this.i, new q0(j, timeUnit, i0.p.a.a())));
+        return h0(new r(this.i, new q0(j, timeUnit, i0.p.a.a())));
     }
 
     public final Observable<T> p(long j, TimeUnit timeUnit) {
-        return g0(new r(this.i, new s0(j, timeUnit, i0.p.a.a())));
+        return h0(new r(this.i, new s0(j, timeUnit, i0.p.a.a())));
     }
 
     public final Observable<T> q() {
-        return g0(new r(this.i, u0.a.a));
+        return h0(new r(this.i, u0.a.a));
     }
 
-    public final Observable<T> r(Action1<? super Throwable> action1) {
+    public final Observable<T> r(Func2<? super T, ? super T, Boolean> func2) {
+        return h0(new r(this.i, new u0(func2)));
+    }
+
+    public final Observable<T> s(Action1<? super Throwable> action1) {
         a.C0323a aVar = i0.k.a.a;
-        return g0(new k(this, new i0.l.e.a(aVar, action1, aVar)));
+        return h0(new k(this, new i0.l.e.a(aVar, action1, aVar)));
     }
 
-    public final Observable<T> s(Action1<? super T> action1) {
+    public final Observable<T> t(Action1<? super T> action1) {
         a.C0323a aVar = i0.k.a.a;
-        return g0(new k(this, new i0.l.e.a(action1, aVar, aVar)));
-    }
-
-    public final Observable<T> t(Action0 action0) {
-        return g0(new r(this.i, new v0(action0)));
+        return h0(new k(this, new i0.l.e.a(action1, aVar, aVar)));
     }
 
     public final Observable<T> u(Action0 action0) {
-        return g0(new r(this.i, new w0(action0)));
+        return h0(new r(this.i, new v0(action0)));
     }
 
-    public final Observable<T> w(i0.k.b<? super T, Boolean> bVar) {
-        return g0(new i0.l.a.l(this, bVar));
+    public final Observable<T> v(Action0 action0) {
+        return h0(new r(this.i, new w0(action0)));
     }
 
-    public final Observable<T> x() {
-        return Y(1).Q();
+    public final Observable<T> x(i0.k.b<? super T, Boolean> bVar) {
+        return h0(new i0.l.a.l(this, bVar));
+    }
+
+    public final Observable<T> y() {
+        return Z(1).R();
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: i0.k.b<? super T, ? extends rx.Observable<? extends R>> */
     /* JADX WARN: Multi-variable type inference failed */
-    public final <R> Observable<R> y(i0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
-        return getClass() == j.class ? ((j) this).j0(bVar) : F(E(bVar));
+    public final <R> Observable<R> z(i0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
+        return getClass() == j.class ? ((j) this).k0(bVar) : G(F(bVar));
     }
 }
diff --git a/app/src/main/java/rx/subjects/BehaviorSubject.java b/app/src/main/java/rx/subjects/BehaviorSubject.java
index 2dfcccf230..0043a8891a 100644
--- a/app/src/main/java/rx/subjects/BehaviorSubject.java
+++ b/app/src/main/java/rx/subjects/BehaviorSubject.java
@@ -92,15 +92,15 @@ public final class BehaviorSubject<T> extends Subject<T, T> {
         this.k = cVar;
     }
 
-    public static <T> BehaviorSubject<T> j0() {
-        return l0(null, false);
+    public static <T> BehaviorSubject<T> k0() {
+        return m0(null, false);
     }
 
-    public static <T> BehaviorSubject<T> k0(T t) {
-        return l0(t, true);
+    public static <T> BehaviorSubject<T> l0(T t) {
+        return m0(t, true);
     }
 
-    public static <T> BehaviorSubject<T> l0(T t, boolean z2) {
+    public static <T> BehaviorSubject<T> m0(T t, boolean z2) {
         c cVar = new c();
         if (z2) {
             if (t == null) {
@@ -114,7 +114,7 @@ public final class BehaviorSubject<T> extends Subject<T, T> {
         return new BehaviorSubject<>(cVar, cVar);
     }
 
-    public T m0() {
+    public T n0() {
         Object obj = this.k.latest;
         if (obj != null && !(obj instanceof e.c) && !e.c(obj)) {
             return (T) e.b(obj);
diff --git a/app/src/main/java/rx/subjects/PublishSubject.java b/app/src/main/java/rx/subjects/PublishSubject.java
index 1c9961c6fa..925dcd16b9 100644
--- a/app/src/main/java/rx/subjects/PublishSubject.java
+++ b/app/src/main/java/rx/subjects/PublishSubject.java
@@ -196,7 +196,7 @@ public final class PublishSubject<T> extends Subject<T, T> {
         this.j = bVar;
     }
 
-    public static <T> PublishSubject<T> j0() {
+    public static <T> PublishSubject<T> k0() {
         return new PublishSubject<>(new b());
     }
 
diff --git a/app/src/main/java/rx/subjects/SerializedSubject.java b/app/src/main/java/rx/subjects/SerializedSubject.java
index b0f9d61b4a..5b4657351a 100644
--- a/app/src/main/java/rx/subjects/SerializedSubject.java
+++ b/app/src/main/java/rx/subjects/SerializedSubject.java
@@ -15,7 +15,7 @@ public class SerializedSubject<T, R> extends Subject<T, R> {
 
         @Override // rx.functions.Action1
         public void call(Object obj) {
-            this.i.h0((Subscriber) obj);
+            this.i.i0((Subscriber) obj);
         }
     }
 
diff --git a/app/src/main/java/y/a.java b/app/src/main/java/y/a.java
index f796ba0a4e..16072e03a1 100644
--- a/app/src/main/java/y/a.java
+++ b/app/src/main/java/y/a.java
@@ -9,7 +9,7 @@ public final class a {
     public static final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f3152c;
+    public static final int f3150c;
     public static final int d;
     public final Executor e = new b(null);
 
@@ -27,7 +27,7 @@ public final class a {
     static {
         int availableProcessors = Runtime.getRuntime().availableProcessors();
         b = availableProcessors;
-        f3152c = availableProcessors + 1;
+        f3150c = availableProcessors + 1;
         d = (availableProcessors * 2) + 1;
     }
 }
diff --git a/app/src/main/java/y/b.java b/app/src/main/java/y/b.java
index fc111670b5..98ba667556 100644
--- a/app/src/main/java/y/b.java
+++ b/app/src/main/java/y/b.java
@@ -13,7 +13,7 @@ public final class b {
     public final ExecutorService b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Executor f3153c;
+    public final Executor f3151c;
 
     /* compiled from: BoltsExecutors */
     /* renamed from: y.b$b  reason: collision with other inner class name */
@@ -66,12 +66,12 @@ public final class b {
             threadPoolExecutor = Executors.newCachedThreadPool();
         } else {
             a aVar = a.a;
-            ThreadPoolExecutor threadPoolExecutor2 = new ThreadPoolExecutor(a.f3152c, a.d, 1, TimeUnit.SECONDS, new LinkedBlockingQueue());
+            ThreadPoolExecutor threadPoolExecutor2 = new ThreadPoolExecutor(a.f3150c, a.d, 1, TimeUnit.SECONDS, new LinkedBlockingQueue());
             threadPoolExecutor2.allowCoreThreadTimeOut(true);
             threadPoolExecutor = threadPoolExecutor2;
         }
         this.b = threadPoolExecutor;
         Executors.newSingleThreadScheduledExecutor();
-        this.f3153c = new ExecutorC0364b(null);
+        this.f3151c = new ExecutorC0364b(null);
     }
 }
diff --git a/app/src/main/java/y/d.java b/app/src/main/java/y/d.java
index 0bb8f3cba2..90570a4bde 100644
--- a/app/src/main/java/y/d.java
+++ b/app/src/main/java/y/d.java
@@ -8,12 +8,12 @@ public class d implements c<TResult, Void> {
     public final /* synthetic */ c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Executor f3154c;
+    public final /* synthetic */ Executor f3152c;
 
     public d(g gVar, h hVar, c cVar, Executor executor) {
         this.a = hVar;
         this.b = cVar;
-        this.f3154c = executor;
+        this.f3152c = executor;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -22,7 +22,7 @@ public class d implements c<TResult, Void> {
         h hVar = this.a;
         c cVar = this.b;
         try {
-            this.f3154c.execute(new e(hVar, cVar, gVar));
+            this.f3152c.execute(new e(hVar, cVar, gVar));
             return null;
         } catch (Exception e) {
             hVar.b(new ExecutorException(e));
diff --git a/app/src/main/java/y/g.java b/app/src/main/java/y/g.java
index 741f9bf1a2..9eef203f55 100644
--- a/app/src/main/java/y/g.java
+++ b/app/src/main/java/y/g.java
@@ -12,7 +12,7 @@ public class g<TResult> {
     public static g<?> b = new g<>((Object) null);
 
     /* renamed from: c  reason: collision with root package name */
-    public static g<Boolean> f3155c = new g<>(Boolean.TRUE);
+    public static g<Boolean> f3153c = new g<>(Boolean.TRUE);
     public static g<Boolean> d = new g<>(Boolean.FALSE);
     public final Object e = new Object();
     public boolean f;
@@ -25,7 +25,7 @@ public class g<TResult> {
     static {
         b bVar = b.a;
         ExecutorService executorService = bVar.b;
-        a = bVar.f3153c;
+        a = bVar.f3151c;
         Executor executor = a.a.e;
         new g(true);
     }
diff --git a/app/src/main/res/drawable-anydpi-v24/img_landing_splash.xml b/app/src/main/res/drawable-anydpi-v24/img_landing_splash.xml
new file mode 100644
index 0000000000..a289b9e238
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/img_landing_splash.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="700dp" android:width="600dp" android:viewportWidth="600" android:viewportHeight="700">
+    <path android:fillColor="#000000" android:pathData="M328.8,226.3L280.7,262C283.2,263.4 284.7,263.5 287.4,262C290.1,260.5 296.6,253 299.2,251C301.8,249 309.3,244.9 313,242.8C317.554,240.263 321.728,237.099 325.4,233.4C328.5,230.1 329.6,229 328.8,226.3Z"/>
+    <path android:fillColor="#eb459f" android:pathData="M159.3,18.8C142.007,18.815 124.966,22.944 109.585,30.847C94.203,38.749 80.923,50.198 70.84,64.247C60.758,78.296 54.162,94.543 51.599,111.644C49.036,128.746 50.579,146.212 56.1,162.6L159.3,236.6C188.182,236.6 215.881,225.127 236.304,204.704C256.727,184.281 268.2,156.582 268.2,127.7C268.2,98.818 256.727,71.119 236.304,50.696C215.881,30.273 188.182,18.8 159.3,18.8V18.8Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M190.5,138.1C180.4,133.6 180,133.9 173.7,125.2C167.4,116.5 160.3,112.9 152.5,112.9L169.7,180.5C190.4,183.4 201.6,171.7 203.2,161.3C204.8,150.9 200.6,142.6 190.5,138.1Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M182.1,148.5C178.3,137.7 169.8,125.7 160.6,116.9C157.251,113.747 154.691,109.85 153.127,105.525C151.564,101.199 151.04,96.566 151.6,92L153.3,76.2C154.327,67.4 152.877,58.488 149.114,50.467C145.351,42.447 139.424,35.636 132,30.8C128.673,28.612 125.076,26.864 121.3,25.6C115.27,23.655 108.917,22.907 102.6,23.4C90.644,24.307 79.471,29.692 71.314,38.48C63.157,47.268 58.616,58.81 58.6,70.8C58.6,72.8 58.8,74.8 59,76.8L59.8,83.3L63.3,110.8C64.955,123.294 63.653,136.001 59.5,147.9C57.758,152.639 56.616,157.577 56.1,162.6L140.1,231.7C148.391,229.1 156.076,224.863 162.701,219.242C169.326,213.62 174.757,206.728 178.673,198.971C182.589,191.214 184.909,182.751 185.498,174.083C186.087,165.414 184.931,156.715 182.1,148.5Z"/>
+    <path android:fillColor="#00000000" android:pathData="M140.1,231.7C148.391,229.1 156.076,224.863 162.701,219.242C169.326,213.62 174.757,206.728 178.673,198.971C182.589,191.214 184.909,182.751 185.498,174.083C186.087,165.414 184.931,156.715 182.1,148.5C178.3,137.7 169.8,125.7 160.6,116.9" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#4452f2" android:pathData="M158.4,154.2C164.1,141.6 167.1,142.7 180.1,144.2C190.5,145.5 204.5,164.5 190.2,177.2C175.9,189.9 143.2,187.9 158.4,154.2Z"/>
+    <path android:fillColor="#000000" android:pathData="M117.1,125.9C118.923,125.9 120.4,124.423 120.4,122.6C120.4,120.777 118.923,119.3 117.1,119.3C115.278,119.3 113.8,120.777 113.8,122.6C113.8,124.423 115.278,125.9 117.1,125.9Z"/>
+    <path android:fillColor="#000000" android:pathData="M136.7,124.4C138.522,124.4 140,122.923 140,121.1C140,119.277 138.522,117.8 136.7,117.8C134.877,117.8 133.4,119.277 133.4,121.1C133.4,122.923 134.877,124.4 136.7,124.4Z"/>
+    <path android:fillColor="#00000000" android:pathData="M136.7,121.1C154.6,132.2 148.9,142.9 164.4,161" android:strokeColor="#ffffff" android:strokeWidth="3.0059" android:strokeLineCap="round"/>
+    <path android:fillColor="#ffc619" android:pathData="M121.4,154C130.8,145.4 133.6,143.1 137.4,142.7L147.7,142.1L149.4,183L124.1,185.9L121.4,154Z"/>
+    <path android:fillColor="#000000" android:pathData="M169.6,136.7C169.724,136.143 169.718,135.566 169.582,135.012C169.446,134.458 169.183,133.944 168.816,133.508C168.448,133.072 167.984,132.728 167.461,132.501C166.938,132.274 166.37,132.171 165.8,132.2H148.5C147.245,132.229 146.04,132.694 145.091,133.515C144.142,134.336 143.509,135.463 143.3,136.7L137.5,173.3C137.413,173.86 137.449,174.432 137.605,174.977C137.762,175.522 138.035,176.026 138.406,176.455C138.778,176.883 139.238,177.225 139.755,177.458C140.272,177.69 140.833,177.807 141.4,177.8H158.7C159.944,177.735 161.13,177.257 162.072,176.442C163.014,175.627 163.657,174.522 163.9,173.3L169.6,136.7Z"/>
+    <path android:fillColor="#000000" android:pathData="M168.4,133.2L170.5,135.2L165.4,136.3L168.4,133.2Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M179.3,155.5C176.8,152.3 174.3,148 168.3,148V155.5H179.3Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M171.4,138.5C171.524,137.943 171.518,137.366 171.382,136.812C171.246,136.258 170.983,135.744 170.616,135.308C170.248,134.872 169.784,134.528 169.261,134.301C168.738,134.074 168.17,133.971 167.6,134H150.3C149.045,134.029 147.84,134.494 146.891,135.315C145.942,136.136 145.309,137.263 145.1,138.5L139.3,175.1C139.211,175.655 139.246,176.224 139.403,176.764C139.56,177.304 139.835,177.802 140.208,178.223C140.581,178.644 141.043,178.977 141.561,179.198C142.078,179.419 142.638,179.522 143.2,179.5H160.5C161.735,179.457 162.92,179 163.863,178.202C164.807,177.404 165.454,176.311 165.7,175.1L171.4,138.5Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M167.8,153.2H174.8C176.225,153.199 177.594,153.751 178.62,154.74C179.646,155.728 180.248,157.076 180.3,158.5C180.327,159.239 180.205,159.976 179.94,160.666C179.676,161.357 179.275,161.987 178.762,162.519C178.248,163.051 177.633,163.474 176.952,163.763C176.271,164.052 175.54,164.2 174.8,164.2H169.7C166.4,164.2 163.2,161.7 162.7,158.7C162.2,155.7 164.5,153.2 167.8,153.2Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M166.5,163.8H171.5C172.304,163.798 173.098,163.975 173.824,164.319C174.55,164.663 175.191,165.165 175.698,165.788C176.206,166.41 176.569,167.139 176.759,167.919C176.95,168.7 176.964,169.513 176.8,170.3C176.588,171.554 175.94,172.693 174.971,173.516C174.001,174.34 172.772,174.794 171.5,174.8H168.4C166.798,174.796 165.245,174.251 163.992,173.252C162.739,172.254 161.861,170.861 161.5,169.3C160.9,166.3 163.2,163.8 166.5,163.8Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M153.6,176.6H136.7V183.33H153.6V176.6Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M154.7,156H144C143.49,155.987 142.993,155.831 142.568,155.547C142.144,155.264 141.808,154.866 141.6,154.4L140.4,151.7L139,146.2L135.4,166.9H152.8C154.407,166.914 155.969,166.376 157.226,165.374C158.482,164.373 159.356,162.969 159.7,161.4C160.2,158.4 158,156 154.7,156Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M152.4,166.9H135.4L137.5,177.9H150.5C152.102,177.896 153.655,177.351 154.908,176.352C156.161,175.354 157.039,173.961 157.4,172.4C158,169.4 155.7,166.9 152.4,166.9Z"/>
+    <path android:fillColor="#66bcff" android:pathData="M277.8,217.8C276.5,201.2 262.5,200.6 252.4,196C242.3,191.4 230,180.9 217.5,174.1C205,167.3 195.1,169.2 176.2,177.9L203.2,218C216.6,222.7 220.1,229.3 228,237.9C235.9,246.5 245.3,248.8 254.3,245.9C259.8,253 261,254.6 267.6,251.2C274.2,247.8 285.1,240.9 287.2,231.5C289.3,222.1 284.6,221.1 277.8,217.8Z"/>
+    <path android:fillColor="#45aaf7" android:pathData="M269.3,245.8H269.2C263.2,245.2 260.5,242.2 256.3,237.7L252.6,233.9C236.3,232.9 228.9,225.4 224.7,219.8C222.8,217.1 219.4,215.3 216.2,213.4C213,211.5 209.9,209.9 207.8,207.3C206.329,205.395 204.993,203.39 203.8,201.3C202.1,198.4 200.9,196.3 198.8,196C196.7,195.7 193.4,197.4 190.3,199.3C187.543,201.068 184.59,202.511 181.5,203.6C181.235,203.665 180.955,203.63 180.715,203.501C180.475,203.371 180.291,203.157 180.2,202.9C180.138,202.648 180.177,202.382 180.308,202.159C180.438,201.935 180.651,201.77 180.9,201.7C183.838,200.637 186.654,199.262 189.3,197.6C192.7,195.5 195.7,193.7 199,194.1C202.3,194.5 203.7,197.1 205.6,200.3C206.642,202.318 207.881,204.227 209.3,206C211.2,208.3 214.1,209.9 217.2,211.7C220.3,213.5 224.1,215.6 226.3,218.6C230.6,224.3 237.5,231.1 253.1,231.9H253.5L253.8,232.1L257.8,236.3C261.8,240.6 264.2,243.2 269.4,243.7C269.532,243.712 269.659,243.751 269.776,243.813C269.893,243.875 269.996,243.96 270.079,244.062C270.163,244.165 270.226,244.282 270.264,244.409C270.301,244.536 270.314,244.669 270.3,244.8C270.277,245.058 270.165,245.299 269.982,245.482C269.799,245.665 269.558,245.777 269.3,245.8Z"/>
+    <path android:fillColor="#00000000" android:pathData="M199.6,192.7C198.23,199.511 197.627,206.454 197.8,213.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#8cd9ff" android:pathData="M217.5,271.1C204.9,285.6 192.5,283.8 187,284C181.5,284.2 181.4,280 180.6,276.8C179.8,273.6 178.9,268.4 178.9,268.4C164.8,269.5 162,260.2 160.8,251.8C159.9,245.4 157.2,242.5 155.5,236.7C138.436,236.109 121.75,231.511 106.793,223.276C91.835,215.042 79.025,203.403 69.4,189.3L82.9,176.7L117.8,193C139,181.9 150.7,176 162.5,173.5C174.3,171 186.5,173.9 192.1,189.7C197.7,205.5 198.8,210.6 203.2,218C204.4,219.9 206.2,222.3 208.1,225.1C213.4,233.2 219.3,244.8 211.9,259.5C213.458,263.508 215.33,267.387 217.5,271.1V271.1Z"/>
+    <path android:fillColor="#000000" android:pathData="M96.8,216.9C95,206.1 98.5,197.9 105.8,195.5L85.2,185.1L72.1,193C79.002,202.236 87.342,210.306 96.8,216.9V216.9Z"/>
+    <path android:fillColor="#66bcff" android:pathData="M191,277.8V275.8C188.1,275.7 187.7,273.7 185.9,264.4L185.7,263.2H185C178.7,262.5 174.2,259.4 172.4,247C171.2,238 168.9,233.7 167,230.3C166.319,229.073 165.717,227.804 165.2,226.5C164.761,225.341 164.26,224.206 163.7,223.1C162.2,220 160.7,216.7 160.8,209.7C160.9,204.8 160.2,202.4 158.5,201.2C156.8,200 153,200.9 147.5,203.6L146.8,203.9C138,208.2 120.5,216.6 102.4,220.7L104.8,222.2C122.5,217.8 139.1,209.8 147.6,205.7L148.3,205.4C152.8,203.3 156,202 157.4,202.9C158.8,203.8 158.9,205.7 158.8,209.7C158.508,214.66 159.58,219.606 161.9,224C162.427,225.039 162.894,226.108 163.3,227.2C163.844,228.623 164.513,229.995 165.3,231.3C167.1,234.5 169.3,238.6 170.5,247.3C172,258.7 176,263.9 184.1,265.1C185.8,274.2 186.5,277.6 191,277.8Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M121.4,151.7C116.6,148.5 113.3,149.3 108.1,152.3C101.8,148 94.3,148.3 86.9,152C81.4,154.8 68,160.8 61.3,163.7C60.927,163.862 60.518,163.923 60.115,163.876C59.711,163.829 59.327,163.675 59.002,163.431C58.676,163.187 58.422,162.862 58.263,162.487C58.105,162.113 58.049,161.703 58.1,161.3L61.3,142.1C46.2,156.8 43.7,183.7 50.4,197.2C57.9,212.3 80,207.4 86.8,202.5C93.6,197.6 95.9,195.9 104.4,196.3C112.9,196.7 119.6,196.7 129.5,186.9L135.8,183.8C136.7,169.5 133.4,159.7 121.4,151.7Z"/>
+    <path android:fillColor="#00000000" android:pathData="M121.4,151.7C116.6,148.5 113.3,149.3 108.1,152.3C101.8,148 94.3,148.3 86.9,152C81.4,154.8 68,160.8 61.3,163.7" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M109.2,152.8C123.1,161.5 127.1,172.6 128.9,180" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#ffffff" android:pathData="M205.3,101.3H186.3C186.195,101.286 186.088,101.293 185.985,101.321C185.883,101.349 185.787,101.396 185.703,101.462C185.62,101.527 185.55,101.608 185.498,101.7C185.445,101.793 185.412,101.895 185.4,102L182.9,117.6C182.871,117.785 182.9,117.974 182.984,118.141C183.067,118.308 183.201,118.445 183.366,118.533C183.531,118.621 183.719,118.655 183.904,118.632C184.089,118.608 184.263,118.527 184.4,118.4L205.9,102.9C206.047,102.781 206.153,102.619 206.203,102.437C206.253,102.254 206.244,102.06 206.178,101.883C206.111,101.706 205.991,101.554 205.833,101.45C205.676,101.345 205.489,101.293 205.3,101.3Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M249,106.6C260.6,106.6 271.6,97.2 273.4,85.7V85.2C275.2,73.8 267.1,64.4 255.5,64.4H191.3C179.7,64.4 168.7,73.8 166.9,85.2V85.7C165.1,97.2 173.2,106.6 184.8,106.6H249Z"/>
+    <path android:fillColor="#8cd9ff" android:pathData="M188.2,94.1C190.59,94.048 192.889,93.175 194.71,91.627C196.532,90.078 197.764,87.95 198.2,85.6V85.4C198.394,84.33 198.347,83.23 198.062,82.181C197.776,81.132 197.26,80.16 196.551,79.335C195.842,78.511 194.957,77.856 193.962,77.417C192.967,76.979 191.887,76.768 190.8,76.8C188.407,76.893 186.116,77.794 184.3,79.355C182.484,80.917 181.25,83.048 180.8,85.4V85.6C180.586,86.659 180.616,87.753 180.889,88.799C181.161,89.845 181.669,90.814 182.373,91.634C183.077,92.454 183.959,93.102 184.951,93.529C185.944,93.957 187.021,94.152 188.1,94.1H188.2Z"/>
+    <path android:fillColor="#66bcff" android:pathData="M218.7,94.1C221.09,94.048 223.389,93.175 225.21,91.627C227.032,90.078 228.264,87.95 228.7,85.6V85.4C228.894,84.33 228.847,83.23 228.562,82.181C228.276,81.132 227.76,80.16 227.051,79.335C226.342,78.511 225.457,77.856 224.462,77.417C223.467,76.979 222.387,76.768 221.3,76.8C218.907,76.893 216.616,77.794 214.8,79.355C212.984,80.917 211.75,83.048 211.3,85.4V85.6C211.086,86.659 211.116,87.753 211.389,88.799C211.661,89.845 212.169,90.814 212.873,91.634C213.577,92.454 214.459,93.102 215.451,93.529C216.444,93.957 217.521,94.152 218.6,94.1H218.7Z"/>
+    <path android:fillColor="#8cd9ff" android:pathData="M249.2,94.1C251.59,94.048 253.889,93.175 255.71,91.627C257.532,90.078 258.764,87.95 259.2,85.6V85.4C259.394,84.33 259.347,83.23 259.062,82.181C258.776,81.132 258.26,80.16 257.551,79.335C256.842,78.511 255.957,77.856 254.962,77.417C253.967,76.979 252.887,76.768 251.8,76.8C249.407,76.893 247.116,77.794 245.3,79.355C243.484,80.917 242.25,83.048 241.8,85.4V85.6C241.586,86.659 241.616,87.753 241.889,88.799C242.161,89.845 242.669,90.814 243.373,91.634C244.077,92.454 244.959,93.102 245.951,93.529C246.944,93.957 248.021,94.152 249.1,94.1H249.2Z"/>
+    <path android:fillColor="#29cc7a" android:pathData="M154.3,141.2C154.329,140.974 154.309,140.744 154.241,140.526C154.174,140.308 154.06,140.107 153.909,139.937C153.757,139.767 153.571,139.63 153.363,139.538C153.154,139.445 152.928,139.398 152.7,139.4H151.2C150.75,139.413 150.317,139.579 149.972,139.869C149.627,140.16 149.39,140.558 149.3,141L148.5,146.2C148.472,146.426 148.492,146.656 148.56,146.874C148.627,147.092 148.74,147.293 148.892,147.463C149.043,147.633 149.23,147.77 149.438,147.862C149.646,147.955 149.872,148.002 150.1,148H151.6C152.037,147.992 152.46,147.841 152.803,147.57C153.146,147.299 153.391,146.923 153.5,146.5L154.3,141.2Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M126.3,115.2C127.284,112.652 128.828,110.359 130.819,108.489C132.81,106.62 135.196,105.222 137.8,104.4C137.864,104.42 137.934,104.418 137.996,104.394C138.059,104.37 138.112,104.326 138.147,104.268C138.181,104.21 138.196,104.143 138.187,104.076C138.179,104.009 138.148,103.947 138.1,103.9C135.3,96.9 135.8,92.5 137.8,86.9C137.815,86.847 137.819,86.792 137.812,86.738C137.805,86.684 137.787,86.632 137.758,86.585C137.73,86.538 137.693,86.498 137.648,86.466C137.604,86.434 137.554,86.412 137.5,86.4C128.5,84 124.5,78.3 123.1,73.8C123.066,73.738 123.015,73.685 122.953,73.649C122.892,73.613 122.822,73.594 122.75,73.594C122.679,73.594 122.609,73.613 122.547,73.649C122.486,73.685 122.435,73.738 122.4,73.8C119.4,81.9 114.2,82.9 109.7,83C109.3,83 109.2,83.3 109.3,83.6C114.7,91.5 112.3,98.1 108.3,103C108.1,103.2 108.3,103.6 108.6,103.6C117.5,103.8 122.7,108.9 125.6,115.2C125.7,115.5 126.1,115.5 126.3,115.2Z"/>
+    <path android:fillColor="#00000000" android:pathData="M152.4,166.9H143.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M168.3,164.2H173.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M122.7,73.5C125.7,64.4 124.7,58.4 123.4,55.2" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M136.8,86.8C142.9,86.5 146.7,84.5 149.9,81.1" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M126.3,115.2C126.424,116.33 126.424,117.47 126.3,118.6" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M109,103C103.7,107.8 95.1,108.4 88.8,107.5" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M109.7,83C107,78.9 102.5,74.4 98.5,73.2" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M138.1,103.9C140.2,104.655 142.382,105.158 144.6,105.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#c40655" android:pathData="M119.7,89.8C123.5,99.6 126.9,98.6 128.1,95.3C129.3,92 129.9,88 132.5,88C135.1,88 134.7,92.2 132.5,98.7C130.3,105.2 125.7,107.4 120.6,102.7C115.5,98 114.8,92.7 114.2,89C113.6,85.3 117.4,84 119.7,89.8Z"/>
+    <path android:fillColor="#00000000" android:pathData="M117.1,122.6C121.3,143.4 111.6,155.1 110.6,176.6" android:strokeColor="#ffffff" android:strokeWidth="3.0059" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M154.4,235.2C149.052,222.879 148.729,208.956 153.5,196.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M150.1,214.6C146.9,210.5 146.5,204.1 146.5,204.1" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M67.1,161.1L56.1,166.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M181.8,144L188.1,144.9" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#d11583" android:pathData="M328.9,226.1C328.139,227.467 327.269,228.771 326.3,230C321.9,235.6 311.3,242.6 305.5,245.8C299.7,249 298,250.3 294,254.5C290,258.7 284.9,264.3 280.7,262C276.5,259.7 269.9,253.6 265.8,249.3C265.552,249.059 265.374,248.755 265.286,248.42C265.198,248.085 265.203,247.732 265.3,247.4C266.9,240.9 272.8,231.2 282.2,225.3C282.507,225.09 282.865,224.969 283.236,224.952C283.607,224.934 283.976,225.02 284.3,225.2C290.6,228.5 294.3,229.1 299,228.4C306.2,227.3 312.7,223.1 320,219.9C327.3,216.7 327.8,220 328.9,226.1Z"/>
+    <path android:fillColor="#fa80ba" android:pathData="M270.8,254.1C274.5,257.5 278.7,260.9 280.7,262C284.9,264.3 289.9,258.7 294,254.5C298.1,250.3 299.7,249 305.5,245.8C311.3,242.6 321.9,235.6 326.3,230C327.269,228.771 328.139,227.467 328.9,226.1C327.8,220 326.1,217.2 320,219.9C313.9,222.6 310.6,224.6 306,226.4C304.655,226.93 303.489,227.832 302.639,229.001C301.789,230.17 301.29,231.557 301.2,233C301.1,234.6 301,236.4 301,238.4C292.4,238 284.8,241.8 284.3,252.9C284.3,252.9 276.7,250.2 270.8,254.1Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M326.3,230C327.224,228.83 328.06,227.594 328.8,226.3C329.006,225.973 329.077,225.579 329,225.2C328.767,224.046 328.362,222.934 327.8,221.9C326.8,224.4 324.9,227 320.5,231.2C313.5,237.8 305.3,240.9 300.4,243.4C295.932,245.709 292.011,248.948 288.9,252.9C286.4,256 283.4,259.2 278.9,260.8L280.7,262C284.9,264.3 289.9,258.7 294,254.5C298.1,250.3 299.7,249 305.5,245.8C311.3,242.6 321.9,235.6 326.3,230Z"/>
+    <path android:fillColor="#d11583" android:pathData="M233.1,250C225,249 217.5,253.8 211.8,268.1C209.6,266.9 204.5,265.9 197.2,268.4C189.9,270.9 187.6,274.3 186.6,277.1C186.097,278.592 186.097,280.208 186.6,281.7C187.1,283.6 188,286.1 189.5,290.3C191.7,296.8 191.5,302.6 195.3,302.8L243,258.4C243,258.4 243.6,251.3 233.1,250Z"/>
+    <path android:fillColor="#fa80ba" android:pathData="M233.1,250C225,249 217.5,253.8 211.8,268.1C211.018,270.229 210.35,272.399 209.8,274.6C201.6,275.1 198.2,279.1 197.7,287.1C197.7,287.1 191.8,284.3 189,289C189.2,289.5 189.3,289.9 189.5,290.3C191.7,296.8 191.5,302.6 195.3,302.8L243,258.4C243,258.4 243.6,251.3 233.1,250Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M242.6,256.1L238.4,253.2C231.7,253 226.1,253.6 221,261.1C215.9,268.6 212.8,276.2 207.2,281.5C199,289.2 192,292.8 191.4,297.7C192.2,300.6 193.1,302.7 195.3,302.8L243,258.4C243.033,257.614 242.896,256.829 242.6,256.1Z"/>
+    <path android:fillColor="#d11583" android:pathData="M235.4,251.3L239.2,251.8C239.861,251.872 240.469,252.194 240.9,252.7C242.7,254.6 243.3,257.7 243.4,260.5L229.6,259.9C233.9,257.1 235.1,254.9 234.4,252.3C234.384,252.165 234.399,252.028 234.443,251.899C234.488,251.77 234.561,251.654 234.657,251.557C234.754,251.461 234.871,251.388 234.999,251.343C235.128,251.299 235.265,251.284 235.4,251.3Z"/>
+    <path android:fillColor="#000000" android:pathData="M195.7,302.8C209.1,303.6 214.5,298.7 219.5,292C221.669,289.098 224.226,286.507 227.1,284.3C234.4,278.6 240,273.1 243.4,264.9C247.6,254.7 233.3,253.8 225.8,261.9C218.3,270 218.6,278.1 203.3,290.6C192.8,299.1 191.6,302.6 195.7,302.8Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M192.938,281.436C193.931,281.396 194.686,280.111 194.624,278.566C194.562,277.021 193.706,275.801 192.713,275.84C191.72,275.88 190.965,277.165 191.027,278.71C191.089,280.256 191.945,281.476 192.938,281.436Z"/>
+    <path android:fillColor="#d11583" android:pathData="M329.1,224.2C328.688,222.643 327.975,221.182 327,219.9H326.4C326.311,219.943 326.24,220.019 326.203,220.111C326.166,220.204 326.165,220.307 326.2,220.4C327.3,223.4 327.9,227 326.6,229.4C329.8,226.2 329.2,224.7 329.1,224.2Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M275.808,248.677C277.173,248.23 277.709,246.124 277.006,243.972C276.302,241.819 274.625,240.436 273.26,240.882C271.896,241.328 271.359,243.435 272.063,245.587C272.766,247.74 274.443,249.123 275.808,248.677Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M390.9,467.1C385.8,460.7 383.8,461.8 380,461.8C380,455.5 377,454.9 375.6,460.2C374.2,465.5 373.4,467.8 376.8,472.9C380.2,478 384.8,485.3 386.9,494.1C386.9,494.1 379.9,496 372.5,498.8L380.9,518.2C394.7,512 402.8,506.6 403.7,495.5C404.6,484.4 396.1,473.6 390.9,467.1Z"/>
+    <path android:fillColor="#bde9ff" android:pathData="M242.5,441.5C253.5,441.5 261.9,442 273.7,445.7C277.683,446.974 281.158,449.482 283.621,452.862C286.084,456.242 287.408,460.318 287.4,464.5V507.3H283.1L280.9,503.8V470C280.886,466.118 279.581,462.351 277.192,459.291C274.802,456.232 271.463,454.054 267.7,453.1C260.67,451.412 253.512,450.308 246.3,449.8L241,441.5H242.5Z"/>
+    <path android:fillColor="#000000" android:pathData="M290.4,543C288.225,543 286.139,542.136 284.602,540.598C283.064,539.06 282.2,536.975 282.2,534.8V491.6C282.2,489.425 283.064,487.339 284.602,485.802C286.139,484.264 288.225,483.4 290.4,483.4C293.158,483.4 295.803,484.496 297.754,486.446C299.704,488.396 300.8,491.042 300.8,493.8V532.6C300.8,535.358 299.704,538.004 297.754,539.954C295.803,541.904 293.158,543 290.4,543Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M157.8,667.2C224.405,667.2 278.4,613.206 278.4,546.6C278.4,479.994 224.405,426 157.8,426C91.194,426 37.2,479.994 37.2,546.6C37.2,613.206 91.194,667.2 157.8,667.2Z"/>
+    <path android:fillColor="#039c78" android:pathData="M42.8,510.1C39.047,521.902 37.158,534.216 37.2,546.6C37.183,567.472 42.583,587.99 52.872,606.15C63.161,624.309 77.987,639.487 95.9,650.2C105.475,638.43 111.79,624.352 114.212,609.373C116.635,594.395 115.079,579.044 109.702,564.856C104.324,550.668 95.314,538.142 83.572,528.532C71.831,518.923 57.771,512.566 42.8,510.1Z"/>
+    <path android:fillColor="#fa94c4" android:pathData="M60,524.6C52,521.7 50.8,520.3 48.9,516.5C47,512.7 45.9,513.4 41.9,513C41.575,514.017 41.308,515.052 41.1,516.1C57,526.4 61.4,548.9 61.4,548.9L67.9,545.8C67.9,545.8 67.9,527.6 60,524.6Z"/>
+    <path android:fillColor="@drawable/res_2131230790_img_landing_splash__0" android:pathData="M39.1,568.4C43.971,595.053 57.676,619.289 78.004,637.201C98.332,655.114 124.1,665.659 151.153,667.138C178.207,668.616 204.971,660.942 227.13,645.351C249.289,629.761 265.553,607.163 273.3,581.2L146.6,528.3C117.8,520.3 68,517.5 39.1,568.4Z"/>
+    <path android:fillColor="#000000" android:pathData="M240,633.7C215.1,633.6 169.9,638.4 143.5,608.5C162.6,630.2 171.6,646.4 172.2,666.4C197.523,663.368 221.229,652.373 239.9,635L240,633.7Z"/>
+    <path android:fillColor="#fa80ba" android:pathData="M55.6,546.6C70.5,532 112.7,521.6 147.1,546.6L160.3,532.7C159.3,509.6 154.1,508.2 147.1,515.5C140.1,522.8 138.6,516.2 131.6,503.8C124.6,491.4 115.8,488.8 109.5,501.7C103.2,514.6 104.6,514.9 99.3,513.1C94,511.3 84.4,506.6 76.2,505.4C68,504.2 64.2,515.8 64.9,524.6C65.6,533.4 63.5,533.1 59.3,531.3C55.1,529.5 54,535 55.6,546.6Z"/>
+    <path android:fillColor="#00000000" android:pathData="M118.5,530.3C120.066,519.637 120.301,508.821 119.2,498.1" android:strokeColor="#ff5cb4" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M73.1,510.1C79.2,522.9 80.3,529.3 80.3,529.3" android:strokeColor="#ff5cb4" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#2ad17d" android:pathData="M401.1,546.6C404.9,534.9 405.9,534.6 381.7,535.6C359.4,536.5 331.3,537.4 305.5,539.3C304.2,523.6 299.2,517.4 293.5,509.3C295.6,483.5 290.9,458.4 265.3,452.4C239.7,446.4 202.1,444.9 177,454.3C151.9,463.7 159,499.5 161.7,523.8C161.7,523.8 139.5,530.9 131.2,552.9C124.2,571.4 127.6,593.5 147.4,612.6C179.1,643.1 211.1,646.5 241.4,642.9C265,640.1 276.9,622.1 280.2,604.6C323.4,620.7 350.7,596.5 360.3,584.8C371.5,571.3 387.4,566.9 397.2,562.8C407,558.7 410.8,554.8 401.1,546.6Z"/>
+    <path android:fillColor="#fa80ba" android:pathData="M190.8,413.5C181.7,413 172,418.9 178.5,436.2C168.7,435.3 158.8,440.6 165.7,456.8L211,441.4C207.1,421.5 199.9,414.1 190.8,413.5Z"/>
+    <path android:fillColor="#000000" android:pathData="M188.7,497.3C188.7,486.254 179.745,477.3 168.7,477.3C157.654,477.3 148.7,486.254 148.7,497.3V528.92C148.7,539.966 157.654,548.92 168.7,548.92C179.745,548.92 188.7,539.966 188.7,528.92V497.3Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M248.2,442.8V449.3C229.4,446.8 206,446.5 186.9,451.3C183.128,452.238 179.779,454.412 177.387,457.475C174.995,460.538 173.697,464.314 173.7,468.2V505.4H150.3V466.7C150.314,461.145 152.287,455.772 155.872,451.528C159.457,447.285 164.425,444.442 169.9,443.5C204.6,437.4 228.7,439.8 248.2,442.8Z"/>
+    <path android:fillColor="#bde9ff" android:pathData="M212.1,439.7C201,439.7 192.6,440.2 180.8,443.9C176.825,445.187 173.359,447.699 170.898,451.076C168.437,454.453 167.108,458.522 167.1,462.7V505.4H171.4L173.7,502V468.2C173.697,464.314 174.995,460.538 177.387,457.475C179.78,454.412 183.129,452.238 186.9,451.3C193.896,449.612 201.021,448.508 208.2,448L213.5,439.7H212.1Z"/>
+    <path android:fillColor="#039c78" android:pathData="M313.5,544.7C287.3,545.9 258.5,547.6 248,548.1C237.5,548.6 231.3,548.8 229.5,553.8C227.7,558.8 242,559.6 260.1,560.8C278.2,562 318.9,561.8 342.5,560.8C366.1,559.8 383.5,558 394.5,556.4C405.5,554.8 395,547.6 395,547.6C395,547.6 399.2,540.9 393.3,540.2C387.4,539.5 313.5,544.7 313.5,544.7Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M286.2,554.6C287.3,538.9 293.2,538.1 295.9,542.2C297.495,544.813 298.708,547.642 299.5,550.6C300.106,550.3 300.773,550.144 301.45,550.144C302.126,550.144 302.793,550.3 303.4,550.6C305.6,551.7 305.8,554.6 305.8,554.6H286.2Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M250.5,553.2C254.3,542.4 262,544.4 267.3,546.9C268.794,547.504 270.086,548.521 271.024,549.831C271.962,551.141 272.509,552.691 272.6,554.3L250.5,553.2Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M238.6,552.8C241.5,541.6 244.6,542.4 245.5,546.6C246.4,550.8 246.8,553.2 246.8,553.2L238.6,552.8Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M390.1,549.3C374.6,551.7 346.2,554.2 309.8,554.6C308.7,545.6 311.5,537.8 322.6,529.3C327.4,525.5 327,522.7 326.6,520.2C325.2,511.4 321.7,502.5 316.6,491C308.8,473.3 307.8,458.8 320.8,450.8C333.8,442.8 348.6,447.4 358.6,462C368.6,476.6 390.5,509 390.1,549.3Z"/>
+    <path android:fillColor="#ffae00" android:pathData="M346.4,470C356.1,479.2 359.7,478 361.8,477.5C363.9,477 362.2,471.5 361,469.1L346.4,470Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M368.7,551.8C375.1,540.1 378.4,536.8 382.2,538C386,539.2 385.7,549.9 385.7,549.9L368.7,551.8Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M347,553.4C352.2,535.9 358.5,538.1 360.7,541C362.9,543.9 364.8,552.2 364.8,552.2L347,553.4Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M330.7,482.7C331.5,487.2 330,490.8 327.7,491.3C325.4,491.8 323.3,489.6 322.1,486.1C320.9,482.6 321.2,477.2 323.6,475.7C326,474.2 329.8,477.4 330.7,482.7Z"/>
+    <path android:fillColor="#ed5f00" android:pathData="M346.4,470C343.7,466.7 345.3,460.6 348.6,455C351.9,449.4 356.5,447.6 360.4,447.6C364.3,447.6 365.4,451.4 360.9,462.1C366.6,461.1 369.2,461.2 369.7,464.4C370.2,467.6 366.5,469.7 358,471.1C351,472.3 347.9,471.9 346.4,470Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M379.8,461.1C381.3,457.1 382.9,456.6 383.9,457C384.9,457.4 384.5,459.4 383.7,463.3C382.9,467.2 378.4,464.9 379.8,461.1Z"/>
+    <path android:fillColor="#ffc619" android:pathData="M382.9,461.8C386.2,458.9 387.9,459.3 388.5,460.1C389.1,460.9 387.9,462.5 385.3,465.5C382.7,468.5 379.9,464.4 382.9,461.8Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M234.7,512C241.4,512.1 244,510.9 244.8,508.1C245.6,505.3 241,499.4 231.8,498.8C222.6,498.2 216.3,502.5 215,508C213.7,513.5 216.6,512.4 222.9,512.1C226.828,511.821 230.769,511.787 234.7,512Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M272.5,512C267,512.1 264.9,510.9 264.3,508.1C263.7,505.3 267.3,499.4 274.8,498.8C282.3,498.2 287.3,502.5 288.4,508C289.5,513.5 287.1,512.4 282,512.1C278.84,511.821 275.664,511.787 272.5,512Z"/>
+    <path android:fillColor="#bde9ff" android:pathData="M154.5,483.3H159.3C163.093,483.3 166.73,484.807 169.412,487.488C172.093,490.17 173.6,493.807 173.6,497.6V528.6C173.613,530.486 173.253,532.357 172.54,534.103C171.827,535.85 170.776,537.438 169.447,538.776C168.118,540.115 166.537,541.177 164.795,541.902C163.054,542.627 161.186,543 159.3,543H154.5C152.123,543 149.769,542.532 147.573,541.622C145.377,540.713 143.382,539.379 141.701,537.699C140.021,536.018 138.687,534.023 137.778,531.827C136.868,529.631 136.4,527.277 136.4,524.9V501.4C136.4,499.023 136.868,496.669 137.778,494.473C138.687,492.277 140.021,490.282 141.701,488.601C143.382,486.921 145.377,485.587 147.573,484.678C149.769,483.768 152.123,483.3 154.5,483.3Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M153.3,483.3H167.1V529.1C167.113,530.921 166.766,532.726 166.078,534.412C165.391,536.098 164.376,537.631 163.094,538.923C161.811,540.215 160.285,541.24 158.604,541.94C156.923,542.64 155.121,543 153.3,543C151.081,543 148.883,542.563 146.833,541.714C144.782,540.864 142.919,539.619 141.35,538.05C139.78,536.481 138.536,534.618 137.686,532.567C136.837,530.517 136.4,528.319 136.4,526.1V500.2C136.4,495.718 138.18,491.419 141.35,488.25C144.519,485.081 148.818,483.3 153.3,483.3Z"/>
+    <path android:fillColor="#fa80ba" android:pathData="M255.3,475.6C247.4,475.6 244.8,473.5 239.2,466.1C233.6,458.7 226.9,447.3 208.3,448C196.5,431.1 201.5,411.1 213.4,401.3C225.3,391.5 249.1,391.5 257.7,406.8C262.3,415 264.1,423.9 261,439.7C271.1,436.8 275,443.7 273.5,452.2C272,460.7 264.9,475.6 255.3,475.6Z"/>
+    <path android:fillColor="#ff78b9" android:pathData="M155.1,505.7C155.1,503.491 153.309,501.7 151.1,501.7C148.891,501.7 147.1,503.491 147.1,505.7V520.64C147.1,522.849 148.891,524.64 151.1,524.64C153.309,524.64 155.1,522.849 155.1,520.64V505.7Z"/>
+    <path android:fillColor="#00000000" android:pathData="M276.6,503.3C278.526,502.996 280.498,503.349 282.2,504.3" android:strokeColor="#000000" android:strokeWidth="3.4304" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M229.8,503.4C232.467,503.111 235.166,503.418 237.7,504.3" android:strokeColor="#000000" android:strokeWidth="3.4304" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M244.1,487.5C232,487.2 225.5,487.2 214.6,488.6" android:strokeColor="#000000" android:strokeWidth="7.3509" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M287.5,489C280.2,487.4 275.7,487.1 267.5,487.1" android:strokeColor="#000000" android:strokeWidth="7.3509" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M392.3,548.9C368.6,552.9 309.6,557.4 236.4,552.6" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#039c78" android:pathData="M277.5,604C270.9,613.1 261.6,621.5 244.2,625C218.3,630.2 204.8,605.8 202.9,585.5C202.1,576.8 201.8,567.7 205.7,577.3C213.1,595.5 230.1,598.1 242.7,597.9C255.3,597.7 261,598.8 277.5,604Z"/>
+    <path android:fillColor="#00000000" android:pathData="M140.6,619.2C148.3,623.1 157.8,623.4 157.8,623.4" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M136.4,542C131.94,548.311 128.997,555.566 127.8,563.2" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#03ab83" android:pathData="M229.67,581.571C231.998,579.135 230.389,573.82 226.077,569.699C221.764,565.578 216.382,564.212 214.054,566.648C211.727,569.083 213.336,574.398 217.648,578.519C221.96,582.64 227.343,584.006 229.67,581.571Z"/>
+    <path android:fillColor="#00000000" android:pathData="M252.3,474.4C259.6,466.4 263,454.8 264.2,446.9" android:strokeColor="#eb459f" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M239.2,463.6C245.4,438.3 245.4,411.5 228.3,402" android:strokeColor="#eb459f" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#57f287" android:pathData="M143.313,580.239C145.766,579.841 147.232,576.293 146.587,572.313C145.943,568.333 143.432,565.429 140.978,565.826C138.525,566.224 137.059,569.772 137.703,573.752C138.348,577.732 140.859,580.636 143.313,580.239Z"/>
+    <path android:fillColor="#00000000" android:pathData="M224.2,552.6L229.7,545.3" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#000000" android:pathData="M327.294,482.522C328.34,482.022 328.592,480.365 327.854,478.819C327.117,477.274 325.671,476.426 324.624,476.926C323.578,477.425 323.327,479.082 324.064,480.628C324.801,482.173 326.247,483.021 327.294,482.522Z"/>
+    <path android:fillColor="#000000" android:pathData="M349.9,466.4C349.785,466.377 349.683,466.314 349.61,466.222C349.536,466.131 349.498,466.017 349.5,465.9C349.817,463.087 350.775,460.384 352.3,458C355,454 357.1,452.6 358.9,452.2C360.7,451.8 362.2,452.1 362.2,453.8C362.2,455.5 361.3,458.8 359.9,462.9C361.864,462.433 363.882,462.231 365.9,462.3C367.1,462.4 367.2,462.9 366.2,463.4C365.2,463.9 360.9,465.5 349.9,466.4Z"/>
+    <path android:fillColor="#00000000" android:pathData="M340.8,530.8C341.9,541.2 333.3,554.1 333.3,554.1" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#ffffff" android:pathData="M176.8,636.2L175.9,635.6C176.176,635.366 176.478,635.165 176.8,635C177.7,634.3 178.6,633.7 178.6,632.7C178.6,631.7 177.5,631.1 176.5,630.6L175.6,630.1C175.841,629.839 176.109,629.604 176.4,629.4C177.3,628.7 178.2,627.9 178,626.9C177.8,625.9 176.8,625.5 175.8,625L174.9,624.6L175.6,623.9C176.4,623.1 177.3,622.3 177.1,621.3C176.9,620.3 175.8,619.9 174.8,619.5C174.476,619.428 174.171,619.292 173.9,619.1L174.6,618.4C175.4,617.6 176.2,616.8 175.9,615.8C175.6,614.8 174.6,614.5 173.6,614.1C173.276,614.028 172.971,613.892 172.7,613.7L173.3,613C174.1,612.2 174.9,611.4 174.7,610.4C174.5,609.4 173.4,609.1 172.3,608.7L171.4,608.3L172.1,607.6C172.9,606.8 173.7,606 173.4,605C173.1,604 172.2,603.7 171.1,603.3L170.2,602.9L170.9,602.2C171.7,601.5 172.5,600.7 172.4,599.7C172.3,598.7 171.1,598.3 170.1,597.8L169.2,597.4L170,596.8C170.8,596.1 171.7,595.4 171.6,594.4C171.5,593.4 170.5,592.9 169.5,592.4L168.7,591.9L169.5,591.3C170.4,590.8 171.3,590.1 171.3,589.2C171.3,588.3 170.5,587.5 169.6,586.9L168.8,586.3L169.7,585.9C170.128,585.761 170.532,585.559 170.9,585.3C171.127,585.197 171.316,585.027 171.441,584.812C171.567,584.597 171.622,584.348 171.6,584.1C171.621,583.827 171.555,583.554 171.411,583.32C171.267,583.087 171.053,582.905 170.8,582.8C169.2,582 169.2,580.3 169.5,573.5V573.3C169.9,565.8 168.2,546.1 165.9,540.7C165.769,540.505 165.573,540.362 165.347,540.297C165.121,540.232 164.879,540.249 164.664,540.345C164.449,540.44 164.275,540.608 164.172,540.82C164.069,541.031 164.043,541.272 164.1,541.5C166.1,546.2 168,565.2 167.6,573.2V573.4C167.2,579.9 167.1,582.5 169.1,584H168.9C167.9,584.5 166.8,585 166.7,586C166.6,587 167.5,587.7 168.4,588.4C168.706,588.542 168.978,588.746 169.2,589L168.4,589.6C167.5,590.2 166.5,590.9 166.5,591.9C166.5,592.9 167.6,593.5 168.6,594L169.5,594.5L168.7,595.2C167.9,595.9 167,596.6 167.1,597.7C167.2,598.8 168.3,599.1 169.3,599.5L170.3,600L169.6,600.7C168.8,601.5 167.9,602.3 168.1,603.3C168.3,604.3 169.4,604.6 170.4,605L171.4,605.4L170.7,606.1C169.9,606.9 169.1,607.7 169.3,608.7C169.5,609.7 170.6,610.1 171.7,610.4L172.6,610.8L171.9,611.5C171.2,612.3 170.4,613.1 170.6,614.1C170.8,615.1 171.9,615.5 172.9,615.8L173.9,616.2L173.2,616.9C172.4,617.7 171.6,618.5 171.8,619.5C172,620.5 173.1,620.9 174.1,621.3L175,621.6C174.793,621.858 174.558,622.093 174.3,622.3C173.5,623.1 172.7,623.9 172.8,624.8C172.9,625.7 174,626.3 175,626.7L175.9,627.1L175.2,627.8C174.3,628.5 173.4,629.2 173.5,630.2C173.6,631.2 174.6,631.7 175.6,632.2L176.4,632.7L175.7,633.2C174.8,633.9 173.8,634.5 173.8,635.5C173.8,636.5 174.8,637.1 175.7,637.7L176.5,638.2L175.6,638.7C174.7,639.2 173.7,639.8 173.6,640.7C173.5,641.6 174.3,642.4 175.1,643.1L175.8,643.8L175,644.1C173.9,644.5 172.9,644.9 172.6,645.8C172.3,646.7 173.1,647.6 173.8,648.4C174.054,648.622 174.258,648.894 174.4,649.2L173.5,649.4C172.4,649.6 171.3,649.8 170.9,650.7C170.819,651.181 170.848,651.675 170.987,652.143C171.126,652.611 171.37,653.041 171.7,653.4C171.828,653.72 171.996,654.022 172.2,654.3H171.3C170.2,654.4 169,654.4 168.5,655.2C168,656 168.4,657.1 168.8,658.1L169.2,659H168.2C167.1,658.9 166,658.7 165.4,659.5C164.8,660.3 165,661.3 165.3,662.3C165.319,662.641 165.386,662.978 165.5,663.3L164.6,663.1C163.5,662.8 162.4,662.5 161.7,663.2C161,663.9 161.1,664.9 161.2,666C161.283,666.327 161.316,666.664 161.3,667L160.4,666.7C159.4,666.3 158.3,665.9 157.5,666.5C157.253,666.664 157.074,666.913 157,667.2H157.8L163.3,667C163.3,666.6 163.2,666.1 163.2,665.6C163.117,665.273 163.084,664.936 163.1,664.6L164.1,664.9C165.2,665.1 166.3,665.4 167,664.7C167.7,664 167.5,662.8 167.2,661.7C167.086,661.378 167.019,661.041 167,660.7H168C169.1,660.9 170.3,661 170.9,660.2C171.5,659.4 171.1,658.3 170.6,657.2L170.3,656.3H171.3C172.4,656.3 173.6,656.2 174.1,655.3C174.6,654.4 174,653.4 173.4,652.4C173.175,652.136 173.005,651.83 172.9,651.5L173.9,651.3C175,651.1 176.1,650.9 176.5,649.9C176.9,648.9 176,648 175.3,647.2L174.7,646.4C174.98,646.226 175.283,646.092 175.6,646C176.7,645.6 177.8,645.2 178,644.2C178.2,643.2 177.3,642.4 176.4,641.7L175.7,641L176.6,640.4C177.5,639.9 178.6,639.4 178.6,638.3C178.6,637.2 177.7,636.8 176.8,636.2Z"/>
+    <path android:fillColor="#00000000" android:pathData="M386.9,494.1L391.8,495.8" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#2ad17d" android:pathData="M85,620.3C80.3,618 74.3,619.2 65.5,624.4C68.726,628.161 72.165,631.733 75.8,635.1C74.4,645.3 71.1,650.9 67.8,657.9C64.5,664.9 68,669.4 73.7,670.2C79.4,671 82.4,669.1 86.6,662.5C89.387,657.994 91.193,652.951 91.9,647.7C92.333,644.552 92.534,641.377 92.5,638.2C92.5,628.4 90.1,622.7 85,620.3Z"/>
+    <path android:fillColor="#2ad17d" android:pathData="M91.4,633.7C98.3,632.8 102.9,632.1 106.2,636.5C109.5,640.9 109.4,645.9 107.6,654.8C105.8,663.7 101.4,673.1 94.5,672.4C87.6,671.7 85.1,667.8 87.6,657.8C89.311,649.843 90.58,641.797 91.4,633.7Z"/>
+    <path android:fillColor="#2ad17d" android:pathData="M106.2,644C111.4,643.9 117.6,643.6 119.3,649.1C121,654.6 119.5,662 116.1,667.7C112.7,673.4 108,674.9 104.6,672.8C101.2,670.7 101,669 103.8,661.6C106.6,654.2 107.2,651 106.2,644Z"/>
+    <path android:fillColor="#2ad17d" android:pathData="M139.2,657.7C134.2,657.3 124.9,657.3 118.4,656.9L116.7,660.1C126.214,663.541 136.126,665.759 146.2,666.7C148.8,661.5 145.8,658.1 139.2,657.7Z"/>
+    <path android:fillColor="#00000000" android:pathData="M87.1,661.5C91.536,652.874 93.41,643.157 92.5,633.5" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M108.8,644.8C108.7,654.1 107.1,661.6 102.6,667.8" android:strokeColor="#000000" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M202.4,547.4C204.3,541.1 210.6,534.3 213.5,532.5" android:strokeColor="#039c78" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#00000000" android:pathData="M209.2,510.1L204.4,507.3" android:strokeColor="#039c78" android:strokeWidth="2.4503" android:strokeLineCap="round"/>
+    <path android:fillColor="#91ffad" android:pathData="M125,423.3C121.165,420.806 117.901,417.53 115.419,413.687C112.938,409.844 111.296,405.521 110.6,401L108.3,385.4C108.251,385.011 108.061,384.654 107.766,384.396C107.471,384.138 107.092,383.997 106.7,384C106.319,383.999 105.952,384.143 105.673,384.403C105.395,384.663 105.225,385.02 105.2,385.4L102.8,401C102.123,405.527 100.488,409.858 98.005,413.703C95.522,417.548 92.247,420.82 88.4,423.3L86.4,424.6C86.174,424.73 85.988,424.92 85.865,425.15C85.741,425.38 85.684,425.64 85.7,425.9C85.711,426.155 85.78,426.405 85.901,426.63C86.023,426.855 86.193,427.05 86.4,427.2L88.4,428.5C92.265,430.96 95.553,434.227 98.038,438.076C100.523,441.924 102.148,446.265 102.8,450.8L105.2,466.4C105.249,466.762 105.428,467.094 105.704,467.334C105.98,467.573 106.334,467.703 106.7,467.7C107.077,467.707 107.444,467.58 107.737,467.342C108.03,467.104 108.229,466.771 108.3,466.4L110.6,450.8C111.284,446.289 112.923,441.975 115.406,438.147C117.889,434.319 121.16,431.064 125,428.6L127,427.3C127.219,427.162 127.398,426.97 127.521,426.742C127.644,426.514 127.705,426.259 127.7,426C127.729,425.738 127.677,425.473 127.552,425.241C127.427,425.009 127.235,424.82 127,424.7L125,423.3Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M401.3,86.5C397.753,84.236 394.736,81.232 392.458,77.694C390.18,74.155 388.693,70.166 388.1,66L385.9,51.7C385.854,51.354 385.689,51.035 385.434,50.798C385.178,50.561 384.848,50.42 384.5,50.4C384.152,50.42 383.822,50.561 383.566,50.798C383.311,51.035 383.146,51.354 383.1,51.7L380.9,66C380.282,70.158 378.785,74.137 376.509,77.672C374.233,81.207 371.23,84.216 367.7,86.5L365.8,87.7C365.608,87.834 365.452,88.014 365.347,88.223C365.242,88.433 365.192,88.666 365.2,88.9C365.192,89.134 365.242,89.367 365.347,89.576C365.452,89.786 365.608,89.966 365.8,90.1L367.7,91.3C371.23,93.584 374.233,96.593 376.509,100.128C378.785,103.662 380.282,107.642 380.9,111.8L383.1,126.1C383.149,126.436 383.317,126.742 383.575,126.963C383.832,127.184 384.161,127.303 384.5,127.3C384.839,127.303 385.168,127.184 385.426,126.963C385.683,126.742 385.852,126.436 385.9,126.1L388.1,111.8C388.693,107.634 390.18,103.645 392.458,100.106C394.736,96.568 397.753,93.564 401.3,91.3L403.2,90.1C403.393,89.966 403.548,89.786 403.653,89.576C403.758,89.367 403.809,89.134 403.8,88.9C403.809,88.666 403.758,88.433 403.653,88.223C403.548,88.014 403.393,87.834 403.2,87.7L401.3,86.5Z"/>
+    <path android:fillColor="#808aff" android:pathData="M508.3,517.1C506.193,515.767 504.398,513.996 503.035,511.909C501.672,509.821 500.773,507.465 500.4,505L499.2,496.5C499.139,496.306 499.02,496.134 498.86,496.009C498.699,495.884 498.504,495.811 498.3,495.8C498.104,495.798 497.915,495.869 497.767,495.998C497.62,496.127 497.525,496.306 497.5,496.5L496.2,505C495.845,507.459 494.964,509.812 493.619,511.9C492.273,513.988 490.493,515.761 488.4,517.1L487.3,517.8C487.184,517.878 487.087,517.981 487.017,518.103C486.948,518.224 486.908,518.36 486.9,518.5C486.886,518.644 486.918,518.788 486.989,518.913C487.061,519.039 487.169,519.139 487.3,519.2L488.4,519.9C490.487,521.269 492.261,523.063 493.605,525.166C494.949,527.268 495.834,529.631 496.2,532.1L497.5,540.6C497.525,540.794 497.62,540.973 497.767,541.102C497.915,541.231 498.104,541.302 498.3,541.3C498.504,541.289 498.699,541.216 498.86,541.091C499.02,540.966 499.139,540.794 499.2,540.6L500.4,532.1C500.784,529.625 501.687,527.259 503.048,525.157C504.409,523.055 506.199,521.263 508.3,519.9L509.4,519.2C509.523,519.129 509.624,519.027 509.695,518.904C509.765,518.781 509.801,518.642 509.8,518.5C509.744,518.23 509.604,517.985 509.4,517.8L508.3,517.1Z"/>
+    <path android:fillColor="#66bcff" android:pathData="M467.6,426.6C526.805,426.6 574.8,378.605 574.8,319.4C574.8,260.195 526.805,212.2 467.6,212.2C408.395,212.2 360.4,260.195 360.4,319.4C360.4,378.605 408.395,426.6 467.6,426.6Z"/>
+    <path android:fillColor="#66bcff" android:pathData="M467.6,426.6C526.805,426.6 574.8,378.605 574.8,319.4C574.8,260.195 526.805,212.2 467.6,212.2C408.395,212.2 360.4,260.195 360.4,319.4C360.4,378.605 408.395,426.6 467.6,426.6Z"/>
+    <path android:fillColor="#66bcff" android:pathData="M467.6,426.6C526.805,426.6 574.8,378.605 574.8,319.4C574.8,260.195 526.805,212.2 467.6,212.2C408.395,212.2 360.4,260.195 360.4,319.4C360.4,378.605 408.395,426.6 467.6,426.6Z"/>
+    <path android:fillColor="#00000000" android:pathData="M467.6,435.9C531.941,435.9 584.1,383.741 584.1,319.4C584.1,255.059 531.941,202.9 467.6,202.9C403.259,202.9 351.1,255.059 351.1,319.4C351.1,383.741 403.259,435.9 467.6,435.9Z" android:strokeColor="#29cc7a" android:strokeWidth="6.8833"/>
+    <path android:fillColor="#eb459f" android:pathData="M388.5,352.6C381.064,352.601 373.923,355.507 368.6,360.7C375.858,378.107 387.587,393.286 402.6,404.7C407.872,401.582 411.977,396.821 414.284,391.146C416.591,385.472 416.974,379.198 415.374,373.285C413.774,367.372 410.279,362.147 405.425,358.411C400.571,354.675 394.625,352.634 388.5,352.6V352.6Z"/>
+    <path android:fillColor="#bf0f76" android:pathData="M377.1,361.6C377.4,363.4 382.4,365.8 389.6,366.8C396.8,367.8 402.3,367.1 403.2,365.4C406.1,359.3 409,351.8 410.2,348.3C411.4,344.8 409.1,339.5 395.9,338.5C382.7,337.5 378.5,339.3 376.4,342.1C374.3,344.9 375.1,352 377.1,361.6Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M419.2,293.9C416.8,293.6 414.1,294.6 410.8,301.7C411.2,292.8 411,283.9 410.9,279.7C410.8,275.5 409,274.1 406.7,273.9C406.067,273.831 405.426,273.892 404.817,274.078C404.207,274.265 403.643,274.573 403.156,274.985C402.67,275.396 402.272,275.902 401.987,276.472C401.703,277.042 401.537,277.664 401.5,278.3C401.2,281.7 400.9,291.9 400.8,295.3C400.7,298.7 400.5,299.3 400.1,299.3C399.7,299.3 399.1,298.2 398.5,295.9C397.9,293.6 395.4,287 394.2,284.2C391.9,279 391.3,275.8 384.3,277.3C377.3,278.8 371.5,284.9 369.8,289.1C368.1,293.3 370.4,296.8 375.6,309.6C371.6,326.3 372,328.7 374.6,332.1C377.2,335.5 383.2,335.3 393.1,334.6C414.8,333.2 414.6,331.8 417,322.3C419,314.5 420.8,304.9 421.4,301.6C422,298.3 422.2,294.3 419.2,293.9Z"/>
+    <path android:fillColor="#000000" android:pathData="M407.1,309.9C407.3,309.877 407.489,309.799 407.648,309.676C407.807,309.552 407.929,309.388 408,309.2C408.803,306.62 409.737,304.084 410.8,301.6C410.9,300 410.9,298.5 411,296.9C408.998,300.413 407.388,304.135 406.2,308C396.6,309.5 391.1,314.3 389.2,323.2C389.171,323.332 389.169,323.468 389.194,323.6C389.219,323.732 389.27,323.858 389.345,323.97C389.419,324.082 389.516,324.178 389.629,324.252C389.741,324.326 389.868,324.376 390,324.4H390.2C390.434,324.405 390.662,324.327 390.845,324.181C391.028,324.035 391.154,323.829 391.2,323.6C393,315.4 397.9,311.2 407.1,309.9Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M386.2,333.3C386,337.8 386.1,344 386.1,344L402.8,345.1L403.8,330.8L386.2,333.3Z"/>
+    <path android:fillColor="#eb459f" android:pathData="M455.4,336.3C431,340.9 425.2,360.9 427.2,383.8C416.3,390.8 412.3,399 412.4,411.3C431.039,422.504 452.647,427.768 474.351,426.393C496.054,425.017 516.825,417.067 533.9,403.6L538.3,342.7C538.3,342.7 479.9,331.7 455.4,336.3Z"/>
+    <path android:fillColor="#eb459f" android:pathData="M416.6,366.8C402.8,371.4 394.3,381.5 392.2,395.6C405.354,408.672 421.693,418.082 439.6,422.9L452.9,335.3C433.1,332.7 415.5,343.3 416.6,366.8Z"/>
+    <path android:fillColor="#000000" android:pathData="M458.9,350.6C447.4,327.6 441.4,325.3 442.5,318.2C443.6,311.1 459.5,310.7 480.4,310.8C501.3,310.9 479.4,349.4 479.4,349.4L458.9,350.6Z"/>
+    <path android:fillColor="#00000000" android:pathData="M455.4,336.3C431,340.9 425.2,360.9 427.2,383.8C417,390.4 412.8,398.1 412.4,409.2" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#00000000" android:pathData="M489,343.9C464,355.1 467.3,363.2 474.7,384.7C469.121,389.753 464.959,396.175 462.626,403.332C460.293,410.488 459.87,418.13 461.4,425.5" android:strokeColor="#ffffff" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="@drawable/res_2131230791_img_landing_splash__1" android:pathData="M517.8,207.7C525.2,198.2 535,192.8 544.2,195.3C553.4,197.8 555.5,202.9 560.4,231.3C577.6,240.5 579.8,242.9 566,262.7C578.7,275.2 580.3,281.6 564,295.7L546.1,296.6C530.7,283.9 528,283.3 535.4,265C511.2,236 514.3,230.6 517.8,207.7Z"/>
+    <path android:fillColor="#00000000" android:pathData="M541.1,266.5C541.1,263.1 542.9,260.3 545,260.3C547.1,260.3 548.9,263.1 548.9,266.5" android:strokeColor="#ffffff" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#4452f2" android:pathData="M536.3,242.3C541.823,242.3 546.3,237.823 546.3,232.3C546.3,226.777 541.823,222.3 536.3,222.3C530.777,222.3 526.3,226.777 526.3,232.3C526.3,237.823 530.777,242.3 536.3,242.3Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M532.5,227.6C538.023,227.6 542.5,223.123 542.5,217.6C542.5,212.077 538.023,207.6 532.5,207.6C526.977,207.6 522.5,212.077 522.5,217.6C522.5,223.123 526.977,227.6 532.5,227.6Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M519.7,223.2C525.223,223.2 529.7,218.723 529.7,213.2C529.7,207.677 525.223,203.2 519.7,203.2C514.177,203.2 509.7,207.677 509.7,213.2C509.7,218.723 514.177,223.2 519.7,223.2Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M509.8,217C513.169,217 515.9,214.269 515.9,210.9C515.9,207.531 513.169,204.8 509.8,204.8C506.431,204.8 503.7,207.531 503.7,210.9C503.7,214.269 506.431,217 509.8,217Z"/>
+    <path android:fillColor="@drawable/res_2131230792_img_landing_splash__2" android:pathData="M476,356.2C495.7,356.2 511.4,345.9 520.8,337.2C527.182,331.276 531.316,323.326 532.5,314.7C534.1,301.8 536.7,280 538.1,257.7C540.3,223 518.6,209.1 498,211C477.4,212.9 460.5,223.7 456.7,257.7C432.9,257.7 424.3,261 422.7,269.8C421.1,278.6 431.6,284.3 447.2,290.9C450.8,292.5 451.3,292.8 451.9,294.9C452.5,297 454.9,308.1 469.2,319.7C465.6,328.5 464.7,335.4 465.7,345.3C466.7,355.2 472,356.2 476,356.2Z"/>
+    <path android:fillColor="#bf0f76" android:pathData="M474.8,349.7C466.4,328.5 462.3,325.1 446.8,313.6C444.4,314.7 442.9,316.2 442.5,318.2C441.4,325.3 447.4,327.6 458.9,350.6L474.8,349.7Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M530.8,250C550.4,248.5 555.5,249.4 556.5,254.1C557.5,258.8 551.8,262.7 531.8,273.1L530.8,250Z"/>
+    <path android:fillColor="#c40655" android:pathData="M488.5,278.5C487.4,281.6 487.5,286.7 487.5,292.4C487.5,298.1 488.1,305.3 481.2,305.9C474.3,306.5 470.6,298.3 468.7,294.8C466.8,291.3 466.5,291 465.5,290.4C464.5,289.8 460.5,287.8 456.9,286C453.3,284.2 451.2,282.2 452.2,281.1C453.2,280 462.6,282 472.7,283C482.8,284 484.6,280.7 487.5,277.3C488.1,276.6 489.2,276.6 488.5,278.5Z"/>
+    <path android:fillColor="#000000" android:pathData="M487.5,277.3C485.4,279.8 483.8,282.4 478.9,283.1C478.779,283.693 478.712,284.295 478.7,284.9C478.2,290.3 480.8,294.7 484.4,294.7C485.555,294.672 486.673,294.288 487.6,293.6C487.518,293.206 487.484,292.803 487.5,292.4C487.5,286.7 487.4,281.6 488.5,278.5C489.6,275.4 488.1,276.6 487.5,277.3Z"/>
+    <path android:fillColor="#00000000" android:pathData="M486,270C488.745,272.936 492.134,275.195 495.9,276.6" android:strokeColor="#ffae00" android:strokeWidth="2.5" android:strokeLineCap="round"/>
+    <path android:fillColor="#4452f2" android:pathData="M471.2,299.3C473.3,302.7 476.6,306.3 481.2,305.9C488.1,305.3 487.6,298 487.5,292.4V286.5C480.3,285.1 472.3,288.6 471.2,299.3Z"/>
+    <path android:fillColor="#00000000" android:pathData="M484.7,285.2C481.4,287.2 477.4,292.1 477.1,299.5" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#00000000" android:pathData="M460.1,257.2C461.1,250.5 462.7,248.2 464,247.9C465.3,247.6 465.1,250.5 464.7,256.5" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#00000000" android:pathData="M492.7,256.5C494.9,246.7 498.2,246.1 499.6,246.7C501,247.3 502,249.9 501.7,257.2" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#fa80ba" android:pathData="M513.203,266.202C516.684,263.664 517.87,259.363 515.852,256.597C513.835,253.83 509.378,253.645 505.897,256.183C502.416,258.721 501.23,263.022 503.248,265.788C505.265,268.555 509.722,268.74 513.203,266.202Z"/>
+    <path android:fillColor="#00000000" android:pathData="M548.9,266.5C548.9,269.8 547.2,272.6 545,272.6C542.8,272.6 541.1,269.8 541.1,266.5" android:strokeColor="#ffffff" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#ffffff" android:pathData="M542.9,287L540,281.6C539.9,281.343 539.9,281.057 540,280.8L544.1,275.1C544.162,274.996 544.25,274.911 544.355,274.851C544.461,274.792 544.579,274.761 544.7,274.761C544.821,274.761 544.94,274.792 545.045,274.851C545.15,274.911 545.238,274.996 545.3,275.1L547.8,280.4C547.853,280.491 547.88,280.595 547.88,280.7C547.88,280.805 547.853,280.909 547.8,281L544.1,287C544.038,287.104 543.95,287.189 543.845,287.249C543.74,287.308 543.621,287.339 543.5,287.339C543.379,287.339 543.261,287.308 543.155,287.249C543.05,287.189 542.962,287.104 542.9,287Z"/>
+    <path android:fillColor="#4452f2" android:pathData="M564,295.7L546.1,296.6C543.7,298.1 544.6,299 546.1,300.5L563.9,299.9C566.6,297.5 565.8,297.1 564,295.7Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M563.9,299.9C565.1,304.8 565.7,308.2 566,310.2C566.3,312.2 565.4,313.6 555.1,313.9C544.8,314.2 545.2,312.5 545.3,310C545.4,307.5 546.1,300.5 546.1,300.5L563.9,299.9Z"/>
+    <path android:fillColor="#bf0f76" android:pathData="M533.5,334.3C538.7,315.2 540.4,309.1 529.7,309.6C516.231,310.287 502.81,311.723 489.5,313.9C479.7,315.7 479.9,317 484.7,349.4L533.5,334.3Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M426.4,330C426.074,329.995 425.751,330.062 425.455,330.196C425.158,330.331 424.895,330.53 424.684,330.779C424.474,331.027 424.321,331.32 424.237,331.635C424.154,331.95 424.141,332.28 424.2,332.6L430.1,375.2C430.17,375.827 430.366,376.433 430.675,376.983C430.984,377.533 431.401,378.015 431.9,378.4C433.5,379.7 436.5,381.1 442,381.1C447.5,381.1 450.5,379.7 452,378.4C452.514,378.02 452.947,377.541 453.273,376.992C453.599,376.442 453.813,375.833 453.9,375.2L459.8,332.6C459.842,332.282 459.817,331.959 459.727,331.651C459.637,331.343 459.483,331.058 459.276,330.813C459.069,330.568 458.813,330.369 458.524,330.229C458.236,330.089 457.921,330.011 457.6,330H426.4Z"/>
+    <path android:fillColor="#00000000" android:pathData="M451.9,337.9C458.3,337.5 461.2,337.4 462.8,339.9C464.4,342.4 463.3,346.4 461.9,353.6C460.5,360.8 459,359.6 450.8,360.1" android:strokeColor="#ffffff" android:strokeWidth="5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#000000" android:pathData="M503.657,234.909C503.772,234.089 502.048,233.168 499.806,232.853C497.563,232.538 495.652,232.948 495.537,233.768C495.422,234.588 497.146,235.509 499.388,235.824C501.631,236.139 503.542,235.73 503.657,234.909Z"/>
+    <path android:fillColor="#000000" android:pathData="M465.984,238.162C466.084,237.451 464.923,236.7 463.392,236.485C461.861,236.27 460.538,236.672 460.438,237.383C460.338,238.094 461.499,238.845 463.03,239.06C464.561,239.275 465.884,238.873 465.984,238.162Z"/>
+    <path android:fillColor="#eb459f" android:pathData="M524,454.6C540.348,454.6 553.6,441.348 553.6,425C553.6,408.652 540.348,395.4 524,395.4C507.652,395.4 494.4,408.652 494.4,425C494.4,441.348 507.652,454.6 524,454.6Z"/>
+    <path android:fillColor="#eb459f" android:pathData="M472.8,349.4C504.6,337.1 525.1,329.3 539.6,327C546.368,325.86 553.321,326.729 559.6,329.5C581.1,339 575.7,361.6 568.5,372.5C582,381.8 588.7,399 574.8,418.7C586.8,428.9 594,451.2 578.5,464.7C563,478.2 539.6,474.1 530,453.5L472.8,349.4Z"/>
+    <path android:fillColor="#bf0f76" android:pathData="M498.4,415.8C500.1,416.9 505.6,414.9 511.7,410.3C517.8,405.7 521.3,400.8 520.7,398.9C518.2,392.2 514.7,384.4 513,380.9C511.3,377.4 505.5,375.3 495,384.5C484.5,393.7 482.6,398.3 483.2,401.9C483.8,405.5 489.8,410.3 498.4,415.8Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M491.5,377.7C501.5,366.4 505.5,358.5 506.1,355C506.7,351.5 506.9,348.4 498.6,340.8C490.3,333.2 485.6,330.9 481.5,331.3C477.4,331.7 473.5,336.2 470,345.8C469.4,347.4 475.4,351.1 473.7,351.6C463.7,354.6 460.9,367.8 459.4,373.5C457.9,379.2 457.6,384 465.1,388.4C472.6,392.8 475.7,395.4 491.5,377.7Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M478.1,340.5C464.9,340.9 458.9,341.9 456,343.3C453.1,344.7 453.3,347.6 453.7,350.4C454.1,353.2 454.7,354.2 461.7,354.5C468.7,354.8 478.1,354.5 478.1,354.5V340.5Z"/>
+    <path android:fillColor="#ffe75c" android:pathData="M482.3,385.9L489.9,395.1L503.2,384.5L493.9,371L482.3,385.9Z"/>
+    <path android:fillColor="#000000" android:pathData="M378.4,279.7L376.2,281.3C375.913,281.513 375.7,281.812 375.593,282.153C375.485,282.494 375.487,282.86 375.6,283.2C376.3,287.2 379.2,293.7 385.1,305C385.198,305.15 385.331,305.275 385.488,305.362C385.645,305.449 385.821,305.496 386,305.5H386.4C386.527,305.458 386.642,305.389 386.739,305.297C386.835,305.205 386.91,305.093 386.958,304.968C387.006,304.844 387.025,304.711 387.015,304.578C387.005,304.445 386.966,304.316 386.9,304.2C376.6,284.3 376.6,281 378.4,279.7Z"/>
+    <path android:fillColor="#00000000" android:pathData="M480.3,341.2C474.9,344.1 474.4,349.1 475.4,353.5C469.9,356 468.6,359 469.5,365.8C466.5,367.5 464,369.7 465.1,375.1" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#000000" android:pathData="M482.8,386.5L487.6,382.1L485.9,390.2L482.8,386.5Z"/>
+    <path android:fillColor="#000000" android:pathData="M386.1,335L399.9,334.1L386.1,341.5V335Z"/>
+    <path android:fillColor="#eb459f" android:pathData="M376,355.7L405.9,359.4L405.8,369.3L374.6,367.3L376,355.7Z"/>
+    <path android:fillColor="#00000000" android:pathData="M552.2,416.1C550.323,410.093 546.573,404.843 541.499,401.119C536.426,397.395 530.294,395.391 524,395.4" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#00000000" android:pathData="M534.8,373.2C529.959,379.371 527.765,387.212 528.7,395" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+    <path android:fillColor="#00000000" android:pathData="M530.8,379.9L528.1,375.1" android:strokeColor="#000000" android:strokeWidth="2.238" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml b/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml
index db00b91729..4da09d331d 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml
@@ -2,11 +2,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="301dp" android:width="375dp" android:alpha="0.1" android:viewportWidth="375" android:viewportHeight="301">
     <group>
         <clip-path android:pathData="M0,0h502v301h-502z M 0,0"/>
-        <path android:fillColor="@drawable/res_2131230790_img_nitro_pattern__0" android:pathData="M-27.6802 230.729C-34.4561 241.24 -39.8533 256.352 -34.8695 268.502C-30.809 278.402 -21.6316 281.992 -13.3836 284.671C-5.02671 287.386 3.33064 290.101 11.6884 292.815C19.6665 295.406 28.5982 297.836 35.6808 292.316C41.4873 287.79 44.5471 278.928 46.2119 270.266C48.2807 259.503 48.7358 248.197 47.5422 237.202C46.4343 227.001 43.7454 216.714 38.2428 209.445C32.678 202.092 24.6426 198.539 16.7923 198.663C-0.534393 198.936 -16.8352 213.906 -27.6802 230.729Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230791_img_nitro_pattern__1" android:pathData="M310.149 1.87836C312.236 10.3679 317.672 16.6476 323.366 21.4193C338.929 34.4632 358.247 39.8166 371.43 56.8553C377.857 65.1615 382.352 75.702 386.414 86.3104C389.157 93.4742 391.79 100.833 395.746 106.92C403.119 118.27 415.012 124.142 426.192 121.955C437.372 119.768 447.475 109.592 452.06 95.9032C455.088 86.8659 455.767 76.7647 455.813 66.8779C455.93 41.9824 452.246 17.0673 445.049 -5.92896C444.9 -6.40583 444.746 -6.8821 444.593 -7.35778H309.255C309.148 -4.23283 309.415 -1.10668 310.149 1.87836Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230792_img_nitro_pattern__2" android:pathData="M298.727 195.559C292.439 191.296 286.422 185.578 282.952 177.432C278.673 167.389 278.837 155.237 278.457 143.719C278.077 132.202 276.668 119.689 270.326 111.787C265.015 105.17 257.213 103.201 249.932 103.771C236.134 104.852 223.334 113.88 212.374 125.028C203.794 133.756 191.594 146.543 181.271 161.292C168.776 179.144 159.03 199.87 161.776 219.75C163.79 234.325 172.611 246.014 182.743 252.311C192.876 258.608 204.251 260.319 215.415 261.404C250.328 264.795 285.868 262.809 319.56 250.231C330.611 246.105 347.886 232.013 337.48 213.807C330.265 201.183 309.198 202.658 298.727 195.559Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230793_img_nitro_pattern__3" android:pathData="M155.541 -15.3248C148.298 -25.0966 137.418 -28.1121 127.171 -30.0672C72.5229 -40.4937 12.8167 -27.4737 -31.4119 18.7266C-46.2977 34.2764 -59.7173 54.1777 -64.0877 78.5728C-67.14 95.6097 -65.9889 118.247 -56.5985 132.187C-56.1366 132.873 -55.6624 133.52 -55.1771 134.131C-42.3872 150.233 -21.6233 141.258 -5.70481 144.538C4.67279 146.676 15.0848 148.865 25.5859 149.136C32.4327 149.312 39.395 148.642 45.8325 145.556C50.9427 143.106 55.5926 139.191 59.8411 134.711C81.7423 111.614 92.7611 74.523 113.593 49.7603C125.54 35.5585 139.28 29.3084 153.077 19.8163C163.084 12.9314 164.043 -3.85456 155.541 -15.3248Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230794_img_nitro_pattern__4" android:pathData="M242.18 29.9086C254.381 32.6766 270.436 32.5765 280.157 23.741C288.077 16.5417 288.314 6.6956 288.013 -1.96615C287.707 -10.7424 287.401 -19.519 287.095 -28.2959C286.803 -36.674 286.033 -45.8926 278.42 -50.6555C272.178 -54.5603 262.798 -54.4026 254.084 -53.0035C243.255 -51.2649 232.469 -47.8255 222.538 -42.9441C213.325 -38.4149 204.572 -32.3715 199.618 -24.7178C194.608 -16.9775 194.015 -8.21646 196.817 -0.886903C202.999 15.2908 222.651 25.4783 242.18 29.9086Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230793_img_nitro_pattern__0" android:pathData="M-27.6802 230.729C-34.4561 241.24 -39.8533 256.352 -34.8695 268.502C-30.809 278.402 -21.6316 281.992 -13.3836 284.671C-5.02671 287.386 3.33064 290.101 11.6884 292.815C19.6665 295.406 28.5982 297.836 35.6808 292.316C41.4873 287.79 44.5471 278.928 46.2119 270.266C48.2807 259.503 48.7358 248.197 47.5422 237.202C46.4343 227.001 43.7454 216.714 38.2428 209.445C32.678 202.092 24.6426 198.539 16.7923 198.663C-0.534393 198.936 -16.8352 213.906 -27.6802 230.729Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230794_img_nitro_pattern__1" android:pathData="M310.149 1.87836C312.236 10.3679 317.672 16.6476 323.366 21.4193C338.929 34.4632 358.247 39.8166 371.43 56.8553C377.857 65.1615 382.352 75.702 386.414 86.3104C389.157 93.4742 391.79 100.833 395.746 106.92C403.119 118.27 415.012 124.142 426.192 121.955C437.372 119.768 447.475 109.592 452.06 95.9032C455.088 86.8659 455.767 76.7647 455.813 66.8779C455.93 41.9824 452.246 17.0673 445.049 -5.92896C444.9 -6.40583 444.746 -6.8821 444.593 -7.35778H309.255C309.148 -4.23283 309.415 -1.10668 310.149 1.87836Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230795_img_nitro_pattern__2" android:pathData="M298.727 195.559C292.439 191.296 286.422 185.578 282.952 177.432C278.673 167.389 278.837 155.237 278.457 143.719C278.077 132.202 276.668 119.689 270.326 111.787C265.015 105.17 257.213 103.201 249.932 103.771C236.134 104.852 223.334 113.88 212.374 125.028C203.794 133.756 191.594 146.543 181.271 161.292C168.776 179.144 159.03 199.87 161.776 219.75C163.79 234.325 172.611 246.014 182.743 252.311C192.876 258.608 204.251 260.319 215.415 261.404C250.328 264.795 285.868 262.809 319.56 250.231C330.611 246.105 347.886 232.013 337.48 213.807C330.265 201.183 309.198 202.658 298.727 195.559Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230796_img_nitro_pattern__3" android:pathData="M155.541 -15.3248C148.298 -25.0966 137.418 -28.1121 127.171 -30.0672C72.5229 -40.4937 12.8167 -27.4737 -31.4119 18.7266C-46.2977 34.2764 -59.7173 54.1777 -64.0877 78.5728C-67.14 95.6097 -65.9889 118.247 -56.5985 132.187C-56.1366 132.873 -55.6624 133.52 -55.1771 134.131C-42.3872 150.233 -21.6233 141.258 -5.70481 144.538C4.67279 146.676 15.0848 148.865 25.5859 149.136C32.4327 149.312 39.395 148.642 45.8325 145.556C50.9427 143.106 55.5926 139.191 59.8411 134.711C81.7423 111.614 92.7611 74.523 113.593 49.7603C125.54 35.5585 139.28 29.3084 153.077 19.8163C163.084 12.9314 164.043 -3.85456 155.541 -15.3248Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230797_img_nitro_pattern__4" android:pathData="M242.18 29.9086C254.381 32.6766 270.436 32.5765 280.157 23.741C288.077 16.5417 288.314 6.6956 288.013 -1.96615C287.707 -10.7424 287.401 -19.519 287.095 -28.2959C286.803 -36.674 286.033 -45.8926 278.42 -50.6555C272.178 -54.5603 262.798 -54.4026 254.084 -53.0035C243.255 -51.2649 232.469 -47.8255 222.538 -42.9441C213.325 -38.4149 204.572 -32.3715 199.618 -24.7178C194.608 -16.9775 194.015 -8.21646 196.817 -0.886903C202.999 15.2908 222.651 25.4783 242.18 29.9086Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
         <path android:fillColor="#00000000" android:pathData="M257.411 -20.5892C265.142 20.2152 252.288 22.8779 225.827 50.6683C218.239 58.637 216.023 69.202 208.461 77.4474C198.256 88.573 167.839 104.686 174.719 124.554C175.336 126.336 177.41 127.39 179.185 128.027C183.98 129.747 189.031 130.747 194.07 131.497C220.727 135.463 224.061 116.293 235.752 98.7682C237.68 95.8769 243.078 94.4827 246.173 95.7948C272.338 106.888 260.209 121.226 272.968 133.976C286.612 147.612 301.905 136.042 309.19 123.564C311.201 120.12 311.2 115.987 309.19 111.166C305.884 103.238 288.615 89.2123 299.268 78.9341C313.516 65.1869 330.075 61.6259 348.887 59.5938C357.269 58.6885 374.886 55.0436 367.247 45.7091C349.697 24.2655 313.603 60.4918 311.175 22.4025C310.07 5.08229 327.399 -1.62873 324.574 -19.2515C322.609 -31.5125 303.206 -26.1313 297.777 -20.2417C284.836 -6.20164 290.921 9.34213 288.349 26.3715C286.751 36.9556 286.665 48.1914 277.93 63.5627C269.195 78.9341 257.411 71.4299 263.043 51.6612C268.475 32.5918 274.686 13.8359 279.418 -5.3668C280.169 -8.41548 280.475 -11.8293 279.418 -14.7861C277.89 -19.0612 274.455 -22.3912 271.974 -26.1938M-21.458 91.8494C-8.49512 62.3039 11.4903 73.9239 45.2086 75.9581C55.4227 76.5743 60.1926 82.3901 72.4997 77.4474C84.8472 72.4885 96.0179 64.6374 106.241 56.124C122.791 42.341 121.289 3.04734 136.013 -14.2923C138.36 -17.0562 141.121 -19.4641 143.954 -21.7284C148.579 -25.4256 153.366 -28.9369 158.344 -32.1433C160.831 -33.7448 163.483 -35.1542 166.282 -36.1096C170.307 -37.483 174.462 -38.6162 178.688 -39.0856C181.98 -39.4511 185.336 -39.0849 188.611 -38.5892C190.836 -38.2522 193.244 -37.9286 195.063 -36.606C200.651 -32.5451 205.629 -27.672 210.445 -22.7213C211.476 -21.6615 212.214 -20.2174 212.43 -18.755C213.056 -14.4995 213.263 -10.1488 212.926 -5.86063C210.56 24.2894 187.652 43.4581 163.801 57.6107C149.555 66.0641 131.676 71.227 121.625 85.38C108.431 103.959 131.537 138.704 121.128 154.307C110.863 169.694 86.752 170.982 71.0094 169.184C66.8528 168.71 63.2344 165.874 59.1025 165.218C42.3243 162.557 25.4021 160.839 8.48682 159.266C-14.9961 157.083 -32.0616 176.279 -45.1017 148.357C-49.6747 138.566 -24.2402 130.067 -21.2854 129.514C-3.16055 126.117 33.3061 136.355 45.7028 131.993C51.1183 130.088 53.0554 123.158 57.1155 119.101C59.0343 117.184 61.0742 115.21 63.5683 114.142C72.5747 110.285 94.0798 110.102 89.8657 94.3055C89.0993 91.4326 84.9169 90.9712 78.2805 92.3223C66.7233 94.6754 55.304 97.7441 44.0425 101.248C37.7373 103.21 31.6622 105.885 25.6829 108.687C14.5527 113.901 -22.9457 133.896 -22.9457 108.19L-21.458 91.8494Z" android:strokeColor="#ffffff" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0.2"/>
         <path android:fillColor="#00000000" android:pathData="M-20.7312 191.498C-0.494293 189.68 20.4215 180.542 39.9795 186.045C47.5631 188.179 31.3975 199.669 25.0946 204.393C20.9683 207.485 -3.67696 212.662 -8.64918 213.318C-12.1506 213.78 -16.4866 215.673 -19.2435 213.467C-23.2401 210.269 -26.335 192.468 -17.0838 192.468M384.396 -5.3668C379.765 3.72504 372.978 12.0114 370.502 21.9087C369.819 24.639 373.59 26.8328 375.959 28.3546C380.692 31.3952 387.67 31.037 391.343 35.2969C397.475 42.4094 400.904 51.6386 403.746 60.5867C404.492 62.934 399.488 69.1916 397.793 70.5051C388.158 77.9729 342.876 105.936 366.036 125.051C371.297 129.393 378.548 129.613 384.89 130.01C397.607 130.805 417.757 126.327 420.122 110.67C421.061 104.45 420.513 98.087 421.115 91.8259C421.342 89.4702 421.515 86.9855 422.603 84.8835C428.738 73.0332 447.582 77.504 448.406 63.0663C448.997 52.7154 439.467 32.3295 443.444 27.8582C454.768 15.1252 493.278 14.6101 496.041 -9.3331C496.363 -12.1243 497.271 -15.2356 496.041 -17.7621C481.549 -47.5339 438.168 -36.2205 422.106 -15.2826C409.741 0.836828 427.158 17.9222 430.047 33.3138C432.442 46.0787 417.439 40.6956 413.175 34.3041C407.037 25.1047 406.506 18.5361 407.718 7.03116C409.012 -5.24426 419.479 -25.0718 402.086 -30.6565L384.396 -5.3668ZM42.981 -26.0423C32.8916 -18.3141 30.5039 -19.1249 26.2581 -11.1673C16.679 6.7863 26.5166 37.4345 45.1145 44.8678C63.2619 52.121 78.034 31.6383 91.2619 22.0576C97.335 17.6591 102.223 11.7946 108.134 7.18009C121.237 -3.04993 137.993 -8.49933 135.922 -28.5218C135.425 -33.3185 129.871 -35.7601 125.801 -34.9677C112.012 -32.2834 98.1444 -29.8217 84.6156 -26.0423C75.7248 -23.5585 74.3017 -7.75577 75.1874 -1.24895C78.5678 23.5823 54.5645 31.1747 55.4892 4.20667C56.119 -14.1632 74.0027 -30.0529 82.2834 -37.9438L42.981 -26.0423ZM12.4923 233.152C12.4923 233.152 31.7119 213.109 52.1896 216.119C61.8145 217.534 97.768 231.917 111.237 220.582C156.191 182.749 129.998 194.144 158.872 172.482C173.805 161.279 183.344 165.066 186.166 169.012C188.647 172.482 189.633 185.214 186.166 191.225C180.475 201.092 178.746 200.473 170.782 207.194C168.545 209.081 159.92 213.317 158.872 218.102C155.784 232.217 164.267 244.54 162.844 258.766C160.936 277.839 134.227 278.265 120.169 272.651C96.5754 263.229 84.5424 256.002 79.9774 256.783C61.8257 259.885 25.5358 276.586 8.52341 263.229C-10.3028 248.447 12.4923 233.152 12.4923 233.152ZM221.395 183.691C213.737 187.786 205.806 202.469 211.473 210.964C229.108 237.399 242.818 226.079 263.077 238.733C272.278 244.481 270.791 251.451 276.476 262.04C280.389 269.327 308.903 266.685 315.677 264.519C326.564 261.039 319.883 253.246 325.599 239.726C327.582 235.035 331.17 231.156 334.531 227.328C344.962 215.449 376.543 189.749 356.862 173.773C344.518 163.752 304.587 176.274 291.858 185.178C285.407 189.69 283.459 196.697 275.98 195.096C265.646 192.885 273.052 176.969 265.063 171.754C250.695 162.374 232.864 177.558 221.395 183.691ZM366.278 144.06C362.714 137.674 302.013 137.242 351.599 157.236C362.602 161.673 369.843 150.446 366.278 144.06ZM141.851 111.119C140.033 120.16 137.629 129.104 136.395 138.243C135.107 147.779 152.66 156.018 157.259 150.641C166.046 140.368 160.885 129.354 155.769 119.896C154.204 117.002 146.303 103.158 142.845 108.987L141.851 111.119Z" android:strokeColor="#ffffff" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0.2"/>
     </group>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml
index a319826efb..950f29d302 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="42dp" android:width="302dp" android:viewportWidth="302" android:viewportHeight="42">
-    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230795_img_plan_activated_dark__0" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230798_img_plan_activated_dark__0" android:strokeWidth="1"/>
     <path android:fillColor="#ffffff" android:pathData="M37.159,29.587C37.075,30.188 37.542,30.725 38.15,30.725H41.048C41.547,30.725 41.969,30.358 42.038,29.864L42.594,25.9C42.663,25.406 43.085,25.038 43.584,25.038H45.819C50.516,25.038 53.236,21.962 53.648,18.28C54.033,14.764 52.247,11.275 47.494,11.275H40.59C40.091,11.275 39.668,11.642 39.599,12.136L37.159,29.587ZM44.472,20.67C43.863,20.67 43.396,20.131 43.482,19.529L43.883,16.721C43.953,16.229 44.375,15.863 44.873,15.863H46.863C48.291,15.863 48.923,16.852 48.758,18.143C48.593,19.462 47.714,20.698 46.176,20.67H44.472Z"/>
     <path android:fillColor="#ffffff" android:pathData="M55.542,29.587C55.458,30.188 55.925,30.725 56.533,30.725H67.367C67.867,30.725 68.29,30.355 68.357,29.86L68.746,26.997C68.827,26.397 68.36,25.863 67.755,25.863H62.139C61.531,25.863 61.063,25.325 61.148,24.723L62.887,12.415C62.972,11.813 62.505,11.275 61.897,11.275H58.973C58.474,11.275 58.051,11.642 57.982,12.136L55.542,29.587Z"/>
     <path android:fillColor="#ffffff" android:pathData="M83.91,12.062C83.81,11.602 83.403,11.275 82.932,11.275H79.885C79.503,11.275 79.154,11.492 78.986,11.836L70.458,29.286C70.133,29.951 70.617,30.725 71.356,30.725H74.379C74.775,30.725 75.133,30.492 75.293,30.131L76.496,27.419C76.657,27.057 77.015,26.824 77.411,26.824H81.125C81.605,26.824 82.018,27.166 82.107,27.637L82.54,29.912C82.629,30.384 83.042,30.725 83.522,30.725H86.728C87.366,30.725 87.841,30.136 87.705,29.513L83.91,12.062ZM79.937,22.456C79.238,22.456 78.754,21.757 79.001,21.103L80.604,16.847C80.622,16.8 80.667,16.769 80.717,16.769V16.769C80.779,16.769 80.831,16.816 80.837,16.878L81.291,21.355C81.351,21.944 80.889,22.456 80.297,22.456H79.937Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml
index 73bc6cd602..0be8f0e4f0 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="42dp" android:width="302dp" android:viewportWidth="302" android:viewportHeight="42">
-    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230796_img_plan_activated_light__0" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230799_img_plan_activated_light__0" android:strokeWidth="1"/>
     <path android:fillColor="#060607" android:pathData="M37.159,29.587C37.075,30.188 37.542,30.725 38.15,30.725H41.048C41.547,30.725 41.969,30.358 42.038,29.864L42.594,25.9C42.663,25.406 43.085,25.038 43.584,25.038H45.819C50.516,25.038 53.236,21.962 53.648,18.28C54.033,14.764 52.247,11.275 47.494,11.275H40.59C40.091,11.275 39.668,11.642 39.599,12.136L37.159,29.587ZM44.472,20.67C43.863,20.67 43.396,20.131 43.482,19.529L43.883,16.721C43.953,16.229 44.375,15.863 44.873,15.863H46.863C48.291,15.863 48.923,16.852 48.758,18.143C48.593,19.462 47.714,20.698 46.176,20.67H44.472Z"/>
     <path android:fillColor="#060607" android:pathData="M55.542,29.587C55.458,30.188 55.925,30.725 56.533,30.725H67.367C67.867,30.725 68.29,30.355 68.357,29.86L68.746,26.997C68.827,26.397 68.36,25.863 67.755,25.863H62.139C61.531,25.863 61.063,25.325 61.148,24.723L62.887,12.415C62.972,11.813 62.505,11.275 61.897,11.275H58.973C58.474,11.275 58.051,11.642 57.982,12.136L55.542,29.587Z"/>
     <path android:fillColor="#060607" android:pathData="M83.91,12.062C83.81,11.602 83.403,11.275 82.932,11.275H79.885C79.503,11.275 79.154,11.492 78.986,11.836L70.458,29.286C70.133,29.951 70.617,30.725 71.356,30.725H74.379C74.775,30.725 75.133,30.492 75.293,30.131L76.496,27.419C76.657,27.057 77.015,26.824 77.411,26.824H81.125C81.605,26.824 82.018,27.166 82.107,27.637L82.54,29.912C82.629,30.384 83.042,30.725 83.522,30.725H86.728C87.366,30.725 87.841,30.136 87.705,29.513L83.91,12.062ZM79.937,22.456C79.238,22.456 78.754,21.757 79.001,21.103L80.604,16.847C80.622,16.8 80.667,16.769 80.717,16.769V16.769C80.779,16.769 80.831,16.816 80.837,16.878L81.291,21.355C81.351,21.944 80.889,22.456 80.297,22.456H79.937Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml
index 6efa610ccf..39da3ca299 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230797_img_premium_activated_tier_1_dark__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230800_img_premium_activated_tier_1_dark__0" android:strokeWidth="2"/>
     <path android:fillColor="#ffffff" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml
index bca0844702..bce868b279 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230798_img_premium_activated_tier_1_light__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230801_img_premium_activated_tier_1_light__0" android:strokeWidth="2"/>
     <path android:fillColor="#060607" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml
index 67bb7470f7..155c21b163 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230799_img_premium_activated_tier_2_dark__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230802_img_premium_activated_tier_2_dark__0" android:strokeWidth="2"/>
     <path android:fillColor="#ffffff" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml
index 670b2062b8..884b3f9c53 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230800_img_premium_activated_tier_2_light__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230803_img_premium_activated_tier_2_light__0" android:strokeWidth="2"/>
     <path android:fillColor="#060607" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml b/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml
index e2ee642be6..469637852b 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml
@@ -16,7 +16,7 @@
     <path android:fillColor="#cbd5e0" android:pathData="M43.5589,41.5195L43.5518,41.5266A4.66,4.66 0,0 1,36.9616 41.5266L30.0036,34.5687A4.66,4.66 90,0 1,30.0036 27.9784L30.0107,27.9713A4.66,4.66 90,0 1,36.6009 27.9713L43.5589,34.9293A4.66,4.66 0,0 1,43.5589 41.5195z"/>
     <path android:fillColor="#cbd5e0" android:pathData="M36.9618,48.1128L36.9547,48.1198A4.66,4.66 0,0 1,30.3645 48.1198L23.4066,41.1619A4.66,4.66 90,0 1,23.4066 34.5717L23.4136,34.5646A4.66,4.66 0,0 1,30.0039 34.5646L36.9618,41.5225A4.66,4.66 90,0 1,36.9618 48.1128z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M56.44,25.38L56.44,25.39A4.66,4.66 0,0 1,51.78 30.05L43.64,30.05A4.66,4.66 0,0 1,38.98 25.39L38.98,25.38A4.66,4.66 0,0 1,43.64 20.72L51.78,20.72A4.66,4.66 0,0 1,56.44 25.38z"/>
-    <path android:fillColor="@drawable/res_2131230801_img_remote_auth_loaded__0" android:pathData="M65.5604,41.1879l-17.9039,17.9039l-1.5698,-1.5698l17.9039,-17.9039z"/>
+    <path android:fillColor="@drawable/res_2131230804_img_remote_auth_loaded__0" android:pathData="M65.5604,41.1879l-17.9039,17.9039l-1.5698,-1.5698l17.9039,-17.9039z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M68.2376,44.2135L50.5104,61.9407A2.37,2.365 134.9993,0 1,47.1623 61.9442L47.1623,61.9442A2.37,2.365 134.9993,0 1,47.1658 58.596L64.893,40.8689A2.37,2.365 134.9993,0 1,68.2411 40.8653L68.2411,40.8653A2.37,2.365 134.9993,0 1,68.2376 44.2135z"/>
     <path android:fillColor="#f7d036" android:pathData="M77.555,12.35L77.555,12.35A0.615,0.62 0,0 1,78.17 12.97L78.17,13.58A0.615,0.62 0,0 1,77.555 14.2L77.555,14.2A0.615,0.62 0,0 1,76.94 13.58L76.94,12.97A0.615,0.62 0,0 1,77.555 12.35z"/>
     <path android:fillColor="#f7d036" android:pathData="M77.555,17.28L77.555,17.28A0.615,0.62 0,0 1,78.17 17.9L78.17,18.51A0.615,0.62 0,0 1,77.555 19.13L77.555,19.13A0.615,0.62 0,0 1,76.94 18.51L76.94,17.9A0.615,0.62 0,0 1,77.555 17.28z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml b/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml
index f8de38b44c..eb4b62d8c7 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml
@@ -47,7 +47,7 @@
     <path android:fillColor="#dae1ea" android:pathData="M559.27,146.32H451.32a12,12 0,0 1,12 12v3.25c0,6.63 -5.38,12.47 -12,12.47h108c6.63,0 12,-5.84 12,-12.47v-3.25A12,12 0,0 0,559.27 146.32Z"/>
     <path android:fillColor="#9babbf" android:pathData="M463.32,161.57v-3.25a12,12 0,0 0,-12 -12H433.41a12,12 0,0 1,12 12v3.25c0,6.63 -5.37,12.47 -12,12.47h17.91C457.94,174 463.32,168.2 463.32,161.57Z"/>
     <path android:fillColor="#dae1ea" android:pathData="M445.41,161.57v-3.25a12,12 0,0 0,-12 -12h-107a12,12 0,0 1,12 12v3.25c0,6.63 -5.37,12.47 -12,12.47h107C440,174 445.41,168.2 445.41,161.57Z"/>
-    <path android:fillColor="@drawable/res_2131230802_img_wumpus_playing_with_friends__0" android:pathData="M378,143.76c2.36,-0.07 4.47,-1.24 6.79,-1.55l-2,0.26a24.43,24.43 0,0 1,6.22 0.09l-2,-0.27a47.61,47.61 0,0 1,11.61 3.4l-1.8,-0.76a96.87,96.87 0,0 1,12.06 6.24c3.37,2 8.38,0.86 10.26,-2.69a7.65,7.65 0,0 0,-2.69 -10.27A107.9,107.9 0,0 0,402.1 131a48.28,48.28 0,0 0,-9.56 -2.94c-4.71,-0.87 -9.65,-1.19 -14.31,0.2a19.29,19.29 0,0 1,-2.18 0.74l2,-0.27H378c-3.91,0.11 -7.68,3.37 -7.5,7.5 0.18,4 3.3,7.62 7.5,7.5Z"/>
+    <path android:fillColor="@drawable/res_2131230805_img_wumpus_playing_with_friends__0" android:pathData="M378,143.76c2.36,-0.07 4.47,-1.24 6.79,-1.55l-2,0.26a24.43,24.43 0,0 1,6.22 0.09l-2,-0.27a47.61,47.61 0,0 1,11.61 3.4l-1.8,-0.76a96.87,96.87 0,0 1,12.06 6.24c3.37,2 8.38,0.86 10.26,-2.69a7.65,7.65 0,0 0,-2.69 -10.27A107.9,107.9 0,0 0,402.1 131a48.28,48.28 0,0 0,-9.56 -2.94c-4.71,-0.87 -9.65,-1.19 -14.31,0.2a19.29,19.29 0,0 1,-2.18 0.74l2,-0.27H378c-3.91,0.11 -7.68,3.37 -7.5,7.5 0.18,4 3.3,7.62 7.5,7.5Z"/>
     <path android:fillColor="#3e70dd" android:pathData="M331.74,101.21l63.39,-12.35l-1.38,-4.77l-60.58,7.73l-1.43,9.39z" android:strokeAlpha="0.5" android:fillAlpha="0.5"/>
     <path android:fillColor="#7196ff" android:pathData="M360,143.32a38.69,38.69 0,0 1,4.81 0.41l-2,-0.27a75.7,75.7 0,0 1,19 5.28L380,148a84.21,84.21 0,0 1,9.17 4.57c3.41,2 8.37,0.91 10.27,-2.69a7.64,7.64 0,0 0,-2.69 -10.26A87,87 0,0 0,372.56 130,58.9 58.9,0 0,0 360,128.32c-3.92,0 -7.68,3.46 -7.5,7.5a7.63,7.63 0,0 0,7.5 7.5Z"/>
     <path android:fillColor="#7196ff" android:pathData="M327.015,85.641l-14.196,1.633a7.14,7.14 128.44,0 1,-7.909 -6.278L303.072,65.022A7.14,7.14 128.44,0 1,309.344 57.063L323.541,55.431a0,0 0,0 1,-0 0L327.015,85.641a0,0 0,0 1,-0 0Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_landing_splash__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_landing_splash__0.xml
new file mode 100644
index 0000000000..b377ad8dee
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_landing_splash__0.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:angle="0" android:type="linear" android:startX="156.23" android:startY="540.47" android:endX="156.23" android:endY="661.33">
+    <item android:color="#ff29cc7a" android:offset="0"/>
+    <item android:color="#ff038567" android:offset="1"/>
+</gradient>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_landing_splash__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_landing_splash__1.xml
new file mode 100644
index 0000000000..4f8405fb3a
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_landing_splash__1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:angle="0" android:type="linear" android:startX="560.4" android:startY="306.43" android:endX="550.13" android:endY="259.59">
+    <item android:color="#ffffe75c" android:offset="0"/>
+    <item android:color="#ffffc619" android:offset="1"/>
+</gradient>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_landing_splash__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_landing_splash__2.xml
new file mode 100644
index 0000000000..cd96f20824
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_landing_splash__2.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:angle="0" android:type="linear" android:startX="56,260.8984" android:startY="40,671.6992" android:endX="53,460.8008" android:endY="47,311.6016">
+    <item android:color="#ffffe75c" android:offset="0"/>
+    <item android:color="#ffffc619" android:offset="1"/>
+</gradient>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_nitro_pattern__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230790_img_nitro_pattern__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_nitro_pattern__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230791_img_nitro_pattern__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_nitro_pattern__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230795_img_nitro_pattern__2.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230792_img_nitro_pattern__2.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230795_img_nitro_pattern__2.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__3.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230796_img_nitro_pattern__3.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__3.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230796_img_nitro_pattern__3.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__4.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230797_img_nitro_pattern__4.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__4.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230797_img_nitro_pattern__4.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230795_img_plan_activated_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230798_img_plan_activated_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230795_img_plan_activated_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230798_img_plan_activated_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230796_img_plan_activated_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230799_img_plan_activated_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230796_img_plan_activated_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230799_img_plan_activated_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230797_img_premium_activated_tier_1_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_1_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230797_img_premium_activated_tier_1_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_1_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230798_img_premium_activated_tier_1_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230801_img_premium_activated_tier_1_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230798_img_premium_activated_tier_1_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230801_img_premium_activated_tier_1_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230799_img_premium_activated_tier_2_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230802_img_premium_activated_tier_2_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230799_img_premium_activated_tier_2_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230802_img_premium_activated_tier_2_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_2_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230803_img_premium_activated_tier_2_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_2_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230803_img_premium_activated_tier_2_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230801_img_remote_auth_loaded__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230804_img_remote_auth_loaded__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230801_img_remote_auth_loaded__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230804_img_remote_auth_loaded__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230802_img_wumpus_playing_with_friends__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230805_img_wumpus_playing_with_friends__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230802_img_wumpus_playing_with_friends__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230805_img_wumpus_playing_with_friends__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230803_screen_share_nfx_illustration__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230806_screen_share_nfx_illustration__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230803_screen_share_nfx_illustration__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230806_screen_share_nfx_illustration__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230804_screen_share_nfx_illustration__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230807_screen_share_nfx_illustration__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230804_screen_share_nfx_illustration__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230807_screen_share_nfx_illustration__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230805_screen_share_nfx_illustration__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230808_screen_share_nfx_illustration__2.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230805_screen_share_nfx_illustration__2.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230808_screen_share_nfx_illustration__2.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230812_video_call_illustration__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230815_video_call_illustration__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230812_video_call_illustration__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230815_video_call_illustration__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml b/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml
index f6addeec48..9c18bd36f3 100644
--- a/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml
+++ b/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml
@@ -28,11 +28,11 @@
     <path android:fillColor="#dd8fff" android:pathData="M253.21,98.06C252.491,97.66 251.72,97.36 250.92,97.17C249.077,96.659 247.106,96.888 245.43,97.81C247.64,100.9 250.81,103.48 253.21,98.06Z"/>
     <path android:fillColor="#c69c00" android:pathData="M225.588,95.484C226.344,95.393 226.921,95.013 226.876,94.634C226.83,94.256 226.18,94.023 225.423,94.114C224.666,94.204 224.09,94.585 224.135,94.963C224.181,95.341 224.831,95.575 225.588,95.484Z"/>
     <path android:fillColor="#00000000" android:pathData="M256.51,88.09C257.37,84.73 260.02,84 262.45,86.46" android:strokeColor="#23242e" android:strokeWidth="1.54" android:strokeLineCap="round"/>
-    <path android:fillColor="@drawable/res_2131230803_screen_share_nfx_illustration__0" android:pathData="M65.56,113H65.5L47.69,113.7C35.95,114.11 31.47,118.61 27.37,127.07L27.09,127.71L20.94,140.81L19.7,143.41C17.84,148.76 20.24,152.2 27.57,150.41C35.061,148.378 42.223,145.287 48.84,141.23C55.26,137.37 64.84,131.75 71.11,122.8L71.39,122.41L71.52,122.19L71.89,121.65L72.02,121.43C75.49,115.66 71.78,112.81 65.56,113Z"/>
-    <path android:fillColor="@drawable/res_2131230804_screen_share_nfx_illustration__1" android:pathData="M72,121.43L71.87,121.65L71.5,122.19L71.37,122.41L71.09,122.8C64.83,131.8 55.24,137.37 48.82,141.23C42.204,145.29 35.042,148.381 27.55,150.41C22.24,151.7 19.55,150.24 19.17,147.41C20.91,142.34 30.73,133.41 42.7,126C54.67,118.59 66.08,114.19 71.7,114.41C73.66,115.69 74.07,118.05 72,121.43Z"/>
+    <path android:fillColor="@drawable/res_2131230806_screen_share_nfx_illustration__0" android:pathData="M65.56,113H65.5L47.69,113.7C35.95,114.11 31.47,118.61 27.37,127.07L27.09,127.71L20.94,140.81L19.7,143.41C17.84,148.76 20.24,152.2 27.57,150.41C35.061,148.378 42.223,145.287 48.84,141.23C55.26,137.37 64.84,131.75 71.11,122.8L71.39,122.41L71.52,122.19L71.89,121.65L72.02,121.43C75.49,115.66 71.78,112.81 65.56,113Z"/>
+    <path android:fillColor="@drawable/res_2131230807_screen_share_nfx_illustration__1" android:pathData="M72,121.43L71.87,121.65L71.5,122.19L71.37,122.41L71.09,122.8C64.83,131.8 55.24,137.37 48.82,141.23C42.204,145.29 35.042,148.381 27.55,150.41C22.24,151.7 19.55,150.24 19.17,147.41C20.91,142.34 30.73,133.41 42.7,126C54.67,118.59 66.08,114.19 71.7,114.41C73.66,115.69 74.07,118.05 72,121.43Z"/>
     <path android:fillColor="#6b3043" android:pathData="M26.58,146.81C25.21,144.59 33.51,136.97 45.12,129.81C56.73,122.65 67.26,118.6 68.63,120.81C70,123.02 61.7,130.65 50.09,137.81C38.48,144.97 28,149 26.58,146.81Z"/>
     <path android:fillColor="#7a384c" android:pathData="M55.87,130.82L55.26,131.41L65.75,126.13C64.928,126.989 64.06,127.804 63.15,128.57L53.56,132.93H53.5L60.07,131.13L56.39,133.84L51.9,134.1L49,136.06L46.46,137.53L42.32,142.39L39.15,144L45.15,138.28L44.74,138.39L35,145.71L33.32,146.33L43.32,139.01C42.605,139.34 41.874,139.634 41.13,139.89L28.28,147.5C27.756,147.53 27.236,147.398 26.79,147.12L39.88,140.12C39.768,140.084 39.665,140.022 39.58,139.94C39.5,139.94 39.58,139.77 39.58,139.57L26.74,145.33C27.021,144.71 27.38,144.128 27.81,143.6L40.09,138.87L40.69,138.21L30.28,140.87L32.19,139.18L41.57,137.48L42.88,136.38L35.88,136.14L37.88,134.69L43.78,135.69L44.91,134.89L40,133.24L41.61,132.13L45.84,134.28L46.92,133.56L43.67,130.78L45.04,129.92L47.42,133.3L47.85,133L47.68,133.05L47.23,128.6L49.1,127.49L48.95,132.34L50.61,131.41L51.27,126.3L52.89,125.45L51.28,131.05L53.83,129.89L56.31,123.75L58.07,122.92L54.53,129.65C55.028,129.391 55.579,129.25 56.14,129.24L63.62,120.86C64.039,120.691 64.48,120.58 64.93,120.53L56.76,129.46L68.41,120.52L68.74,120.82C68.866,121.109 68.904,121.429 68.85,121.74L55.87,130.82Z"/>
-    <path android:fillColor="@drawable/res_2131230805_screen_share_nfx_illustration__2" android:pathData="M45.17,169.73C43.985,168.035 43.293,166.045 43.17,163.98C42.78,157.4 40.69,149.19 37.17,140.33C36.76,139.65 41.17,136.23 47.06,132.67C52.95,129.11 58.06,126.86 58.47,127.67C61.7,136.31 66.83,148.82 67.07,164.67C67.102,167.193 66.273,169.651 64.721,171.639C63.168,173.628 60.985,175.028 58.53,175.61L57.86,175.77C55.681,176.289 53.397,176.138 51.306,175.336C49.215,174.535 47.414,173.121 46.14,171.28L45.17,169.73Z"/>
+    <path android:fillColor="@drawable/res_2131230808_screen_share_nfx_illustration__2" android:pathData="M45.17,169.73C43.985,168.035 43.293,166.045 43.17,163.98C42.78,157.4 40.69,149.19 37.17,140.33C36.76,139.65 41.17,136.23 47.06,132.67C52.95,129.11 58.06,126.86 58.47,127.67C61.7,136.31 66.83,148.82 67.07,164.67C67.102,167.193 66.273,169.651 64.721,171.639C63.168,173.628 60.985,175.028 58.53,175.61L57.86,175.77C55.681,176.289 53.397,176.138 51.306,175.336C49.215,174.535 47.414,173.121 46.14,171.28L45.17,169.73Z"/>
     <path android:fillColor="#a5387e" android:pathData="M63.11,140.58C55.28,140.22 45.39,141.64 38.7,144.22C38.28,142.898 37.789,141.6 37.23,140.33C36.82,139.65 41.23,136.23 47.12,132.67C53.01,129.11 58.12,126.86 58.53,127.67C59.87,131.3 61.6,135.6 63.11,140.58Z" android:strokeAlpha="0.3" android:fillAlpha="0.3"/>
     <path android:fillColor="#543247" android:pathData="M62.83,149.93C62.28,149.93 61.83,149.34 61.76,148.54C61.69,147.74 62.12,147.06 62.67,147.03C63.22,147 63.67,147.63 63.74,148.43C63.81,149.23 63.38,149.9 62.83,149.93Z"/>
     <path android:fillColor="#543247" android:pathData="M52.9,151.09C52.789,150.882 52.738,150.646 52.754,150.41C52.769,150.174 52.85,149.948 52.987,149.755C53.125,149.563 53.313,149.413 53.531,149.322C53.749,149.231 53.988,149.202 54.222,149.239C54.455,149.277 54.673,149.378 54.852,149.533C55.031,149.688 55.163,149.889 55.233,150.115C55.304,150.34 55.31,150.581 55.251,150.81C55.192,151.039 55.07,151.247 54.9,151.41C54.59,151.626 54.208,151.713 53.835,151.653C53.463,151.594 53.127,151.392 52.9,151.09Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml b/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml
index ca2a05b324..9567d3f6d7 100644
--- a/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml
+++ b/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml
@@ -4,7 +4,7 @@
     <path android:fillColor="#3e70dd" android:pathData="M124,58.5H227.9V112a5,5 0,0 1,-5 5H124Z"/>
     <path android:fillColor="#fff" android:pathData="M25.1,0H124V58.5H20.1V5A5,5 0,0 1,25.1 0Z"/>
     <path android:fillColor="#f7c9f7" android:pathData="M20.1,58.5H124V117H25.1a5,5 0,0 1,-5 -5Z"/>
-    <path android:fillColor="@drawable/res_2131230812_video_call_illustration__0" android:pathData="M106,32.4l0.43,-2.55a4.76,4.76 0,0 0,-3.68 2.06A31.84,31.84 0,0 1,92.57 42a9,9 0,0 1,-3.83 2.59l0.6,2.47 1.58,6.49 0.16,-0.05c10,-4.42 15.06,-9.7 19.52,-16.28 0.06,-0.08 0.11,-0.17 0.16,-0.25a4.73,4.73 0,0 0,0.6 -1.67l-3.77,-0.64A2,2 0,0 1,106 32.4Z"/>
+    <path android:fillColor="@drawable/res_2131230815_video_call_illustration__0" android:pathData="M106,32.4l0.43,-2.55a4.76,4.76 0,0 0,-3.68 2.06A31.84,31.84 0,0 1,92.57 42a9,9 0,0 1,-3.83 2.59l0.6,2.47 1.58,6.49 0.16,-0.05c10,-4.42 15.06,-9.7 19.52,-16.28 0.06,-0.08 0.11,-0.17 0.16,-0.25a4.73,4.73 0,0 0,0.6 -1.67l-3.77,-0.64A2,2 0,0 1,106 32.4Z"/>
     <path android:pathData="M52.9,48.68a9.87,9.87 0,0 1,-1.21 -0.21,3.55 3.55,0 0,0 -0.47,0.32 45.41,45.41 0,0 0,-8.93 9.71H51.5l0.82,-5.7Z"/>
     <path android:fillColor="#6a94ff" android:pathData="M52.32,52.8l-0.81,5.7l40.61,0l-1.2,-4.91l-1.58,-6.49l-37.02,5.7z"/>
     <path android:fillColor="#6a94ff" android:pathData="M54.81,48.67a9.39,9.39 0,0 1,-1.91 0l-0.58,4.12 37,-5.7 -0.6,-2.47a8.71,8.71 0,0 1,-2 0.47Z"/>
diff --git a/app/src/main/res/drawable-hdpi/img_landing_splash.png b/app/src/main/res/drawable-hdpi/img_landing_splash.png
new file mode 100644
index 0000000000..9447914e77
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_landing_splash.png differ
diff --git a/app/src/main/res/drawable-ldpi/img_landing_splash.png b/app/src/main/res/drawable-ldpi/img_landing_splash.png
new file mode 100644
index 0000000000..89b7c177d6
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_landing_splash.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_landing_splash.png b/app/src/main/res/drawable-mdpi/img_landing_splash.png
new file mode 100644
index 0000000000..e2f34b2403
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_landing_splash.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_premium_activated_tier_2_light.png b/app/src/main/res/drawable-mdpi/img_premium_activated_tier_2_light.png
index d3bbf01e6c..07f532c563 100644
Binary files a/app/src/main/res/drawable-mdpi/img_premium_activated_tier_2_light.png and b/app/src/main/res/drawable-mdpi/img_premium_activated_tier_2_light.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_landing_splash.png b/app/src/main/res/drawable-xhdpi/img_landing_splash.png
new file mode 100644
index 0000000000..00359fec24
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_landing_splash.png differ
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
deleted file mode 100644
index cb93566e40..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/img_server_profile_marketing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_landing_splash.png b/app/src/main/res/drawable-xxhdpi/img_landing_splash.png
new file mode 100644
index 0000000000..2f81fa3ab2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_landing_splash.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
deleted file mode 100644
index 8676fd05ad..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/img_server_profile_marketing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_landing_splash.png b/app/src/main/res/drawable-xxxhdpi/img_landing_splash.png
new file mode 100644
index 0000000000..d0429403cd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_landing_splash.png differ
diff --git a/app/src/main/res/drawable/img_landing_splash.png b/app/src/main/res/drawable/img_landing_splash.png
deleted file mode 100644
index 8c98d1e0e4..0000000000
Binary files a/app/src/main/res/drawable/img_landing_splash.png and /dev/null differ
diff --git a/app/src/main/res/drawable/res_2131230806_sparkle_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230809_sparkle_animated_vector__0.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230806_sparkle_animated_vector__0.xml
rename to app/src/main/res/drawable/res_2131230809_sparkle_animated_vector__0.xml
diff --git a/app/src/main/res/drawable/res_2131230807_sparkle_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230810_sparkle_animated_vector__1.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230807_sparkle_animated_vector__1.xml
rename to app/src/main/res/drawable/res_2131230810_sparkle_animated_vector__1.xml
diff --git a/app/src/main/res/drawable/res_2131230808_sparkle_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230811_sparkle_animated_vector__2.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230808_sparkle_animated_vector__2.xml
rename to app/src/main/res/drawable/res_2131230811_sparkle_animated_vector__2.xml
diff --git a/app/src/main/res/drawable/res_2131230809_sparkle_yellow_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230812_sparkle_yellow_animated_vector__0.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230809_sparkle_yellow_animated_vector__0.xml
rename to app/src/main/res/drawable/res_2131230812_sparkle_yellow_animated_vector__0.xml
diff --git a/app/src/main/res/drawable/res_2131230810_sparkle_yellow_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230813_sparkle_yellow_animated_vector__1.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230810_sparkle_yellow_animated_vector__1.xml
rename to app/src/main/res/drawable/res_2131230813_sparkle_yellow_animated_vector__1.xml
diff --git a/app/src/main/res/drawable/res_2131230811_sparkle_yellow_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230814_sparkle_yellow_animated_vector__2.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230811_sparkle_yellow_animated_vector__2.xml
rename to app/src/main/res/drawable/res_2131230814_sparkle_yellow_animated_vector__2.xml
diff --git a/app/src/main/res/drawable/sparkle_animated_vector.xml b/app/src/main/res/drawable/sparkle_animated_vector.xml
index 0c497f0db3..ad8824d9e1 100644
--- a/app/src/main/res/drawable/sparkle_animated_vector.xml
+++ b/app/src/main/res/drawable/sparkle_animated_vector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230806_sparkle_animated_vector__0">
-    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230807_sparkle_animated_vector__1"/>
-    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230808_sparkle_animated_vector__2"/>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230809_sparkle_animated_vector__0">
+    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230810_sparkle_animated_vector__1"/>
+    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230811_sparkle_animated_vector__2"/>
 </animated-vector>
diff --git a/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml b/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml
index 640bdc9657..07f79e412f 100644
--- a/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml
+++ b/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230809_sparkle_yellow_animated_vector__0">
-    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230810_sparkle_yellow_animated_vector__1"/>
-    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230811_sparkle_yellow_animated_vector__2"/>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230812_sparkle_yellow_animated_vector__0">
+    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230813_sparkle_yellow_animated_vector__1"/>
+    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230814_sparkle_yellow_animated_vector__2"/>
 </animated-vector>
diff --git a/app/src/main/res/layout-v22/widget_guild_identity_marketing_sheet.xml b/app/src/main/res/layout-v22/widget_guild_identity_marketing_sheet.xml
deleted file mode 100644
index 1796fc24d1..0000000000
--- a/app/src/main/res/layout-v22/widget_guild_identity_marketing_sheet.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
-        <ImageView android:id="@+id/profile_marketing_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/img_server_profile_marketing"/>
-        <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_subtitle="@string/change_identity_guild_header_tooltip_content" app:stv_title="@string/change_identity_guild_header_tooltip_title"/>
-        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@+id/profile_marketing_update_profile_button" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/profile_customization_marketing_tooltip_cta_mobile" android:paddingVertical="12dp" style="@style/UiKit_Material_Button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/profile_marketing_skip_button" android:text="@string/education_new_feature_dismiss" style="@style/UiKit_Material_Button_Transparent_Fit"/>
-    </LinearLayout>
-</FrameLayout>
diff --git a/app/src/main/res/layout/view_premium_settings_perks.xml b/app/src/main/res/layout/view_premium_settings_perks.xml
index 67cf92de12..72fb1ebf37 100644
--- a/app/src/main/res/layout/view_premium_settings_perks.xml
+++ b/app/src/main/res/layout/view_premium_settings_perks.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
     <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/premium_included" style="@style/UiKit_TextView_Semibold"/>
     <TextView android:text="@string/premium_perks_tier_2_profile" app:drawableStartCompat="@drawable/ic_premium_marketing_custom_profile_24dp" style="@style/UiKit_TextView_Perk"/>
-    <TextView android:id="@+id/identity_perk" android:visibility="gone" android:text="@string/per_guild_avatars_premium_marketing_feature_mobile" app:drawableStartCompat="@drawable/ic_identity_card" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/identity_perk" android:text="@string/per_guild_avatars_premium_marketing_feature_mobile" app:drawableStartCompat="@drawable/ic_identity_card" style="@style/UiKit_TextView_Perk"/>
     <TextView android:text="@string/premium_perks_tier_2_custom_emoji" app:drawableStartCompat="@drawable/ic_premium_marketing_global_emojis_24dp" style="@style/UiKit_TextView_Perk"/>
     <TextView android:text="@string/premium_perks_tier_2_stream_resolution" app:drawableStartCompat="@drawable/ic_premium_marketing_stream_quality_24dp" style="@style/UiKit_TextView_Perk"/>
     <TextView android:id="@+id/upload_size_perk" android:text="@string/premium_perks_upload_size" app:drawableStartCompat="@drawable/ic_premium_marketing_upload_size_24dp" style="@style/UiKit_TextView_Perk"/>
diff --git a/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml b/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml
deleted file mode 100644
index 4ec470d04d..0000000000
--- a/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
-    <TextView android:id="@+id/channels_list_actions_change_nickname_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/change_nickname" style="@style/UiKit_TextView_H1_Bold"/>
-    <View style="@style/UiKit_Divider"/>
-    <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/channels_list_actions_change_nickname_edit_text" android:hint="@string/nickname" style="@style/UiKit_TextInputLayout_Primary">
-            <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Username"/>
-        </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextLink" android:id="@+id/channels_list_actions_change_nickname_reset" android:paddingTop="8dp" android:text="@string/reset_nickname" style="@style/UiKit_TextView_Semibold"/>
-    </LinearLayout>
-    <View style="@style/UiKit_Settings_Divider"/>
-    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/channels_list_actions_change_nickname_cancel" android:text="@string/cancel" android:layout_marginEnd="8dp" style="@style/UiKit_Material_Button_Transparent_Fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/channels_list_actions_change_nickname_save" android:layout_width="wrap_content" android:text="@string/save" style="@style/UiKit_Material_Button_Fit"/>
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_identity_marketing_sheet.xml b/app/src/main/res/layout/widget_guild_identity_marketing_sheet.xml
deleted file mode 100644
index 89c2fd4c3d..0000000000
--- a/app/src/main/res/layout/widget_guild_identity_marketing_sheet.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
-        <ImageView android:id="@+id/profile_marketing_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/img_server_profile_marketing"/>
-        <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_subtitle="@string/change_identity_guild_header_tooltip_content" app:stv_title="@string/change_identity_guild_header_tooltip_title"/>
-        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@+id/profile_marketing_update_profile_button" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/profile_customization_marketing_tooltip_cta_mobile" style="@style/UiKit_Material_Button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/profile_marketing_skip_button" android:text="@string/education_new_feature_dismiss" style="@style/UiKit_Material_Button_Transparent_Fit"/>
-    </LinearLayout>
-</FrameLayout>
diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml
index a132869201..1e20fd6ade 100644
--- a/app/src/main/res/values/public.xml
+++ b/app/src/main/res/values/public.xml
@@ -3452,1669 +3452,1671 @@
     <public type="drawable" name="res_2131230787_img_boost_activated_light__0" id="0x7F080043" />
     <public type="drawable" name="res_2131230788_img_krisp_onboarding__0" id="0x7F080044" />
     <public type="drawable" name="res_2131230789_img_krisp_onboarding__1" id="0x7F080045" />
-    <public type="drawable" name="res_2131230790_img_nitro_pattern__0" id="0x7F080046" />
-    <public type="drawable" name="res_2131230791_img_nitro_pattern__1" id="0x7F080047" />
-    <public type="drawable" name="res_2131230792_img_nitro_pattern__2" id="0x7F080048" />
-    <public type="drawable" name="res_2131230793_img_nitro_pattern__3" id="0x7F080049" />
-    <public type="drawable" name="res_2131230794_img_nitro_pattern__4" id="0x7F08004A" />
-    <public type="drawable" name="res_2131230795_img_plan_activated_dark__0" id="0x7F08004B" />
-    <public type="drawable" name="res_2131230796_img_plan_activated_light__0" id="0x7F08004C" />
-    <public type="drawable" name="res_2131230797_img_premium_activated_tier_1_dark__0" id="0x7F08004D" />
-    <public type="drawable" name="res_2131230798_img_premium_activated_tier_1_light__0" id="0x7F08004E" />
-    <public type="drawable" name="res_2131230799_img_premium_activated_tier_2_dark__0" id="0x7F08004F" />
-    <public type="drawable" name="res_2131230800_img_premium_activated_tier_2_light__0" id="0x7F080050" />
-    <public type="drawable" name="res_2131230801_img_remote_auth_loaded__0" id="0x7F080051" />
-    <public type="drawable" name="res_2131230802_img_wumpus_playing_with_friends__0" id="0x7F080052" />
-    <public type="drawable" name="res_2131230803_screen_share_nfx_illustration__0" id="0x7F080053" />
-    <public type="drawable" name="res_2131230804_screen_share_nfx_illustration__1" id="0x7F080054" />
-    <public type="drawable" name="res_2131230805_screen_share_nfx_illustration__2" id="0x7F080055" />
-    <public type="drawable" name="res_2131230806_sparkle_animated_vector__0" id="0x7F080056" />
-    <public type="drawable" name="res_2131230807_sparkle_animated_vector__1" id="0x7F080057" />
-    <public type="drawable" name="res_2131230808_sparkle_animated_vector__2" id="0x7F080058" />
-    <public type="drawable" name="res_2131230809_sparkle_yellow_animated_vector__0" id="0x7F080059" />
-    <public type="drawable" name="res_2131230810_sparkle_yellow_animated_vector__1" id="0x7F08005A" />
-    <public type="drawable" name="res_2131230811_sparkle_yellow_animated_vector__2" id="0x7F08005B" />
-    <public type="drawable" name="res_2131230812_video_call_illustration__0" id="0x7F08005C" />
-    <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7F08005D" />
-    <public type="drawable" name="abc_action_bar_item_background_material" id="0x7F08005E" />
-    <public type="drawable" name="abc_btn_borderless_material" id="0x7F08005F" />
-    <public type="drawable" name="abc_btn_check_material" id="0x7F080060" />
-    <public type="drawable" name="abc_btn_check_material_anim" id="0x7F080061" />
-    <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7F080062" />
-    <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7F080063" />
-    <public type="drawable" name="abc_btn_colored_material" id="0x7F080064" />
-    <public type="drawable" name="abc_btn_default_mtrl_shape" id="0x7F080065" />
-    <public type="drawable" name="abc_btn_radio_material" id="0x7F080066" />
-    <public type="drawable" name="abc_btn_radio_material_anim" id="0x7F080067" />
-    <public type="drawable" name="abc_btn_radio_to_on_mtrl_000" id="0x7F080068" />
-    <public type="drawable" name="abc_btn_radio_to_on_mtrl_015" id="0x7F080069" />
-    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00001" id="0x7F08006A" />
-    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00012" id="0x7F08006B" />
-    <public type="drawable" name="abc_cab_background_internal_bg" id="0x7F08006C" />
-    <public type="drawable" name="abc_cab_background_top_material" id="0x7F08006D" />
-    <public type="drawable" name="abc_cab_background_top_mtrl_alpha" id="0x7F08006E" />
-    <public type="drawable" name="abc_control_background_material" id="0x7F08006F" />
-    <public type="drawable" name="abc_dialog_material_background" id="0x7F080070" />
-    <public type="drawable" name="abc_edit_text_material" id="0x7F080071" />
-    <public type="drawable" name="abc_ic_ab_back_material" id="0x7F080072" />
-    <public type="drawable" name="abc_ic_arrow_drop_right_black_24dp" id="0x7F080073" />
-    <public type="drawable" name="abc_ic_clear_material" id="0x7F080074" />
-    <public type="drawable" name="abc_ic_commit_search_api_mtrl_alpha" id="0x7F080075" />
-    <public type="drawable" name="abc_ic_go_search_api_material" id="0x7F080076" />
-    <public type="drawable" name="abc_ic_menu_copy_mtrl_am_alpha" id="0x7F080077" />
-    <public type="drawable" name="abc_ic_menu_cut_mtrl_alpha" id="0x7F080078" />
-    <public type="drawable" name="abc_ic_menu_overflow_material" id="0x7F080079" />
-    <public type="drawable" name="abc_ic_menu_paste_mtrl_am_alpha" id="0x7F08007A" />
-    <public type="drawable" name="abc_ic_menu_selectall_mtrl_alpha" id="0x7F08007B" />
-    <public type="drawable" name="abc_ic_menu_share_mtrl_alpha" id="0x7F08007C" />
-    <public type="drawable" name="abc_ic_search_api_material" id="0x7F08007D" />
-    <public type="drawable" name="abc_ic_star_black_16dp" id="0x7F08007E" />
-    <public type="drawable" name="abc_ic_star_black_36dp" id="0x7F08007F" />
-    <public type="drawable" name="abc_ic_star_black_48dp" id="0x7F080080" />
-    <public type="drawable" name="abc_ic_star_half_black_16dp" id="0x7F080081" />
-    <public type="drawable" name="abc_ic_star_half_black_36dp" id="0x7F080082" />
-    <public type="drawable" name="abc_ic_star_half_black_48dp" id="0x7F080083" />
-    <public type="drawable" name="abc_ic_voice_search_api_material" id="0x7F080084" />
-    <public type="drawable" name="abc_item_background_holo_dark" id="0x7F080085" />
-    <public type="drawable" name="abc_item_background_holo_light" id="0x7F080086" />
-    <public type="drawable" name="abc_list_divider_material" id="0x7F080087" />
-    <public type="drawable" name="abc_list_divider_mtrl_alpha" id="0x7F080088" />
-    <public type="drawable" name="abc_list_focused_holo" id="0x7F080089" />
-    <public type="drawable" name="abc_list_longpressed_holo" id="0x7F08008A" />
-    <public type="drawable" name="abc_list_pressed_holo_dark" id="0x7F08008B" />
-    <public type="drawable" name="abc_list_pressed_holo_light" id="0x7F08008C" />
-    <public type="drawable" name="abc_list_selector_background_transition_holo_dark" id="0x7F08008D" />
-    <public type="drawable" name="abc_list_selector_background_transition_holo_light" id="0x7F08008E" />
-    <public type="drawable" name="abc_list_selector_disabled_holo_dark" id="0x7F08008F" />
-    <public type="drawable" name="abc_list_selector_disabled_holo_light" id="0x7F080090" />
-    <public type="drawable" name="abc_list_selector_holo_dark" id="0x7F080091" />
-    <public type="drawable" name="abc_list_selector_holo_light" id="0x7F080092" />
-    <public type="drawable" name="abc_menu_hardkey_panel_mtrl_mult" id="0x7F080093" />
-    <public type="drawable" name="abc_popup_background_mtrl_mult" id="0x7F080094" />
-    <public type="drawable" name="abc_ratingbar_indicator_material" id="0x7F080095" />
-    <public type="drawable" name="abc_ratingbar_material" id="0x7F080096" />
-    <public type="drawable" name="abc_ratingbar_small_material" id="0x7F080097" />
-    <public type="drawable" name="abc_scrubber_control_off_mtrl_alpha" id="0x7F080098" />
-    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_000" id="0x7F080099" />
-    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_005" id="0x7F08009A" />
-    <public type="drawable" name="abc_scrubber_primary_mtrl_alpha" id="0x7F08009B" />
-    <public type="drawable" name="abc_scrubber_track_mtrl_alpha" id="0x7F08009C" />
-    <public type="drawable" name="abc_seekbar_thumb_material" id="0x7F08009D" />
-    <public type="drawable" name="abc_seekbar_tick_mark_material" id="0x7F08009E" />
-    <public type="drawable" name="abc_seekbar_track_material" id="0x7F08009F" />
-    <public type="drawable" name="abc_spinner_mtrl_am_alpha" id="0x7F0800A0" />
-    <public type="drawable" name="abc_spinner_textfield_background_material" id="0x7F0800A1" />
-    <public type="drawable" name="abc_switch_thumb_material" id="0x7F0800A2" />
-    <public type="drawable" name="abc_switch_track_mtrl_alpha" id="0x7F0800A3" />
-    <public type="drawable" name="abc_tab_indicator_material" id="0x7F0800A4" />
-    <public type="drawable" name="abc_tab_indicator_mtrl_alpha" id="0x7F0800A5" />
-    <public type="drawable" name="abc_text_cursor_material" id="0x7F0800A6" />
-    <public type="drawable" name="abc_text_select_handle_left_mtrl_dark" id="0x7F0800A7" />
-    <public type="drawable" name="abc_text_select_handle_left_mtrl_light" id="0x7F0800A8" />
-    <public type="drawable" name="abc_text_select_handle_middle_mtrl_dark" id="0x7F0800A9" />
-    <public type="drawable" name="abc_text_select_handle_middle_mtrl_light" id="0x7F0800AA" />
-    <public type="drawable" name="abc_text_select_handle_right_mtrl_dark" id="0x7F0800AB" />
-    <public type="drawable" name="abc_text_select_handle_right_mtrl_light" id="0x7F0800AC" />
-    <public type="drawable" name="abc_textfield_activated_mtrl_alpha" id="0x7F0800AD" />
-    <public type="drawable" name="abc_textfield_default_mtrl_alpha" id="0x7F0800AE" />
-    <public type="drawable" name="abc_textfield_search_activated_mtrl_alpha" id="0x7F0800AF" />
-    <public type="drawable" name="abc_textfield_search_default_mtrl_alpha" id="0x7F0800B0" />
-    <public type="drawable" name="abc_textfield_search_material" id="0x7F0800B1" />
-    <public type="drawable" name="abc_vector_test" id="0x7F0800B2" />
-    <public type="drawable" name="alerter_alert_button_background" id="0x7F0800B3" />
-    <public type="drawable" name="alerter_ic_face" id="0x7F0800B4" />
-    <public type="drawable" name="alerter_ic_notifications" id="0x7F0800B5" />
-    <public type="drawable" name="app_toast_frame" id="0x7F0800B6" />
-    <public type="drawable" name="asset_account_sync_twitch" id="0x7F0800B7" />
-    <public type="drawable" name="asset_account_sync_youtube" id="0x7F0800B8" />
-    <public type="drawable" name="asset_broken_results_dark" id="0x7F0800B9" />
-    <public type="drawable" name="asset_broken_results_light" id="0x7F0800BA" />
-    <public type="drawable" name="asset_default_avatar_32dp" id="0x7F0800BB" />
-    <public type="drawable" name="asset_default_avatar_64dp" id="0x7F0800BC" />
-    <public type="drawable" name="asset_default_avatar_80dp" id="0x7F0800BD" />
-    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7F0800BE" />
-    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7F0800BF" />
-    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7F0800C0" />
-    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7F0800C1" />
-    <public type="drawable" name="asset_empty_no_bans" id="0x7F0800C2" />
-    <public type="drawable" name="asset_empty_no_invites" id="0x7F0800C3" />
-    <public type="drawable" name="asset_group_full" id="0x7F0800C4" />
-    <public type="drawable" name="asset_guild_role_subscriptions_unavailable" id="0x7F0800C5" />
-    <public type="drawable" name="asset_mfa_server" id="0x7F0800C6" />
-    <public type="drawable" name="asset_no_results_alt_dark" id="0x7F0800C7" />
-    <public type="drawable" name="asset_no_results_alt_light" id="0x7F0800C8" />
-    <public type="drawable" name="asset_no_results_dark" id="0x7F0800C9" />
-    <public type="drawable" name="asset_no_results_light" id="0x7F0800CA" />
-    <public type="drawable" name="asset_nux_navigation_channels" id="0x7F0800CB" />
-    <public type="drawable" name="asset_nux_navigation_dms" id="0x7F0800CC" />
-    <public type="drawable" name="asset_nux_navigation_guilds" id="0x7F0800CD" />
-    <public type="drawable" name="asset_sadbot" id="0x7F0800CE" />
-    <public type="drawable" name="asset_security" id="0x7F0800CF" />
-    <public type="drawable" name="asset_tooltip_server_create" id="0x7F0800D0" />
-    <public type="drawable" name="avd_hide_password" id="0x7F0800D1" />
-    <public type="drawable" name="avd_show_password" id="0x7F0800D2" />
-    <public type="drawable" name="bg_announcements_follow_sheet_dark" id="0x7F0800D3" />
-    <public type="drawable" name="bg_announcements_follow_sheet_light" id="0x7F0800D4" />
-    <public type="drawable" name="bg_bot_ui_component_select" id="0x7F0800D5" />
-    <public type="drawable" name="bg_bot_ui_component_select_pill" id="0x7F0800D6" />
-    <public type="drawable" name="bg_changelog_special_header" id="0x7F0800D7" />
-    <public type="drawable" name="bg_chat_sticker_greet_button" id="0x7F0800D8" />
-    <public type="drawable" name="bg_chat_sticker_greet_button_default" id="0x7F0800D9" />
-    <public type="drawable" name="bg_chat_sticker_greet_button_pressed" id="0x7F0800DA" />
-    <public type="drawable" name="bg_cloud_pattern_dark" id="0x7F0800DB" />
-    <public type="drawable" name="bg_cloud_pattern_light" id="0x7F0800DC" />
-    <public type="drawable" name="bg_discord_hub_email_confirmation" id="0x7F0800DD" />
-    <public type="drawable" name="bg_discord_hub_email_verification" id="0x7F0800DE" />
-    <public type="drawable" name="bg_guild_role_subscription_plan_format_radio_button" id="0x7F0800DF" />
-    <public type="drawable" name="bg_guild_role_subscription_plan_format_radio_button_image" id="0x7F0800E0" />
-    <public type="drawable" name="bg_guild_role_subscription_subscribe_button" id="0x7F0800E1" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_connected_primary" id="0x7F0800E2" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_connected_secondary" id="0x7F0800E3" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_floating" id="0x7F0800E4" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_active" id="0x7F0800E5" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_default" id="0x7F0800E6" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_disabled" id="0x7F0800E7" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_interested" id="0x7F0800E8" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_primary" id="0x7F0800E9" />
-    <public type="drawable" name="bg_guild_scheduled_event_list_item_secondary" id="0x7F0800EA" />
-    <public type="drawable" name="bg_hub_email_confirmation" id="0x7F0800EB" />
-    <public type="drawable" name="bg_payment_method_spinner_closed" id="0x7F0800EC" />
-    <public type="drawable" name="bg_payment_method_spinner_closed_light" id="0x7F0800ED" />
-    <public type="drawable" name="bg_payment_method_spinner_dropdown" id="0x7F0800EE" />
-    <public type="drawable" name="bg_payment_method_spinner_dropdown_light" id="0x7F0800EF" />
-    <public type="drawable" name="bg_premium_bundle_header" id="0x7F0800F0" />
-    <public type="drawable" name="bg_premium_classic_subscription_header" id="0x7F0800F1" />
-    <public type="drawable" name="bg_premium_guild_subscription_header" id="0x7F0800F2" />
-    <public type="drawable" name="bg_premium_guild_subscription_header_error" id="0x7F0800F3" />
-    <public type="drawable" name="bg_premium_guild_subscription_header_resub" id="0x7F0800F4" />
-    <public type="drawable" name="bg_premium_subscription_header" id="0x7F0800F5" />
-    <public type="drawable" name="bg_premium_subscription_header_error" id="0x7F0800F6" />
-    <public type="drawable" name="bg_premium_subscription_header_resub" id="0x7F0800F7" />
-    <public type="drawable" name="bg_pressed_highlight" id="0x7F0800F8" />
-    <public type="drawable" name="bg_pressed_highlight_brighten" id="0x7F0800F9" />
-    <public type="drawable" name="bg_pressed_highlight_darken" id="0x7F0800FA" />
-    <public type="drawable" name="bg_server_discovery_header" id="0x7F0800FB" />
-    <public type="drawable" name="bg_stage_channel_speaking_chip" id="0x7F0800FC" />
-    <public type="drawable" name="bg_start_stage_event_button" id="0x7F0800FD" />
-    <public type="drawable" name="bg_steps_progress_indicator_dot" id="0x7F0800FE" />
-    <public type="drawable" name="bg_stream_label" id="0x7F0800FF" />
-    <public type="drawable" name="bg_stream_live_indicator" id="0x7F080100" />
-    <public type="drawable" name="bg_stream_live_indicator_split_pill" id="0x7F080101" />
-    <public type="drawable" name="bg_stream_preview" id="0x7F080102" />
-    <public type="drawable" name="bg_stream_preview_overlay_caption" id="0x7F080103" />
-    <public type="drawable" name="bg_stream_preview_overlay_caption_opaque" id="0x7F080104" />
-    <public type="drawable" name="bg_stream_resolution_indicator_split_pill" id="0x7F080105" />
-    <public type="drawable" name="bg_subscription_placeholder_pattern_dark" id="0x7F080106" />
-    <public type="drawable" name="bg_subscription_placeholder_pattern_light" id="0x7F080107" />
-    <public type="drawable" name="bot_ui_component_divider_drawable" id="0x7F080108" />
-    <public type="drawable" name="btn_checkbox_checked_mtrl" id="0x7F080109" />
-    <public type="drawable" name="btn_checkbox_checked_to_unchecked_mtrl_animation" id="0x7F08010A" />
-    <public type="drawable" name="btn_checkbox_unchecked_mtrl" id="0x7F08010B" />
-    <public type="drawable" name="btn_checkbox_unchecked_to_checked_mtrl_animation" id="0x7F08010C" />
-    <public type="drawable" name="btn_radio_off_mtrl" id="0x7F08010D" />
-    <public type="drawable" name="btn_radio_off_to_on_mtrl_animation" id="0x7F08010E" />
-    <public type="drawable" name="btn_radio_on_mtrl" id="0x7F08010F" />
-    <public type="drawable" name="btn_radio_on_to_off_mtrl_animation" id="0x7F080110" />
-    <public type="drawable" name="bubble_state_selector" id="0x7F080111" />
-    <public type="drawable" name="button_brand_500" id="0x7F080112" />
-    <public type="drawable" name="button_text_color_primary_100" id="0x7F080113" />
-    <public type="drawable" name="cameraview_focus_marker_fill" id="0x7F080114" />
-    <public type="drawable" name="cameraview_focus_marker_outline" id="0x7F080115" />
-    <public type="drawable" name="changelog_special_back" id="0x7F080116" />
-    <public type="drawable" name="changelog_special_close" id="0x7F080117" />
-    <public type="drawable" name="changelog_special_footer" id="0x7F080118" />
-    <public type="drawable" name="changelog_special_hero" id="0x7F080119" />
-    <public type="drawable" name="claim_promo_success" id="0x7F08011A" />
-    <public type="drawable" name="common_full_open_on_phone" id="0x7F08011B" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7F08011C" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7F08011D" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7F08011E" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal_background" id="0x7F08011F" />
-    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7F080120" />
-    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7F080121" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7F080122" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7F080123" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7F080124" />
-    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7F080125" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7F080126" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7F080127" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7F080128" />
-    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7F080129" />
-    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7F08012A" />
-    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7F08012B" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7F08012C" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7F08012D" />
-    <public type="drawable" name="community_server_get_started_hogwarts" id="0x7F08012E" />
-    <public type="drawable" name="community_server_get_started_latin" id="0x7F08012F" />
-    <public type="drawable" name="community_server_get_started_pokemon" id="0x7F080130" />
-    <public type="drawable" name="community_server_get_started_sneakers" id="0x7F080131" />
-    <public type="drawable" name="community_setup_get_started" id="0x7F080132" />
-    <public type="drawable" name="cpv_alpha" id="0x7F080133" />
-    <public type="drawable" name="cpv_btn_background" id="0x7F080134" />
-    <public type="drawable" name="cpv_btn_background_pressed" id="0x7F080135" />
-    <public type="drawable" name="cpv_ic_arrow_right_black_24dp" id="0x7F080136" />
-    <public type="drawable" name="cpv_preset_checked" id="0x7F080137" />
-    <public type="drawable" name="cursor_color" id="0x7F080138" />
-    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7F080139" />
-    <public type="drawable" name="design_fab_background" id="0x7F08013A" />
-    <public type="drawable" name="design_ic_visibility" id="0x7F08013B" />
-    <public type="drawable" name="design_ic_visibility_off" id="0x7F08013C" />
-    <public type="drawable" name="design_password_eye" id="0x7F08013D" />
-    <public type="drawable" name="design_snackbar_background" id="0x7F08013E" />
-    <public type="drawable" name="discovery_empty_state" id="0x7F08013F" />
-    <public type="drawable" name="drawable_bg_card_grey" id="0x7F080140" />
-    <public type="drawable" name="drawable_bg_card_white" id="0x7F080141" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7F080142" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7F080143" />
-    <public type="drawable" name="drawable_bg_command_param_highlight" id="0x7F080144" />
-    <public type="drawable" name="drawable_bg_command_param_normal" id="0x7F080145" />
-    <public type="drawable" name="drawable_bg_corners_4dp" id="0x7F080146" />
-    <public type="drawable" name="drawable_bg_highlight" id="0x7F080147" />
-    <public type="drawable" name="drawable_bg_item_filter" id="0x7F080148" />
-    <public type="drawable" name="drawable_bg_loading" id="0x7F080149" />
-    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7F08014A" />
-    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7F08014B" />
-    <public type="drawable" name="drawable_bg_nitro_classic_gradient_diagonal" id="0x7F08014C" />
-    <public type="drawable" name="drawable_bg_nitro_gradient" id="0x7F08014D" />
-    <public type="drawable" name="drawable_bg_nitro_gradient_diagonal" id="0x7F08014E" />
-    <public type="drawable" name="drawable_bg_outline_dark" id="0x7F08014F" />
-    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7F080150" />
-    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7F080151" />
-    <public type="drawable" name="drawable_bg_premium_guild_gradient" id="0x7F080152" />
-    <public type="drawable" name="drawable_bg_premium_guild_gradient_corners" id="0x7F080153" />
-    <public type="drawable" name="drawable_bg_premium_tier_1_and_premium_guild_gradient" id="0x7F080154" />
-    <public type="drawable" name="drawable_bg_premium_tier_2_and_premium_guild_gradient" id="0x7F080155" />
-    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7F080156" />
-    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7F080157" />
-    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7F080158" />
-    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7F080159" />
-    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7F08015A" />
-    <public type="drawable" name="drawable_bg_reaction_light" id="0x7F08015B" />
-    <public type="drawable" name="drawable_bg_settings_header" id="0x7F08015C" />
-    <public type="drawable" name="drawable_bg_settings_item" id="0x7F08015D" />
-    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7F08015E" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_bottom" id="0x7F08015F" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_middle" id="0x7F080160" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_only" id="0x7F080161" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_top" id="0x7F080162" />
-    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7F080163" />
-    <public type="drawable" name="drawable_bg_ternary_off" id="0x7F080164" />
-    <public type="drawable" name="drawable_bg_ternary_on" id="0x7F080165" />
-    <public type="drawable" name="drawable_bg_tooltip" id="0x7F080166" />
-    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7F080167" />
-    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7F080168" />
-    <public type="drawable" name="drawable_bg_white_alpha_06_corners_gradient" id="0x7F080169" />
-    <public type="drawable" name="drawable_bg_white_alpha_24_corners_gradient" id="0x7F08016A" />
-    <public type="drawable" name="drawable_black_underlay_gradient" id="0x7F08016B" />
-    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7F08016C" />
-    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7F08016D" />
-    <public type="drawable" name="drawable_boost_progress_ring" id="0x7F08016E" />
-    <public type="drawable" name="drawable_boost_removal" id="0x7F08016F" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7F080170" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7F080171" />
-    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7F080172" />
-    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7F080173" />
-    <public type="drawable" name="drawable_button_brand_neutral" id="0x7F080174" />
-    <public type="drawable" name="drawable_button_green" id="0x7F080175" />
-    <public type="drawable" name="drawable_button_green_neutral" id="0x7F080176" />
-    <public type="drawable" name="drawable_button_grey" id="0x7F080177" />
-    <public type="drawable" name="drawable_button_grey_disabled" id="0x7F080178" />
-    <public type="drawable" name="drawable_button_red" id="0x7F080179" />
-    <public type="drawable" name="drawable_button_red_neutral" id="0x7F08017A" />
-    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7F08017B" />
-    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7F08017C" />
-    <public type="drawable" name="drawable_chip_background_deprecated" id="0x7F08017D" />
-    <public type="drawable" name="drawable_chip_circle" id="0x7F08017E" />
-    <public type="drawable" name="drawable_chip_delete" id="0x7F08017F" />
-    <public type="drawable" name="drawable_circle_background_primary" id="0x7F080180" />
-    <public type="drawable" name="drawable_circle_background_secondary" id="0x7F080181" />
-    <public type="drawable" name="drawable_circle_background_tertiary" id="0x7F080182" />
-    <public type="drawable" name="drawable_circle_black" id="0x7F080183" />
-    <public type="drawable" name="drawable_circle_brand" id="0x7F080184" />
-    <public type="drawable" name="drawable_circle_brand_500" id="0x7F080185" />
-    <public type="drawable" name="drawable_circle_dashed" id="0x7F080186" />
-    <public type="drawable" name="drawable_circle_dashed_4dp" id="0x7F080187" />
-    <public type="drawable" name="drawable_circle_green" id="0x7F080188" />
-    <public type="drawable" name="drawable_circle_guild_badge_activateable_dark" id="0x7F080189" />
-    <public type="drawable" name="drawable_circle_guild_badge_activateable_light" id="0x7F08018A" />
-    <public type="drawable" name="drawable_circle_guild_badge_active_dark" id="0x7F08018B" />
-    <public type="drawable" name="drawable_circle_guild_badge_active_light" id="0x7F08018C" />
-    <public type="drawable" name="drawable_circle_guild_badge_inactive_dark" id="0x7F08018D" />
-    <public type="drawable" name="drawable_circle_guild_badge_inactive_light" id="0x7F08018E" />
-    <public type="drawable" name="drawable_circle_interactive_text_normal" id="0x7F08018F" />
-    <public type="drawable" name="drawable_circle_premium_guild_gradient" id="0x7F080190" />
-    <public type="drawable" name="drawable_circle_primary_700" id="0x7F080191" />
-    <public type="drawable" name="drawable_circle_primary_900" id="0x7F080192" />
-    <public type="drawable" name="drawable_circle_primary_900_alpha_80" id="0x7F080193" />
-    <public type="drawable" name="drawable_circle_red" id="0x7F080194" />
-    <public type="drawable" name="drawable_circle_transparent" id="0x7F080195" />
-    <public type="drawable" name="drawable_circle_white" id="0x7F080196" />
-    <public type="drawable" name="drawable_circle_white_1" id="0x7F080197" />
-    <public type="drawable" name="drawable_circle_white_12dp" id="0x7F080198" />
-    <public type="drawable" name="drawable_circle_white_5" id="0x7F080199" />
-    <public type="drawable" name="drawable_clickable_rounded_4dp_brighten" id="0x7F08019A" />
-    <public type="drawable" name="drawable_clickable_rounded_4dp_darken" id="0x7F08019B" />
-    <public type="drawable" name="drawable_community_setup_first_step_dark" id="0x7F08019C" />
-    <public type="drawable" name="drawable_community_setup_first_step_light" id="0x7F08019D" />
-    <public type="drawable" name="drawable_community_setup_second_step_dark" id="0x7F08019E" />
-    <public type="drawable" name="drawable_community_setup_second_step_light" id="0x7F08019F" />
-    <public type="drawable" name="drawable_community_setup_third_step_dark" id="0x7F0801A0" />
-    <public type="drawable" name="drawable_community_setup_third_step_light" id="0x7F0801A1" />
-    <public type="drawable" name="drawable_cpv_edit_text_background" id="0x7F0801A2" />
-    <public type="drawable" name="drawable_default_invite_splash" id="0x7F0801A3" />
-    <public type="drawable" name="drawable_discovery_card_icon_bg_12dp_rounded" id="0x7F0801A4" />
-    <public type="drawable" name="drawable_discovery_card_icon_bg_4dp_rounded" id="0x7F0801A5" />
-    <public type="drawable" name="drawable_discovery_card_icon_bg_circle" id="0x7F0801A6" />
-    <public type="drawable" name="drawable_discovery_intro_card_bg" id="0x7F0801A7" />
-    <public type="drawable" name="drawable_discovery_stage_card_bg" id="0x7F0801A8" />
-    <public type="drawable" name="drawable_divider" id="0x7F0801A9" />
-    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7F0801AA" />
-    <public type="drawable" name="drawable_empty_text_placeholder_white" id="0x7F0801AB" />
-    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7F0801AC" />
-    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7F0801AD" />
-    <public type="drawable" name="drawable_fill_brand" id="0x7F0801AE" />
-    <public type="drawable" name="drawable_flex_input_bg" id="0x7F0801AF" />
-    <public type="drawable" name="drawable_friends_pending_dark" id="0x7F0801B0" />
-    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7F0801B1" />
-    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7F0801B2" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7F0801B3" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7F0801B4" />
-    <public type="drawable" name="drawable_friends_pending_light" id="0x7F0801B5" />
-    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7F0801B6" />
-    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7F0801B7" />
-    <public type="drawable" name="drawable_gem_premium_guild_background_dark" id="0x7F0801B8" />
-    <public type="drawable" name="drawable_gem_premium_guild_background_light" id="0x7F0801B9" />
-    <public type="drawable" name="drawable_gem_tier_3" id="0x7F0801BA" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7F0801BB" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7F0801BC" />
-    <public type="drawable" name="drawable_grey_user_icon" id="0x7F0801BD" />
-    <public type="drawable" name="drawable_guild_placeholder_primary_500" id="0x7F0801BE" />
-    <public type="drawable" name="drawable_guild_template_club" id="0x7F0801BF" />
-    <public type="drawable" name="drawable_guild_template_community" id="0x7F0801C0" />
-    <public type="drawable" name="drawable_guild_template_create" id="0x7F0801C1" />
-    <public type="drawable" name="drawable_guild_template_creator" id="0x7F0801C2" />
-    <public type="drawable" name="drawable_guild_template_friend" id="0x7F0801C3" />
-    <public type="drawable" name="drawable_guild_template_gaming" id="0x7F0801C4" />
-    <public type="drawable" name="drawable_guild_template_study" id="0x7F0801C5" />
-    <public type="drawable" name="drawable_ic_community_setting_analytics_dark" id="0x7F0801C6" />
-    <public type="drawable" name="drawable_ic_community_setting_analytics_light" id="0x7F0801C7" />
-    <public type="drawable" name="drawable_ic_community_setting_info_dark" id="0x7F0801C8" />
-    <public type="drawable" name="drawable_ic_community_setting_info_light" id="0x7F0801C9" />
-    <public type="drawable" name="drawable_ic_community_setting_server_insights_dark" id="0x7F0801CA" />
-    <public type="drawable" name="drawable_ic_community_setting_server_insights_light" id="0x7F0801CB" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7F0801CC" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7F0801CD" />
-    <public type="drawable" name="drawable_ic_nitro" id="0x7F0801CE" />
-    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7F0801CF" />
-    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7F0801D0" />
-    <public type="drawable" name="drawable_ic_ternary_off" id="0x7F0801D1" />
-    <public type="drawable" name="drawable_ic_ternary_on" id="0x7F0801D2" />
-    <public type="drawable" name="drawable_icon_sync_integration" id="0x7F0801D3" />
-    <public type="drawable" name="drawable_image_upload" id="0x7F0801D4" />
-    <public type="drawable" name="drawable_invite_share_art_envelope" id="0x7F0801D5" />
-    <public type="drawable" name="drawable_listitem_divider_left_padded" id="0x7F0801D6" />
-    <public type="drawable" name="drawable_logo_auth_dark" id="0x7F0801D7" />
-    <public type="drawable" name="drawable_logo_auth_light" id="0x7F0801D8" />
-    <public type="drawable" name="drawable_nitro_server_boost" id="0x7F0801D9" />
-    <public type="drawable" name="drawable_notifications_badge_border_color_tabs_background" id="0x7F0801DA" />
-    <public type="drawable" name="drawable_open_folder_dark" id="0x7F0801DB" />
-    <public type="drawable" name="drawable_open_folder_light" id="0x7F0801DC" />
-    <public type="drawable" name="drawable_overlay_category_dark" id="0x7F0801DD" />
-    <public type="drawable" name="drawable_overlay_category_light" id="0x7F0801DE" />
-    <public type="drawable" name="drawable_overlay_category_pressed_dark" id="0x7F0801DF" />
-    <public type="drawable" name="drawable_overlay_category_pressed_light" id="0x7F0801E0" />
-    <public type="drawable" name="drawable_overlay_channel_pressed_dark" id="0x7F0801E1" />
-    <public type="drawable" name="drawable_overlay_channel_pressed_light" id="0x7F0801E2" />
-    <public type="drawable" name="drawable_overlay_channels_active_dark" id="0x7F0801E3" />
-    <public type="drawable" name="drawable_overlay_channels_active_light" id="0x7F0801E4" />
-    <public type="drawable" name="drawable_overlay_channels_dark" id="0x7F0801E5" />
-    <public type="drawable" name="drawable_overlay_channels_light" id="0x7F0801E6" />
-    <public type="drawable" name="drawable_overlay_channels_selected_dark" id="0x7F0801E7" />
-    <public type="drawable" name="drawable_overlay_channels_selected_light" id="0x7F0801E8" />
-    <public type="drawable" name="drawable_overlay_guild_mentions_dark" id="0x7F0801E9" />
-    <public type="drawable" name="drawable_overlay_guild_mentions_light" id="0x7F0801EA" />
-    <public type="drawable" name="drawable_overlay_image_square" id="0x7F0801EB" />
-    <public type="drawable" name="drawable_overlay_mentions" id="0x7F0801EC" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7F0801ED" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7F0801EE" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7F0801EF" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_800" id="0x7F0801F0" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_light_130" id="0x7F0801F1" />
-    <public type="drawable" name="drawable_overlay_mentions_white" id="0x7F0801F2" />
-    <public type="drawable" name="drawable_overlay_thread_count_primary_dark" id="0x7F0801F3" />
-    <public type="drawable" name="drawable_overlay_thread_count_primary_light" id="0x7F0801F4" />
-    <public type="drawable" name="drawable_pill_background_tertiary" id="0x7F0801F5" />
-    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7F0801F6" />
-    <public type="drawable" name="drawable_progress_gradient_light" id="0x7F0801F7" />
-    <public type="drawable" name="drawable_progress_green" id="0x7F0801F8" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7F0801F9" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7F0801FA" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7F0801FB" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7F0801FC" />
-    <public type="drawable" name="drawable_ptrn_landing_bg_dark" id="0x7F0801FD" />
-    <public type="drawable" name="drawable_ptrn_landing_bg_light" id="0x7F0801FE" />
-    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7F0801FF" />
-    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7F080200" />
-    <public type="drawable" name="drawable_rect_guild_selected" id="0x7F080201" />
-    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7F080202" />
-    <public type="drawable" name="drawable_rect_rounded_bg_primary" id="0x7F080203" />
-    <public type="drawable" name="drawable_rect_rounded_bg_primary_dialog" id="0x7F080204" />
-    <public type="drawable" name="drawable_rect_rounded_bg_secondary" id="0x7F080205" />
-    <public type="drawable" name="drawable_rect_rounded_bg_tertiary" id="0x7F080206" />
-    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7F080207" />
-    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7F080208" />
-    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7F080209" />
-    <public type="drawable" name="drawable_rect_rounded_white_corner_radius_8dp" id="0x7F08020A" />
-    <public type="drawable" name="drawable_segmented_control_container_bg" id="0x7F08020B" />
-    <public type="drawable" name="drawable_settings_progress" id="0x7F08020C" />
-    <public type="drawable" name="drawable_squircle_brand_500" id="0x7F08020D" />
-    <public type="drawable" name="drawable_squircle_primary_600" id="0x7F08020E" />
-    <public type="drawable" name="drawable_squircle_primary_light_500_alpha_30" id="0x7F08020F" />
-    <public type="drawable" name="drawable_squircle_transparent" id="0x7F080210" />
-    <public type="drawable" name="drawable_squircle_white" id="0x7F080211" />
-    <public type="drawable" name="drawable_squircle_white_alpha_30" id="0x7F080212" />
-    <public type="drawable" name="drawable_start_stage_bg" id="0x7F080213" />
-    <public type="drawable" name="drawable_stream_ended_dark" id="0x7F080214" />
-    <public type="drawable" name="drawable_stream_ended_light" id="0x7F080215" />
-    <public type="drawable" name="drawable_stream_full" id="0x7F080216" />
-    <public type="drawable" name="drawable_stream_preview_not_available_dark" id="0x7F080217" />
-    <public type="drawable" name="drawable_stream_preview_not_available_light" id="0x7F080218" />
-    <public type="drawable" name="drawable_tag_brand" id="0x7F080219" />
-    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7F08021A" />
-    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7F08021B" />
-    <public type="drawable" name="drawable_thumb_grey" id="0x7F08021C" />
-    <public type="drawable" name="drawable_thumb_white" id="0x7F08021D" />
-    <public type="drawable" name="drawable_tooltip_top_tail" id="0x7F08021E" />
-    <public type="drawable" name="drawable_top_down_black_40_alpha_gradient" id="0x7F08021F" />
-    <public type="drawable" name="drawable_uikit_background_tertiary_button" id="0x7F080220" />
-    <public type="drawable" name="drawable_uikit_background_tertiary_button_outline" id="0x7F080221" />
-    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7F080222" />
-    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7F080223" />
-    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7F080224" />
-    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7F080225" />
-    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7F080226" />
-    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7F080227" />
-    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7F080228" />
-    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7F080229" />
-    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7F08022A" />
-    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7F08022B" />
-    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7F08022C" />
-    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7F08022D" />
-    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7F08022E" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7F08022F" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7F080230" />
-    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7F080231" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7F080232" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7F080233" />
-    <public type="drawable" name="drawable_uikit_primary_700_alpha_50_circle" id="0x7F080234" />
-    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7F080235" />
-    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7F080236" />
-    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7F080237" />
-    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7F080238" />
-    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7F080239" />
-    <public type="drawable" name="drawable_uikit_primary_light_000_circle" id="0x7F08023A" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7F08023B" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7F08023C" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7F08023D" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7F08023E" />
-    <public type="drawable" name="drawable_uikit_primary_light_200_alpha_50_circle" id="0x7F08023F" />
-    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7F080240" />
-    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7F080241" />
-    <public type="drawable" name="drawable_uikit_white_circle" id="0x7F080242" />
-    <public type="drawable" name="drawable_vc_empty" id="0x7F080243" />
-    <public type="drawable" name="drawable_voice_controls_bg" id="0x7F080244" />
-    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7F080245" />
-    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7F080246" />
-    <public type="drawable" name="drawable_voice_sensitivity_progress" id="0x7F080247" />
-    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7F080248" />
-    <public type="drawable" name="empty_pins_dark" id="0x7F080249" />
-    <public type="drawable" name="empty_pins_light" id="0x7F08024A" />
-    <public type="drawable" name="exo_controls_fastforward" id="0x7F08024B" />
-    <public type="drawable" name="exo_controls_fullscreen_enter" id="0x7F08024C" />
-    <public type="drawable" name="exo_controls_fullscreen_exit" id="0x7F08024D" />
-    <public type="drawable" name="exo_controls_next" id="0x7F08024E" />
-    <public type="drawable" name="exo_controls_pause" id="0x7F08024F" />
-    <public type="drawable" name="exo_controls_play" id="0x7F080250" />
-    <public type="drawable" name="exo_controls_previous" id="0x7F080251" />
-    <public type="drawable" name="exo_controls_repeat_all" id="0x7F080252" />
-    <public type="drawable" name="exo_controls_repeat_off" id="0x7F080253" />
-    <public type="drawable" name="exo_controls_repeat_one" id="0x7F080254" />
-    <public type="drawable" name="exo_controls_rewind" id="0x7F080255" />
-    <public type="drawable" name="exo_controls_shuffle_off" id="0x7F080256" />
-    <public type="drawable" name="exo_controls_shuffle_on" id="0x7F080257" />
-    <public type="drawable" name="exo_controls_vr" id="0x7F080258" />
-    <public type="drawable" name="exo_edit_mode_logo" id="0x7F080259" />
-    <public type="drawable" name="exo_ic_audiotrack" id="0x7F08025A" />
-    <public type="drawable" name="exo_ic_check" id="0x7F08025B" />
-    <public type="drawable" name="exo_ic_chevron_left" id="0x7F08025C" />
-    <public type="drawable" name="exo_ic_chevron_right" id="0x7F08025D" />
-    <public type="drawable" name="exo_ic_default_album_image" id="0x7F08025E" />
-    <public type="drawable" name="exo_ic_forward" id="0x7F08025F" />
-    <public type="drawable" name="exo_ic_fullscreen_enter" id="0x7F080260" />
-    <public type="drawable" name="exo_ic_fullscreen_exit" id="0x7F080261" />
-    <public type="drawable" name="exo_ic_pause_circle_filled" id="0x7F080262" />
-    <public type="drawable" name="exo_ic_play_circle_filled" id="0x7F080263" />
-    <public type="drawable" name="exo_ic_rewind" id="0x7F080264" />
-    <public type="drawable" name="exo_ic_settings" id="0x7F080265" />
-    <public type="drawable" name="exo_ic_skip_next" id="0x7F080266" />
-    <public type="drawable" name="exo_ic_skip_previous" id="0x7F080267" />
-    <public type="drawable" name="exo_ic_speed" id="0x7F080268" />
-    <public type="drawable" name="exo_ic_subtitle_off" id="0x7F080269" />
-    <public type="drawable" name="exo_ic_subtitle_on" id="0x7F08026A" />
-    <public type="drawable" name="exo_icon_circular_play" id="0x7F08026B" />
-    <public type="drawable" name="exo_icon_fastforward" id="0x7F08026C" />
-    <public type="drawable" name="exo_icon_fullscreen_enter" id="0x7F08026D" />
-    <public type="drawable" name="exo_icon_fullscreen_exit" id="0x7F08026E" />
-    <public type="drawable" name="exo_icon_next" id="0x7F08026F" />
-    <public type="drawable" name="exo_icon_pause" id="0x7F080270" />
-    <public type="drawable" name="exo_icon_play" id="0x7F080271" />
-    <public type="drawable" name="exo_icon_previous" id="0x7F080272" />
-    <public type="drawable" name="exo_icon_repeat_all" id="0x7F080273" />
-    <public type="drawable" name="exo_icon_repeat_off" id="0x7F080274" />
-    <public type="drawable" name="exo_icon_repeat_one" id="0x7F080275" />
-    <public type="drawable" name="exo_icon_rewind" id="0x7F080276" />
-    <public type="drawable" name="exo_icon_shuffle_off" id="0x7F080277" />
-    <public type="drawable" name="exo_icon_shuffle_on" id="0x7F080278" />
-    <public type="drawable" name="exo_icon_stop" id="0x7F080279" />
-    <public type="drawable" name="exo_icon_vr" id="0x7F08027A" />
-    <public type="drawable" name="exo_notification_fastforward" id="0x7F08027B" />
-    <public type="drawable" name="exo_notification_next" id="0x7F08027C" />
-    <public type="drawable" name="exo_notification_pause" id="0x7F08027D" />
-    <public type="drawable" name="exo_notification_play" id="0x7F08027E" />
-    <public type="drawable" name="exo_notification_previous" id="0x7F08027F" />
-    <public type="drawable" name="exo_notification_rewind" id="0x7F080280" />
-    <public type="drawable" name="exo_notification_small_icon" id="0x7F080281" />
-    <public type="drawable" name="exo_notification_stop" id="0x7F080282" />
-    <public type="drawable" name="exo_rounded_rectangle" id="0x7F080283" />
-    <public type="drawable" name="exo_styled_controls_audiotrack" id="0x7F080284" />
-    <public type="drawable" name="exo_styled_controls_check" id="0x7F080285" />
-    <public type="drawable" name="exo_styled_controls_fastforward" id="0x7F080286" />
-    <public type="drawable" name="exo_styled_controls_fullscreen_enter" id="0x7F080287" />
-    <public type="drawable" name="exo_styled_controls_fullscreen_exit" id="0x7F080288" />
-    <public type="drawable" name="exo_styled_controls_next" id="0x7F080289" />
-    <public type="drawable" name="exo_styled_controls_overflow_hide" id="0x7F08028A" />
-    <public type="drawable" name="exo_styled_controls_overflow_show" id="0x7F08028B" />
-    <public type="drawable" name="exo_styled_controls_pause" id="0x7F08028C" />
-    <public type="drawable" name="exo_styled_controls_play" id="0x7F08028D" />
-    <public type="drawable" name="exo_styled_controls_previous" id="0x7F08028E" />
-    <public type="drawable" name="exo_styled_controls_repeat_all" id="0x7F08028F" />
-    <public type="drawable" name="exo_styled_controls_repeat_off" id="0x7F080290" />
-    <public type="drawable" name="exo_styled_controls_repeat_one" id="0x7F080291" />
-    <public type="drawable" name="exo_styled_controls_rewind" id="0x7F080292" />
-    <public type="drawable" name="exo_styled_controls_settings" id="0x7F080293" />
-    <public type="drawable" name="exo_styled_controls_shuffle_off" id="0x7F080294" />
-    <public type="drawable" name="exo_styled_controls_shuffle_on" id="0x7F080295" />
-    <public type="drawable" name="exo_styled_controls_speed" id="0x7F080296" />
-    <public type="drawable" name="exo_styled_controls_subtitle_off" id="0x7F080297" />
-    <public type="drawable" name="exo_styled_controls_subtitle_on" id="0x7F080298" />
-    <public type="drawable" name="exo_styled_controls_vr" id="0x7F080299" />
-    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7F08029A" />
-    <public type="drawable" name="gif" id="0x7F08029B" />
-    <public type="drawable" name="googleg_disabled_color_18" id="0x7F08029C" />
-    <public type="drawable" name="googleg_standard_color_18" id="0x7F08029D" />
-    <public type="drawable" name="gradient_transparent_colorbackgroundsecondary" id="0x7F08029E" />
-    <public type="drawable" name="ic_accessibility_24dp" id="0x7F08029F" />
-    <public type="drawable" name="ic_account_bnet" id="0x7F0802A0" />
-    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7F0802A1" />
-    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7F0802A2" />
-    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7F0802A3" />
-    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7F0802A4" />
-    <public type="drawable" name="ic_account_facebook" id="0x7F0802A5" />
-    <public type="drawable" name="ic_account_github" id="0x7F0802A6" />
-    <public type="drawable" name="ic_account_google" id="0x7F0802A7" />
-    <public type="drawable" name="ic_account_lol" id="0x7F0802A8" />
-    <public type="drawable" name="ic_account_microsoft" id="0x7F0802A9" />
-    <public type="drawable" name="ic_account_obs" id="0x7F0802AA" />
-    <public type="drawable" name="ic_account_patreon" id="0x7F0802AB" />
-    <public type="drawable" name="ic_account_reddit" id="0x7F0802AC" />
-    <public type="drawable" name="ic_account_skype" id="0x7F0802AD" />
-    <public type="drawable" name="ic_account_spotify" id="0x7F0802AE" />
-    <public type="drawable" name="ic_account_steam" id="0x7F0802AF" />
-    <public type="drawable" name="ic_account_twitch" id="0x7F0802B0" />
-    <public type="drawable" name="ic_account_twitter" id="0x7F0802B1" />
-    <public type="drawable" name="ic_account_xbox" id="0x7F0802B2" />
-    <public type="drawable" name="ic_account_xsplit" id="0x7F0802B3" />
-    <public type="drawable" name="ic_account_youtube" id="0x7F0802B4" />
-    <public type="drawable" name="ic_activity_status_24dp" id="0x7F0802B5" />
-    <public type="drawable" name="ic_add_24dp" id="0x7F0802B6" />
-    <public type="drawable" name="ic_add_circle" id="0x7F0802B7" />
-    <public type="drawable" name="ic_add_circle_dark" id="0x7F0802B8" />
-    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7F0802B9" />
-    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7F0802BA" />
-    <public type="drawable" name="ic_add_friend_green_check" id="0x7F0802BB" />
-    <public type="drawable" name="ic_add_friend_plus" id="0x7F0802BC" />
-    <public type="drawable" name="ic_add_friend_send" id="0x7F0802BD" />
-    <public type="drawable" name="ic_add_person_16dp" id="0x7F0802BE" />
-    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7F0802BF" />
-    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7F0802C0" />
-    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7F0802C1" />
-    <public type="drawable" name="ic_add_white_24dp" id="0x7F0802C2" />
-    <public type="drawable" name="ic_alert_circle_16dp" id="0x7F0802C3" />
-    <public type="drawable" name="ic_analytics_16dp" id="0x7F0802C4" />
-    <public type="drawable" name="ic_application_status_approved" id="0x7F0802C5" />
-    <public type="drawable" name="ic_application_status_pending" id="0x7F0802C6" />
-    <public type="drawable" name="ic_application_status_rejected" id="0x7F0802C7" />
-    <public type="drawable" name="ic_application_status_started" id="0x7F0802C8" />
-    <public type="drawable" name="ic_archived_clock_dark" id="0x7F0802C9" />
-    <public type="drawable" name="ic_archived_clock_light" id="0x7F0802CA" />
-    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7F0802CB" />
-    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7F0802CC" />
-    <public type="drawable" name="ic_arrow_down" id="0x7F0802CD" />
-    <public type="drawable" name="ic_arrow_down_14dp" id="0x7F0802CE" />
-    <public type="drawable" name="ic_arrow_down_24dp" id="0x7F0802CF" />
-    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7F0802D0" />
-    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7F0802D1" />
-    <public type="drawable" name="ic_arrow_end_24dp" id="0x7F0802D2" />
-    <public type="drawable" name="ic_arrow_right" id="0x7F0802D3" />
-    <public type="drawable" name="ic_arrow_right_24dp" id="0x7F0802D4" />
-    <public type="drawable" name="ic_arrow_right_link_16dp" id="0x7F0802D5" />
-    <public type="drawable" name="ic_arrow_up_24dp" id="0x7F0802D6" />
-    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7F0802D7" />
-    <public type="drawable" name="ic_attachment_white_24dp" id="0x7F0802D8" />
-    <public type="drawable" name="ic_audio_output_bluetooth_white_24dp" id="0x7F0802D9" />
-    <public type="drawable" name="ic_audio_output_white_24dp" id="0x7F0802DA" />
-    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7F0802DB" />
-    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7F0802DC" />
-    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7F0802DD" />
-    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7F0802DE" />
-    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7F0802DF" />
-    <public type="drawable" name="ic_audit_calendar_grey_24dp" id="0x7F0802E0" />
-    <public type="drawable" name="ic_audit_calendar_white_24dp" id="0x7F0802E1" />
-    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7F0802E2" />
-    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7F0802E3" />
-    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7F0802E4" />
-    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7F0802E5" />
-    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7F0802E6" />
-    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7F0802E7" />
-    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7F0802E8" />
-    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7F0802E9" />
-    <public type="drawable" name="ic_audit_integrations_grey_24dp" id="0x7F0802EA" />
-    <public type="drawable" name="ic_audit_integrations_white_24dp" id="0x7F0802EB" />
-    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7F0802EC" />
-    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7F0802ED" />
-    <public type="drawable" name="ic_audit_logs_24dp" id="0x7F0802EE" />
-    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7F0802EF" />
-    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7F0802F0" />
-    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7F0802F1" />
-    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7F0802F2" />
-    <public type="drawable" name="ic_audit_stage_instance_grey_24dp" id="0x7F0802F3" />
-    <public type="drawable" name="ic_audit_stage_instance_white_24dp" id="0x7F0802F4" />
-    <public type="drawable" name="ic_audit_sticker_grey_24dp" id="0x7F0802F5" />
-    <public type="drawable" name="ic_audit_sticker_white_24dp" id="0x7F0802F6" />
-    <public type="drawable" name="ic_audit_thread_grey_24dp" id="0x7F0802F7" />
-    <public type="drawable" name="ic_audit_thread_white_24dp" id="0x7F0802F8" />
-    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7F0802F9" />
-    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7F0802FA" />
-    <public type="drawable" name="ic_authed_apps_24dp" id="0x7F0802FB" />
-    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7F0802FC" />
-    <public type="drawable" name="ic_backspace_white_24dp" id="0x7F0802FD" />
-    <public type="drawable" name="ic_ban_red_24dp" id="0x7F0802FE" />
-    <public type="drawable" name="ic_behavior_24dp" id="0x7F0802FF" />
-    <public type="drawable" name="ic_bell_12dp" id="0x7F080300" />
-    <public type="drawable" name="ic_bell_16dp" id="0x7F080301" />
-    <public type="drawable" name="ic_bell_20dp" id="0x7F080302" />
-    <public type="drawable" name="ic_billing_24dp" id="0x7F080303" />
-    <public type="drawable" name="ic_blocked_12dp" id="0x7F080304" />
-    <public type="drawable" name="ic_bluetooth_24dp" id="0x7F080305" />
-    <public type="drawable" name="ic_bnet_white_24dp" id="0x7F080306" />
-    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7F080307" />
-    <public type="drawable" name="ic_boosted_badge_18dp" id="0x7F080308" />
-    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7F080309" />
-    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7F08030A" />
-    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7F08030B" />
-    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7F08030C" />
-    <public type="drawable" name="ic_booster_profile_badge_24dp" id="0x7F08030D" />
-    <public type="drawable" name="ic_calendar_white_24dp" id="0x7F08030E" />
-    <public type="drawable" name="ic_call_24dp" id="0x7F08030F" />
-    <public type="drawable" name="ic_call_disconnect_24dp" id="0x7F080310" />
-    <public type="drawable" name="ic_call_indicator_mobile_screenshare_16dp" id="0x7F080311" />
-    <public type="drawable" name="ic_call_indicator_streaming_16dp" id="0x7F080312" />
-    <public type="drawable" name="ic_call_indicator_voice_16dp" id="0x7F080313" />
-    <public type="drawable" name="ic_call_invite_icon" id="0x7F080314" />
-    <public type="drawable" name="ic_call_toolbar_icon_camera_swap" id="0x7F080315" />
-    <public type="drawable" name="ic_call_toolbar_icon_grid" id="0x7F080316" />
-    <public type="drawable" name="ic_call_toolbar_icon_group" id="0x7F080317" />
-    <public type="drawable" name="ic_call_toolbar_icon_minimize" id="0x7F080318" />
-    <public type="drawable" name="ic_call_toolbar_icon_minimize_cutout" id="0x7F080319" />
-    <public type="drawable" name="ic_call_toolbar_stage_minimize" id="0x7F08031A" />
-    <public type="drawable" name="ic_call_toolbar_stage_minimize_cutout" id="0x7F08031B" />
-    <public type="drawable" name="ic_camera_24dp" id="0x7F08031C" />
-    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7F08031D" />
-    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7F08031E" />
-    <public type="drawable" name="ic_carot_right_24dp" id="0x7F08031F" />
-    <public type="drawable" name="ic_category_16dp" id="0x7F080320" />
-    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7F080321" />
-    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7F080322" />
-    <public type="drawable" name="ic_channel_announcements" id="0x7F080323" />
-    <public type="drawable" name="ic_channel_announcements_16dp" id="0x7F080324" />
-    <public type="drawable" name="ic_channel_announcements_locked" id="0x7F080325" />
-    <public type="drawable" name="ic_channel_announcements_nsfw" id="0x7F080326" />
-    <public type="drawable" name="ic_channel_announcements_thread" id="0x7F080327" />
-    <public type="drawable" name="ic_channel_announcements_thread_locked" id="0x7F080328" />
-    <public type="drawable" name="ic_channel_announcements_thread_nsfw" id="0x7F080329" />
-    <public type="drawable" name="ic_channel_lock_16dp" id="0x7F08032A" />
-    <public type="drawable" name="ic_channel_pinned_message" id="0x7F08032B" />
-    <public type="drawable" name="ic_channel_stage_16dp" id="0x7F08032C" />
-    <public type="drawable" name="ic_channel_stage_24dp" id="0x7F08032D" />
-    <public type="drawable" name="ic_channel_stage_24dp_gray_a60" id="0x7F08032E" />
-    <public type="drawable" name="ic_channel_stage_24dp_white" id="0x7F08032F" />
-    <public type="drawable" name="ic_channel_stage_24dp_white_a60" id="0x7F080330" />
-    <public type="drawable" name="ic_channel_stage_locked" id="0x7F080331" />
-    <public type="drawable" name="ic_channel_text" id="0x7F080332" />
-    <public type="drawable" name="ic_channel_text_16dp" id="0x7F080333" />
-    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7F080334" />
-    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7F080335" />
-    <public type="drawable" name="ic_channel_text_locked" id="0x7F080336" />
-    <public type="drawable" name="ic_channel_text_nsfw" id="0x7F080337" />
-    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7F080338" />
-    <public type="drawable" name="ic_channel_topic_ellipsis_dark" id="0x7F080339" />
-    <public type="drawable" name="ic_channel_topic_ellipsis_light" id="0x7F08033A" />
-    <public type="drawable" name="ic_channel_voice" id="0x7F08033B" />
-    <public type="drawable" name="ic_channel_voice_16dp" id="0x7F08033C" />
-    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7F08033D" />
-    <public type="drawable" name="ic_channel_voice_locked" id="0x7F08033E" />
-    <public type="drawable" name="ic_channels_24dp" id="0x7F08033F" />
-    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7F080340" />
-    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7F080341" />
-    <public type="drawable" name="ic_chat_list_actions_add_reaction" id="0x7F080342" />
-    <public type="drawable" name="ic_chat_message_white_24dp" id="0x7F080343" />
-    <public type="drawable" name="ic_check_16dp" id="0x7F080344" />
-    <public type="drawable" name="ic_check_active_16dp" id="0x7F080345" />
-    <public type="drawable" name="ic_check_blurple" id="0x7F080346" />
-    <public type="drawable" name="ic_check_brand_16dp" id="0x7F080347" />
-    <public type="drawable" name="ic_check_brand_24dp" id="0x7F080348" />
-    <public type="drawable" name="ic_check_circle_24dp" id="0x7F080349" />
-    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7F08034A" />
-    <public type="drawable" name="ic_check_green_24dp" id="0x7F08034B" />
-    <public type="drawable" name="ic_check_grey_24dp" id="0x7F08034C" />
-    <public type="drawable" name="ic_check_white_24dp" id="0x7F08034D" />
-    <public type="drawable" name="ic_checkmark_green_16dp" id="0x7F08034E" />
-    <public type="drawable" name="ic_chevron" id="0x7F08034F" />
-    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7F080350" />
-    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7F080351" />
-    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7F080352" />
-    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7F080353" />
-    <public type="drawable" name="ic_chevron_left_24dp" id="0x7F080354" />
-    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7F080355" />
-    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7F080356" />
-    <public type="drawable" name="ic_clear_24dp" id="0x7F080357" />
-    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7F080358" />
-    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7F080359" />
-    <public type="drawable" name="ic_clear_white_24dp" id="0x7F08035A" />
-    <public type="drawable" name="ic_clock_20dp" id="0x7F08035B" />
-    <public type="drawable" name="ic_clock_24dp" id="0x7F08035C" />
-    <public type="drawable" name="ic_clock_black_24dp" id="0x7F08035D" />
-    <public type="drawable" name="ic_close_24dp" id="0x7F08035E" />
-    <public type="drawable" name="ic_close_circle_grey_24dp" id="0x7F08035F" />
-    <public type="drawable" name="ic_close_circle_nova_grey_24dp" id="0x7F080360" />
-    <public type="drawable" name="ic_close_grey_24dp" id="0x7F080361" />
-    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7F080362" />
-    <public type="drawable" name="ic_close_white_18dp" id="0x7F080363" />
-    <public type="drawable" name="ic_close_white_24dp" id="0x7F080364" />
-    <public type="drawable" name="ic_community_24dp" id="0x7F080365" />
-    <public type="drawable" name="ic_community_update" id="0x7F080366" />
-    <public type="drawable" name="ic_compass" id="0x7F080367" />
-    <public type="drawable" name="ic_contact_sync_friends_list_upsell" id="0x7F080368" />
-    <public type="drawable" name="ic_contact_sync_white" id="0x7F080369" />
-    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7F08036A" />
-    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7F08036B" />
-    <public type="drawable" name="ic_controller_24dp" id="0x7F08036C" />
-    <public type="drawable" name="ic_copy_24dp" id="0x7F08036D" />
-    <public type="drawable" name="ic_creator_revenue_premium_18px" id="0x7F08036E" />
-    <public type="drawable" name="ic_creditcard_amex" id="0x7F08036F" />
-    <public type="drawable" name="ic_creditcard_discover" id="0x7F080370" />
-    <public type="drawable" name="ic_creditcard_generic" id="0x7F080371" />
-    <public type="drawable" name="ic_creditcard_mastercard" id="0x7F080372" />
-    <public type="drawable" name="ic_creditcard_paypal" id="0x7F080373" />
-    <public type="drawable" name="ic_creditcard_visa" id="0x7F080374" />
-    <public type="drawable" name="ic_crown_16dp" id="0x7F080375" />
-    <public type="drawable" name="ic_crown_24dp" id="0x7F080376" />
-    <public type="drawable" name="ic_deafen_state_dark" id="0x7F080377" />
-    <public type="drawable" name="ic_deafen_state_light" id="0x7F080378" />
-    <public type="drawable" name="ic_deafen_v2_deafened" id="0x7F080379" />
-    <public type="drawable" name="ic_deafen_v2_red_strike_primary_dark_300" id="0x7F08037A" />
-    <public type="drawable" name="ic_deafen_v2_red_strike_primary_light_600" id="0x7F08037B" />
-    <public type="drawable" name="ic_delete_24dp" id="0x7F08037C" />
-    <public type="drawable" name="ic_delete_circle" id="0x7F08037D" />
-    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7F08037E" />
-    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7F08037F" />
-    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7F080380" />
-    <public type="drawable" name="ic_delete_white_24dp" id="0x7F080381" />
-    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7F080382" />
-    <public type="drawable" name="ic_diag_link_24dp" id="0x7F080383" />
-    <public type="drawable" name="ic_direct_message_header" id="0x7F080384" />
-    <public type="drawable" name="ic_directory_selected_background" id="0x7F080385" />
-    <public type="drawable" name="ic_directory_selector_background" id="0x7F080386" />
-    <public type="drawable" name="ic_done_activated_24dp" id="0x7F080387" />
-    <public type="drawable" name="ic_done_green_24dp" id="0x7F080388" />
-    <public type="drawable" name="ic_double_carot_right_16dp" id="0x7F080389" />
-    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7F08038A" />
-    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7F08038B" />
-    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7F08038C" />
-    <public type="drawable" name="ic_edit_24dp" id="0x7F08038D" />
-    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7F08038E" />
-    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7F08038F" />
-    <public type="drawable" name="ic_ellipsis_16dp" id="0x7F080390" />
-    <public type="drawable" name="ic_email_verification_24dp" id="0x7F080391" />
-    <public type="drawable" name="ic_embed_white_24dp" id="0x7F080392" />
-    <public type="drawable" name="ic_emoji_24dp" id="0x7F080393" />
-    <public type="drawable" name="ic_emoji_blue_24dp" id="0x7F080394" />
-    <public type="drawable" name="ic_emoji_picker_category_activity" id="0x7F080395" />
-    <public type="drawable" name="ic_emoji_picker_category_custom" id="0x7F080396" />
-    <public type="drawable" name="ic_emoji_picker_category_favorites_star" id="0x7F080397" />
-    <public type="drawable" name="ic_emoji_picker_category_flags" id="0x7F080398" />
-    <public type="drawable" name="ic_emoji_picker_category_food" id="0x7F080399" />
-    <public type="drawable" name="ic_emoji_picker_category_nature" id="0x7F08039A" />
-    <public type="drawable" name="ic_emoji_picker_category_objects" id="0x7F08039B" />
-    <public type="drawable" name="ic_emoji_picker_category_people" id="0x7F08039C" />
-    <public type="drawable" name="ic_emoji_picker_category_recent" id="0x7F08039D" />
-    <public type="drawable" name="ic_emoji_picker_category_symbols" id="0x7F08039E" />
-    <public type="drawable" name="ic_emoji_picker_category_travel" id="0x7F08039F" />
-    <public type="drawable" name="ic_empty_server_settings_integrations_dark" id="0x7F0803A0" />
-    <public type="drawable" name="ic_empty_server_settings_integrations_light" id="0x7F0803A1" />
-    <public type="drawable" name="ic_end_event_24dp" id="0x7F0803A2" />
-    <public type="drawable" name="ic_event_20dp" id="0x7F0803A3" />
-    <public type="drawable" name="ic_event_24dp" id="0x7F0803A4" />
-    <public type="drawable" name="ic_events_empty" id="0x7F0803A5" />
-    <public type="drawable" name="ic_exit_24dp" id="0x7F0803A6" />
-    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7F0803A7" />
-    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7F0803A8" />
-    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7F0803A9" />
-    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7F0803AA" />
-    <public type="drawable" name="ic_expression_icon_cutout_24dp" id="0x7F0803AB" />
-    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_100" id="0x7F0803AC" />
-    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_500" id="0x7F0803AD" />
-    <public type="drawable" name="ic_expression_search_empty_dark" id="0x7F0803AE" />
-    <public type="drawable" name="ic_expression_search_empty_light" id="0x7F0803AF" />
-    <public type="drawable" name="ic_facebook_white_18dp" id="0x7F0803B0" />
-    <public type="drawable" name="ic_facebook_white_24dp" id="0x7F0803B1" />
-    <public type="drawable" name="ic_feedback_happy" id="0x7F0803B2" />
-    <public type="drawable" name="ic_feedback_happy_desaturated_dark" id="0x7F0803B3" />
-    <public type="drawable" name="ic_feedback_happy_desaturated_light" id="0x7F0803B4" />
-    <public type="drawable" name="ic_feedback_neutral" id="0x7F0803B5" />
-    <public type="drawable" name="ic_feedback_neutral_desaturated_dark" id="0x7F0803B6" />
-    <public type="drawable" name="ic_feedback_neutral_desaturated_light" id="0x7F0803B7" />
-    <public type="drawable" name="ic_feedback_sad" id="0x7F0803B8" />
-    <public type="drawable" name="ic_feedback_sad_desaturated_dark" id="0x7F0803B9" />
-    <public type="drawable" name="ic_feedback_sad_desaturated_light" id="0x7F0803BA" />
-    <public type="drawable" name="ic_file_acrobat" id="0x7F0803BB" />
-    <public type="drawable" name="ic_file_ae" id="0x7F0803BC" />
-    <public type="drawable" name="ic_file_ai" id="0x7F0803BD" />
-    <public type="drawable" name="ic_file_archive" id="0x7F0803BE" />
-    <public type="drawable" name="ic_file_audio" id="0x7F0803BF" />
-    <public type="drawable" name="ic_file_code" id="0x7F0803C0" />
-    <public type="drawable" name="ic_file_document" id="0x7F0803C1" />
-    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7F0803C2" />
-    <public type="drawable" name="ic_file_download_white_24dp" id="0x7F0803C3" />
-    <public type="drawable" name="ic_file_large_code" id="0x7F0803C4" />
-    <public type="drawable" name="ic_file_large_document" id="0x7F0803C5" />
-    <public type="drawable" name="ic_file_large_video" id="0x7F0803C6" />
-    <public type="drawable" name="ic_file_ps" id="0x7F0803C7" />
-    <public type="drawable" name="ic_file_sketch" id="0x7F0803C8" />
-    <public type="drawable" name="ic_file_spreadsheet" id="0x7F0803C9" />
-    <public type="drawable" name="ic_file_unknown" id="0x7F0803CA" />
-    <public type="drawable" name="ic_file_upload_24dp" id="0x7F0803CB" />
-    <public type="drawable" name="ic_file_video" id="0x7F0803CC" />
-    <public type="drawable" name="ic_file_webcode" id="0x7F0803CD" />
-    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7F0803CE" />
-    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7F0803CF" />
-    <public type="drawable" name="ic_flag_24dp" id="0x7F0803D0" />
-    <public type="drawable" name="ic_flash_auto_24dp" id="0x7F0803D1" />
-    <public type="drawable" name="ic_flash_off_24dp" id="0x7F0803D2" />
-    <public type="drawable" name="ic_flash_on_24dp" id="0x7F0803D3" />
-    <public type="drawable" name="ic_flash_torch_24dp" id="0x7F0803D4" />
-    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_dark" id="0x7F0803D5" />
-    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_light" id="0x7F0803D6" />
-    <public type="drawable" name="ic_flex_input_audio_24dp_dark" id="0x7F0803D7" />
-    <public type="drawable" name="ic_flex_input_audio_24dp_light" id="0x7F0803D8" />
-    <public type="drawable" name="ic_flex_input_create_thread_24dp_dark" id="0x7F0803D9" />
-    <public type="drawable" name="ic_flex_input_create_thread_24dp_light" id="0x7F0803DA" />
-    <public type="drawable" name="ic_flex_input_file_24dp_dark" id="0x7F0803DB" />
-    <public type="drawable" name="ic_flex_input_file_24dp_light" id="0x7F0803DC" />
-    <public type="drawable" name="ic_flex_input_image_24dp_dark" id="0x7F0803DD" />
-    <public type="drawable" name="ic_flex_input_image_24dp_light" id="0x7F0803DE" />
-    <public type="drawable" name="ic_flex_input_movie_24dp_dark" id="0x7F0803DF" />
-    <public type="drawable" name="ic_flex_input_movie_24dp_light" id="0x7F0803E0" />
-    <public type="drawable" name="ic_gallery_24dp" id="0x7F0803E1" />
-    <public type="drawable" name="ic_games_24dp" id="0x7F0803E2" />
-    <public type="drawable" name="ic_gem_tier_1" id="0x7F0803E3" />
-    <public type="drawable" name="ic_gem_tier_2" id="0x7F0803E4" />
-    <public type="drawable" name="ic_gem_tier_3" id="0x7F0803E5" />
-    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7F0803E6" />
-    <public type="drawable" name="ic_gift_24dp" id="0x7F0803E7" />
-    <public type="drawable" name="ic_github_white" id="0x7F0803E8" />
-    <public type="drawable" name="ic_globe_24dp" id="0x7F0803E9" />
-    <public type="drawable" name="ic_globe_32dp" id="0x7F0803EA" />
-    <public type="drawable" name="ic_google_auth_logo" id="0x7F0803EB" />
-    <public type="drawable" name="ic_google_white_24dp" id="0x7F0803EC" />
-    <public type="drawable" name="ic_group_add_white_24dp" id="0x7F0803ED" />
-    <public type="drawable" name="ic_group_edit" id="0x7F0803EE" />
-    <public type="drawable" name="ic_group_join" id="0x7F0803EF" />
-    <public type="drawable" name="ic_group_leave" id="0x7F0803F0" />
-    <public type="drawable" name="ic_group_message_header" id="0x7F0803F1" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7F0803F2" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7F0803F3" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7F0803F4" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7F0803F5" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7F0803F6" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7F0803F7" />
-    <public type="drawable" name="ic_guild_folder" id="0x7F0803F8" />
-    <public type="drawable" name="ic_guild_invite_24dp" id="0x7F0803F9" />
-    <public type="drawable" name="ic_guild_list_dms_24dp" id="0x7F0803FA" />
-    <public type="drawable" name="ic_guild_list_pending_folder" id="0x7F0803FB" />
-    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7F0803FC" />
-    <public type="drawable" name="ic_guild_nitro_progress" id="0x7F0803FD" />
-    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7F0803FE" />
-    <public type="drawable" name="ic_guild_notifications_24dp" id="0x7F0803FF" />
-    <public type="drawable" name="ic_guild_settings_24dp" id="0x7F080400" />
-    <public type="drawable" name="ic_guild_welcome_add_friend" id="0x7F080401" />
-    <public type="drawable" name="ic_guild_welcome_personalize" id="0x7F080402" />
-    <public type="drawable" name="ic_hammer_24dp" id="0x7F080403" />
-    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7F080404" />
-    <public type="drawable" name="ic_headset_10dp" id="0x7F080405" />
-    <public type="drawable" name="ic_headset_12dp" id="0x7F080406" />
-    <public type="drawable" name="ic_headset_24dp" id="0x7F080407" />
-    <public type="drawable" name="ic_headset_blue_24dp" id="0x7F080408" />
-    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7F080409" />
-    <public type="drawable" name="ic_headset_deafened_grey_a60_24dp" id="0x7F08040A" />
-    <public type="drawable" name="ic_headset_deafened_interactiveactive_dark_24dp" id="0x7F08040B" />
-    <public type="drawable" name="ic_headset_deafened_interactiveactive_light_24dp" id="0x7F08040C" />
-    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7F08040D" />
-    <public type="drawable" name="ic_headset_deafened_white_a60_24dp" id="0x7F08040E" />
-    <public type="drawable" name="ic_headset_grey_24dp" id="0x7F08040F" />
-    <public type="drawable" name="ic_headset_grey_a60_24dp" id="0x7F080410" />
-    <public type="drawable" name="ic_headset_interactivenormal_dark_24dp" id="0x7F080411" />
-    <public type="drawable" name="ic_headset_interactivenormal_light_24dp" id="0x7F080412" />
-    <public type="drawable" name="ic_headset_white_18dp" id="0x7F080413" />
-    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7F080414" />
-    <public type="drawable" name="ic_headset_white_24dp" id="0x7F080415" />
-    <public type="drawable" name="ic_headset_white_a60_24dp" id="0x7F080416" />
-    <public type="drawable" name="ic_heart_12dp" id="0x7F080417" />
-    <public type="drawable" name="ic_heart_16dp" id="0x7F080418" />
-    <public type="drawable" name="ic_heart_24dp" id="0x7F080419" />
-    <public type="drawable" name="ic_help_24dp" id="0x7F08041A" />
-    <public type="drawable" name="ic_history_white_24dp" id="0x7F08041B" />
-    <public type="drawable" name="ic_hour_glass_10dp" id="0x7F08041C" />
-    <public type="drawable" name="ic_house_24dp" id="0x7F08041D" />
-    <public type="drawable" name="ic_hub_24dp" id="0x7F08041E" />
-    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7F08041F" />
-    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7F080420" />
-    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7F080421" />
-    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7F080422" />
-    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7F080423" />
-    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7F080424" />
-    <public type="drawable" name="ic_identity_card" id="0x7F080425" />
-    <public type="drawable" name="ic_image_library_24dp" id="0x7F080426" />
-    <public type="drawable" name="ic_image_upload" id="0x7F080427" />
-    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7F080428" />
-    <public type="drawable" name="ic_img_selected_light_theme" id="0x7F080429" />
-    <public type="drawable" name="ic_info_24dp" id="0x7F08042A" />
-    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7F08042B" />
-    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7F08042C" />
-    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7F08042D" />
-    <public type="drawable" name="ic_instagram_white_18dp" id="0x7F08042E" />
-    <public type="drawable" name="ic_key_24dp" id="0x7F08042F" />
-    <public type="drawable" name="ic_keyboard_24dp" id="0x7F080430" />
-    <public type="drawable" name="ic_keyboard_black_24dp" id="0x7F080431" />
-    <public type="drawable" name="ic_krisp_logo_dark" id="0x7F080432" />
-    <public type="drawable" name="ic_krisp_logo_light" id="0x7F080433" />
-    <public type="drawable" name="ic_launch_24dp" id="0x7F080434" />
-    <public type="drawable" name="ic_link_white_24dp" id="0x7F080435" />
-    <public type="drawable" name="ic_locale_24dp" id="0x7F080436" />
-    <public type="drawable" name="ic_location_16dp" id="0x7F080437" />
-    <public type="drawable" name="ic_location_24dp" id="0x7F080438" />
-    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7F080439" />
-    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7F08043A" />
-    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7F08043B" />
-    <public type="drawable" name="ic_logo" id="0x7F08043C" />
-    <public type="drawable" name="ic_lol_white_24dp" id="0x7F08043D" />
-    <public type="drawable" name="ic_mail_24dp" id="0x7F08043E" />
-    <public type="drawable" name="ic_mark_unread_24dp" id="0x7F08043F" />
-    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7F080440" />
-    <public type="drawable" name="ic_member_verification_chat_guard_cta" id="0x7F080441" />
-    <public type="drawable" name="ic_member_verification_pending" id="0x7F080442" />
-    <public type="drawable" name="ic_members_12dp" id="0x7F080443" />
-    <public type="drawable" name="ic_members_24dp" id="0x7F080444" />
-    <public type="drawable" name="ic_mentions_empty" id="0x7F080445" />
-    <public type="drawable" name="ic_mentions_white_24dp" id="0x7F080446" />
-    <public type="drawable" name="ic_menu_24dp" id="0x7F080447" />
-    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7F080448" />
-    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7F080449" />
-    <public type="drawable" name="ic_mic_grey_24dp" id="0x7F08044A" />
-    <public type="drawable" name="ic_mic_grey_a60_24dp" id="0x7F08044B" />
-    <public type="drawable" name="ic_mic_interactivenormal_dark_24dp" id="0x7F08044C" />
-    <public type="drawable" name="ic_mic_interactivenormal_light_24dp" id="0x7F08044D" />
-    <public type="drawable" name="ic_mic_mute_red_strike_24dp" id="0x7F08044E" />
-    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7F08044F" />
-    <public type="drawable" name="ic_mic_muted_grey_a60_24dp" id="0x7F080450" />
-    <public type="drawable" name="ic_mic_muted_interactiveactive_dark_24dp" id="0x7F080451" />
-    <public type="drawable" name="ic_mic_muted_interactiveactive_light_24dp" id="0x7F080452" />
-    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7F080453" />
-    <public type="drawable" name="ic_mic_muted_white_a60_24dp" id="0x7F080454" />
-    <public type="drawable" name="ic_mic_state_dark" id="0x7F080455" />
-    <public type="drawable" name="ic_mic_state_light" id="0x7F080456" />
-    <public type="drawable" name="ic_mic_white_18dp" id="0x7F080457" />
-    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7F080458" />
-    <public type="drawable" name="ic_mic_white_24dp" id="0x7F080459" />
-    <public type="drawable" name="ic_mic_white_a60_24dp" id="0x7F08045A" />
-    <public type="drawable" name="ic_mobile" id="0x7F08045B" />
-    <public type="drawable" name="ic_mobile_screenshare_24dp" id="0x7F08045C" />
-    <public type="drawable" name="ic_mobile_screenshare_end_24dp" id="0x7F08045D" />
-    <public type="drawable" name="ic_moderator_shield_24dp" id="0x7F08045E" />
-    <public type="drawable" name="ic_monitor_white_24dp" id="0x7F08045F" />
-    <public type="drawable" name="ic_more_options_with_circular_background" id="0x7F080460" />
-    <public type="drawable" name="ic_more_primary100_24dp" id="0x7F080461" />
-    <public type="drawable" name="ic_more_primary900_24dp" id="0x7F080462" />
-    <public type="drawable" name="ic_mtrl_checked_circle" id="0x7F080463" />
-    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7F080464" />
-    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7F080465" />
-    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7F080466" />
-    <public type="drawable" name="ic_mute_v2_muted" id="0x7F080467" />
-    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_dark_300" id="0x7F080468" />
-    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_light_600" id="0x7F080469" />
-    <public type="drawable" name="ic_my_account_24dp" id="0x7F08046A" />
-    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7F08046B" />
-    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7F08046C" />
-    <public type="drawable" name="ic_network_airplane_mode" id="0x7F08046D" />
-    <public type="drawable" name="ic_network_airplane_mode_light" id="0x7F08046E" />
-    <public type="drawable" name="ic_network_connecting_animated_vector" id="0x7F08046F" />
-    <public type="drawable" name="ic_network_connecting_animated_vector_light" id="0x7F080470" />
-    <public type="drawable" name="ic_network_offline" id="0x7F080471" />
-    <public type="drawable" name="ic_network_offline_light" id="0x7F080472" />
-    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7F080473" />
-    <public type="drawable" name="ic_nitro_badge_white" id="0x7F080474" />
-    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7F080475" />
-    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7F080476" />
-    <public type="drawable" name="ic_nitro_rep" id="0x7F080477" />
-    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7F080478" />
-    <public type="drawable" name="ic_nitro_wheel_18dp" id="0x7F080479" />
-    <public type="drawable" name="ic_noise_cancellation_active_24dp" id="0x7F08047A" />
-    <public type="drawable" name="ic_noise_cancellation_disabled_24dp" id="0x7F08047B" />
-    <public type="drawable" name="ic_notification_24dp" id="0x7F08047C" />
-    <public type="drawable" name="ic_notification_call_24dp" id="0x7F08047D" />
-    <public type="drawable" name="ic_notification_friends_24dp" id="0x7F08047E" />
-    <public type="drawable" name="ic_notification_message_24dp" id="0x7F08047F" />
-    <public type="drawable" name="ic_notification_settings_24dp" id="0x7F080480" />
-    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7F080481" />
-    <public type="drawable" name="ic_notifications_off_grey_24dp" id="0x7F080482" />
-    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7F080483" />
-    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7F080484" />
-    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7F080485" />
-    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7F080486" />
-    <public type="drawable" name="ic_notifications_white_24dp" id="0x7F080487" />
-    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7F080488" />
-    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7F080489" />
-    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7F08048A" />
-    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7F08048B" />
-    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7F08048C" />
-    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7F08048D" />
-    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7F08048E" />
-    <public type="drawable" name="ic_overflow_dark_24dp" id="0x7F08048F" />
-    <public type="drawable" name="ic_overflow_light_24dp" id="0x7F080490" />
-    <public type="drawable" name="ic_partnered_badge" id="0x7F080491" />
-    <public type="drawable" name="ic_partnered_badge_banner" id="0x7F080492" />
-    <public type="drawable" name="ic_people_white_24dp" id="0x7F080493" />
-    <public type="drawable" name="ic_perk_lock" id="0x7F080494" />
-    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7F080495" />
-    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7F080496" />
-    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7F080497" />
-    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7F080498" />
-    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7F080499" />
-    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7F08049A" />
-    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7F08049B" />
-    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7F08049C" />
-    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7F08049D" />
-    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7F08049E" />
-    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7F08049F" />
-    <public type="drawable" name="ic_person_shield_24dp" id="0x7F0804A0" />
-    <public type="drawable" name="ic_person_shield_purple_24dp" id="0x7F0804A1" />
-    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7F0804A2" />
-    <public type="drawable" name="ic_phone_24dp" id="0x7F0804A3" />
-    <public type="drawable" name="ic_phone_verification_24dp" id="0x7F0804A4" />
-    <public type="drawable" name="ic_phonelink_24dp" id="0x7F0804A5" />
-    <public type="drawable" name="ic_photo_grey_24dp" id="0x7F0804A6" />
-    <public type="drawable" name="ic_pin_24dp" id="0x7F0804A7" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_1" id="0x7F0804A8" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_10" id="0x7F0804A9" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_13" id="0x7F0804AA" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_2" id="0x7F0804AB" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_28" id="0x7F0804AC" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_3" id="0x7F0804AD" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_5" id="0x7F0804AE" />
-    <public type="drawable" name="ic_plan_premium_guild_1" id="0x7F0804AF" />
-    <public type="drawable" name="ic_plan_premium_guild_2" id="0x7F0804B0" />
-    <public type="drawable" name="ic_plan_premium_tier_1" id="0x7F0804B1" />
-    <public type="drawable" name="ic_plan_premium_tier_1_and_premium_guild_1" id="0x7F0804B2" />
-    <public type="drawable" name="ic_plan_premium_tier_1_year" id="0x7F0804B3" />
-    <public type="drawable" name="ic_plan_premium_tier_2" id="0x7F0804B4" />
-    <public type="drawable" name="ic_plan_premium_tier_2_year" id="0x7F0804B5" />
-    <public type="drawable" name="ic_play_arrow_24dp" id="0x7F0804B6" />
-    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7F0804B7" />
-    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7F0804B8" />
-    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7F0804B9" />
-    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7F0804BA" />
-    <public type="drawable" name="ic_premium_24dp" id="0x7F0804BB" />
-    <public type="drawable" name="ic_premium_marketing_custom_profile_24dp" id="0x7F0804BC" />
-    <public type="drawable" name="ic_premium_marketing_global_emojis_24dp" id="0x7F0804BD" />
-    <public type="drawable" name="ic_premium_marketing_guild_boost_24dp" id="0x7F0804BE" />
-    <public type="drawable" name="ic_premium_marketing_longer_messages_24dp" id="0x7F0804BF" />
-    <public type="drawable" name="ic_premium_marketing_more_guilds_24dp" id="0x7F0804C0" />
-    <public type="drawable" name="ic_premium_marketing_stickers_24dp" id="0x7F0804C1" />
-    <public type="drawable" name="ic_premium_marketing_stream_quality_24dp" id="0x7F0804C2" />
-    <public type="drawable" name="ic_premium_marketing_upload_size_24dp" id="0x7F0804C3" />
-    <public type="drawable" name="ic_privacy_24dp" id="0x7F0804C4" />
-    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7F0804C5" />
-    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7F0804C6" />
-    <public type="drawable" name="ic_profile_24dp" id="0x7F0804C7" />
-    <public type="drawable" name="ic_profile_badge_bughunter_level_1_32dp" id="0x7F0804C8" />
-    <public type="drawable" name="ic_profile_badge_bughunter_level_2_32dp" id="0x7F0804C9" />
-    <public type="drawable" name="ic_profile_badge_certified_moderator_32dp" id="0x7F0804CA" />
-    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7F0804CB" />
-    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7F0804CC" />
-    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7F0804CD" />
-    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7F0804CE" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7F0804CF" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7F0804D0" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7F0804D1" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7F0804D2" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7F0804D3" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7F0804D4" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7F0804D5" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7F0804D6" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7F0804D7" />
-    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7F0804D8" />
-    <public type="drawable" name="ic_profile_badge_verified_developer_32dp" id="0x7F0804D9" />
-    <public type="drawable" name="ic_publish_24dp" id="0x7F0804DA" />
-    <public type="drawable" name="ic_qr_code_24dp" id="0x7F0804DB" />
-    <public type="drawable" name="ic_quote_grey_a60_24dp" id="0x7F0804DC" />
-    <public type="drawable" name="ic_quote_white_a60_24dp" id="0x7F0804DD" />
-    <public type="drawable" name="ic_raised_hand_action_24dp" id="0x7F0804DE" />
-    <public type="drawable" name="ic_reaction_24dp" id="0x7F0804DF" />
-    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7F0804E0" />
-    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7F0804E1" />
-    <public type="drawable" name="ic_recent_24dp" id="0x7F0804E2" />
-    <public type="drawable" name="ic_recent_grey_a60_24dp" id="0x7F0804E3" />
-    <public type="drawable" name="ic_recent_white_a60_24dp" id="0x7F0804E4" />
-    <public type="drawable" name="ic_reddit_white_24dp" id="0x7F0804E5" />
-    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7F0804E6" />
-    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7F0804E7" />
-    <public type="drawable" name="ic_reminder_notification" id="0x7F0804E8" />
-    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7F0804E9" />
-    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7F0804EA" />
-    <public type="drawable" name="ic_remove_reaction_24dp" id="0x7F0804EB" />
-    <public type="drawable" name="ic_removed_sticker_72dp" id="0x7F0804EC" />
-    <public type="drawable" name="ic_reply_24dp" id="0x7F0804ED" />
-    <public type="drawable" name="ic_resend_24dp" id="0x7F0804EE" />
-    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7F0804EF" />
-    <public type="drawable" name="ic_role_24dp" id="0x7F0804F0" />
-    <public type="drawable" name="ic_role_lock" id="0x7F0804F1" />
-    <public type="drawable" name="ic_role_pink_24dp" id="0x7F0804F2" />
-    <public type="drawable" name="ic_screen_14dp" id="0x7F0804F3" />
-    <public type="drawable" name="ic_search" id="0x7F0804F4" />
-    <public type="drawable" name="ic_search_16dp" id="0x7F0804F5" />
-    <public type="drawable" name="ic_search_grey_24dp" id="0x7F0804F6" />
-    <public type="drawable" name="ic_search_no_results" id="0x7F0804F7" />
-    <public type="drawable" name="ic_search_white_24dp" id="0x7F0804F8" />
-    <public type="drawable" name="ic_security_24dp" id="0x7F0804F9" />
-    <public type="drawable" name="ic_select" id="0x7F0804FA" />
-    <public type="drawable" name="ic_select_all" id="0x7F0804FB" />
-    <public type="drawable" name="ic_send_24dp" id="0x7F0804FC" />
-    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7F0804FD" />
-    <public type="drawable" name="ic_send_white_24dp" id="0x7F0804FE" />
-    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7F0804FF" />
-    <public type="drawable" name="ic_settings_24dp" id="0x7F080500" />
-    <public type="drawable" name="ic_settings_boost_24dp" id="0x7F080501" />
-    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7F080502" />
-    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7F080503" />
-    <public type="drawable" name="ic_share_16dp" id="0x7F080504" />
-    <public type="drawable" name="ic_share_24dp" id="0x7F080505" />
-    <public type="drawable" name="ic_share_grey_24dp" id="0x7F080506" />
-    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7F080507" />
-    <public type="drawable" name="ic_share_white_24dp" id="0x7F080508" />
-    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7F080509" />
-    <public type="drawable" name="ic_shieldstar_24dp" id="0x7F08050A" />
-    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7F08050B" />
-    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7F08050C" />
-    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7F08050D" />
-    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7F08050E" />
-    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7F08050F" />
-    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7F080510" />
-    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7F080511" />
-    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7F080512" />
-    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7F080513" />
-    <public type="drawable" name="ic_skype_white_24dp" id="0x7F080514" />
-    <public type="drawable" name="ic_slash_command_24dp" id="0x7F080515" />
-    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7F080516" />
-    <public type="drawable" name="ic_smile_24dp" id="0x7F080517" />
-    <public type="drawable" name="ic_smiley_desaturated" id="0x7F080518" />
-    <public type="drawable" name="ic_sort_grey_24dp" id="0x7F080519" />
-    <public type="drawable" name="ic_sort_white_24dp" id="0x7F08051A" />
-    <public type="drawable" name="ic_sound_24dp" id="0x7F08051B" />
-    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7F08051C" />
-    <public type="drawable" name="ic_sound_quiet_24dp" id="0x7F08051D" />
-    <public type="drawable" name="ic_sparkle" id="0x7F08051E" />
-    <public type="drawable" name="ic_spectate" id="0x7F08051F" />
-    <public type="drawable" name="ic_spine_long_cap" id="0x7F080520" />
-    <public type="drawable" name="ic_spine_long_no_cap" id="0x7F080521" />
-    <public type="drawable" name="ic_spine_short_cap" id="0x7F080522" />
-    <public type="drawable" name="ic_spine_short_no_cap" id="0x7F080523" />
-    <public type="drawable" name="ic_spotify_green_24dp" id="0x7F080524" />
-    <public type="drawable" name="ic_spotify_white_24dp" id="0x7F080525" />
-    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7F080526" />
-    <public type="drawable" name="ic_stage_20dp" id="0x7F080527" />
-    <public type="drawable" name="ic_stage_audience" id="0x7F080528" />
-    <public type="drawable" name="ic_stage_invite_speak" id="0x7F080529" />
-    <public type="drawable" name="ic_stage_leave_20dp" id="0x7F08052A" />
-    <public type="drawable" name="ic_stage_move_to_audience" id="0x7F08052B" />
-    <public type="drawable" name="ic_stage_move_to_speaker" id="0x7F08052C" />
-    <public type="drawable" name="ic_stage_raised_hand" id="0x7F08052D" />
-    <public type="drawable" name="ic_stage_raised_hand_24dp_activatable" id="0x7F08052E" />
-    <public type="drawable" name="ic_stage_raised_hand_green_bg_24dp" id="0x7F08052F" />
-    <public type="drawable" name="ic_stage_raised_hand_list" id="0x7F080530" />
-    <public type="drawable" name="ic_stage_raised_hand_white_bg_24dp" id="0x7F080531" />
-    <public type="drawable" name="ic_star_24dp" id="0x7F080532" />
-    <public type="drawable" name="ic_status_24dp" id="0x7F080533" />
-    <public type="drawable" name="ic_status_dnd_16dp" id="0x7F080534" />
-    <public type="drawable" name="ic_status_idle_16dp" id="0x7F080535" />
-    <public type="drawable" name="ic_status_invisible_16dp" id="0x7F080536" />
-    <public type="drawable" name="ic_status_online_16dp" id="0x7F080537" />
-    <public type="drawable" name="ic_status_streaming_16dp" id="0x7F080538" />
-    <public type="drawable" name="ic_steam_white_24dp" id="0x7F080539" />
-    <public type="drawable" name="ic_sticker_icon_24dp" id="0x7F08053A" />
-    <public type="drawable" name="ic_sticker_shop_icon_32dp" id="0x7F08053B" />
-    <public type="drawable" name="ic_sticker_shop_icon_badged_32dp" id="0x7F08053C" />
-    <public type="drawable" name="ic_stop_stream" id="0x7F08053D" />
-    <public type="drawable" name="ic_success_discovery" id="0x7F08053E" />
-    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7F08053F" />
-    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7F080540" />
-    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7F080541" />
-    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7F080542" />
-    <public type="drawable" name="ic_tab_friends" id="0x7F080543" />
-    <public type="drawable" name="ic_tab_home" id="0x7F080544" />
-    <public type="drawable" name="ic_tab_mentions" id="0x7F080545" />
-    <public type="drawable" name="ic_tab_search" id="0x7F080546" />
-    <public type="drawable" name="ic_take_photo" id="0x7F080547" />
-    <public type="drawable" name="ic_template_32dp" id="0x7F080548" />
-    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7F080549" />
-    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7F08054A" />
-    <public type="drawable" name="ic_ternary_off_checked" id="0x7F08054B" />
-    <public type="drawable" name="ic_ternary_off_disabled" id="0x7F08054C" />
-    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7F08054D" />
-    <public type="drawable" name="ic_ternary_on_checked" id="0x7F08054E" />
-    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7F08054F" />
-    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7F080550" />
-    <public type="drawable" name="ic_text_image_24dp" id="0x7F080551" />
-    <public type="drawable" name="ic_theme_24dp" id="0x7F080552" />
-    <public type="drawable" name="ic_thread" id="0x7F080553" />
-    <public type="drawable" name="ic_thread_grey_18dp" id="0x7F080554" />
-    <public type="drawable" name="ic_thread_grey_24dp" id="0x7F080555" />
-    <public type="drawable" name="ic_thread_locked" id="0x7F080556" />
-    <public type="drawable" name="ic_thread_nsfw" id="0x7F080557" />
-    <public type="drawable" name="ic_thread_welcome_video_frame" id="0x7F080558" />
-    <public type="drawable" name="ic_thread_white_24dp" id="0x7F080559" />
-    <public type="drawable" name="ic_tiers_24dp" id="0x7F08055A" />
-    <public type="drawable" name="ic_timer_dark" id="0x7F08055B" />
-    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7F08055C" />
-    <public type="drawable" name="ic_timer_light" id="0x7F08055D" />
-    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7F08055E" />
-    <public type="drawable" name="ic_tooltip_bottom_tail" id="0x7F08055F" />
-    <public type="drawable" name="ic_transfer_red_24dp" id="0x7F080560" />
-    <public type="drawable" name="ic_trash_outline" id="0x7F080561" />
-    <public type="drawable" name="ic_twitch_white_24dp" id="0x7F080562" />
-    <public type="drawable" name="ic_twitter_white_18dp" id="0x7F080563" />
-    <public type="drawable" name="ic_twitter_white_24dp" id="0x7F080564" />
-    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7F080565" />
-    <public type="drawable" name="ic_unban_grey" id="0x7F080566" />
-    <public type="drawable" name="ic_unread_white_9dp" id="0x7F080567" />
-    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7F080568" />
-    <public type="drawable" name="ic_upload_24dp" id="0x7F080569" />
-    <public type="drawable" name="ic_upload_image_34dp" id="0x7F08056A" />
-    <public type="drawable" name="ic_upload_image_40dp" id="0x7F08056B" />
-    <public type="drawable" name="ic_upload_plus_32dp" id="0x7F08056C" />
-    <public type="drawable" name="ic_uploads_file_dark" id="0x7F08056D" />
-    <public type="drawable" name="ic_uploads_file_light" id="0x7F08056E" />
-    <public type="drawable" name="ic_uploads_generic_dark" id="0x7F08056F" />
-    <public type="drawable" name="ic_uploads_generic_light" id="0x7F080570" />
-    <public type="drawable" name="ic_uploads_image_dark" id="0x7F080571" />
-    <public type="drawable" name="ic_uploads_image_light" id="0x7F080572" />
-    <public type="drawable" name="ic_uploads_video_dark" id="0x7F080573" />
-    <public type="drawable" name="ic_uploads_video_light" id="0x7F080574" />
-    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7F080575" />
-    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7F080576" />
-    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7F080577" />
-    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7F080578" />
-    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7F080579" />
-    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7F08057A" />
-    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7F08057B" />
-    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7F08057C" />
-    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7F08057D" />
-    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7F08057E" />
-    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7F08057F" />
-    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7F080580" />
-    <public type="drawable" name="ic_user_profile_action_pending" id="0x7F080581" />
-    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7F080582" />
-    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7F080583" />
-    <public type="drawable" name="ic_verified_10dp" id="0x7F080584" />
-    <public type="drawable" name="ic_verified_badge" id="0x7F080585" />
-    <public type="drawable" name="ic_verified_badge_banner" id="0x7F080586" />
-    <public type="drawable" name="ic_video_grid_view_grey" id="0x7F080587" />
-    <public type="drawable" name="ic_video_grid_view_white" id="0x7F080588" />
-    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7F080589" />
-    <public type="drawable" name="ic_videocam_white_12dp" id="0x7F08058A" />
-    <public type="drawable" name="ic_videocam_white_16dp" id="0x7F08058B" />
-    <public type="drawable" name="ic_videocam_white_24dp" id="0x7F08058C" />
-    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7F08058D" />
-    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7F08058E" />
-    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7F08058F" />
-    <public type="drawable" name="ic_visibility_white_24dp" id="0x7F080590" />
-    <public type="drawable" name="ic_voice_quality_average" id="0x7F080591" />
-    <public type="drawable" name="ic_voice_quality_bad" id="0x7F080592" />
-    <public type="drawable" name="ic_voice_quality_fine" id="0x7F080593" />
-    <public type="drawable" name="ic_voice_quality_unknown" id="0x7F080594" />
-    <public type="drawable" name="ic_voice_settings_24dp" id="0x7F080595" />
-    <public type="drawable" name="ic_volume_off_24dp" id="0x7F080596" />
-    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7F080597" />
-    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7F080598" />
-    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7F080599" />
-    <public type="drawable" name="ic_wallet_24dp" id="0x7F08059A" />
-    <public type="drawable" name="ic_wand_24dp" id="0x7F08059B" />
-    <public type="drawable" name="ic_warning_circle_24dp" id="0x7F08059C" />
-    <public type="drawable" name="ic_x_red_24dp" id="0x7F08059D" />
-    <public type="drawable" name="ic_xbox_white_24dp" id="0x7F08059E" />
-    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7F08059F" />
-    <public type="drawable" name="icon_carrot" id="0x7F0805A0" />
-    <public type="drawable" name="icon_flag_au" id="0x7F0805A1" />
-    <public type="drawable" name="icon_flag_bg" id="0x7F0805A2" />
-    <public type="drawable" name="icon_flag_cs" id="0x7F0805A3" />
-    <public type="drawable" name="icon_flag_da" id="0x7F0805A4" />
-    <public type="drawable" name="icon_flag_de" id="0x7F0805A5" />
-    <public type="drawable" name="icon_flag_el" id="0x7F0805A6" />
-    <public type="drawable" name="icon_flag_en_gb" id="0x7F0805A7" />
-    <public type="drawable" name="icon_flag_en_us" id="0x7F0805A8" />
-    <public type="drawable" name="icon_flag_es_es" id="0x7F0805A9" />
-    <public type="drawable" name="icon_flag_eu" id="0x7F0805AA" />
-    <public type="drawable" name="icon_flag_fi" id="0x7F0805AB" />
-    <public type="drawable" name="icon_flag_fr" id="0x7F0805AC" />
-    <public type="drawable" name="icon_flag_gb" id="0x7F0805AD" />
-    <public type="drawable" name="icon_flag_hi" id="0x7F0805AE" />
-    <public type="drawable" name="icon_flag_hk" id="0x7F0805AF" />
-    <public type="drawable" name="icon_flag_hr" id="0x7F0805B0" />
-    <public type="drawable" name="icon_flag_hu" id="0x7F0805B1" />
-    <public type="drawable" name="icon_flag_it" id="0x7F0805B2" />
-    <public type="drawable" name="icon_flag_ja" id="0x7F0805B3" />
-    <public type="drawable" name="icon_flag_ko" id="0x7F0805B4" />
-    <public type="drawable" name="icon_flag_lt" id="0x7F0805B5" />
-    <public type="drawable" name="icon_flag_nl" id="0x7F0805B6" />
-    <public type="drawable" name="icon_flag_no" id="0x7F0805B7" />
-    <public type="drawable" name="icon_flag_pl" id="0x7F0805B8" />
-    <public type="drawable" name="icon_flag_pt_br" id="0x7F0805B9" />
-    <public type="drawable" name="icon_flag_ro" id="0x7F0805BA" />
-    <public type="drawable" name="icon_flag_ru" id="0x7F0805BB" />
-    <public type="drawable" name="icon_flag_sg" id="0x7F0805BC" />
-    <public type="drawable" name="icon_flag_sv_se" id="0x7F0805BD" />
-    <public type="drawable" name="icon_flag_th" id="0x7F0805BE" />
-    <public type="drawable" name="icon_flag_tr" id="0x7F0805BF" />
-    <public type="drawable" name="icon_flag_uk" id="0x7F0805C0" />
-    <public type="drawable" name="icon_flag_unknown" id="0x7F0805C1" />
-    <public type="drawable" name="icon_flag_vi" id="0x7F0805C2" />
-    <public type="drawable" name="icon_flag_zh_cn" id="0x7F0805C3" />
-    <public type="drawable" name="icon_flag_zh_tw" id="0x7F0805C4" />
-    <public type="drawable" name="icon_menu_copy" id="0x7F0805C5" />
-    <public type="drawable" name="icon_save" id="0x7F0805C6" />
-    <public type="drawable" name="img_addfriends_empty_dark" id="0x7F0805C7" />
-    <public type="drawable" name="img_addfriends_empty_light" id="0x7F0805C8" />
-    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7F0805C9" />
-    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7F0805CA" />
-    <public type="drawable" name="img_age_gate_failure" id="0x7F0805CB" />
-    <public type="drawable" name="img_age_gate_safety" id="0x7F0805CC" />
-    <public type="drawable" name="img_animated_emoji_upsell" id="0x7F0805CD" />
-    <public type="drawable" name="img_auth_bg_dark" id="0x7F0805CE" />
-    <public type="drawable" name="img_auth_bg_light" id="0x7F0805CF" />
-    <public type="drawable" name="img_avatar_upsell" id="0x7F0805D0" />
-    <public type="drawable" name="img_baddies_dark_theme" id="0x7F0805D1" />
-    <public type="drawable" name="img_baddies_light_theme" id="0x7F0805D2" />
-    <public type="drawable" name="img_badge_upsell" id="0x7F0805D3" />
-    <public type="drawable" name="img_boost_activated_dark" id="0x7F0805D4" />
-    <public type="drawable" name="img_boost_activated_light" id="0x7F0805D5" />
-    <public type="drawable" name="img_boost_cancel" id="0x7F0805D6" />
-    <public type="drawable" name="img_boost_hands" id="0x7F0805D7" />
-    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7F0805D8" />
-    <public type="drawable" name="img_channel_following_success_1_light" id="0x7F0805D9" />
-    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7F0805DA" />
-    <public type="drawable" name="img_channel_following_success_2_light" id="0x7F0805DB" />
-    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7F0805DC" />
-    <public type="drawable" name="img_channel_following_success_3_light" id="0x7F0805DD" />
-    <public type="drawable" name="img_channels_onboarding_dark" id="0x7F0805DE" />
-    <public type="drawable" name="img_channels_onboarding_light" id="0x7F0805DF" />
-    <public type="drawable" name="img_clyde_empty" id="0x7F0805E0" />
-    <public type="drawable" name="img_contact_sync_empty_state_upsell" id="0x7F0805E1" />
-    <public type="drawable" name="img_contact_sync_landing_header" id="0x7F0805E2" />
-    <public type="drawable" name="img_contact_sync_suggestions_empty_header" id="0x7F0805E3" />
-    <public type="drawable" name="img_create_stage_choose_server" id="0x7F0805E4" />
-    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7F0805E5" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7F0805E6" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7F0805E7" />
-    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7F0805E8" />
-    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7F0805E9" />
-    <public type="drawable" name="img_empty_friends_none_dark" id="0x7F0805EA" />
-    <public type="drawable" name="img_empty_friends_none_light" id="0x7F0805EB" />
-    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7F0805EC" />
-    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7F0805ED" />
-    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7F0805EE" />
-    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7F0805EF" />
-    <public type="drawable" name="img_empty_guild_role_subscriptions" id="0x7F0805F0" />
-    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7F0805F1" />
-    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7F0805F2" />
-    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7F0805F3" />
-    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7F0805F4" />
-    <public type="drawable" name="img_forced_update_dark" id="0x7F0805F5" />
-    <public type="drawable" name="img_forced_update_light" id="0x7F0805F6" />
-    <public type="drawable" name="img_game_presence_nux" id="0x7F0805F7" />
-    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7F0805F8" />
-    <public type="drawable" name="img_gem_hands_faded_light" id="0x7F0805F9" />
-    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7F0805FA" />
-    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7F0805FB" />
-    <public type="drawable" name="img_gifting_pattern_dark" id="0x7F0805FC" />
-    <public type="drawable" name="img_gifting_pattern_light" id="0x7F0805FD" />
-    <public type="drawable" name="img_global_emoji_upsell" id="0x7F0805FE" />
-    <public type="drawable" name="img_guild_event_upsell" id="0x7F0805FF" />
-    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7F080600" />
-    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7F080601" />
-    <public type="drawable" name="img_guild_role_subscription_default_avatar_40dp" id="0x7F080602" />
-    <public type="drawable" name="img_krisp_onboarding" id="0x7F080603" />
-    <public type="drawable" name="img_landing_bg_dark" id="0x7F080604" />
-    <public type="drawable" name="img_landing_bg_light" id="0x7F080605" />
-    <public type="drawable" name="img_landing_splash" id="0x7F080606" />
-    <public type="drawable" name="img_logo" id="0x7F080607" />
-    <public type="drawable" name="img_logo_discord" id="0x7F080608" />
-    <public type="drawable" name="img_logo_discord_nitro" id="0x7F080609" />
-    <public type="drawable" name="img_logo_discord_nitro_and_boost" id="0x7F08060A" />
-    <public type="drawable" name="img_logo_discord_nitro_and_boost_horizontal" id="0x7F08060B" />
-    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7F08060C" />
-    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7F08060D" />
-    <public type="drawable" name="img_logo_nitro" id="0x7F08060E" />
-    <public type="drawable" name="img_logo_nitro_classic" id="0x7F08060F" />
-    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7F080610" />
-    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7F080611" />
-    <public type="drawable" name="img_logo_square" id="0x7F080612" />
-    <public type="drawable" name="img_logo_wordmark" id="0x7F080613" />
-    <public type="drawable" name="img_member_verification_denied" id="0x7F080614" />
-    <public type="drawable" name="img_member_verification_pending" id="0x7F080615" />
-    <public type="drawable" name="img_member_verification_started" id="0x7F080616" />
-    <public type="drawable" name="img_mfa_dark" id="0x7F080617" />
-    <public type="drawable" name="img_mfa_light" id="0x7F080618" />
-    <public type="drawable" name="img_new_tos_dark_theme" id="0x7F080619" />
-    <public type="drawable" name="img_new_tos_light_theme" id="0x7F08061A" />
-    <public type="drawable" name="img_nitro_classic_pattern" id="0x7F08061B" />
-    <public type="drawable" name="img_nitro_pattern" id="0x7F08061C" />
-    <public type="drawable" name="img_nitro_splash_dark" id="0x7F08061D" />
-    <public type="drawable" name="img_nitro_splash_light" id="0x7F08061E" />
-    <public type="drawable" name="img_nitro_uncancel" id="0x7F08061F" />
-    <public type="drawable" name="img_no_gifts" id="0x7F080620" />
-    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7F080621" />
-    <public type="drawable" name="img_no_mutual_friends_light" id="0x7F080622" />
-    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7F080623" />
-    <public type="drawable" name="img_no_mutual_servers_light" id="0x7F080624" />
-    <public type="drawable" name="img_no_text_channels_dark" id="0x7F080625" />
-    <public type="drawable" name="img_no_text_channels_light" id="0x7F080626" />
-    <public type="drawable" name="img_nsfw_dark_theme" id="0x7F080627" />
-    <public type="drawable" name="img_nsfw_light_theme" id="0x7F080628" />
-    <public type="drawable" name="img_overlay_nux" id="0x7F080629" />
-    <public type="drawable" name="img_permission_prime" id="0x7F08062A" />
-    <public type="drawable" name="img_plan_activated_dark" id="0x7F08062B" />
-    <public type="drawable" name="img_plan_activated_light" id="0x7F08062C" />
-    <public type="drawable" name="img_poop_dark" id="0x7F08062D" />
-    <public type="drawable" name="img_poop_light" id="0x7F08062E" />
-    <public type="drawable" name="img_premium_activated_tier_1_dark" id="0x7F08062F" />
-    <public type="drawable" name="img_premium_activated_tier_1_light" id="0x7F080630" />
-    <public type="drawable" name="img_premium_activated_tier_2_dark" id="0x7F080631" />
-    <public type="drawable" name="img_premium_activated_tier_2_light" id="0x7F080632" />
-    <public type="drawable" name="img_premium_and_premium_guild_subscription_header" id="0x7F080633" />
-    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7F080634" />
-    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7F080635" />
-    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7F080636" />
-    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7F080637" />
-    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7F080638" />
-    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7F080639" />
-    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7F08063A" />
-    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7F08063B" />
-    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_1" id="0x7F08063C" />
-    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_2" id="0x7F08063D" />
-    <public type="drawable" name="img_premium_guild_upsell_cta_boost" id="0x7F08063E" />
-    <public type="drawable" name="img_premium_stickers_upsell" id="0x7F08063F" />
-    <public type="drawable" name="img_premium_subscription_header" id="0x7F080640" />
-    <public type="drawable" name="img_premium_subscription_header_error" id="0x7F080641" />
-    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7F080642" />
-    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7F080643" />
-    <public type="drawable" name="img_profile_banner_value_prop" id="0x7F080644" />
-    <public type="drawable" name="img_profile_marketing" id="0x7F080645" />
-    <public type="drawable" name="img_quick_switcher_empty" id="0x7F080646" />
-    <public type="drawable" name="img_remote_auth_finished" id="0x7F080647" />
-    <public type="drawable" name="img_remote_auth_loaded" id="0x7F080648" />
-    <public type="drawable" name="img_remote_auth_not_found" id="0x7F080649" />
-    <public type="drawable" name="img_report_success_shield" id="0x7F08064A" />
-    <public type="drawable" name="img_save_your_group" id="0x7F08064B" />
-    <public type="drawable" name="img_server_boost_long" id="0x7F08064C" />
-    <public type="drawable" name="img_server_profile_marketing" id="0x7F08064D" />
-    <public type="drawable" name="img_stickers_search_empty_90dp" id="0x7F08064E" />
-    <public type="drawable" name="img_tag_upsell" id="0x7F08064F" />
-    <public type="drawable" name="img_upload_upsell" id="0x7F080650" />
-    <public type="drawable" name="img_verify_email_dark_theme" id="0x7F080651" />
-    <public type="drawable" name="img_verify_email_light_theme" id="0x7F080652" />
-    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7F080653" />
-    <public type="drawable" name="img_verify_phone_light_theme" id="0x7F080654" />
-    <public type="drawable" name="img_voice_no_connections_dark" id="0x7F080655" />
-    <public type="drawable" name="img_voice_no_connections_light" id="0x7F080656" />
-    <public type="drawable" name="img_voice_onboarding" id="0x7F080657" />
-    <public type="drawable" name="img_wump_trash_dark" id="0x7F080658" />
-    <public type="drawable" name="img_wumpus_ball_dark" id="0x7F080659" />
-    <public type="drawable" name="img_wumpus_ball_light" id="0x7F08065A" />
-    <public type="drawable" name="img_wumpus_custom_status" id="0x7F08065B" />
-    <public type="drawable" name="img_wumpus_jetpack" id="0x7F08065C" />
-    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7F08065D" />
-    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7F08065E" />
-    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7F08065F" />
-    <public type="drawable" name="img_wumpus_tophat_light" id="0x7F080660" />
-    <public type="drawable" name="invite_settings_radio_button_dark" id="0x7F080661" />
-    <public type="drawable" name="invite_settings_radio_button_light" id="0x7F080662" />
-    <public type="drawable" name="material_cursor_drawable" id="0x7F080663" />
-    <public type="drawable" name="material_ic_calendar_black_24dp" id="0x7F080664" />
-    <public type="drawable" name="material_ic_clear_black_24dp" id="0x7F080665" />
-    <public type="drawable" name="material_ic_edit_black_24dp" id="0x7F080666" />
-    <public type="drawable" name="material_ic_keyboard_arrow_left_black_24dp" id="0x7F080667" />
-    <public type="drawable" name="material_ic_keyboard_arrow_next_black_24dp" id="0x7F080668" />
-    <public type="drawable" name="material_ic_keyboard_arrow_previous_black_24dp" id="0x7F080669" />
-    <public type="drawable" name="material_ic_keyboard_arrow_right_black_24dp" id="0x7F08066A" />
-    <public type="drawable" name="material_ic_menu_arrow_down_black_24dp" id="0x7F08066B" />
-    <public type="drawable" name="material_ic_menu_arrow_up_black_24dp" id="0x7F08066C" />
-    <public type="drawable" name="mg_profile_banner_value_prop" id="0x7F08066D" />
-    <public type="drawable" name="mtrl_dialog_background" id="0x7F08066E" />
-    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7F08066F" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7F080670" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7F080671" />
-    <public type="drawable" name="mtrl_ic_cancel" id="0x7F080672" />
-    <public type="drawable" name="mtrl_ic_error" id="0x7F080673" />
-    <public type="drawable" name="mtrl_popupmenu_background" id="0x7F080674" />
-    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7F080675" />
-    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7F080676" />
-    <public type="drawable" name="navigation_empty_icon" id="0x7F080677" />
-    <public type="drawable" name="notification_action_background" id="0x7F080678" />
-    <public type="drawable" name="notification_bg" id="0x7F080679" />
-    <public type="drawable" name="notification_bg_low" id="0x7F08067A" />
-    <public type="drawable" name="notification_bg_low_normal" id="0x7F08067B" />
-    <public type="drawable" name="notification_bg_low_pressed" id="0x7F08067C" />
-    <public type="drawable" name="notification_bg_normal" id="0x7F08067D" />
-    <public type="drawable" name="notification_bg_normal_pressed" id="0x7F08067E" />
-    <public type="drawable" name="notification_icon_background" id="0x7F08067F" />
-    <public type="drawable" name="notification_template_icon_bg" id="0x7F080680" />
-    <public type="drawable" name="notification_template_icon_low_bg" id="0x7F080681" />
-    <public type="drawable" name="notification_tile_bg" id="0x7F080682" />
-    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7F080683" />
-    <public type="drawable" name="per_guild_identity_modal_image" id="0x7F080684" />
-    <public type="drawable" name="preference_list_divider_material" id="0x7F080685" />
-    <public type="drawable" name="premium_shine" id="0x7F080686" />
-    <public type="drawable" name="reactions_divider" id="0x7F080687" />
-    <public type="drawable" name="ripple_bg_secondary" id="0x7F080688" />
-    <public type="drawable" name="ripple_brighten" id="0x7F080689" />
-    <public type="drawable" name="ripple_circle_background_primary" id="0x7F08068A" />
-    <public type="drawable" name="ripple_circle_black" id="0x7F08068B" />
-    <public type="drawable" name="ripple_circle_red" id="0x7F08068C" />
-    <public type="drawable" name="ripple_darken" id="0x7F08068D" />
-    <public type="drawable" name="ripple_pill_red" id="0x7F08068E" />
-    <public type="drawable" name="ripple_rounded_bg_secondary" id="0x7F08068F" />
-    <public type="drawable" name="ripple_selector_rounded" id="0x7F080690" />
-    <public type="drawable" name="rounded_rectangle_1000dp_radius" id="0x7F080691" />
-    <public type="drawable" name="rounded_rectangle_16dp_radius" id="0x7F080692" />
-    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7F080693" />
-    <public type="drawable" name="rounded_rectangle_8dp_radius" id="0x7F080694" />
-    <public type="drawable" name="screen_share_illustration" id="0x7F080695" />
-    <public type="drawable" name="screen_share_nfx_illustration" id="0x7F080696" />
-    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7F080697" />
-    <public type="drawable" name="selectable_feedback_happy_light" id="0x7F080698" />
-    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7F080699" />
-    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7F08069A" />
-    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7F08069B" />
-    <public type="drawable" name="selectable_feedback_sad_light" id="0x7F08069C" />
-    <public type="drawable" name="sparkle_animated_vector" id="0x7F08069D" />
-    <public type="drawable" name="sparkle_yellow_animated_vector" id="0x7F08069E" />
-    <public type="drawable" name="stage_channel_audience_notice" id="0x7F08069F" />
-    <public type="drawable" name="stage_channel_dot_separator" id="0x7F0806A0" />
-    <public type="drawable" name="stage_channel_info_separator_dot" id="0x7F0806A1" />
-    <public type="drawable" name="stage_channel_live_dot" id="0x7F0806A2" />
-    <public type="drawable" name="stage_channel_role_dot" id="0x7F0806A3" />
-    <public type="drawable" name="system_cta_bg" id="0x7F0806A4" />
-    <public type="drawable" name="tab_dot_selector" id="0x7F0806A5" />
-    <public type="drawable" name="tab_indicator_default" id="0x7F0806A6" />
-    <public type="drawable" name="tab_indicator_selected" id="0x7F0806A7" />
-    <public type="drawable" name="test_custom_background" id="0x7F0806A8" />
-    <public type="drawable" name="thread_embed_spine_drawable" id="0x7F0806A9" />
-    <public type="drawable" name="thread_onboarding_placeholder" id="0x7F0806AA" />
-    <public type="drawable" name="tooltip_frame_dark" id="0x7F0806AB" />
-    <public type="drawable" name="tooltip_frame_light" id="0x7F0806AC" />
-    <public type="drawable" name="trash_bg" id="0x7F0806AD" />
-    <public type="drawable" name="ucrop_crop" id="0x7F0806AE" />
-    <public type="drawable" name="ucrop_ic_angle" id="0x7F0806AF" />
-    <public type="drawable" name="ucrop_ic_crop" id="0x7F0806B0" />
-    <public type="drawable" name="ucrop_ic_crop_unselected" id="0x7F0806B1" />
-    <public type="drawable" name="ucrop_ic_cross" id="0x7F0806B2" />
-    <public type="drawable" name="ucrop_ic_done" id="0x7F0806B3" />
-    <public type="drawable" name="ucrop_ic_next" id="0x7F0806B4" />
-    <public type="drawable" name="ucrop_ic_reset" id="0x7F0806B5" />
-    <public type="drawable" name="ucrop_ic_rotate" id="0x7F0806B6" />
-    <public type="drawable" name="ucrop_ic_rotate_unselected" id="0x7F0806B7" />
-    <public type="drawable" name="ucrop_ic_scale" id="0x7F0806B8" />
-    <public type="drawable" name="ucrop_ic_scale_unselected" id="0x7F0806B9" />
-    <public type="drawable" name="ucrop_rotate" id="0x7F0806BA" />
-    <public type="drawable" name="ucrop_scale" id="0x7F0806BB" />
-    <public type="drawable" name="ucrop_shadow_upside" id="0x7F0806BC" />
-    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7F0806BD" />
-    <public type="drawable" name="ucrop_vector_loader" id="0x7F0806BE" />
-    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7F0806BF" />
-    <public type="drawable" name="ucrop_wrapper_controls_shape" id="0x7F0806C0" />
-    <public type="drawable" name="video_call_illustration" id="0x7F0806C1" />
-    <public type="drawable" name="voice_user_limit_view_left_bg" id="0x7F0806C2" />
-    <public type="drawable" name="voice_user_limit_view_right_bg" id="0x7F0806C3" />
-    <public type="drawable" name="widget_stage_raised_hands_divider" id="0x7F0806C4" />
+    <public type="drawable" name="res_2131230790_img_landing_splash__0" id="0x7F080046" />
+    <public type="drawable" name="res_2131230791_img_landing_splash__1" id="0x7F080047" />
+    <public type="drawable" name="res_2131230792_img_landing_splash__2" id="0x7F080048" />
+    <public type="drawable" name="res_2131230793_img_nitro_pattern__0" id="0x7F080049" />
+    <public type="drawable" name="res_2131230794_img_nitro_pattern__1" id="0x7F08004A" />
+    <public type="drawable" name="res_2131230795_img_nitro_pattern__2" id="0x7F08004B" />
+    <public type="drawable" name="res_2131230796_img_nitro_pattern__3" id="0x7F08004C" />
+    <public type="drawable" name="res_2131230797_img_nitro_pattern__4" id="0x7F08004D" />
+    <public type="drawable" name="res_2131230798_img_plan_activated_dark__0" id="0x7F08004E" />
+    <public type="drawable" name="res_2131230799_img_plan_activated_light__0" id="0x7F08004F" />
+    <public type="drawable" name="res_2131230800_img_premium_activated_tier_1_dark__0" id="0x7F080050" />
+    <public type="drawable" name="res_2131230801_img_premium_activated_tier_1_light__0" id="0x7F080051" />
+    <public type="drawable" name="res_2131230802_img_premium_activated_tier_2_dark__0" id="0x7F080052" />
+    <public type="drawable" name="res_2131230803_img_premium_activated_tier_2_light__0" id="0x7F080053" />
+    <public type="drawable" name="res_2131230804_img_remote_auth_loaded__0" id="0x7F080054" />
+    <public type="drawable" name="res_2131230805_img_wumpus_playing_with_friends__0" id="0x7F080055" />
+    <public type="drawable" name="res_2131230806_screen_share_nfx_illustration__0" id="0x7F080056" />
+    <public type="drawable" name="res_2131230807_screen_share_nfx_illustration__1" id="0x7F080057" />
+    <public type="drawable" name="res_2131230808_screen_share_nfx_illustration__2" id="0x7F080058" />
+    <public type="drawable" name="res_2131230809_sparkle_animated_vector__0" id="0x7F080059" />
+    <public type="drawable" name="res_2131230810_sparkle_animated_vector__1" id="0x7F08005A" />
+    <public type="drawable" name="res_2131230811_sparkle_animated_vector__2" id="0x7F08005B" />
+    <public type="drawable" name="res_2131230812_sparkle_yellow_animated_vector__0" id="0x7F08005C" />
+    <public type="drawable" name="res_2131230813_sparkle_yellow_animated_vector__1" id="0x7F08005D" />
+    <public type="drawable" name="res_2131230814_sparkle_yellow_animated_vector__2" id="0x7F08005E" />
+    <public type="drawable" name="res_2131230815_video_call_illustration__0" id="0x7F08005F" />
+    <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7F080060" />
+    <public type="drawable" name="abc_action_bar_item_background_material" id="0x7F080061" />
+    <public type="drawable" name="abc_btn_borderless_material" id="0x7F080062" />
+    <public type="drawable" name="abc_btn_check_material" id="0x7F080063" />
+    <public type="drawable" name="abc_btn_check_material_anim" id="0x7F080064" />
+    <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7F080065" />
+    <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7F080066" />
+    <public type="drawable" name="abc_btn_colored_material" id="0x7F080067" />
+    <public type="drawable" name="abc_btn_default_mtrl_shape" id="0x7F080068" />
+    <public type="drawable" name="abc_btn_radio_material" id="0x7F080069" />
+    <public type="drawable" name="abc_btn_radio_material_anim" id="0x7F08006A" />
+    <public type="drawable" name="abc_btn_radio_to_on_mtrl_000" id="0x7F08006B" />
+    <public type="drawable" name="abc_btn_radio_to_on_mtrl_015" id="0x7F08006C" />
+    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00001" id="0x7F08006D" />
+    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00012" id="0x7F08006E" />
+    <public type="drawable" name="abc_cab_background_internal_bg" id="0x7F08006F" />
+    <public type="drawable" name="abc_cab_background_top_material" id="0x7F080070" />
+    <public type="drawable" name="abc_cab_background_top_mtrl_alpha" id="0x7F080071" />
+    <public type="drawable" name="abc_control_background_material" id="0x7F080072" />
+    <public type="drawable" name="abc_dialog_material_background" id="0x7F080073" />
+    <public type="drawable" name="abc_edit_text_material" id="0x7F080074" />
+    <public type="drawable" name="abc_ic_ab_back_material" id="0x7F080075" />
+    <public type="drawable" name="abc_ic_arrow_drop_right_black_24dp" id="0x7F080076" />
+    <public type="drawable" name="abc_ic_clear_material" id="0x7F080077" />
+    <public type="drawable" name="abc_ic_commit_search_api_mtrl_alpha" id="0x7F080078" />
+    <public type="drawable" name="abc_ic_go_search_api_material" id="0x7F080079" />
+    <public type="drawable" name="abc_ic_menu_copy_mtrl_am_alpha" id="0x7F08007A" />
+    <public type="drawable" name="abc_ic_menu_cut_mtrl_alpha" id="0x7F08007B" />
+    <public type="drawable" name="abc_ic_menu_overflow_material" id="0x7F08007C" />
+    <public type="drawable" name="abc_ic_menu_paste_mtrl_am_alpha" id="0x7F08007D" />
+    <public type="drawable" name="abc_ic_menu_selectall_mtrl_alpha" id="0x7F08007E" />
+    <public type="drawable" name="abc_ic_menu_share_mtrl_alpha" id="0x7F08007F" />
+    <public type="drawable" name="abc_ic_search_api_material" id="0x7F080080" />
+    <public type="drawable" name="abc_ic_star_black_16dp" id="0x7F080081" />
+    <public type="drawable" name="abc_ic_star_black_36dp" id="0x7F080082" />
+    <public type="drawable" name="abc_ic_star_black_48dp" id="0x7F080083" />
+    <public type="drawable" name="abc_ic_star_half_black_16dp" id="0x7F080084" />
+    <public type="drawable" name="abc_ic_star_half_black_36dp" id="0x7F080085" />
+    <public type="drawable" name="abc_ic_star_half_black_48dp" id="0x7F080086" />
+    <public type="drawable" name="abc_ic_voice_search_api_material" id="0x7F080087" />
+    <public type="drawable" name="abc_item_background_holo_dark" id="0x7F080088" />
+    <public type="drawable" name="abc_item_background_holo_light" id="0x7F080089" />
+    <public type="drawable" name="abc_list_divider_material" id="0x7F08008A" />
+    <public type="drawable" name="abc_list_divider_mtrl_alpha" id="0x7F08008B" />
+    <public type="drawable" name="abc_list_focused_holo" id="0x7F08008C" />
+    <public type="drawable" name="abc_list_longpressed_holo" id="0x7F08008D" />
+    <public type="drawable" name="abc_list_pressed_holo_dark" id="0x7F08008E" />
+    <public type="drawable" name="abc_list_pressed_holo_light" id="0x7F08008F" />
+    <public type="drawable" name="abc_list_selector_background_transition_holo_dark" id="0x7F080090" />
+    <public type="drawable" name="abc_list_selector_background_transition_holo_light" id="0x7F080091" />
+    <public type="drawable" name="abc_list_selector_disabled_holo_dark" id="0x7F080092" />
+    <public type="drawable" name="abc_list_selector_disabled_holo_light" id="0x7F080093" />
+    <public type="drawable" name="abc_list_selector_holo_dark" id="0x7F080094" />
+    <public type="drawable" name="abc_list_selector_holo_light" id="0x7F080095" />
+    <public type="drawable" name="abc_menu_hardkey_panel_mtrl_mult" id="0x7F080096" />
+    <public type="drawable" name="abc_popup_background_mtrl_mult" id="0x7F080097" />
+    <public type="drawable" name="abc_ratingbar_indicator_material" id="0x7F080098" />
+    <public type="drawable" name="abc_ratingbar_material" id="0x7F080099" />
+    <public type="drawable" name="abc_ratingbar_small_material" id="0x7F08009A" />
+    <public type="drawable" name="abc_scrubber_control_off_mtrl_alpha" id="0x7F08009B" />
+    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_000" id="0x7F08009C" />
+    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_005" id="0x7F08009D" />
+    <public type="drawable" name="abc_scrubber_primary_mtrl_alpha" id="0x7F08009E" />
+    <public type="drawable" name="abc_scrubber_track_mtrl_alpha" id="0x7F08009F" />
+    <public type="drawable" name="abc_seekbar_thumb_material" id="0x7F0800A0" />
+    <public type="drawable" name="abc_seekbar_tick_mark_material" id="0x7F0800A1" />
+    <public type="drawable" name="abc_seekbar_track_material" id="0x7F0800A2" />
+    <public type="drawable" name="abc_spinner_mtrl_am_alpha" id="0x7F0800A3" />
+    <public type="drawable" name="abc_spinner_textfield_background_material" id="0x7F0800A4" />
+    <public type="drawable" name="abc_switch_thumb_material" id="0x7F0800A5" />
+    <public type="drawable" name="abc_switch_track_mtrl_alpha" id="0x7F0800A6" />
+    <public type="drawable" name="abc_tab_indicator_material" id="0x7F0800A7" />
+    <public type="drawable" name="abc_tab_indicator_mtrl_alpha" id="0x7F0800A8" />
+    <public type="drawable" name="abc_text_cursor_material" id="0x7F0800A9" />
+    <public type="drawable" name="abc_text_select_handle_left_mtrl_dark" id="0x7F0800AA" />
+    <public type="drawable" name="abc_text_select_handle_left_mtrl_light" id="0x7F0800AB" />
+    <public type="drawable" name="abc_text_select_handle_middle_mtrl_dark" id="0x7F0800AC" />
+    <public type="drawable" name="abc_text_select_handle_middle_mtrl_light" id="0x7F0800AD" />
+    <public type="drawable" name="abc_text_select_handle_right_mtrl_dark" id="0x7F0800AE" />
+    <public type="drawable" name="abc_text_select_handle_right_mtrl_light" id="0x7F0800AF" />
+    <public type="drawable" name="abc_textfield_activated_mtrl_alpha" id="0x7F0800B0" />
+    <public type="drawable" name="abc_textfield_default_mtrl_alpha" id="0x7F0800B1" />
+    <public type="drawable" name="abc_textfield_search_activated_mtrl_alpha" id="0x7F0800B2" />
+    <public type="drawable" name="abc_textfield_search_default_mtrl_alpha" id="0x7F0800B3" />
+    <public type="drawable" name="abc_textfield_search_material" id="0x7F0800B4" />
+    <public type="drawable" name="abc_vector_test" id="0x7F0800B5" />
+    <public type="drawable" name="alerter_alert_button_background" id="0x7F0800B6" />
+    <public type="drawable" name="alerter_ic_face" id="0x7F0800B7" />
+    <public type="drawable" name="alerter_ic_notifications" id="0x7F0800B8" />
+    <public type="drawable" name="app_toast_frame" id="0x7F0800B9" />
+    <public type="drawable" name="asset_account_sync_twitch" id="0x7F0800BA" />
+    <public type="drawable" name="asset_account_sync_youtube" id="0x7F0800BB" />
+    <public type="drawable" name="asset_broken_results_dark" id="0x7F0800BC" />
+    <public type="drawable" name="asset_broken_results_light" id="0x7F0800BD" />
+    <public type="drawable" name="asset_default_avatar_32dp" id="0x7F0800BE" />
+    <public type="drawable" name="asset_default_avatar_64dp" id="0x7F0800BF" />
+    <public type="drawable" name="asset_default_avatar_80dp" id="0x7F0800C0" />
+    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7F0800C1" />
+    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7F0800C2" />
+    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7F0800C3" />
+    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7F0800C4" />
+    <public type="drawable" name="asset_empty_no_bans" id="0x7F0800C5" />
+    <public type="drawable" name="asset_empty_no_invites" id="0x7F0800C6" />
+    <public type="drawable" name="asset_group_full" id="0x7F0800C7" />
+    <public type="drawable" name="asset_guild_role_subscriptions_unavailable" id="0x7F0800C8" />
+    <public type="drawable" name="asset_mfa_server" id="0x7F0800C9" />
+    <public type="drawable" name="asset_no_results_alt_dark" id="0x7F0800CA" />
+    <public type="drawable" name="asset_no_results_alt_light" id="0x7F0800CB" />
+    <public type="drawable" name="asset_no_results_dark" id="0x7F0800CC" />
+    <public type="drawable" name="asset_no_results_light" id="0x7F0800CD" />
+    <public type="drawable" name="asset_nux_navigation_channels" id="0x7F0800CE" />
+    <public type="drawable" name="asset_nux_navigation_dms" id="0x7F0800CF" />
+    <public type="drawable" name="asset_nux_navigation_guilds" id="0x7F0800D0" />
+    <public type="drawable" name="asset_sadbot" id="0x7F0800D1" />
+    <public type="drawable" name="asset_security" id="0x7F0800D2" />
+    <public type="drawable" name="asset_tooltip_server_create" id="0x7F0800D3" />
+    <public type="drawable" name="avd_hide_password" id="0x7F0800D4" />
+    <public type="drawable" name="avd_show_password" id="0x7F0800D5" />
+    <public type="drawable" name="bg_announcements_follow_sheet_dark" id="0x7F0800D6" />
+    <public type="drawable" name="bg_announcements_follow_sheet_light" id="0x7F0800D7" />
+    <public type="drawable" name="bg_bot_ui_component_select" id="0x7F0800D8" />
+    <public type="drawable" name="bg_bot_ui_component_select_pill" id="0x7F0800D9" />
+    <public type="drawable" name="bg_changelog_special_header" id="0x7F0800DA" />
+    <public type="drawable" name="bg_chat_sticker_greet_button" id="0x7F0800DB" />
+    <public type="drawable" name="bg_chat_sticker_greet_button_default" id="0x7F0800DC" />
+    <public type="drawable" name="bg_chat_sticker_greet_button_pressed" id="0x7F0800DD" />
+    <public type="drawable" name="bg_cloud_pattern_dark" id="0x7F0800DE" />
+    <public type="drawable" name="bg_cloud_pattern_light" id="0x7F0800DF" />
+    <public type="drawable" name="bg_discord_hub_email_confirmation" id="0x7F0800E0" />
+    <public type="drawable" name="bg_discord_hub_email_verification" id="0x7F0800E1" />
+    <public type="drawable" name="bg_guild_role_subscription_plan_format_radio_button" id="0x7F0800E2" />
+    <public type="drawable" name="bg_guild_role_subscription_plan_format_radio_button_image" id="0x7F0800E3" />
+    <public type="drawable" name="bg_guild_role_subscription_subscribe_button" id="0x7F0800E4" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_connected_primary" id="0x7F0800E5" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_connected_secondary" id="0x7F0800E6" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_floating" id="0x7F0800E7" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_active" id="0x7F0800E8" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_default" id="0x7F0800E9" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_disabled" id="0x7F0800EA" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_interested_button_interested" id="0x7F0800EB" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_primary" id="0x7F0800EC" />
+    <public type="drawable" name="bg_guild_scheduled_event_list_item_secondary" id="0x7F0800ED" />
+    <public type="drawable" name="bg_hub_email_confirmation" id="0x7F0800EE" />
+    <public type="drawable" name="bg_payment_method_spinner_closed" id="0x7F0800EF" />
+    <public type="drawable" name="bg_payment_method_spinner_closed_light" id="0x7F0800F0" />
+    <public type="drawable" name="bg_payment_method_spinner_dropdown" id="0x7F0800F1" />
+    <public type="drawable" name="bg_payment_method_spinner_dropdown_light" id="0x7F0800F2" />
+    <public type="drawable" name="bg_premium_bundle_header" id="0x7F0800F3" />
+    <public type="drawable" name="bg_premium_classic_subscription_header" id="0x7F0800F4" />
+    <public type="drawable" name="bg_premium_guild_subscription_header" id="0x7F0800F5" />
+    <public type="drawable" name="bg_premium_guild_subscription_header_error" id="0x7F0800F6" />
+    <public type="drawable" name="bg_premium_guild_subscription_header_resub" id="0x7F0800F7" />
+    <public type="drawable" name="bg_premium_subscription_header" id="0x7F0800F8" />
+    <public type="drawable" name="bg_premium_subscription_header_error" id="0x7F0800F9" />
+    <public type="drawable" name="bg_premium_subscription_header_resub" id="0x7F0800FA" />
+    <public type="drawable" name="bg_pressed_highlight" id="0x7F0800FB" />
+    <public type="drawable" name="bg_pressed_highlight_brighten" id="0x7F0800FC" />
+    <public type="drawable" name="bg_pressed_highlight_darken" id="0x7F0800FD" />
+    <public type="drawable" name="bg_server_discovery_header" id="0x7F0800FE" />
+    <public type="drawable" name="bg_stage_channel_speaking_chip" id="0x7F0800FF" />
+    <public type="drawable" name="bg_start_stage_event_button" id="0x7F080100" />
+    <public type="drawable" name="bg_steps_progress_indicator_dot" id="0x7F080101" />
+    <public type="drawable" name="bg_stream_label" id="0x7F080102" />
+    <public type="drawable" name="bg_stream_live_indicator" id="0x7F080103" />
+    <public type="drawable" name="bg_stream_live_indicator_split_pill" id="0x7F080104" />
+    <public type="drawable" name="bg_stream_preview" id="0x7F080105" />
+    <public type="drawable" name="bg_stream_preview_overlay_caption" id="0x7F080106" />
+    <public type="drawable" name="bg_stream_preview_overlay_caption_opaque" id="0x7F080107" />
+    <public type="drawable" name="bg_stream_resolution_indicator_split_pill" id="0x7F080108" />
+    <public type="drawable" name="bg_subscription_placeholder_pattern_dark" id="0x7F080109" />
+    <public type="drawable" name="bg_subscription_placeholder_pattern_light" id="0x7F08010A" />
+    <public type="drawable" name="bot_ui_component_divider_drawable" id="0x7F08010B" />
+    <public type="drawable" name="btn_checkbox_checked_mtrl" id="0x7F08010C" />
+    <public type="drawable" name="btn_checkbox_checked_to_unchecked_mtrl_animation" id="0x7F08010D" />
+    <public type="drawable" name="btn_checkbox_unchecked_mtrl" id="0x7F08010E" />
+    <public type="drawable" name="btn_checkbox_unchecked_to_checked_mtrl_animation" id="0x7F08010F" />
+    <public type="drawable" name="btn_radio_off_mtrl" id="0x7F080110" />
+    <public type="drawable" name="btn_radio_off_to_on_mtrl_animation" id="0x7F080111" />
+    <public type="drawable" name="btn_radio_on_mtrl" id="0x7F080112" />
+    <public type="drawable" name="btn_radio_on_to_off_mtrl_animation" id="0x7F080113" />
+    <public type="drawable" name="bubble_state_selector" id="0x7F080114" />
+    <public type="drawable" name="button_brand_500" id="0x7F080115" />
+    <public type="drawable" name="button_text_color_primary_100" id="0x7F080116" />
+    <public type="drawable" name="cameraview_focus_marker_fill" id="0x7F080117" />
+    <public type="drawable" name="cameraview_focus_marker_outline" id="0x7F080118" />
+    <public type="drawable" name="changelog_special_back" id="0x7F080119" />
+    <public type="drawable" name="changelog_special_close" id="0x7F08011A" />
+    <public type="drawable" name="changelog_special_footer" id="0x7F08011B" />
+    <public type="drawable" name="changelog_special_hero" id="0x7F08011C" />
+    <public type="drawable" name="claim_promo_success" id="0x7F08011D" />
+    <public type="drawable" name="common_full_open_on_phone" id="0x7F08011E" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7F08011F" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7F080120" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7F080121" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_normal_background" id="0x7F080122" />
+    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7F080123" />
+    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7F080124" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7F080125" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7F080126" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7F080127" />
+    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7F080128" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7F080129" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7F08012A" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7F08012B" />
+    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7F08012C" />
+    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7F08012D" />
+    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7F08012E" />
+    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7F08012F" />
+    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7F080130" />
+    <public type="drawable" name="community_server_get_started_hogwarts" id="0x7F080131" />
+    <public type="drawable" name="community_server_get_started_latin" id="0x7F080132" />
+    <public type="drawable" name="community_server_get_started_pokemon" id="0x7F080133" />
+    <public type="drawable" name="community_server_get_started_sneakers" id="0x7F080134" />
+    <public type="drawable" name="community_setup_get_started" id="0x7F080135" />
+    <public type="drawable" name="cpv_alpha" id="0x7F080136" />
+    <public type="drawable" name="cpv_btn_background" id="0x7F080137" />
+    <public type="drawable" name="cpv_btn_background_pressed" id="0x7F080138" />
+    <public type="drawable" name="cpv_ic_arrow_right_black_24dp" id="0x7F080139" />
+    <public type="drawable" name="cpv_preset_checked" id="0x7F08013A" />
+    <public type="drawable" name="cursor_color" id="0x7F08013B" />
+    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7F08013C" />
+    <public type="drawable" name="design_fab_background" id="0x7F08013D" />
+    <public type="drawable" name="design_ic_visibility" id="0x7F08013E" />
+    <public type="drawable" name="design_ic_visibility_off" id="0x7F08013F" />
+    <public type="drawable" name="design_password_eye" id="0x7F080140" />
+    <public type="drawable" name="design_snackbar_background" id="0x7F080141" />
+    <public type="drawable" name="discovery_empty_state" id="0x7F080142" />
+    <public type="drawable" name="drawable_bg_card_grey" id="0x7F080143" />
+    <public type="drawable" name="drawable_bg_card_white" id="0x7F080144" />
+    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7F080145" />
+    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7F080146" />
+    <public type="drawable" name="drawable_bg_command_param_highlight" id="0x7F080147" />
+    <public type="drawable" name="drawable_bg_command_param_normal" id="0x7F080148" />
+    <public type="drawable" name="drawable_bg_corners_4dp" id="0x7F080149" />
+    <public type="drawable" name="drawable_bg_highlight" id="0x7F08014A" />
+    <public type="drawable" name="drawable_bg_item_filter" id="0x7F08014B" />
+    <public type="drawable" name="drawable_bg_loading" id="0x7F08014C" />
+    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7F08014D" />
+    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7F08014E" />
+    <public type="drawable" name="drawable_bg_nitro_classic_gradient_diagonal" id="0x7F08014F" />
+    <public type="drawable" name="drawable_bg_nitro_gradient" id="0x7F080150" />
+    <public type="drawable" name="drawable_bg_nitro_gradient_diagonal" id="0x7F080151" />
+    <public type="drawable" name="drawable_bg_outline_dark" id="0x7F080152" />
+    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7F080153" />
+    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7F080154" />
+    <public type="drawable" name="drawable_bg_premium_guild_gradient" id="0x7F080155" />
+    <public type="drawable" name="drawable_bg_premium_guild_gradient_corners" id="0x7F080156" />
+    <public type="drawable" name="drawable_bg_premium_tier_1_and_premium_guild_gradient" id="0x7F080157" />
+    <public type="drawable" name="drawable_bg_premium_tier_2_and_premium_guild_gradient" id="0x7F080158" />
+    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7F080159" />
+    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7F08015A" />
+    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7F08015B" />
+    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7F08015C" />
+    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7F08015D" />
+    <public type="drawable" name="drawable_bg_reaction_light" id="0x7F08015E" />
+    <public type="drawable" name="drawable_bg_settings_header" id="0x7F08015F" />
+    <public type="drawable" name="drawable_bg_settings_item" id="0x7F080160" />
+    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7F080161" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_bottom" id="0x7F080162" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_middle" id="0x7F080163" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_only" id="0x7F080164" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_top" id="0x7F080165" />
+    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7F080166" />
+    <public type="drawable" name="drawable_bg_ternary_off" id="0x7F080167" />
+    <public type="drawable" name="drawable_bg_ternary_on" id="0x7F080168" />
+    <public type="drawable" name="drawable_bg_tooltip" id="0x7F080169" />
+    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7F08016A" />
+    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7F08016B" />
+    <public type="drawable" name="drawable_bg_white_alpha_06_corners_gradient" id="0x7F08016C" />
+    <public type="drawable" name="drawable_bg_white_alpha_24_corners_gradient" id="0x7F08016D" />
+    <public type="drawable" name="drawable_black_underlay_gradient" id="0x7F08016E" />
+    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7F08016F" />
+    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7F080170" />
+    <public type="drawable" name="drawable_boost_progress_ring" id="0x7F080171" />
+    <public type="drawable" name="drawable_boost_removal" id="0x7F080172" />
+    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7F080173" />
+    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7F080174" />
+    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7F080175" />
+    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7F080176" />
+    <public type="drawable" name="drawable_button_brand_neutral" id="0x7F080177" />
+    <public type="drawable" name="drawable_button_green" id="0x7F080178" />
+    <public type="drawable" name="drawable_button_green_neutral" id="0x7F080179" />
+    <public type="drawable" name="drawable_button_grey" id="0x7F08017A" />
+    <public type="drawable" name="drawable_button_grey_disabled" id="0x7F08017B" />
+    <public type="drawable" name="drawable_button_red" id="0x7F08017C" />
+    <public type="drawable" name="drawable_button_red_neutral" id="0x7F08017D" />
+    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7F08017E" />
+    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7F08017F" />
+    <public type="drawable" name="drawable_chip_background_deprecated" id="0x7F080180" />
+    <public type="drawable" name="drawable_chip_circle" id="0x7F080181" />
+    <public type="drawable" name="drawable_chip_delete" id="0x7F080182" />
+    <public type="drawable" name="drawable_circle_background_primary" id="0x7F080183" />
+    <public type="drawable" name="drawable_circle_background_secondary" id="0x7F080184" />
+    <public type="drawable" name="drawable_circle_background_tertiary" id="0x7F080185" />
+    <public type="drawable" name="drawable_circle_black" id="0x7F080186" />
+    <public type="drawable" name="drawable_circle_brand" id="0x7F080187" />
+    <public type="drawable" name="drawable_circle_brand_500" id="0x7F080188" />
+    <public type="drawable" name="drawable_circle_dashed" id="0x7F080189" />
+    <public type="drawable" name="drawable_circle_dashed_4dp" id="0x7F08018A" />
+    <public type="drawable" name="drawable_circle_green" id="0x7F08018B" />
+    <public type="drawable" name="drawable_circle_guild_badge_activateable_dark" id="0x7F08018C" />
+    <public type="drawable" name="drawable_circle_guild_badge_activateable_light" id="0x7F08018D" />
+    <public type="drawable" name="drawable_circle_guild_badge_active_dark" id="0x7F08018E" />
+    <public type="drawable" name="drawable_circle_guild_badge_active_light" id="0x7F08018F" />
+    <public type="drawable" name="drawable_circle_guild_badge_inactive_dark" id="0x7F080190" />
+    <public type="drawable" name="drawable_circle_guild_badge_inactive_light" id="0x7F080191" />
+    <public type="drawable" name="drawable_circle_interactive_text_normal" id="0x7F080192" />
+    <public type="drawable" name="drawable_circle_premium_guild_gradient" id="0x7F080193" />
+    <public type="drawable" name="drawable_circle_primary_700" id="0x7F080194" />
+    <public type="drawable" name="drawable_circle_primary_900" id="0x7F080195" />
+    <public type="drawable" name="drawable_circle_primary_900_alpha_80" id="0x7F080196" />
+    <public type="drawable" name="drawable_circle_red" id="0x7F080197" />
+    <public type="drawable" name="drawable_circle_transparent" id="0x7F080198" />
+    <public type="drawable" name="drawable_circle_white" id="0x7F080199" />
+    <public type="drawable" name="drawable_circle_white_1" id="0x7F08019A" />
+    <public type="drawable" name="drawable_circle_white_12dp" id="0x7F08019B" />
+    <public type="drawable" name="drawable_circle_white_5" id="0x7F08019C" />
+    <public type="drawable" name="drawable_clickable_rounded_4dp_brighten" id="0x7F08019D" />
+    <public type="drawable" name="drawable_clickable_rounded_4dp_darken" id="0x7F08019E" />
+    <public type="drawable" name="drawable_community_setup_first_step_dark" id="0x7F08019F" />
+    <public type="drawable" name="drawable_community_setup_first_step_light" id="0x7F0801A0" />
+    <public type="drawable" name="drawable_community_setup_second_step_dark" id="0x7F0801A1" />
+    <public type="drawable" name="drawable_community_setup_second_step_light" id="0x7F0801A2" />
+    <public type="drawable" name="drawable_community_setup_third_step_dark" id="0x7F0801A3" />
+    <public type="drawable" name="drawable_community_setup_third_step_light" id="0x7F0801A4" />
+    <public type="drawable" name="drawable_cpv_edit_text_background" id="0x7F0801A5" />
+    <public type="drawable" name="drawable_default_invite_splash" id="0x7F0801A6" />
+    <public type="drawable" name="drawable_discovery_card_icon_bg_12dp_rounded" id="0x7F0801A7" />
+    <public type="drawable" name="drawable_discovery_card_icon_bg_4dp_rounded" id="0x7F0801A8" />
+    <public type="drawable" name="drawable_discovery_card_icon_bg_circle" id="0x7F0801A9" />
+    <public type="drawable" name="drawable_discovery_intro_card_bg" id="0x7F0801AA" />
+    <public type="drawable" name="drawable_discovery_stage_card_bg" id="0x7F0801AB" />
+    <public type="drawable" name="drawable_divider" id="0x7F0801AC" />
+    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7F0801AD" />
+    <public type="drawable" name="drawable_empty_text_placeholder_white" id="0x7F0801AE" />
+    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7F0801AF" />
+    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7F0801B0" />
+    <public type="drawable" name="drawable_fill_brand" id="0x7F0801B1" />
+    <public type="drawable" name="drawable_flex_input_bg" id="0x7F0801B2" />
+    <public type="drawable" name="drawable_friends_pending_dark" id="0x7F0801B3" />
+    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7F0801B4" />
+    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7F0801B5" />
+    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7F0801B6" />
+    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7F0801B7" />
+    <public type="drawable" name="drawable_friends_pending_light" id="0x7F0801B8" />
+    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7F0801B9" />
+    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7F0801BA" />
+    <public type="drawable" name="drawable_gem_premium_guild_background_dark" id="0x7F0801BB" />
+    <public type="drawable" name="drawable_gem_premium_guild_background_light" id="0x7F0801BC" />
+    <public type="drawable" name="drawable_gem_tier_3" id="0x7F0801BD" />
+    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7F0801BE" />
+    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7F0801BF" />
+    <public type="drawable" name="drawable_grey_user_icon" id="0x7F0801C0" />
+    <public type="drawable" name="drawable_guild_placeholder_primary_500" id="0x7F0801C1" />
+    <public type="drawable" name="drawable_guild_template_club" id="0x7F0801C2" />
+    <public type="drawable" name="drawable_guild_template_community" id="0x7F0801C3" />
+    <public type="drawable" name="drawable_guild_template_create" id="0x7F0801C4" />
+    <public type="drawable" name="drawable_guild_template_creator" id="0x7F0801C5" />
+    <public type="drawable" name="drawable_guild_template_friend" id="0x7F0801C6" />
+    <public type="drawable" name="drawable_guild_template_gaming" id="0x7F0801C7" />
+    <public type="drawable" name="drawable_guild_template_study" id="0x7F0801C8" />
+    <public type="drawable" name="drawable_ic_community_setting_analytics_dark" id="0x7F0801C9" />
+    <public type="drawable" name="drawable_ic_community_setting_analytics_light" id="0x7F0801CA" />
+    <public type="drawable" name="drawable_ic_community_setting_info_dark" id="0x7F0801CB" />
+    <public type="drawable" name="drawable_ic_community_setting_info_light" id="0x7F0801CC" />
+    <public type="drawable" name="drawable_ic_community_setting_server_insights_dark" id="0x7F0801CD" />
+    <public type="drawable" name="drawable_ic_community_setting_server_insights_light" id="0x7F0801CE" />
+    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7F0801CF" />
+    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7F0801D0" />
+    <public type="drawable" name="drawable_ic_nitro" id="0x7F0801D1" />
+    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7F0801D2" />
+    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7F0801D3" />
+    <public type="drawable" name="drawable_ic_ternary_off" id="0x7F0801D4" />
+    <public type="drawable" name="drawable_ic_ternary_on" id="0x7F0801D5" />
+    <public type="drawable" name="drawable_icon_sync_integration" id="0x7F0801D6" />
+    <public type="drawable" name="drawable_image_upload" id="0x7F0801D7" />
+    <public type="drawable" name="drawable_invite_share_art_envelope" id="0x7F0801D8" />
+    <public type="drawable" name="drawable_listitem_divider_left_padded" id="0x7F0801D9" />
+    <public type="drawable" name="drawable_logo_auth_dark" id="0x7F0801DA" />
+    <public type="drawable" name="drawable_logo_auth_light" id="0x7F0801DB" />
+    <public type="drawable" name="drawable_nitro_server_boost" id="0x7F0801DC" />
+    <public type="drawable" name="drawable_notifications_badge_border_color_tabs_background" id="0x7F0801DD" />
+    <public type="drawable" name="drawable_open_folder_dark" id="0x7F0801DE" />
+    <public type="drawable" name="drawable_open_folder_light" id="0x7F0801DF" />
+    <public type="drawable" name="drawable_overlay_category_dark" id="0x7F0801E0" />
+    <public type="drawable" name="drawable_overlay_category_light" id="0x7F0801E1" />
+    <public type="drawable" name="drawable_overlay_category_pressed_dark" id="0x7F0801E2" />
+    <public type="drawable" name="drawable_overlay_category_pressed_light" id="0x7F0801E3" />
+    <public type="drawable" name="drawable_overlay_channel_pressed_dark" id="0x7F0801E4" />
+    <public type="drawable" name="drawable_overlay_channel_pressed_light" id="0x7F0801E5" />
+    <public type="drawable" name="drawable_overlay_channels_active_dark" id="0x7F0801E6" />
+    <public type="drawable" name="drawable_overlay_channels_active_light" id="0x7F0801E7" />
+    <public type="drawable" name="drawable_overlay_channels_dark" id="0x7F0801E8" />
+    <public type="drawable" name="drawable_overlay_channels_light" id="0x7F0801E9" />
+    <public type="drawable" name="drawable_overlay_channels_selected_dark" id="0x7F0801EA" />
+    <public type="drawable" name="drawable_overlay_channels_selected_light" id="0x7F0801EB" />
+    <public type="drawable" name="drawable_overlay_guild_mentions_dark" id="0x7F0801EC" />
+    <public type="drawable" name="drawable_overlay_guild_mentions_light" id="0x7F0801ED" />
+    <public type="drawable" name="drawable_overlay_image_square" id="0x7F0801EE" />
+    <public type="drawable" name="drawable_overlay_mentions" id="0x7F0801EF" />
+    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7F0801F0" />
+    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7F0801F1" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7F0801F2" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_800" id="0x7F0801F3" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_light_130" id="0x7F0801F4" />
+    <public type="drawable" name="drawable_overlay_mentions_white" id="0x7F0801F5" />
+    <public type="drawable" name="drawable_overlay_thread_count_primary_dark" id="0x7F0801F6" />
+    <public type="drawable" name="drawable_overlay_thread_count_primary_light" id="0x7F0801F7" />
+    <public type="drawable" name="drawable_pill_background_tertiary" id="0x7F0801F8" />
+    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7F0801F9" />
+    <public type="drawable" name="drawable_progress_gradient_light" id="0x7F0801FA" />
+    <public type="drawable" name="drawable_progress_green" id="0x7F0801FB" />
+    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7F0801FC" />
+    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7F0801FD" />
+    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7F0801FE" />
+    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7F0801FF" />
+    <public type="drawable" name="drawable_ptrn_landing_bg_dark" id="0x7F080200" />
+    <public type="drawable" name="drawable_ptrn_landing_bg_light" id="0x7F080201" />
+    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7F080202" />
+    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7F080203" />
+    <public type="drawable" name="drawable_rect_guild_selected" id="0x7F080204" />
+    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7F080205" />
+    <public type="drawable" name="drawable_rect_rounded_bg_primary" id="0x7F080206" />
+    <public type="drawable" name="drawable_rect_rounded_bg_primary_dialog" id="0x7F080207" />
+    <public type="drawable" name="drawable_rect_rounded_bg_secondary" id="0x7F080208" />
+    <public type="drawable" name="drawable_rect_rounded_bg_tertiary" id="0x7F080209" />
+    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7F08020A" />
+    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7F08020B" />
+    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7F08020C" />
+    <public type="drawable" name="drawable_rect_rounded_white_corner_radius_8dp" id="0x7F08020D" />
+    <public type="drawable" name="drawable_segmented_control_container_bg" id="0x7F08020E" />
+    <public type="drawable" name="drawable_settings_progress" id="0x7F08020F" />
+    <public type="drawable" name="drawable_squircle_brand_500" id="0x7F080210" />
+    <public type="drawable" name="drawable_squircle_primary_600" id="0x7F080211" />
+    <public type="drawable" name="drawable_squircle_primary_light_500_alpha_30" id="0x7F080212" />
+    <public type="drawable" name="drawable_squircle_transparent" id="0x7F080213" />
+    <public type="drawable" name="drawable_squircle_white" id="0x7F080214" />
+    <public type="drawable" name="drawable_squircle_white_alpha_30" id="0x7F080215" />
+    <public type="drawable" name="drawable_start_stage_bg" id="0x7F080216" />
+    <public type="drawable" name="drawable_stream_ended_dark" id="0x7F080217" />
+    <public type="drawable" name="drawable_stream_ended_light" id="0x7F080218" />
+    <public type="drawable" name="drawable_stream_full" id="0x7F080219" />
+    <public type="drawable" name="drawable_stream_preview_not_available_dark" id="0x7F08021A" />
+    <public type="drawable" name="drawable_stream_preview_not_available_light" id="0x7F08021B" />
+    <public type="drawable" name="drawable_tag_brand" id="0x7F08021C" />
+    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7F08021D" />
+    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7F08021E" />
+    <public type="drawable" name="drawable_thumb_grey" id="0x7F08021F" />
+    <public type="drawable" name="drawable_thumb_white" id="0x7F080220" />
+    <public type="drawable" name="drawable_tooltip_top_tail" id="0x7F080221" />
+    <public type="drawable" name="drawable_top_down_black_40_alpha_gradient" id="0x7F080222" />
+    <public type="drawable" name="drawable_uikit_background_tertiary_button" id="0x7F080223" />
+    <public type="drawable" name="drawable_uikit_background_tertiary_button_outline" id="0x7F080224" />
+    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7F080225" />
+    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7F080226" />
+    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7F080227" />
+    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7F080228" />
+    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7F080229" />
+    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7F08022A" />
+    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7F08022B" />
+    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7F08022C" />
+    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7F08022D" />
+    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7F08022E" />
+    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7F08022F" />
+    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7F080230" />
+    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7F080231" />
+    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7F080232" />
+    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7F080233" />
+    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7F080234" />
+    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7F080235" />
+    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7F080236" />
+    <public type="drawable" name="drawable_uikit_primary_700_alpha_50_circle" id="0x7F080237" />
+    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7F080238" />
+    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7F080239" />
+    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7F08023A" />
+    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7F08023B" />
+    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7F08023C" />
+    <public type="drawable" name="drawable_uikit_primary_light_000_circle" id="0x7F08023D" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7F08023E" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7F08023F" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7F080240" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7F080241" />
+    <public type="drawable" name="drawable_uikit_primary_light_200_alpha_50_circle" id="0x7F080242" />
+    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7F080243" />
+    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7F080244" />
+    <public type="drawable" name="drawable_uikit_white_circle" id="0x7F080245" />
+    <public type="drawable" name="drawable_vc_empty" id="0x7F080246" />
+    <public type="drawable" name="drawable_voice_controls_bg" id="0x7F080247" />
+    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7F080248" />
+    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7F080249" />
+    <public type="drawable" name="drawable_voice_sensitivity_progress" id="0x7F08024A" />
+    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7F08024B" />
+    <public type="drawable" name="empty_pins_dark" id="0x7F08024C" />
+    <public type="drawable" name="empty_pins_light" id="0x7F08024D" />
+    <public type="drawable" name="exo_controls_fastforward" id="0x7F08024E" />
+    <public type="drawable" name="exo_controls_fullscreen_enter" id="0x7F08024F" />
+    <public type="drawable" name="exo_controls_fullscreen_exit" id="0x7F080250" />
+    <public type="drawable" name="exo_controls_next" id="0x7F080251" />
+    <public type="drawable" name="exo_controls_pause" id="0x7F080252" />
+    <public type="drawable" name="exo_controls_play" id="0x7F080253" />
+    <public type="drawable" name="exo_controls_previous" id="0x7F080254" />
+    <public type="drawable" name="exo_controls_repeat_all" id="0x7F080255" />
+    <public type="drawable" name="exo_controls_repeat_off" id="0x7F080256" />
+    <public type="drawable" name="exo_controls_repeat_one" id="0x7F080257" />
+    <public type="drawable" name="exo_controls_rewind" id="0x7F080258" />
+    <public type="drawable" name="exo_controls_shuffle_off" id="0x7F080259" />
+    <public type="drawable" name="exo_controls_shuffle_on" id="0x7F08025A" />
+    <public type="drawable" name="exo_controls_vr" id="0x7F08025B" />
+    <public type="drawable" name="exo_edit_mode_logo" id="0x7F08025C" />
+    <public type="drawable" name="exo_ic_audiotrack" id="0x7F08025D" />
+    <public type="drawable" name="exo_ic_check" id="0x7F08025E" />
+    <public type="drawable" name="exo_ic_chevron_left" id="0x7F08025F" />
+    <public type="drawable" name="exo_ic_chevron_right" id="0x7F080260" />
+    <public type="drawable" name="exo_ic_default_album_image" id="0x7F080261" />
+    <public type="drawable" name="exo_ic_forward" id="0x7F080262" />
+    <public type="drawable" name="exo_ic_fullscreen_enter" id="0x7F080263" />
+    <public type="drawable" name="exo_ic_fullscreen_exit" id="0x7F080264" />
+    <public type="drawable" name="exo_ic_pause_circle_filled" id="0x7F080265" />
+    <public type="drawable" name="exo_ic_play_circle_filled" id="0x7F080266" />
+    <public type="drawable" name="exo_ic_rewind" id="0x7F080267" />
+    <public type="drawable" name="exo_ic_settings" id="0x7F080268" />
+    <public type="drawable" name="exo_ic_skip_next" id="0x7F080269" />
+    <public type="drawable" name="exo_ic_skip_previous" id="0x7F08026A" />
+    <public type="drawable" name="exo_ic_speed" id="0x7F08026B" />
+    <public type="drawable" name="exo_ic_subtitle_off" id="0x7F08026C" />
+    <public type="drawable" name="exo_ic_subtitle_on" id="0x7F08026D" />
+    <public type="drawable" name="exo_icon_circular_play" id="0x7F08026E" />
+    <public type="drawable" name="exo_icon_fastforward" id="0x7F08026F" />
+    <public type="drawable" name="exo_icon_fullscreen_enter" id="0x7F080270" />
+    <public type="drawable" name="exo_icon_fullscreen_exit" id="0x7F080271" />
+    <public type="drawable" name="exo_icon_next" id="0x7F080272" />
+    <public type="drawable" name="exo_icon_pause" id="0x7F080273" />
+    <public type="drawable" name="exo_icon_play" id="0x7F080274" />
+    <public type="drawable" name="exo_icon_previous" id="0x7F080275" />
+    <public type="drawable" name="exo_icon_repeat_all" id="0x7F080276" />
+    <public type="drawable" name="exo_icon_repeat_off" id="0x7F080277" />
+    <public type="drawable" name="exo_icon_repeat_one" id="0x7F080278" />
+    <public type="drawable" name="exo_icon_rewind" id="0x7F080279" />
+    <public type="drawable" name="exo_icon_shuffle_off" id="0x7F08027A" />
+    <public type="drawable" name="exo_icon_shuffle_on" id="0x7F08027B" />
+    <public type="drawable" name="exo_icon_stop" id="0x7F08027C" />
+    <public type="drawable" name="exo_icon_vr" id="0x7F08027D" />
+    <public type="drawable" name="exo_notification_fastforward" id="0x7F08027E" />
+    <public type="drawable" name="exo_notification_next" id="0x7F08027F" />
+    <public type="drawable" name="exo_notification_pause" id="0x7F080280" />
+    <public type="drawable" name="exo_notification_play" id="0x7F080281" />
+    <public type="drawable" name="exo_notification_previous" id="0x7F080282" />
+    <public type="drawable" name="exo_notification_rewind" id="0x7F080283" />
+    <public type="drawable" name="exo_notification_small_icon" id="0x7F080284" />
+    <public type="drawable" name="exo_notification_stop" id="0x7F080285" />
+    <public type="drawable" name="exo_rounded_rectangle" id="0x7F080286" />
+    <public type="drawable" name="exo_styled_controls_audiotrack" id="0x7F080287" />
+    <public type="drawable" name="exo_styled_controls_check" id="0x7F080288" />
+    <public type="drawable" name="exo_styled_controls_fastforward" id="0x7F080289" />
+    <public type="drawable" name="exo_styled_controls_fullscreen_enter" id="0x7F08028A" />
+    <public type="drawable" name="exo_styled_controls_fullscreen_exit" id="0x7F08028B" />
+    <public type="drawable" name="exo_styled_controls_next" id="0x7F08028C" />
+    <public type="drawable" name="exo_styled_controls_overflow_hide" id="0x7F08028D" />
+    <public type="drawable" name="exo_styled_controls_overflow_show" id="0x7F08028E" />
+    <public type="drawable" name="exo_styled_controls_pause" id="0x7F08028F" />
+    <public type="drawable" name="exo_styled_controls_play" id="0x7F080290" />
+    <public type="drawable" name="exo_styled_controls_previous" id="0x7F080291" />
+    <public type="drawable" name="exo_styled_controls_repeat_all" id="0x7F080292" />
+    <public type="drawable" name="exo_styled_controls_repeat_off" id="0x7F080293" />
+    <public type="drawable" name="exo_styled_controls_repeat_one" id="0x7F080294" />
+    <public type="drawable" name="exo_styled_controls_rewind" id="0x7F080295" />
+    <public type="drawable" name="exo_styled_controls_settings" id="0x7F080296" />
+    <public type="drawable" name="exo_styled_controls_shuffle_off" id="0x7F080297" />
+    <public type="drawable" name="exo_styled_controls_shuffle_on" id="0x7F080298" />
+    <public type="drawable" name="exo_styled_controls_speed" id="0x7F080299" />
+    <public type="drawable" name="exo_styled_controls_subtitle_off" id="0x7F08029A" />
+    <public type="drawable" name="exo_styled_controls_subtitle_on" id="0x7F08029B" />
+    <public type="drawable" name="exo_styled_controls_vr" id="0x7F08029C" />
+    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7F08029D" />
+    <public type="drawable" name="gif" id="0x7F08029E" />
+    <public type="drawable" name="googleg_disabled_color_18" id="0x7F08029F" />
+    <public type="drawable" name="googleg_standard_color_18" id="0x7F0802A0" />
+    <public type="drawable" name="gradient_transparent_colorbackgroundsecondary" id="0x7F0802A1" />
+    <public type="drawable" name="ic_accessibility_24dp" id="0x7F0802A2" />
+    <public type="drawable" name="ic_account_bnet" id="0x7F0802A3" />
+    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7F0802A4" />
+    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7F0802A5" />
+    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7F0802A6" />
+    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7F0802A7" />
+    <public type="drawable" name="ic_account_facebook" id="0x7F0802A8" />
+    <public type="drawable" name="ic_account_github" id="0x7F0802A9" />
+    <public type="drawable" name="ic_account_google" id="0x7F0802AA" />
+    <public type="drawable" name="ic_account_lol" id="0x7F0802AB" />
+    <public type="drawable" name="ic_account_microsoft" id="0x7F0802AC" />
+    <public type="drawable" name="ic_account_obs" id="0x7F0802AD" />
+    <public type="drawable" name="ic_account_patreon" id="0x7F0802AE" />
+    <public type="drawable" name="ic_account_reddit" id="0x7F0802AF" />
+    <public type="drawable" name="ic_account_skype" id="0x7F0802B0" />
+    <public type="drawable" name="ic_account_spotify" id="0x7F0802B1" />
+    <public type="drawable" name="ic_account_steam" id="0x7F0802B2" />
+    <public type="drawable" name="ic_account_twitch" id="0x7F0802B3" />
+    <public type="drawable" name="ic_account_twitter" id="0x7F0802B4" />
+    <public type="drawable" name="ic_account_xbox" id="0x7F0802B5" />
+    <public type="drawable" name="ic_account_xsplit" id="0x7F0802B6" />
+    <public type="drawable" name="ic_account_youtube" id="0x7F0802B7" />
+    <public type="drawable" name="ic_activity_status_24dp" id="0x7F0802B8" />
+    <public type="drawable" name="ic_add_24dp" id="0x7F0802B9" />
+    <public type="drawable" name="ic_add_circle" id="0x7F0802BA" />
+    <public type="drawable" name="ic_add_circle_dark" id="0x7F0802BB" />
+    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7F0802BC" />
+    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7F0802BD" />
+    <public type="drawable" name="ic_add_friend_green_check" id="0x7F0802BE" />
+    <public type="drawable" name="ic_add_friend_plus" id="0x7F0802BF" />
+    <public type="drawable" name="ic_add_friend_send" id="0x7F0802C0" />
+    <public type="drawable" name="ic_add_person_16dp" id="0x7F0802C1" />
+    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7F0802C2" />
+    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7F0802C3" />
+    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7F0802C4" />
+    <public type="drawable" name="ic_add_white_24dp" id="0x7F0802C5" />
+    <public type="drawable" name="ic_alert_circle_16dp" id="0x7F0802C6" />
+    <public type="drawable" name="ic_analytics_16dp" id="0x7F0802C7" />
+    <public type="drawable" name="ic_application_status_approved" id="0x7F0802C8" />
+    <public type="drawable" name="ic_application_status_pending" id="0x7F0802C9" />
+    <public type="drawable" name="ic_application_status_rejected" id="0x7F0802CA" />
+    <public type="drawable" name="ic_application_status_started" id="0x7F0802CB" />
+    <public type="drawable" name="ic_archived_clock_dark" id="0x7F0802CC" />
+    <public type="drawable" name="ic_archived_clock_light" id="0x7F0802CD" />
+    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7F0802CE" />
+    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7F0802CF" />
+    <public type="drawable" name="ic_arrow_down" id="0x7F0802D0" />
+    <public type="drawable" name="ic_arrow_down_14dp" id="0x7F0802D1" />
+    <public type="drawable" name="ic_arrow_down_24dp" id="0x7F0802D2" />
+    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7F0802D3" />
+    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7F0802D4" />
+    <public type="drawable" name="ic_arrow_end_24dp" id="0x7F0802D5" />
+    <public type="drawable" name="ic_arrow_right" id="0x7F0802D6" />
+    <public type="drawable" name="ic_arrow_right_24dp" id="0x7F0802D7" />
+    <public type="drawable" name="ic_arrow_right_link_16dp" id="0x7F0802D8" />
+    <public type="drawable" name="ic_arrow_up_24dp" id="0x7F0802D9" />
+    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7F0802DA" />
+    <public type="drawable" name="ic_attachment_white_24dp" id="0x7F0802DB" />
+    <public type="drawable" name="ic_audio_output_bluetooth_white_24dp" id="0x7F0802DC" />
+    <public type="drawable" name="ic_audio_output_white_24dp" id="0x7F0802DD" />
+    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7F0802DE" />
+    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7F0802DF" />
+    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7F0802E0" />
+    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7F0802E1" />
+    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7F0802E2" />
+    <public type="drawable" name="ic_audit_calendar_grey_24dp" id="0x7F0802E3" />
+    <public type="drawable" name="ic_audit_calendar_white_24dp" id="0x7F0802E4" />
+    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7F0802E5" />
+    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7F0802E6" />
+    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7F0802E7" />
+    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7F0802E8" />
+    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7F0802E9" />
+    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7F0802EA" />
+    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7F0802EB" />
+    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7F0802EC" />
+    <public type="drawable" name="ic_audit_integrations_grey_24dp" id="0x7F0802ED" />
+    <public type="drawable" name="ic_audit_integrations_white_24dp" id="0x7F0802EE" />
+    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7F0802EF" />
+    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7F0802F0" />
+    <public type="drawable" name="ic_audit_logs_24dp" id="0x7F0802F1" />
+    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7F0802F2" />
+    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7F0802F3" />
+    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7F0802F4" />
+    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7F0802F5" />
+    <public type="drawable" name="ic_audit_stage_instance_grey_24dp" id="0x7F0802F6" />
+    <public type="drawable" name="ic_audit_stage_instance_white_24dp" id="0x7F0802F7" />
+    <public type="drawable" name="ic_audit_sticker_grey_24dp" id="0x7F0802F8" />
+    <public type="drawable" name="ic_audit_sticker_white_24dp" id="0x7F0802F9" />
+    <public type="drawable" name="ic_audit_thread_grey_24dp" id="0x7F0802FA" />
+    <public type="drawable" name="ic_audit_thread_white_24dp" id="0x7F0802FB" />
+    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7F0802FC" />
+    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7F0802FD" />
+    <public type="drawable" name="ic_authed_apps_24dp" id="0x7F0802FE" />
+    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7F0802FF" />
+    <public type="drawable" name="ic_backspace_white_24dp" id="0x7F080300" />
+    <public type="drawable" name="ic_ban_red_24dp" id="0x7F080301" />
+    <public type="drawable" name="ic_behavior_24dp" id="0x7F080302" />
+    <public type="drawable" name="ic_bell_12dp" id="0x7F080303" />
+    <public type="drawable" name="ic_bell_16dp" id="0x7F080304" />
+    <public type="drawable" name="ic_bell_20dp" id="0x7F080305" />
+    <public type="drawable" name="ic_billing_24dp" id="0x7F080306" />
+    <public type="drawable" name="ic_blocked_12dp" id="0x7F080307" />
+    <public type="drawable" name="ic_bluetooth_24dp" id="0x7F080308" />
+    <public type="drawable" name="ic_bnet_white_24dp" id="0x7F080309" />
+    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7F08030A" />
+    <public type="drawable" name="ic_boosted_badge_18dp" id="0x7F08030B" />
+    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7F08030C" />
+    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7F08030D" />
+    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7F08030E" />
+    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7F08030F" />
+    <public type="drawable" name="ic_booster_profile_badge_24dp" id="0x7F080310" />
+    <public type="drawable" name="ic_calendar_white_24dp" id="0x7F080311" />
+    <public type="drawable" name="ic_call_24dp" id="0x7F080312" />
+    <public type="drawable" name="ic_call_disconnect_24dp" id="0x7F080313" />
+    <public type="drawable" name="ic_call_indicator_mobile_screenshare_16dp" id="0x7F080314" />
+    <public type="drawable" name="ic_call_indicator_streaming_16dp" id="0x7F080315" />
+    <public type="drawable" name="ic_call_indicator_voice_16dp" id="0x7F080316" />
+    <public type="drawable" name="ic_call_invite_icon" id="0x7F080317" />
+    <public type="drawable" name="ic_call_toolbar_icon_camera_swap" id="0x7F080318" />
+    <public type="drawable" name="ic_call_toolbar_icon_grid" id="0x7F080319" />
+    <public type="drawable" name="ic_call_toolbar_icon_group" id="0x7F08031A" />
+    <public type="drawable" name="ic_call_toolbar_icon_minimize" id="0x7F08031B" />
+    <public type="drawable" name="ic_call_toolbar_icon_minimize_cutout" id="0x7F08031C" />
+    <public type="drawable" name="ic_call_toolbar_stage_minimize" id="0x7F08031D" />
+    <public type="drawable" name="ic_call_toolbar_stage_minimize_cutout" id="0x7F08031E" />
+    <public type="drawable" name="ic_camera_24dp" id="0x7F08031F" />
+    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7F080320" />
+    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7F080321" />
+    <public type="drawable" name="ic_carot_right_24dp" id="0x7F080322" />
+    <public type="drawable" name="ic_category_16dp" id="0x7F080323" />
+    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7F080324" />
+    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7F080325" />
+    <public type="drawable" name="ic_channel_announcements" id="0x7F080326" />
+    <public type="drawable" name="ic_channel_announcements_16dp" id="0x7F080327" />
+    <public type="drawable" name="ic_channel_announcements_locked" id="0x7F080328" />
+    <public type="drawable" name="ic_channel_announcements_nsfw" id="0x7F080329" />
+    <public type="drawable" name="ic_channel_announcements_thread" id="0x7F08032A" />
+    <public type="drawable" name="ic_channel_announcements_thread_locked" id="0x7F08032B" />
+    <public type="drawable" name="ic_channel_announcements_thread_nsfw" id="0x7F08032C" />
+    <public type="drawable" name="ic_channel_lock_16dp" id="0x7F08032D" />
+    <public type="drawable" name="ic_channel_pinned_message" id="0x7F08032E" />
+    <public type="drawable" name="ic_channel_stage_16dp" id="0x7F08032F" />
+    <public type="drawable" name="ic_channel_stage_24dp" id="0x7F080330" />
+    <public type="drawable" name="ic_channel_stage_24dp_gray_a60" id="0x7F080331" />
+    <public type="drawable" name="ic_channel_stage_24dp_white" id="0x7F080332" />
+    <public type="drawable" name="ic_channel_stage_24dp_white_a60" id="0x7F080333" />
+    <public type="drawable" name="ic_channel_stage_locked" id="0x7F080334" />
+    <public type="drawable" name="ic_channel_text" id="0x7F080335" />
+    <public type="drawable" name="ic_channel_text_16dp" id="0x7F080336" />
+    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7F080337" />
+    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7F080338" />
+    <public type="drawable" name="ic_channel_text_locked" id="0x7F080339" />
+    <public type="drawable" name="ic_channel_text_nsfw" id="0x7F08033A" />
+    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7F08033B" />
+    <public type="drawable" name="ic_channel_topic_ellipsis_dark" id="0x7F08033C" />
+    <public type="drawable" name="ic_channel_topic_ellipsis_light" id="0x7F08033D" />
+    <public type="drawable" name="ic_channel_voice" id="0x7F08033E" />
+    <public type="drawable" name="ic_channel_voice_16dp" id="0x7F08033F" />
+    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7F080340" />
+    <public type="drawable" name="ic_channel_voice_locked" id="0x7F080341" />
+    <public type="drawable" name="ic_channels_24dp" id="0x7F080342" />
+    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7F080343" />
+    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7F080344" />
+    <public type="drawable" name="ic_chat_list_actions_add_reaction" id="0x7F080345" />
+    <public type="drawable" name="ic_chat_message_white_24dp" id="0x7F080346" />
+    <public type="drawable" name="ic_check_16dp" id="0x7F080347" />
+    <public type="drawable" name="ic_check_active_16dp" id="0x7F080348" />
+    <public type="drawable" name="ic_check_blurple" id="0x7F080349" />
+    <public type="drawable" name="ic_check_brand_16dp" id="0x7F08034A" />
+    <public type="drawable" name="ic_check_brand_24dp" id="0x7F08034B" />
+    <public type="drawable" name="ic_check_circle_24dp" id="0x7F08034C" />
+    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7F08034D" />
+    <public type="drawable" name="ic_check_green_24dp" id="0x7F08034E" />
+    <public type="drawable" name="ic_check_grey_24dp" id="0x7F08034F" />
+    <public type="drawable" name="ic_check_white_24dp" id="0x7F080350" />
+    <public type="drawable" name="ic_checkmark_green_16dp" id="0x7F080351" />
+    <public type="drawable" name="ic_chevron" id="0x7F080352" />
+    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7F080353" />
+    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7F080354" />
+    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7F080355" />
+    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7F080356" />
+    <public type="drawable" name="ic_chevron_left_24dp" id="0x7F080357" />
+    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7F080358" />
+    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7F080359" />
+    <public type="drawable" name="ic_clear_24dp" id="0x7F08035A" />
+    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7F08035B" />
+    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7F08035C" />
+    <public type="drawable" name="ic_clear_white_24dp" id="0x7F08035D" />
+    <public type="drawable" name="ic_clock_20dp" id="0x7F08035E" />
+    <public type="drawable" name="ic_clock_24dp" id="0x7F08035F" />
+    <public type="drawable" name="ic_clock_black_24dp" id="0x7F080360" />
+    <public type="drawable" name="ic_close_24dp" id="0x7F080361" />
+    <public type="drawable" name="ic_close_circle_grey_24dp" id="0x7F080362" />
+    <public type="drawable" name="ic_close_circle_nova_grey_24dp" id="0x7F080363" />
+    <public type="drawable" name="ic_close_grey_24dp" id="0x7F080364" />
+    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7F080365" />
+    <public type="drawable" name="ic_close_white_18dp" id="0x7F080366" />
+    <public type="drawable" name="ic_close_white_24dp" id="0x7F080367" />
+    <public type="drawable" name="ic_community_24dp" id="0x7F080368" />
+    <public type="drawable" name="ic_community_update" id="0x7F080369" />
+    <public type="drawable" name="ic_compass" id="0x7F08036A" />
+    <public type="drawable" name="ic_contact_sync_friends_list_upsell" id="0x7F08036B" />
+    <public type="drawable" name="ic_contact_sync_white" id="0x7F08036C" />
+    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7F08036D" />
+    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7F08036E" />
+    <public type="drawable" name="ic_controller_24dp" id="0x7F08036F" />
+    <public type="drawable" name="ic_copy_24dp" id="0x7F080370" />
+    <public type="drawable" name="ic_creator_revenue_premium_18px" id="0x7F080371" />
+    <public type="drawable" name="ic_creditcard_amex" id="0x7F080372" />
+    <public type="drawable" name="ic_creditcard_discover" id="0x7F080373" />
+    <public type="drawable" name="ic_creditcard_generic" id="0x7F080374" />
+    <public type="drawable" name="ic_creditcard_mastercard" id="0x7F080375" />
+    <public type="drawable" name="ic_creditcard_paypal" id="0x7F080376" />
+    <public type="drawable" name="ic_creditcard_visa" id="0x7F080377" />
+    <public type="drawable" name="ic_crown_16dp" id="0x7F080378" />
+    <public type="drawable" name="ic_crown_24dp" id="0x7F080379" />
+    <public type="drawable" name="ic_deafen_state_dark" id="0x7F08037A" />
+    <public type="drawable" name="ic_deafen_state_light" id="0x7F08037B" />
+    <public type="drawable" name="ic_deafen_v2_deafened" id="0x7F08037C" />
+    <public type="drawable" name="ic_deafen_v2_red_strike_primary_dark_300" id="0x7F08037D" />
+    <public type="drawable" name="ic_deafen_v2_red_strike_primary_light_600" id="0x7F08037E" />
+    <public type="drawable" name="ic_delete_24dp" id="0x7F08037F" />
+    <public type="drawable" name="ic_delete_circle" id="0x7F080380" />
+    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7F080381" />
+    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7F080382" />
+    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7F080383" />
+    <public type="drawable" name="ic_delete_white_24dp" id="0x7F080384" />
+    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7F080385" />
+    <public type="drawable" name="ic_diag_link_24dp" id="0x7F080386" />
+    <public type="drawable" name="ic_direct_message_header" id="0x7F080387" />
+    <public type="drawable" name="ic_directory_selected_background" id="0x7F080388" />
+    <public type="drawable" name="ic_directory_selector_background" id="0x7F080389" />
+    <public type="drawable" name="ic_done_activated_24dp" id="0x7F08038A" />
+    <public type="drawable" name="ic_done_green_24dp" id="0x7F08038B" />
+    <public type="drawable" name="ic_double_carot_right_16dp" id="0x7F08038C" />
+    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7F08038D" />
+    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7F08038E" />
+    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7F08038F" />
+    <public type="drawable" name="ic_edit_24dp" id="0x7F080390" />
+    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7F080391" />
+    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7F080392" />
+    <public type="drawable" name="ic_ellipsis_16dp" id="0x7F080393" />
+    <public type="drawable" name="ic_email_verification_24dp" id="0x7F080394" />
+    <public type="drawable" name="ic_embed_white_24dp" id="0x7F080395" />
+    <public type="drawable" name="ic_emoji_24dp" id="0x7F080396" />
+    <public type="drawable" name="ic_emoji_blue_24dp" id="0x7F080397" />
+    <public type="drawable" name="ic_emoji_picker_category_activity" id="0x7F080398" />
+    <public type="drawable" name="ic_emoji_picker_category_custom" id="0x7F080399" />
+    <public type="drawable" name="ic_emoji_picker_category_favorites_star" id="0x7F08039A" />
+    <public type="drawable" name="ic_emoji_picker_category_flags" id="0x7F08039B" />
+    <public type="drawable" name="ic_emoji_picker_category_food" id="0x7F08039C" />
+    <public type="drawable" name="ic_emoji_picker_category_nature" id="0x7F08039D" />
+    <public type="drawable" name="ic_emoji_picker_category_objects" id="0x7F08039E" />
+    <public type="drawable" name="ic_emoji_picker_category_people" id="0x7F08039F" />
+    <public type="drawable" name="ic_emoji_picker_category_recent" id="0x7F0803A0" />
+    <public type="drawable" name="ic_emoji_picker_category_symbols" id="0x7F0803A1" />
+    <public type="drawable" name="ic_emoji_picker_category_travel" id="0x7F0803A2" />
+    <public type="drawable" name="ic_empty_server_settings_integrations_dark" id="0x7F0803A3" />
+    <public type="drawable" name="ic_empty_server_settings_integrations_light" id="0x7F0803A4" />
+    <public type="drawable" name="ic_end_event_24dp" id="0x7F0803A5" />
+    <public type="drawable" name="ic_event_20dp" id="0x7F0803A6" />
+    <public type="drawable" name="ic_event_24dp" id="0x7F0803A7" />
+    <public type="drawable" name="ic_events_empty" id="0x7F0803A8" />
+    <public type="drawable" name="ic_exit_24dp" id="0x7F0803A9" />
+    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7F0803AA" />
+    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7F0803AB" />
+    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7F0803AC" />
+    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7F0803AD" />
+    <public type="drawable" name="ic_expression_icon_cutout_24dp" id="0x7F0803AE" />
+    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_100" id="0x7F0803AF" />
+    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_500" id="0x7F0803B0" />
+    <public type="drawable" name="ic_expression_search_empty_dark" id="0x7F0803B1" />
+    <public type="drawable" name="ic_expression_search_empty_light" id="0x7F0803B2" />
+    <public type="drawable" name="ic_facebook_white_18dp" id="0x7F0803B3" />
+    <public type="drawable" name="ic_facebook_white_24dp" id="0x7F0803B4" />
+    <public type="drawable" name="ic_feedback_happy" id="0x7F0803B5" />
+    <public type="drawable" name="ic_feedback_happy_desaturated_dark" id="0x7F0803B6" />
+    <public type="drawable" name="ic_feedback_happy_desaturated_light" id="0x7F0803B7" />
+    <public type="drawable" name="ic_feedback_neutral" id="0x7F0803B8" />
+    <public type="drawable" name="ic_feedback_neutral_desaturated_dark" id="0x7F0803B9" />
+    <public type="drawable" name="ic_feedback_neutral_desaturated_light" id="0x7F0803BA" />
+    <public type="drawable" name="ic_feedback_sad" id="0x7F0803BB" />
+    <public type="drawable" name="ic_feedback_sad_desaturated_dark" id="0x7F0803BC" />
+    <public type="drawable" name="ic_feedback_sad_desaturated_light" id="0x7F0803BD" />
+    <public type="drawable" name="ic_file_acrobat" id="0x7F0803BE" />
+    <public type="drawable" name="ic_file_ae" id="0x7F0803BF" />
+    <public type="drawable" name="ic_file_ai" id="0x7F0803C0" />
+    <public type="drawable" name="ic_file_archive" id="0x7F0803C1" />
+    <public type="drawable" name="ic_file_audio" id="0x7F0803C2" />
+    <public type="drawable" name="ic_file_code" id="0x7F0803C3" />
+    <public type="drawable" name="ic_file_document" id="0x7F0803C4" />
+    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7F0803C5" />
+    <public type="drawable" name="ic_file_download_white_24dp" id="0x7F0803C6" />
+    <public type="drawable" name="ic_file_large_code" id="0x7F0803C7" />
+    <public type="drawable" name="ic_file_large_document" id="0x7F0803C8" />
+    <public type="drawable" name="ic_file_large_video" id="0x7F0803C9" />
+    <public type="drawable" name="ic_file_ps" id="0x7F0803CA" />
+    <public type="drawable" name="ic_file_sketch" id="0x7F0803CB" />
+    <public type="drawable" name="ic_file_spreadsheet" id="0x7F0803CC" />
+    <public type="drawable" name="ic_file_unknown" id="0x7F0803CD" />
+    <public type="drawable" name="ic_file_upload_24dp" id="0x7F0803CE" />
+    <public type="drawable" name="ic_file_video" id="0x7F0803CF" />
+    <public type="drawable" name="ic_file_webcode" id="0x7F0803D0" />
+    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7F0803D1" />
+    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7F0803D2" />
+    <public type="drawable" name="ic_flag_24dp" id="0x7F0803D3" />
+    <public type="drawable" name="ic_flash_auto_24dp" id="0x7F0803D4" />
+    <public type="drawable" name="ic_flash_off_24dp" id="0x7F0803D5" />
+    <public type="drawable" name="ic_flash_on_24dp" id="0x7F0803D6" />
+    <public type="drawable" name="ic_flash_torch_24dp" id="0x7F0803D7" />
+    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_dark" id="0x7F0803D8" />
+    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_light" id="0x7F0803D9" />
+    <public type="drawable" name="ic_flex_input_audio_24dp_dark" id="0x7F0803DA" />
+    <public type="drawable" name="ic_flex_input_audio_24dp_light" id="0x7F0803DB" />
+    <public type="drawable" name="ic_flex_input_create_thread_24dp_dark" id="0x7F0803DC" />
+    <public type="drawable" name="ic_flex_input_create_thread_24dp_light" id="0x7F0803DD" />
+    <public type="drawable" name="ic_flex_input_file_24dp_dark" id="0x7F0803DE" />
+    <public type="drawable" name="ic_flex_input_file_24dp_light" id="0x7F0803DF" />
+    <public type="drawable" name="ic_flex_input_image_24dp_dark" id="0x7F0803E0" />
+    <public type="drawable" name="ic_flex_input_image_24dp_light" id="0x7F0803E1" />
+    <public type="drawable" name="ic_flex_input_movie_24dp_dark" id="0x7F0803E2" />
+    <public type="drawable" name="ic_flex_input_movie_24dp_light" id="0x7F0803E3" />
+    <public type="drawable" name="ic_gallery_24dp" id="0x7F0803E4" />
+    <public type="drawable" name="ic_games_24dp" id="0x7F0803E5" />
+    <public type="drawable" name="ic_gem_tier_1" id="0x7F0803E6" />
+    <public type="drawable" name="ic_gem_tier_2" id="0x7F0803E7" />
+    <public type="drawable" name="ic_gem_tier_3" id="0x7F0803E8" />
+    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7F0803E9" />
+    <public type="drawable" name="ic_gift_24dp" id="0x7F0803EA" />
+    <public type="drawable" name="ic_github_white" id="0x7F0803EB" />
+    <public type="drawable" name="ic_globe_24dp" id="0x7F0803EC" />
+    <public type="drawable" name="ic_globe_32dp" id="0x7F0803ED" />
+    <public type="drawable" name="ic_google_auth_logo" id="0x7F0803EE" />
+    <public type="drawable" name="ic_google_white_24dp" id="0x7F0803EF" />
+    <public type="drawable" name="ic_group_add_white_24dp" id="0x7F0803F0" />
+    <public type="drawable" name="ic_group_edit" id="0x7F0803F1" />
+    <public type="drawable" name="ic_group_join" id="0x7F0803F2" />
+    <public type="drawable" name="ic_group_leave" id="0x7F0803F3" />
+    <public type="drawable" name="ic_group_message_header" id="0x7F0803F4" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7F0803F5" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7F0803F6" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7F0803F7" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7F0803F8" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7F0803F9" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7F0803FA" />
+    <public type="drawable" name="ic_guild_folder" id="0x7F0803FB" />
+    <public type="drawable" name="ic_guild_invite_24dp" id="0x7F0803FC" />
+    <public type="drawable" name="ic_guild_list_dms_24dp" id="0x7F0803FD" />
+    <public type="drawable" name="ic_guild_list_pending_folder" id="0x7F0803FE" />
+    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7F0803FF" />
+    <public type="drawable" name="ic_guild_nitro_progress" id="0x7F080400" />
+    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7F080401" />
+    <public type="drawable" name="ic_guild_notifications_24dp" id="0x7F080402" />
+    <public type="drawable" name="ic_guild_settings_24dp" id="0x7F080403" />
+    <public type="drawable" name="ic_guild_welcome_add_friend" id="0x7F080404" />
+    <public type="drawable" name="ic_guild_welcome_personalize" id="0x7F080405" />
+    <public type="drawable" name="ic_hammer_24dp" id="0x7F080406" />
+    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7F080407" />
+    <public type="drawable" name="ic_headset_10dp" id="0x7F080408" />
+    <public type="drawable" name="ic_headset_12dp" id="0x7F080409" />
+    <public type="drawable" name="ic_headset_24dp" id="0x7F08040A" />
+    <public type="drawable" name="ic_headset_blue_24dp" id="0x7F08040B" />
+    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7F08040C" />
+    <public type="drawable" name="ic_headset_deafened_grey_a60_24dp" id="0x7F08040D" />
+    <public type="drawable" name="ic_headset_deafened_interactiveactive_dark_24dp" id="0x7F08040E" />
+    <public type="drawable" name="ic_headset_deafened_interactiveactive_light_24dp" id="0x7F08040F" />
+    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7F080410" />
+    <public type="drawable" name="ic_headset_deafened_white_a60_24dp" id="0x7F080411" />
+    <public type="drawable" name="ic_headset_grey_24dp" id="0x7F080412" />
+    <public type="drawable" name="ic_headset_grey_a60_24dp" id="0x7F080413" />
+    <public type="drawable" name="ic_headset_interactivenormal_dark_24dp" id="0x7F080414" />
+    <public type="drawable" name="ic_headset_interactivenormal_light_24dp" id="0x7F080415" />
+    <public type="drawable" name="ic_headset_white_18dp" id="0x7F080416" />
+    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7F080417" />
+    <public type="drawable" name="ic_headset_white_24dp" id="0x7F080418" />
+    <public type="drawable" name="ic_headset_white_a60_24dp" id="0x7F080419" />
+    <public type="drawable" name="ic_heart_12dp" id="0x7F08041A" />
+    <public type="drawable" name="ic_heart_16dp" id="0x7F08041B" />
+    <public type="drawable" name="ic_heart_24dp" id="0x7F08041C" />
+    <public type="drawable" name="ic_help_24dp" id="0x7F08041D" />
+    <public type="drawable" name="ic_history_white_24dp" id="0x7F08041E" />
+    <public type="drawable" name="ic_hour_glass_10dp" id="0x7F08041F" />
+    <public type="drawable" name="ic_house_24dp" id="0x7F080420" />
+    <public type="drawable" name="ic_hub_24dp" id="0x7F080421" />
+    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7F080422" />
+    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7F080423" />
+    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7F080424" />
+    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7F080425" />
+    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7F080426" />
+    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7F080427" />
+    <public type="drawable" name="ic_identity_card" id="0x7F080428" />
+    <public type="drawable" name="ic_image_library_24dp" id="0x7F080429" />
+    <public type="drawable" name="ic_image_upload" id="0x7F08042A" />
+    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7F08042B" />
+    <public type="drawable" name="ic_img_selected_light_theme" id="0x7F08042C" />
+    <public type="drawable" name="ic_info_24dp" id="0x7F08042D" />
+    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7F08042E" />
+    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7F08042F" />
+    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7F080430" />
+    <public type="drawable" name="ic_instagram_white_18dp" id="0x7F080431" />
+    <public type="drawable" name="ic_key_24dp" id="0x7F080432" />
+    <public type="drawable" name="ic_keyboard_24dp" id="0x7F080433" />
+    <public type="drawable" name="ic_keyboard_black_24dp" id="0x7F080434" />
+    <public type="drawable" name="ic_krisp_logo_dark" id="0x7F080435" />
+    <public type="drawable" name="ic_krisp_logo_light" id="0x7F080436" />
+    <public type="drawable" name="ic_launch_24dp" id="0x7F080437" />
+    <public type="drawable" name="ic_link_white_24dp" id="0x7F080438" />
+    <public type="drawable" name="ic_locale_24dp" id="0x7F080439" />
+    <public type="drawable" name="ic_location_16dp" id="0x7F08043A" />
+    <public type="drawable" name="ic_location_24dp" id="0x7F08043B" />
+    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7F08043C" />
+    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7F08043D" />
+    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7F08043E" />
+    <public type="drawable" name="ic_logo" id="0x7F08043F" />
+    <public type="drawable" name="ic_lol_white_24dp" id="0x7F080440" />
+    <public type="drawable" name="ic_mail_24dp" id="0x7F080441" />
+    <public type="drawable" name="ic_mark_unread_24dp" id="0x7F080442" />
+    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7F080443" />
+    <public type="drawable" name="ic_member_verification_chat_guard_cta" id="0x7F080444" />
+    <public type="drawable" name="ic_member_verification_pending" id="0x7F080445" />
+    <public type="drawable" name="ic_members_12dp" id="0x7F080446" />
+    <public type="drawable" name="ic_members_24dp" id="0x7F080447" />
+    <public type="drawable" name="ic_mentions_empty" id="0x7F080448" />
+    <public type="drawable" name="ic_mentions_white_24dp" id="0x7F080449" />
+    <public type="drawable" name="ic_menu_24dp" id="0x7F08044A" />
+    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7F08044B" />
+    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7F08044C" />
+    <public type="drawable" name="ic_mic_grey_24dp" id="0x7F08044D" />
+    <public type="drawable" name="ic_mic_grey_a60_24dp" id="0x7F08044E" />
+    <public type="drawable" name="ic_mic_interactivenormal_dark_24dp" id="0x7F08044F" />
+    <public type="drawable" name="ic_mic_interactivenormal_light_24dp" id="0x7F080450" />
+    <public type="drawable" name="ic_mic_mute_red_strike_24dp" id="0x7F080451" />
+    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7F080452" />
+    <public type="drawable" name="ic_mic_muted_grey_a60_24dp" id="0x7F080453" />
+    <public type="drawable" name="ic_mic_muted_interactiveactive_dark_24dp" id="0x7F080454" />
+    <public type="drawable" name="ic_mic_muted_interactiveactive_light_24dp" id="0x7F080455" />
+    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7F080456" />
+    <public type="drawable" name="ic_mic_muted_white_a60_24dp" id="0x7F080457" />
+    <public type="drawable" name="ic_mic_state_dark" id="0x7F080458" />
+    <public type="drawable" name="ic_mic_state_light" id="0x7F080459" />
+    <public type="drawable" name="ic_mic_white_18dp" id="0x7F08045A" />
+    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7F08045B" />
+    <public type="drawable" name="ic_mic_white_24dp" id="0x7F08045C" />
+    <public type="drawable" name="ic_mic_white_a60_24dp" id="0x7F08045D" />
+    <public type="drawable" name="ic_mobile" id="0x7F08045E" />
+    <public type="drawable" name="ic_mobile_screenshare_24dp" id="0x7F08045F" />
+    <public type="drawable" name="ic_mobile_screenshare_end_24dp" id="0x7F080460" />
+    <public type="drawable" name="ic_moderator_shield_24dp" id="0x7F080461" />
+    <public type="drawable" name="ic_monitor_white_24dp" id="0x7F080462" />
+    <public type="drawable" name="ic_more_options_with_circular_background" id="0x7F080463" />
+    <public type="drawable" name="ic_more_primary100_24dp" id="0x7F080464" />
+    <public type="drawable" name="ic_more_primary900_24dp" id="0x7F080465" />
+    <public type="drawable" name="ic_mtrl_checked_circle" id="0x7F080466" />
+    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7F080467" />
+    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7F080468" />
+    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7F080469" />
+    <public type="drawable" name="ic_mute_v2_muted" id="0x7F08046A" />
+    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_dark_300" id="0x7F08046B" />
+    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_light_600" id="0x7F08046C" />
+    <public type="drawable" name="ic_my_account_24dp" id="0x7F08046D" />
+    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7F08046E" />
+    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7F08046F" />
+    <public type="drawable" name="ic_network_airplane_mode" id="0x7F080470" />
+    <public type="drawable" name="ic_network_airplane_mode_light" id="0x7F080471" />
+    <public type="drawable" name="ic_network_connecting_animated_vector" id="0x7F080472" />
+    <public type="drawable" name="ic_network_connecting_animated_vector_light" id="0x7F080473" />
+    <public type="drawable" name="ic_network_offline" id="0x7F080474" />
+    <public type="drawable" name="ic_network_offline_light" id="0x7F080475" />
+    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7F080476" />
+    <public type="drawable" name="ic_nitro_badge_white" id="0x7F080477" />
+    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7F080478" />
+    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7F080479" />
+    <public type="drawable" name="ic_nitro_rep" id="0x7F08047A" />
+    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7F08047B" />
+    <public type="drawable" name="ic_nitro_wheel_18dp" id="0x7F08047C" />
+    <public type="drawable" name="ic_noise_cancellation_active_24dp" id="0x7F08047D" />
+    <public type="drawable" name="ic_noise_cancellation_disabled_24dp" id="0x7F08047E" />
+    <public type="drawable" name="ic_notification_24dp" id="0x7F08047F" />
+    <public type="drawable" name="ic_notification_call_24dp" id="0x7F080480" />
+    <public type="drawable" name="ic_notification_friends_24dp" id="0x7F080481" />
+    <public type="drawable" name="ic_notification_message_24dp" id="0x7F080482" />
+    <public type="drawable" name="ic_notification_settings_24dp" id="0x7F080483" />
+    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7F080484" />
+    <public type="drawable" name="ic_notifications_off_grey_24dp" id="0x7F080485" />
+    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7F080486" />
+    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7F080487" />
+    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7F080488" />
+    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7F080489" />
+    <public type="drawable" name="ic_notifications_white_24dp" id="0x7F08048A" />
+    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7F08048B" />
+    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7F08048C" />
+    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7F08048D" />
+    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7F08048E" />
+    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7F08048F" />
+    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7F080490" />
+    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7F080491" />
+    <public type="drawable" name="ic_overflow_dark_24dp" id="0x7F080492" />
+    <public type="drawable" name="ic_overflow_light_24dp" id="0x7F080493" />
+    <public type="drawable" name="ic_partnered_badge" id="0x7F080494" />
+    <public type="drawable" name="ic_partnered_badge_banner" id="0x7F080495" />
+    <public type="drawable" name="ic_people_white_24dp" id="0x7F080496" />
+    <public type="drawable" name="ic_perk_lock" id="0x7F080497" />
+    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7F080498" />
+    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7F080499" />
+    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7F08049A" />
+    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7F08049B" />
+    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7F08049C" />
+    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7F08049D" />
+    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7F08049E" />
+    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7F08049F" />
+    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7F0804A0" />
+    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7F0804A1" />
+    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7F0804A2" />
+    <public type="drawable" name="ic_person_shield_24dp" id="0x7F0804A3" />
+    <public type="drawable" name="ic_person_shield_purple_24dp" id="0x7F0804A4" />
+    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7F0804A5" />
+    <public type="drawable" name="ic_phone_24dp" id="0x7F0804A6" />
+    <public type="drawable" name="ic_phone_verification_24dp" id="0x7F0804A7" />
+    <public type="drawable" name="ic_phonelink_24dp" id="0x7F0804A8" />
+    <public type="drawable" name="ic_photo_grey_24dp" id="0x7F0804A9" />
+    <public type="drawable" name="ic_pin_24dp" id="0x7F0804AA" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_1" id="0x7F0804AB" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_10" id="0x7F0804AC" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_13" id="0x7F0804AD" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_2" id="0x7F0804AE" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_28" id="0x7F0804AF" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_3" id="0x7F0804B0" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_5" id="0x7F0804B1" />
+    <public type="drawable" name="ic_plan_premium_guild_1" id="0x7F0804B2" />
+    <public type="drawable" name="ic_plan_premium_guild_2" id="0x7F0804B3" />
+    <public type="drawable" name="ic_plan_premium_tier_1" id="0x7F0804B4" />
+    <public type="drawable" name="ic_plan_premium_tier_1_and_premium_guild_1" id="0x7F0804B5" />
+    <public type="drawable" name="ic_plan_premium_tier_1_year" id="0x7F0804B6" />
+    <public type="drawable" name="ic_plan_premium_tier_2" id="0x7F0804B7" />
+    <public type="drawable" name="ic_plan_premium_tier_2_year" id="0x7F0804B8" />
+    <public type="drawable" name="ic_play_arrow_24dp" id="0x7F0804B9" />
+    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7F0804BA" />
+    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7F0804BB" />
+    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7F0804BC" />
+    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7F0804BD" />
+    <public type="drawable" name="ic_premium_24dp" id="0x7F0804BE" />
+    <public type="drawable" name="ic_premium_marketing_custom_profile_24dp" id="0x7F0804BF" />
+    <public type="drawable" name="ic_premium_marketing_global_emojis_24dp" id="0x7F0804C0" />
+    <public type="drawable" name="ic_premium_marketing_guild_boost_24dp" id="0x7F0804C1" />
+    <public type="drawable" name="ic_premium_marketing_longer_messages_24dp" id="0x7F0804C2" />
+    <public type="drawable" name="ic_premium_marketing_more_guilds_24dp" id="0x7F0804C3" />
+    <public type="drawable" name="ic_premium_marketing_stickers_24dp" id="0x7F0804C4" />
+    <public type="drawable" name="ic_premium_marketing_stream_quality_24dp" id="0x7F0804C5" />
+    <public type="drawable" name="ic_premium_marketing_upload_size_24dp" id="0x7F0804C6" />
+    <public type="drawable" name="ic_privacy_24dp" id="0x7F0804C7" />
+    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7F0804C8" />
+    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7F0804C9" />
+    <public type="drawable" name="ic_profile_24dp" id="0x7F0804CA" />
+    <public type="drawable" name="ic_profile_badge_bughunter_level_1_32dp" id="0x7F0804CB" />
+    <public type="drawable" name="ic_profile_badge_bughunter_level_2_32dp" id="0x7F0804CC" />
+    <public type="drawable" name="ic_profile_badge_certified_moderator_32dp" id="0x7F0804CD" />
+    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7F0804CE" />
+    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7F0804CF" />
+    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7F0804D0" />
+    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7F0804D1" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7F0804D2" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7F0804D3" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7F0804D4" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7F0804D5" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7F0804D6" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7F0804D7" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7F0804D8" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7F0804D9" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7F0804DA" />
+    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7F0804DB" />
+    <public type="drawable" name="ic_profile_badge_verified_developer_32dp" id="0x7F0804DC" />
+    <public type="drawable" name="ic_publish_24dp" id="0x7F0804DD" />
+    <public type="drawable" name="ic_qr_code_24dp" id="0x7F0804DE" />
+    <public type="drawable" name="ic_quote_grey_a60_24dp" id="0x7F0804DF" />
+    <public type="drawable" name="ic_quote_white_a60_24dp" id="0x7F0804E0" />
+    <public type="drawable" name="ic_raised_hand_action_24dp" id="0x7F0804E1" />
+    <public type="drawable" name="ic_reaction_24dp" id="0x7F0804E2" />
+    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7F0804E3" />
+    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7F0804E4" />
+    <public type="drawable" name="ic_recent_24dp" id="0x7F0804E5" />
+    <public type="drawable" name="ic_recent_grey_a60_24dp" id="0x7F0804E6" />
+    <public type="drawable" name="ic_recent_white_a60_24dp" id="0x7F0804E7" />
+    <public type="drawable" name="ic_reddit_white_24dp" id="0x7F0804E8" />
+    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7F0804E9" />
+    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7F0804EA" />
+    <public type="drawable" name="ic_reminder_notification" id="0x7F0804EB" />
+    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7F0804EC" />
+    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7F0804ED" />
+    <public type="drawable" name="ic_remove_reaction_24dp" id="0x7F0804EE" />
+    <public type="drawable" name="ic_removed_sticker_72dp" id="0x7F0804EF" />
+    <public type="drawable" name="ic_reply_24dp" id="0x7F0804F0" />
+    <public type="drawable" name="ic_resend_24dp" id="0x7F0804F1" />
+    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7F0804F2" />
+    <public type="drawable" name="ic_role_24dp" id="0x7F0804F3" />
+    <public type="drawable" name="ic_role_lock" id="0x7F0804F4" />
+    <public type="drawable" name="ic_role_pink_24dp" id="0x7F0804F5" />
+    <public type="drawable" name="ic_screen_14dp" id="0x7F0804F6" />
+    <public type="drawable" name="ic_search" id="0x7F0804F7" />
+    <public type="drawable" name="ic_search_16dp" id="0x7F0804F8" />
+    <public type="drawable" name="ic_search_grey_24dp" id="0x7F0804F9" />
+    <public type="drawable" name="ic_search_no_results" id="0x7F0804FA" />
+    <public type="drawable" name="ic_search_white_24dp" id="0x7F0804FB" />
+    <public type="drawable" name="ic_security_24dp" id="0x7F0804FC" />
+    <public type="drawable" name="ic_select" id="0x7F0804FD" />
+    <public type="drawable" name="ic_select_all" id="0x7F0804FE" />
+    <public type="drawable" name="ic_send_24dp" id="0x7F0804FF" />
+    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7F080500" />
+    <public type="drawable" name="ic_send_white_24dp" id="0x7F080501" />
+    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7F080502" />
+    <public type="drawable" name="ic_settings_24dp" id="0x7F080503" />
+    <public type="drawable" name="ic_settings_boost_24dp" id="0x7F080504" />
+    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7F080505" />
+    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7F080506" />
+    <public type="drawable" name="ic_share_16dp" id="0x7F080507" />
+    <public type="drawable" name="ic_share_24dp" id="0x7F080508" />
+    <public type="drawable" name="ic_share_grey_24dp" id="0x7F080509" />
+    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7F08050A" />
+    <public type="drawable" name="ic_share_white_24dp" id="0x7F08050B" />
+    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7F08050C" />
+    <public type="drawable" name="ic_shieldstar_24dp" id="0x7F08050D" />
+    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7F08050E" />
+    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7F08050F" />
+    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7F080510" />
+    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7F080511" />
+    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7F080512" />
+    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7F080513" />
+    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7F080514" />
+    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7F080515" />
+    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7F080516" />
+    <public type="drawable" name="ic_skype_white_24dp" id="0x7F080517" />
+    <public type="drawable" name="ic_slash_command_24dp" id="0x7F080518" />
+    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7F080519" />
+    <public type="drawable" name="ic_smile_24dp" id="0x7F08051A" />
+    <public type="drawable" name="ic_smiley_desaturated" id="0x7F08051B" />
+    <public type="drawable" name="ic_sort_grey_24dp" id="0x7F08051C" />
+    <public type="drawable" name="ic_sort_white_24dp" id="0x7F08051D" />
+    <public type="drawable" name="ic_sound_24dp" id="0x7F08051E" />
+    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7F08051F" />
+    <public type="drawable" name="ic_sound_quiet_24dp" id="0x7F080520" />
+    <public type="drawable" name="ic_sparkle" id="0x7F080521" />
+    <public type="drawable" name="ic_spectate" id="0x7F080522" />
+    <public type="drawable" name="ic_spine_long_cap" id="0x7F080523" />
+    <public type="drawable" name="ic_spine_long_no_cap" id="0x7F080524" />
+    <public type="drawable" name="ic_spine_short_cap" id="0x7F080525" />
+    <public type="drawable" name="ic_spine_short_no_cap" id="0x7F080526" />
+    <public type="drawable" name="ic_spotify_green_24dp" id="0x7F080527" />
+    <public type="drawable" name="ic_spotify_white_24dp" id="0x7F080528" />
+    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7F080529" />
+    <public type="drawable" name="ic_stage_20dp" id="0x7F08052A" />
+    <public type="drawable" name="ic_stage_audience" id="0x7F08052B" />
+    <public type="drawable" name="ic_stage_invite_speak" id="0x7F08052C" />
+    <public type="drawable" name="ic_stage_leave_20dp" id="0x7F08052D" />
+    <public type="drawable" name="ic_stage_move_to_audience" id="0x7F08052E" />
+    <public type="drawable" name="ic_stage_move_to_speaker" id="0x7F08052F" />
+    <public type="drawable" name="ic_stage_raised_hand" id="0x7F080530" />
+    <public type="drawable" name="ic_stage_raised_hand_24dp_activatable" id="0x7F080531" />
+    <public type="drawable" name="ic_stage_raised_hand_green_bg_24dp" id="0x7F080532" />
+    <public type="drawable" name="ic_stage_raised_hand_list" id="0x7F080533" />
+    <public type="drawable" name="ic_stage_raised_hand_white_bg_24dp" id="0x7F080534" />
+    <public type="drawable" name="ic_star_24dp" id="0x7F080535" />
+    <public type="drawable" name="ic_status_24dp" id="0x7F080536" />
+    <public type="drawable" name="ic_status_dnd_16dp" id="0x7F080537" />
+    <public type="drawable" name="ic_status_idle_16dp" id="0x7F080538" />
+    <public type="drawable" name="ic_status_invisible_16dp" id="0x7F080539" />
+    <public type="drawable" name="ic_status_online_16dp" id="0x7F08053A" />
+    <public type="drawable" name="ic_status_streaming_16dp" id="0x7F08053B" />
+    <public type="drawable" name="ic_steam_white_24dp" id="0x7F08053C" />
+    <public type="drawable" name="ic_sticker_icon_24dp" id="0x7F08053D" />
+    <public type="drawable" name="ic_sticker_shop_icon_32dp" id="0x7F08053E" />
+    <public type="drawable" name="ic_sticker_shop_icon_badged_32dp" id="0x7F08053F" />
+    <public type="drawable" name="ic_stop_stream" id="0x7F080540" />
+    <public type="drawable" name="ic_success_discovery" id="0x7F080541" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7F080542" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7F080543" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7F080544" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7F080545" />
+    <public type="drawable" name="ic_tab_friends" id="0x7F080546" />
+    <public type="drawable" name="ic_tab_home" id="0x7F080547" />
+    <public type="drawable" name="ic_tab_mentions" id="0x7F080548" />
+    <public type="drawable" name="ic_tab_search" id="0x7F080549" />
+    <public type="drawable" name="ic_take_photo" id="0x7F08054A" />
+    <public type="drawable" name="ic_template_32dp" id="0x7F08054B" />
+    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7F08054C" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7F08054D" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7F08054E" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7F08054F" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7F080550" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7F080551" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7F080552" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7F080553" />
+    <public type="drawable" name="ic_text_image_24dp" id="0x7F080554" />
+    <public type="drawable" name="ic_theme_24dp" id="0x7F080555" />
+    <public type="drawable" name="ic_thread" id="0x7F080556" />
+    <public type="drawable" name="ic_thread_grey_18dp" id="0x7F080557" />
+    <public type="drawable" name="ic_thread_grey_24dp" id="0x7F080558" />
+    <public type="drawable" name="ic_thread_locked" id="0x7F080559" />
+    <public type="drawable" name="ic_thread_nsfw" id="0x7F08055A" />
+    <public type="drawable" name="ic_thread_welcome_video_frame" id="0x7F08055B" />
+    <public type="drawable" name="ic_thread_white_24dp" id="0x7F08055C" />
+    <public type="drawable" name="ic_tiers_24dp" id="0x7F08055D" />
+    <public type="drawable" name="ic_timer_dark" id="0x7F08055E" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7F08055F" />
+    <public type="drawable" name="ic_timer_light" id="0x7F080560" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7F080561" />
+    <public type="drawable" name="ic_tooltip_bottom_tail" id="0x7F080562" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7F080563" />
+    <public type="drawable" name="ic_trash_outline" id="0x7F080564" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7F080565" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7F080566" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7F080567" />
+    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7F080568" />
+    <public type="drawable" name="ic_unban_grey" id="0x7F080569" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7F08056A" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7F08056B" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7F08056C" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7F08056D" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7F08056E" />
+    <public type="drawable" name="ic_upload_plus_32dp" id="0x7F08056F" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7F080570" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7F080571" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7F080572" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7F080573" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7F080574" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7F080575" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7F080576" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7F080577" />
+    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7F080578" />
+    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7F080579" />
+    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7F08057A" />
+    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7F08057B" />
+    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7F08057C" />
+    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7F08057D" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7F08057E" />
+    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7F08057F" />
+    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7F080580" />
+    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7F080581" />
+    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7F080582" />
+    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7F080583" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7F080584" />
+    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7F080585" />
+    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7F080586" />
+    <public type="drawable" name="ic_verified_10dp" id="0x7F080587" />
+    <public type="drawable" name="ic_verified_badge" id="0x7F080588" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7F080589" />
+    <public type="drawable" name="ic_video_grid_view_grey" id="0x7F08058A" />
+    <public type="drawable" name="ic_video_grid_view_white" id="0x7F08058B" />
+    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7F08058C" />
+    <public type="drawable" name="ic_videocam_white_12dp" id="0x7F08058D" />
+    <public type="drawable" name="ic_videocam_white_16dp" id="0x7F08058E" />
+    <public type="drawable" name="ic_videocam_white_24dp" id="0x7F08058F" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7F080590" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7F080591" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7F080592" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7F080593" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7F080594" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7F080595" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7F080596" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7F080597" />
+    <public type="drawable" name="ic_voice_settings_24dp" id="0x7F080598" />
+    <public type="drawable" name="ic_volume_off_24dp" id="0x7F080599" />
+    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7F08059A" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7F08059B" />
+    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7F08059C" />
+    <public type="drawable" name="ic_wallet_24dp" id="0x7F08059D" />
+    <public type="drawable" name="ic_wand_24dp" id="0x7F08059E" />
+    <public type="drawable" name="ic_warning_circle_24dp" id="0x7F08059F" />
+    <public type="drawable" name="ic_x_red_24dp" id="0x7F0805A0" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7F0805A1" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7F0805A2" />
+    <public type="drawable" name="icon_carrot" id="0x7F0805A3" />
+    <public type="drawable" name="icon_flag_au" id="0x7F0805A4" />
+    <public type="drawable" name="icon_flag_bg" id="0x7F0805A5" />
+    <public type="drawable" name="icon_flag_cs" id="0x7F0805A6" />
+    <public type="drawable" name="icon_flag_da" id="0x7F0805A7" />
+    <public type="drawable" name="icon_flag_de" id="0x7F0805A8" />
+    <public type="drawable" name="icon_flag_el" id="0x7F0805A9" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7F0805AA" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7F0805AB" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7F0805AC" />
+    <public type="drawable" name="icon_flag_eu" id="0x7F0805AD" />
+    <public type="drawable" name="icon_flag_fi" id="0x7F0805AE" />
+    <public type="drawable" name="icon_flag_fr" id="0x7F0805AF" />
+    <public type="drawable" name="icon_flag_gb" id="0x7F0805B0" />
+    <public type="drawable" name="icon_flag_hi" id="0x7F0805B1" />
+    <public type="drawable" name="icon_flag_hk" id="0x7F0805B2" />
+    <public type="drawable" name="icon_flag_hr" id="0x7F0805B3" />
+    <public type="drawable" name="icon_flag_hu" id="0x7F0805B4" />
+    <public type="drawable" name="icon_flag_it" id="0x7F0805B5" />
+    <public type="drawable" name="icon_flag_ja" id="0x7F0805B6" />
+    <public type="drawable" name="icon_flag_ko" id="0x7F0805B7" />
+    <public type="drawable" name="icon_flag_lt" id="0x7F0805B8" />
+    <public type="drawable" name="icon_flag_nl" id="0x7F0805B9" />
+    <public type="drawable" name="icon_flag_no" id="0x7F0805BA" />
+    <public type="drawable" name="icon_flag_pl" id="0x7F0805BB" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7F0805BC" />
+    <public type="drawable" name="icon_flag_ro" id="0x7F0805BD" />
+    <public type="drawable" name="icon_flag_ru" id="0x7F0805BE" />
+    <public type="drawable" name="icon_flag_sg" id="0x7F0805BF" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7F0805C0" />
+    <public type="drawable" name="icon_flag_th" id="0x7F0805C1" />
+    <public type="drawable" name="icon_flag_tr" id="0x7F0805C2" />
+    <public type="drawable" name="icon_flag_uk" id="0x7F0805C3" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7F0805C4" />
+    <public type="drawable" name="icon_flag_vi" id="0x7F0805C5" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7F0805C6" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7F0805C7" />
+    <public type="drawable" name="icon_menu_copy" id="0x7F0805C8" />
+    <public type="drawable" name="icon_save" id="0x7F0805C9" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7F0805CA" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7F0805CB" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7F0805CC" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7F0805CD" />
+    <public type="drawable" name="img_age_gate_failure" id="0x7F0805CE" />
+    <public type="drawable" name="img_age_gate_safety" id="0x7F0805CF" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7F0805D0" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7F0805D1" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7F0805D2" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7F0805D3" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7F0805D4" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7F0805D5" />
+    <public type="drawable" name="img_badge_upsell" id="0x7F0805D6" />
+    <public type="drawable" name="img_boost_activated_dark" id="0x7F0805D7" />
+    <public type="drawable" name="img_boost_activated_light" id="0x7F0805D8" />
+    <public type="drawable" name="img_boost_cancel" id="0x7F0805D9" />
+    <public type="drawable" name="img_boost_hands" id="0x7F0805DA" />
+    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7F0805DB" />
+    <public type="drawable" name="img_channel_following_success_1_light" id="0x7F0805DC" />
+    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7F0805DD" />
+    <public type="drawable" name="img_channel_following_success_2_light" id="0x7F0805DE" />
+    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7F0805DF" />
+    <public type="drawable" name="img_channel_following_success_3_light" id="0x7F0805E0" />
+    <public type="drawable" name="img_channels_onboarding_dark" id="0x7F0805E1" />
+    <public type="drawable" name="img_channels_onboarding_light" id="0x7F0805E2" />
+    <public type="drawable" name="img_clyde_empty" id="0x7F0805E3" />
+    <public type="drawable" name="img_contact_sync_empty_state_upsell" id="0x7F0805E4" />
+    <public type="drawable" name="img_contact_sync_landing_header" id="0x7F0805E5" />
+    <public type="drawable" name="img_contact_sync_suggestions_empty_header" id="0x7F0805E6" />
+    <public type="drawable" name="img_create_stage_choose_server" id="0x7F0805E7" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7F0805E8" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7F0805E9" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7F0805EA" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7F0805EB" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7F0805EC" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7F0805ED" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7F0805EE" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7F0805EF" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7F0805F0" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7F0805F1" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7F0805F2" />
+    <public type="drawable" name="img_empty_guild_role_subscriptions" id="0x7F0805F3" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7F0805F4" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7F0805F5" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7F0805F6" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7F0805F7" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7F0805F8" />
+    <public type="drawable" name="img_forced_update_light" id="0x7F0805F9" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7F0805FA" />
+    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7F0805FB" />
+    <public type="drawable" name="img_gem_hands_faded_light" id="0x7F0805FC" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7F0805FD" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7F0805FE" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7F0805FF" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7F080600" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7F080601" />
+    <public type="drawable" name="img_guild_event_upsell" id="0x7F080602" />
+    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7F080603" />
+    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7F080604" />
+    <public type="drawable" name="img_guild_role_subscription_default_avatar_40dp" id="0x7F080605" />
+    <public type="drawable" name="img_krisp_onboarding" id="0x7F080606" />
+    <public type="drawable" name="img_landing_bg_dark" id="0x7F080607" />
+    <public type="drawable" name="img_landing_bg_light" id="0x7F080608" />
+    <public type="drawable" name="img_landing_splash" id="0x7F080609" />
+    <public type="drawable" name="img_logo" id="0x7F08060A" />
+    <public type="drawable" name="img_logo_discord" id="0x7F08060B" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7F08060C" />
+    <public type="drawable" name="img_logo_discord_nitro_and_boost" id="0x7F08060D" />
+    <public type="drawable" name="img_logo_discord_nitro_and_boost_horizontal" id="0x7F08060E" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7F08060F" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7F080610" />
+    <public type="drawable" name="img_logo_nitro" id="0x7F080611" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7F080612" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7F080613" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7F080614" />
+    <public type="drawable" name="img_logo_square" id="0x7F080615" />
+    <public type="drawable" name="img_logo_wordmark" id="0x7F080616" />
+    <public type="drawable" name="img_member_verification_denied" id="0x7F080617" />
+    <public type="drawable" name="img_member_verification_pending" id="0x7F080618" />
+    <public type="drawable" name="img_member_verification_started" id="0x7F080619" />
+    <public type="drawable" name="img_mfa_dark" id="0x7F08061A" />
+    <public type="drawable" name="img_mfa_light" id="0x7F08061B" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7F08061C" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7F08061D" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7F08061E" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7F08061F" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7F080620" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7F080621" />
+    <public type="drawable" name="img_nitro_uncancel" id="0x7F080622" />
+    <public type="drawable" name="img_no_gifts" id="0x7F080623" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7F080624" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7F080625" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7F080626" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7F080627" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7F080628" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7F080629" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7F08062A" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7F08062B" />
+    <public type="drawable" name="img_overlay_nux" id="0x7F08062C" />
+    <public type="drawable" name="img_permission_prime" id="0x7F08062D" />
+    <public type="drawable" name="img_plan_activated_dark" id="0x7F08062E" />
+    <public type="drawable" name="img_plan_activated_light" id="0x7F08062F" />
+    <public type="drawable" name="img_poop_dark" id="0x7F080630" />
+    <public type="drawable" name="img_poop_light" id="0x7F080631" />
+    <public type="drawable" name="img_premium_activated_tier_1_dark" id="0x7F080632" />
+    <public type="drawable" name="img_premium_activated_tier_1_light" id="0x7F080633" />
+    <public type="drawable" name="img_premium_activated_tier_2_dark" id="0x7F080634" />
+    <public type="drawable" name="img_premium_activated_tier_2_light" id="0x7F080635" />
+    <public type="drawable" name="img_premium_and_premium_guild_subscription_header" id="0x7F080636" />
+    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7F080637" />
+    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7F080638" />
+    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7F080639" />
+    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7F08063A" />
+    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7F08063B" />
+    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7F08063C" />
+    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7F08063D" />
+    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7F08063E" />
+    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_1" id="0x7F08063F" />
+    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_2" id="0x7F080640" />
+    <public type="drawable" name="img_premium_guild_upsell_cta_boost" id="0x7F080641" />
+    <public type="drawable" name="img_premium_stickers_upsell" id="0x7F080642" />
+    <public type="drawable" name="img_premium_subscription_header" id="0x7F080643" />
+    <public type="drawable" name="img_premium_subscription_header_error" id="0x7F080644" />
+    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7F080645" />
+    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7F080646" />
+    <public type="drawable" name="img_profile_banner_value_prop" id="0x7F080647" />
+    <public type="drawable" name="img_profile_marketing" id="0x7F080648" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7F080649" />
+    <public type="drawable" name="img_remote_auth_finished" id="0x7F08064A" />
+    <public type="drawable" name="img_remote_auth_loaded" id="0x7F08064B" />
+    <public type="drawable" name="img_remote_auth_not_found" id="0x7F08064C" />
+    <public type="drawable" name="img_report_success_shield" id="0x7F08064D" />
+    <public type="drawable" name="img_save_your_group" id="0x7F08064E" />
+    <public type="drawable" name="img_server_boost_long" id="0x7F08064F" />
+    <public type="drawable" name="img_stickers_search_empty_90dp" id="0x7F080650" />
+    <public type="drawable" name="img_tag_upsell" id="0x7F080651" />
+    <public type="drawable" name="img_upload_upsell" id="0x7F080652" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7F080653" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7F080654" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7F080655" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7F080656" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7F080657" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7F080658" />
+    <public type="drawable" name="img_voice_onboarding" id="0x7F080659" />
+    <public type="drawable" name="img_wump_trash_dark" id="0x7F08065A" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7F08065B" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7F08065C" />
+    <public type="drawable" name="img_wumpus_custom_status" id="0x7F08065D" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7F08065E" />
+    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7F08065F" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7F080660" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7F080661" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7F080662" />
+    <public type="drawable" name="invite_settings_radio_button_dark" id="0x7F080663" />
+    <public type="drawable" name="invite_settings_radio_button_light" id="0x7F080664" />
+    <public type="drawable" name="material_cursor_drawable" id="0x7F080665" />
+    <public type="drawable" name="material_ic_calendar_black_24dp" id="0x7F080666" />
+    <public type="drawable" name="material_ic_clear_black_24dp" id="0x7F080667" />
+    <public type="drawable" name="material_ic_edit_black_24dp" id="0x7F080668" />
+    <public type="drawable" name="material_ic_keyboard_arrow_left_black_24dp" id="0x7F080669" />
+    <public type="drawable" name="material_ic_keyboard_arrow_next_black_24dp" id="0x7F08066A" />
+    <public type="drawable" name="material_ic_keyboard_arrow_previous_black_24dp" id="0x7F08066B" />
+    <public type="drawable" name="material_ic_keyboard_arrow_right_black_24dp" id="0x7F08066C" />
+    <public type="drawable" name="material_ic_menu_arrow_down_black_24dp" id="0x7F08066D" />
+    <public type="drawable" name="material_ic_menu_arrow_up_black_24dp" id="0x7F08066E" />
+    <public type="drawable" name="mg_profile_banner_value_prop" id="0x7F08066F" />
+    <public type="drawable" name="mtrl_dialog_background" id="0x7F080670" />
+    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7F080671" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7F080672" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7F080673" />
+    <public type="drawable" name="mtrl_ic_cancel" id="0x7F080674" />
+    <public type="drawable" name="mtrl_ic_error" id="0x7F080675" />
+    <public type="drawable" name="mtrl_popupmenu_background" id="0x7F080676" />
+    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7F080677" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7F080678" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7F080679" />
+    <public type="drawable" name="notification_action_background" id="0x7F08067A" />
+    <public type="drawable" name="notification_bg" id="0x7F08067B" />
+    <public type="drawable" name="notification_bg_low" id="0x7F08067C" />
+    <public type="drawable" name="notification_bg_low_normal" id="0x7F08067D" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7F08067E" />
+    <public type="drawable" name="notification_bg_normal" id="0x7F08067F" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7F080680" />
+    <public type="drawable" name="notification_icon_background" id="0x7F080681" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7F080682" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7F080683" />
+    <public type="drawable" name="notification_tile_bg" id="0x7F080684" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7F080685" />
+    <public type="drawable" name="per_guild_identity_modal_image" id="0x7F080686" />
+    <public type="drawable" name="preference_list_divider_material" id="0x7F080687" />
+    <public type="drawable" name="premium_shine" id="0x7F080688" />
+    <public type="drawable" name="reactions_divider" id="0x7F080689" />
+    <public type="drawable" name="ripple_bg_secondary" id="0x7F08068A" />
+    <public type="drawable" name="ripple_brighten" id="0x7F08068B" />
+    <public type="drawable" name="ripple_circle_background_primary" id="0x7F08068C" />
+    <public type="drawable" name="ripple_circle_black" id="0x7F08068D" />
+    <public type="drawable" name="ripple_circle_red" id="0x7F08068E" />
+    <public type="drawable" name="ripple_darken" id="0x7F08068F" />
+    <public type="drawable" name="ripple_pill_red" id="0x7F080690" />
+    <public type="drawable" name="ripple_rounded_bg_secondary" id="0x7F080691" />
+    <public type="drawable" name="ripple_selector_rounded" id="0x7F080692" />
+    <public type="drawable" name="rounded_rectangle_1000dp_radius" id="0x7F080693" />
+    <public type="drawable" name="rounded_rectangle_16dp_radius" id="0x7F080694" />
+    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7F080695" />
+    <public type="drawable" name="rounded_rectangle_8dp_radius" id="0x7F080696" />
+    <public type="drawable" name="screen_share_illustration" id="0x7F080697" />
+    <public type="drawable" name="screen_share_nfx_illustration" id="0x7F080698" />
+    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7F080699" />
+    <public type="drawable" name="selectable_feedback_happy_light" id="0x7F08069A" />
+    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7F08069B" />
+    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7F08069C" />
+    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7F08069D" />
+    <public type="drawable" name="selectable_feedback_sad_light" id="0x7F08069E" />
+    <public type="drawable" name="sparkle_animated_vector" id="0x7F08069F" />
+    <public type="drawable" name="sparkle_yellow_animated_vector" id="0x7F0806A0" />
+    <public type="drawable" name="stage_channel_audience_notice" id="0x7F0806A1" />
+    <public type="drawable" name="stage_channel_dot_separator" id="0x7F0806A2" />
+    <public type="drawable" name="stage_channel_info_separator_dot" id="0x7F0806A3" />
+    <public type="drawable" name="stage_channel_live_dot" id="0x7F0806A4" />
+    <public type="drawable" name="stage_channel_role_dot" id="0x7F0806A5" />
+    <public type="drawable" name="system_cta_bg" id="0x7F0806A6" />
+    <public type="drawable" name="tab_dot_selector" id="0x7F0806A7" />
+    <public type="drawable" name="tab_indicator_default" id="0x7F0806A8" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7F0806A9" />
+    <public type="drawable" name="test_custom_background" id="0x7F0806AA" />
+    <public type="drawable" name="thread_embed_spine_drawable" id="0x7F0806AB" />
+    <public type="drawable" name="thread_onboarding_placeholder" id="0x7F0806AC" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7F0806AD" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7F0806AE" />
+    <public type="drawable" name="trash_bg" id="0x7F0806AF" />
+    <public type="drawable" name="ucrop_crop" id="0x7F0806B0" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7F0806B1" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7F0806B2" />
+    <public type="drawable" name="ucrop_ic_crop_unselected" id="0x7F0806B3" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7F0806B4" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7F0806B5" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7F0806B6" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7F0806B7" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7F0806B8" />
+    <public type="drawable" name="ucrop_ic_rotate_unselected" id="0x7F0806B9" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7F0806BA" />
+    <public type="drawable" name="ucrop_ic_scale_unselected" id="0x7F0806BB" />
+    <public type="drawable" name="ucrop_rotate" id="0x7F0806BC" />
+    <public type="drawable" name="ucrop_scale" id="0x7F0806BD" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7F0806BE" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7F0806BF" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7F0806C0" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7F0806C1" />
+    <public type="drawable" name="ucrop_wrapper_controls_shape" id="0x7F0806C2" />
+    <public type="drawable" name="video_call_illustration" id="0x7F0806C3" />
+    <public type="drawable" name="voice_user_limit_view_left_bg" id="0x7F0806C4" />
+    <public type="drawable" name="voice_user_limit_view_right_bg" id="0x7F0806C5" />
+    <public type="drawable" name="widget_stage_raised_hands_divider" id="0x7F0806C6" />
     <public type="font" name="ginto_bold" id="0x7F090000" />
     <public type="font" name="ginto_medium" id="0x7F090001" />
     <public type="font" name="ginto_regular" id="0x7F090002" />
@@ -5777,3594 +5779,3586 @@
     <public type="id" name="channels_item_voice_user_microphone" id="0x7F0A028B" />
     <public type="id" name="channels_item_voice_user_name" id="0x7F0A028C" />
     <public type="id" name="channels_list" id="0x7F0A028D" />
-    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7F0A028E" />
-    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7F0A028F" />
-    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7F0A0290" />
-    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7F0A0291" />
-    <public type="id" name="channels_list_actions_change_nickname_title" id="0x7F0A0292" />
-    <public type="id" name="channels_list_banner" id="0x7F0A0293" />
-    <public type="id" name="channels_list_banner_foreground" id="0x7F0A0294" />
-    <public type="id" name="channels_list_direct_messages_title" id="0x7F0A0295" />
-    <public type="id" name="channels_list_header" id="0x7F0A0296" />
-    <public type="id" name="channels_list_item_guild_scheduled_event_count" id="0x7F0A0297" />
-    <public type="id" name="channels_list_item_guild_scheduled_event_icon" id="0x7F0A0298" />
-    <public type="id" name="channels_list_item_guild_scheduled_event_label" id="0x7F0A0299" />
-    <public type="id" name="channels_list_item_header" id="0x7F0A029A" />
-    <public type="id" name="channels_list_item_mfa_text" id="0x7F0A029B" />
-    <public type="id" name="channels_list_item_private_avatar" id="0x7F0A029C" />
-    <public type="id" name="channels_list_item_private_desc" id="0x7F0A029D" />
-    <public type="id" name="channels_list_item_private_mentions" id="0x7F0A029E" />
-    <public type="id" name="channels_list_item_private_name" id="0x7F0A029F" />
-    <public type="id" name="channels_list_item_private_tag" id="0x7F0A02A0" />
-    <public type="id" name="channels_list_item_text_actions_icon" id="0x7F0A02A1" />
-    <public type="id" name="channels_list_item_text_actions_title" id="0x7F0A02A2" />
-    <public type="id" name="channels_list_item_thread_actions_archive_settings" id="0x7F0A02A3" />
-    <public type="id" name="channels_list_item_thread_actions_archive_settings_header" id="0x7F0A02A4" />
-    <public type="id" name="channels_list_item_thread_actions_archive_settings_subheader" id="0x7F0A02A5" />
-    <public type="id" name="channels_list_item_thread_actions_channel_notifications" id="0x7F0A02A6" />
-    <public type="id" name="channels_list_item_thread_actions_copy_id" id="0x7F0A02A7" />
-    <public type="id" name="channels_list_item_thread_actions_developer_divider" id="0x7F0A02A8" />
-    <public type="id" name="channels_list_item_thread_actions_divider" id="0x7F0A02A9" />
-    <public type="id" name="channels_list_item_thread_actions_edit" id="0x7F0A02AA" />
-    <public type="id" name="channels_list_item_thread_actions_icon" id="0x7F0A02AB" />
-    <public type="id" name="channels_list_item_thread_actions_leave" id="0x7F0A02AC" />
-    <public type="id" name="channels_list_item_thread_actions_mark_as_read" id="0x7F0A02AD" />
-    <public type="id" name="channels_list_item_thread_actions_mute" id="0x7F0A02AE" />
-    <public type="id" name="channels_list_item_thread_actions_title" id="0x7F0A02AF" />
-    <public type="id" name="channels_list_item_thread_actions_unarchive" id="0x7F0A02B0" />
-    <public type="id" name="channels_list_new" id="0x7F0A02B1" />
-    <public type="id" name="channels_list_premium_guild_hint" id="0x7F0A02B2" />
-    <public type="id" name="channels_list_premium_guild_hint_button" id="0x7F0A02B3" />
-    <public type="id" name="channels_list_premium_guild_hint_subtitle" id="0x7F0A02B4" />
-    <public type="id" name="channels_list_premium_guild_hint_title" id="0x7F0A02B5" />
-    <public type="id" name="channels_list_private_channels_header" id="0x7F0A02B6" />
-    <public type="id" name="channels_list_search" id="0x7F0A02B7" />
-    <public type="id" name="channels_list_start_group" id="0x7F0A02B8" />
-    <public type="id" name="channels_list_tooltip_background" id="0x7F0A02B9" />
-    <public type="id" name="channels_list_tooltip_top_tail" id="0x7F0A02BA" />
-    <public type="id" name="channels_list_unreads" id="0x7F0A02BB" />
-    <public type="id" name="channels_list_unreads_background" id="0x7F0A02BC" />
-    <public type="id" name="channels_list_unreads_stub" id="0x7F0A02BD" />
-    <public type="id" name="channels_toolbar" id="0x7F0A02BE" />
-    <public type="id" name="chat_action_item_button" id="0x7F0A02BF" />
-    <public type="id" name="chat_action_item_image" id="0x7F0A02C0" />
-    <public type="id" name="chat_action_item_subtext" id="0x7F0A02C1" />
-    <public type="id" name="chat_action_item_text" id="0x7F0A02C2" />
-    <public type="id" name="chat_input_application_avatar" id="0x7F0A02C3" />
-    <public type="id" name="chat_input_application_commands_option_description" id="0x7F0A02C4" />
-    <public type="id" name="chat_input_application_commands_recycler" id="0x7F0A02C5" />
-    <public type="id" name="chat_input_application_name" id="0x7F0A02C6" />
-    <public type="id" name="chat_input_categories_recycler" id="0x7F0A02C7" />
-    <public type="id" name="chat_input_container" id="0x7F0A02C8" />
-    <public type="id" name="chat_input_context_bar" id="0x7F0A02C9" />
-    <public type="id" name="chat_input_context_cancel" id="0x7F0A02CA" />
-    <public type="id" name="chat_input_context_description" id="0x7F0A02CB" />
-    <public type="id" name="chat_input_context_reply_mention_button" id="0x7F0A02CC" />
-    <public type="id" name="chat_input_context_reply_mention_button_image" id="0x7F0A02CD" />
-    <public type="id" name="chat_input_context_reply_mention_button_text" id="0x7F0A02CE" />
-    <public type="id" name="chat_input_emoji_matching_header" id="0x7F0A02CF" />
-    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7F0A02D0" />
-    <public type="id" name="chat_input_emoji_picker_view_flipper" id="0x7F0A02D1" />
-    <public type="id" name="chat_input_emoji_upsell_pile" id="0x7F0A02D2" />
-    <public type="id" name="chat_input_emoji_upsell_text" id="0x7F0A02D3" />
-    <public type="id" name="chat_input_guard_action" id="0x7F0A02D4" />
-    <public type="id" name="chat_input_guard_action_secondary" id="0x7F0A02D5" />
-    <public type="id" name="chat_input_guard_subtext" id="0x7F0A02D6" />
-    <public type="id" name="chat_input_guard_text" id="0x7F0A02D7" />
-    <public type="id" name="chat_input_icon_barrier" id="0x7F0A02D8" />
-    <public type="id" name="chat_input_item_avatar" id="0x7F0A02D9" />
-    <public type="id" name="chat_input_item_description" id="0x7F0A02DA" />
-    <public type="id" name="chat_input_item_divider" id="0x7F0A02DB" />
-    <public type="id" name="chat_input_item_emoji" id="0x7F0A02DC" />
-    <public type="id" name="chat_input_item_icon_container" id="0x7F0A02DD" />
-    <public type="id" name="chat_input_item_name" id="0x7F0A02DE" />
-    <public type="id" name="chat_input_item_name_right" id="0x7F0A02DF" />
-    <public type="id" name="chat_input_item_status" id="0x7F0A02E0" />
-    <public type="id" name="chat_input_mentions_recycler" id="0x7F0A02E1" />
-    <public type="id" name="chat_input_sticker_picker_empty_container" id="0x7F0A02E2" />
-    <public type="id" name="chat_input_sticker_picker_empty_container_phase_1" id="0x7F0A02E3" />
-    <public type="id" name="chat_input_sticker_picker_empty_image" id="0x7F0A02E4" />
-    <public type="id" name="chat_input_sticker_picker_empty_link" id="0x7F0A02E5" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_1" id="0x7F0A02E6" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_2" id="0x7F0A02E7" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_3" id="0x7F0A02E8" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_4" id="0x7F0A02E9" />
-    <public type="id" name="chat_input_sticker_picker_empty_subscribe" id="0x7F0A02EA" />
-    <public type="id" name="chat_input_sticker_picker_empty_subtitle" id="0x7F0A02EB" />
-    <public type="id" name="chat_input_sticker_picker_empty_subtitle_phase_1" id="0x7F0A02EC" />
-    <public type="id" name="chat_input_sticker_picker_empty_title" id="0x7F0A02ED" />
-    <public type="id" name="chat_input_sticker_picker_empty_title_phase_1" id="0x7F0A02EE" />
-    <public type="id" name="chat_input_sticker_picker_recycler" id="0x7F0A02EF" />
-    <public type="id" name="chat_input_sticker_picker_view_flipper" id="0x7F0A02F0" />
-    <public type="id" name="chat_input_stickers_container" id="0x7F0A02F1" />
-    <public type="id" name="chat_input_stickers_matching_header" id="0x7F0A02F2" />
-    <public type="id" name="chat_input_stickers_recycler" id="0x7F0A02F3" />
-    <public type="id" name="chat_input_suggested_sticker_1" id="0x7F0A02F4" />
-    <public type="id" name="chat_input_suggested_sticker_2" id="0x7F0A02F5" />
-    <public type="id" name="chat_input_suggested_sticker_3" id="0x7F0A02F6" />
-    <public type="id" name="chat_input_suggested_sticker_4" id="0x7F0A02F7" />
-    <public type="id" name="chat_input_suggested_sticker_cancel" id="0x7F0A02F8" />
-    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7F0A02F9" />
-    <public type="id" name="chat_input_widget" id="0x7F0A02FA" />
-    <public type="id" name="chat_input_wrap" id="0x7F0A02FB" />
-    <public type="id" name="chat_item" id="0x7F0A02FC" />
-    <public type="id" name="chat_list_adapter_item_alert_text" id="0x7F0A02FD" />
-    <public type="id" name="chat_list_adapter_item_blocked" id="0x7F0A02FE" />
-    <public type="id" name="chat_list_adapter_item_call_icon" id="0x7F0A02FF" />
-    <public type="id" name="chat_list_adapter_item_call_participants" id="0x7F0A0300" />
-    <public type="id" name="chat_list_adapter_item_call_subtitle" id="0x7F0A0301" />
-    <public type="id" name="chat_list_adapter_item_call_title" id="0x7F0A0302" />
-    <public type="id" name="chat_list_adapter_item_call_unjoined_ongoing_subtitle" id="0x7F0A0303" />
-    <public type="id" name="chat_list_adapter_item_chat_attachment_icon" id="0x7F0A0304" />
-    <public type="id" name="chat_list_adapter_item_component_root" id="0x7F0A0305" />
-    <public type="id" name="chat_list_adapter_item_edit_channel" id="0x7F0A0306" />
-    <public type="id" name="chat_list_adapter_item_failed" id="0x7F0A0307" />
-    <public type="id" name="chat_list_adapter_item_failed_upload_list" id="0x7F0A0308" />
-    <public type="id" name="chat_list_adapter_item_gutter_bg" id="0x7F0A0309" />
-    <public type="id" name="chat_list_adapter_item_header" id="0x7F0A030A" />
-    <public type="id" name="chat_list_adapter_item_highlighted_bg" id="0x7F0A030B" />
-    <public type="id" name="chat_list_adapter_item_icon_help" id="0x7F0A030C" />
-    <public type="id" name="chat_list_adapter_item_private_channel_start_header" id="0x7F0A030D" />
-    <public type="id" name="chat_list_adapter_item_reply_leading_views" id="0x7F0A030E" />
-    <public type="id" name="chat_list_adapter_item_selectable_background" id="0x7F0A030F" />
-    <public type="id" name="chat_list_adapter_item_sticker" id="0x7F0A0310" />
-    <public type="id" name="chat_list_adapter_item_sticker_greet" id="0x7F0A0311" />
-    <public type="id" name="chat_list_adapter_item_sticker_greet_text" id="0x7F0A0312" />
-    <public type="id" name="chat_list_adapter_item_subheader1" id="0x7F0A0313" />
-    <public type="id" name="chat_list_adapter_item_subheader2" id="0x7F0A0314" />
-    <public type="id" name="chat_list_adapter_item_text" id="0x7F0A0315" />
-    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7F0A0316" />
-    <public type="id" name="chat_list_adapter_item_text_command" id="0x7F0A0317" />
-    <public type="id" name="chat_list_adapter_item_text_decorator" id="0x7F0A0318" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_avatar" id="0x7F0A0319" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_reply_icon" id="0x7F0A031A" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_reply_link_icon" id="0x7F0A031B" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_reply_name" id="0x7F0A031C" />
-    <public type="id" name="chat_list_adapter_item_text_dismiss" id="0x7F0A031D" />
-    <public type="id" name="chat_list_adapter_item_text_error" id="0x7F0A031E" />
-    <public type="id" name="chat_list_adapter_item_text_header" id="0x7F0A031F" />
-    <public type="id" name="chat_list_adapter_item_text_loading" id="0x7F0A0320" />
-    <public type="id" name="chat_list_adapter_item_text_name" id="0x7F0A0321" />
-    <public type="id" name="chat_list_adapter_item_text_reply_content" id="0x7F0A0322" />
-    <public type="id" name="chat_list_adapter_item_text_role_icon" id="0x7F0A0323" />
-    <public type="id" name="chat_list_adapter_item_text_tag" id="0x7F0A0324" />
-    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7F0A0325" />
-    <public type="id" name="chat_list_adapter_item_thread_embed_spine" id="0x7F0A0326" />
-    <public type="id" name="chat_list_adapter_item_unjoined_call_duration" id="0x7F0A0327" />
-    <public type="id" name="chat_list_adapter_item_visibility_icon" id="0x7F0A0328" />
-    <public type="id" name="chat_list_adapter_thread_header_icon" id="0x7F0A0329" />
-    <public type="id" name="chat_list_empty_image" id="0x7F0A032A" />
-    <public type="id" name="chat_list_empty_pins_text" id="0x7F0A032B" />
-    <public type="id" name="chat_list_item_attachment_barrier" id="0x7F0A032C" />
-    <public type="id" name="chat_list_item_attachment_card" id="0x7F0A032D" />
-    <public type="id" name="chat_list_item_attachment_description" id="0x7F0A032E" />
-    <public type="id" name="chat_list_item_attachment_download" id="0x7F0A032F" />
-    <public type="id" name="chat_list_item_attachment_icon" id="0x7F0A0330" />
-    <public type="id" name="chat_list_item_attachment_inline_media" id="0x7F0A0331" />
-    <public type="id" name="chat_list_item_attachment_name" id="0x7F0A0332" />
-    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7F0A0333" />
-    <public type="id" name="chat_list_item_embed_author_icon" id="0x7F0A0334" />
-    <public type="id" name="chat_list_item_embed_author_text" id="0x7F0A0335" />
-    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7F0A0336" />
-    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7F0A0337" />
-    <public type="id" name="chat_list_item_embed_container_card" id="0x7F0A0338" />
-    <public type="id" name="chat_list_item_embed_content" id="0x7F0A0339" />
-    <public type="id" name="chat_list_item_embed_description" id="0x7F0A033A" />
-    <public type="id" name="chat_list_item_embed_divider" id="0x7F0A033B" />
-    <public type="id" name="chat_list_item_embed_field_name" id="0x7F0A033C" />
-    <public type="id" name="chat_list_item_embed_field_value" id="0x7F0A033D" />
-    <public type="id" name="chat_list_item_embed_fields" id="0x7F0A033E" />
-    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7F0A033F" />
-    <public type="id" name="chat_list_item_embed_footer_text" id="0x7F0A0340" />
-    <public type="id" name="chat_list_item_embed_image" id="0x7F0A0341" />
-    <public type="id" name="chat_list_item_embed_image_icons" id="0x7F0A0342" />
-    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7F0A0343" />
-    <public type="id" name="chat_list_item_embed_provider" id="0x7F0A0344" />
-    <public type="id" name="chat_list_item_embed_spoiler" id="0x7F0A0345" />
-    <public type="id" name="chat_list_item_embed_title" id="0x7F0A0346" />
-    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7F0A0347" />
-    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7F0A0348" />
-    <public type="id" name="chat_list_item_message_header_channel" id="0x7F0A0349" />
-    <public type="id" name="chat_list_item_message_header_divider" id="0x7F0A034A" />
-    <public type="id" name="chat_list_item_message_header_guild" id="0x7F0A034B" />
-    <public type="id" name="chat_list_item_message_header_spacer" id="0x7F0A034C" />
-    <public type="id" name="chat_list_item_reactions" id="0x7F0A034D" />
-    <public type="id" name="chat_list_recycler" id="0x7F0A034E" />
-    <public type="id" name="chat_list_search_empty_image" id="0x7F0A034F" />
-    <public type="id" name="chat_list_search_error_text" id="0x7F0A0350" />
-    <public type="id" name="chat_list_search_indexing_animation" id="0x7F0A0351" />
-    <public type="id" name="chat_list_search_indexing_text" id="0x7F0A0352" />
-    <public type="id" name="chat_member_verification_input_guard_action" id="0x7F0A0353" />
-    <public type="id" name="chat_member_verification_input_guard_chevron" id="0x7F0A0354" />
-    <public type="id" name="chat_member_verification_input_guard_icon" id="0x7F0A0355" />
-    <public type="id" name="chat_member_verification_input_guard_text" id="0x7F0A0356" />
-    <public type="id" name="chat_overlay_old_messages_fab" id="0x7F0A0357" />
-    <public type="id" name="chat_overlay_typing" id="0x7F0A0358" />
-    <public type="id" name="chat_overlay_typing_dots" id="0x7F0A0359" />
-    <public type="id" name="chat_status_unread_messages" id="0x7F0A035A" />
-    <public type="id" name="chat_status_unread_messages_mark" id="0x7F0A035B" />
-    <public type="id" name="chat_status_unread_messages_text" id="0x7F0A035C" />
-    <public type="id" name="chat_typing_users_slowmode" id="0x7F0A035D" />
-    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7F0A035E" />
-    <public type="id" name="chat_typing_users_typing" id="0x7F0A035F" />
-    <public type="id" name="chat_upload_1" id="0x7F0A0360" />
-    <public type="id" name="chat_upload_2" id="0x7F0A0361" />
-    <public type="id" name="chat_upload_3" id="0x7F0A0362" />
-    <public type="id" name="check" id="0x7F0A0363" />
-    <public type="id" name="checkable_off_container" id="0x7F0A0364" />
-    <public type="id" name="checkbox" id="0x7F0A0365" />
-    <public type="id" name="checkboxes_container" id="0x7F0A0366" />
-    <public type="id" name="checked" id="0x7F0A0367" />
-    <public type="id" name="chip" id="0x7F0A0368" />
-    <public type="id" name="chip1" id="0x7F0A0369" />
-    <public type="id" name="chip2" id="0x7F0A036A" />
-    <public type="id" name="chip3" id="0x7F0A036B" />
-    <public type="id" name="chip_group" id="0x7F0A036C" />
-    <public type="id" name="chip_image" id="0x7F0A036D" />
-    <public type="id" name="chip_text" id="0x7F0A036E" />
-    <public type="id" name="chips_view" id="0x7F0A036F" />
-    <public type="id" name="choose_plan_empty_container" id="0x7F0A0370" />
-    <public type="id" name="choose_plan_empty_description" id="0x7F0A0371" />
-    <public type="id" name="choose_plan_recycler" id="0x7F0A0372" />
-    <public type="id" name="chronometer" id="0x7F0A0373" />
-    <public type="id" name="circle" id="0x7F0A0374" />
-    <public type="id" name="circle_center" id="0x7F0A0375" />
-    <public type="id" name="claimPromoBody" id="0x7F0A0376" />
-    <public type="id" name="claimPromoCode" id="0x7F0A0377" />
-    <public type="id" name="claimPromoCodeBox" id="0x7F0A0378" />
-    <public type="id" name="claimPromoCopyButton" id="0x7F0A0379" />
-    <public type="id" name="claimPromoFailure" id="0x7F0A037A" />
-    <public type="id" name="claimPromoFailureCloseButton" id="0x7F0A037B" />
-    <public type="id" name="claimPromoFlipper" id="0x7F0A037C" />
-    <public type="id" name="claimPromoLoading" id="0x7F0A037D" />
-    <public type="id" name="claimPromoMaybeLaterButton" id="0x7F0A037E" />
-    <public type="id" name="claimPromoRedeemButton" id="0x7F0A037F" />
-    <public type="id" name="claimPromoSuccess" id="0x7F0A0380" />
-    <public type="id" name="clear_text" id="0x7F0A0381" />
-    <public type="id" name="client_outdated_anchor_wrap" id="0x7F0A0382" />
-    <public type="id" name="client_outdated_update" id="0x7F0A0383" />
-    <public type="id" name="clip_horizontal" id="0x7F0A0384" />
-    <public type="id" name="clip_vertical" id="0x7F0A0385" />
-    <public type="id" name="clockwise" id="0x7F0A0386" />
-    <public type="id" name="close" id="0x7F0A0387" />
-    <public type="id" name="close_button" id="0x7F0A0388" />
-    <public type="id" name="cloudy" id="0x7F0A0389" />
-    <public type="id" name="collapseActionView" id="0x7F0A038A" />
-    <public type="id" name="collapsing_toolbar" id="0x7F0A038B" />
-    <public type="id" name="column" id="0x7F0A038C" />
-    <public type="id" name="column_reverse" id="0x7F0A038D" />
-    <public type="id" name="command_bottom_sheet_command_avatar" id="0x7F0A038E" />
-    <public type="id" name="command_bottom_sheet_command_content" id="0x7F0A038F" />
-    <public type="id" name="command_bottom_sheet_command_copy_button" id="0x7F0A0390" />
-    <public type="id" name="command_bottom_sheet_command_loader" id="0x7F0A0391" />
-    <public type="id" name="command_bottom_sheet_command_slash_heading" id="0x7F0A0392" />
-    <public type="id" name="command_bottom_sheet_command_title" id="0x7F0A0393" />
-    <public type="id" name="command_bottom_sheet_command_title_application_name" id="0x7F0A0394" />
-    <public type="id" name="command_category_item_icon" id="0x7F0A0395" />
-    <public type="id" name="community_first_step_scroll" id="0x7F0A0396" />
-    <public type="id" name="community_get_started_header" id="0x7F0A0397" />
-    <public type="id" name="community_get_started_header_icon" id="0x7F0A0398" />
-    <public type="id" name="community_get_started_header_icon_text" id="0x7F0A0399" />
-    <public type="id" name="community_get_started_header_image" id="0x7F0A039A" />
-    <public type="id" name="community_get_started_scroll" id="0x7F0A039B" />
-    <public type="id" name="community_guideline" id="0x7F0A039C" />
-    <public type="id" name="community_guidelines_channel" id="0x7F0A039D" />
-    <public type="id" name="community_header_image" id="0x7F0A039E" />
-    <public type="id" name="community_list_adapter_item_description" id="0x7F0A039F" />
-    <public type="id" name="community_list_adapter_item_icon" id="0x7F0A03A0" />
-    <public type="id" name="community_list_adapter_item_text_header" id="0x7F0A03A1" />
-    <public type="id" name="community_list_adapter_item_text_icon" id="0x7F0A03A2" />
-    <public type="id" name="community_list_adapter_item_text_name" id="0x7F0A03A3" />
-    <public type="id" name="community_rules_channel" id="0x7F0A03A4" />
-    <public type="id" name="community_setting_community_guidelines_switch" id="0x7F0A03A5" />
-    <public type="id" name="community_setting_get_started" id="0x7F0A03A6" />
-    <public type="id" name="community_setting_guidelines" id="0x7F0A03A7" />
-    <public type="id" name="community_setting_manage_permissions_switch" id="0x7F0A03A8" />
-    <public type="id" name="community_setting_notifications_to_mentions_switch" id="0x7F0A03A9" />
-    <public type="id" name="community_settings_scan_messages_switch" id="0x7F0A03AA" />
-    <public type="id" name="community_settings_verified_emailed_switch" id="0x7F0A03AB" />
-    <public type="id" name="community_step_header" id="0x7F0A03AC" />
-    <public type="id" name="community_updates_channel" id="0x7F0A03AD" />
-    <public type="id" name="compression_toggle" id="0x7F0A03AE" />
-    <public type="id" name="compression_toggle_subtext" id="0x7F0A03AF" />
-    <public type="id" name="confirm" id="0x7F0A03B0" />
-    <public type="id" name="confirm_button" id="0x7F0A03B1" />
-    <public type="id" name="confirm_deleting_community_body_text" id="0x7F0A03B2" />
-    <public type="id" name="confirm_deleting_community_cancel" id="0x7F0A03B3" />
-    <public type="id" name="confirm_deleting_community_header" id="0x7F0A03B4" />
-    <public type="id" name="confirm_deleting_community_header_container" id="0x7F0A03B5" />
-    <public type="id" name="confirm_deleting_community_ok" id="0x7F0A03B6" />
-    <public type="id" name="confirm_guild_scheduled_event_notify" id="0x7F0A03B7" />
-    <public type="id" name="confirm_guild_scheduled_event_preview" id="0x7F0A03B8" />
-    <public type="id" name="confirm_guild_scheduled_event_subtitle" id="0x7F0A03B9" />
-    <public type="id" name="confirm_guild_scheduled_event_title" id="0x7F0A03BA" />
-    <public type="id" name="confirm_guild_scheduled_event_toolbar" id="0x7F0A03BB" />
-    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7F0A03BC" />
-    <public type="id" name="connected_account_actions_dialog_header" id="0x7F0A03BD" />
-    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7F0A03BE" />
-    <public type="id" name="connected_account_disconnect" id="0x7F0A03BF" />
-    <public type="id" name="connected_account_divider" id="0x7F0A03C0" />
-    <public type="id" name="connected_account_img" id="0x7F0A03C1" />
-    <public type="id" name="connected_account_name" id="0x7F0A03C2" />
-    <public type="id" name="connections" id="0x7F0A03C3" />
-    <public type="id" name="connections_empty" id="0x7F0A03C4" />
-    <public type="id" name="connections_recycler" id="0x7F0A03C5" />
-    <public type="id" name="connections_xbox_code" id="0x7F0A03C6" />
-    <public type="id" name="connections_xbox_login" id="0x7F0A03C7" />
-    <public type="id" name="contact" id="0x7F0A03C8" />
-    <public type="id" name="contact_sync_add_phone" id="0x7F0A03C9" />
-    <public type="id" name="contact_sync_add_phone_input" id="0x7F0A03CA" />
-    <public type="id" name="contact_sync_add_phone_next" id="0x7F0A03CB" />
-    <public type="id" name="contact_sync_add_phone_subtitle" id="0x7F0A03CC" />
-    <public type="id" name="contact_sync_add_phone_title" id="0x7F0A03CD" />
-    <public type="id" name="contact_sync_discovery_info_1" id="0x7F0A03CE" />
-    <public type="id" name="contact_sync_discovery_info_2" id="0x7F0A03CF" />
-    <public type="id" name="contact_sync_discovery_toggle" id="0x7F0A03D0" />
-    <public type="id" name="contact_sync_friend_suggestions" id="0x7F0A03D1" />
-    <public type="id" name="contact_sync_friend_suggestions_empty" id="0x7F0A03D2" />
-    <public type="id" name="contact_sync_landing" id="0x7F0A03D3" />
-    <public type="id" name="contact_sync_landing_cta" id="0x7F0A03D4" />
-    <public type="id" name="contact_sync_landing_needs_permissions" id="0x7F0A03D5" />
-    <public type="id" name="contact_sync_landing_next_button" id="0x7F0A03D6" />
-    <public type="id" name="contact_sync_landing_permissions_divider" id="0x7F0A03D7" />
-    <public type="id" name="contact_sync_landing_subtitle" id="0x7F0A03D8" />
-    <public type="id" name="contact_sync_landing_title" id="0x7F0A03D9" />
-    <public type="id" name="contact_sync_landing_toggle_info" id="0x7F0A03DA" />
-    <public type="id" name="contact_sync_name" id="0x7F0A03DB" />
-    <public type="id" name="contact_sync_name_input" id="0x7F0A03DC" />
-    <public type="id" name="contact_sync_name_input_wrap" id="0x7F0A03DD" />
-    <public type="id" name="contact_sync_name_next_button" id="0x7F0A03DE" />
-    <public type="id" name="contact_sync_name_prefill_hint" id="0x7F0A03DF" />
-    <public type="id" name="contact_sync_name_subtitle" id="0x7F0A03E0" />
-    <public type="id" name="contact_sync_name_title" id="0x7F0A03E1" />
-    <public type="id" name="contact_sync_permissions_discoverable_toggle" id="0x7F0A03E2" />
-    <public type="id" name="contact_sync_permissions_discovery_info_1" id="0x7F0A03E3" />
-    <public type="id" name="contact_sync_permissions_discovery_info_2" id="0x7F0A03E4" />
-    <public type="id" name="contact_sync_permissions_email_toggle" id="0x7F0A03E5" />
-    <public type="id" name="contact_sync_permissions_learn_more" id="0x7F0A03E6" />
-    <public type="id" name="contact_sync_permissions_phone_toggle" id="0x7F0A03E7" />
-    <public type="id" name="contact_sync_permissions_subtitle" id="0x7F0A03E8" />
-    <public type="id" name="contact_sync_setting_email" id="0x7F0A03E9" />
-    <public type="id" name="contact_sync_setting_enabled" id="0x7F0A03EA" />
-    <public type="id" name="contact_sync_setting_info" id="0x7F0A03EB" />
-    <public type="id" name="contact_sync_setting_phone" id="0x7F0A03EC" />
-    <public type="id" name="contact_sync_setting_staff_only" id="0x7F0A03ED" />
-    <public type="id" name="contact_sync_suggestions_empty_subtitle" id="0x7F0A03EE" />
-    <public type="id" name="contact_sync_suggestions_empty_title" id="0x7F0A03EF" />
-    <public type="id" name="contact_sync_suggestions_invite_button" id="0x7F0A03F0" />
-    <public type="id" name="contact_sync_suggestions_list_recycler" id="0x7F0A03F1" />
-    <public type="id" name="contact_sync_suggestions_skip_button" id="0x7F0A03F2" />
-    <public type="id" name="contact_sync_suggestions_submit_button" id="0x7F0A03F3" />
-    <public type="id" name="contact_sync_suggestions_subtitle" id="0x7F0A03F4" />
-    <public type="id" name="contact_sync_suggestions_title" id="0x7F0A03F5" />
-    <public type="id" name="contact_sync_upsell_cta" id="0x7F0A03F6" />
-    <public type="id" name="contact_sync_upsell_next_button" id="0x7F0A03F7" />
-    <public type="id" name="contact_sync_upsell_skip_button" id="0x7F0A03F8" />
-    <public type="id" name="contact_sync_upsell_subtitle" id="0x7F0A03F9" />
-    <public type="id" name="contact_sync_upsell_title" id="0x7F0A03FA" />
-    <public type="id" name="contact_sync_upsell_toggle_info" id="0x7F0A03FB" />
-    <public type="id" name="contact_sync_verify_phone" id="0x7F0A03FC" />
-    <public type="id" name="contact_sync_verify_phone_code" id="0x7F0A03FD" />
-    <public type="id" name="contact_sync_verify_phone_subtitle" id="0x7F0A03FE" />
-    <public type="id" name="contact_sync_verify_phone_title" id="0x7F0A03FF" />
-    <public type="id" name="contact_sync_view_flipper" id="0x7F0A0400" />
-    <public type="id" name="container" id="0x7F0A0401" />
-    <public type="id" name="content" id="0x7F0A0402" />
-    <public type="id" name="contentPanel" id="0x7F0A0403" />
-    <public type="id" name="content_background" id="0x7F0A0404" />
-    <public type="id" name="content_container" id="0x7F0A0405" />
-    <public type="id" name="content_iv" id="0x7F0A0406" />
-    <public type="id" name="content_pager" id="0x7F0A0407" />
-    <public type="id" name="content_tabs" id="0x7F0A0408" />
-    <public type="id" name="contiguous" id="0x7F0A0409" />
-    <public type="id" name="continue_button" id="0x7F0A040A" />
-    <public type="id" name="controls_shadow" id="0x7F0A040B" />
-    <public type="id" name="controls_wrapper" id="0x7F0A040C" />
-    <public type="id" name="coordinator" id="0x7F0A040D" />
-    <public type="id" name="copy_id" id="0x7F0A040E" />
-    <public type="id" name="copy_link_group" id="0x7F0A040F" />
-    <public type="id" name="copy_link_icon" id="0x7F0A0410" />
-    <public type="id" name="copy_link_icon_barrier" id="0x7F0A0411" />
-    <public type="id" name="copy_link_subtitle" id="0x7F0A0412" />
-    <public type="id" name="copy_link_title" id="0x7F0A0413" />
-    <public type="id" name="cos" id="0x7F0A0414" />
-    <public type="id" name="counter_text_1" id="0x7F0A0415" />
-    <public type="id" name="counter_text_2" id="0x7F0A0416" />
-    <public type="id" name="counter_text_switcher" id="0x7F0A0417" />
-    <public type="id" name="counterclockwise" id="0x7F0A0418" />
-    <public type="id" name="cpv_color_image_view" id="0x7F0A0419" />
-    <public type="id" name="cpv_color_panel_new" id="0x7F0A041A" />
-    <public type="id" name="cpv_color_panel_old" id="0x7F0A041B" />
-    <public type="id" name="cpv_color_panel_view" id="0x7F0A041C" />
-    <public type="id" name="cpv_color_picker_content" id="0x7F0A041D" />
-    <public type="id" name="cpv_color_picker_custom_button" id="0x7F0A041E" />
-    <public type="id" name="cpv_color_picker_custom_reset" id="0x7F0A041F" />
-    <public type="id" name="cpv_color_picker_select_button" id="0x7F0A0420" />
-    <public type="id" name="cpv_color_picker_title" id="0x7F0A0421" />
-    <public type="id" name="cpv_color_picker_view" id="0x7F0A0422" />
-    <public type="id" name="cpv_hex" id="0x7F0A0423" />
-    <public type="id" name="cpv_hex_container" id="0x7F0A0424" />
-    <public type="id" name="cpv_hex_prefix" id="0x7F0A0425" />
-    <public type="id" name="cpv_preference_preview_color_panel" id="0x7F0A0426" />
-    <public type="id" name="create_channel_announcements_container" id="0x7F0A0427" />
-    <public type="id" name="create_channel_announcements_icon" id="0x7F0A0428" />
-    <public type="id" name="create_channel_announcements_radio" id="0x7F0A0429" />
-    <public type="id" name="create_channel_announcements_title" id="0x7F0A042A" />
-    <public type="id" name="create_channel_follower_button" id="0x7F0A042B" />
-    <public type="id" name="create_channel_name_layout" id="0x7F0A042C" />
-    <public type="id" name="create_channel_private_container" id="0x7F0A042D" />
-    <public type="id" name="create_channel_private_info" id="0x7F0A042E" />
-    <public type="id" name="create_channel_private_switch" id="0x7F0A042F" />
-    <public type="id" name="create_channel_private_title" id="0x7F0A0430" />
-    <public type="id" name="create_channel_role_access_recycler" id="0x7F0A0431" />
-    <public type="id" name="create_channel_role_divider" id="0x7F0A0432" />
-    <public type="id" name="create_channel_role_header" id="0x7F0A0433" />
-    <public type="id" name="create_channel_stage_container" id="0x7F0A0434" />
-    <public type="id" name="create_channel_stage_icon" id="0x7F0A0435" />
-    <public type="id" name="create_channel_stage_radio" id="0x7F0A0436" />
-    <public type="id" name="create_channel_stage_title" id="0x7F0A0437" />
-    <public type="id" name="create_channel_text_container" id="0x7F0A0438" />
-    <public type="id" name="create_channel_text_icon" id="0x7F0A0439" />
-    <public type="id" name="create_channel_text_radio" id="0x7F0A043A" />
-    <public type="id" name="create_channel_text_title" id="0x7F0A043B" />
-    <public type="id" name="create_channel_type_container" id="0x7F0A043C" />
-    <public type="id" name="create_channel_voice_container" id="0x7F0A043D" />
-    <public type="id" name="create_channel_voice_icon" id="0x7F0A043E" />
-    <public type="id" name="create_channel_voice_radio" id="0x7F0A043F" />
-    <public type="id" name="create_channel_voice_title" id="0x7F0A0440" />
-    <public type="id" name="create_event_button" id="0x7F0A0441" />
-    <public type="id" name="create_event_subtitle" id="0x7F0A0442" />
-    <public type="id" name="create_guild_subscription_role_tier_steps_view" id="0x7F0A0443" />
-    <public type="id" name="create_subscription_tier_description" id="0x7F0A0444" />
-    <public type="id" name="create_subscription_tier_description_layout" id="0x7F0A0445" />
-    <public type="id" name="create_subscription_tier_details_layout" id="0x7F0A0446" />
-    <public type="id" name="create_subscription_tier_image_upload_view" id="0x7F0A0447" />
-    <public type="id" name="create_subscription_tier_name" id="0x7F0A0448" />
-    <public type="id" name="create_subscription_tier_name_layout" id="0x7F0A0449" />
-    <public type="id" name="create_subscription_tier_price" id="0x7F0A044A" />
-    <public type="id" name="create_subscription_tier_subtitle" id="0x7F0A044B" />
-    <public type="id" name="create_subscription_tier_title" id="0x7F0A044C" />
-    <public type="id" name="creation_intent_first_option" id="0x7F0A044D" />
-    <public type="id" name="creation_intent_first_option_text" id="0x7F0A044E" />
-    <public type="id" name="creation_intent_second_option" id="0x7F0A044F" />
-    <public type="id" name="creation_intent_second_option_text" id="0x7F0A0450" />
-    <public type="id" name="creation_intent_skip_text" id="0x7F0A0451" />
-    <public type="id" name="credit_header" id="0x7F0A0452" />
-    <public type="id" name="credit_icon" id="0x7F0A0453" />
-    <public type="id" name="credit_info" id="0x7F0A0454" />
-    <public type="id" name="credit_info_container" id="0x7F0A0455" />
-    <public type="id" name="credit_nitro" id="0x7F0A0456" />
-    <public type="id" name="credit_nitro_classic" id="0x7F0A0457" />
-    <public type="id" name="credit_nitro_divider" id="0x7F0A0458" />
-    <public type="id" name="credit_time" id="0x7F0A0459" />
-    <public type="id" name="crown" id="0x7F0A045A" />
-    <public type="id" name="cs_subtitle" id="0x7F0A045B" />
-    <public type="id" name="current_bitrate_display" id="0x7F0A045C" />
-    <public type="id" name="current_user_limit_display" id="0x7F0A045D" />
-    <public type="id" name="custom" id="0x7F0A045E" />
-    <public type="id" name="customPanel" id="0x7F0A045F" />
-    <public type="id" name="cut" id="0x7F0A0460" />
-    <public type="id" name="dark" id="0x7F0A0461" />
-    <public type="id" name="date" id="0x7F0A0462" />
-    <public type="id" name="date_picker_actions" id="0x7F0A0463" />
-    <public type="id" name="daylight" id="0x7F0A0464" />
-    <public type="id" name="deafen_secondary_button" id="0x7F0A0465" />
-    <public type="id" name="debugging_logs" id="0x7F0A0466" />
-    <public type="id" name="decelerate" id="0x7F0A0467" />
-    <public type="id" name="decelerateAndComplete" id="0x7F0A0468" />
-    <public type="id" name="decor_content_parent" id="0x7F0A0469" />
-    <public type="id" name="default_activity_button" id="0x7F0A046A" />
-    <public type="id" name="default_tooltip_text" id="0x7F0A046B" />
-    <public type="id" name="default_window_insets_handler" id="0x7F0A046C" />
-    <public type="id" name="deltaRelative" id="0x7F0A046D" />
-    <public type="id" name="demote_common_words" id="0x7F0A046E" />
-    <public type="id" name="demote_rfc822_hostnames" id="0x7F0A046F" />
-    <public type="id" name="dependency_ordering" id="0x7F0A0470" />
-    <public type="id" name="description" id="0x7F0A0471" />
-    <public type="id" name="description_layout" id="0x7F0A0472" />
-    <public type="id" name="description_placeholder" id="0x7F0A0473" />
-    <public type="id" name="description_placeholder_end_guideline" id="0x7F0A0474" />
-    <public type="id" name="design_bottom_sheet" id="0x7F0A0475" />
-    <public type="id" name="design_menu_item_action_area" id="0x7F0A0476" />
-    <public type="id" name="design_menu_item_action_area_stub" id="0x7F0A0477" />
-    <public type="id" name="design_menu_item_text" id="0x7F0A0478" />
-    <public type="id" name="design_navigation_view" id="0x7F0A0479" />
-    <public type="id" name="developer_divider" id="0x7F0A047A" />
-    <public type="id" name="developer_options" id="0x7F0A047B" />
-    <public type="id" name="developer_options_divider" id="0x7F0A047C" />
-    <public type="id" name="developer_options_header" id="0x7F0A047D" />
-    <public type="id" name="developer_settings_crash_discord_jnibridge" id="0x7F0A047E" />
-    <public type="id" name="developer_settings_crash_discord_nonfatal" id="0x7F0A047F" />
-    <public type="id" name="developer_settings_crash_kotlin" id="0x7F0A0480" />
-    <public type="id" name="developer_settings_experiments" id="0x7F0A0481" />
-    <public type="id" name="developer_settings_notices" id="0x7F0A0482" />
-    <public type="id" name="developer_settings_simulate_gateway_reconnect" id="0x7F0A0483" />
-    <public type="id" name="deviceDefault" id="0x7F0A0484" />
-    <public type="id" name="dialog_button" id="0x7F0A0485" />
-    <public type="id" name="dialog_cancel" id="0x7F0A0486" />
-    <public type="id" name="dialog_card" id="0x7F0A0487" />
-    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7F0A0488" />
-    <public type="id" name="dialog_chat_actions_container" id="0x7F0A0489" />
-    <public type="id" name="dialog_chat_actions_copy" id="0x7F0A048A" />
-    <public type="id" name="dialog_chat_actions_copy_id" id="0x7F0A048B" />
-    <public type="id" name="dialog_chat_actions_delete" id="0x7F0A048C" />
-    <public type="id" name="dialog_chat_actions_edit" id="0x7F0A048D" />
-    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7F0A048E" />
-    <public type="id" name="dialog_chat_actions_mark_unread" id="0x7F0A048F" />
-    <public type="id" name="dialog_chat_actions_pin" id="0x7F0A0490" />
-    <public type="id" name="dialog_chat_actions_profile" id="0x7F0A0491" />
-    <public type="id" name="dialog_chat_actions_publish" id="0x7F0A0492" />
-    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7F0A0493" />
-    <public type="id" name="dialog_chat_actions_reply" id="0x7F0A0494" />
-    <public type="id" name="dialog_chat_actions_report" id="0x7F0A0495" />
-    <public type="id" name="dialog_chat_actions_resend" id="0x7F0A0496" />
-    <public type="id" name="dialog_chat_actions_share" id="0x7F0A0497" />
-    <public type="id" name="dialog_chat_actions_start_thread" id="0x7F0A0498" />
-    <public type="id" name="dialog_date_picker_done" id="0x7F0A0499" />
-    <public type="id" name="dialog_date_picker_input" id="0x7F0A049A" />
-    <public type="id" name="dialog_date_picker_title" id="0x7F0A049B" />
-    <public type="id" name="dialog_delete" id="0x7F0A049C" />
-    <public type="id" name="dialog_save" id="0x7F0A049D" />
-    <public type="id" name="dialog_selections" id="0x7F0A049E" />
-    <public type="id" name="dialog_title" id="0x7F0A049F" />
-    <public type="id" name="dialog_url_actions_copy" id="0x7F0A04A0" />
-    <public type="id" name="dialog_url_actions_open" id="0x7F0A04A1" />
-    <public type="id" name="dialog_url_actions_share" id="0x7F0A04A2" />
-    <public type="id" name="dialog_url_actions_url" id="0x7F0A04A3" />
-    <public type="id" name="dimensions" id="0x7F0A04A4" />
-    <public type="id" name="dimmer_view" id="0x7F0A04A5" />
-    <public type="id" name="direct" id="0x7F0A04A6" />
-    <public type="id" name="directory_channel_icon" id="0x7F0A04A7" />
-    <public type="id" name="directory_channel_name" id="0x7F0A04A8" />
-    <public type="id" name="directory_entry" id="0x7F0A04A9" />
-    <public type="id" name="disableHome" id="0x7F0A04AA" />
-    <public type="id" name="disablePostScroll" id="0x7F0A04AB" />
-    <public type="id" name="disableScroll" id="0x7F0A04AC" />
-    <public type="id" name="disable_delete_body" id="0x7F0A04AD" />
-    <public type="id" name="disable_delete_cancel" id="0x7F0A04AE" />
-    <public type="id" name="disable_delete_code_wrap" id="0x7F0A04AF" />
-    <public type="id" name="disable_delete_confirm" id="0x7F0A04B0" />
-    <public type="id" name="disable_delete_header" id="0x7F0A04B1" />
-    <public type="id" name="disable_delete_password_wrap" id="0x7F0A04B2" />
-    <public type="id" name="disconnect_btn" id="0x7F0A04B3" />
-    <public type="id" name="disconnect_button" id="0x7F0A04B4" />
-    <public type="id" name="discord_hub_add_name_image" id="0x7F0A04B5" />
-    <public type="id" name="discord_hub_add_name_input" id="0x7F0A04B6" />
-    <public type="id" name="discord_hub_add_name_input_layout" id="0x7F0A04B7" />
-    <public type="id" name="discord_hub_add_name_title" id="0x7F0A04B8" />
-    <public type="id" name="discord_hub_add_name_title_button" id="0x7F0A04B9" />
-    <public type="id" name="discord_hub_email_button_layout" id="0x7F0A04BA" />
-    <public type="id" name="discord_hub_email_confirmation" id="0x7F0A04BB" />
-    <public type="id" name="discord_hub_email_confirmation_different" id="0x7F0A04BC" />
-    <public type="id" name="discord_hub_email_confirmation_header_title" id="0x7F0A04BD" />
-    <public type="id" name="discord_hub_email_confirmation_resend" id="0x7F0A04BE" />
-    <public type="id" name="discord_hub_email_header_description" id="0x7F0A04BF" />
-    <public type="id" name="discord_hub_email_header_description_email_input" id="0x7F0A04C0" />
-    <public type="id" name="discord_hub_email_header_description_email_input_layout" id="0x7F0A04C1" />
-    <public type="id" name="discord_hub_email_header_image" id="0x7F0A04C2" />
-    <public type="id" name="discord_hub_email_header_title" id="0x7F0A04C3" />
-    <public type="id" name="discord_hub_email_input" id="0x7F0A04C4" />
-    <public type="id" name="discord_hub_email_label" id="0x7F0A04C5" />
-    <public type="id" name="discord_hub_email_no" id="0x7F0A04C6" />
-    <public type="id" name="discord_hub_email_yes" id="0x7F0A04C7" />
-    <public type="id" name="discord_hub_waitlist" id="0x7F0A04C8" />
-    <public type="id" name="discord_u_add_server_create_server" id="0x7F0A04C9" />
-    <public type="id" name="discord_u_add_server_list_item_image" id="0x7F0A04CA" />
-    <public type="id" name="discord_u_add_server_list_item_layout" id="0x7F0A04CB" />
-    <public type="id" name="discord_u_add_server_list_item_text" id="0x7F0A04CC" />
-    <public type="id" name="discovery_speakers_recycler" id="0x7F0A04CD" />
-    <public type="id" name="discovery_stage_card_speaker_avatar" id="0x7F0A04CE" />
-    <public type="id" name="discovery_stage_card_speaker_name" id="0x7F0A04CF" />
-    <public type="id" name="disjoint" id="0x7F0A04D0" />
-    <public type="id" name="display_activity_switch" id="0x7F0A04D1" />
-    <public type="id" name="display_name" id="0x7F0A04D2" />
-    <public type="id" name="display_switch" id="0x7F0A04D3" />
-    <public type="id" name="divider" id="0x7F0A04D4" />
-    <public type="id" name="divider_stroke" id="0x7F0A04D5" />
-    <public type="id" name="divider_stroke_left" id="0x7F0A04D6" />
-    <public type="id" name="divider_stroke_right" id="0x7F0A04D7" />
-    <public type="id" name="divider_text" id="0x7F0A04D8" />
-    <public type="id" name="dm_action_profile" id="0x7F0A04D9" />
-    <public type="id" name="dng" id="0x7F0A04DA" />
-    <public type="id" name="dragDown" id="0x7F0A04DB" />
-    <public type="id" name="dragEnd" id="0x7F0A04DC" />
-    <public type="id" name="dragLeft" id="0x7F0A04DD" />
-    <public type="id" name="dragRight" id="0x7F0A04DE" />
-    <public type="id" name="dragStart" id="0x7F0A04DF" />
-    <public type="id" name="dragUp" id="0x7F0A04E0" />
-    <public type="id" name="draw3x3" id="0x7F0A04E1" />
-    <public type="id" name="draw4x4" id="0x7F0A04E2" />
-    <public type="id" name="drawPhi" id="0x7F0A04E3" />
-    <public type="id" name="dropdown_menu" id="0x7F0A04E4" />
-    <public type="id" name="dtddd" id="0x7F0A04E5" />
-    <public type="id" name="duration_selector" id="0x7F0A04E6" />
-    <public type="id" name="easeIn" id="0x7F0A04E7" />
-    <public type="id" name="easeInOut" id="0x7F0A04E8" />
-    <public type="id" name="easeOut" id="0x7F0A04E9" />
-    <public type="id" name="edit_account_discriminator_wrap" id="0x7F0A04EA" />
-    <public type="id" name="edit_account_email_wrap" id="0x7F0A04EB" />
-    <public type="id" name="edit_account_name_wrap" id="0x7F0A04EC" />
-    <public type="id" name="edit_account_password_wrap" id="0x7F0A04ED" />
-    <public type="id" name="edit_account_tag_layout_container" id="0x7F0A04EE" />
-    <public type="id" name="edit_account_username_wrap" id="0x7F0A04EF" />
-    <public type="id" name="edit_event" id="0x7F0A04F0" />
-    <public type="id" name="edit_guild_folder_name" id="0x7F0A04F1" />
-    <public type="id" name="edit_integration_custom_emotes_container" id="0x7F0A04F2" />
-    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7F0A04F3" />
-    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7F0A04F4" />
-    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7F0A04F5" />
-    <public type="id" name="edit_integration_expired_sub_container" id="0x7F0A04F6" />
-    <public type="id" name="edit_integration_grace_period_container" id="0x7F0A04F7" />
-    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7F0A04F8" />
-    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7F0A04F9" />
-    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7F0A04FA" />
-    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7F0A04FB" />
-    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7F0A04FC" />
-    <public type="id" name="edit_integration_icon" id="0x7F0A04FD" />
-    <public type="id" name="edit_integration_last_sync_time" id="0x7F0A04FE" />
-    <public type="id" name="edit_integration_name" id="0x7F0A04FF" />
-    <public type="id" name="edit_integration_name_container" id="0x7F0A0500" />
-    <public type="id" name="edit_integration_owner_name" id="0x7F0A0501" />
-    <public type="id" name="edit_integration_save" id="0x7F0A0502" />
-    <public type="id" name="edit_integration_settings_scroll" id="0x7F0A0503" />
-    <public type="id" name="edit_integration_subscriber_count" id="0x7F0A0504" />
-    <public type="id" name="edit_integration_sync_container" id="0x7F0A0505" />
-    <public type="id" name="edit_integration_synced_role" id="0x7F0A0506" />
-    <public type="id" name="edit_integration_synced_role_container" id="0x7F0A0507" />
-    <public type="id" name="edit_member_administrative_container" id="0x7F0A0508" />
-    <public type="id" name="edit_member_ban_button" id="0x7F0A0509" />
-    <public type="id" name="edit_member_kick_button" id="0x7F0A050A" />
-    <public type="id" name="edit_member_nickname" id="0x7F0A050B" />
-    <public type="id" name="edit_member_roles_container" id="0x7F0A050C" />
-    <public type="id" name="edit_member_roles_recycler" id="0x7F0A050D" />
-    <public type="id" name="edit_member_save" id="0x7F0A050E" />
-    <public type="id" name="edit_member_transfer_ownership_button" id="0x7F0A050F" />
-    <public type="id" name="edit_query" id="0x7F0A0510" />
-    <public type="id" name="edit_role_name" id="0x7F0A0511" />
-    <public type="id" name="edit_role_save" id="0x7F0A0512" />
-    <public type="id" name="elastic" id="0x7F0A0513" />
-    <public type="id" name="email" id="0x7F0A0514" />
-    <public type="id" name="embed_image_container" id="0x7F0A0515" />
-    <public type="id" name="embed_inline_media" id="0x7F0A0516" />
-    <public type="id" name="emoji" id="0x7F0A0517" />
-    <public type="id" name="emojiPickerPremiumCta" id="0x7F0A0518" />
-    <public type="id" name="emoji_app_bar" id="0x7F0A0519" />
-    <public type="id" name="emoji_category_item_guild_icon" id="0x7F0A051A" />
-    <public type="id" name="emoji_category_item_standard_icon" id="0x7F0A051B" />
-    <public type="id" name="emoji_info_tv" id="0x7F0A051C" />
-    <public type="id" name="emoji_inline_search_button" id="0x7F0A051D" />
-    <public type="id" name="emoji_item_draweeview" id="0x7F0A051E" />
-    <public type="id" name="emoji_iv" id="0x7F0A051F" />
-    <public type="id" name="emoji_picker_backspace_icon" id="0x7F0A0520" />
-    <public type="id" name="emoji_picker_bottom_bar" id="0x7F0A0521" />
-    <public type="id" name="emoji_picker_bottom_bar_divider" id="0x7F0A0522" />
-    <public type="id" name="emoji_picker_category_barrier" id="0x7F0A0523" />
-    <public type="id" name="emoji_picker_category_recycler" id="0x7F0A0524" />
-    <public type="id" name="emoji_picker_container" id="0x7F0A0525" />
-    <public type="id" name="emoji_picker_unicode_emoji_shortcut_button" id="0x7F0A0526" />
-    <public type="id" name="emoji_search_bar" id="0x7F0A0527" />
-    <public type="id" name="emoji_search_clear" id="0x7F0A0528" />
-    <public type="id" name="emoji_search_input" id="0x7F0A0529" />
-    <public type="id" name="emoji_sheet_emoji_picker_content" id="0x7F0A052A" />
-    <public type="id" name="emoji_sheet_flipper" id="0x7F0A052B" />
-    <public type="id" name="emoji_text_view" id="0x7F0A052C" />
-    <public type="id" name="emoji_toolbar" id="0x7F0A052D" />
-    <public type="id" name="empty" id="0x7F0A052E" />
-    <public type="id" name="empty_description" id="0x7F0A052F" />
-    <public type="id" name="empty_friends_state_add_friend" id="0x7F0A0530" />
-    <public type="id" name="empty_friends_state_cs_button" id="0x7F0A0531" />
-    <public type="id" name="empty_friends_state_cs_image" id="0x7F0A0532" />
-    <public type="id" name="empty_friends_state_cs_title" id="0x7F0A0533" />
-    <public type="id" name="empty_friends_state_image" id="0x7F0A0534" />
-    <public type="id" name="empty_friends_state_title" id="0x7F0A0535" />
-    <public type="id" name="empty_guild_role_subscription_cta" id="0x7F0A0536" />
-    <public type="id" name="empty_results" id="0x7F0A0537" />
-    <public type="id" name="empty_state" id="0x7F0A0538" />
-    <public type="id" name="empty_state_body" id="0x7F0A0539" />
-    <public type="id" name="empty_state_img" id="0x7F0A053A" />
-    <public type="id" name="empty_state_invite_link" id="0x7F0A053B" />
-    <public type="id" name="empty_state_link_options" id="0x7F0A053C" />
-    <public type="id" name="empty_state_scroller" id="0x7F0A053D" />
-    <public type="id" name="empty_state_settings_subtext" id="0x7F0A053E" />
-    <public type="id" name="empty_state_share_btn" id="0x7F0A053F" />
-    <public type="id" name="empty_state_title" id="0x7F0A0540" />
-    <public type="id" name="empty_title" id="0x7F0A0541" />
-    <public type="id" name="empty_view" id="0x7F0A0542" />
-    <public type="id" name="enable_button" id="0x7F0A0543" />
-    <public type="id" name="enable_community_stepsview" id="0x7F0A0544" />
-    <public type="id" name="enable_mfa_key_code" id="0x7F0A0545" />
-    <public type="id" name="enable_mfa_key_launch_authy" id="0x7F0A0546" />
-    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7F0A0547" />
-    <public type="id" name="enable_mfa_stepsview" id="0x7F0A0548" />
-    <public type="id" name="enable_sms_backup_body" id="0x7F0A0549" />
-    <public type="id" name="enable_sms_backup_cancel" id="0x7F0A054A" />
-    <public type="id" name="enable_sms_backup_confirm" id="0x7F0A054B" />
-    <public type="id" name="enable_sms_backup_header" id="0x7F0A054C" />
-    <public type="id" name="enable_sms_backup_password_wrap" id="0x7F0A054D" />
-    <public type="id" name="enable_two_factor_password_body_container" id="0x7F0A054E" />
-    <public type="id" name="enable_two_factor_password_body_text" id="0x7F0A054F" />
-    <public type="id" name="enable_two_factor_password_cancel" id="0x7F0A0550" />
-    <public type="id" name="enable_two_factor_password_header" id="0x7F0A0551" />
-    <public type="id" name="enable_two_factor_password_header_container" id="0x7F0A0552" />
-    <public type="id" name="enable_two_factor_password_ok" id="0x7F0A0553" />
-    <public type="id" name="enable_two_factor_password_view_input" id="0x7F0A0554" />
-    <public type="id" name="end" id="0x7F0A0555" />
-    <public type="id" name="endToStart" id="0x7F0A0556" />
-    <public type="id" name="end_date_header" id="0x7F0A0557" />
-    <public type="id" name="end_date_input" id="0x7F0A0558" />
-    <public type="id" name="end_date_layout" id="0x7F0A0559" />
-    <public type="id" name="end_event" id="0x7F0A055A" />
-    <public type="id" name="end_padder" id="0x7F0A055B" />
-    <public type="id" name="end_time_header" id="0x7F0A055C" />
-    <public type="id" name="end_time_input" id="0x7F0A055D" />
-    <public type="id" name="end_time_layout" id="0x7F0A055E" />
-    <public type="id" name="enterAlways" id="0x7F0A055F" />
-    <public type="id" name="enterAlwaysCollapsed" id="0x7F0A0560" />
-    <public type="id" name="entire_server" id="0x7F0A0561" />
-    <public type="id" name="event_card" id="0x7F0A0562" />
-    <public type="id" name="event_channel" id="0x7F0A0563" />
-    <public type="id" name="event_connect_button" id="0x7F0A0564" />
-    <public type="id" name="event_icon" id="0x7F0A0565" />
-    <public type="id" name="event_name" id="0x7F0A0566" />
-    <public type="id" name="event_permissions_divider" id="0x7F0A0567" />
-    <public type="id" name="event_permissions_title" id="0x7F0A0568" />
-    <public type="id" name="event_prompt_overlay_stub" id="0x7F0A0569" />
-    <public type="id" name="event_topic" id="0x7F0A056A" />
-    <public type="id" name="exitUntilCollapsed" id="0x7F0A056B" />
-    <public type="id" name="exo_ad_overlay" id="0x7F0A056C" />
-    <public type="id" name="exo_artwork" id="0x7F0A056D" />
-    <public type="id" name="exo_audio_track" id="0x7F0A056E" />
-    <public type="id" name="exo_basic_controls" id="0x7F0A056F" />
-    <public type="id" name="exo_bottom_bar" id="0x7F0A0570" />
-    <public type="id" name="exo_buffering" id="0x7F0A0571" />
-    <public type="id" name="exo_center_controls" id="0x7F0A0572" />
-    <public type="id" name="exo_check" id="0x7F0A0573" />
-    <public type="id" name="exo_content_frame" id="0x7F0A0574" />
-    <public type="id" name="exo_controller" id="0x7F0A0575" />
-    <public type="id" name="exo_controller_placeholder" id="0x7F0A0576" />
-    <public type="id" name="exo_controls_background" id="0x7F0A0577" />
-    <public type="id" name="exo_duration" id="0x7F0A0578" />
-    <public type="id" name="exo_error_message" id="0x7F0A0579" />
-    <public type="id" name="exo_extra_controls" id="0x7F0A057A" />
-    <public type="id" name="exo_extra_controls_scroll_view" id="0x7F0A057B" />
-    <public type="id" name="exo_ffwd" id="0x7F0A057C" />
-    <public type="id" name="exo_ffwd_with_amount" id="0x7F0A057D" />
-    <public type="id" name="exo_fullscreen" id="0x7F0A057E" />
-    <public type="id" name="exo_icon" id="0x7F0A057F" />
-    <public type="id" name="exo_main_text" id="0x7F0A0580" />
-    <public type="id" name="exo_minimal_controls" id="0x7F0A0581" />
-    <public type="id" name="exo_minimal_fullscreen" id="0x7F0A0582" />
-    <public type="id" name="exo_next" id="0x7F0A0583" />
-    <public type="id" name="exo_overflow_hide" id="0x7F0A0584" />
-    <public type="id" name="exo_overflow_show" id="0x7F0A0585" />
-    <public type="id" name="exo_overlay" id="0x7F0A0586" />
-    <public type="id" name="exo_pause" id="0x7F0A0587" />
-    <public type="id" name="exo_play" id="0x7F0A0588" />
-    <public type="id" name="exo_play_pause" id="0x7F0A0589" />
-    <public type="id" name="exo_playback_speed" id="0x7F0A058A" />
-    <public type="id" name="exo_position" id="0x7F0A058B" />
-    <public type="id" name="exo_prev" id="0x7F0A058C" />
-    <public type="id" name="exo_progress" id="0x7F0A058D" />
-    <public type="id" name="exo_progress_placeholder" id="0x7F0A058E" />
-    <public type="id" name="exo_repeat_toggle" id="0x7F0A058F" />
-    <public type="id" name="exo_rew" id="0x7F0A0590" />
-    <public type="id" name="exo_rew_with_amount" id="0x7F0A0591" />
-    <public type="id" name="exo_settings" id="0x7F0A0592" />
-    <public type="id" name="exo_settings_listview" id="0x7F0A0593" />
-    <public type="id" name="exo_shuffle" id="0x7F0A0594" />
-    <public type="id" name="exo_shutter" id="0x7F0A0595" />
-    <public type="id" name="exo_sub_text" id="0x7F0A0596" />
-    <public type="id" name="exo_subtitle" id="0x7F0A0597" />
-    <public type="id" name="exo_subtitles" id="0x7F0A0598" />
-    <public type="id" name="exo_text" id="0x7F0A0599" />
-    <public type="id" name="exo_time" id="0x7F0A059A" />
-    <public type="id" name="exo_track_selection_view" id="0x7F0A059B" />
-    <public type="id" name="exo_vr" id="0x7F0A059C" />
-    <public type="id" name="expand_activities_button" id="0x7F0A059D" />
-    <public type="id" name="expand_btn" id="0x7F0A059E" />
-    <public type="id" name="expanded_menu" id="0x7F0A059F" />
-    <public type="id" name="experiment_override_bucket_descriptions" id="0x7F0A05A0" />
-    <public type="id" name="experiment_override_buckets_spinner" id="0x7F0A05A1" />
-    <public type="id" name="experiment_override_buckets_spinner_container" id="0x7F0A05A2" />
-    <public type="id" name="experiment_override_clear" id="0x7F0A05A3" />
-    <public type="id" name="experiment_override_experiment_api_name" id="0x7F0A05A4" />
-    <public type="id" name="experiment_override_experiment_name" id="0x7F0A05A5" />
-    <public type="id" name="experiment_overrides_list_item_experiment_override_view" id="0x7F0A05A6" />
-    <public type="id" name="exposureCorrection" id="0x7F0A05A7" />
-    <public type="id" name="expression_btn" id="0x7F0A05A8" />
-    <public type="id" name="expression_btn_badge" id="0x7F0A05A9" />
-    <public type="id" name="expression_btn_container" id="0x7F0A05AA" />
-    <public type="id" name="expression_picker_category_selection_overline" id="0x7F0A05AB" />
-    <public type="id" name="expression_tray_container" id="0x7F0A05AC" />
-    <public type="id" name="expression_tray_content_container" id="0x7F0A05AD" />
-    <public type="id" name="expression_tray_detail_page" id="0x7F0A05AE" />
-    <public type="id" name="expression_tray_emoji_card" id="0x7F0A05AF" />
-    <public type="id" name="expression_tray_emoji_picker_content" id="0x7F0A05B0" />
-    <public type="id" name="expression_tray_gif_card" id="0x7F0A05B1" />
-    <public type="id" name="expression_tray_gif_picker_content" id="0x7F0A05B2" />
-    <public type="id" name="expression_tray_landing_page" id="0x7F0A05B3" />
-    <public type="id" name="expression_tray_search_bar" id="0x7F0A05B4" />
-    <public type="id" name="expression_tray_search_button" id="0x7F0A05B5" />
-    <public type="id" name="expression_tray_search_icon" id="0x7F0A05B6" />
-    <public type="id" name="expression_tray_segmented_control" id="0x7F0A05B7" />
-    <public type="id" name="expression_tray_sticker_card" id="0x7F0A05B8" />
-    <public type="id" name="expression_tray_sticker_picker_content" id="0x7F0A05B9" />
-    <public type="id" name="expression_tray_toolbar" id="0x7F0A05BA" />
-    <public type="id" name="expression_tray_toolbar_layout" id="0x7F0A05BB" />
-    <public type="id" name="external_divider" id="0x7F0A05BC" />
-    <public type="id" name="external_location_input" id="0x7F0A05BD" />
-    <public type="id" name="external_location_layout" id="0x7F0A05BE" />
-    <public type="id" name="external_option" id="0x7F0A05BF" />
-    <public type="id" name="external_share_activity_action_preview" id="0x7F0A05C0" />
-    <public type="id" name="external_share_comment" id="0x7F0A05C1" />
-    <public type="id" name="external_share_list" id="0x7F0A05C2" />
-    <public type="id" name="external_share_list_wrap" id="0x7F0A05C3" />
-    <public type="id" name="external_share_search" id="0x7F0A05C4" />
-    <public type="id" name="external_share_search_results" id="0x7F0A05C5" />
-    <public type="id" name="extra_button" id="0x7F0A05C6" />
-    <public type="id" name="extra_info" id="0x7F0A05C7" />
-    <public type="id" name="fab_menu_add_category" id="0x7F0A05C8" />
-    <public type="id" name="fab_menu_add_text" id="0x7F0A05C9" />
-    <public type="id" name="fab_menu_add_voice" id="0x7F0A05CA" />
-    <public type="id" name="fab_menu_main" id="0x7F0A05CB" />
-    <public type="id" name="fab_menu_main_fab" id="0x7F0A05CC" />
-    <public type="id" name="fab_menu_table" id="0x7F0A05CD" />
-    <public type="id" name="fade" id="0x7F0A05CE" />
-    <public type="id" name="failed_alert_icon" id="0x7F0A05CF" />
-    <public type="id" name="fatal_crash_app_version" id="0x7F0A05D0" />
-    <public type="id" name="fatal_crash_details" id="0x7F0A05D1" />
-    <public type="id" name="fatal_crash_device" id="0x7F0A05D2" />
-    <public type="id" name="fatal_crash_os_version" id="0x7F0A05D3" />
-    <public type="id" name="fatal_crash_source" id="0x7F0A05D4" />
-    <public type="id" name="fatal_crash_testers_invite" id="0x7F0A05D5" />
-    <public type="id" name="fatal_crash_time" id="0x7F0A05D6" />
-    <public type="id" name="favorite_add_button" id="0x7F0A05D7" />
-    <public type="id" name="favorite_container" id="0x7F0A05D8" />
-    <public type="id" name="favorite_remove_button" id="0x7F0A05D9" />
-    <public type="id" name="feature_list_item_feature" id="0x7F0A05DA" />
-    <public type="id" name="feature_list_item_squad" id="0x7F0A05DB" />
-    <public type="id" name="feedback_happy_rating" id="0x7F0A05DC" />
-    <public type="id" name="feedback_issue_section_header" id="0x7F0A05DD" />
-    <public type="id" name="feedback_issues_card" id="0x7F0A05DE" />
-    <public type="id" name="feedback_issues_recycler" id="0x7F0A05DF" />
-    <public type="id" name="feedback_neutral_rating" id="0x7F0A05E0" />
-    <public type="id" name="feedback_rating_container" id="0x7F0A05E1" />
-    <public type="id" name="feedback_rating_summary_prompt" id="0x7F0A05E2" />
-    <public type="id" name="feedback_sad_rating" id="0x7F0A05E3" />
-    <public type="id" name="feedback_sheet_close_button" id="0x7F0A05E4" />
-    <public type="id" name="feedback_sheet_container" id="0x7F0A05E5" />
-    <public type="id" name="feedback_sheet_feedback_view" id="0x7F0A05E6" />
-    <public type="id" name="feedback_sheet_title" id="0x7F0A05E7" />
-    <public type="id" name="file_image" id="0x7F0A05E8" />
-    <public type="id" name="file_name_tv" id="0x7F0A05E9" />
-    <public type="id" name="file_subtitle_tv" id="0x7F0A05EA" />
-    <public type="id" name="fill" id="0x7F0A05EB" />
-    <public type="id" name="fill_horizontal" id="0x7F0A05EC" />
-    <public type="id" name="fill_vertical" id="0x7F0A05ED" />
-    <public type="id" name="filled" id="0x7F0A05EE" />
-    <public type="id" name="filterControl1" id="0x7F0A05EF" />
-    <public type="id" name="filterControl2" id="0x7F0A05F0" />
-    <public type="id" name="fit" id="0x7F0A05F1" />
-    <public type="id" name="fitBottomStart" id="0x7F0A05F2" />
-    <public type="id" name="fitCenter" id="0x7F0A05F3" />
-    <public type="id" name="fitEnd" id="0x7F0A05F4" />
-    <public type="id" name="fitStart" id="0x7F0A05F5" />
-    <public type="id" name="fitToContents" id="0x7F0A05F6" />
-    <public type="id" name="fitXY" id="0x7F0A05F7" />
-    <public type="id" name="fixed" id="0x7F0A05F8" />
-    <public type="id" name="fixed_height" id="0x7F0A05F9" />
-    <public type="id" name="fixed_width" id="0x7F0A05FA" />
-    <public type="id" name="flClickShield" id="0x7F0A05FB" />
-    <public type="id" name="flIconContainer" id="0x7F0A05FC" />
-    <public type="id" name="flRightIconContainer" id="0x7F0A05FD" />
-    <public type="id" name="flag_icon" id="0x7F0A05FE" />
-    <public type="id" name="flag_icon_barrier" id="0x7F0A05FF" />
-    <public type="id" name="flex_end" id="0x7F0A0600" />
-    <public type="id" name="flex_start" id="0x7F0A0601" />
-    <public type="id" name="flip" id="0x7F0A0602" />
-    <public type="id" name="flipper" id="0x7F0A0603" />
-    <public type="id" name="floating" id="0x7F0A0604" />
-    <public type="id" name="fluorescent" id="0x7F0A0605" />
-    <public type="id" name="focusCrop" id="0x7F0A0606" />
-    <public type="id" name="focusMarkerContainer" id="0x7F0A0607" />
-    <public type="id" name="focusMarkerFill" id="0x7F0A0608" />
-    <public type="id" name="folder_context_menu_card" id="0x7F0A0609" />
-    <public type="id" name="folder_context_menu_header" id="0x7F0A060A" />
-    <public type="id" name="folder_context_menu_header_divider" id="0x7F0A060B" />
-    <public type="id" name="folder_context_menu_mark_as_read" id="0x7F0A060C" />
-    <public type="id" name="folder_context_menu_settings" id="0x7F0A060D" />
-    <public type="id" name="folder_view_folder_image" id="0x7F0A060E" />
-    <public type="id" name="follow_sheet_view_flipper" id="0x7F0A060F" />
-    <public type="id" name="forever" id="0x7F0A0610" />
-    <public type="id" name="fragment_container_view_tag" id="0x7F0A0611" />
-    <public type="id" name="frequency_radio_all" id="0x7F0A0612" />
-    <public type="id" name="frequency_radio_mentions" id="0x7F0A0613" />
-    <public type="id" name="frequency_radio_nothing" id="0x7F0A0614" />
-    <public type="id" name="frequency_top_divider" id="0x7F0A0615" />
-    <public type="id" name="friend_add_username_indicator" id="0x7F0A0616" />
-    <public type="id" name="friend_container" id="0x7F0A0617" />
-    <public type="id" name="friend_suggestion_avatar" id="0x7F0A0618" />
-    <public type="id" name="friend_suggestion_container" id="0x7F0A0619" />
-    <public type="id" name="friend_suggestion_discriminator" id="0x7F0A061A" />
-    <public type="id" name="friend_suggestion_name" id="0x7F0A061B" />
-    <public type="id" name="friend_suggestion_nickname" id="0x7F0A061C" />
-    <public type="id" name="friend_suggestion_selected" id="0x7F0A061D" />
-    <public type="id" name="friends_add_container" id="0x7F0A061E" />
-    <public type="id" name="friends_add_send" id="0x7F0A061F" />
-    <public type="id" name="friends_add_text_edit_wrap" id="0x7F0A0620" />
-    <public type="id" name="friends_list_contact_sync_upsell_arrow" id="0x7F0A0621" />
-    <public type="id" name="friends_list_contact_sync_upsell_container" id="0x7F0A0622" />
-    <public type="id" name="friends_list_contact_sync_upsell_icon" id="0x7F0A0623" />
-    <public type="id" name="friends_list_contact_sync_upsell_subtitle" id="0x7F0A0624" />
-    <public type="id" name="friends_list_contact_sync_upsell_title" id="0x7F0A0625" />
-    <public type="id" name="friends_list_empty_friends_state_cs_view" id="0x7F0A0626" />
-    <public type="id" name="friends_list_empty_friends_state_view" id="0x7F0A0627" />
-    <public type="id" name="friends_list_expandable_header_button" id="0x7F0A0628" />
-    <public type="id" name="friends_list_flipper" id="0x7F0A0629" />
-    <public type="id" name="friends_list_item_accept_button" id="0x7F0A062A" />
-    <public type="id" name="friends_list_item_activity" id="0x7F0A062B" />
-    <public type="id" name="friends_list_item_avatar" id="0x7F0A062C" />
-    <public type="id" name="friends_list_item_avatar_wrap" id="0x7F0A062D" />
-    <public type="id" name="friends_list_item_buttons_wrap" id="0x7F0A062E" />
-    <public type="id" name="friends_list_item_call_button" id="0x7F0A062F" />
-    <public type="id" name="friends_list_item_chat_button" id="0x7F0A0630" />
-    <public type="id" name="friends_list_item_decline_button" id="0x7F0A0631" />
-    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7F0A0632" />
-    <public type="id" name="friends_list_item_game" id="0x7F0A0633" />
-    <public type="id" name="friends_list_item_header_text" id="0x7F0A0634" />
-    <public type="id" name="friends_list_item_name" id="0x7F0A0635" />
-    <public type="id" name="friends_list_item_status" id="0x7F0A0636" />
-    <public type="id" name="friends_list_item_text" id="0x7F0A0637" />
-    <public type="id" name="friends_list_loading" id="0x7F0A0638" />
-    <public type="id" name="friends_list_pending_item_header_text" id="0x7F0A0639" />
-    <public type="id" name="friends_list_recycler" id="0x7F0A063A" />
-    <public type="id" name="front" id="0x7F0A063B" />
-    <public type="id" name="gallery_btn" id="0x7F0A063C" />
-    <public type="id" name="gap" id="0x7F0A063D" />
-    <public type="id" name="get_premium_button" id="0x7F0A063E" />
-    <public type="id" name="ghost_view" id="0x7F0A063F" />
-    <public type="id" name="ghost_view_holder" id="0x7F0A0640" />
-    <public type="id" name="gif_category_container" id="0x7F0A0641" />
-    <public type="id" name="gif_category_gif_recycler" id="0x7F0A0642" />
-    <public type="id" name="gif_category_item_icon" id="0x7F0A0643" />
-    <public type="id" name="gif_category_item_preview" id="0x7F0A0644" />
-    <public type="id" name="gif_category_item_title" id="0x7F0A0645" />
-    <public type="id" name="gif_category_loading_view" id="0x7F0A0646" />
-    <public type="id" name="gif_category_title" id="0x7F0A0647" />
-    <public type="id" name="gif_item_image" id="0x7F0A0648" />
-    <public type="id" name="gif_picker_category_recycler" id="0x7F0A0649" />
-    <public type="id" name="gif_picker_container" id="0x7F0A064A" />
-    <public type="id" name="gif_picker_loading_view" id="0x7F0A064B" />
-    <public type="id" name="gif_search_app_bar" id="0x7F0A064C" />
-    <public type="id" name="gif_search_gif_recycler" id="0x7F0A064D" />
-    <public type="id" name="gif_search_loading_view" id="0x7F0A064E" />
-    <public type="id" name="gif_search_sheet_content" id="0x7F0A064F" />
-    <public type="id" name="gif_search_suggested_terms_container" id="0x7F0A0650" />
-    <public type="id" name="gif_search_suggested_terms_flex_box" id="0x7F0A0651" />
-    <public type="id" name="gif_search_suggested_terms_icon_text" id="0x7F0A0652" />
-    <public type="id" name="gif_search_toolbar" id="0x7F0A0653" />
-    <public type="id" name="gif_search_view_flipper" id="0x7F0A0654" />
-    <public type="id" name="gif_tag" id="0x7F0A0655" />
-    <public type="id" name="giftPromoButton" id="0x7F0A0656" />
-    <public type="id" name="giftPromoDescription" id="0x7F0A0657" />
-    <public type="id" name="giftPromoImage" id="0x7F0A0658" />
-    <public type="id" name="giftPromoMoreDetails" id="0x7F0A0659" />
-    <public type="id" name="giftPromoTitle" id="0x7F0A065A" />
-    <public type="id" name="gift_btn" id="0x7F0A065B" />
-    <public type="id" name="gift_entitlement_code" id="0x7F0A065C" />
-    <public type="id" name="gift_entitlement_code_container" id="0x7F0A065D" />
-    <public type="id" name="gift_entitlement_container" id="0x7F0A065E" />
-    <public type="id" name="gift_entitlement_copy" id="0x7F0A065F" />
-    <public type="id" name="gift_entitlement_divider" id="0x7F0A0660" />
-    <public type="id" name="gift_entitlement_flipper" id="0x7F0A0661" />
-    <public type="id" name="gift_entitlement_generate" id="0x7F0A0662" />
-    <public type="id" name="gift_entitlement_revoke" id="0x7F0A0663" />
-    <public type="id" name="gift_link_subtext" id="0x7F0A0664" />
-    <public type="id" name="gift_purchased_dialog_confirm" id="0x7F0A0665" />
-    <public type="id" name="gift_purchased_dialog_subtext" id="0x7F0A0666" />
-    <public type="id" name="gift_purchased_icon" id="0x7F0A0667" />
-    <public type="id" name="gift_select_premium_tier_1_month" id="0x7F0A0668" />
-    <public type="id" name="gift_select_premium_tier_1_year" id="0x7F0A0669" />
-    <public type="id" name="gift_select_premium_tier_2_month" id="0x7F0A066A" />
-    <public type="id" name="gift_select_premium_tier_2_year" id="0x7F0A066B" />
-    <public type="id" name="gift_sku_arrow" id="0x7F0A066C" />
-    <public type="id" name="gift_sku_copies" id="0x7F0A066D" />
-    <public type="id" name="gift_sku_icon" id="0x7F0A066E" />
-    <public type="id" name="gift_sku_name" id="0x7F0A066F" />
-    <public type="id" name="glSurface" id="0x7F0A0670" />
-    <public type="id" name="gl_surface_view" id="0x7F0A0671" />
-    <public type="id" name="global_search_add_a_friend_btn" id="0x7F0A0672" />
-    <public type="id" name="global_search_bar" id="0x7F0A0673" />
-    <public type="id" name="global_search_bar_text" id="0x7F0A0674" />
-    <public type="id" name="global_search_guild_list" id="0x7F0A0675" />
-    <public type="id" name="global_search_join_guild_btn" id="0x7F0A0676" />
-    <public type="id" name="global_search_recycler" id="0x7F0A0677" />
-    <public type="id" name="global_search_view_flipper" id="0x7F0A0678" />
-    <public type="id" name="gone" id="0x7F0A0679" />
-    <public type="id" name="graph" id="0x7F0A067A" />
-    <public type="id" name="graph_wrap" id="0x7F0A067B" />
-    <public type="id" name="gridView" id="0x7F0A067C" />
-    <public type="id" name="group_divider" id="0x7F0A067D" />
-    <public type="id" name="group_dm_notifications_mute_settings_view" id="0x7F0A067E" />
-    <public type="id" name="group_dm_settings_scroll_view" id="0x7F0A067F" />
-    <public type="id" name="group_invite_friends_chips" id="0x7F0A0680" />
-    <public type="id" name="group_invite_friends_recipients_container" id="0x7F0A0681" />
-    <public type="id" name="group_invite_friends_recycler" id="0x7F0A0682" />
-    <public type="id" name="group_invite_friends_save_fab" id="0x7F0A0683" />
-    <public type="id" name="group_invite_friends_text_to" id="0x7F0A0684" />
-    <public type="id" name="group_invite_friends_view_flipper" id="0x7F0A0685" />
-    <public type="id" name="grouping" id="0x7F0A0686" />
-    <public type="id" name="groups" id="0x7F0A0687" />
-    <public type="id" name="guard" id="0x7F0A0688" />
-    <public type="id" name="guard_member_verification" id="0x7F0A0689" />
-    <public type="id" name="guideline" id="0x7F0A068A" />
-    <public type="id" name="guildAvatarText" id="0x7F0A068B" />
-    <public type="id" name="guildAvatarWrap" id="0x7F0A068C" />
-    <public type="id" name="guild_actions_overview_header_tv" id="0x7F0A068D" />
-    <public type="id" name="guild_avatar" id="0x7F0A068E" />
-    <public type="id" name="guild_avatar_card" id="0x7F0A068F" />
-    <public type="id" name="guild_avatar_container" id="0x7F0A0690" />
-    <public type="id" name="guild_call_onboarding_connect" id="0x7F0A0691" />
-    <public type="id" name="guild_container" id="0x7F0A0692" />
-    <public type="id" name="guild_context_menu_card" id="0x7F0A0693" />
-    <public type="id" name="guild_context_menu_header" id="0x7F0A0694" />
-    <public type="id" name="guild_context_menu_header_divider" id="0x7F0A0695" />
-    <public type="id" name="guild_context_menu_leave_guild" id="0x7F0A0696" />
-    <public type="id" name="guild_context_menu_mark_as_read" id="0x7F0A0697" />
-    <public type="id" name="guild_context_menu_more_options" id="0x7F0A0698" />
-    <public type="id" name="guild_context_menu_notifications" id="0x7F0A0699" />
-    <public type="id" name="guild_create_button" id="0x7F0A069A" />
-    <public type="id" name="guild_create_flipper" id="0x7F0A069B" />
-    <public type="id" name="guild_create_guidelines" id="0x7F0A069C" />
-    <public type="id" name="guild_create_icon_uploader" id="0x7F0A069D" />
-    <public type="id" name="guild_create_name" id="0x7F0A069E" />
-    <public type="id" name="guild_create_protip" id="0x7F0A069F" />
-    <public type="id" name="guild_create_screen_title" id="0x7F0A06A0" />
-    <public type="id" name="guild_folder_color_name" id="0x7F0A06A1" />
-    <public type="id" name="guild_folder_settings_color" id="0x7F0A06A2" />
-    <public type="id" name="guild_folder_settings_color_display" id="0x7F0A06A3" />
-    <public type="id" name="guild_folder_settings_save" id="0x7F0A06A4" />
-    <public type="id" name="guild_icon_barrier" id="0x7F0A06A5" />
-    <public type="id" name="guild_info_tv" id="0x7F0A06A6" />
-    <public type="id" name="guild_invite_accept" id="0x7F0A06A7" />
-    <public type="id" name="guild_invite_actions" id="0x7F0A06A8" />
-    <public type="id" name="guild_invite_cancel" id="0x7F0A06A9" />
-    <public type="id" name="guild_invite_channel_spinner" id="0x7F0A06AA" />
-    <public type="id" name="guild_invite_empty_results" id="0x7F0A06AB" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7F0A06AC" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7F0A06AD" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7F0A06AE" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7F0A06AF" />
-    <public type="id" name="guild_invite_event_info" id="0x7F0A06B0" />
-    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7F0A06B1" />
-    <public type="id" name="guild_invite_generate_link" id="0x7F0A06B2" />
-    <public type="id" name="guild_invite_info" id="0x7F0A06B3" />
-    <public type="id" name="guild_invite_link" id="0x7F0A06B4" />
-    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7F0A06B5" />
-    <public type="id" name="guild_invite_never_expire" id="0x7F0A06B6" />
-    <public type="id" name="guild_invite_settings_edit" id="0x7F0A06B7" />
-    <public type="id" name="guild_invite_share_btn" id="0x7F0A06B8" />
-    <public type="id" name="guild_invite_share_compact_search" id="0x7F0A06B9" />
-    <public type="id" name="guild_invite_share_search" id="0x7F0A06BA" />
-    <public type="id" name="guild_invite_suggestion_list" id="0x7F0A06BB" />
-    <public type="id" name="guild_invite_suggestions_flipper" id="0x7F0A06BC" />
-    <public type="id" name="guild_invite_temporary_membership" id="0x7F0A06BD" />
-    <public type="id" name="guild_item_sparkle" id="0x7F0A06BE" />
-    <public type="id" name="guild_iv" id="0x7F0A06BF" />
-    <public type="id" name="guild_join_action_btn" id="0x7F0A06C0" />
-    <public type="id" name="guild_join_content" id="0x7F0A06C1" />
-    <public type="id" name="guild_join_invite" id="0x7F0A06C2" />
-    <public type="id" name="guild_list" id="0x7F0A06C3" />
-    <public type="id" name="guild_list_add_hint" id="0x7F0A06C4" />
-    <public type="id" name="guild_list_unreads_stub" id="0x7F0A06C5" />
-    <public type="id" name="guild_member_avatar" id="0x7F0A06C6" />
-    <public type="id" name="guild_member_identity_barrier" id="0x7F0A06C7" />
-    <public type="id" name="guild_name_tv" id="0x7F0A06C8" />
-    <public type="id" name="guild_notifications_channel_list" id="0x7F0A06C9" />
-    <public type="id" name="guild_notifications_channel_search" id="0x7F0A06CA" />
-    <public type="id" name="guild_notifications_override_list" id="0x7F0A06CB" />
-    <public type="id" name="guild_profile_sheet_actions" id="0x7F0A06CC" />
-    <public type="id" name="guild_profile_sheet_actions_top_barrier" id="0x7F0A06CD" />
-    <public type="id" name="guild_profile_sheet_allow_dm" id="0x7F0A06CE" />
-    <public type="id" name="guild_profile_sheet_banner" id="0x7F0A06CF" />
-    <public type="id" name="guild_profile_sheet_boosts" id="0x7F0A06D0" />
-    <public type="id" name="guild_profile_sheet_bottom_actions" id="0x7F0A06D1" />
-    <public type="id" name="guild_profile_sheet_bottom_container" id="0x7F0A06D2" />
-    <public type="id" name="guild_profile_sheet_change_nickname" id="0x7F0A06D3" />
-    <public type="id" name="guild_profile_sheet_constraint_layout" id="0x7F0A06D4" />
-    <public type="id" name="guild_profile_sheet_content_container" id="0x7F0A06D5" />
-    <public type="id" name="guild_profile_sheet_content_container_bottom_divider" id="0x7F0A06D6" />
-    <public type="id" name="guild_profile_sheet_copy_id" id="0x7F0A06D7" />
-    <public type="id" name="guild_profile_sheet_create_category" id="0x7F0A06D8" />
-    <public type="id" name="guild_profile_sheet_create_channel" id="0x7F0A06D9" />
-    <public type="id" name="guild_profile_sheet_create_event" id="0x7F0A06DA" />
-    <public type="id" name="guild_profile_sheet_create_event_label" id="0x7F0A06DB" />
-    <public type="id" name="guild_profile_sheet_create_event_new" id="0x7F0A06DC" />
-    <public type="id" name="guild_profile_sheet_description" id="0x7F0A06DD" />
-    <public type="id" name="guild_profile_sheet_developer_actions" id="0x7F0A06DE" />
-    <public type="id" name="guild_profile_sheet_emoji_imageview" id="0x7F0A06DF" />
-    <public type="id" name="guild_profile_sheet_emojis" id="0x7F0A06E0" />
-    <public type="id" name="guild_profile_sheet_emojis_card" id="0x7F0A06E1" />
-    <public type="id" name="guild_profile_sheet_emojis_count" id="0x7F0A06E2" />
-    <public type="id" name="guild_profile_sheet_flipper" id="0x7F0A06E3" />
-    <public type="id" name="guild_profile_sheet_guild_avatar" id="0x7F0A06E4" />
-    <public type="id" name="guild_profile_sheet_guild_verified_premium_icon" id="0x7F0A06E5" />
-    <public type="id" name="guild_profile_sheet_hide_muted_channels" id="0x7F0A06E6" />
-    <public type="id" name="guild_profile_sheet_icon" id="0x7F0A06E7" />
-    <public type="id" name="guild_profile_sheet_icon_card" id="0x7F0A06E8" />
-    <public type="id" name="guild_profile_sheet_icon_name" id="0x7F0A06E9" />
-    <public type="id" name="guild_profile_sheet_invite" id="0x7F0A06EA" />
-    <public type="id" name="guild_profile_sheet_invite_action" id="0x7F0A06EB" />
-    <public type="id" name="guild_profile_sheet_join_server" id="0x7F0A06EC" />
-    <public type="id" name="guild_profile_sheet_leave_server" id="0x7F0A06ED" />
-    <public type="id" name="guild_profile_sheet_mark_as_read" id="0x7F0A06EE" />
-    <public type="id" name="guild_profile_sheet_mark_as_read_action" id="0x7F0A06EF" />
-    <public type="id" name="guild_profile_sheet_member_count" id="0x7F0A06F0" />
-    <public type="id" name="guild_profile_sheet_member_count_text" id="0x7F0A06F1" />
-    <public type="id" name="guild_profile_sheet_name" id="0x7F0A06F2" />
-    <public type="id" name="guild_profile_sheet_nickname" id="0x7F0A06F3" />
-    <public type="id" name="guild_profile_sheet_notifications" id="0x7F0A06F4" />
-    <public type="id" name="guild_profile_sheet_online_count" id="0x7F0A06F5" />
-    <public type="id" name="guild_profile_sheet_online_count_text" id="0x7F0A06F6" />
-    <public type="id" name="guild_profile_sheet_premium_upsell_dot_separator" id="0x7F0A06F7" />
-    <public type="id" name="guild_profile_sheet_premium_upsell_text" id="0x7F0A06F8" />
-    <public type="id" name="guild_profile_sheet_primary_actions" id="0x7F0A06F9" />
-    <public type="id" name="guild_profile_sheet_secondary_actions" id="0x7F0A06FA" />
-    <public type="id" name="guild_profile_sheet_settings" id="0x7F0A06FB" />
-    <public type="id" name="guild_profile_sheet_tab_items" id="0x7F0A06FC" />
-    <public type="id" name="guild_profile_sheet_upload_emoji" id="0x7F0A06FD" />
-    <public type="id" name="guild_profile_sheet_view_server" id="0x7F0A06FE" />
-    <public type="id" name="guild_region_help" id="0x7F0A06FF" />
-    <public type="id" name="guild_role_item_text" id="0x7F0A0700" />
-    <public type="id" name="guild_role_subscription_add_benefit_image_circle" id="0x7F0A0701" />
-    <public type="id" name="guild_role_subscription_add_benefit_text" id="0x7F0A0702" />
-    <public type="id" name="guild_role_subscription_add_tier_image" id="0x7F0A0703" />
-    <public type="id" name="guild_role_subscription_add_tier_text" id="0x7F0A0704" />
-    <public type="id" name="guild_role_subscription_benefit_channel_label" id="0x7F0A0705" />
-    <public type="id" name="guild_role_subscription_benefit_description" id="0x7F0A0706" />
-    <public type="id" name="guild_role_subscription_benefit_image" id="0x7F0A0707" />
-    <public type="id" name="guild_role_subscription_benefit_name" id="0x7F0A0708" />
-    <public type="id" name="guild_role_subscription_edit_tier_publish" id="0x7F0A0709" />
-    <public type="id" name="guild_role_subscription_edit_tier_publish_description" id="0x7F0A070A" />
-    <public type="id" name="guild_role_subscription_edit_tier_publish_group" id="0x7F0A070B" />
-    <public type="id" name="guild_role_subscription_edit_tier_tabs" id="0x7F0A070C" />
-    <public type="id" name="guild_role_subscription_edit_tier_view_pager" id="0x7F0A070D" />
-    <public type="id" name="guild_role_subscription_edit_tier_view_pager_top_barrier" id="0x7F0A070E" />
-    <public type="id" name="guild_role_subscription_format_divider" id="0x7F0A070F" />
-    <public type="id" name="guild_role_subscription_format_subtitle" id="0x7F0A0710" />
-    <public type="id" name="guild_role_subscription_format_title" id="0x7F0A0711" />
-    <public type="id" name="guild_role_subscription_intangible_benefit_name" id="0x7F0A0712" />
-    <public type="id" name="guild_role_subscription_intangible_benefit_name_label" id="0x7F0A0713" />
-    <public type="id" name="guild_role_subscription_intangible_benefit_name_layout" id="0x7F0A0714" />
-    <public type="id" name="guild_role_subscription_plan_cover_image" id="0x7F0A0715" />
-    <public type="id" name="guild_role_subscription_plan_cover_image_info" id="0x7F0A0716" />
-    <public type="id" name="guild_role_subscription_plan_cover_image_label" id="0x7F0A0717" />
-    <public type="id" name="guild_role_subscription_plan_description" id="0x7F0A0718" />
-    <public type="id" name="guild_role_subscription_plan_description_label" id="0x7F0A0719" />
-    <public type="id" name="guild_role_subscription_plan_description_layout" id="0x7F0A071A" />
-    <public type="id" name="guild_role_subscription_plan_details" id="0x7F0A071B" />
-    <public type="id" name="guild_role_subscription_plan_details_divider" id="0x7F0A071C" />
-    <public type="id" name="guild_role_subscription_plan_details_header_group" id="0x7F0A071D" />
-    <public type="id" name="guild_role_subscription_plan_details_subtitle" id="0x7F0A071E" />
-    <public type="id" name="guild_role_subscription_plan_details_title" id="0x7F0A071F" />
-    <public type="id" name="guild_role_subscription_plan_entire_server_format" id="0x7F0A0720" />
-    <public type="id" name="guild_role_subscription_plan_format" id="0x7F0A0721" />
-    <public type="id" name="guild_role_subscription_plan_format_button" id="0x7F0A0722" />
-    <public type="id" name="guild_role_subscription_plan_format_button_subtitle" id="0x7F0A0723" />
-    <public type="id" name="guild_role_subscription_plan_format_button_title" id="0x7F0A0724" />
-    <public type="id" name="guild_role_subscription_plan_format_image" id="0x7F0A0725" />
-    <public type="id" name="guild_role_subscription_plan_some_channels_format" id="0x7F0A0726" />
-    <public type="id" name="guild_role_subscription_publish_tier" id="0x7F0A0727" />
-    <public type="id" name="guild_role_subscription_publish_tier_cancel" id="0x7F0A0728" />
-    <public type="id" name="guild_role_subscription_section_header" id="0x7F0A0729" />
-    <public type="id" name="guild_role_subscription_tier_all_channels" id="0x7F0A072A" />
-    <public type="id" name="guild_role_subscription_tier_appearance_color" id="0x7F0A072B" />
-    <public type="id" name="guild_role_subscription_tier_appearance_color_layout" id="0x7F0A072C" />
-    <public type="id" name="guild_role_subscription_tier_appearance_color_text" id="0x7F0A072D" />
-    <public type="id" name="guild_role_subscription_tier_appearance_subtitle" id="0x7F0A072E" />
-    <public type="id" name="guild_role_subscription_tier_appearance_title" id="0x7F0A072F" />
-    <public type="id" name="guild_role_subscription_tier_benefit_app_bar_layout" id="0x7F0A0730" />
-    <public type="id" name="guild_role_subscription_tier_benefit_cancel" id="0x7F0A0731" />
-    <public type="id" name="guild_role_subscription_tier_benefit_description" id="0x7F0A0732" />
-    <public type="id" name="guild_role_subscription_tier_benefit_emoji" id="0x7F0A0733" />
-    <public type="id" name="guild_role_subscription_tier_benefit_emoji_name" id="0x7F0A0734" />
-    <public type="id" name="guild_role_subscription_tier_benefit_name" id="0x7F0A0735" />
-    <public type="id" name="guild_role_subscription_tier_benefit_remove" id="0x7F0A0736" />
-    <public type="id" name="guild_role_subscription_tier_benefit_save" id="0x7F0A0737" />
-    <public type="id" name="guild_role_subscription_tier_benefit_scroll_view" id="0x7F0A0738" />
-    <public type="id" name="guild_role_subscription_tier_benefit_select_emoji" id="0x7F0A0739" />
-    <public type="id" name="guild_role_subscription_tier_benefit_subtitle" id="0x7F0A073A" />
-    <public type="id" name="guild_role_subscription_tier_benefit_title" id="0x7F0A073B" />
-    <public type="id" name="guild_role_subscription_tier_benefits_sub_title" id="0x7F0A073C" />
-    <public type="id" name="guild_role_subscription_tier_benefits_title" id="0x7F0A073D" />
-    <public type="id" name="guild_role_subscription_tier_channel_benefit_setting" id="0x7F0A073E" />
-    <public type="id" name="guild_role_subscription_tier_draft_tag" id="0x7F0A073F" />
-    <public type="id" name="guild_role_subscription_tier_edit" id="0x7F0A0740" />
-    <public type="id" name="guild_role_subscription_tier_header_description" id="0x7F0A0741" />
-    <public type="id" name="guild_role_subscription_tier_header_image" id="0x7F0A0742" />
-    <public type="id" name="guild_role_subscription_tier_header_name" id="0x7F0A0743" />
-    <public type="id" name="guild_role_subscription_tier_header_price" id="0x7F0A0744" />
-    <public type="id" name="guild_role_subscription_tier_header_price_interval" id="0x7F0A0745" />
-    <public type="id" name="guild_role_subscription_tier_header_subscribe" id="0x7F0A0746" />
-    <public type="id" name="guild_role_subscription_tier_icon" id="0x7F0A0747" />
-    <public type="id" name="guild_role_subscription_tier_manual_channels" id="0x7F0A0748" />
-    <public type="id" name="guild_role_subscription_tier_member_icon" id="0x7F0A0749" />
-    <public type="id" name="guild_role_subscription_tier_member_preview_dark" id="0x7F0A074A" />
-    <public type="id" name="guild_role_subscription_tier_member_preview_light" id="0x7F0A074B" />
-    <public type="id" name="guild_role_subscription_tier_name" id="0x7F0A074C" />
-    <public type="id" name="guild_role_subscription_tier_price" id="0x7F0A074D" />
-    <public type="id" name="guild_role_subscriptions_app_bar_layout" id="0x7F0A074E" />
-    <public type="id" name="guild_scheduled_event_date_view_icon" id="0x7F0A074F" />
-    <public type="id" name="guild_scheduled_event_date_view_text" id="0x7F0A0750" />
-    <public type="id" name="guild_scheduled_event_details_button_view" id="0x7F0A0751" />
-    <public type="id" name="guild_scheduled_event_details_channel_icon" id="0x7F0A0752" />
-    <public type="id" name="guild_scheduled_event_details_channel_name" id="0x7F0A0753" />
-    <public type="id" name="guild_scheduled_event_details_date_view" id="0x7F0A0754" />
-    <public type="id" name="guild_scheduled_event_details_desc_text" id="0x7F0A0755" />
-    <public type="id" name="guild_scheduled_event_details_guild_icon" id="0x7F0A0756" />
-    <public type="id" name="guild_scheduled_event_details_guild_name" id="0x7F0A0757" />
-    <public type="id" name="guild_scheduled_event_details_rsvp_count" id="0x7F0A0758" />
-    <public type="id" name="guild_scheduled_event_details_rsvp_icon" id="0x7F0A0759" />
-    <public type="id" name="guild_scheduled_event_details_title_text" id="0x7F0A075A" />
-    <public type="id" name="guild_scheduled_event_invite_container" id="0x7F0A075B" />
-    <public type="id" name="guild_scheduled_event_item_view" id="0x7F0A075C" />
-    <public type="id" name="guild_scheduled_event_list_empty_state" id="0x7F0A075D" />
-    <public type="id" name="guild_scheduled_event_list_empty_state_icon" id="0x7F0A075E" />
-    <public type="id" name="guild_scheduled_event_list_empty_state_subtitle" id="0x7F0A075F" />
-    <public type="id" name="guild_scheduled_event_list_empty_state_title" id="0x7F0A0760" />
-    <public type="id" name="guild_scheduled_event_list_item_buttom_view" id="0x7F0A0761" />
-    <public type="id" name="guild_scheduled_event_list_item_channel_guild_container" id="0x7F0A0762" />
-    <public type="id" name="guild_scheduled_event_list_item_date_view" id="0x7F0A0763" />
-    <public type="id" name="guild_scheduled_event_list_item_desc_text" id="0x7F0A0764" />
-    <public type="id" name="guild_scheduled_event_list_item_guild_channel_name" id="0x7F0A0765" />
-    <public type="id" name="guild_scheduled_event_list_item_guild_icon" id="0x7F0A0766" />
-    <public type="id" name="guild_scheduled_event_list_item_guild_icon_placeholder_text" id="0x7F0A0767" />
-    <public type="id" name="guild_scheduled_event_list_item_guild_name" id="0x7F0A0768" />
-    <public type="id" name="guild_scheduled_event_list_item_rsvp_text" id="0x7F0A0769" />
-    <public type="id" name="guild_scheduled_event_list_item_title_text" id="0x7F0A076A" />
-    <public type="id" name="guild_scheduled_event_list_recycler_view" id="0x7F0A076B" />
-    <public type="id" name="guild_scheduled_event_list_toolbar_container" id="0x7F0A076C" />
-    <public type="id" name="guild_scheduled_event_list_toolbar_title" id="0x7F0A076D" />
-    <public type="id" name="guild_scheduled_event_settings_description_header" id="0x7F0A076E" />
-    <public type="id" name="guild_scheduled_event_settings_description_input" id="0x7F0A076F" />
-    <public type="id" name="guild_scheduled_event_settings_description_input_layout" id="0x7F0A0770" />
-    <public type="id" name="guild_scheduled_event_settings_next_button" id="0x7F0A0771" />
-    <public type="id" name="guild_scheduled_event_settings_scroll_view" id="0x7F0A0772" />
-    <public type="id" name="guild_scheduled_event_settings_start_date_header" id="0x7F0A0773" />
-    <public type="id" name="guild_scheduled_event_settings_start_date_input" id="0x7F0A0774" />
-    <public type="id" name="guild_scheduled_event_settings_start_date_input_layout" id="0x7F0A0775" />
-    <public type="id" name="guild_scheduled_event_settings_start_time_header" id="0x7F0A0776" />
-    <public type="id" name="guild_scheduled_event_settings_start_time_input" id="0x7F0A0777" />
-    <public type="id" name="guild_scheduled_event_settings_start_time_input_layout" id="0x7F0A0778" />
-    <public type="id" name="guild_scheduled_event_settings_step_text" id="0x7F0A0779" />
-    <public type="id" name="guild_scheduled_event_settings_stv" id="0x7F0A077A" />
-    <public type="id" name="guild_scheduled_event_settings_toolbar" id="0x7F0A077B" />
-    <public type="id" name="guild_scheduled_event_settings_topic_header" id="0x7F0A077C" />
-    <public type="id" name="guild_scheduled_event_settings_topic_input" id="0x7F0A077D" />
-    <public type="id" name="guild_scheduled_event_settings_topic_layout" id="0x7F0A077E" />
-    <public type="id" name="guild_selector_list" id="0x7F0A077F" />
-    <public type="id" name="guild_sticker_sheet_button_container" id="0x7F0A0780" />
-    <public type="id" name="guild_sticker_sheet_description" id="0x7F0A0781" />
-    <public type="id" name="guild_sticker_sheet_flipper" id="0x7F0A0782" />
-    <public type="id" name="guild_sticker_sheet_guild_container" id="0x7F0A0783" />
-    <public type="id" name="guild_sticker_sheet_guild_header" id="0x7F0A0784" />
-    <public type="id" name="guild_sticker_sheet_guild_icon" id="0x7F0A0785" />
-    <public type="id" name="guild_sticker_sheet_guild_icon_text" id="0x7F0A0786" />
-    <public type="id" name="guild_sticker_sheet_guild_icon_wrapper" id="0x7F0A0787" />
-    <public type="id" name="guild_sticker_sheet_guild_info" id="0x7F0A0788" />
-    <public type="id" name="guild_sticker_sheet_guild_name" id="0x7F0A0789" />
-    <public type="id" name="guild_sticker_sheet_join_btn" id="0x7F0A078A" />
-    <public type="id" name="guild_sticker_sheet_premium_btn" id="0x7F0A078B" />
-    <public type="id" name="guild_sticker_sheet_sticker" id="0x7F0A078C" />
-    <public type="id" name="guild_sticker_sheet_sticker_name" id="0x7F0A078D" />
-    <public type="id" name="guild_subscription_custom_image_title" id="0x7F0A078E" />
-    <public type="id" name="guild_subscription_edit_image" id="0x7F0A078F" />
-    <public type="id" name="guild_subscription_image" id="0x7F0A0790" />
-    <public type="id" name="guild_subscription_perk" id="0x7F0A0791" />
-    <public type="id" name="guild_subscription_plan_details_edit_cover_image" id="0x7F0A0792" />
-    <public type="id" name="guild_subscription_plan_details_layout" id="0x7F0A0793" />
-    <public type="id" name="guild_subscription_plan_setup_step_views" id="0x7F0A0794" />
-    <public type="id" name="guild_subscription_upload_image" id="0x7F0A0795" />
-    <public type="id" name="guild_subscription_upload_image_label" id="0x7F0A0796" />
-    <public type="id" name="guild_template_channels_item_image" id="0x7F0A0797" />
-    <public type="id" name="guild_template_channels_item_name" id="0x7F0A0798" />
-    <public type="id" name="guild_template_channels_recycler_view" id="0x7F0A0799" />
-    <public type="id" name="guild_template_name" id="0x7F0A079A" />
-    <public type="id" name="guild_template_preview_channels" id="0x7F0A079B" />
-    <public type="id" name="guild_template_preview_roles" id="0x7F0A079C" />
-    <public type="id" name="guild_template_preview_roles_layout" id="0x7F0A079D" />
-    <public type="id" name="guild_text" id="0x7F0A079E" />
-    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7F0A079F" />
-    <public type="id" name="guild_transfer_ownership_cancel" id="0x7F0A07A0" />
-    <public type="id" name="guild_transfer_ownership_confirm" id="0x7F0A07A1" />
-    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7F0A07A2" />
-    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7F0A07A3" />
-    <public type="id" name="guild_video_at_capacity_confirm" id="0x7F0A07A4" />
-    <public type="id" name="guild_view_1" id="0x7F0A07A5" />
-    <public type="id" name="guild_view_2" id="0x7F0A07A6" />
-    <public type="id" name="guild_view_3" id="0x7F0A07A7" />
-    <public type="id" name="guild_view_4" id="0x7F0A07A8" />
-    <public type="id" name="guild_views" id="0x7F0A07A9" />
-    <public type="id" name="guild_welcome_channel" id="0x7F0A07AA" />
-    <public type="id" name="guild_welcome_channel_description" id="0x7F0A07AB" />
-    <public type="id" name="guild_welcome_channel_details" id="0x7F0A07AC" />
-    <public type="id" name="guild_welcome_channel_emoji" id="0x7F0A07AD" />
-    <public type="id" name="guild_welcome_channel_hash" id="0x7F0A07AE" />
-    <public type="id" name="guild_welcome_channel_icon" id="0x7F0A07AF" />
-    <public type="id" name="guild_welcome_channel_name" id="0x7F0A07B0" />
-    <public type="id" name="guild_welcome_channel_text" id="0x7F0A07B1" />
-    <public type="id" name="guild_welcome_channel_unicode_emoji" id="0x7F0A07B2" />
-    <public type="id" name="guild_welcome_sheet_channels" id="0x7F0A07B3" />
-    <public type="id" name="guild_welcome_sheet_description" id="0x7F0A07B4" />
-    <public type="id" name="guild_welcome_sheet_flipper" id="0x7F0A07B5" />
-    <public type="id" name="guild_welcome_sheet_icon" id="0x7F0A07B6" />
-    <public type="id" name="guild_welcome_sheet_icon_card" id="0x7F0A07B7" />
-    <public type="id" name="guild_welcome_sheet_icon_name" id="0x7F0A07B8" />
-    <public type="id" name="guild_welcome_sheet_name" id="0x7F0A07B9" />
-    <public type="id" name="guilds_item_application_status" id="0x7F0A07BA" />
-    <public type="id" name="guilds_item_application_stream" id="0x7F0A07BB" />
-    <public type="id" name="guilds_item_avatar" id="0x7F0A07BC" />
-    <public type="id" name="guilds_item_avatar_text" id="0x7F0A07BD" />
-    <public type="id" name="guilds_item_avatar_wrap" id="0x7F0A07BE" />
-    <public type="id" name="guilds_item_dm_avatar" id="0x7F0A07BF" />
-    <public type="id" name="guilds_item_dm_count" id="0x7F0A07C0" />
-    <public type="id" name="guilds_item_event_status" id="0x7F0A07C1" />
-    <public type="id" name="guilds_item_folder" id="0x7F0A07C2" />
-    <public type="id" name="guilds_item_folder_container" id="0x7F0A07C3" />
-    <public type="id" name="guilds_item_highlight" id="0x7F0A07C4" />
-    <public type="id" name="guilds_item_mentions" id="0x7F0A07C5" />
-    <public type="id" name="guilds_item_profile_avatar" id="0x7F0A07C6" />
-    <public type="id" name="guilds_item_profile_avatar_wrap" id="0x7F0A07C7" />
-    <public type="id" name="guilds_item_profile_selected" id="0x7F0A07C8" />
-    <public type="id" name="guilds_item_selected" id="0x7F0A07C9" />
-    <public type="id" name="guilds_item_unread" id="0x7F0A07CA" />
-    <public type="id" name="guilds_item_voice" id="0x7F0A07CB" />
-    <public type="id" name="h263" id="0x7F0A07CC" />
-    <public type="id" name="h264" id="0x7F0A07CD" />
-    <public type="id" name="handle" id="0x7F0A07CE" />
-    <public type="id" name="hardware" id="0x7F0A07CF" />
-    <public type="id" name="heAac" id="0x7F0A07D0" />
-    <public type="id" name="header" id="0x7F0A07D1" />
-    <public type="id" name="header_barrier" id="0x7F0A07D2" />
-    <public type="id" name="header_item_text" id="0x7F0A07D3" />
-    <public type="id" name="header_name" id="0x7F0A07D4" />
-    <public type="id" name="header_title" id="0x7F0A07D5" />
-    <public type="id" name="hideable" id="0x7F0A07D6" />
-    <public type="id" name="home" id="0x7F0A07D7" />
-    <public type="id" name="homeAsUp" id="0x7F0A07D8" />
-    <public type="id" name="home_panel_center_channel_less" id="0x7F0A07D9" />
-    <public type="id" name="home_panel_center_channel_less_body" id="0x7F0A07DA" />
-    <public type="id" name="home_panel_center_channel_less_title" id="0x7F0A07DB" />
-    <public type="id" name="home_panel_center_nsfw" id="0x7F0A07DC" />
-    <public type="id" name="home_panel_center_nsfw_anchor_wrap" id="0x7F0A07DD" />
-    <public type="id" name="home_panel_center_nsfw_art" id="0x7F0A07DE" />
-    <public type="id" name="home_panel_center_nsfw_confirm" id="0x7F0A07DF" />
-    <public type="id" name="home_panel_center_nsfw_deny" id="0x7F0A07E0" />
-    <public type="id" name="home_panel_center_nsfw_description" id="0x7F0A07E1" />
-    <public type="id" name="home_panel_center_nsfw_title" id="0x7F0A07E2" />
-    <public type="id" name="home_toolbar_unread_count" id="0x7F0A07E3" />
-    <public type="id" name="honorRequest" id="0x7F0A07E4" />
-    <public type="id" name="html" id="0x7F0A07E5" />
-    <public type="id" name="hub_domains_section_title" id="0x7F0A07E6" />
-    <public type="id" name="hub_waitlist_button" id="0x7F0A07E7" />
-    <public type="id" name="hub_waitlist_description" id="0x7F0A07E8" />
-    <public type="id" name="hub_waitlist_edit_text" id="0x7F0A07E9" />
-    <public type="id" name="hub_waitlist_header" id="0x7F0A07EA" />
-    <public type="id" name="hub_waitlist_layout" id="0x7F0A07EB" />
-    <public type="id" name="icon" id="0x7F0A07EC" />
-    <public type="id" name="icon_bg" id="0x7F0A07ED" />
-    <public type="id" name="icon_frame" id="0x7F0A07EE" />
-    <public type="id" name="icon_group" id="0x7F0A07EF" />
-    <public type="id" name="icon_label" id="0x7F0A07F0" />
-    <public type="id" name="icon_only" id="0x7F0A07F1" />
-    <public type="id" name="icon_row" id="0x7F0A07F2" />
-    <public type="id" name="icon_uploader_image" id="0x7F0A07F3" />
-    <public type="id" name="icon_uploader_placeholder_border" id="0x7F0A07F4" />
-    <public type="id" name="icon_uploader_placeholder_icon" id="0x7F0A07F5" />
-    <public type="id" name="icon_uploader_placeholder_text" id="0x7F0A07F6" />
-    <public type="id" name="icon_uploader_plus" id="0x7F0A07F7" />
-    <public type="id" name="icon_uri" id="0x7F0A07F8" />
-    <public type="id" name="identity_perk" id="0x7F0A07F9" />
-    <public type="id" name="ifRoom" id="0x7F0A07FA" />
-    <public type="id" name="ignore" id="0x7F0A07FB" />
-    <public type="id" name="ignoreRequest" id="0x7F0A07FC" />
-    <public type="id" name="image" id="0x7F0A07FD" />
-    <public type="id" name="image_bottom_guideline" id="0x7F0A07FE" />
-    <public type="id" name="image_upload_failed_cancel" id="0x7F0A07FF" />
-    <public type="id" name="image_upload_failed_compression_settings_checkbox" id="0x7F0A0800" />
-    <public type="id" name="image_upload_failed_compression_settings_container" id="0x7F0A0801" />
-    <public type="id" name="image_upload_failed_divider" id="0x7F0A0802" />
-    <public type="id" name="image_upload_failed_nitro" id="0x7F0A0803" />
-    <public type="id" name="image_upload_failed_nitro_wrapper" id="0x7F0A0804" />
-    <public type="id" name="image_upload_failed_okay" id="0x7F0A0805" />
-    <public type="id" name="image_upload_failed_send_compress" id="0x7F0A0806" />
-    <public type="id" name="image_upload_failed_text" id="0x7F0A0807" />
-    <public type="id" name="image_view_crop" id="0x7F0A0808" />
-    <public type="id" name="image_view_logo" id="0x7F0A0809" />
-    <public type="id" name="image_view_state_aspect_ratio" id="0x7F0A080A" />
-    <public type="id" name="image_view_state_rotate" id="0x7F0A080B" />
-    <public type="id" name="image_view_state_scale" id="0x7F0A080C" />
-    <public type="id" name="incandescent" id="0x7F0A080D" />
-    <public type="id" name="incoming_call_accept_alt_container" id="0x7F0A080E" />
-    <public type="id" name="incoming_call_accept_button" id="0x7F0A080F" />
-    <public type="id" name="incoming_call_accept_video_button" id="0x7F0A0810" />
-    <public type="id" name="incoming_call_blurred_view" id="0x7F0A0811" />
-    <public type="id" name="incoming_call_decline_button" id="0x7F0A0812" />
-    <public type="id" name="incoming_call_status_container" id="0x7F0A0813" />
-    <public type="id" name="incoming_call_status_primary" id="0x7F0A0814" />
-    <public type="id" name="incoming_call_status_secondary" id="0x7F0A0815" />
-    <public type="id" name="incoming_call_top_guideline" id="0x7F0A0816" />
-    <public type="id" name="incoming_call_users_grid_view" id="0x7F0A0817" />
-    <public type="id" name="incoming_share_no_results_img" id="0x7F0A0818" />
-    <public type="id" name="incoming_share_results_flipper" id="0x7F0A0819" />
-    <public type="id" name="index_entity_types" id="0x7F0A081A" />
-    <public type="id" name="indicator" id="0x7F0A081B" />
-    <public type="id" name="indicator_accept" id="0x7F0A081C" />
-    <public type="id" name="indicator_actions" id="0x7F0A081D" />
-    <public type="id" name="indicator_content" id="0x7F0A081E" />
-    <public type="id" name="indicator_decline" id="0x7F0A081F" />
-    <public type="id" name="indicator_icon" id="0x7F0A0820" />
-    <public type="id" name="indicator_text" id="0x7F0A0821" />
-    <public type="id" name="indicators_container" id="0x7F0A0822" />
-    <public type="id" name="info" id="0x7F0A0823" />
-    <public type="id" name="inline_media_gif_indicator" id="0x7F0A0824" />
-    <public type="id" name="inline_media_image_preview" id="0x7F0A0825" />
-    <public type="id" name="inline_media_loading_indicator" id="0x7F0A0826" />
-    <public type="id" name="inline_media_play_button" id="0x7F0A0827" />
-    <public type="id" name="inline_media_player_view" id="0x7F0A0828" />
-    <public type="id" name="inline_media_volume_toggle" id="0x7F0A0829" />
-    <public type="id" name="instant_message" id="0x7F0A082A" />
-    <public type="id" name="integration_header_container" id="0x7F0A082B" />
-    <public type="id" name="integration_header_disabled_overlay" id="0x7F0A082C" />
-    <public type="id" name="integration_icon" id="0x7F0A082D" />
-    <public type="id" name="integration_name" id="0x7F0A082E" />
-    <public type="id" name="integration_name_container" id="0x7F0A082F" />
-    <public type="id" name="integration_owner_name" id="0x7F0A0830" />
-    <public type="id" name="integration_settings_icon" id="0x7F0A0831" />
-    <public type="id" name="integration_sync_switch" id="0x7F0A0832" />
-    <public type="id" name="integration_syncing_progress_bar" id="0x7F0A0833" />
-    <public type="id" name="integrations_empty_body" id="0x7F0A0834" />
-    <public type="id" name="integrations_empty_header" id="0x7F0A0835" />
-    <public type="id" name="integrations_recycler" id="0x7F0A0836" />
-    <public type="id" name="integrations_root" id="0x7F0A0837" />
-    <public type="id" name="integrations_view_flipper" id="0x7F0A0838" />
-    <public type="id" name="intent_action" id="0x7F0A0839" />
-    <public type="id" name="intent_activity" id="0x7F0A083A" />
-    <public type="id" name="intent_data" id="0x7F0A083B" />
-    <public type="id" name="intent_data_id" id="0x7F0A083C" />
-    <public type="id" name="intent_extra_data" id="0x7F0A083D" />
-    <public type="id" name="interested_button" id="0x7F0A083E" />
-    <public type="id" name="interested_button_text" id="0x7F0A083F" />
-    <public type="id" name="interested_toggle" id="0x7F0A0840" />
-    <public type="id" name="invisible" id="0x7F0A0841" />
-    <public type="id" name="invite_actions_copy" id="0x7F0A0842" />
-    <public type="id" name="invite_actions_revoke" id="0x7F0A0843" />
-    <public type="id" name="invite_actions_share" id="0x7F0A0844" />
-    <public type="id" name="invite_actions_title" id="0x7F0A0845" />
-    <public type="id" name="invite_avatar" id="0x7F0A0846" />
-    <public type="id" name="invite_avatar_small" id="0x7F0A0847" />
-    <public type="id" name="invite_button" id="0x7F0A0848" />
-    <public type="id" name="invite_channel" id="0x7F0A0849" />
-    <public type="id" name="invite_code" id="0x7F0A084A" />
-    <public type="id" name="invite_container" id="0x7F0A084B" />
-    <public type="id" name="invite_divider" id="0x7F0A084C" />
-    <public type="id" name="invite_expiration_container" id="0x7F0A084D" />
-    <public type="id" name="invite_expiration_time" id="0x7F0A084E" />
-    <public type="id" name="invite_expires_label" id="0x7F0A084F" />
-    <public type="id" name="invite_member_container_layout" id="0x7F0A0850" />
-    <public type="id" name="invite_message" id="0x7F0A0851" />
-    <public type="id" name="invite_name_container" id="0x7F0A0852" />
-    <public type="id" name="invite_secondary_button" id="0x7F0A0853" />
-    <public type="id" name="invite_settings_bottom_sheet" id="0x7F0A0854" />
-    <public type="id" name="invite_settings_button" id="0x7F0A0855" />
-    <public type="id" name="invite_settings_icon" id="0x7F0A0856" />
-    <public type="id" name="invite_suggestions_header" id="0x7F0A0857" />
-    <public type="id" name="invite_title" id="0x7F0A0858" />
-    <public type="id" name="invite_uses" id="0x7F0A0859" />
-    <public type="id" name="invite_uses_label" id="0x7F0A085A" />
-    <public type="id" name="inward" id="0x7F0A085B" />
-    <public type="id" name="issue_details_cx_prompt" id="0x7F0A085C" />
-    <public type="id" name="issue_details_input" id="0x7F0A085D" />
-    <public type="id" name="issue_details_submit_button" id="0x7F0A085E" />
-    <public type="id" name="italic" id="0x7F0A085F" />
-    <public type="id" name="item_avatar_wrap" id="0x7F0A0860" />
-    <public type="id" name="item_backup_code_tv" id="0x7F0A0861" />
-    <public type="id" name="item_check_indicator" id="0x7F0A0862" />
-    <public type="id" name="item_description_tv" id="0x7F0A0863" />
-    <public type="id" name="item_directory_empty_header" id="0x7F0A0864" />
-    <public type="id" name="item_directory_empty_subheader" id="0x7F0A0865" />
-    <public type="id" name="item_game_invite" id="0x7F0A0866" />
-    <public type="id" name="item_game_invite_action_btn" id="0x7F0A0867" />
-    <public type="id" name="item_game_invite_application_name_tv" id="0x7F0A0868" />
-    <public type="id" name="item_game_invite_avatar_iv" id="0x7F0A0869" />
-    <public type="id" name="item_game_invite_avatar_status_iv" id="0x7F0A086A" />
-    <public type="id" name="item_game_invite_barrier" id="0x7F0A086B" />
-    <public type="id" name="item_game_invite_cover_iv" id="0x7F0A086C" />
-    <public type="id" name="item_game_invite_header" id="0x7F0A086D" />
-    <public type="id" name="item_game_invite_recycler" id="0x7F0A086E" />
-    <public type="id" name="item_game_invite_subtext" id="0x7F0A086F" />
-    <public type="id" name="item_gift_accept_button" id="0x7F0A0870" />
-    <public type="id" name="item_gift_cannot_claim_button" id="0x7F0A0871" />
-    <public type="id" name="item_gift_details" id="0x7F0A0872" />
-    <public type="id" name="item_gift_expires" id="0x7F0A0873" />
-    <public type="id" name="item_gift_header" id="0x7F0A0874" />
-    <public type="id" name="item_gift_image" id="0x7F0A0875" />
-    <public type="id" name="item_gift_image_background" id="0x7F0A0876" />
-    <public type="id" name="item_gift_loading_button_placeholder" id="0x7F0A0877" />
-    <public type="id" name="item_gift_name" id="0x7F0A0878" />
-    <public type="id" name="item_gift_subtext" id="0x7F0A0879" />
-    <public type="id" name="item_gift_verify_button" id="0x7F0A087A" />
-    <public type="id" name="item_group_tv" id="0x7F0A087B" />
-    <public type="id" name="item_guild_template_header" id="0x7F0A087C" />
-    <public type="id" name="item_guild_template_image" id="0x7F0A087D" />
-    <public type="id" name="item_guild_template_join_button" id="0x7F0A087E" />
-    <public type="id" name="item_guild_template_name" id="0x7F0A087F" />
-    <public type="id" name="item_guild_template_subtext" id="0x7F0A0880" />
-    <public type="id" name="item_guild_welcome_header" id="0x7F0A0881" />
-    <public type="id" name="item_guild_welcome_subheader" id="0x7F0A0882" />
-    <public type="id" name="item_guild_welcome_subheader_intro" id="0x7F0A0883" />
-    <public type="id" name="item_header" id="0x7F0A0884" />
-    <public type="id" name="item_header_tv" id="0x7F0A0885" />
-    <public type="id" name="item_icon" id="0x7F0A0886" />
-    <public type="id" name="item_icon_iv" id="0x7F0A0887" />
-    <public type="id" name="item_invite_btn" id="0x7F0A0888" />
-    <public type="id" name="item_invite_button_layout" id="0x7F0A0889" />
-    <public type="id" name="item_invite_channel_name" id="0x7F0A088A" />
-    <public type="id" name="item_invite_channel_topic" id="0x7F0A088B" />
-    <public type="id" name="item_invite_guild_name" id="0x7F0A088C" />
-    <public type="id" name="item_invite_header" id="0x7F0A088D" />
-    <public type="id" name="item_invite_hub_layout" id="0x7F0A088E" />
-    <public type="id" name="item_invite_hub_link" id="0x7F0A088F" />
-    <public type="id" name="item_invite_image" id="0x7F0A0890" />
-    <public type="id" name="item_invite_image_text" id="0x7F0A0891" />
-    <public type="id" name="item_invite_join_button" id="0x7F0A0892" />
-    <public type="id" name="item_invite_joined_button" id="0x7F0A0893" />
-    <public type="id" name="item_invite_loading_button" id="0x7F0A0894" />
-    <public type="id" name="item_invite_member_container" id="0x7F0A0895" />
-    <public type="id" name="item_invite_mention_button" id="0x7F0A0896" />
-    <public type="id" name="item_invite_name" id="0x7F0A0897" />
-    <public type="id" name="item_invite_online_dot" id="0x7F0A0898" />
-    <public type="id" name="item_invite_online_text" id="0x7F0A0899" />
-    <public type="id" name="item_invite_total_member_dot" id="0x7F0A089A" />
-    <public type="id" name="item_invite_total_member_text" id="0x7F0A089B" />
-    <public type="id" name="item_listen_together_album_image" id="0x7F0A089C" />
-    <public type="id" name="item_listen_together_artist" id="0x7F0A089D" />
-    <public type="id" name="item_listen_together_container" id="0x7F0A089E" />
-    <public type="id" name="item_listen_together_header" id="0x7F0A089F" />
-    <public type="id" name="item_listen_together_join" id="0x7F0A08A0" />
-    <public type="id" name="item_listen_together_recycler" id="0x7F0A08A1" />
-    <public type="id" name="item_listen_together_session_ended" id="0x7F0A08A2" />
-    <public type="id" name="item_listen_together_track" id="0x7F0A08A3" />
-    <public type="id" name="item_listeners_count" id="0x7F0A08A4" />
-    <public type="id" name="item_mentions_tv" id="0x7F0A08A5" />
-    <public type="id" name="item_name" id="0x7F0A08A6" />
-    <public type="id" name="item_name_tv" id="0x7F0A08A7" />
-    <public type="id" name="item_sent" id="0x7F0A08A8" />
-    <public type="id" name="item_text" id="0x7F0A08A9" />
-    <public type="id" name="item_touch_helper_previous_elevation" id="0x7F0A08AA" />
-    <public type="id" name="item_unread" id="0x7F0A08AB" />
-    <public type="id" name="item_video_indicator" id="0x7F0A08AC" />
-    <public type="id" name="ivIcon" id="0x7F0A08AD" />
-    <public type="id" name="ivRightIcon" id="0x7F0A08AE" />
-    <public type="id" name="join_audience" id="0x7F0A08AF" />
-    <public type="id" name="join_btn" id="0x7F0A08B0" />
-    <public type="id" name="join_speaker" id="0x7F0A08B1" />
-    <public type="id" name="jpeg" id="0x7F0A08B2" />
-    <public type="id" name="jumpToEnd" id="0x7F0A08B3" />
-    <public type="id" name="jumpToStart" id="0x7F0A08B4" />
-    <public type="id" name="kick_user_body" id="0x7F0A08B5" />
-    <public type="id" name="kick_user_cancel" id="0x7F0A08B6" />
-    <public type="id" name="kick_user_confirm" id="0x7F0A08B7" />
-    <public type="id" name="kick_user_reason" id="0x7F0A08B8" />
-    <public type="id" name="kick_user_title" id="0x7F0A08B9" />
-    <public type="id" name="kicker" id="0x7F0A08BA" />
-    <public type="id" name="label" id="0x7F0A08BB" />
-    <public type="id" name="labelGroup" id="0x7F0A08BC" />
-    <public type="id" name="labeled" id="0x7F0A08BD" />
-    <public type="id" name="language" id="0x7F0A08BE" />
-    <public type="id" name="large" id="0x7F0A08BF" />
-    <public type="id" name="largeLabel" id="0x7F0A08C0" />
-    <public type="id" name="large_avatar" id="0x7F0A08C1" />
-    <public type="id" name="large_avatar_barrier" id="0x7F0A08C2" />
-    <public type="id" name="large_icon_uri" id="0x7F0A08C3" />
-    <public type="id" name="launch_btn" id="0x7F0A08C4" />
-    <public type="id" name="launch_camera_btn" id="0x7F0A08C5" />
-    <public type="id" name="layout" id="0x7F0A08C6" />
-    <public type="id" name="layout_aspect_ratio" id="0x7F0A08C7" />
-    <public type="id" name="layout_rotate_wheel" id="0x7F0A08C8" />
-    <public type="id" name="layout_scale_wheel" id="0x7F0A08C9" />
-    <public type="id" name="leave_guild_cancel_btn" id="0x7F0A08CA" />
-    <public type="id" name="leave_guild_confirm_btn" id="0x7F0A08CB" />
-    <public type="id" name="leave_guild_dialog_body" id="0x7F0A08CC" />
-    <public type="id" name="leave_guild_dialog_header" id="0x7F0A08CD" />
-    <public type="id" name="left" id="0x7F0A08CE" />
-    <public type="id" name="leftToRight" id="0x7F0A08CF" />
-    <public type="id" name="left_btns_container" id="0x7F0A08D0" />
-    <public type="id" name="light" id="0x7F0A08D1" />
-    <public type="id" name="line1" id="0x7F0A08D2" />
-    <public type="id" name="line3" id="0x7F0A08D3" />
-    <public type="id" name="linear" id="0x7F0A08D4" />
-    <public type="id" name="link_icon" id="0x7F0A08D5" />
-    <public type="id" name="link_settings_barrier" id="0x7F0A08D6" />
-    <public type="id" name="list" id="0x7F0A08D7" />
-    <public type="id" name="listMode" id="0x7F0A08D8" />
-    <public type="id" name="list_item" id="0x7F0A08D9" />
-    <public type="id" name="live_now_dot" id="0x7F0A08DA" />
-    <public type="id" name="live_now_label" id="0x7F0A08DB" />
-    <public type="id" name="llAlertBackground" id="0x7F0A08DC" />
-    <public type="id" name="llButtonContainer" id="0x7F0A08DD" />
-    <public type="id" name="loading" id="0x7F0A08DE" />
-    <public type="id" name="loadingContainer" id="0x7F0A08DF" />
-    <public type="id" name="loading_button_button" id="0x7F0A08E0" />
-    <public type="id" name="loading_button_progress" id="0x7F0A08E1" />
-    <public type="id" name="loading_dots" id="0x7F0A08E2" />
-    <public type="id" name="loading_progress_bar" id="0x7F0A08E3" />
-    <public type="id" name="location_header" id="0x7F0A08E4" />
-    <public type="id" name="location_options" id="0x7F0A08E5" />
-    <public type="id" name="log_message" id="0x7F0A08E6" />
-    <public type="id" name="logo" id="0x7F0A08E7" />
-    <public type="id" name="lottie_layer_name" id="0x7F0A08E8" />
-    <public type="id" name="main_input_container" id="0x7F0A08E9" />
-    <public type="id" name="main_panel_right_rounded_container" id="0x7F0A08EA" />
-    <public type="id" name="manage_reactions_emoji_container" id="0x7F0A08EB" />
-    <public type="id" name="manage_reactions_emoji_counter" id="0x7F0A08EC" />
-    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7F0A08ED" />
-    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7F0A08EE" />
-    <public type="id" name="manage_reactions_emojis_recycler" id="0x7F0A08EF" />
-    <public type="id" name="manage_reactions_result_error_img" id="0x7F0A08F0" />
-    <public type="id" name="manage_reactions_result_error_text" id="0x7F0A08F1" />
-    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7F0A08F2" />
-    <public type="id" name="manage_reactions_result_user_avatar" id="0x7F0A08F3" />
-    <public type="id" name="manage_reactions_result_user_name" id="0x7F0A08F4" />
-    <public type="id" name="manage_reactions_results_recycler" id="0x7F0A08F5" />
-    <public type="id" name="masked" id="0x7F0A08F6" />
-    <public type="id" name="masked_links_body_text" id="0x7F0A08F7" />
-    <public type="id" name="masked_links_cancel" id="0x7F0A08F8" />
-    <public type="id" name="masked_links_confirm" id="0x7F0A08F9" />
-    <public type="id" name="masked_links_trust_domain" id="0x7F0A08FA" />
-    <public type="id" name="match_global_nicknames" id="0x7F0A08FB" />
-    <public type="id" name="material_clock_display" id="0x7F0A08FC" />
-    <public type="id" name="material_clock_face" id="0x7F0A08FD" />
-    <public type="id" name="material_clock_hand" id="0x7F0A08FE" />
-    <public type="id" name="material_clock_period_am_button" id="0x7F0A08FF" />
-    <public type="id" name="material_clock_period_pm_button" id="0x7F0A0900" />
-    <public type="id" name="material_clock_period_toggle" id="0x7F0A0901" />
-    <public type="id" name="material_hour_text_input" id="0x7F0A0902" />
-    <public type="id" name="material_hour_tv" id="0x7F0A0903" />
-    <public type="id" name="material_label" id="0x7F0A0904" />
-    <public type="id" name="material_minute_text_input" id="0x7F0A0905" />
-    <public type="id" name="material_minute_tv" id="0x7F0A0906" />
-    <public type="id" name="material_textinput_timepicker" id="0x7F0A0907" />
-    <public type="id" name="material_timepicker_cancel_button" id="0x7F0A0908" />
-    <public type="id" name="material_timepicker_container" id="0x7F0A0909" />
-    <public type="id" name="material_timepicker_edit_text" id="0x7F0A090A" />
-    <public type="id" name="material_timepicker_mode_button" id="0x7F0A090B" />
-    <public type="id" name="material_timepicker_ok_button" id="0x7F0A090C" />
-    <public type="id" name="material_timepicker_view" id="0x7F0A090D" />
-    <public type="id" name="material_value_index" id="0x7F0A090E" />
-    <public type="id" name="max_guilds_perk" id="0x7F0A090F" />
-    <public type="id" name="max_message_length_perk" id="0x7F0A0910" />
-    <public type="id" name="media_actions" id="0x7F0A0911" />
-    <public type="id" name="media_container" id="0x7F0A0912" />
-    <public type="id" name="media_controller_compat_view_tag" id="0x7F0A0913" />
-    <public type="id" name="media_image" id="0x7F0A0914" />
-    <public type="id" name="media_loading_indicator" id="0x7F0A0915" />
-    <public type="id" name="media_player_control_view" id="0x7F0A0916" />
-    <public type="id" name="media_player_view" id="0x7F0A0917" />
-    <public type="id" name="member_list_item_container" id="0x7F0A0918" />
-    <public type="id" name="member_list_item_lock" id="0x7F0A0919" />
-    <public type="id" name="member_list_item_overflow" id="0x7F0A091A" />
-    <public type="id" name="member_list_item_roles_list" id="0x7F0A091B" />
-    <public type="id" name="member_subtitle" id="0x7F0A091C" />
-    <public type="id" name="member_title" id="0x7F0A091D" />
-    <public type="id" name="member_verification_avatar" id="0x7F0A091E" />
-    <public type="id" name="member_verification_banner_image" id="0x7F0A091F" />
-    <public type="id" name="member_verification_confirm" id="0x7F0A0920" />
-    <public type="id" name="member_verification_container" id="0x7F0A0921" />
-    <public type="id" name="member_verification_guild_icon" id="0x7F0A0922" />
-    <public type="id" name="member_verification_guild_name" id="0x7F0A0923" />
-    <public type="id" name="member_verification_multiple_choice_radio_group" id="0x7F0A0924" />
-    <public type="id" name="member_verification_paragraph_field" id="0x7F0A0925" />
-    <public type="id" name="member_verification_pending_img" id="0x7F0A0926" />
-    <public type="id" name="member_verification_primary_btn" id="0x7F0A0927" />
-    <public type="id" name="member_verification_rule_container" id="0x7F0A0928" />
-    <public type="id" name="member_verification_rule_description" id="0x7F0A0929" />
-    <public type="id" name="member_verification_rule_divider" id="0x7F0A092A" />
-    <public type="id" name="member_verification_rule_index" id="0x7F0A092B" />
-    <public type="id" name="member_verification_rule_root" id="0x7F0A092C" />
-    <public type="id" name="member_verification_rules_check" id="0x7F0A092D" />
-    <public type="id" name="member_verification_rules_confirm" id="0x7F0A092E" />
-    <public type="id" name="member_verification_rules_header" id="0x7F0A092F" />
-    <public type="id" name="member_verification_rules_recycler" id="0x7F0A0930" />
-    <public type="id" name="member_verification_scrollview" id="0x7F0A0931" />
-    <public type="id" name="member_verification_secondary_btn" id="0x7F0A0932" />
-    <public type="id" name="member_verification_success_card" id="0x7F0A0933" />
-    <public type="id" name="member_verification_tertiary_btn" id="0x7F0A0934" />
-    <public type="id" name="member_verification_text" id="0x7F0A0935" />
-    <public type="id" name="member_verification_text_input_field" id="0x7F0A0936" />
-    <public type="id" name="member_verification_verified_check" id="0x7F0A0937" />
-    <public type="id" name="member_verification_verify_button" id="0x7F0A0938" />
-    <public type="id" name="member_verification_verify_icon" id="0x7F0A0939" />
-    <public type="id" name="member_verification_verify_text" id="0x7F0A093A" />
-    <public type="id" name="member_view" id="0x7F0A093B" />
-    <public type="id" name="members_container" id="0x7F0A093C" />
-    <public type="id" name="members_permission_owners_list" id="0x7F0A093D" />
-    <public type="id" name="members_recycler" id="0x7F0A093E" />
-    <public type="id" name="menu_add_connections" id="0x7F0A093F" />
-    <public type="id" name="menu_audit_log_sort_actions" id="0x7F0A0940" />
-    <public type="id" name="menu_audit_log_sort_users" id="0x7F0A0941" />
-    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7F0A0942" />
-    <public type="id" name="menu_auth_mfa_info" id="0x7F0A0943" />
-    <public type="id" name="menu_call_overlay_launcher" id="0x7F0A0944" />
-    <public type="id" name="menu_call_switch_camera" id="0x7F0A0945" />
-    <public type="id" name="menu_call_video_list" id="0x7F0A0946" />
-    <public type="id" name="menu_call_voice_settings" id="0x7F0A0947" />
-    <public type="id" name="menu_channel_settings_delete" id="0x7F0A0948" />
-    <public type="id" name="menu_channel_settings_reset" id="0x7F0A0949" />
-    <public type="id" name="menu_chat_add_friend" id="0x7F0A094A" />
-    <public type="id" name="menu_chat_search" id="0x7F0A094B" />
-    <public type="id" name="menu_chat_side_panel" id="0x7F0A094C" />
-    <public type="id" name="menu_chat_start_call" id="0x7F0A094D" />
-    <public type="id" name="menu_chat_start_group" id="0x7F0A094E" />
-    <public type="id" name="menu_chat_start_video_call" id="0x7F0A094F" />
-    <public type="id" name="menu_chat_stop_call" id="0x7F0A0950" />
-    <public type="id" name="menu_chat_thread_browser" id="0x7F0A0951" />
-    <public type="id" name="menu_code_verification_paste" id="0x7F0A0952" />
-    <public type="id" name="menu_contact_sync_skip" id="0x7F0A0953" />
-    <public type="id" name="menu_contact_sync_upsell_dismiss" id="0x7F0A0954" />
-    <public type="id" name="menu_continue" id="0x7F0A0955" />
-    <public type="id" name="menu_copy_id" id="0x7F0A0956" />
-    <public type="id" name="menu_crop" id="0x7F0A0957" />
-    <public type="id" name="menu_debugging_filter" id="0x7F0A0958" />
-    <public type="id" name="menu_edit_overwrite_delete" id="0x7F0A0959" />
-    <public type="id" name="menu_edit_role_delete" id="0x7F0A095A" />
-    <public type="id" name="menu_filter" id="0x7F0A095B" />
-    <public type="id" name="menu_friends_add_friend" id="0x7F0A095C" />
-    <public type="id" name="menu_friends_contact_sync" id="0x7F0A095D" />
-    <public type="id" name="menu_friends_start_group" id="0x7F0A095E" />
-    <public type="id" name="menu_leave_group" id="0x7F0A095F" />
-    <public type="id" name="menu_loader" id="0x7F0A0960" />
-    <public type="id" name="menu_media_browser" id="0x7F0A0961" />
-    <public type="id" name="menu_media_download" id="0x7F0A0962" />
-    <public type="id" name="menu_media_share" id="0x7F0A0963" />
-    <public type="id" name="menu_premium_guild" id="0x7F0A0964" />
-    <public type="id" name="menu_private_channel_sidebar_close" id="0x7F0A0965" />
-    <public type="id" name="menu_private_channel_sidebar_copy_id" id="0x7F0A0966" />
-    <public type="id" name="menu_private_channel_sidebar_customize_gorup" id="0x7F0A0967" />
-    <public type="id" name="menu_private_channel_sidebar_pinned_messages" id="0x7F0A0968" />
-    <public type="id" name="menu_reports_node_view_holder" id="0x7F0A0969" />
-    <public type="id" name="menu_send" id="0x7F0A096A" />
-    <public type="id" name="menu_server_settings_delete" id="0x7F0A096B" />
-    <public type="id" name="menu_server_settings_emoji_delete" id="0x7F0A096C" />
-    <public type="id" name="menu_server_settings_members_prune" id="0x7F0A096D" />
-    <public type="id" name="menu_settings_debugging" id="0x7F0A096E" />
-    <public type="id" name="menu_settings_log_out" id="0x7F0A096F" />
-    <public type="id" name="menu_settings_premium_guild_sub_cancel" id="0x7F0A0970" />
-    <public type="id" name="menu_settings_premium_guild_sub_transfer" id="0x7F0A0971" />
-    <public type="id" name="menu_settings_premium_guild_sub_uncancel" id="0x7F0A0972" />
-    <public type="id" name="menu_sort_channel" id="0x7F0A0973" />
-    <public type="id" name="menu_sort_done" id="0x7F0A0974" />
-    <public type="id" name="menu_thread_browser_create_thread" id="0x7F0A0975" />
-    <public type="id" name="menu_thread_browser_filters" id="0x7F0A0976" />
-    <public type="id" name="menu_user_mentions_filter" id="0x7F0A0977" />
-    <public type="id" name="message" id="0x7F0A0978" />
-    <public type="id" name="mfa_description_text" id="0x7F0A0979" />
-    <public type="id" name="mfa_download_body" id="0x7F0A097A" />
-    <public type="id" name="mfa_success_enable_sms" id="0x7F0A097B" />
-    <public type="id" name="middle" id="0x7F0A097C" />
-    <public type="id" name="mini" id="0x7F0A097D" />
-    <public type="id" name="mobile_reports_block_user_avatar" id="0x7F0A097E" />
-    <public type="id" name="mobile_reports_block_user_button" id="0x7F0A097F" />
-    <public type="id" name="mobile_reports_block_user_description" id="0x7F0A0980" />
-    <public type="id" name="mobile_reports_block_user_header" id="0x7F0A0981" />
-    <public type="id" name="mobile_reports_block_user_name" id="0x7F0A0982" />
-    <public type="id" name="mobile_reports_channel_preview" id="0x7F0A0983" />
-    <public type="id" name="mobile_reports_child" id="0x7F0A0984" />
-    <public type="id" name="mobile_reports_child_menu_title" id="0x7F0A0985" />
-    <public type="id" name="mobile_reports_directory_channel_preview" id="0x7F0A0986" />
-    <public type="id" name="mobile_reports_message_preview" id="0x7F0A0987" />
-    <public type="id" name="mobile_reports_multiselect" id="0x7F0A0988" />
-    <public type="id" name="mobile_reports_node_block_user" id="0x7F0A0989" />
-    <public type="id" name="mobile_reports_node_bottom_button" id="0x7F0A098A" />
-    <public type="id" name="mobile_reports_node_breadcrumbs" id="0x7F0A098B" />
-    <public type="id" name="mobile_reports_node_channel_preview" id="0x7F0A098C" />
-    <public type="id" name="mobile_reports_node_child_list" id="0x7F0A098D" />
-    <public type="id" name="mobile_reports_node_directory_channel_preview" id="0x7F0A098E" />
-    <public type="id" name="mobile_reports_node_directory_channel_preview_title" id="0x7F0A098F" />
-    <public type="id" name="mobile_reports_node_header" id="0x7F0A0990" />
-    <public type="id" name="mobile_reports_node_info_box" id="0x7F0A0991" />
-    <public type="id" name="mobile_reports_node_info_text" id="0x7F0A0992" />
-    <public type="id" name="mobile_reports_node_message_preview" id="0x7F0A0993" />
-    <public type="id" name="mobile_reports_node_subheader" id="0x7F0A0994" />
-    <public type="id" name="mobile_reports_node_success_shield" id="0x7F0A0995" />
-    <public type="id" name="mobile_reports_progress_bar" id="0x7F0A0996" />
-    <public type="id" name="moderator_start_stage_exit_stage_button" id="0x7F0A0997" />
-    <public type="id" name="moderator_start_stage_icon" id="0x7F0A0998" />
-    <public type="id" name="moderator_start_stage_subtitle" id="0x7F0A0999" />
-    <public type="id" name="moderator_start_stage_title" id="0x7F0A099A" />
-    <public type="id" name="moderator_start_stage_waiting_user_list" id="0x7F0A099B" />
-    <public type="id" name="moderator_start_stage_waiting_user_text" id="0x7F0A099C" />
-    <public type="id" name="mono" id="0x7F0A099D" />
-    <public type="id" name="month_grid" id="0x7F0A099E" />
-    <public type="id" name="month_navigation_bar" id="0x7F0A099F" />
-    <public type="id" name="month_navigation_fragment_toggle" id="0x7F0A09A0" />
-    <public type="id" name="month_navigation_next" id="0x7F0A09A1" />
-    <public type="id" name="month_navigation_previous" id="0x7F0A09A2" />
-    <public type="id" name="month_title" id="0x7F0A09A3" />
-    <public type="id" name="more_arrow" id="0x7F0A09A4" />
-    <public type="id" name="motion_base" id="0x7F0A09A5" />
-    <public type="id" name="move_to_audience_button" id="0x7F0A09A6" />
-    <public type="id" name="mtrl_anchor_parent" id="0x7F0A09A7" />
-    <public type="id" name="mtrl_calendar_day_selector_frame" id="0x7F0A09A8" />
-    <public type="id" name="mtrl_calendar_days_of_week" id="0x7F0A09A9" />
-    <public type="id" name="mtrl_calendar_frame" id="0x7F0A09AA" />
-    <public type="id" name="mtrl_calendar_main_pane" id="0x7F0A09AB" />
-    <public type="id" name="mtrl_calendar_months" id="0x7F0A09AC" />
-    <public type="id" name="mtrl_calendar_selection_frame" id="0x7F0A09AD" />
-    <public type="id" name="mtrl_calendar_text_input_frame" id="0x7F0A09AE" />
-    <public type="id" name="mtrl_calendar_year_selector_frame" id="0x7F0A09AF" />
-    <public type="id" name="mtrl_card_checked_layer_id" id="0x7F0A09B0" />
-    <public type="id" name="mtrl_child_content_container" id="0x7F0A09B1" />
-    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7F0A09B2" />
-    <public type="id" name="mtrl_motion_snapshot_view" id="0x7F0A09B3" />
-    <public type="id" name="mtrl_picker_fullscreen" id="0x7F0A09B4" />
-    <public type="id" name="mtrl_picker_header" id="0x7F0A09B5" />
-    <public type="id" name="mtrl_picker_header_selection_text" id="0x7F0A09B6" />
-    <public type="id" name="mtrl_picker_header_title_and_selection" id="0x7F0A09B7" />
-    <public type="id" name="mtrl_picker_header_toggle" id="0x7F0A09B8" />
-    <public type="id" name="mtrl_picker_text_input_date" id="0x7F0A09B9" />
-    <public type="id" name="mtrl_picker_text_input_range_end" id="0x7F0A09BA" />
-    <public type="id" name="mtrl_picker_text_input_range_start" id="0x7F0A09BB" />
-    <public type="id" name="mtrl_picker_title_text" id="0x7F0A09BC" />
-    <public type="id" name="mtrl_view_tag_bottom_padding" id="0x7F0A09BD" />
-    <public type="id" name="multiply" id="0x7F0A09BE" />
-    <public type="id" name="mute_button" id="0x7F0A09BF" />
-    <public type="id" name="mute_settings" id="0x7F0A09C0" />
-    <public type="id" name="mute_settings_sheet_mute_options" id="0x7F0A09C1" />
-    <public type="id" name="mute_toggle" id="0x7F0A09C2" />
-    <public type="id" name="mutual_guild_pile" id="0x7F0A09C3" />
-    <public type="id" name="mutual_guilds" id="0x7F0A09C4" />
-    <public type="id" name="mutual_guilds_text" id="0x7F0A09C5" />
-    <public type="id" name="mutual_server_1" id="0x7F0A09C6" />
-    <public type="id" name="mutual_server_2" id="0x7F0A09C7" />
-    <public type="id" name="mutual_server_3" id="0x7F0A09C8" />
-    <public type="id" name="mutual_server_4" id="0x7F0A09C9" />
-    <public type="id" name="name" id="0x7F0A09CA" />
-    <public type="id" name="name_placeholder" id="0x7F0A09CB" />
-    <public type="id" name="name_placeholder_end_guideline" id="0x7F0A09CC" />
-    <public type="id" name="name_tv" id="0x7F0A09CD" />
-    <public type="id" name="navigation_header_container" id="0x7F0A09CE" />
-    <public type="id" name="navigation_help_close" id="0x7F0A09CF" />
-    <public type="id" name="navigation_help_indicators" id="0x7F0A09D0" />
-    <public type="id" name="navigation_help_nux_pager" id="0x7F0A09D1" />
-    <public type="id" name="navigation_indicator" id="0x7F0A09D2" />
-    <public type="id" name="nearby_friends_enable" id="0x7F0A09D3" />
-    <public type="id" name="nearby_friends_learn_more" id="0x7F0A09D4" />
-    <public type="id" name="nearby_friends_recycler" id="0x7F0A09D5" />
-    <public type="id" name="nearby_friends_searching_body" id="0x7F0A09D6" />
-    <public type="id" name="nearby_friends_searching_lottie" id="0x7F0A09D7" />
-    <public type="id" name="nearby_friends_searching_title" id="0x7F0A09D8" />
-    <public type="id" name="never" id="0x7F0A09D9" />
-    <public type="id" name="next_button" id="0x7F0A09DA" />
-    <public type="id" name="nickname_editor_card" id="0x7F0A09DB" />
-    <public type="id" name="nicknames" id="0x7F0A09DC" />
-    <public type="id" name="nitroGiftingBadge" id="0x7F0A09DD" />
-    <public type="id" name="nitroGiftingContainer" id="0x7F0A09DE" />
-    <public type="id" name="nitro_boosting" id="0x7F0A09DF" />
-    <public type="id" name="nitro_gifting" id="0x7F0A09E0" />
-    <public type="id" name="nitro_header" id="0x7F0A09E1" />
-    <public type="id" name="nitro_settings_container" id="0x7F0A09E2" />
-    <public type="id" name="noScroll" id="0x7F0A09E3" />
-    <public type="id" name="no_bans_body" id="0x7F0A09E4" />
-    <public type="id" name="no_guilds" id="0x7F0A09E5" />
-    <public type="id" name="no_invites_body" id="0x7F0A09E6" />
-    <public type="id" name="no_invites_header" id="0x7F0A09E7" />
-    <public type="id" name="no_logs_body" id="0x7F0A09E8" />
-    <public type="id" name="no_logs_title" id="0x7F0A09E9" />
-    <public type="id" name="no_results_text" id="0x7F0A09EA" />
-    <public type="id" name="noise_cancellation_enable_button" id="0x7F0A09EB" />
-    <public type="id" name="noise_cancellation_learn_more" id="0x7F0A09EC" />
-    <public type="id" name="non_member_text" id="0x7F0A09ED" />
-    <public type="id" name="none" id="0x7F0A09EE" />
-    <public type="id" name="normal" id="0x7F0A09EF" />
-    <public type="id" name="not_found" id="0x7F0A09F0" />
-    <public type="id" name="notice_body_container" id="0x7F0A09F1" />
-    <public type="id" name="notice_body_text" id="0x7F0A09F2" />
-    <public type="id" name="notice_cancel" id="0x7F0A09F3" />
-    <public type="id" name="notice_crop" id="0x7F0A09F4" />
-    <public type="id" name="notice_header" id="0x7F0A09F5" />
-    <public type="id" name="notice_header_container" id="0x7F0A09F6" />
-    <public type="id" name="notice_image" id="0x7F0A09F7" />
-    <public type="id" name="notice_ok" id="0x7F0A09F8" />
-    <public type="id" name="notice_upload" id="0x7F0A09F9" />
-    <public type="id" name="notification_background" id="0x7F0A09FA" />
-    <public type="id" name="notification_main_column" id="0x7F0A09FB" />
-    <public type="id" name="notification_main_column_container" id="0x7F0A09FC" />
-    <public type="id" name="notification_mute_settings_mute_item" id="0x7F0A09FD" />
-    <public type="id" name="notification_mute_settings_mute_item_description" id="0x7F0A09FE" />
-    <public type="id" name="notification_mute_settings_mute_item_status" id="0x7F0A09FF" />
-    <public type="id" name="notification_settings_button" id="0x7F0A0A00" />
-    <public type="id" name="notification_settings_button_container" id="0x7F0A0A01" />
-    <public type="id" name="notification_settings_label" id="0x7F0A0A02" />
-    <public type="id" name="notification_settings_overrides_label" id="0x7F0A0A03" />
-    <public type="id" name="notification_upsell" id="0x7F0A0A04" />
-    <public type="id" name="notification_upsell_enable" id="0x7F0A0A05" />
-    <public type="id" name="notifications" id="0x7F0A0A06" />
-    <public type="id" name="nowrap" id="0x7F0A0A07" />
-    <public type="id" name="nuf_channel_prompt_cta_button" id="0x7F0A0A08" />
-    <public type="id" name="nuf_channel_prompt_guild_icon" id="0x7F0A0A09" />
-    <public type="id" name="nuf_channel_prompt_guild_icon_name" id="0x7F0A0A0A" />
-    <public type="id" name="nuf_channel_prompt_guild_name" id="0x7F0A0A0B" />
-    <public type="id" name="nuf_channel_prompt_skip_button" id="0x7F0A0A0C" />
-    <public type="id" name="nuf_channel_prompt_topic_wrap" id="0x7F0A0A0D" />
-    <public type="id" name="numeric" id="0x7F0A0A0E" />
-    <public type="id" name="nux_guild_template_action_join" id="0x7F0A0A0F" />
-    <public type="id" name="nux_guild_template_card" id="0x7F0A0A10" />
-    <public type="id" name="nux_guild_template_section_bottom" id="0x7F0A0A11" />
-    <public type="id" name="nux_guild_template_section_custom_label" id="0x7F0A0A12" />
-    <public type="id" name="nux_guild_template_section_title" id="0x7F0A0A13" />
-    <public type="id" name="nux_guild_template_text" id="0x7F0A0A14" />
-    <public type="id" name="oauth_application_deauthorize_btn" id="0x7F0A0A15" />
-    <public type="id" name="oauth_application_description_label_tv" id="0x7F0A0A16" />
-    <public type="id" name="oauth_application_description_tv" id="0x7F0A0A17" />
-    <public type="id" name="oauth_application_icon_iv" id="0x7F0A0A18" />
-    <public type="id" name="oauth_application_list_item" id="0x7F0A0A19" />
-    <public type="id" name="oauth_application_name_tv" id="0x7F0A0A1A" />
-    <public type="id" name="oauth_application_permissions_label_tv" id="0x7F0A0A1B" />
-    <public type="id" name="oauth_application_permissions_rv" id="0x7F0A0A1C" />
-    <public type="id" name="oauth_authorize_age_notice" id="0x7F0A0A1D" />
-    <public type="id" name="oauth_authorize_age_notice_icon" id="0x7F0A0A1E" />
-    <public type="id" name="oauth_authorize_application_icon" id="0x7F0A0A1F" />
-    <public type="id" name="oauth_authorize_application_name" id="0x7F0A0A20" />
-    <public type="id" name="oauth_authorize_card" id="0x7F0A0A21" />
-    <public type="id" name="oauth_authorize_connect_label" id="0x7F0A0A22" />
-    <public type="id" name="oauth_authorize_content" id="0x7F0A0A23" />
-    <public type="id" name="oauth_authorize_deny" id="0x7F0A0A24" />
-    <public type="id" name="oauth_authorize_grant" id="0x7F0A0A25" />
-    <public type="id" name="oauth_authorize_loading" id="0x7F0A0A26" />
-    <public type="id" name="oauth_authorize_loading_cancel" id="0x7F0A0A27" />
-    <public type="id" name="oauth_authorize_logo" id="0x7F0A0A28" />
-    <public type="id" name="oauth_authorize_not_supported" id="0x7F0A0A29" />
-    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7F0A0A2A" />
-    <public type="id" name="oauth_authorize_permissions_list" id="0x7F0A0A2B" />
-    <public type="id" name="oauth_authorize_security_notice" id="0x7F0A0A2C" />
-    <public type="id" name="oauth_authorize_security_notice_icon" id="0x7F0A0A2D" />
-    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7F0A0A2E" />
-    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7F0A0A2F" />
-    <public type="id" name="oauth_authorize_user_icon" id="0x7F0A0A30" />
-    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7F0A0A31" />
-    <public type="id" name="oauth_token_permission_detailed_name" id="0x7F0A0A32" />
-    <public type="id" name="off" id="0x7F0A0A33" />
-    <public type="id" name="off_disabled_overlay" id="0x7F0A0A34" />
-    <public type="id" name="omnibox_title_section" id="0x7F0A0A35" />
-    <public type="id" name="omnibox_url_section" id="0x7F0A0A36" />
-    <public type="id" name="on" id="0x7F0A0A37" />
-    <public type="id" name="one" id="0x7F0A0A38" />
-    <public type="id" name="option_always" id="0x7F0A0A39" />
-    <public type="id" name="option_eight_hours" id="0x7F0A0A3A" />
-    <public type="id" name="option_fifteen_minutes" id="0x7F0A0A3B" />
-    <public type="id" name="option_one_hour" id="0x7F0A0A3C" />
-    <public type="id" name="option_one_hour_radio" id="0x7F0A0A3D" />
-    <public type="id" name="option_seven_days" id="0x7F0A0A3E" />
-    <public type="id" name="option_seven_days_duration" id="0x7F0A0A3F" />
-    <public type="id" name="option_seven_days_icon" id="0x7F0A0A40" />
-    <public type="id" name="option_seven_days_label" id="0x7F0A0A41" />
-    <public type="id" name="option_seven_days_radio" id="0x7F0A0A42" />
-    <public type="id" name="option_three_days" id="0x7F0A0A43" />
-    <public type="id" name="option_three_days_duration" id="0x7F0A0A44" />
-    <public type="id" name="option_three_days_icon" id="0x7F0A0A45" />
-    <public type="id" name="option_three_days_label" id="0x7F0A0A46" />
-    <public type="id" name="option_three_days_radio" id="0x7F0A0A47" />
-    <public type="id" name="option_twenty_four_hours" id="0x7F0A0A48" />
-    <public type="id" name="option_twenty_four_hours_radio" id="0x7F0A0A49" />
-    <public type="id" name="other_speakers_count_text" id="0x7F0A0A4A" />
-    <public type="id" name="outline" id="0x7F0A0A4B" />
-    <public type="id" name="outward" id="0x7F0A0A4C" />
-    <public type="id" name="overlapping_panels" id="0x7F0A0A4D" />
-    <public type="id" name="overlay_bubble_iv" id="0x7F0A0A4E" />
-    <public type="id" name="overlay_channel_name" id="0x7F0A0A4F" />
-    <public type="id" name="overlay_channel_search" id="0x7F0A0A50" />
-    <public type="id" name="overlay_guild_name" id="0x7F0A0A51" />
-    <public type="id" name="overlay_header" id="0x7F0A0A52" />
-    <public type="id" name="overlay_invite_link" id="0x7F0A0A53" />
-    <public type="id" name="overlay_linked_anchor_view" id="0x7F0A0A54" />
-    <public type="id" name="overlay_members_overflow_tv" id="0x7F0A0A55" />
-    <public type="id" name="overlay_members_rv" id="0x7F0A0A56" />
-    <public type="id" name="overlay_menu" id="0x7F0A0A57" />
-    <public type="id" name="overlay_network_icon" id="0x7F0A0A58" />
-    <public type="id" name="overlay_open_app" id="0x7F0A0A59" />
-    <public type="id" name="overlay_switch_channels" id="0x7F0A0A5A" />
-    <public type="id" name="overline" id="0x7F0A0A5B" />
-    <public type="id" name="overview_name" id="0x7F0A0A5C" />
-    <public type="id" name="overview_region_wrap_help" id="0x7F0A0A5D" />
-    <public type="id" name="packed" id="0x7F0A0A5E" />
-    <public type="id" name="panel_center" id="0x7F0A0A5F" />
-    <public type="id" name="panel_left" id="0x7F0A0A60" />
-    <public type="id" name="panel_right" id="0x7F0A0A61" />
-    <public type="id" name="parallax" id="0x7F0A0A62" />
-    <public type="id" name="parent" id="0x7F0A0A63" />
-    <public type="id" name="parentPanel" id="0x7F0A0A64" />
-    <public type="id" name="parentRelative" id="0x7F0A0A65" />
-    <public type="id" name="parent_matrix" id="0x7F0A0A66" />
-    <public type="id" name="participant_bg_avatar" id="0x7F0A0A67" />
-    <public type="id" name="participant_bg_letterbox" id="0x7F0A0A68" />
-    <public type="id" name="participant_deafen_status_indicator" id="0x7F0A0A69" />
-    <public type="id" name="participant_fullscreen_streamqual_container" id="0x7F0A0A6A" />
-    <public type="id" name="participant_fullscreen_streamqual_divider" id="0x7F0A0A6B" />
-    <public type="id" name="participant_fullscreen_streamqual_icon" id="0x7F0A0A6C" />
-    <public type="id" name="participant_fullscreen_streamqual_info" id="0x7F0A0A6D" />
-    <public type="id" name="participant_fullscreen_streamqual_info_container" id="0x7F0A0A6E" />
-    <public type="id" name="participant_fullscreen_streamqual_live_indicator" id="0x7F0A0A6F" />
-    <public type="id" name="participant_live_indicator" id="0x7F0A0A70" />
-    <public type="id" name="participant_mute_status_indicator" id="0x7F0A0A71" />
-    <public type="id" name="participant_stream_ended" id="0x7F0A0A72" />
-    <public type="id" name="participant_stream_ended_img" id="0x7F0A0A73" />
-    <public type="id" name="participant_stream_ended_label" id="0x7F0A0A74" />
-    <public type="id" name="participant_stream_paused" id="0x7F0A0A75" />
-    <public type="id" name="participant_stream_preview_image" id="0x7F0A0A76" />
-    <public type="id" name="participant_stream_preview_text" id="0x7F0A0A77" />
-    <public type="id" name="participant_video_label" id="0x7F0A0A78" />
-    <public type="id" name="participant_video_loading_indicator" id="0x7F0A0A79" />
-    <public type="id" name="participant_video_stream_renderer" id="0x7F0A0A7A" />
-    <public type="id" name="participant_voice_indicators" id="0x7F0A0A7B" />
-    <public type="id" name="participant_voice_user_view" id="0x7F0A0A7C" />
-    <public type="id" name="password_toggle" id="0x7F0A0A7D" />
-    <public type="id" name="path" id="0x7F0A0A7E" />
-    <public type="id" name="pathRelative" id="0x7F0A0A7F" />
-    <public type="id" name="payment" id="0x7F0A0A80" />
-    <public type="id" name="payment_method_edit" id="0x7F0A0A81" />
-    <public type="id" name="payment_method_header" id="0x7F0A0A82" />
-    <public type="id" name="payment_method_summary" id="0x7F0A0A83" />
-    <public type="id" name="payment_source_edit_address1" id="0x7F0A0A84" />
-    <public type="id" name="payment_source_edit_address2" id="0x7F0A0A85" />
-    <public type="id" name="payment_source_edit_city" id="0x7F0A0A86" />
-    <public type="id" name="payment_source_edit_country" id="0x7F0A0A87" />
-    <public type="id" name="payment_source_edit_default" id="0x7F0A0A88" />
-    <public type="id" name="payment_source_edit_error" id="0x7F0A0A89" />
-    <public type="id" name="payment_source_edit_help" id="0x7F0A0A8A" />
-    <public type="id" name="payment_source_edit_name" id="0x7F0A0A8B" />
-    <public type="id" name="payment_source_edit_postal_code" id="0x7F0A0A8C" />
-    <public type="id" name="payment_source_edit_state" id="0x7F0A0A8D" />
-    <public type="id" name="payment_source_summary" id="0x7F0A0A8E" />
-    <public type="id" name="payment_source_view_icon" id="0x7F0A0A8F" />
-    <public type="id" name="payment_source_view_icon_wrapper" id="0x7F0A0A90" />
-    <public type="id" name="payment_source_view_invalid" id="0x7F0A0A91" />
-    <public type="id" name="payment_source_view_premium" id="0x7F0A0A92" />
-    <public type="id" name="payment_source_view_subtext" id="0x7F0A0A93" />
-    <public type="id" name="payment_source_view_title" id="0x7F0A0A94" />
-    <public type="id" name="pbProgress" id="0x7F0A0A95" />
-    <public type="id" name="peekHeight" id="0x7F0A0A96" />
-    <public type="id" name="peek_container" id="0x7F0A0A97" />
-    <public type="id" name="peek_transition_bitmap" id="0x7F0A0A98" />
-    <public type="id" name="pending_dialog_desc" id="0x7F0A0A99" />
-    <public type="id" name="pending_dialog_title" id="0x7F0A0A9A" />
-    <public type="id" name="pending_login" id="0x7F0A0A9B" />
-    <public type="id" name="per_guild_identity_container" id="0x7F0A0A9C" />
-    <public type="id" name="percent" id="0x7F0A0A9D" />
-    <public type="id" name="perk_view_content_list_item" id="0x7F0A0A9E" />
-    <public type="id" name="perks_level_contents_header" id="0x7F0A0A9F" />
-    <public type="id" name="perks_level_contents_recycler" id="0x7F0A0AA0" />
-    <public type="id" name="perks_level_header" id="0x7F0A0AA1" />
-    <public type="id" name="perks_level_header_boosts" id="0x7F0A0AA2" />
-    <public type="id" name="perks_level_header_boosts_container" id="0x7F0A0AA3" />
-    <public type="id" name="perks_level_header_text" id="0x7F0A0AA4" />
-    <public type="id" name="perks_level_header_unlocked" id="0x7F0A0AA5" />
-    <public type="id" name="perm_req_text" id="0x7F0A0AA6" />
-    <public type="id" name="permission_owner_view" id="0x7F0A0AA7" />
-    <public type="id" name="permissions_req_btn" id="0x7F0A0AA8" />
-    <public type="id" name="permissions_required_action_btn" id="0x7F0A0AA9" />
-    <public type="id" name="permissions_required_text" id="0x7F0A0AAA" />
-    <public type="id" name="permissions_view_stub" id="0x7F0A0AAB" />
-    <public type="id" name="phone" id="0x7F0A0AAC" />
-    <public type="id" name="phone_country_code_code" id="0x7F0A0AAD" />
-    <public type="id" name="phone_country_code_item" id="0x7F0A0AAE" />
-    <public type="id" name="phone_country_code_name" id="0x7F0A0AAF" />
-    <public type="id" name="phone_country_code_recycler" id="0x7F0A0AB0" />
-    <public type="id" name="phone_country_code_search" id="0x7F0A0AB1" />
-    <public type="id" name="phone_digit_verification_view" id="0x7F0A0AB2" />
-    <public type="id" name="phone_or_email_country_code_wrap" id="0x7F0A0AB3" />
-    <public type="id" name="phone_or_email_main_input" id="0x7F0A0AB4" />
-    <public type="id" name="phone_or_email_main_input_wrap" id="0x7F0A0AB5" />
-    <public type="id" name="picture" id="0x7F0A0AB6" />
-    <public type="id" name="pileItemBg" id="0x7F0A0AB7" />
-    <public type="id" name="pileItemImage" id="0x7F0A0AB8" />
-    <public type="id" name="pileItemInitials" id="0x7F0A0AB9" />
-    <public type="id" name="pile_item_text" id="0x7F0A0ABA" />
-    <public type="id" name="pin" id="0x7F0A0ABB" />
-    <public type="id" name="placeholder_group" id="0x7F0A0ABC" />
-    <public type="id" name="plain" id="0x7F0A0ABD" />
-    <public type="id" name="plan_item_border" id="0x7F0A0ABE" />
-    <public type="id" name="plan_item_container" id="0x7F0A0ABF" />
-    <public type="id" name="plan_item_current_plan" id="0x7F0A0AC0" />
-    <public type="id" name="plan_item_icon" id="0x7F0A0AC1" />
-    <public type="id" name="plan_item_name" id="0x7F0A0AC2" />
-    <public type="id" name="plan_item_price" id="0x7F0A0AC3" />
-    <public type="id" name="popup_attachment" id="0x7F0A0AC4" />
-    <public type="id" name="popup_body" id="0x7F0A0AC5" />
-    <public type="id" name="popup_close_btn" id="0x7F0A0AC6" />
-    <public type="id" name="popup_icon" id="0x7F0A0AC7" />
-    <public type="id" name="popup_sticker" id="0x7F0A0AC8" />
-    <public type="id" name="popup_subtitle" id="0x7F0A0AC9" />
-    <public type="id" name="popup_title" id="0x7F0A0ACA" />
-    <public type="id" name="popup_title_wrap" id="0x7F0A0ACB" />
-    <public type="id" name="position" id="0x7F0A0ACC" />
-    <public type="id" name="postLayout" id="0x7F0A0ACD" />
-    <public type="id" name="premium_activated_confirm" id="0x7F0A0ACE" />
-    <public type="id" name="premium_activated_description" id="0x7F0A0ACF" />
-    <public type="id" name="premium_activated_header_background" id="0x7F0A0AD0" />
-    <public type="id" name="premium_activated_logo" id="0x7F0A0AD1" />
-    <public type="id" name="premium_activated_title" id="0x7F0A0AD2" />
-    <public type="id" name="premium_activated_wumpus" id="0x7F0A0AD3" />
-    <public type="id" name="premium_and_premium_guild_activated_text" id="0x7F0A0AD4" />
-    <public type="id" name="premium_btn" id="0x7F0A0AD5" />
-    <public type="id" name="premium_guild_confirmation_avatar" id="0x7F0A0AD6" />
-    <public type="id" name="premium_guild_confirmation_guild_name" id="0x7F0A0AD7" />
-    <public type="id" name="premium_guild_confirmation_level_info_previous" id="0x7F0A0AD8" />
-    <public type="id" name="premium_guild_confirmation_level_info_upgrade" id="0x7F0A0AD9" />
-    <public type="id" name="premium_guild_confirmation_upgrade_arrow" id="0x7F0A0ADA" />
-    <public type="id" name="premium_guild_subscription_activated_body1" id="0x7F0A0ADB" />
-    <public type="id" name="premium_guild_subscription_activated_body2" id="0x7F0A0ADC" />
-    <public type="id" name="premium_guild_subscription_activated_lottie" id="0x7F0A0ADD" />
-    <public type="id" name="premium_guild_subscription_activated_ok" id="0x7F0A0ADE" />
-    <public type="id" name="premium_guild_subscription_cancel_body" id="0x7F0A0ADF" />
-    <public type="id" name="premium_guild_subscription_cancel_confirm" id="0x7F0A0AE0" />
-    <public type="id" name="premium_guild_subscription_cancel_error" id="0x7F0A0AE1" />
-    <public type="id" name="premium_guild_subscription_cancel_flipper" id="0x7F0A0AE2" />
-    <public type="id" name="premium_guild_subscription_cancel_header" id="0x7F0A0AE3" />
-    <public type="id" name="premium_guild_subscription_cancel_nevermind" id="0x7F0A0AE4" />
-    <public type="id" name="premium_guild_subscription_uncancel_body" id="0x7F0A0AE5" />
-    <public type="id" name="premium_guild_subscription_uncancel_confirm" id="0x7F0A0AE6" />
-    <public type="id" name="premium_guild_subscription_uncancel_error" id="0x7F0A0AE7" />
-    <public type="id" name="premium_guild_subscription_uncancel_flipper" id="0x7F0A0AE8" />
-    <public type="id" name="premium_guild_subscription_uncancel_header" id="0x7F0A0AE9" />
-    <public type="id" name="premium_guild_subscription_uncancel_image" id="0x7F0A0AEA" />
-    <public type="id" name="premium_guild_subscription_uncancel_nevermind" id="0x7F0A0AEB" />
-    <public type="id" name="premium_guild_transfer_confirmation_blurb" id="0x7F0A0AEC" />
-    <public type="id" name="premium_guild_transfer_error" id="0x7F0A0AED" />
-    <public type="id" name="premium_guild_transfer_previous_guild" id="0x7F0A0AEE" />
-    <public type="id" name="premium_guild_transfer_previous_guild_header" id="0x7F0A0AEF" />
-    <public type="id" name="premium_guild_transfer_select" id="0x7F0A0AF0" />
-    <public type="id" name="premium_guild_transfer_target_guild" id="0x7F0A0AF1" />
-    <public type="id" name="premium_guild_transfer_target_guild_header" id="0x7F0A0AF2" />
-    <public type="id" name="premium_guild_upsell_close" id="0x7F0A0AF3" />
-    <public type="id" name="premium_guild_upsell_close_button" id="0x7F0A0AF4" />
-    <public type="id" name="premium_guild_upsell_subscribe_button" id="0x7F0A0AF5" />
-    <public type="id" name="premium_perks" id="0x7F0A0AF6" />
-    <public type="id" name="premium_settings_active_guild_subscription" id="0x7F0A0AF7" />
-    <public type="id" name="premium_settings_active_subscription" id="0x7F0A0AF8" />
-    <public type="id" name="premium_settings_billing_divider" id="0x7F0A0AF9" />
-    <public type="id" name="premium_settings_billing_information" id="0x7F0A0AFA" />
-    <public type="id" name="premium_settings_credit_container" id="0x7F0A0AFB" />
-    <public type="id" name="premium_settings_credit_header" id="0x7F0A0AFC" />
-    <public type="id" name="premium_settings_google_play_manage" id="0x7F0A0AFD" />
-    <public type="id" name="premium_settings_grandfathered" id="0x7F0A0AFE" />
-    <public type="id" name="premium_settings_legalese" id="0x7F0A0AFF" />
-    <public type="id" name="premium_settings_nitro" id="0x7F0A0B00" />
-    <public type="id" name="premium_settings_nitro_wumpus" id="0x7F0A0B01" />
-    <public type="id" name="premium_settings_payment_container" id="0x7F0A0B02" />
-    <public type="id" name="premium_settings_payment_header" id="0x7F0A0B03" />
-    <public type="id" name="premium_settings_premium" id="0x7F0A0B04" />
-    <public type="id" name="premium_settings_premium_classic" id="0x7F0A0B05" />
-    <public type="id" name="premium_settings_retry" id="0x7F0A0B06" />
-    <public type="id" name="premium_settings_scrollview" id="0x7F0A0B07" />
-    <public type="id" name="premium_settings_status_notice_button" id="0x7F0A0B08" />
-    <public type="id" name="premium_settings_status_notice_container" id="0x7F0A0B09" />
-    <public type="id" name="premium_settings_status_notice_tv" id="0x7F0A0B0A" />
-    <public type="id" name="premium_settings_subscription_container" id="0x7F0A0B0B" />
-    <public type="id" name="premium_settings_subscriptions_header" id="0x7F0A0B0C" />
-    <public type="id" name="premium_settings_view_flipper" id="0x7F0A0B0D" />
-    <public type="id" name="premium_tier_1" id="0x7F0A0B0E" />
-    <public type="id" name="premium_tier_1_gift_learn_more" id="0x7F0A0B0F" />
-    <public type="id" name="premium_tier_2" id="0x7F0A0B10" />
-    <public type="id" name="premium_tier_2_gift_learn_more" id="0x7F0A0B11" />
-    <public type="id" name="premium_upsell_body" id="0x7F0A0B12" />
-    <public type="id" name="premium_upsell_button" id="0x7F0A0B13" />
-    <public type="id" name="premium_upsell_button_container" id="0x7F0A0B14" />
-    <public type="id" name="premium_upsell_close" id="0x7F0A0B15" />
-    <public type="id" name="premium_upsell_description" id="0x7F0A0B16" />
-    <public type="id" name="premium_upsell_divider" id="0x7F0A0B17" />
-    <public type="id" name="premium_upsell_dots" id="0x7F0A0B18" />
-    <public type="id" name="premium_upsell_get_premium" id="0x7F0A0B19" />
-    <public type="id" name="premium_upsell_header" id="0x7F0A0B1A" />
-    <public type="id" name="premium_upsell_img" id="0x7F0A0B1B" />
-    <public type="id" name="premium_upsell_learn_more" id="0x7F0A0B1C" />
-    <public type="id" name="premium_upsell_perk_boosts" id="0x7F0A0B1D" />
-    <public type="id" name="premium_upsell_server_perk" id="0x7F0A0B1E" />
-    <public type="id" name="premium_upsell_viewpager" id="0x7F0A0B1F" />
-    <public type="id" name="premium_upsell_yearly_description" id="0x7F0A0B20" />
-    <public type="id" name="premium_upsell_yearly_title" id="0x7F0A0B21" />
-    <public type="id" name="preset" id="0x7F0A0B22" />
-    <public type="id" name="price_tier_picker_app_bar" id="0x7F0A0B23" />
-    <public type="id" name="price_tier_picker_app_flipper" id="0x7F0A0B24" />
-    <public type="id" name="price_tier_picker_recycler" id="0x7F0A0B25" />
-    <public type="id" name="price_tier_picker_toolbar" id="0x7F0A0B26" />
-    <public type="id" name="privacy" id="0x7F0A0B27" />
-    <public type="id" name="private_call" id="0x7F0A0B28" />
-    <public type="id" name="private_call_blurred_grid_view" id="0x7F0A0B29" />
-    <public type="id" name="private_call_connectivity_status_bar" id="0x7F0A0B2A" />
-    <public type="id" name="private_call_container" id="0x7F0A0B2B" />
-    <public type="id" name="private_call_container_content" id="0x7F0A0B2C" />
-    <public type="id" name="private_call_grid_view" id="0x7F0A0B2D" />
-    <public type="id" name="private_call_status_duration" id="0x7F0A0B2E" />
-    <public type="id" name="private_call_status_primary" id="0x7F0A0B2F" />
-    <public type="id" name="private_call_status_secondary" id="0x7F0A0B30" />
-    <public type="id" name="private_channel_sidebar_actions_call" id="0x7F0A0B31" />
-    <public type="id" name="private_channel_sidebar_actions_notifications" id="0x7F0A0B32" />
-    <public type="id" name="private_channel_sidebar_actions_search" id="0x7F0A0B33" />
-    <public type="id" name="private_channel_sidebar_actions_video" id="0x7F0A0B34" />
-    <public type="id" name="private_channel_start_image" id="0x7F0A0B35" />
-    <public type="id" name="private_channel_start_text" id="0x7F0A0B36" />
-    <public type="id" name="private_thread_toggle" id="0x7F0A0B37" />
-    <public type="id" name="private_thread_toggle_badge" id="0x7F0A0B38" />
-    <public type="id" name="private_thread_toggle_switch" id="0x7F0A0B39" />
-    <public type="id" name="private_thread_toggle_text" id="0x7F0A0B3A" />
-    <public type="id" name="profile" id="0x7F0A0B3B" />
-    <public type="id" name="profile_container" id="0x7F0A0B3C" />
-    <public type="id" name="profile_marketing_image" id="0x7F0A0B3D" />
-    <public type="id" name="profile_marketing_skip_button" id="0x7F0A0B3E" />
-    <public type="id" name="profile_marketing_update_profile_button" id="0x7F0A0B3F" />
-    <public type="id" name="progress" id="0x7F0A0B40" />
-    <public type="id" name="progress_bar" id="0x7F0A0B41" />
-    <public type="id" name="progress_cancel_centered" id="0x7F0A0B42" />
-    <public type="id" name="progress_cancel_top" id="0x7F0A0B43" />
-    <public type="id" name="progress_circular" id="0x7F0A0B44" />
-    <public type="id" name="progress_file_image" id="0x7F0A0B45" />
-    <public type="id" name="progress_gem_icon" id="0x7F0A0B46" />
-    <public type="id" name="progress_horizontal" id="0x7F0A0B47" />
-    <public type="id" name="progress_level_text" id="0x7F0A0B48" />
-    <public type="id" name="progress_progress" id="0x7F0A0B49" />
-    <public type="id" name="progress_subtext" id="0x7F0A0B4A" />
-    <public type="id" name="progress_text" id="0x7F0A0B4B" />
-    <public type="id" name="promoTermsClose" id="0x7F0A0B4C" />
-    <public type="id" name="promoTermsContent" id="0x7F0A0B4D" />
-    <public type="id" name="prune_user_cancel" id="0x7F0A0B4E" />
-    <public type="id" name="prune_user_header" id="0x7F0A0B4F" />
-    <public type="id" name="prune_user_prune" id="0x7F0A0B50" />
-    <public type="id" name="prune_users_estimate_text" id="0x7F0A0B51" />
-    <public type="id" name="prune_users_history_1_radio" id="0x7F0A0B52" />
-    <public type="id" name="prune_users_history_2_radio" id="0x7F0A0B53" />
-    <public type="id" name="prune_users_loading_progressbar" id="0x7F0A0B54" />
-    <public type="id" name="public_dot" id="0x7F0A0B55" />
-    <public type="id" name="public_icon" id="0x7F0A0B56" />
-    <public type="id" name="public_text" id="0x7F0A0B57" />
-    <public type="id" name="purchase_premium_monthly" id="0x7F0A0B58" />
-    <public type="id" name="purchase_premium_yearly" id="0x7F0A0B59" />
-    <public type="id" name="push_to_talk_button" id="0x7F0A0B5A" />
-    <public type="id" name="qr_scanner" id="0x7F0A0B5B" />
-    <public type="id" name="qr_scanner_chip" id="0x7F0A0B5C" />
-    <public type="id" name="radio" id="0x7F0A0B5D" />
-    <public type="id" name="raise_hand_badge" id="0x7F0A0B5E" />
-    <public type="id" name="raise_hand_button" id="0x7F0A0B5F" />
-    <public type="id" name="raised_hands_count_label" id="0x7F0A0B60" />
-    <public type="id" name="raised_hands_empty_group" id="0x7F0A0B61" />
-    <public type="id" name="raised_hands_empty_sparkle" id="0x7F0A0B62" />
-    <public type="id" name="raised_hands_empty_subtitle" id="0x7F0A0B63" />
-    <public type="id" name="raised_hands_empty_title" id="0x7F0A0B64" />
-    <public type="id" name="ratio" id="0x7F0A0B65" />
-    <public type="id" name="reaction_quick_add" id="0x7F0A0B66" />
-    <public type="id" name="rectangles" id="0x7F0A0B67" />
-    <public type="id" name="recycler" id="0x7F0A0B68" />
-    <public type="id" name="recycler_view" id="0x7F0A0B69" />
-    <public type="id" name="region_help" id="0x7F0A0B6A" />
-    <public type="id" name="region_override_divider" id="0x7F0A0B6B" />
-    <public type="id" name="regular" id="0x7F0A0B6C" />
-    <public type="id" name="remote_auth_cancel_button" id="0x7F0A0B6D" />
-    <public type="id" name="remote_auth_finish_button" id="0x7F0A0B6E" />
-    <public type="id" name="remote_auth_login_button" id="0x7F0A0B6F" />
-    <public type="id" name="remote_auth_not_found_cancel_button" id="0x7F0A0B70" />
-    <public type="id" name="remote_auth_temporary_switch" id="0x7F0A0B71" />
-    <public type="id" name="remote_auth_view_flipper" id="0x7F0A0B72" />
-    <public type="id" name="remove" id="0x7F0A0B73" />
-    <public type="id" name="remove_phone" id="0x7F0A0B74" />
-    <public type="id" name="report_button" id="0x7F0A0B75" />
-    <public type="id" name="report_header" id="0x7F0A0B76" />
-    <public type="id" name="report_message_end_guideline" id="0x7F0A0B77" />
-    <public type="id" name="report_message_start_guideline" id="0x7F0A0B78" />
-    <public type="id" name="report_message_top_guideline" id="0x7F0A0B79" />
-    <public type="id" name="report_node_bottom_button" id="0x7F0A0B7A" />
-    <public type="id" name="report_node_bottom_button_cancel" id="0x7F0A0B7B" />
-    <public type="id" name="report_node_bottom_button_description" id="0x7F0A0B7C" />
-    <public type="id" name="report_node_bottom_button_error_text" id="0x7F0A0B7D" />
-    <public type="id" name="report_reason_descriptipn" id="0x7F0A0B7E" />
-    <public type="id" name="report_reason_header" id="0x7F0A0B7F" />
-    <public type="id" name="report_reason_radio" id="0x7F0A0B80" />
-    <public type="id" name="report_reasons_container" id="0x7F0A0B81" />
-    <public type="id" name="report_reasons_header" id="0x7F0A0B82" />
-    <public type="id" name="report_reasons_loading" id="0x7F0A0B83" />
-    <public type="id" name="report_tooltip" id="0x7F0A0B84" />
-    <public type="id" name="reports_breadcrumbs_item_dot" id="0x7F0A0B85" />
-    <public type="id" name="reports_breadcrumbs_item_title" id="0x7F0A0B86" />
-    <public type="id" name="request_data_link" id="0x7F0A0B87" />
-    <public type="id" name="restart" id="0x7F0A0B88" />
-    <public type="id" name="result_count" id="0x7F0A0B89" />
-    <public type="id" name="results_rv" id="0x7F0A0B8A" />
-    <public type="id" name="reverse" id="0x7F0A0B8B" />
-    <public type="id" name="reverseSawtooth" id="0x7F0A0B8C" />
-    <public type="id" name="rfc822" id="0x7F0A0B8D" />
-    <public type="id" name="rich_presence_container" id="0x7F0A0B8E" />
-    <public type="id" name="rich_presence_container_data" id="0x7F0A0B8F" />
-    <public type="id" name="rich_presence_details" id="0x7F0A0B90" />
-    <public type="id" name="rich_presence_header" id="0x7F0A0B91" />
-    <public type="id" name="rich_presence_image_large" id="0x7F0A0B92" />
-    <public type="id" name="rich_presence_image_large_text" id="0x7F0A0B93" />
-    <public type="id" name="rich_presence_image_large_wrap" id="0x7F0A0B94" />
-    <public type="id" name="rich_presence_image_small" id="0x7F0A0B95" />
-    <public type="id" name="rich_presence_music_duration" id="0x7F0A0B96" />
-    <public type="id" name="rich_presence_music_elapsed" id="0x7F0A0B97" />
-    <public type="id" name="rich_presence_music_progress_container" id="0x7F0A0B98" />
-    <public type="id" name="rich_presence_primary_button" id="0x7F0A0B99" />
-    <public type="id" name="rich_presence_secondary_button" id="0x7F0A0B9A" />
-    <public type="id" name="rich_presence_seekbar" id="0x7F0A0B9B" />
-    <public type="id" name="rich_presence_state" id="0x7F0A0B9C" />
-    <public type="id" name="rich_presence_time" id="0x7F0A0B9D" />
-    <public type="id" name="rich_presence_title" id="0x7F0A0B9E" />
-    <public type="id" name="right" id="0x7F0A0B9F" />
-    <public type="id" name="rightToLeft" id="0x7F0A0BA0" />
-    <public type="id" name="right_icon" id="0x7F0A0BA1" />
-    <public type="id" name="right_side" id="0x7F0A0BA2" />
-    <public type="id" name="role_chip_dot" id="0x7F0A0BA3" />
-    <public type="id" name="role_chip_icon" id="0x7F0A0BA4" />
-    <public type="id" name="role_chip_text" id="0x7F0A0BA5" />
-    <public type="id" name="role_icon_iv" id="0x7F0A0BA6" />
-    <public type="id" name="role_item_checked_setting" id="0x7F0A0BA7" />
-    <public type="id" name="role_members_app_view_flipper" id="0x7F0A0BA8" />
-    <public type="id" name="role_settings_add_reactions" id="0x7F0A0BA9" />
-    <public type="id" name="role_settings_administrator" id="0x7F0A0BAA" />
-    <public type="id" name="role_settings_attach_files" id="0x7F0A0BAB" />
-    <public type="id" name="role_settings_ban_members" id="0x7F0A0BAC" />
-    <public type="id" name="role_settings_change_nickname" id="0x7F0A0BAD" />
-    <public type="id" name="role_settings_color_disabled_overlay" id="0x7F0A0BAE" />
-    <public type="id" name="role_settings_color_selector_container" id="0x7F0A0BAF" />
-    <public type="id" name="role_settings_create_instant_invite" id="0x7F0A0BB0" />
-    <public type="id" name="role_settings_create_private_threads" id="0x7F0A0BB1" />
-    <public type="id" name="role_settings_create_public_threads" id="0x7F0A0BB2" />
-    <public type="id" name="role_settings_current_color_display" id="0x7F0A0BB3" />
-    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7F0A0BB4" />
-    <public type="id" name="role_settings_embed_links" id="0x7F0A0BB5" />
-    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7F0A0BB6" />
-    <public type="id" name="role_settings_icon_container" id="0x7F0A0BB7" />
-    <public type="id" name="role_settings_kick_members" id="0x7F0A0BB8" />
-    <public type="id" name="role_settings_manage_channels" id="0x7F0A0BB9" />
-    <public type="id" name="role_settings_manage_emojis_and_stickers" id="0x7F0A0BBA" />
-    <public type="id" name="role_settings_manage_events" id="0x7F0A0BBB" />
-    <public type="id" name="role_settings_manage_messages" id="0x7F0A0BBC" />
-    <public type="id" name="role_settings_manage_nicknames" id="0x7F0A0BBD" />
-    <public type="id" name="role_settings_manage_roles" id="0x7F0A0BBE" />
-    <public type="id" name="role_settings_manage_server" id="0x7F0A0BBF" />
-    <public type="id" name="role_settings_manage_threads" id="0x7F0A0BC0" />
-    <public type="id" name="role_settings_manage_webhooks" id="0x7F0A0BC1" />
-    <public type="id" name="role_settings_mention_everyone" id="0x7F0A0BC2" />
-    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7F0A0BC3" />
-    <public type="id" name="role_settings_overview_scroll" id="0x7F0A0BC4" />
-    <public type="id" name="role_settings_priority_speaker" id="0x7F0A0BC5" />
-    <public type="id" name="role_settings_read_message_history" id="0x7F0A0BC6" />
-    <public type="id" name="role_settings_read_messages" id="0x7F0A0BC7" />
-    <public type="id" name="role_settings_request_to_speak" id="0x7F0A0BC8" />
-    <public type="id" name="role_settings_role_icon" id="0x7F0A0BC9" />
-    <public type="id" name="role_settings_role_icon_divider" id="0x7F0A0BCA" />
-    <public type="id" name="role_settings_role_icon_header" id="0x7F0A0BCB" />
-    <public type="id" name="role_settings_send_messages" id="0x7F0A0BCC" />
-    <public type="id" name="role_settings_send_messages_in_threads" id="0x7F0A0BCD" />
-    <public type="id" name="role_settings_send_tts_messages" id="0x7F0A0BCE" />
-    <public type="id" name="role_settings_use_application_commands" id="0x7F0A0BCF" />
-    <public type="id" name="role_settings_use_external_emojis" id="0x7F0A0BD0" />
-    <public type="id" name="role_settings_use_external_stickers" id="0x7F0A0BD1" />
-    <public type="id" name="role_settings_view_audit_log" id="0x7F0A0BD2" />
-    <public type="id" name="role_settings_view_guild_analytics" id="0x7F0A0BD3" />
-    <public type="id" name="role_settings_voice_connect" id="0x7F0A0BD4" />
-    <public type="id" name="role_settings_voice_deafen_members" id="0x7F0A0BD5" />
-    <public type="id" name="role_settings_voice_move_members" id="0x7F0A0BD6" />
-    <public type="id" name="role_settings_voice_mute_members" id="0x7F0A0BD7" />
-    <public type="id" name="role_settings_voice_speak" id="0x7F0A0BD8" />
-    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7F0A0BD9" />
-    <public type="id" name="role_settings_voice_video" id="0x7F0A0BDA" />
-    <public type="id" name="role_spinner_item_textview" id="0x7F0A0BDB" />
-    <public type="id" name="roles_container" id="0x7F0A0BDC" />
-    <public type="id" name="roles_list_add_role_fab" id="0x7F0A0BDD" />
-    <public type="id" name="roles_permission_owners_list" id="0x7F0A0BDE" />
-    <public type="id" name="roles_recycler" id="0x7F0A0BDF" />
-    <public type="id" name="root" id="0x7F0A0BE0" />
-    <public type="id" name="rotate_scroll_wheel" id="0x7F0A0BE1" />
-    <public type="id" name="rounded" id="0x7F0A0BE2" />
-    <public type="id" name="row" id="0x7F0A0BE3" />
-    <public type="id" name="row_index_key" id="0x7F0A0BE4" />
-    <public type="id" name="row_reverse" id="0x7F0A0BE5" />
-    <public type="id" name="save" id="0x7F0A0BE6" />
-    <public type="id" name="save_fab" id="0x7F0A0BE7" />
-    <public type="id" name="save_non_transition_alpha" id="0x7F0A0BE8" />
-    <public type="id" name="save_overlay_view" id="0x7F0A0BE9" />
-    <public type="id" name="sawtooth" id="0x7F0A0BEA" />
-    <public type="id" name="scale" id="0x7F0A0BEB" />
-    <public type="id" name="scale_scroll_wheel" id="0x7F0A0BEC" />
-    <public type="id" name="screen" id="0x7F0A0BED" />
-    <public type="id" name="screen_share_button" id="0x7F0A0BEE" />
-    <public type="id" name="screen_share_nfx_cancel_button" id="0x7F0A0BEF" />
-    <public type="id" name="screen_share_nfx_cta" id="0x7F0A0BF0" />
-    <public type="id" name="screen_share_secondary_button" id="0x7F0A0BF1" />
-    <public type="id" name="screen_title" id="0x7F0A0BF2" />
-    <public type="id" name="screen_title_subtitle" id="0x7F0A0BF3" />
-    <public type="id" name="screen_title_title" id="0x7F0A0BF4" />
-    <public type="id" name="scroll" id="0x7F0A0BF5" />
-    <public type="id" name="scrollIndicatorDown" id="0x7F0A0BF6" />
-    <public type="id" name="scrollIndicatorUp" id="0x7F0A0BF7" />
-    <public type="id" name="scrollView" id="0x7F0A0BF8" />
-    <public type="id" name="scroll_view" id="0x7F0A0BF9" />
-    <public type="id" name="scrollable" id="0x7F0A0BFA" />
-    <public type="id" name="search" id="0x7F0A0BFB" />
-    <public type="id" name="search_badge" id="0x7F0A0BFC" />
-    <public type="id" name="search_bar" id="0x7F0A0BFD" />
-    <public type="id" name="search_bar_text" id="0x7F0A0BFE" />
-    <public type="id" name="search_barrier" id="0x7F0A0BFF" />
-    <public type="id" name="search_button" id="0x7F0A0C00" />
-    <public type="id" name="search_clear" id="0x7F0A0C01" />
-    <public type="id" name="search_close_btn" id="0x7F0A0C02" />
-    <public type="id" name="search_edit_frame" id="0x7F0A0C03" />
-    <public type="id" name="search_flipper" id="0x7F0A0C04" />
-    <public type="id" name="search_go_btn" id="0x7F0A0C05" />
-    <public type="id" name="search_icon" id="0x7F0A0C06" />
-    <public type="id" name="search_input" id="0x7F0A0C07" />
-    <public type="id" name="search_input_edit_text" id="0x7F0A0C08" />
-    <public type="id" name="search_mag_icon" id="0x7F0A0C09" />
-    <public type="id" name="search_plate" id="0x7F0A0C0A" />
-    <public type="id" name="search_results_list" id="0x7F0A0C0B" />
-    <public type="id" name="search_send_query_fab" id="0x7F0A0C0C" />
-    <public type="id" name="search_src_text" id="0x7F0A0C0D" />
-    <public type="id" name="search_suggestion_item_channel_container" id="0x7F0A0C0E" />
-    <public type="id" name="search_suggestion_item_has_container" id="0x7F0A0C0F" />
-    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7F0A0C10" />
-    <public type="id" name="search_suggestion_item_user_container" id="0x7F0A0C11" />
-    <public type="id" name="search_suggestions_item_channel_icon" id="0x7F0A0C12" />
-    <public type="id" name="search_suggestions_item_channel_text" id="0x7F0A0C13" />
-    <public type="id" name="search_suggestions_item_has_icon" id="0x7F0A0C14" />
-    <public type="id" name="search_suggestions_item_has_text" id="0x7F0A0C15" />
-    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7F0A0C16" />
-    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7F0A0C17" />
-    <public type="id" name="search_suggestions_recycler" id="0x7F0A0C18" />
-    <public type="id" name="search_voice_btn" id="0x7F0A0C19" />
-    <public type="id" name="secondary_actions_card" id="0x7F0A0C1A" />
-    <public type="id" name="section_general_permissions" id="0x7F0A0C1B" />
-    <public type="id" name="seekbar" id="0x7F0A0C1C" />
-    <public type="id" name="seekbar_value" id="0x7F0A0C1D" />
-    <public type="id" name="segmented_control" id="0x7F0A0C1E" />
-    <public type="id" name="segmented_control_guilds_added" id="0x7F0A0C1F" />
-    <public type="id" name="segmented_control_guilds_not_added" id="0x7F0A0C20" />
-    <public type="id" name="select_component_chevron" id="0x7F0A0C21" />
-    <public type="id" name="select_component_loading" id="0x7F0A0C22" />
-    <public type="id" name="select_component_selection_icon" id="0x7F0A0C23" />
-    <public type="id" name="select_component_selection_text" id="0x7F0A0C24" />
-    <public type="id" name="select_component_selections_root" id="0x7F0A0C25" />
-    <public type="id" name="select_component_sheet_item_description" id="0x7F0A0C26" />
-    <public type="id" name="select_component_sheet_item_divider" id="0x7F0A0C27" />
-    <public type="id" name="select_component_sheet_item_divider_icon" id="0x7F0A0C28" />
-    <public type="id" name="select_component_sheet_item_icon" id="0x7F0A0C29" />
-    <public type="id" name="select_component_sheet_item_selected" id="0x7F0A0C2A" />
-    <public type="id" name="select_component_sheet_item_title" id="0x7F0A0C2B" />
-    <public type="id" name="select_dialog_listview" id="0x7F0A0C2C" />
-    <public type="id" name="select_subscription_header_text" id="0x7F0A0C2D" />
-    <public type="id" name="selected" id="0x7F0A0C2E" />
-    <public type="id" name="selection_indicator" id="0x7F0A0C2F" />
-    <public type="id" name="selection_type" id="0x7F0A0C30" />
-    <public type="id" name="send_btn_container" id="0x7F0A0C31" />
-    <public type="id" name="send_btn_image" id="0x7F0A0C32" />
-    <public type="id" name="send_sticker_greet_button" id="0x7F0A0C33" />
-    <public type="id" name="server_discovery_header_description" id="0x7F0A0C34" />
-    <public type="id" name="server_discovery_header_image" id="0x7F0A0C35" />
-    <public type="id" name="server_discovery_header_search_layout" id="0x7F0A0C36" />
-    <public type="id" name="server_discovery_header_title" id="0x7F0A0C37" />
-    <public type="id" name="server_discovery_item_barrier" id="0x7F0A0C38" />
-    <public type="id" name="server_discovery_item_button" id="0x7F0A0C39" />
-    <public type="id" name="server_discovery_item_button_joined" id="0x7F0A0C3A" />
-    <public type="id" name="server_discovery_item_count_container" id="0x7F0A0C3B" />
-    <public type="id" name="server_discovery_item_description" id="0x7F0A0C3C" />
-    <public type="id" name="server_discovery_item_image" id="0x7F0A0C3D" />
-    <public type="id" name="server_discovery_item_overflow" id="0x7F0A0C3E" />
-    <public type="id" name="server_discovery_item_title" id="0x7F0A0C3F" />
-    <public type="id" name="server_notifications_everyone_switch" id="0x7F0A0C40" />
-    <public type="id" name="server_notifications_frequency_0_radio" id="0x7F0A0C41" />
-    <public type="id" name="server_notifications_frequency_1_radio" id="0x7F0A0C42" />
-    <public type="id" name="server_notifications_frequency_2_radio" id="0x7F0A0C43" />
-    <public type="id" name="server_notifications_frequency_divider" id="0x7F0A0C44" />
-    <public type="id" name="server_notifications_frequency_wrap" id="0x7F0A0C45" />
-    <public type="id" name="server_notifications_mute_settings_view" id="0x7F0A0C46" />
-    <public type="id" name="server_notifications_push_switch" id="0x7F0A0C47" />
-    <public type="id" name="server_notifications_roles_switch" id="0x7F0A0C48" />
-    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7F0A0C49" />
-    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7F0A0C4A" />
-    <public type="id" name="server_settings_audit_logs_recycler" id="0x7F0A0C4B" />
-    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7F0A0C4C" />
-    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7F0A0C4D" />
-    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7F0A0C4E" />
-    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7F0A0C4F" />
-    <public type="id" name="server_settings_bans_option" id="0x7F0A0C50" />
-    <public type="id" name="server_settings_bans_recycler" id="0x7F0A0C51" />
-    <public type="id" name="server_settings_bans_search" id="0x7F0A0C52" />
-    <public type="id" name="server_settings_bans_view_flipper" id="0x7F0A0C53" />
-    <public type="id" name="server_settings_channels_create_channel" id="0x7F0A0C54" />
-    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7F0A0C55" />
-    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7F0A0C56" />
-    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7F0A0C57" />
-    <public type="id" name="server_settings_channels_text_recycler" id="0x7F0A0C58" />
-    <public type="id" name="server_settings_community_locale" id="0x7F0A0C59" />
-    <public type="id" name="server_settings_community_overview_option" id="0x7F0A0C5A" />
-    <public type="id" name="server_settings_community_overview_scroll" id="0x7F0A0C5B" />
-    <public type="id" name="server_settings_community_setting_selector_description" id="0x7F0A0C5C" />
-    <public type="id" name="server_settings_community_setting_selector_dropdown_icon" id="0x7F0A0C5D" />
-    <public type="id" name="server_settings_community_setting_selector_subtitle" id="0x7F0A0C5E" />
-    <public type="id" name="server_settings_community_setting_selector_title" id="0x7F0A0C5F" />
-    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7F0A0C60" />
-    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7F0A0C61" />
-    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7F0A0C62" />
-    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7F0A0C63" />
-    <public type="id" name="server_settings_delete_server_cancel" id="0x7F0A0C64" />
-    <public type="id" name="server_settings_delete_server_confirm" id="0x7F0A0C65" />
-    <public type="id" name="server_settings_delete_server_header" id="0x7F0A0C66" />
-    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7F0A0C67" />
-    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7F0A0C68" />
-    <public type="id" name="server_settings_delete_server_text" id="0x7F0A0C69" />
-    <public type="id" name="server_settings_disable_community_button" id="0x7F0A0C6A" />
-    <public type="id" name="server_settings_disable_community_message" id="0x7F0A0C6B" />
-    <public type="id" name="server_settings_emojis_avatar" id="0x7F0A0C6C" />
-    <public type="id" name="server_settings_emojis_container" id="0x7F0A0C6D" />
-    <public type="id" name="server_settings_emojis_edit_alias" id="0x7F0A0C6E" />
-    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7F0A0C6F" />
-    <public type="id" name="server_settings_emojis_name" id="0x7F0A0C70" />
-    <public type="id" name="server_settings_emojis_nickname" id="0x7F0A0C71" />
-    <public type="id" name="server_settings_emojis_option" id="0x7F0A0C72" />
-    <public type="id" name="server_settings_emojis_overflow" id="0x7F0A0C73" />
-    <public type="id" name="server_settings_emojis_username" id="0x7F0A0C74" />
-    <public type="id" name="server_settings_emojis_username_avatar" id="0x7F0A0C75" />
-    <public type="id" name="server_settings_enable_community_option" id="0x7F0A0C76" />
-    <public type="id" name="server_settings_guild_role_subscription_basic_info" id="0x7F0A0C77" />
-    <public type="id" name="server_settings_guild_role_subscription_edit_tier_app_bar" id="0x7F0A0C78" />
-    <public type="id" name="server_settings_guild_role_subscription_edit_tier_save" id="0x7F0A0C79" />
-    <public type="id" name="server_settings_guild_role_subscription_edit_tier_view_flipper" id="0x7F0A0C7A" />
-    <public type="id" name="server_settings_guild_role_subscription_get_started" id="0x7F0A0C7B" />
-    <public type="id" name="server_settings_guild_role_subscription_save" id="0x7F0A0C7C" />
-    <public type="id" name="server_settings_guild_role_subscription_tier_list" id="0x7F0A0C7D" />
-    <public type="id" name="server_settings_guild_role_subscription_tier_list_view_flipper" id="0x7F0A0C7E" />
-    <public type="id" name="server_settings_guild_role_subscription_tiers" id="0x7F0A0C7F" />
-    <public type="id" name="server_settings_guild_role_subscription_view_flipper" id="0x7F0A0C80" />
-    <public type="id" name="server_settings_help_item" id="0x7F0A0C81" />
-    <public type="id" name="server_settings_instant_invites_option" id="0x7F0A0C82" />
-    <public type="id" name="server_settings_instant_invites_recycler" id="0x7F0A0C83" />
-    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7F0A0C84" />
-    <public type="id" name="server_settings_members_header_container" id="0x7F0A0C85" />
-    <public type="id" name="server_settings_members_name_search" id="0x7F0A0C86" />
-    <public type="id" name="server_settings_members_option" id="0x7F0A0C87" />
-    <public type="id" name="server_settings_members_recycler" id="0x7F0A0C88" />
-    <public type="id" name="server_settings_members_roles_spinner" id="0x7F0A0C89" />
-    <public type="id" name="server_settings_members_view_flipper" id="0x7F0A0C8A" />
-    <public type="id" name="server_settings_moderation_explicit_1" id="0x7F0A0C8B" />
-    <public type="id" name="server_settings_moderation_explicit_2" id="0x7F0A0C8C" />
-    <public type="id" name="server_settings_moderation_explicit_3" id="0x7F0A0C8D" />
-    <public type="id" name="server_settings_moderation_explicit_help" id="0x7F0A0C8E" />
-    <public type="id" name="server_settings_moderation_verification_1" id="0x7F0A0C8F" />
-    <public type="id" name="server_settings_moderation_verification_2" id="0x7F0A0C90" />
-    <public type="id" name="server_settings_moderation_verification_3" id="0x7F0A0C91" />
-    <public type="id" name="server_settings_moderation_verification_4" id="0x7F0A0C92" />
-    <public type="id" name="server_settings_moderation_verification_5" id="0x7F0A0C93" />
-    <public type="id" name="server_settings_moderation_verification_help" id="0x7F0A0C94" />
-    <public type="id" name="server_settings_option_audit_log" id="0x7F0A0C95" />
-    <public type="id" name="server_settings_option_channels" id="0x7F0A0C96" />
-    <public type="id" name="server_settings_option_integrations" id="0x7F0A0C97" />
-    <public type="id" name="server_settings_option_moderation" id="0x7F0A0C98" />
-    <public type="id" name="server_settings_option_overview" id="0x7F0A0C99" />
-    <public type="id" name="server_settings_option_security" id="0x7F0A0C9A" />
-    <public type="id" name="server_settings_option_vanity_url" id="0x7F0A0C9B" />
-    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7F0A0C9C" />
-    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7F0A0C9D" />
-    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7F0A0C9E" />
-    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7F0A0C9F" />
-    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7F0A0CA0" />
-    <public type="id" name="server_settings_overview_icon" id="0x7F0A0CA1" />
-    <public type="id" name="server_settings_overview_icon_name_container" id="0x7F0A0CA2" />
-    <public type="id" name="server_settings_overview_icon_remove" id="0x7F0A0CA3" />
-    <public type="id" name="server_settings_overview_icon_text" id="0x7F0A0CA4" />
-    <public type="id" name="server_settings_overview_notification_all" id="0x7F0A0CA5" />
-    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7F0A0CA6" />
-    <public type="id" name="server_settings_overview_scroll" id="0x7F0A0CA7" />
-    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7F0A0CA8" />
-    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7F0A0CA9" />
-    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7F0A0CAA" />
-    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7F0A0CAB" />
-    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7F0A0CAC" />
-    <public type="id" name="server_settings_public_setting_selector" id="0x7F0A0CAD" />
-    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7F0A0CAE" />
-    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7F0A0CAF" />
-    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7F0A0CB0" />
-    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7F0A0CB1" />
-    <public type="id" name="server_settings_role_item_name" id="0x7F0A0CB2" />
-    <public type="id" name="server_settings_role_item_role_icon" id="0x7F0A0CB3" />
-    <public type="id" name="server_settings_role_members_list" id="0x7F0A0CB4" />
-    <public type="id" name="server_settings_role_members_search_input" id="0x7F0A0CB5" />
-    <public type="id" name="server_settings_roles_option" id="0x7F0A0CB6" />
-    <public type="id" name="server_settings_roles_recycler" id="0x7F0A0CB7" />
-    <public type="id" name="server_settings_section_community" id="0x7F0A0CB8" />
-    <public type="id" name="server_settings_section_community_divider" id="0x7F0A0CB9" />
-    <public type="id" name="server_settings_section_general_settings" id="0x7F0A0CBA" />
-    <public type="id" name="server_settings_section_server_monetization" id="0x7F0A0CBB" />
-    <public type="id" name="server_settings_section_server_monetization_divider" id="0x7F0A0CBC" />
-    <public type="id" name="server_settings_section_user_management" id="0x7F0A0CBD" />
-    <public type="id" name="server_settings_section_user_management_divider" id="0x7F0A0CBE" />
-    <public type="id" name="server_settings_security_dialog_cancel" id="0x7F0A0CBF" />
-    <public type="id" name="server_settings_security_dialog_confirm" id="0x7F0A0CC0" />
-    <public type="id" name="server_settings_security_label" id="0x7F0A0CC1" />
-    <public type="id" name="server_settings_security_server_mfa_code" id="0x7F0A0CC2" />
-    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7F0A0CC3" />
-    <public type="id" name="server_settings_server_icon" id="0x7F0A0CC4" />
-    <public type="id" name="server_settings_server_icon_text" id="0x7F0A0CC5" />
-    <public type="id" name="server_settings_server_name" id="0x7F0A0CC6" />
-    <public type="id" name="server_settings_vanity_input" id="0x7F0A0CC7" />
-    <public type="id" name="server_settings_vanity_url_current_url" id="0x7F0A0CC8" />
-    <public type="id" name="server_settings_vanity_url_error_text" id="0x7F0A0CC9" />
-    <public type="id" name="server_settings_vanity_url_header" id="0x7F0A0CCA" />
-    <public type="id" name="server_settings_vanity_url_input_container" id="0x7F0A0CCB" />
-    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7F0A0CCC" />
-    <public type="id" name="server_settings_vanity_url_prefix" id="0x7F0A0CCD" />
-    <public type="id" name="server_settings_vanity_url_remove" id="0x7F0A0CCE" />
-    <public type="id" name="server_settings_vanity_url_save" id="0x7F0A0CCF" />
-    <public type="id" name="set_custom_status_emoji" id="0x7F0A0CD0" />
-    <public type="id" name="set_custom_status_emoji_button" id="0x7F0A0CD1" />
-    <public type="id" name="set_custom_status_expiration" id="0x7F0A0CD2" />
-    <public type="id" name="set_custom_status_expiration_1_hour" id="0x7F0A0CD3" />
-    <public type="id" name="set_custom_status_expiration_30_minutes" id="0x7F0A0CD4" />
-    <public type="id" name="set_custom_status_expiration_4_hours" id="0x7F0A0CD5" />
-    <public type="id" name="set_custom_status_expiration_never" id="0x7F0A0CD6" />
-    <public type="id" name="set_custom_status_expiration_tomorrow" id="0x7F0A0CD7" />
-    <public type="id" name="set_custom_status_save" id="0x7F0A0CD8" />
-    <public type="id" name="set_custom_status_text" id="0x7F0A0CD9" />
-    <public type="id" name="set_nickname_text" id="0x7F0A0CDA" />
-    <public type="id" name="set_status_container" id="0x7F0A0CDB" />
-    <public type="id" name="setting_button" id="0x7F0A0CDC" />
-    <public type="id" name="setting_container" id="0x7F0A0CDD" />
-    <public type="id" name="setting_disabled_overlay" id="0x7F0A0CDE" />
-    <public type="id" name="setting_drawable_left" id="0x7F0A0CDF" />
-    <public type="id" name="setting_label" id="0x7F0A0CE0" />
-    <public type="id" name="setting_subtext" id="0x7F0A0CE1" />
-    <public type="id" name="setting_tag" id="0x7F0A0CE2" />
-    <public type="id" name="settings_accessibility_allow_animate_emoji_switch" id="0x7F0A0CE3" />
-    <public type="id" name="settings_accessibility_allow_autoplay_gif_switch" id="0x7F0A0CE4" />
-    <public type="id" name="settings_accessibility_images_header" id="0x7F0A0CE5" />
-    <public type="id" name="settings_accessibility_reduced_motion_description" id="0x7F0A0CE6" />
-    <public type="id" name="settings_accessibility_reduced_motion_header" id="0x7F0A0CE7" />
-    <public type="id" name="settings_accessibility_reduced_motion_switch" id="0x7F0A0CE8" />
-    <public type="id" name="settings_accessibility_stickers_container" id="0x7F0A0CE9" />
-    <public type="id" name="settings_accessibility_stickers_header" id="0x7F0A0CEA" />
-    <public type="id" name="settings_account_2fa_header" id="0x7F0A0CEB" />
-    <public type="id" name="settings_account_change_password" id="0x7F0A0CEC" />
-    <public type="id" name="settings_account_email_container" id="0x7F0A0CED" />
-    <public type="id" name="settings_account_email_label" id="0x7F0A0CEE" />
-    <public type="id" name="settings_account_email_text" id="0x7F0A0CEF" />
-    <public type="id" name="settings_account_information_data_wrap" id="0x7F0A0CF0" />
-    <public type="id" name="settings_account_information_header" id="0x7F0A0CF1" />
-    <public type="id" name="settings_account_management_header" id="0x7F0A0CF2" />
-    <public type="id" name="settings_account_mfa_container" id="0x7F0A0CF3" />
-    <public type="id" name="settings_account_mfa_disabled_container" id="0x7F0A0CF4" />
-    <public type="id" name="settings_account_mfa_enable" id="0x7F0A0CF5" />
-    <public type="id" name="settings_account_mfa_enabled_container" id="0x7F0A0CF6" />
-    <public type="id" name="settings_account_mfa_enabled_header" id="0x7F0A0CF7" />
-    <public type="id" name="settings_account_mfa_flipper" id="0x7F0A0CF8" />
-    <public type="id" name="settings_account_mfa_lottie" id="0x7F0A0CF9" />
-    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7F0A0CFA" />
-    <public type="id" name="settings_account_name_clear" id="0x7F0A0CFB" />
-    <public type="id" name="settings_account_name_container" id="0x7F0A0CFC" />
-    <public type="id" name="settings_account_name_label" id="0x7F0A0CFD" />
-    <public type="id" name="settings_account_name_text" id="0x7F0A0CFE" />
-    <public type="id" name="settings_account_phone_container" id="0x7F0A0CFF" />
-    <public type="id" name="settings_account_phone_label" id="0x7F0A0D00" />
-    <public type="id" name="settings_account_phone_text" id="0x7F0A0D01" />
-    <public type="id" name="settings_account_private_data_delete" id="0x7F0A0D02" />
-    <public type="id" name="settings_account_private_data_disable" id="0x7F0A0D03" />
-    <public type="id" name="settings_account_private_data_wrap" id="0x7F0A0D04" />
-    <public type="id" name="settings_account_remove_two_fa" id="0x7F0A0D05" />
-    <public type="id" name="settings_account_save" id="0x7F0A0D06" />
-    <public type="id" name="settings_account_scroll" id="0x7F0A0D07" />
-    <public type="id" name="settings_account_sms_backup" id="0x7F0A0D08" />
-    <public type="id" name="settings_account_sms_phone" id="0x7F0A0D09" />
-    <public type="id" name="settings_account_tag_container" id="0x7F0A0D0A" />
-    <public type="id" name="settings_account_tag_label" id="0x7F0A0D0B" />
-    <public type="id" name="settings_account_tag_text" id="0x7F0A0D0C" />
-    <public type="id" name="settings_account_verification" id="0x7F0A0D0D" />
-    <public type="id" name="settings_account_verification_button" id="0x7F0A0D0E" />
-    <public type="id" name="settings_account_verification_title" id="0x7F0A0D0F" />
-    <public type="id" name="settings_account_view_backup_codes" id="0x7F0A0D10" />
-    <public type="id" name="settings_appearance_font_scale_header" id="0x7F0A0D11" />
-    <public type="id" name="settings_appearance_font_scale_platform" id="0x7F0A0D12" />
-    <public type="id" name="settings_appearance_font_scaling_container" id="0x7F0A0D13" />
-    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7F0A0D14" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7F0A0D15" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7F0A0D16" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7F0A0D17" />
-    <public type="id" name="settings_appearance_holy_light" id="0x7F0A0D18" />
-    <public type="id" name="settings_appearance_sync_header" id="0x7F0A0D19" />
-    <public type="id" name="settings_appearance_sync_switch" id="0x7F0A0D1A" />
-    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7F0A0D1B" />
-    <public type="id" name="settings_appearance_theme_header" id="0x7F0A0D1C" />
-    <public type="id" name="settings_appearance_theme_light_radio" id="0x7F0A0D1D" />
-    <public type="id" name="settings_appearance_theme_pure_evil_switch" id="0x7F0A0D1E" />
-    <public type="id" name="settings_backup_codes_generate" id="0x7F0A0D1F" />
-    <public type="id" name="settings_backup_codes_info" id="0x7F0A0D20" />
-    <public type="id" name="settings_backup_codes_rv" id="0x7F0A0D21" />
-    <public type="id" name="settings_behavior_browser_switch" id="0x7F0A0D22" />
-    <public type="id" name="settings_behavior_chat_header" id="0x7F0A0D23" />
-    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7F0A0D24" />
-    <public type="id" name="settings_behavior_keyboard_header" id="0x7F0A0D25" />
-    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7F0A0D26" />
-    <public type="id" name="settings_billing" id="0x7F0A0D27" />
-    <public type="id" name="settings_bitrate" id="0x7F0A0D28" />
-    <public type="id" name="settings_bitrate_help" id="0x7F0A0D29" />
-    <public type="id" name="settings_blocked_users" id="0x7F0A0D2A" />
-    <public type="id" name="settings_boost_flipper" id="0x7F0A0D2B" />
-    <public type="id" name="settings_boost_marketing_view" id="0x7F0A0D2C" />
-    <public type="id" name="settings_boost_no_guilds_image" id="0x7F0A0D2D" />
-    <public type="id" name="settings_boost_no_guilds_subtitle" id="0x7F0A0D2E" />
-    <public type="id" name="settings_boost_no_guilds_title" id="0x7F0A0D2F" />
-    <public type="id" name="settings_boost_recycler" id="0x7F0A0D30" />
-    <public type="id" name="settings_boost_retry" id="0x7F0A0D31" />
-    <public type="id" name="settings_boost_sample_guilds" id="0x7F0A0D32" />
-    <public type="id" name="settings_boost_subtext" id="0x7F0A0D33" />
-    <public type="id" name="settings_boost_subtext_container" id="0x7F0A0D34" />
-    <public type="id" name="settings_boost_upsell_view" id="0x7F0A0D35" />
-    <public type="id" name="settings_channel_list_category_item_drag" id="0x7F0A0D36" />
-    <public type="id" name="settings_channel_list_category_item_text" id="0x7F0A0D37" />
-    <public type="id" name="settings_channel_list_item_drag" id="0x7F0A0D38" />
-    <public type="id" name="settings_channel_list_item_hash" id="0x7F0A0D39" />
-    <public type="id" name="settings_channel_list_item_name" id="0x7F0A0D3A" />
-    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7F0A0D3B" />
-    <public type="id" name="settings_developer_screenshot_bug_reporting" id="0x7F0A0D3C" />
-    <public type="id" name="settings_gifting_flipper" id="0x7F0A0D3D" />
-    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7F0A0D3E" />
-    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7F0A0D3F" />
-    <public type="id" name="settings_gifting_gifts_you_purchased_header" id="0x7F0A0D40" />
-    <public type="id" name="settings_gifting_gifts_you_purchased_recycler" id="0x7F0A0D41" />
-    <public type="id" name="settings_gifting_purchase_gift_section" id="0x7F0A0D42" />
-    <public type="id" name="settings_gifting_redeem_codes_header" id="0x7F0A0D43" />
-    <public type="id" name="settings_gifting_retry" id="0x7F0A0D44" />
-    <public type="id" name="settings_gifting_select_classic_gift_header" id="0x7F0A0D45" />
-    <public type="id" name="settings_gifting_select_gift_header" id="0x7F0A0D46" />
-    <public type="id" name="settings_gifting_your_gifts_header" id="0x7F0A0D47" />
-    <public type="id" name="settings_gifting_your_gifts_recycler" id="0x7F0A0D48" />
-    <public type="id" name="settings_group_icon" id="0x7F0A0D49" />
-    <public type="id" name="settings_group_icon_label" id="0x7F0A0D4A" />
-    <public type="id" name="settings_group_icon_remove" id="0x7F0A0D4B" />
-    <public type="id" name="settings_inapp_notifs_switch" id="0x7F0A0D4C" />
-    <public type="id" name="settings_language_current" id="0x7F0A0D4D" />
-    <public type="id" name="settings_language_current_flag" id="0x7F0A0D4E" />
-    <public type="id" name="settings_language_current_text" id="0x7F0A0D4F" />
-    <public type="id" name="settings_language_header" id="0x7F0A0D50" />
-    <public type="id" name="settings_language_select_item_name" id="0x7F0A0D51" />
-    <public type="id" name="settings_language_select_item_name_localized" id="0x7F0A0D52" />
-    <public type="id" name="settings_language_select_list" id="0x7F0A0D53" />
-    <public type="id" name="settings_language_sync_check" id="0x7F0A0D54" />
-    <public type="id" name="settings_language_sync_header" id="0x7F0A0D55" />
-    <public type="id" name="settings_member" id="0x7F0A0D56" />
-    <public type="id" name="settings_member_view" id="0x7F0A0D57" />
-    <public type="id" name="settings_nitro" id="0x7F0A0D58" />
-    <public type="id" name="settings_notification_os" id="0x7F0A0D59" />
-    <public type="id" name="settings_notification_os_label" id="0x7F0A0D5A" />
-    <public type="id" name="settings_notification_switch" id="0x7F0A0D5B" />
-    <public type="id" name="settings_notifications_blink" id="0x7F0A0D5C" />
-    <public type="id" name="settings_notifications_enabled" id="0x7F0A0D5D" />
-    <public type="id" name="settings_notifications_mute_all" id="0x7F0A0D5E" />
-    <public type="id" name="settings_notifications_vibrations" id="0x7F0A0D5F" />
-    <public type="id" name="settings_notifications_wrap" id="0x7F0A0D60" />
-    <public type="id" name="settings_presence_text" id="0x7F0A0D61" />
-    <public type="id" name="settings_privacy_basic_service" id="0x7F0A0D62" />
-    <public type="id" name="settings_privacy_contact_sync" id="0x7F0A0D63" />
-    <public type="id" name="settings_privacy_contact_sync_title" id="0x7F0A0D64" />
-    <public type="id" name="settings_privacy_controls" id="0x7F0A0D65" />
-    <public type="id" name="settings_privacy_data_header" id="0x7F0A0D66" />
-    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7F0A0D67" />
-    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7F0A0D68" />
-    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7F0A0D69" />
-    <public type="id" name="settings_privacy_defaults_header" id="0x7F0A0D6A" />
-    <public type="id" name="settings_privacy_explicit_0" id="0x7F0A0D6B" />
-    <public type="id" name="settings_privacy_explicit_1" id="0x7F0A0D6C" />
-    <public type="id" name="settings_privacy_explicit_2" id="0x7F0A0D6D" />
-    <public type="id" name="settings_privacy_friend_source_0" id="0x7F0A0D6E" />
-    <public type="id" name="settings_privacy_friend_source_1" id="0x7F0A0D6F" />
-    <public type="id" name="settings_privacy_friend_source_2" id="0x7F0A0D70" />
-    <public type="id" name="settings_privacy_friend_source_header" id="0x7F0A0D71" />
-    <public type="id" name="settings_privacy_personalization" id="0x7F0A0D72" />
-    <public type="id" name="settings_privacy_request_data" id="0x7F0A0D73" />
-    <public type="id" name="settings_privacy_safe_messaging_header" id="0x7F0A0D74" />
-    <public type="id" name="settings_privacy_screenreader_detection" id="0x7F0A0D75" />
-    <public type="id" name="settings_privacy_statistics" id="0x7F0A0D76" />
-    <public type="id" name="settings_profile_scroll" id="0x7F0A0D77" />
-    <public type="id" name="settings_status_view" id="0x7F0A0D78" />
-    <public type="id" name="settings_text_images_compression_header" id="0x7F0A0D79" />
-    <public type="id" name="settings_text_images_display_header" id="0x7F0A0D7A" />
-    <public type="id" name="settings_text_images_embeds_toggle" id="0x7F0A0D7B" />
-    <public type="id" name="settings_text_images_links_toggle" id="0x7F0A0D7C" />
-    <public type="id" name="settings_text_images_preview_header" id="0x7F0A0D7D" />
-    <public type="id" name="settings_text_images_stickers_header" id="0x7F0A0D7E" />
-    <public type="id" name="settings_text_images_sync_header" id="0x7F0A0D7F" />
-    <public type="id" name="settings_text_images_sync_toggle" id="0x7F0A0D80" />
-    <public type="id" name="settings_user_limit" id="0x7F0A0D81" />
-    <public type="id" name="settings_user_limit_help" id="0x7F0A0D82" />
-    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7F0A0D83" />
-    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7F0A0D84" />
-    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7F0A0D85" />
-    <public type="id" name="settings_voice_gain_control_toggle" id="0x7F0A0D86" />
-    <public type="id" name="settings_voice_input_header" id="0x7F0A0D87" />
-    <public type="id" name="settings_voice_input_mode_ptt" id="0x7F0A0D88" />
-    <public type="id" name="settings_voice_input_mode_vad" id="0x7F0A0D89" />
-    <public type="id" name="settings_voice_krisp_info" id="0x7F0A0D8A" />
-    <public type="id" name="settings_voice_krisp_vad_toggle" id="0x7F0A0D8B" />
-    <public type="id" name="settings_voice_mode" id="0x7F0A0D8C" />
-    <public type="id" name="settings_voice_mode_header" id="0x7F0A0D8D" />
-    <public type="id" name="settings_voice_mode_value" id="0x7F0A0D8E" />
-    <public type="id" name="settings_voice_noise_cancellation_toggle" id="0x7F0A0D8F" />
-    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7F0A0D90" />
-    <public type="id" name="settings_voice_opensl_header" id="0x7F0A0D91" />
-    <public type="id" name="settings_voice_opensles_default" id="0x7F0A0D92" />
-    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7F0A0D93" />
-    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7F0A0D94" />
-    <public type="id" name="settings_voice_opensles_help" id="0x7F0A0D95" />
-    <public type="id" name="settings_voice_output_header" id="0x7F0A0D96" />
-    <public type="id" name="settings_voice_output_volume" id="0x7F0A0D97" />
-    <public type="id" name="settings_voice_output_volume_wrap" id="0x7F0A0D98" />
-    <public type="id" name="settings_voice_overlay_header" id="0x7F0A0D99" />
-    <public type="id" name="settings_voice_overlay_toggle" id="0x7F0A0D9A" />
-    <public type="id" name="settings_voice_processing_header" id="0x7F0A0D9B" />
-    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7F0A0D9C" />
-    <public type="id" name="settings_voice_sensitivity_header" id="0x7F0A0D9D" />
-    <public type="id" name="settings_voice_sensitivity_label" id="0x7F0A0D9E" />
-    <public type="id" name="settings_voice_sensitivity_manual" id="0x7F0A0D9F" />
-    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7F0A0DA0" />
-    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7F0A0DA1" />
-    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7F0A0DA2" />
-    <public type="id" name="settings_voice_video_container" id="0x7F0A0DA3" />
-    <public type="id" name="settings_voice_video_header" id="0x7F0A0DA4" />
-    <public type="id" name="settings_voice_video_troubleshooting_guide" id="0x7F0A0DA5" />
-    <public type="id" name="shades_divider" id="0x7F0A0DA6" />
-    <public type="id" name="shades_layout" id="0x7F0A0DA7" />
-    <public type="id" name="share_button" id="0x7F0A0DA8" />
-    <public type="id" name="shortcut" id="0x7F0A0DA9" />
-    <public type="id" name="showCustom" id="0x7F0A0DAA" />
-    <public type="id" name="showHome" id="0x7F0A0DAB" />
-    <public type="id" name="showTitle" id="0x7F0A0DAC" />
-    <public type="id" name="show_current_activity" id="0x7F0A0DAD" />
-    <public type="id" name="simple_confirmation_dialog_description" id="0x7F0A0DAE" />
-    <public type="id" name="simple_confirmation_dialog_negative" id="0x7F0A0DAF" />
-    <public type="id" name="simple_confirmation_dialog_positive" id="0x7F0A0DB0" />
-    <public type="id" name="simple_confirmation_dialog_title" id="0x7F0A0DB1" />
-    <public type="id" name="sin" id="0x7F0A0DB2" />
-    <public type="id" name="skipCollapsed" id="0x7F0A0DB3" />
-    <public type="id" name="slide" id="0x7F0A0DB4" />
-    <public type="id" name="smallLabel" id="0x7F0A0DB5" />
-    <public type="id" name="snackbar_action" id="0x7F0A0DB6" />
-    <public type="id" name="snackbar_text" id="0x7F0A0DB7" />
-    <public type="id" name="snap" id="0x7F0A0DB8" />
-    <public type="id" name="snapMargins" id="0x7F0A0DB9" />
-    <public type="id" name="software" id="0x7F0A0DBA" />
-    <public type="id" name="some_channels" id="0x7F0A0DBB" />
-    <public type="id" name="space_around" id="0x7F0A0DBC" />
-    <public type="id" name="space_between" id="0x7F0A0DBD" />
-    <public type="id" name="space_evenly" id="0x7F0A0DBE" />
-    <public type="id" name="space_for_measuring" id="0x7F0A0DBF" />
-    <public type="id" name="spacer" id="0x7F0A0DC0" />
-    <public type="id" name="sparkle" id="0x7F0A0DC1" />
-    <public type="id" name="sparkle_view_image" id="0x7F0A0DC2" />
-    <public type="id" name="speaker_hint" id="0x7F0A0DC3" />
-    <public type="id" name="special_effects_controller_view_tag" id="0x7F0A0DC4" />
-    <public type="id" name="spherical_gl_surface_view" id="0x7F0A0DC5" />
-    <public type="id" name="spinner" id="0x7F0A0DC6" />
-    <public type="id" name="spline" id="0x7F0A0DC7" />
-    <public type="id" name="split_action_bar" id="0x7F0A0DC8" />
-    <public type="id" name="spread" id="0x7F0A0DC9" />
-    <public type="id" name="spread_inside" id="0x7F0A0DCA" />
-    <public type="id" name="square" id="0x7F0A0DCB" />
-    <public type="id" name="src_atop" id="0x7F0A0DCC" />
-    <public type="id" name="src_in" id="0x7F0A0DCD" />
-    <public type="id" name="src_over" id="0x7F0A0DCE" />
-    <public type="id" name="src_toggle" id="0x7F0A0DCF" />
-    <public type="id" name="stage_call_speaking_chip" id="0x7F0A0DD0" />
-    <public type="id" name="stage_call_speaking_user_summary" id="0x7F0A0DD1" />
-    <public type="id" name="stage_call_speaking_user_summary_label" id="0x7F0A0DD2" />
-    <public type="id" name="stage_channel_audience_icon" id="0x7F0A0DD3" />
-    <public type="id" name="stage_channel_audience_member_container" id="0x7F0A0DD4" />
-    <public type="id" name="stage_channel_audience_member_icon" id="0x7F0A0DD5" />
-    <public type="id" name="stage_channel_audience_member_icon_container" id="0x7F0A0DD6" />
-    <public type="id" name="stage_channel_audience_member_name" id="0x7F0A0DD7" />
-    <public type="id" name="stage_channel_audience_member_raised_hand" id="0x7F0A0DD8" />
-    <public type="id" name="stage_channel_audience_role_text" id="0x7F0A0DD9" />
-    <public type="id" name="stage_channel_blocked_member_container" id="0x7F0A0DDA" />
-    <public type="id" name="stage_channel_blocked_member_icon" id="0x7F0A0DDB" />
-    <public type="id" name="stage_channel_blocked_member_icon_container" id="0x7F0A0DDC" />
-    <public type="id" name="stage_channel_blocked_member_name" id="0x7F0A0DDD" />
-    <public type="id" name="stage_channel_blocked_member_speaker" id="0x7F0A0DDE" />
-    <public type="id" name="stage_channel_blocked_text" id="0x7F0A0DDF" />
-    <public type="id" name="stage_channel_blocked_text_divider" id="0x7F0A0DE0" />
-    <public type="id" name="stage_channel_blocked_text_speaker" id="0x7F0A0DE1" />
-    <public type="id" name="stage_channel_item_stage_channel_icon" id="0x7F0A0DE2" />
-    <public type="id" name="stage_channel_item_voice_channel_name" id="0x7F0A0DE3" />
-    <public type="id" name="stage_channel_item_voice_channel_topic" id="0x7F0A0DE4" />
-    <public type="id" name="stage_channel_option" id="0x7F0A0DE5" />
-    <public type="id" name="stage_channel_speaker" id="0x7F0A0DE6" />
-    <public type="id" name="stage_channel_speaker_blocked" id="0x7F0A0DE7" />
-    <public type="id" name="stage_channel_speaker_container" id="0x7F0A0DE8" />
-    <public type="id" name="stage_channel_speaker_deafen_indicator" id="0x7F0A0DE9" />
-    <public type="id" name="stage_channel_speaker_mod_indicator" id="0x7F0A0DEA" />
-    <public type="id" name="stage_channel_speaker_mute_indicator" id="0x7F0A0DEB" />
-    <public type="id" name="stage_channel_speaker_name" id="0x7F0A0DEC" />
-    <public type="id" name="stage_channel_speaker_pulse" id="0x7F0A0DED" />
-    <public type="id" name="stage_channels_audience_count" id="0x7F0A0DEE" />
-    <public type="id" name="stage_disconnect_button_large" id="0x7F0A0DEF" />
-    <public type="id" name="stage_discovery_speakers_view" id="0x7F0A0DF0" />
-    <public type="id" name="stage_event_listeners" id="0x7F0A0DF1" />
-    <public type="id" name="stage_moderator_permissions_fragment" id="0x7F0A0DF2" />
-    <public type="id" name="stage_raise_hands_enabled_toggle" id="0x7F0A0DF3" />
-    <public type="id" name="stage_raised_hands_bottom_sheet_root" id="0x7F0A0DF4" />
-    <public type="id" name="stage_raised_hands_item_dismiss_button" id="0x7F0A0DF5" />
-    <public type="id" name="stage_raised_hands_item_invite_button" id="0x7F0A0DF6" />
-    <public type="id" name="stage_raised_hands_item_role" id="0x7F0A0DF7" />
-    <public type="id" name="stage_raised_hands_item_user_avatar" id="0x7F0A0DF8" />
-    <public type="id" name="stage_raised_hands_item_user_name" id="0x7F0A0DF9" />
-    <public type="id" name="stage_raised_hands_recycler" id="0x7F0A0DFA" />
-    <public type="id" name="standalone_channel_icon" id="0x7F0A0DFB" />
-    <public type="id" name="standalone_channel_name" id="0x7F0A0DFC" />
-    <public type="id" name="standard" id="0x7F0A0DFD" />
-    <public type="id" name="start" id="0x7F0A0DFE" />
-    <public type="id" name="startHorizontal" id="0x7F0A0DFF" />
-    <public type="id" name="startToEnd" id="0x7F0A0E00" />
-    <public type="id" name="startVertical" id="0x7F0A0E01" />
-    <public type="id" name="start_call_sheet_video_item" id="0x7F0A0E02" />
-    <public type="id" name="start_call_sheet_voice_item" id="0x7F0A0E03" />
-    <public type="id" name="start_event" id="0x7F0A0E04" />
-    <public type="id" name="start_event_button" id="0x7F0A0E05" />
-    <public type="id" name="start_event_button_text" id="0x7F0A0E06" />
-    <public type="id" name="start_stage_button" id="0x7F0A0E07" />
-    <public type="id" name="state_aspect_ratio" id="0x7F0A0E08" />
-    <public type="id" name="state_rotate" id="0x7F0A0E09" />
-    <public type="id" name="state_scale" id="0x7F0A0E0A" />
-    <public type="id" name="staticLayout" id="0x7F0A0E0B" />
-    <public type="id" name="staticPostLayout" id="0x7F0A0E0C" />
-    <public type="id" name="static_avatar" id="0x7F0A0E0D" />
-    <public type="id" name="status_bar_latest_event_content" id="0x7F0A0E0E" />
-    <public type="id" name="step_text" id="0x7F0A0E0F" />
-    <public type="id" name="steps_button_container" id="0x7F0A0E10" />
-    <public type="id" name="steps_cancel" id="0x7F0A0E11" />
-    <public type="id" name="steps_close" id="0x7F0A0E12" />
-    <public type="id" name="steps_done" id="0x7F0A0E13" />
-    <public type="id" name="steps_next" id="0x7F0A0E14" />
-    <public type="id" name="steps_progress_indicator" id="0x7F0A0E15" />
-    <public type="id" name="steps_title" id="0x7F0A0E16" />
-    <public type="id" name="steps_viewpager" id="0x7F0A0E17" />
-    <public type="id" name="stereo" id="0x7F0A0E18" />
-    <public type="id" name="sticker_app_bar" id="0x7F0A0E19" />
-    <public type="id" name="sticker_autocomplete_sticker" id="0x7F0A0E1A" />
-    <public type="id" name="sticker_category_item_guild_icon" id="0x7F0A0E1B" />
-    <public type="id" name="sticker_category_item_pack_avatar" id="0x7F0A0E1C" />
-    <public type="id" name="sticker_full_size_sticker" id="0x7F0A0E1D" />
-    <public type="id" name="sticker_pack_details_animated" id="0x7F0A0E1E" />
-    <public type="id" name="sticker_pack_details_close" id="0x7F0A0E1F" />
-    <public type="id" name="sticker_pack_details_limited" id="0x7F0A0E20" />
-    <public type="id" name="sticker_pack_details_pack" id="0x7F0A0E21" />
-    <public type="id" name="sticker_pack_details_premium" id="0x7F0A0E22" />
-    <public type="id" name="sticker_pack_store_sheet_buy_button_container" id="0x7F0A0E23" />
-    <public type="id" name="sticker_pack_store_sheet_container" id="0x7F0A0E24" />
-    <public type="id" name="sticker_pack_store_sheet_recycler" id="0x7F0A0E25" />
-    <public type="id" name="sticker_pack_view_all_banner" id="0x7F0A0E26" />
-    <public type="id" name="sticker_picker_bottom_bar" id="0x7F0A0E27" />
-    <public type="id" name="sticker_picker_bottom_bar_divider" id="0x7F0A0E28" />
-    <public type="id" name="sticker_picker_category_recycler" id="0x7F0A0E29" />
-    <public type="id" name="sticker_picker_container" id="0x7F0A0E2A" />
-    <public type="id" name="sticker_picker_sticker" id="0x7F0A0E2B" />
-    <public type="id" name="sticker_premium_upsell_close_button" id="0x7F0A0E2C" />
-    <public type="id" name="sticker_premium_upsell_description" id="0x7F0A0E2D" />
-    <public type="id" name="sticker_premium_upsell_subscribe_button" id="0x7F0A0E2E" />
-    <public type="id" name="sticker_search_input" id="0x7F0A0E2F" />
-    <public type="id" name="sticker_sheet_buy_button" id="0x7F0A0E30" />
-    <public type="id" name="sticker_sheet_sticker_info" id="0x7F0A0E31" />
-    <public type="id" name="sticker_sheet_sticker_name" id="0x7F0A0E32" />
-    <public type="id" name="sticker_sheet_sticker_picker_content" id="0x7F0A0E33" />
-    <public type="id" name="sticker_sheet_stickers_container" id="0x7F0A0E34" />
-    <public type="id" name="sticker_sheet_view_button" id="0x7F0A0E35" />
-    <public type="id" name="sticker_sheet_view_limited_chip" id="0x7F0A0E36" />
-    <public type="id" name="sticker_sheet_view_limited_container" id="0x7F0A0E37" />
-    <public type="id" name="sticker_store_buy_button_premium" id="0x7F0A0E38" />
-    <public type="id" name="sticker_store_header_item_animated" id="0x7F0A0E39" />
-    <public type="id" name="sticker_store_header_item_container" id="0x7F0A0E3A" />
-    <public type="id" name="sticker_store_header_item_description" id="0x7F0A0E3B" />
-    <public type="id" name="sticker_store_header_item_new" id="0x7F0A0E3C" />
-    <public type="id" name="sticker_store_header_item_premium" id="0x7F0A0E3D" />
-    <public type="id" name="sticker_store_header_item_subtitle" id="0x7F0A0E3E" />
-    <public type="id" name="sticker_store_header_item_title" id="0x7F0A0E3F" />
-    <public type="id" name="sticker_toolbar" id="0x7F0A0E40" />
-    <public type="id" name="sticker_view_imageview" id="0x7F0A0E41" />
-    <public type="id" name="sticker_view_lottie" id="0x7F0A0E42" />
-    <public type="id" name="sticker_view_placeholder" id="0x7F0A0E43" />
-    <public type="id" name="stickers_always_animate" id="0x7F0A0E44" />
-    <public type="id" name="stickers_animate_on_interaction" id="0x7F0A0E45" />
-    <public type="id" name="stickers_never_animate" id="0x7F0A0E46" />
-    <public type="id" name="stickers_sheet_sticker_1" id="0x7F0A0E47" />
-    <public type="id" name="stickers_sheet_sticker_2" id="0x7F0A0E48" />
-    <public type="id" name="stickers_sheet_sticker_3" id="0x7F0A0E49" />
-    <public type="id" name="stickers_sheet_sticker_4" id="0x7F0A0E4A" />
-    <public type="id" name="stickers_suggestions" id="0x7F0A0E4B" />
-    <public type="id" name="stop" id="0x7F0A0E4C" />
-    <public type="id" name="stop_watching_button" id="0x7F0A0E4D" />
-    <public type="id" name="stream_preview" id="0x7F0A0E4E" />
-    <public type="id" name="stream_preview_image" id="0x7F0A0E4F" />
-    <public type="id" name="stream_preview_overlay_text" id="0x7F0A0E50" />
-    <public type="id" name="stream_preview_placeholder_caption" id="0x7F0A0E51" />
-    <public type="id" name="stream_volume_label" id="0x7F0A0E52" />
-    <public type="id" name="stream_volume_slider" id="0x7F0A0E53" />
-    <public type="id" name="stretch" id="0x7F0A0E54" />
-    <public type="id" name="submenuarrow" id="0x7F0A0E55" />
-    <public type="id" name="submit_area" id="0x7F0A0E56" />
-    <public type="id" name="submit_report_error" id="0x7F0A0E57" />
-    <public type="id" name="subscribe_button" id="0x7F0A0E58" />
-    <public type="id" name="subscription_tier_benefits_recycler" id="0x7F0A0E59" />
-    <public type="id" name="subscription_tier_review_recycler" id="0x7F0A0E5A" />
-    <public type="id" name="subtitle" id="0x7F0A0E5B" />
-    <public type="id" name="subtitle_text" id="0x7F0A0E5C" />
-    <public type="id" name="suggested_friend_avatar" id="0x7F0A0E5D" />
-    <public type="id" name="suggested_friend_decline" id="0x7F0A0E5E" />
-    <public type="id" name="suggested_friend_public_name" id="0x7F0A0E5F" />
-    <public type="id" name="suggested_friend_send_request" id="0x7F0A0E60" />
-    <public type="id" name="suggested_friend_username" id="0x7F0A0E61" />
-    <public type="id" name="suggested_friend_view" id="0x7F0A0E62" />
-    <public type="id" name="suggestion_example_answer" id="0x7F0A0E63" />
-    <public type="id" name="suggestion_example_container" id="0x7F0A0E64" />
-    <public type="id" name="suggestion_example_filter" id="0x7F0A0E65" />
-    <public type="id" name="suggestion_example_icon" id="0x7F0A0E66" />
-    <public type="id" name="suggestion_item_header" id="0x7F0A0E67" />
-    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7F0A0E68" />
-    <public type="id" name="suggestion_item_header_history_divider" id="0x7F0A0E69" />
-    <public type="id" name="suggestion_item_header_history_text" id="0x7F0A0E6A" />
-    <public type="id" name="suggestion_list" id="0x7F0A0E6B" />
-    <public type="id" name="suggestions_flipper" id="0x7F0A0E6C" />
-    <public type="id" name="support" id="0x7F0A0E6D" />
-    <public type="id" name="surface" id="0x7F0A0E6E" />
-    <public type="id" name="surface_view" id="0x7F0A0E6F" />
-    <public type="id" name="surface_view_root" id="0x7F0A0E70" />
-    <public type="id" name="swipeRefreshLayout" id="0x7F0A0E71" />
-    <public type="id" name="switchWidget" id="0x7F0A0E72" />
-    <public type="id" name="switchview" id="0x7F0A0E73" />
-    <public type="id" name="sync_friends_switch" id="0x7F0A0E74" />
-    <public type="id" name="sync_settings" id="0x7F0A0E75" />
-    <public type="id" name="systemChannel" id="0x7F0A0E76" />
-    <public type="id" name="system_channel" id="0x7F0A0E77" />
-    <public type="id" name="system_channel_boost" id="0x7F0A0E78" />
-    <public type="id" name="system_channel_join" id="0x7F0A0E79" />
-    <public type="id" name="system_channel_wrap" id="0x7F0A0E7A" />
-    <public type="id" name="system_icon" id="0x7F0A0E7B" />
-    <public type="id" name="system_text" id="0x7F0A0E7C" />
-    <public type="id" name="system_timestamp" id="0x7F0A0E7D" />
-    <public type="id" name="system_welcome_cta_button" id="0x7F0A0E7E" />
-    <public type="id" name="system_welcome_cta_button_sticker" id="0x7F0A0E7F" />
-    <public type="id" name="tabMode" id="0x7F0A0E80" />
-    <public type="id" name="tab_contents" id="0x7F0A0E81" />
-    <public type="id" name="tab_view" id="0x7F0A0E82" />
-    <public type="id" name="tabs" id="0x7F0A0E83" />
-    <public type="id" name="tabs_host_bottom_nav_friends_icon" id="0x7F0A0E84" />
-    <public type="id" name="tabs_host_bottom_nav_friends_item" id="0x7F0A0E85" />
-    <public type="id" name="tabs_host_bottom_nav_friends_notifications_badge" id="0x7F0A0E86" />
-    <public type="id" name="tabs_host_bottom_nav_home_icon" id="0x7F0A0E87" />
-    <public type="id" name="tabs_host_bottom_nav_home_item" id="0x7F0A0E88" />
-    <public type="id" name="tabs_host_bottom_nav_home_notifications_badge" id="0x7F0A0E89" />
-    <public type="id" name="tabs_host_bottom_nav_mentions_icon" id="0x7F0A0E8A" />
-    <public type="id" name="tabs_host_bottom_nav_mentions_item" id="0x7F0A0E8B" />
-    <public type="id" name="tabs_host_bottom_nav_search_icon" id="0x7F0A0E8C" />
-    <public type="id" name="tabs_host_bottom_nav_search_item" id="0x7F0A0E8D" />
-    <public type="id" name="tabs_host_bottom_nav_stage_discovery_icon" id="0x7F0A0E8E" />
-    <public type="id" name="tabs_host_bottom_nav_stage_discovery_item" id="0x7F0A0E8F" />
-    <public type="id" name="tabs_host_bottom_nav_tabs_container" id="0x7F0A0E90" />
-    <public type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" id="0x7F0A0E91" />
-    <public type="id" name="tabs_host_bottom_nav_user_settings_item" id="0x7F0A0E92" />
-    <public type="id" name="tag_accessibility_actions" id="0x7F0A0E93" />
-    <public type="id" name="tag_accessibility_clickable_spans" id="0x7F0A0E94" />
-    <public type="id" name="tag_accessibility_heading" id="0x7F0A0E95" />
-    <public type="id" name="tag_accessibility_pane_title" id="0x7F0A0E96" />
-    <public type="id" name="tag_on_apply_window_listener" id="0x7F0A0E97" />
-    <public type="id" name="tag_on_receive_content_listener" id="0x7F0A0E98" />
-    <public type="id" name="tag_on_receive_content_mime_types" id="0x7F0A0E99" />
-    <public type="id" name="tag_screen_reader_focusable" id="0x7F0A0E9A" />
-    <public type="id" name="tag_state_description" id="0x7F0A0E9B" />
-    <public type="id" name="tag_transition_group" id="0x7F0A0E9C" />
-    <public type="id" name="tag_unhandled_key_event_manager" id="0x7F0A0E9D" />
-    <public type="id" name="tag_unhandled_key_listeners" id="0x7F0A0E9E" />
-    <public type="id" name="tag_window_insets_animation_callback" id="0x7F0A0E9F" />
-    <public type="id" name="takePicture" id="0x7F0A0EA0" />
-    <public type="id" name="takePictureSnapshot" id="0x7F0A0EA1" />
-    <public type="id" name="take_photo_btn" id="0x7F0A0EA2" />
-    <public type="id" name="ternary_check_neutral" id="0x7F0A0EA3" />
-    <public type="id" name="ternary_check_off" id="0x7F0A0EA4" />
-    <public type="id" name="ternary_check_on" id="0x7F0A0EA5" />
-    <public type="id" name="test" id="0x7F0A0EA6" />
-    <public type="id" name="test_checkbox_android_button_tint" id="0x7F0A0EA7" />
-    <public type="id" name="test_checkbox_app_button_tint" id="0x7F0A0EA8" />
-    <public type="id" name="test_radiobutton_android_button_tint" id="0x7F0A0EA9" />
-    <public type="id" name="test_radiobutton_app_button_tint" id="0x7F0A0EAA" />
-    <public type="id" name="text" id="0x7F0A0EAB" />
-    <public type="id" name="text1" id="0x7F0A0EAC" />
-    <public type="id" name="text2" id="0x7F0A0EAD" />
-    <public type="id" name="textEnd" id="0x7F0A0EAE" />
-    <public type="id" name="textSpacerNoButtons" id="0x7F0A0EAF" />
-    <public type="id" name="textSpacerNoTitle" id="0x7F0A0EB0" />
-    <public type="id" name="textStart" id="0x7F0A0EB1" />
-    <public type="id" name="textTop" id="0x7F0A0EB2" />
-    <public type="id" name="textView" id="0x7F0A0EB3" />
-    <public type="id" name="text_action_mark_as_read" id="0x7F0A0EB4" />
-    <public type="id" name="text_action_mute" id="0x7F0A0EB5" />
-    <public type="id" name="text_action_thread_browser" id="0x7F0A0EB6" />
-    <public type="id" name="text_images_settings" id="0x7F0A0EB7" />
-    <public type="id" name="text_input" id="0x7F0A0EB8" />
-    <public type="id" name="text_input_end_icon" id="0x7F0A0EB9" />
-    <public type="id" name="text_input_error_icon" id="0x7F0A0EBA" />
-    <public type="id" name="text_input_start_icon" id="0x7F0A0EBB" />
-    <public type="id" name="text_view_crop" id="0x7F0A0EBC" />
-    <public type="id" name="text_view_rotate" id="0x7F0A0EBD" />
-    <public type="id" name="text_view_scale" id="0x7F0A0EBE" />
-    <public type="id" name="textinput_counter" id="0x7F0A0EBF" />
-    <public type="id" name="textinput_error" id="0x7F0A0EC0" />
-    <public type="id" name="textinput_helper_text" id="0x7F0A0EC1" />
-    <public type="id" name="textinput_placeholder" id="0x7F0A0EC2" />
-    <public type="id" name="textinput_prefix_text" id="0x7F0A0EC3" />
-    <public type="id" name="textinput_suffix_text" id="0x7F0A0EC4" />
-    <public type="id" name="texture" id="0x7F0A0EC5" />
-    <public type="id" name="texture_view" id="0x7F0A0EC6" />
-    <public type="id" name="thing_proto" id="0x7F0A0EC7" />
-    <public type="id" name="thread_avatar" id="0x7F0A0EC8" />
-    <public type="id" name="thread_browser_count" id="0x7F0A0EC9" />
-    <public type="id" name="thread_browser_empty" id="0x7F0A0ECA" />
-    <public type="id" name="thread_browser_empty_create_button" id="0x7F0A0ECB" />
-    <public type="id" name="thread_browser_empty_heading" id="0x7F0A0ECC" />
-    <public type="id" name="thread_browser_empty_subheading" id="0x7F0A0ECD" />
-    <public type="id" name="thread_browser_error_msg" id="0x7F0A0ECE" />
-    <public type="id" name="thread_browser_error_overlay" id="0x7F0A0ECF" />
-    <public type="id" name="thread_browser_icon" id="0x7F0A0ED0" />
-    <public type="id" name="thread_browser_moderator_view" id="0x7F0A0ED1" />
-    <public type="id" name="thread_browser_moderator_view_card" id="0x7F0A0ED2" />
-    <public type="id" name="thread_browser_root" id="0x7F0A0ED3" />
-    <public type="id" name="thread_browser_toolbar" id="0x7F0A0ED4" />
-    <public type="id" name="thread_browser_try_again" id="0x7F0A0ED5" />
-    <public type="id" name="thread_browser_view_pager" id="0x7F0A0ED6" />
-    <public type="id" name="thread_browser_visibility_private" id="0x7F0A0ED7" />
-    <public type="id" name="thread_browser_visibility_public" id="0x7F0A0ED8" />
-    <public type="id" name="thread_embed_container" id="0x7F0A0ED9" />
-    <public type="id" name="thread_embed_icon" id="0x7F0A0EDA" />
-    <public type="id" name="thread_embed_message_center_guideline" id="0x7F0A0EDB" />
-    <public type="id" name="thread_embed_messages_count" id="0x7F0A0EDC" />
-    <public type="id" name="thread_embed_messages_count_chevron" id="0x7F0A0EDD" />
-    <public type="id" name="thread_embed_most_recent_message_avatar" id="0x7F0A0EDE" />
-    <public type="id" name="thread_embed_most_recent_message_content" id="0x7F0A0EDF" />
-    <public type="id" name="thread_embed_most_recent_message_header" id="0x7F0A0EE0" />
-    <public type="id" name="thread_embed_most_recent_message_name" id="0x7F0A0EE1" />
-    <public type="id" name="thread_embed_name" id="0x7F0A0EE2" />
-    <public type="id" name="thread_embed_selectable_background" id="0x7F0A0EE3" />
-    <public type="id" name="thread_embed_spine" id="0x7F0A0EE4" />
-    <public type="id" name="thread_icon" id="0x7F0A0EE5" />
-    <public type="id" name="thread_image" id="0x7F0A0EE6" />
-    <public type="id" name="thread_message" id="0x7F0A0EE7" />
-    <public type="id" name="thread_name" id="0x7F0A0EE8" />
-    <public type="id" name="thread_name_input" id="0x7F0A0EE9" />
-    <public type="id" name="thread_settings_edit_name" id="0x7F0A0EEA" />
-    <public type="id" name="thread_settings_edit_wrap" id="0x7F0A0EEB" />
-    <public type="id" name="thread_settings_save" id="0x7F0A0EEC" />
-    <public type="id" name="thread_settings_section_slow_mode" id="0x7F0A0EED" />
-    <public type="id" name="thread_settings_slow_mode_cooldown_label" id="0x7F0A0EEE" />
-    <public type="id" name="thread_settings_slow_mode_cooldown_slider" id="0x7F0A0EEF" />
-    <public type="id" name="thread_settings_slowmode_label" id="0x7F0A0EF0" />
-    <public type="id" name="thread_starter_message_header" id="0x7F0A0EF1" />
-    <public type="id" name="thread_starter_message_header_icon" id="0x7F0A0EF2" />
-    <public type="id" name="thread_starter_message_header_text" id="0x7F0A0EF3" />
-    <public type="id" name="thread_status" id="0x7F0A0EF4" />
-    <public type="id" name="thread_status_button" id="0x7F0A0EF5" />
-    <public type="id" name="thread_status_text" id="0x7F0A0EF6" />
-    <public type="id" name="thread_timestamp" id="0x7F0A0EF7" />
-    <public type="id" name="thread_timestamp_separator" id="0x7F0A0EF8" />
-    <public type="id" name="thread_view" id="0x7F0A0EF9" />
-    <public type="id" name="thumb_iv" id="0x7F0A0EFA" />
-    <public type="id" name="tier1_upload_size_perk" id="0x7F0A0EFB" />
-    <public type="id" name="tier_1_guild_subscription_perk" id="0x7F0A0EFC" />
-    <public type="id" name="tile" id="0x7F0A0EFD" />
-    <public type="id" name="time" id="0x7F0A0EFE" />
-    <public type="id" name="title" id="0x7F0A0EFF" />
-    <public type="id" name="titleDividerNoCustom" id="0x7F0A0F00" />
-    <public type="id" name="title_layout" id="0x7F0A0F01" />
-    <public type="id" name="title_template" id="0x7F0A0F02" />
-    <public type="id" name="title_text_barrier" id="0x7F0A0F03" />
-    <public type="id" name="title_view" id="0x7F0A0F04" />
-    <public type="id" name="toggle" id="0x7F0A0F05" />
-    <public type="id" name="toggle_speaker_state_button" id="0x7F0A0F06" />
-    <public type="id" name="toggle_speaker_state_group" id="0x7F0A0F07" />
-    <public type="id" name="toggle_speaker_state_icon" id="0x7F0A0F08" />
-    <public type="id" name="toolbar" id="0x7F0A0F09" />
-    <public type="id" name="toolbar_events_button" id="0x7F0A0F0A" />
-    <public type="id" name="toolbar_icon" id="0x7F0A0F0B" />
-    <public type="id" name="toolbar_presence" id="0x7F0A0F0C" />
-    <public type="id" name="toolbar_title" id="0x7F0A0F0D" />
-    <public type="id" name="toolbar_title_subtext" id="0x7F0A0F0E" />
-    <public type="id" name="toolbar_voice_active_event" id="0x7F0A0F0F" />
-    <public type="id" name="top" id="0x7F0A0F10" />
-    <public type="id" name="topPanel" id="0x7F0A0F11" />
-    <public type="id" name="top_of_ui" id="0x7F0A0F12" />
-    <public type="id" name="top_to_end" id="0x7F0A0F13" />
-    <public type="id" name="topic_input" id="0x7F0A0F14" />
-    <public type="id" name="topic_label" id="0x7F0A0F15" />
-    <public type="id" name="topic_layout" id="0x7F0A0F16" />
-    <public type="id" name="torch" id="0x7F0A0F17" />
-    <public type="id" name="touch_outside" id="0x7F0A0F18" />
-    <public type="id" name="transitionToEnd" id="0x7F0A0F19" />
-    <public type="id" name="transitionToStart" id="0x7F0A0F1A" />
-    <public type="id" name="transition_current_scene" id="0x7F0A0F1B" />
-    <public type="id" name="transition_layout_save" id="0x7F0A0F1C" />
-    <public type="id" name="transition_position" id="0x7F0A0F1D" />
-    <public type="id" name="transition_scene_layoutid_cache" id="0x7F0A0F1E" />
-    <public type="id" name="transition_transform" id="0x7F0A0F1F" />
-    <public type="id" name="transparency_layout" id="0x7F0A0F20" />
-    <public type="id" name="transparency_seekbar" id="0x7F0A0F21" />
-    <public type="id" name="transparency_text" id="0x7F0A0F22" />
-    <public type="id" name="transparency_title" id="0x7F0A0F23" />
-    <public type="id" name="transparent_space" id="0x7F0A0F24" />
-    <public type="id" name="trash_wrap_icon" id="0x7F0A0F25" />
-    <public type="id" name="trash_wrap_target_container" id="0x7F0A0F26" />
-    <public type="id" name="trash_wrap_target_zone" id="0x7F0A0F27" />
-    <public type="id" name="triangle" id="0x7F0A0F28" />
-    <public type="id" name="tvText" id="0x7F0A0F29" />
-    <public type="id" name="tvTitle" id="0x7F0A0F2A" />
-    <public type="id" name="type_iv" id="0x7F0A0F2B" />
-    <public type="id" name="ucrop" id="0x7F0A0F2C" />
-    <public type="id" name="ucrop_frame" id="0x7F0A0F2D" />
-    <public type="id" name="ucrop_photobox" id="0x7F0A0F2E" />
-    <public type="id" name="uikit_chat_guideline" id="0x7F0A0F2F" />
-    <public type="id" name="uikit_icon_url" id="0x7F0A0F30" />
-    <public type="id" name="uikit_sheet_header_guideline" id="0x7F0A0F31" />
-    <public type="id" name="unblock_user_button" id="0x7F0A0F32" />
-    <public type="id" name="unchecked" id="0x7F0A0F33" />
-    <public type="id" name="underage" id="0x7F0A0F34" />
-    <public type="id" name="underage_warning" id="0x7F0A0F35" />
-    <public type="id" name="unhandled_uri_display" id="0x7F0A0F36" />
-    <public type="id" name="unhandled_uri_okay" id="0x7F0A0F37" />
-    <public type="id" name="uniform" id="0x7F0A0F38" />
-    <public type="id" name="unknown_sticker_sheet_sticker" id="0x7F0A0F39" />
-    <public type="id" name="unknown_sticker_sheet_sticker_name" id="0x7F0A0F3A" />
-    <public type="id" name="unlabeled" id="0x7F0A0F3B" />
-    <public type="id" name="unmute_button" id="0x7F0A0F3C" />
-    <public type="id" name="unmute_button_details_label" id="0x7F0A0F3D" />
-    <public type="id" name="unmute_button_label" id="0x7F0A0F3E" />
-    <public type="id" name="unread" id="0x7F0A0F3F" />
-    <public type="id" name="up" id="0x7F0A0F40" />
-    <public type="id" name="upgrade_button" id="0x7F0A0F41" />
-    <public type="id" name="uploadBanner" id="0x7F0A0F42" />
-    <public type="id" name="uploadSplash" id="0x7F0A0F43" />
-    <public type="id" name="upload_banner" id="0x7F0A0F44" />
-    <public type="id" name="upload_banner_fab" id="0x7F0A0F45" />
-    <public type="id" name="upload_banner_learn_more" id="0x7F0A0F46" />
-    <public type="id" name="upload_banner_nitro_tier" id="0x7F0A0F47" />
-    <public type="id" name="upload_banner_unlock" id="0x7F0A0F48" />
-    <public type="id" name="upload_debug_logs" id="0x7F0A0F49" />
-    <public type="id" name="upload_progress_1" id="0x7F0A0F4A" />
-    <public type="id" name="upload_progress_2" id="0x7F0A0F4B" />
-    <public type="id" name="upload_progress_3" id="0x7F0A0F4C" />
-    <public type="id" name="upload_size_perk" id="0x7F0A0F4D" />
-    <public type="id" name="upload_splash" id="0x7F0A0F4E" />
-    <public type="id" name="upload_splash_learn_more" id="0x7F0A0F4F" />
-    <public type="id" name="upload_splash_nitro_tier" id="0x7F0A0F50" />
-    <public type="id" name="upload_splash_unlock" id="0x7F0A0F51" />
-    <public type="id" name="upsell_body" id="0x7F0A0F52" />
-    <public type="id" name="upsell_body_text" id="0x7F0A0F53" />
-    <public type="id" name="upsell_header_part_1" id="0x7F0A0F54" />
-    <public type="id" name="upsell_header_part_2" id="0x7F0A0F55" />
-    <public type="id" name="upsell_header_text" id="0x7F0A0F56" />
-    <public type="id" name="upsell_image" id="0x7F0A0F57" />
-    <public type="id" name="upsell_section" id="0x7F0A0F58" />
-    <public type="id" name="url" id="0x7F0A0F59" />
-    <public type="id" name="useLogo" id="0x7F0A0F5A" />
-    <public type="id" name="user_actions_dialog_avatar" id="0x7F0A0F5B" />
-    <public type="id" name="user_actions_dialog_block_item" id="0x7F0A0F5C" />
-    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7F0A0F5D" />
-    <public type="id" name="user_actions_dialog_unblock_item" id="0x7F0A0F5E" />
-    <public type="id" name="user_actions_dialog_user_name" id="0x7F0A0F5F" />
-    <public type="id" name="user_aka" id="0x7F0A0F60" />
-    <public type="id" name="user_avatar_presence_container" id="0x7F0A0F61" />
-    <public type="id" name="user_avatar_presence_status" id="0x7F0A0F62" />
-    <public type="id" name="user_limit_divider" id="0x7F0A0F63" />
-    <public type="id" name="user_limit_seekbar" id="0x7F0A0F64" />
-    <public type="id" name="user_limit_title" id="0x7F0A0F65" />
-    <public type="id" name="user_list_item_avatar" id="0x7F0A0F66" />
-    <public type="id" name="user_list_item_name" id="0x7F0A0F67" />
-    <public type="id" name="user_list_item_name_secondary" id="0x7F0A0F68" />
-    <public type="id" name="user_list_item_status" id="0x7F0A0F69" />
-    <public type="id" name="user_mentions_filter_include_everyone" id="0x7F0A0F6A" />
-    <public type="id" name="user_mentions_filter_include_roles" id="0x7F0A0F6B" />
-    <public type="id" name="user_mentions_filter_this_server" id="0x7F0A0F6C" />
-    <public type="id" name="user_mentions_list" id="0x7F0A0F6D" />
-    <public type="id" name="user_mutual_friends_recycler_view" id="0x7F0A0F6E" />
-    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7F0A0F6F" />
-    <public type="id" name="user_phone_add_description_note" id="0x7F0A0F70" />
-    <public type="id" name="user_phone_add_next" id="0x7F0A0F71" />
-    <public type="id" name="user_phone_add_number" id="0x7F0A0F72" />
-    <public type="id" name="user_phone_title" id="0x7F0A0F73" />
-    <public type="id" name="user_profile_adapter_item_empty" id="0x7F0A0F74" />
-    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7F0A0F75" />
-    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7F0A0F76" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7F0A0F77" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7F0A0F78" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7F0A0F79" />
-    <public type="id" name="user_profile_adapter_item_friend_status" id="0x7F0A0F7A" />
-    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7F0A0F7B" />
-    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7F0A0F7C" />
-    <public type="id" name="user_profile_adapter_item_server_image" id="0x7F0A0F7D" />
-    <public type="id" name="user_profile_adapter_item_server_name" id="0x7F0A0F7E" />
-    <public type="id" name="user_profile_adapter_item_server_text" id="0x7F0A0F7F" />
-    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7F0A0F80" />
-    <public type="id" name="user_profile_adapter_item_user_display_name" id="0x7F0A0F81" />
-    <public type="id" name="user_profile_admin_ban" id="0x7F0A0F82" />
-    <public type="id" name="user_profile_admin_edit_member" id="0x7F0A0F83" />
-    <public type="id" name="user_profile_admin_kick" id="0x7F0A0F84" />
-    <public type="id" name="user_profile_admin_server_deafen" id="0x7F0A0F85" />
-    <public type="id" name="user_profile_admin_server_disconnect" id="0x7F0A0F86" />
-    <public type="id" name="user_profile_admin_server_move" id="0x7F0A0F87" />
-    <public type="id" name="user_profile_admin_server_mute" id="0x7F0A0F88" />
-    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7F0A0F89" />
-    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7F0A0F8A" />
-    <public type="id" name="user_profile_connections_view_recycler" id="0x7F0A0F8B" />
-    <public type="id" name="user_profile_header_badges_recycler" id="0x7F0A0F8C" />
-    <public type="id" name="user_profile_header_custom_status" id="0x7F0A0F8D" />
-    <public type="id" name="user_profile_header_name_wrap" id="0x7F0A0F8E" />
-    <public type="id" name="user_profile_header_primary_name" id="0x7F0A0F8F" />
-    <public type="id" name="user_profile_header_secondary_name" id="0x7F0A0F90" />
-    <public type="id" name="user_profile_stage_invite_to_speak" id="0x7F0A0F91" />
-    <public type="id" name="user_profile_stage_move_to_audience" id="0x7F0A0F92" />
-    <public type="id" name="user_selected_checkbox" id="0x7F0A0F93" />
-    <public type="id" name="user_settings_header" id="0x7F0A0F94" />
-    <public type="id" name="user_settings_mfa_enable_input_code" id="0x7F0A0F95" />
-    <public type="id" name="user_settings_profile_header_view" id="0x7F0A0F96" />
-    <public type="id" name="user_sheet_add_friend_action_button" id="0x7F0A0F97" />
-    <public type="id" name="user_sheet_admin_card" id="0x7F0A0F98" />
-    <public type="id" name="user_sheet_admin_view" id="0x7F0A0F99" />
-    <public type="id" name="user_sheet_badge_image" id="0x7F0A0F9A" />
-    <public type="id" name="user_sheet_call_action_button" id="0x7F0A0F9B" />
-    <public type="id" name="user_sheet_connections_header" id="0x7F0A0F9C" />
-    <public type="id" name="user_sheet_connections_view" id="0x7F0A0F9D" />
-    <public type="id" name="user_sheet_content" id="0x7F0A0F9E" />
-    <public type="id" name="user_sheet_copy_id" id="0x7F0A0F9F" />
-    <public type="id" name="user_sheet_deafen" id="0x7F0A0FA0" />
-    <public type="id" name="user_sheet_developer_header" id="0x7F0A0FA1" />
-    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7F0A0FA2" />
-    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7F0A0FA3" />
-    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7F0A0FA4" />
-    <public type="id" name="user_sheet_guild_container" id="0x7F0A0FA5" />
-    <public type="id" name="user_sheet_guild_header" id="0x7F0A0FA6" />
-    <public type="id" name="user_sheet_header" id="0x7F0A0FA7" />
-    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7F0A0FA8" />
-    <public type="id" name="user_sheet_loading_container" id="0x7F0A0FA9" />
-    <public type="id" name="user_sheet_message_action_button" id="0x7F0A0FAA" />
-    <public type="id" name="user_sheet_more_button" id="0x7F0A0FAB" />
-    <public type="id" name="user_sheet_muted" id="0x7F0A0FAC" />
-    <public type="id" name="user_sheet_note_header" id="0x7F0A0FAD" />
-    <public type="id" name="user_sheet_note_text_field" id="0x7F0A0FAE" />
-    <public type="id" name="user_sheet_note_text_field_wrap" id="0x7F0A0FAF" />
-    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7F0A0FB0" />
-    <public type="id" name="user_sheet_profile_actions_container" id="0x7F0A0FB1" />
-    <public type="id" name="user_sheet_profile_actions_divider" id="0x7F0A0FB2" />
-    <public type="id" name="user_sheet_profile_edit_button" id="0x7F0A0FB3" />
-    <public type="id" name="user_sheet_profile_edit_container" id="0x7F0A0FB4" />
-    <public type="id" name="user_sheet_profile_header_view" id="0x7F0A0FB5" />
-    <public type="id" name="user_sheet_profile_identity_button" id="0x7F0A0FB6" />
-    <public type="id" name="user_sheet_profile_stage_actions_card" id="0x7F0A0FB7" />
-    <public type="id" name="user_sheet_profile_stage_actions_view" id="0x7F0A0FB8" />
-    <public type="id" name="user_sheet_profile_voice_settings_header" id="0x7F0A0FB9" />
-    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7F0A0FBA" />
-    <public type="id" name="user_sheet_roles_list" id="0x7F0A0FBB" />
-    <public type="id" name="user_sheet_video_action_button" id="0x7F0A0FBC" />
-    <public type="id" name="user_sheet_volume_label" id="0x7F0A0FBD" />
-    <public type="id" name="user_sheet_volume_slider" id="0x7F0A0FBE" />
-    <public type="id" name="user_status_presence_custom_clear" id="0x7F0A0FBF" />
-    <public type="id" name="user_status_presence_custom_emoji" id="0x7F0A0FC0" />
-    <public type="id" name="user_status_presence_custom_text" id="0x7F0A0FC1" />
-    <public type="id" name="user_status_presence_dot" id="0x7F0A0FC2" />
-    <public type="id" name="user_status_presence_subtitle" id="0x7F0A0FC3" />
-    <public type="id" name="user_status_presence_title" id="0x7F0A0FC4" />
-    <public type="id" name="user_status_update_custom" id="0x7F0A0FC5" />
-    <public type="id" name="user_status_update_dnd" id="0x7F0A0FC6" />
-    <public type="id" name="user_status_update_idle" id="0x7F0A0FC7" />
-    <public type="id" name="user_status_update_invisible" id="0x7F0A0FC8" />
-    <public type="id" name="user_status_update_online" id="0x7F0A0FC9" />
-    <public type="id" name="user_summary" id="0x7F0A0FCA" />
-    <public type="id" name="user_summary_label" id="0x7F0A0FCB" />
-    <public type="id" name="username_placeholder_end_guideline" id="0x7F0A0FCC" />
-    <public type="id" name="username_tag" id="0x7F0A0FCD" />
-    <public type="id" name="username_text" id="0x7F0A0FCE" />
-    <public type="id" name="vAlertContentContainer" id="0x7F0A0FCF" />
-    <public type="id" name="value_prop_image" id="0x7F0A0FD0" />
-    <public type="id" name="verification" id="0x7F0A0FD1" />
-    <public type="id" name="verify" id="0x7F0A0FD2" />
-    <public type="id" name="verify_account_by_email" id="0x7F0A0FD3" />
-    <public type="id" name="verify_account_by_phone" id="0x7F0A0FD4" />
-    <public type="id" name="verify_account_support" id="0x7F0A0FD5" />
-    <public type="id" name="verify_account_text_body" id="0x7F0A0FD6" />
-    <public type="id" name="video" id="0x7F0A0FD7" />
-    <public type="id" name="video_button" id="0x7F0A0FD8" />
-    <public type="id" name="video_decoder_gl_surface_view" id="0x7F0A0FD9" />
-    <public type="id" name="view_dialog_confirmation_cancel" id="0x7F0A0FDA" />
-    <public type="id" name="view_dialog_confirmation_confirm" id="0x7F0A0FDB" />
-    <public type="id" name="view_dialog_confirmation_header" id="0x7F0A0FDC" />
-    <public type="id" name="view_dialog_confirmation_text" id="0x7F0A0FDD" />
-    <public type="id" name="view_input" id="0x7F0A0FDE" />
-    <public type="id" name="view_interaction_failed_label_icon" id="0x7F0A0FDF" />
-    <public type="id" name="view_interaction_failed_label_message" id="0x7F0A0FE0" />
-    <public type="id" name="view_offset_helper" id="0x7F0A0FE1" />
-    <public type="id" name="view_overlay" id="0x7F0A0FE2" />
-    <public type="id" name="view_pager" id="0x7F0A0FE3" />
-    <public type="id" name="view_premium_marketing_container_tier1" id="0x7F0A0FE4" />
-    <public type="id" name="view_premium_marketing_learn_more" id="0x7F0A0FE5" />
-    <public type="id" name="view_premium_marketing_marketing_container" id="0x7F0A0FE6" />
-    <public type="id" name="view_premium_marketing_marketing_subtitle" id="0x7F0A0FE7" />
-    <public type="id" name="view_premium_marketing_marketing_title" id="0x7F0A0FE8" />
-    <public type="id" name="view_premium_marketing_nitro_boost_count" id="0x7F0A0FE9" />
-    <public type="id" name="view_premium_marketing_nitro_boost_discount" id="0x7F0A0FEA" />
-    <public type="id" name="view_premium_marketing_nitro_classic_boost_count" id="0x7F0A0FEB" />
-    <public type="id" name="view_premium_marketing_nitro_classic_boost_discount" id="0x7F0A0FEC" />
-    <public type="id" name="view_premium_upsell_info_subheading" id="0x7F0A0FED" />
-    <public type="id" name="view_premium_upsell_info_subheading_blurb" id="0x7F0A0FEE" />
-    <public type="id" name="view_premium_upsell_info_subheading_price" id="0x7F0A0FEF" />
-    <public type="id" name="view_tree_lifecycle_owner" id="0x7F0A0FF0" />
-    <public type="id" name="view_tree_saved_state_registry_owner" id="0x7F0A0FF1" />
-    <public type="id" name="view_tree_view_model_store_owner" id="0x7F0A0FF2" />
-    <public type="id" name="view_typing_dots_1" id="0x7F0A0FF3" />
-    <public type="id" name="view_typing_dots_2" id="0x7F0A0FF4" />
-    <public type="id" name="view_typing_dots_3" id="0x7F0A0FF5" />
-    <public type="id" name="visible" id="0x7F0A0FF6" />
-    <public type="id" name="visible_removing_fragment_view_tag" id="0x7F0A0FF7" />
-    <public type="id" name="visit_community_icon" id="0x7F0A0FF8" />
-    <public type="id" name="visit_community_icon_text" id="0x7F0A0FF9" />
-    <public type="id" name="visit_community_text" id="0x7F0A0FFA" />
-    <public type="id" name="voice" id="0x7F0A0FFB" />
-    <public type="id" name="voice_bottom_sheet_bottom_content_container" id="0x7F0A0FFC" />
-    <public type="id" name="voice_bottom_sheet_connect" id="0x7F0A0FFD" />
-    <public type="id" name="voice_bottom_sheet_connect_container" id="0x7F0A0FFE" />
-    <public type="id" name="voice_bottom_sheet_controls" id="0x7F0A0FFF" />
-    <public type="id" name="voice_bottom_sheet_header_deafen" id="0x7F0A1000" />
-    <public type="id" name="voice_bottom_sheet_header_icon" id="0x7F0A1001" />
-    <public type="id" name="voice_bottom_sheet_header_invite" id="0x7F0A1002" />
-    <public type="id" name="voice_bottom_sheet_header_noise_cancellation" id="0x7F0A1003" />
-    <public type="id" name="voice_bottom_sheet_header_settings" id="0x7F0A1004" />
-    <public type="id" name="voice_bottom_sheet_header_subtitle" id="0x7F0A1005" />
-    <public type="id" name="voice_bottom_sheet_header_title" id="0x7F0A1006" />
-    <public type="id" name="voice_bottom_sheet_join_video" id="0x7F0A1007" />
-    <public type="id" name="voice_bottom_sheet_recycler" id="0x7F0A1008" />
-    <public type="id" name="voice_bottom_sheet_root" id="0x7F0A1009" />
-    <public type="id" name="voice_call_inline_container" id="0x7F0A100A" />
-    <public type="id" name="voice_channel_divider" id="0x7F0A100B" />
-    <public type="id" name="voice_channel_option" id="0x7F0A100C" />
-    <public type="id" name="voice_connected_ptt" id="0x7F0A100D" />
-    <public type="id" name="voice_controls_sheet_view" id="0x7F0A100E" />
-    <public type="id" name="voice_fullscreen_controls_camera" id="0x7F0A100F" />
-    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7F0A1010" />
-    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7F0A1011" />
-    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7F0A1012" />
-    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7F0A1013" />
-    <public type="id" name="voice_fullscreen_controls_screenshare" id="0x7F0A1014" />
-    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7F0A1015" />
-    <public type="id" name="voice_settings_events" id="0x7F0A1016" />
-    <public type="id" name="voice_settings_invite" id="0x7F0A1017" />
-    <public type="id" name="voice_settings_noise_suppression" id="0x7F0A1018" />
-    <public type="id" name="voice_settings_notifications" id="0x7F0A1019" />
-    <public type="id" name="voice_settings_report" id="0x7F0A101A" />
-    <public type="id" name="voice_settings_sheet_container" id="0x7F0A101B" />
-    <public type="id" name="voice_settings_stage_settings" id="0x7F0A101C" />
-    <public type="id" name="voice_settings_toggle_video_participants" id="0x7F0A101D" />
-    <public type="id" name="voice_settings_view_card" id="0x7F0A101E" />
-    <public type="id" name="voice_settings_voice_settings" id="0x7F0A101F" />
-    <public type="id" name="voice_user_avatar" id="0x7F0A1020" />
-    <public type="id" name="voice_user_limit_current" id="0x7F0A1021" />
-    <public type="id" name="voice_user_limit_max" id="0x7F0A1022" />
-    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7F0A1023" />
-    <public type="id" name="voice_user_list_item_header_label" id="0x7F0A1024" />
-    <public type="id" name="voice_user_list_item_live_indicator" id="0x7F0A1025" />
-    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7F0A1026" />
-    <public type="id" name="voice_user_list_item_spectating_indicator" id="0x7F0A1027" />
-    <public type="id" name="voice_user_list_item_toggle_ringing" id="0x7F0A1028" />
-    <public type="id" name="voice_user_list_item_user_avatar" id="0x7F0A1029" />
-    <public type="id" name="voice_user_list_item_user_name" id="0x7F0A102A" />
-    <public type="id" name="voice_user_list_item_user_stream_preview" id="0x7F0A102B" />
-    <public type="id" name="voice_user_list_item_video_indicator" id="0x7F0A102C" />
-    <public type="id" name="voice_user_name_display" id="0x7F0A102D" />
-    <public type="id" name="volume_slider_max_vol" id="0x7F0A102E" />
-    <public type="id" name="volume_slider_min_vol" id="0x7F0A102F" />
-    <public type="id" name="volume_slider_seek_bar" id="0x7F0A1030" />
-    <public type="id" name="waitlist_button" id="0x7F0A1031" />
-    <public type="id" name="webView" id="0x7F0A1032" />
-    <public type="id" name="welcome_card_add_server" id="0x7F0A1033" />
-    <public type="id" name="welcome_card_invite_friends" id="0x7F0A1034" />
-    <public type="id" name="welcome_card_upload_icon" id="0x7F0A1035" />
-    <public type="id" name="when_playing" id="0x7F0A1036" />
-    <public type="id" name="wide" id="0x7F0A1037" />
-    <public type="id" name="widget_add_friend_user_list_item" id="0x7F0A1038" />
-    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7F0A1039" />
-    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7F0A103A" />
-    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7F0A103B" />
-    <public type="id" name="widget_auth_mfa_info_okay" id="0x7F0A103C" />
-    <public type="id" name="widget_auth_mfa_info_text" id="0x7F0A103D" />
-    <public type="id" name="widget_bug_report_feature_touch_delegate" id="0x7F0A103E" />
-    <public type="id" name="widget_bug_report_severity_touch_delegate" id="0x7F0A103F" />
-    <public type="id" name="widget_channel_action_bar" id="0x7F0A1040" />
-    <public type="id" name="widget_channel_search_item" id="0x7F0A1041" />
-    <public type="id" name="widget_channel_search_item_remove" id="0x7F0A1042" />
-    <public type="id" name="widget_channel_sidebar_actions_guild_view" id="0x7F0A1043" />
-    <public type="id" name="widget_channel_sidebar_actions_private_view" id="0x7F0A1044" />
-    <public type="id" name="widget_channel_topic" id="0x7F0A1045" />
-    <public type="id" name="widget_channels" id="0x7F0A1046" />
-    <public type="id" name="widget_channels_list_container" id="0x7F0A1047" />
-    <public type="id" name="widget_channels_list_empty_friends_state_cs_view" id="0x7F0A1048" />
-    <public type="id" name="widget_channels_list_empty_friends_state_view" id="0x7F0A1049" />
-    <public type="id" name="widget_chat_bottom_space" id="0x7F0A104A" />
-    <public type="id" name="widget_chat_input" id="0x7F0A104B" />
-    <public type="id" name="widget_chat_list" id="0x7F0A104C" />
-    <public type="id" name="widget_chat_list_adapter_item_text_root" id="0x7F0A104D" />
-    <public type="id" name="widget_chat_overlay_actions" id="0x7F0A104E" />
-    <public type="id" name="widget_chat_voice_inline" id="0x7F0A104F" />
-    <public type="id" name="widget_collapsed_user_count" id="0x7F0A1050" />
-    <public type="id" name="widget_collapsed_user_imageview" id="0x7F0A1051" />
-    <public type="id" name="widget_connected_list" id="0x7F0A1052" />
-    <public type="id" name="widget_connection_integration_guild_handle" id="0x7F0A1053" />
-    <public type="id" name="widget_connection_integration_guild_icon" id="0x7F0A1054" />
-    <public type="id" name="widget_connection_integration_guild_join_error" id="0x7F0A1055" />
-    <public type="id" name="widget_connection_integration_guild_name" id="0x7F0A1056" />
-    <public type="id" name="widget_connection_integration_join_guild" id="0x7F0A1057" />
-    <public type="id" name="widget_directory_channel_empty" id="0x7F0A1058" />
-    <public type="id" name="widget_global_search_container" id="0x7F0A1059" />
-    <public type="id" name="widget_global_status" id="0x7F0A105A" />
-    <public type="id" name="widget_guild_hub_profile_actions" id="0x7F0A105B" />
-    <public type="id" name="widget_guild_profile_actions" id="0x7F0A105C" />
-    <public type="id" name="widget_guilds" id="0x7F0A105D" />
-    <public type="id" name="widget_home_container" id="0x7F0A105E" />
-    <public type="id" name="widget_home_panel_center_chat" id="0x7F0A105F" />
-    <public type="id" name="widget_home_panel_directory" id="0x7F0A1060" />
-    <public type="id" name="widget_profile_strip" id="0x7F0A1061" />
-    <public type="id" name="widget_search_input" id="0x7F0A1062" />
-    <public type="id" name="widget_search_results" id="0x7F0A1063" />
-    <public type="id" name="widget_search_suggestions" id="0x7F0A1064" />
-    <public type="id" name="widget_server_settings_channels_container" id="0x7F0A1065" />
-    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7F0A1066" />
-    <public type="id" name="widget_server_settings_emojis_section" id="0x7F0A1067" />
-    <public type="id" name="widget_server_settings_emojis_upload" id="0x7F0A1068" />
-    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7F0A1069" />
-    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7F0A106A" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_header" id="0x7F0A106B" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_placeholder" id="0x7F0A106C" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_recycler" id="0x7F0A106D" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_select" id="0x7F0A106E" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_subtitle" id="0x7F0A106F" />
-    <public type="id" name="widget_simple_bottom_sheet_selector_header" id="0x7F0A1070" />
-    <public type="id" name="widget_simple_bottom_sheet_selector_placeholder" id="0x7F0A1071" />
-    <public type="id" name="widget_simple_bottom_sheet_selector_recycler" id="0x7F0A1072" />
-    <public type="id" name="widget_stage_channel_details_blocked_count" id="0x7F0A1073" />
-    <public type="id" name="widget_stage_channel_details_blocked_icon" id="0x7F0A1074" />
-    <public type="id" name="widget_stage_channel_details_dot" id="0x7F0A1075" />
-    <public type="id" name="widget_stage_channel_details_listener_count" id="0x7F0A1076" />
-    <public type="id" name="widget_stage_channel_details_listener_icon" id="0x7F0A1077" />
-    <public type="id" name="widget_stage_channel_details_name" id="0x7F0A1078" />
-    <public type="id" name="widget_stage_channel_details_speaker_count" id="0x7F0A1079" />
-    <public type="id" name="widget_stage_channel_details_speaker_icon" id="0x7F0A107A" />
-    <public type="id" name="widget_stage_channel_details_topic" id="0x7F0A107B" />
-    <public type="id" name="widget_status" id="0x7F0A107C" />
-    <public type="id" name="widget_tabs_host_bottom_navigation_view" id="0x7F0A107D" />
-    <public type="id" name="widget_tabs_host_container" id="0x7F0A107E" />
-    <public type="id" name="widget_tabs_host_friends" id="0x7F0A107F" />
-    <public type="id" name="widget_tabs_host_global_status_indicator" id="0x7F0A1080" />
-    <public type="id" name="widget_tabs_host_home" id="0x7F0A1081" />
-    <public type="id" name="widget_tabs_host_mentions" id="0x7F0A1082" />
-    <public type="id" name="widget_tabs_host_nav_host" id="0x7F0A1083" />
-    <public type="id" name="widget_tabs_host_non_fullscreen_nav_host" id="0x7F0A1084" />
-    <public type="id" name="widget_tabs_host_user_settings" id="0x7F0A1085" />
-    <public type="id" name="widget_thread_status" id="0x7F0A1086" />
-    <public type="id" name="withText" id="0x7F0A1087" />
-    <public type="id" name="withinBounds" id="0x7F0A1088" />
-    <public type="id" name="wrap" id="0x7F0A1089" />
-    <public type="id" name="wrap_content" id="0x7F0A108A" />
-    <public type="id" name="wrap_reverse" id="0x7F0A108B" />
-    <public type="id" name="wrapper_controls" id="0x7F0A108C" />
-    <public type="id" name="wrapper_reset_rotate" id="0x7F0A108D" />
-    <public type="id" name="wrapper_rotate_by_angle" id="0x7F0A108E" />
-    <public type="id" name="wrapper_states" id="0x7F0A108F" />
-    <public type="id" name="zero_corner_chip" id="0x7F0A1090" />
-    <public type="id" name="zoom" id="0x7F0A1091" />
+    <public type="id" name="channels_list_banner" id="0x7F0A028E" />
+    <public type="id" name="channels_list_banner_foreground" id="0x7F0A028F" />
+    <public type="id" name="channels_list_direct_messages_title" id="0x7F0A0290" />
+    <public type="id" name="channels_list_header" id="0x7F0A0291" />
+    <public type="id" name="channels_list_item_guild_scheduled_event_count" id="0x7F0A0292" />
+    <public type="id" name="channels_list_item_guild_scheduled_event_icon" id="0x7F0A0293" />
+    <public type="id" name="channels_list_item_guild_scheduled_event_label" id="0x7F0A0294" />
+    <public type="id" name="channels_list_item_header" id="0x7F0A0295" />
+    <public type="id" name="channels_list_item_mfa_text" id="0x7F0A0296" />
+    <public type="id" name="channels_list_item_private_avatar" id="0x7F0A0297" />
+    <public type="id" name="channels_list_item_private_desc" id="0x7F0A0298" />
+    <public type="id" name="channels_list_item_private_mentions" id="0x7F0A0299" />
+    <public type="id" name="channels_list_item_private_name" id="0x7F0A029A" />
+    <public type="id" name="channels_list_item_private_tag" id="0x7F0A029B" />
+    <public type="id" name="channels_list_item_text_actions_icon" id="0x7F0A029C" />
+    <public type="id" name="channels_list_item_text_actions_title" id="0x7F0A029D" />
+    <public type="id" name="channels_list_item_thread_actions_archive_settings" id="0x7F0A029E" />
+    <public type="id" name="channels_list_item_thread_actions_archive_settings_header" id="0x7F0A029F" />
+    <public type="id" name="channels_list_item_thread_actions_archive_settings_subheader" id="0x7F0A02A0" />
+    <public type="id" name="channels_list_item_thread_actions_channel_notifications" id="0x7F0A02A1" />
+    <public type="id" name="channels_list_item_thread_actions_copy_id" id="0x7F0A02A2" />
+    <public type="id" name="channels_list_item_thread_actions_developer_divider" id="0x7F0A02A3" />
+    <public type="id" name="channels_list_item_thread_actions_divider" id="0x7F0A02A4" />
+    <public type="id" name="channels_list_item_thread_actions_edit" id="0x7F0A02A5" />
+    <public type="id" name="channels_list_item_thread_actions_icon" id="0x7F0A02A6" />
+    <public type="id" name="channels_list_item_thread_actions_leave" id="0x7F0A02A7" />
+    <public type="id" name="channels_list_item_thread_actions_mark_as_read" id="0x7F0A02A8" />
+    <public type="id" name="channels_list_item_thread_actions_mute" id="0x7F0A02A9" />
+    <public type="id" name="channels_list_item_thread_actions_title" id="0x7F0A02AA" />
+    <public type="id" name="channels_list_item_thread_actions_unarchive" id="0x7F0A02AB" />
+    <public type="id" name="channels_list_new" id="0x7F0A02AC" />
+    <public type="id" name="channels_list_premium_guild_hint" id="0x7F0A02AD" />
+    <public type="id" name="channels_list_premium_guild_hint_button" id="0x7F0A02AE" />
+    <public type="id" name="channels_list_premium_guild_hint_subtitle" id="0x7F0A02AF" />
+    <public type="id" name="channels_list_premium_guild_hint_title" id="0x7F0A02B0" />
+    <public type="id" name="channels_list_private_channels_header" id="0x7F0A02B1" />
+    <public type="id" name="channels_list_search" id="0x7F0A02B2" />
+    <public type="id" name="channels_list_start_group" id="0x7F0A02B3" />
+    <public type="id" name="channels_list_tooltip_background" id="0x7F0A02B4" />
+    <public type="id" name="channels_list_tooltip_top_tail" id="0x7F0A02B5" />
+    <public type="id" name="channels_list_unreads" id="0x7F0A02B6" />
+    <public type="id" name="channels_list_unreads_background" id="0x7F0A02B7" />
+    <public type="id" name="channels_list_unreads_stub" id="0x7F0A02B8" />
+    <public type="id" name="channels_toolbar" id="0x7F0A02B9" />
+    <public type="id" name="chat_action_item_button" id="0x7F0A02BA" />
+    <public type="id" name="chat_action_item_image" id="0x7F0A02BB" />
+    <public type="id" name="chat_action_item_subtext" id="0x7F0A02BC" />
+    <public type="id" name="chat_action_item_text" id="0x7F0A02BD" />
+    <public type="id" name="chat_input_application_avatar" id="0x7F0A02BE" />
+    <public type="id" name="chat_input_application_commands_option_description" id="0x7F0A02BF" />
+    <public type="id" name="chat_input_application_commands_recycler" id="0x7F0A02C0" />
+    <public type="id" name="chat_input_application_name" id="0x7F0A02C1" />
+    <public type="id" name="chat_input_categories_recycler" id="0x7F0A02C2" />
+    <public type="id" name="chat_input_container" id="0x7F0A02C3" />
+    <public type="id" name="chat_input_context_bar" id="0x7F0A02C4" />
+    <public type="id" name="chat_input_context_cancel" id="0x7F0A02C5" />
+    <public type="id" name="chat_input_context_description" id="0x7F0A02C6" />
+    <public type="id" name="chat_input_context_reply_mention_button" id="0x7F0A02C7" />
+    <public type="id" name="chat_input_context_reply_mention_button_image" id="0x7F0A02C8" />
+    <public type="id" name="chat_input_context_reply_mention_button_text" id="0x7F0A02C9" />
+    <public type="id" name="chat_input_emoji_matching_header" id="0x7F0A02CA" />
+    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7F0A02CB" />
+    <public type="id" name="chat_input_emoji_picker_view_flipper" id="0x7F0A02CC" />
+    <public type="id" name="chat_input_emoji_upsell_pile" id="0x7F0A02CD" />
+    <public type="id" name="chat_input_emoji_upsell_text" id="0x7F0A02CE" />
+    <public type="id" name="chat_input_guard_action" id="0x7F0A02CF" />
+    <public type="id" name="chat_input_guard_action_secondary" id="0x7F0A02D0" />
+    <public type="id" name="chat_input_guard_subtext" id="0x7F0A02D1" />
+    <public type="id" name="chat_input_guard_text" id="0x7F0A02D2" />
+    <public type="id" name="chat_input_icon_barrier" id="0x7F0A02D3" />
+    <public type="id" name="chat_input_item_avatar" id="0x7F0A02D4" />
+    <public type="id" name="chat_input_item_description" id="0x7F0A02D5" />
+    <public type="id" name="chat_input_item_divider" id="0x7F0A02D6" />
+    <public type="id" name="chat_input_item_emoji" id="0x7F0A02D7" />
+    <public type="id" name="chat_input_item_icon_container" id="0x7F0A02D8" />
+    <public type="id" name="chat_input_item_name" id="0x7F0A02D9" />
+    <public type="id" name="chat_input_item_name_right" id="0x7F0A02DA" />
+    <public type="id" name="chat_input_item_status" id="0x7F0A02DB" />
+    <public type="id" name="chat_input_mentions_recycler" id="0x7F0A02DC" />
+    <public type="id" name="chat_input_sticker_picker_empty_container" id="0x7F0A02DD" />
+    <public type="id" name="chat_input_sticker_picker_empty_container_phase_1" id="0x7F0A02DE" />
+    <public type="id" name="chat_input_sticker_picker_empty_image" id="0x7F0A02DF" />
+    <public type="id" name="chat_input_sticker_picker_empty_link" id="0x7F0A02E0" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_1" id="0x7F0A02E1" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_2" id="0x7F0A02E2" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_3" id="0x7F0A02E3" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_4" id="0x7F0A02E4" />
+    <public type="id" name="chat_input_sticker_picker_empty_subscribe" id="0x7F0A02E5" />
+    <public type="id" name="chat_input_sticker_picker_empty_subtitle" id="0x7F0A02E6" />
+    <public type="id" name="chat_input_sticker_picker_empty_subtitle_phase_1" id="0x7F0A02E7" />
+    <public type="id" name="chat_input_sticker_picker_empty_title" id="0x7F0A02E8" />
+    <public type="id" name="chat_input_sticker_picker_empty_title_phase_1" id="0x7F0A02E9" />
+    <public type="id" name="chat_input_sticker_picker_recycler" id="0x7F0A02EA" />
+    <public type="id" name="chat_input_sticker_picker_view_flipper" id="0x7F0A02EB" />
+    <public type="id" name="chat_input_stickers_container" id="0x7F0A02EC" />
+    <public type="id" name="chat_input_stickers_matching_header" id="0x7F0A02ED" />
+    <public type="id" name="chat_input_stickers_recycler" id="0x7F0A02EE" />
+    <public type="id" name="chat_input_suggested_sticker_1" id="0x7F0A02EF" />
+    <public type="id" name="chat_input_suggested_sticker_2" id="0x7F0A02F0" />
+    <public type="id" name="chat_input_suggested_sticker_3" id="0x7F0A02F1" />
+    <public type="id" name="chat_input_suggested_sticker_4" id="0x7F0A02F2" />
+    <public type="id" name="chat_input_suggested_sticker_cancel" id="0x7F0A02F3" />
+    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7F0A02F4" />
+    <public type="id" name="chat_input_widget" id="0x7F0A02F5" />
+    <public type="id" name="chat_input_wrap" id="0x7F0A02F6" />
+    <public type="id" name="chat_item" id="0x7F0A02F7" />
+    <public type="id" name="chat_list_adapter_item_alert_text" id="0x7F0A02F8" />
+    <public type="id" name="chat_list_adapter_item_blocked" id="0x7F0A02F9" />
+    <public type="id" name="chat_list_adapter_item_call_icon" id="0x7F0A02FA" />
+    <public type="id" name="chat_list_adapter_item_call_participants" id="0x7F0A02FB" />
+    <public type="id" name="chat_list_adapter_item_call_subtitle" id="0x7F0A02FC" />
+    <public type="id" name="chat_list_adapter_item_call_title" id="0x7F0A02FD" />
+    <public type="id" name="chat_list_adapter_item_call_unjoined_ongoing_subtitle" id="0x7F0A02FE" />
+    <public type="id" name="chat_list_adapter_item_chat_attachment_icon" id="0x7F0A02FF" />
+    <public type="id" name="chat_list_adapter_item_component_root" id="0x7F0A0300" />
+    <public type="id" name="chat_list_adapter_item_edit_channel" id="0x7F0A0301" />
+    <public type="id" name="chat_list_adapter_item_failed" id="0x7F0A0302" />
+    <public type="id" name="chat_list_adapter_item_failed_upload_list" id="0x7F0A0303" />
+    <public type="id" name="chat_list_adapter_item_gutter_bg" id="0x7F0A0304" />
+    <public type="id" name="chat_list_adapter_item_header" id="0x7F0A0305" />
+    <public type="id" name="chat_list_adapter_item_highlighted_bg" id="0x7F0A0306" />
+    <public type="id" name="chat_list_adapter_item_icon_help" id="0x7F0A0307" />
+    <public type="id" name="chat_list_adapter_item_private_channel_start_header" id="0x7F0A0308" />
+    <public type="id" name="chat_list_adapter_item_reply_leading_views" id="0x7F0A0309" />
+    <public type="id" name="chat_list_adapter_item_selectable_background" id="0x7F0A030A" />
+    <public type="id" name="chat_list_adapter_item_sticker" id="0x7F0A030B" />
+    <public type="id" name="chat_list_adapter_item_sticker_greet" id="0x7F0A030C" />
+    <public type="id" name="chat_list_adapter_item_sticker_greet_text" id="0x7F0A030D" />
+    <public type="id" name="chat_list_adapter_item_subheader1" id="0x7F0A030E" />
+    <public type="id" name="chat_list_adapter_item_subheader2" id="0x7F0A030F" />
+    <public type="id" name="chat_list_adapter_item_text" id="0x7F0A0310" />
+    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7F0A0311" />
+    <public type="id" name="chat_list_adapter_item_text_command" id="0x7F0A0312" />
+    <public type="id" name="chat_list_adapter_item_text_decorator" id="0x7F0A0313" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_avatar" id="0x7F0A0314" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_reply_icon" id="0x7F0A0315" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_reply_link_icon" id="0x7F0A0316" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_reply_name" id="0x7F0A0317" />
+    <public type="id" name="chat_list_adapter_item_text_dismiss" id="0x7F0A0318" />
+    <public type="id" name="chat_list_adapter_item_text_error" id="0x7F0A0319" />
+    <public type="id" name="chat_list_adapter_item_text_header" id="0x7F0A031A" />
+    <public type="id" name="chat_list_adapter_item_text_loading" id="0x7F0A031B" />
+    <public type="id" name="chat_list_adapter_item_text_name" id="0x7F0A031C" />
+    <public type="id" name="chat_list_adapter_item_text_reply_content" id="0x7F0A031D" />
+    <public type="id" name="chat_list_adapter_item_text_role_icon" id="0x7F0A031E" />
+    <public type="id" name="chat_list_adapter_item_text_tag" id="0x7F0A031F" />
+    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7F0A0320" />
+    <public type="id" name="chat_list_adapter_item_thread_embed_spine" id="0x7F0A0321" />
+    <public type="id" name="chat_list_adapter_item_unjoined_call_duration" id="0x7F0A0322" />
+    <public type="id" name="chat_list_adapter_item_visibility_icon" id="0x7F0A0323" />
+    <public type="id" name="chat_list_adapter_thread_header_icon" id="0x7F0A0324" />
+    <public type="id" name="chat_list_empty_image" id="0x7F0A0325" />
+    <public type="id" name="chat_list_empty_pins_text" id="0x7F0A0326" />
+    <public type="id" name="chat_list_item_attachment_barrier" id="0x7F0A0327" />
+    <public type="id" name="chat_list_item_attachment_card" id="0x7F0A0328" />
+    <public type="id" name="chat_list_item_attachment_description" id="0x7F0A0329" />
+    <public type="id" name="chat_list_item_attachment_download" id="0x7F0A032A" />
+    <public type="id" name="chat_list_item_attachment_icon" id="0x7F0A032B" />
+    <public type="id" name="chat_list_item_attachment_inline_media" id="0x7F0A032C" />
+    <public type="id" name="chat_list_item_attachment_name" id="0x7F0A032D" />
+    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7F0A032E" />
+    <public type="id" name="chat_list_item_embed_author_icon" id="0x7F0A032F" />
+    <public type="id" name="chat_list_item_embed_author_text" id="0x7F0A0330" />
+    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7F0A0331" />
+    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7F0A0332" />
+    <public type="id" name="chat_list_item_embed_container_card" id="0x7F0A0333" />
+    <public type="id" name="chat_list_item_embed_content" id="0x7F0A0334" />
+    <public type="id" name="chat_list_item_embed_description" id="0x7F0A0335" />
+    <public type="id" name="chat_list_item_embed_divider" id="0x7F0A0336" />
+    <public type="id" name="chat_list_item_embed_field_name" id="0x7F0A0337" />
+    <public type="id" name="chat_list_item_embed_field_value" id="0x7F0A0338" />
+    <public type="id" name="chat_list_item_embed_fields" id="0x7F0A0339" />
+    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7F0A033A" />
+    <public type="id" name="chat_list_item_embed_footer_text" id="0x7F0A033B" />
+    <public type="id" name="chat_list_item_embed_image" id="0x7F0A033C" />
+    <public type="id" name="chat_list_item_embed_image_icons" id="0x7F0A033D" />
+    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7F0A033E" />
+    <public type="id" name="chat_list_item_embed_provider" id="0x7F0A033F" />
+    <public type="id" name="chat_list_item_embed_spoiler" id="0x7F0A0340" />
+    <public type="id" name="chat_list_item_embed_title" id="0x7F0A0341" />
+    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7F0A0342" />
+    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7F0A0343" />
+    <public type="id" name="chat_list_item_message_header_channel" id="0x7F0A0344" />
+    <public type="id" name="chat_list_item_message_header_divider" id="0x7F0A0345" />
+    <public type="id" name="chat_list_item_message_header_guild" id="0x7F0A0346" />
+    <public type="id" name="chat_list_item_message_header_spacer" id="0x7F0A0347" />
+    <public type="id" name="chat_list_item_reactions" id="0x7F0A0348" />
+    <public type="id" name="chat_list_recycler" id="0x7F0A0349" />
+    <public type="id" name="chat_list_search_empty_image" id="0x7F0A034A" />
+    <public type="id" name="chat_list_search_error_text" id="0x7F0A034B" />
+    <public type="id" name="chat_list_search_indexing_animation" id="0x7F0A034C" />
+    <public type="id" name="chat_list_search_indexing_text" id="0x7F0A034D" />
+    <public type="id" name="chat_member_verification_input_guard_action" id="0x7F0A034E" />
+    <public type="id" name="chat_member_verification_input_guard_chevron" id="0x7F0A034F" />
+    <public type="id" name="chat_member_verification_input_guard_icon" id="0x7F0A0350" />
+    <public type="id" name="chat_member_verification_input_guard_text" id="0x7F0A0351" />
+    <public type="id" name="chat_overlay_old_messages_fab" id="0x7F0A0352" />
+    <public type="id" name="chat_overlay_typing" id="0x7F0A0353" />
+    <public type="id" name="chat_overlay_typing_dots" id="0x7F0A0354" />
+    <public type="id" name="chat_status_unread_messages" id="0x7F0A0355" />
+    <public type="id" name="chat_status_unread_messages_mark" id="0x7F0A0356" />
+    <public type="id" name="chat_status_unread_messages_text" id="0x7F0A0357" />
+    <public type="id" name="chat_typing_users_slowmode" id="0x7F0A0358" />
+    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7F0A0359" />
+    <public type="id" name="chat_typing_users_typing" id="0x7F0A035A" />
+    <public type="id" name="chat_upload_1" id="0x7F0A035B" />
+    <public type="id" name="chat_upload_2" id="0x7F0A035C" />
+    <public type="id" name="chat_upload_3" id="0x7F0A035D" />
+    <public type="id" name="check" id="0x7F0A035E" />
+    <public type="id" name="checkable_off_container" id="0x7F0A035F" />
+    <public type="id" name="checkbox" id="0x7F0A0360" />
+    <public type="id" name="checkboxes_container" id="0x7F0A0361" />
+    <public type="id" name="checked" id="0x7F0A0362" />
+    <public type="id" name="chip" id="0x7F0A0363" />
+    <public type="id" name="chip1" id="0x7F0A0364" />
+    <public type="id" name="chip2" id="0x7F0A0365" />
+    <public type="id" name="chip3" id="0x7F0A0366" />
+    <public type="id" name="chip_group" id="0x7F0A0367" />
+    <public type="id" name="chip_image" id="0x7F0A0368" />
+    <public type="id" name="chip_text" id="0x7F0A0369" />
+    <public type="id" name="chips_view" id="0x7F0A036A" />
+    <public type="id" name="choose_plan_empty_container" id="0x7F0A036B" />
+    <public type="id" name="choose_plan_empty_description" id="0x7F0A036C" />
+    <public type="id" name="choose_plan_recycler" id="0x7F0A036D" />
+    <public type="id" name="chronometer" id="0x7F0A036E" />
+    <public type="id" name="circle" id="0x7F0A036F" />
+    <public type="id" name="circle_center" id="0x7F0A0370" />
+    <public type="id" name="claimPromoBody" id="0x7F0A0371" />
+    <public type="id" name="claimPromoCode" id="0x7F0A0372" />
+    <public type="id" name="claimPromoCodeBox" id="0x7F0A0373" />
+    <public type="id" name="claimPromoCopyButton" id="0x7F0A0374" />
+    <public type="id" name="claimPromoFailure" id="0x7F0A0375" />
+    <public type="id" name="claimPromoFailureCloseButton" id="0x7F0A0376" />
+    <public type="id" name="claimPromoFlipper" id="0x7F0A0377" />
+    <public type="id" name="claimPromoLoading" id="0x7F0A0378" />
+    <public type="id" name="claimPromoMaybeLaterButton" id="0x7F0A0379" />
+    <public type="id" name="claimPromoRedeemButton" id="0x7F0A037A" />
+    <public type="id" name="claimPromoSuccess" id="0x7F0A037B" />
+    <public type="id" name="clear_text" id="0x7F0A037C" />
+    <public type="id" name="client_outdated_anchor_wrap" id="0x7F0A037D" />
+    <public type="id" name="client_outdated_update" id="0x7F0A037E" />
+    <public type="id" name="clip_horizontal" id="0x7F0A037F" />
+    <public type="id" name="clip_vertical" id="0x7F0A0380" />
+    <public type="id" name="clockwise" id="0x7F0A0381" />
+    <public type="id" name="close" id="0x7F0A0382" />
+    <public type="id" name="close_button" id="0x7F0A0383" />
+    <public type="id" name="cloudy" id="0x7F0A0384" />
+    <public type="id" name="collapseActionView" id="0x7F0A0385" />
+    <public type="id" name="collapsing_toolbar" id="0x7F0A0386" />
+    <public type="id" name="column" id="0x7F0A0387" />
+    <public type="id" name="column_reverse" id="0x7F0A0388" />
+    <public type="id" name="command_bottom_sheet_command_avatar" id="0x7F0A0389" />
+    <public type="id" name="command_bottom_sheet_command_content" id="0x7F0A038A" />
+    <public type="id" name="command_bottom_sheet_command_copy_button" id="0x7F0A038B" />
+    <public type="id" name="command_bottom_sheet_command_loader" id="0x7F0A038C" />
+    <public type="id" name="command_bottom_sheet_command_slash_heading" id="0x7F0A038D" />
+    <public type="id" name="command_bottom_sheet_command_title" id="0x7F0A038E" />
+    <public type="id" name="command_bottom_sheet_command_title_application_name" id="0x7F0A038F" />
+    <public type="id" name="command_category_item_icon" id="0x7F0A0390" />
+    <public type="id" name="community_first_step_scroll" id="0x7F0A0391" />
+    <public type="id" name="community_get_started_header" id="0x7F0A0392" />
+    <public type="id" name="community_get_started_header_icon" id="0x7F0A0393" />
+    <public type="id" name="community_get_started_header_icon_text" id="0x7F0A0394" />
+    <public type="id" name="community_get_started_header_image" id="0x7F0A0395" />
+    <public type="id" name="community_get_started_scroll" id="0x7F0A0396" />
+    <public type="id" name="community_guideline" id="0x7F0A0397" />
+    <public type="id" name="community_guidelines_channel" id="0x7F0A0398" />
+    <public type="id" name="community_header_image" id="0x7F0A0399" />
+    <public type="id" name="community_list_adapter_item_description" id="0x7F0A039A" />
+    <public type="id" name="community_list_adapter_item_icon" id="0x7F0A039B" />
+    <public type="id" name="community_list_adapter_item_text_header" id="0x7F0A039C" />
+    <public type="id" name="community_list_adapter_item_text_icon" id="0x7F0A039D" />
+    <public type="id" name="community_list_adapter_item_text_name" id="0x7F0A039E" />
+    <public type="id" name="community_rules_channel" id="0x7F0A039F" />
+    <public type="id" name="community_setting_community_guidelines_switch" id="0x7F0A03A0" />
+    <public type="id" name="community_setting_get_started" id="0x7F0A03A1" />
+    <public type="id" name="community_setting_guidelines" id="0x7F0A03A2" />
+    <public type="id" name="community_setting_manage_permissions_switch" id="0x7F0A03A3" />
+    <public type="id" name="community_setting_notifications_to_mentions_switch" id="0x7F0A03A4" />
+    <public type="id" name="community_settings_scan_messages_switch" id="0x7F0A03A5" />
+    <public type="id" name="community_settings_verified_emailed_switch" id="0x7F0A03A6" />
+    <public type="id" name="community_step_header" id="0x7F0A03A7" />
+    <public type="id" name="community_updates_channel" id="0x7F0A03A8" />
+    <public type="id" name="compression_toggle" id="0x7F0A03A9" />
+    <public type="id" name="compression_toggle_subtext" id="0x7F0A03AA" />
+    <public type="id" name="confirm" id="0x7F0A03AB" />
+    <public type="id" name="confirm_button" id="0x7F0A03AC" />
+    <public type="id" name="confirm_deleting_community_body_text" id="0x7F0A03AD" />
+    <public type="id" name="confirm_deleting_community_cancel" id="0x7F0A03AE" />
+    <public type="id" name="confirm_deleting_community_header" id="0x7F0A03AF" />
+    <public type="id" name="confirm_deleting_community_header_container" id="0x7F0A03B0" />
+    <public type="id" name="confirm_deleting_community_ok" id="0x7F0A03B1" />
+    <public type="id" name="confirm_guild_scheduled_event_notify" id="0x7F0A03B2" />
+    <public type="id" name="confirm_guild_scheduled_event_preview" id="0x7F0A03B3" />
+    <public type="id" name="confirm_guild_scheduled_event_subtitle" id="0x7F0A03B4" />
+    <public type="id" name="confirm_guild_scheduled_event_title" id="0x7F0A03B5" />
+    <public type="id" name="confirm_guild_scheduled_event_toolbar" id="0x7F0A03B6" />
+    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7F0A03B7" />
+    <public type="id" name="connected_account_actions_dialog_header" id="0x7F0A03B8" />
+    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7F0A03B9" />
+    <public type="id" name="connected_account_disconnect" id="0x7F0A03BA" />
+    <public type="id" name="connected_account_divider" id="0x7F0A03BB" />
+    <public type="id" name="connected_account_img" id="0x7F0A03BC" />
+    <public type="id" name="connected_account_name" id="0x7F0A03BD" />
+    <public type="id" name="connections" id="0x7F0A03BE" />
+    <public type="id" name="connections_empty" id="0x7F0A03BF" />
+    <public type="id" name="connections_recycler" id="0x7F0A03C0" />
+    <public type="id" name="connections_xbox_code" id="0x7F0A03C1" />
+    <public type="id" name="connections_xbox_login" id="0x7F0A03C2" />
+    <public type="id" name="contact" id="0x7F0A03C3" />
+    <public type="id" name="contact_sync_add_phone" id="0x7F0A03C4" />
+    <public type="id" name="contact_sync_add_phone_input" id="0x7F0A03C5" />
+    <public type="id" name="contact_sync_add_phone_next" id="0x7F0A03C6" />
+    <public type="id" name="contact_sync_add_phone_subtitle" id="0x7F0A03C7" />
+    <public type="id" name="contact_sync_add_phone_title" id="0x7F0A03C8" />
+    <public type="id" name="contact_sync_discovery_info_1" id="0x7F0A03C9" />
+    <public type="id" name="contact_sync_discovery_info_2" id="0x7F0A03CA" />
+    <public type="id" name="contact_sync_discovery_toggle" id="0x7F0A03CB" />
+    <public type="id" name="contact_sync_friend_suggestions" id="0x7F0A03CC" />
+    <public type="id" name="contact_sync_friend_suggestions_empty" id="0x7F0A03CD" />
+    <public type="id" name="contact_sync_landing" id="0x7F0A03CE" />
+    <public type="id" name="contact_sync_landing_cta" id="0x7F0A03CF" />
+    <public type="id" name="contact_sync_landing_needs_permissions" id="0x7F0A03D0" />
+    <public type="id" name="contact_sync_landing_next_button" id="0x7F0A03D1" />
+    <public type="id" name="contact_sync_landing_permissions_divider" id="0x7F0A03D2" />
+    <public type="id" name="contact_sync_landing_subtitle" id="0x7F0A03D3" />
+    <public type="id" name="contact_sync_landing_title" id="0x7F0A03D4" />
+    <public type="id" name="contact_sync_landing_toggle_info" id="0x7F0A03D5" />
+    <public type="id" name="contact_sync_name" id="0x7F0A03D6" />
+    <public type="id" name="contact_sync_name_input" id="0x7F0A03D7" />
+    <public type="id" name="contact_sync_name_input_wrap" id="0x7F0A03D8" />
+    <public type="id" name="contact_sync_name_next_button" id="0x7F0A03D9" />
+    <public type="id" name="contact_sync_name_prefill_hint" id="0x7F0A03DA" />
+    <public type="id" name="contact_sync_name_subtitle" id="0x7F0A03DB" />
+    <public type="id" name="contact_sync_name_title" id="0x7F0A03DC" />
+    <public type="id" name="contact_sync_permissions_discoverable_toggle" id="0x7F0A03DD" />
+    <public type="id" name="contact_sync_permissions_discovery_info_1" id="0x7F0A03DE" />
+    <public type="id" name="contact_sync_permissions_discovery_info_2" id="0x7F0A03DF" />
+    <public type="id" name="contact_sync_permissions_email_toggle" id="0x7F0A03E0" />
+    <public type="id" name="contact_sync_permissions_learn_more" id="0x7F0A03E1" />
+    <public type="id" name="contact_sync_permissions_phone_toggle" id="0x7F0A03E2" />
+    <public type="id" name="contact_sync_permissions_subtitle" id="0x7F0A03E3" />
+    <public type="id" name="contact_sync_setting_email" id="0x7F0A03E4" />
+    <public type="id" name="contact_sync_setting_enabled" id="0x7F0A03E5" />
+    <public type="id" name="contact_sync_setting_info" id="0x7F0A03E6" />
+    <public type="id" name="contact_sync_setting_phone" id="0x7F0A03E7" />
+    <public type="id" name="contact_sync_setting_staff_only" id="0x7F0A03E8" />
+    <public type="id" name="contact_sync_suggestions_empty_subtitle" id="0x7F0A03E9" />
+    <public type="id" name="contact_sync_suggestions_empty_title" id="0x7F0A03EA" />
+    <public type="id" name="contact_sync_suggestions_invite_button" id="0x7F0A03EB" />
+    <public type="id" name="contact_sync_suggestions_list_recycler" id="0x7F0A03EC" />
+    <public type="id" name="contact_sync_suggestions_skip_button" id="0x7F0A03ED" />
+    <public type="id" name="contact_sync_suggestions_submit_button" id="0x7F0A03EE" />
+    <public type="id" name="contact_sync_suggestions_subtitle" id="0x7F0A03EF" />
+    <public type="id" name="contact_sync_suggestions_title" id="0x7F0A03F0" />
+    <public type="id" name="contact_sync_upsell_cta" id="0x7F0A03F1" />
+    <public type="id" name="contact_sync_upsell_next_button" id="0x7F0A03F2" />
+    <public type="id" name="contact_sync_upsell_skip_button" id="0x7F0A03F3" />
+    <public type="id" name="contact_sync_upsell_subtitle" id="0x7F0A03F4" />
+    <public type="id" name="contact_sync_upsell_title" id="0x7F0A03F5" />
+    <public type="id" name="contact_sync_upsell_toggle_info" id="0x7F0A03F6" />
+    <public type="id" name="contact_sync_verify_phone" id="0x7F0A03F7" />
+    <public type="id" name="contact_sync_verify_phone_code" id="0x7F0A03F8" />
+    <public type="id" name="contact_sync_verify_phone_subtitle" id="0x7F0A03F9" />
+    <public type="id" name="contact_sync_verify_phone_title" id="0x7F0A03FA" />
+    <public type="id" name="contact_sync_view_flipper" id="0x7F0A03FB" />
+    <public type="id" name="container" id="0x7F0A03FC" />
+    <public type="id" name="content" id="0x7F0A03FD" />
+    <public type="id" name="contentPanel" id="0x7F0A03FE" />
+    <public type="id" name="content_background" id="0x7F0A03FF" />
+    <public type="id" name="content_container" id="0x7F0A0400" />
+    <public type="id" name="content_iv" id="0x7F0A0401" />
+    <public type="id" name="content_pager" id="0x7F0A0402" />
+    <public type="id" name="content_tabs" id="0x7F0A0403" />
+    <public type="id" name="contiguous" id="0x7F0A0404" />
+    <public type="id" name="continue_button" id="0x7F0A0405" />
+    <public type="id" name="controls_shadow" id="0x7F0A0406" />
+    <public type="id" name="controls_wrapper" id="0x7F0A0407" />
+    <public type="id" name="coordinator" id="0x7F0A0408" />
+    <public type="id" name="copy_id" id="0x7F0A0409" />
+    <public type="id" name="copy_link_group" id="0x7F0A040A" />
+    <public type="id" name="copy_link_icon" id="0x7F0A040B" />
+    <public type="id" name="copy_link_icon_barrier" id="0x7F0A040C" />
+    <public type="id" name="copy_link_subtitle" id="0x7F0A040D" />
+    <public type="id" name="copy_link_title" id="0x7F0A040E" />
+    <public type="id" name="cos" id="0x7F0A040F" />
+    <public type="id" name="counter_text_1" id="0x7F0A0410" />
+    <public type="id" name="counter_text_2" id="0x7F0A0411" />
+    <public type="id" name="counter_text_switcher" id="0x7F0A0412" />
+    <public type="id" name="counterclockwise" id="0x7F0A0413" />
+    <public type="id" name="cpv_color_image_view" id="0x7F0A0414" />
+    <public type="id" name="cpv_color_panel_new" id="0x7F0A0415" />
+    <public type="id" name="cpv_color_panel_old" id="0x7F0A0416" />
+    <public type="id" name="cpv_color_panel_view" id="0x7F0A0417" />
+    <public type="id" name="cpv_color_picker_content" id="0x7F0A0418" />
+    <public type="id" name="cpv_color_picker_custom_button" id="0x7F0A0419" />
+    <public type="id" name="cpv_color_picker_custom_reset" id="0x7F0A041A" />
+    <public type="id" name="cpv_color_picker_select_button" id="0x7F0A041B" />
+    <public type="id" name="cpv_color_picker_title" id="0x7F0A041C" />
+    <public type="id" name="cpv_color_picker_view" id="0x7F0A041D" />
+    <public type="id" name="cpv_hex" id="0x7F0A041E" />
+    <public type="id" name="cpv_hex_container" id="0x7F0A041F" />
+    <public type="id" name="cpv_hex_prefix" id="0x7F0A0420" />
+    <public type="id" name="cpv_preference_preview_color_panel" id="0x7F0A0421" />
+    <public type="id" name="create_channel_announcements_container" id="0x7F0A0422" />
+    <public type="id" name="create_channel_announcements_icon" id="0x7F0A0423" />
+    <public type="id" name="create_channel_announcements_radio" id="0x7F0A0424" />
+    <public type="id" name="create_channel_announcements_title" id="0x7F0A0425" />
+    <public type="id" name="create_channel_follower_button" id="0x7F0A0426" />
+    <public type="id" name="create_channel_name_layout" id="0x7F0A0427" />
+    <public type="id" name="create_channel_private_container" id="0x7F0A0428" />
+    <public type="id" name="create_channel_private_info" id="0x7F0A0429" />
+    <public type="id" name="create_channel_private_switch" id="0x7F0A042A" />
+    <public type="id" name="create_channel_private_title" id="0x7F0A042B" />
+    <public type="id" name="create_channel_role_access_recycler" id="0x7F0A042C" />
+    <public type="id" name="create_channel_role_divider" id="0x7F0A042D" />
+    <public type="id" name="create_channel_role_header" id="0x7F0A042E" />
+    <public type="id" name="create_channel_stage_container" id="0x7F0A042F" />
+    <public type="id" name="create_channel_stage_icon" id="0x7F0A0430" />
+    <public type="id" name="create_channel_stage_radio" id="0x7F0A0431" />
+    <public type="id" name="create_channel_stage_title" id="0x7F0A0432" />
+    <public type="id" name="create_channel_text_container" id="0x7F0A0433" />
+    <public type="id" name="create_channel_text_icon" id="0x7F0A0434" />
+    <public type="id" name="create_channel_text_radio" id="0x7F0A0435" />
+    <public type="id" name="create_channel_text_title" id="0x7F0A0436" />
+    <public type="id" name="create_channel_type_container" id="0x7F0A0437" />
+    <public type="id" name="create_channel_voice_container" id="0x7F0A0438" />
+    <public type="id" name="create_channel_voice_icon" id="0x7F0A0439" />
+    <public type="id" name="create_channel_voice_radio" id="0x7F0A043A" />
+    <public type="id" name="create_channel_voice_title" id="0x7F0A043B" />
+    <public type="id" name="create_event_button" id="0x7F0A043C" />
+    <public type="id" name="create_event_subtitle" id="0x7F0A043D" />
+    <public type="id" name="create_guild_subscription_role_tier_steps_view" id="0x7F0A043E" />
+    <public type="id" name="create_subscription_tier_description" id="0x7F0A043F" />
+    <public type="id" name="create_subscription_tier_description_layout" id="0x7F0A0440" />
+    <public type="id" name="create_subscription_tier_details_layout" id="0x7F0A0441" />
+    <public type="id" name="create_subscription_tier_image_upload_view" id="0x7F0A0442" />
+    <public type="id" name="create_subscription_tier_name" id="0x7F0A0443" />
+    <public type="id" name="create_subscription_tier_name_layout" id="0x7F0A0444" />
+    <public type="id" name="create_subscription_tier_price" id="0x7F0A0445" />
+    <public type="id" name="create_subscription_tier_subtitle" id="0x7F0A0446" />
+    <public type="id" name="create_subscription_tier_title" id="0x7F0A0447" />
+    <public type="id" name="creation_intent_first_option" id="0x7F0A0448" />
+    <public type="id" name="creation_intent_first_option_text" id="0x7F0A0449" />
+    <public type="id" name="creation_intent_second_option" id="0x7F0A044A" />
+    <public type="id" name="creation_intent_second_option_text" id="0x7F0A044B" />
+    <public type="id" name="creation_intent_skip_text" id="0x7F0A044C" />
+    <public type="id" name="credit_header" id="0x7F0A044D" />
+    <public type="id" name="credit_icon" id="0x7F0A044E" />
+    <public type="id" name="credit_info" id="0x7F0A044F" />
+    <public type="id" name="credit_info_container" id="0x7F0A0450" />
+    <public type="id" name="credit_nitro" id="0x7F0A0451" />
+    <public type="id" name="credit_nitro_classic" id="0x7F0A0452" />
+    <public type="id" name="credit_nitro_divider" id="0x7F0A0453" />
+    <public type="id" name="credit_time" id="0x7F0A0454" />
+    <public type="id" name="crown" id="0x7F0A0455" />
+    <public type="id" name="cs_subtitle" id="0x7F0A0456" />
+    <public type="id" name="current_bitrate_display" id="0x7F0A0457" />
+    <public type="id" name="current_user_limit_display" id="0x7F0A0458" />
+    <public type="id" name="custom" id="0x7F0A0459" />
+    <public type="id" name="customPanel" id="0x7F0A045A" />
+    <public type="id" name="cut" id="0x7F0A045B" />
+    <public type="id" name="dark" id="0x7F0A045C" />
+    <public type="id" name="date" id="0x7F0A045D" />
+    <public type="id" name="date_picker_actions" id="0x7F0A045E" />
+    <public type="id" name="daylight" id="0x7F0A045F" />
+    <public type="id" name="deafen_secondary_button" id="0x7F0A0460" />
+    <public type="id" name="debugging_logs" id="0x7F0A0461" />
+    <public type="id" name="decelerate" id="0x7F0A0462" />
+    <public type="id" name="decelerateAndComplete" id="0x7F0A0463" />
+    <public type="id" name="decor_content_parent" id="0x7F0A0464" />
+    <public type="id" name="default_activity_button" id="0x7F0A0465" />
+    <public type="id" name="default_tooltip_text" id="0x7F0A0466" />
+    <public type="id" name="default_window_insets_handler" id="0x7F0A0467" />
+    <public type="id" name="deltaRelative" id="0x7F0A0468" />
+    <public type="id" name="demote_common_words" id="0x7F0A0469" />
+    <public type="id" name="demote_rfc822_hostnames" id="0x7F0A046A" />
+    <public type="id" name="dependency_ordering" id="0x7F0A046B" />
+    <public type="id" name="description" id="0x7F0A046C" />
+    <public type="id" name="description_layout" id="0x7F0A046D" />
+    <public type="id" name="description_placeholder" id="0x7F0A046E" />
+    <public type="id" name="description_placeholder_end_guideline" id="0x7F0A046F" />
+    <public type="id" name="design_bottom_sheet" id="0x7F0A0470" />
+    <public type="id" name="design_menu_item_action_area" id="0x7F0A0471" />
+    <public type="id" name="design_menu_item_action_area_stub" id="0x7F0A0472" />
+    <public type="id" name="design_menu_item_text" id="0x7F0A0473" />
+    <public type="id" name="design_navigation_view" id="0x7F0A0474" />
+    <public type="id" name="developer_divider" id="0x7F0A0475" />
+    <public type="id" name="developer_options" id="0x7F0A0476" />
+    <public type="id" name="developer_options_divider" id="0x7F0A0477" />
+    <public type="id" name="developer_options_header" id="0x7F0A0478" />
+    <public type="id" name="developer_settings_crash_discord_jnibridge" id="0x7F0A0479" />
+    <public type="id" name="developer_settings_crash_discord_nonfatal" id="0x7F0A047A" />
+    <public type="id" name="developer_settings_crash_kotlin" id="0x7F0A047B" />
+    <public type="id" name="developer_settings_experiments" id="0x7F0A047C" />
+    <public type="id" name="developer_settings_notices" id="0x7F0A047D" />
+    <public type="id" name="developer_settings_simulate_gateway_reconnect" id="0x7F0A047E" />
+    <public type="id" name="deviceDefault" id="0x7F0A047F" />
+    <public type="id" name="dialog_button" id="0x7F0A0480" />
+    <public type="id" name="dialog_cancel" id="0x7F0A0481" />
+    <public type="id" name="dialog_card" id="0x7F0A0482" />
+    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7F0A0483" />
+    <public type="id" name="dialog_chat_actions_container" id="0x7F0A0484" />
+    <public type="id" name="dialog_chat_actions_copy" id="0x7F0A0485" />
+    <public type="id" name="dialog_chat_actions_copy_id" id="0x7F0A0486" />
+    <public type="id" name="dialog_chat_actions_delete" id="0x7F0A0487" />
+    <public type="id" name="dialog_chat_actions_edit" id="0x7F0A0488" />
+    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7F0A0489" />
+    <public type="id" name="dialog_chat_actions_mark_unread" id="0x7F0A048A" />
+    <public type="id" name="dialog_chat_actions_pin" id="0x7F0A048B" />
+    <public type="id" name="dialog_chat_actions_profile" id="0x7F0A048C" />
+    <public type="id" name="dialog_chat_actions_publish" id="0x7F0A048D" />
+    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7F0A048E" />
+    <public type="id" name="dialog_chat_actions_reply" id="0x7F0A048F" />
+    <public type="id" name="dialog_chat_actions_report" id="0x7F0A0490" />
+    <public type="id" name="dialog_chat_actions_resend" id="0x7F0A0491" />
+    <public type="id" name="dialog_chat_actions_share" id="0x7F0A0492" />
+    <public type="id" name="dialog_chat_actions_start_thread" id="0x7F0A0493" />
+    <public type="id" name="dialog_date_picker_done" id="0x7F0A0494" />
+    <public type="id" name="dialog_date_picker_input" id="0x7F0A0495" />
+    <public type="id" name="dialog_date_picker_title" id="0x7F0A0496" />
+    <public type="id" name="dialog_delete" id="0x7F0A0497" />
+    <public type="id" name="dialog_save" id="0x7F0A0498" />
+    <public type="id" name="dialog_selections" id="0x7F0A0499" />
+    <public type="id" name="dialog_title" id="0x7F0A049A" />
+    <public type="id" name="dialog_url_actions_copy" id="0x7F0A049B" />
+    <public type="id" name="dialog_url_actions_open" id="0x7F0A049C" />
+    <public type="id" name="dialog_url_actions_share" id="0x7F0A049D" />
+    <public type="id" name="dialog_url_actions_url" id="0x7F0A049E" />
+    <public type="id" name="dimensions" id="0x7F0A049F" />
+    <public type="id" name="dimmer_view" id="0x7F0A04A0" />
+    <public type="id" name="direct" id="0x7F0A04A1" />
+    <public type="id" name="directory_channel_icon" id="0x7F0A04A2" />
+    <public type="id" name="directory_channel_name" id="0x7F0A04A3" />
+    <public type="id" name="directory_entry" id="0x7F0A04A4" />
+    <public type="id" name="disableHome" id="0x7F0A04A5" />
+    <public type="id" name="disablePostScroll" id="0x7F0A04A6" />
+    <public type="id" name="disableScroll" id="0x7F0A04A7" />
+    <public type="id" name="disable_delete_body" id="0x7F0A04A8" />
+    <public type="id" name="disable_delete_cancel" id="0x7F0A04A9" />
+    <public type="id" name="disable_delete_code_wrap" id="0x7F0A04AA" />
+    <public type="id" name="disable_delete_confirm" id="0x7F0A04AB" />
+    <public type="id" name="disable_delete_header" id="0x7F0A04AC" />
+    <public type="id" name="disable_delete_password_wrap" id="0x7F0A04AD" />
+    <public type="id" name="disconnect_btn" id="0x7F0A04AE" />
+    <public type="id" name="disconnect_button" id="0x7F0A04AF" />
+    <public type="id" name="discord_hub_add_name_image" id="0x7F0A04B0" />
+    <public type="id" name="discord_hub_add_name_input" id="0x7F0A04B1" />
+    <public type="id" name="discord_hub_add_name_input_layout" id="0x7F0A04B2" />
+    <public type="id" name="discord_hub_add_name_title" id="0x7F0A04B3" />
+    <public type="id" name="discord_hub_add_name_title_button" id="0x7F0A04B4" />
+    <public type="id" name="discord_hub_email_button_layout" id="0x7F0A04B5" />
+    <public type="id" name="discord_hub_email_confirmation" id="0x7F0A04B6" />
+    <public type="id" name="discord_hub_email_confirmation_different" id="0x7F0A04B7" />
+    <public type="id" name="discord_hub_email_confirmation_header_title" id="0x7F0A04B8" />
+    <public type="id" name="discord_hub_email_confirmation_resend" id="0x7F0A04B9" />
+    <public type="id" name="discord_hub_email_header_description" id="0x7F0A04BA" />
+    <public type="id" name="discord_hub_email_header_description_email_input" id="0x7F0A04BB" />
+    <public type="id" name="discord_hub_email_header_description_email_input_layout" id="0x7F0A04BC" />
+    <public type="id" name="discord_hub_email_header_image" id="0x7F0A04BD" />
+    <public type="id" name="discord_hub_email_header_title" id="0x7F0A04BE" />
+    <public type="id" name="discord_hub_email_input" id="0x7F0A04BF" />
+    <public type="id" name="discord_hub_email_label" id="0x7F0A04C0" />
+    <public type="id" name="discord_hub_email_no" id="0x7F0A04C1" />
+    <public type="id" name="discord_hub_email_yes" id="0x7F0A04C2" />
+    <public type="id" name="discord_hub_waitlist" id="0x7F0A04C3" />
+    <public type="id" name="discord_u_add_server_create_server" id="0x7F0A04C4" />
+    <public type="id" name="discord_u_add_server_list_item_image" id="0x7F0A04C5" />
+    <public type="id" name="discord_u_add_server_list_item_layout" id="0x7F0A04C6" />
+    <public type="id" name="discord_u_add_server_list_item_text" id="0x7F0A04C7" />
+    <public type="id" name="discovery_speakers_recycler" id="0x7F0A04C8" />
+    <public type="id" name="discovery_stage_card_speaker_avatar" id="0x7F0A04C9" />
+    <public type="id" name="discovery_stage_card_speaker_name" id="0x7F0A04CA" />
+    <public type="id" name="disjoint" id="0x7F0A04CB" />
+    <public type="id" name="display_activity_switch" id="0x7F0A04CC" />
+    <public type="id" name="display_name" id="0x7F0A04CD" />
+    <public type="id" name="display_switch" id="0x7F0A04CE" />
+    <public type="id" name="divider" id="0x7F0A04CF" />
+    <public type="id" name="divider_stroke" id="0x7F0A04D0" />
+    <public type="id" name="divider_stroke_left" id="0x7F0A04D1" />
+    <public type="id" name="divider_stroke_right" id="0x7F0A04D2" />
+    <public type="id" name="divider_text" id="0x7F0A04D3" />
+    <public type="id" name="dm_action_profile" id="0x7F0A04D4" />
+    <public type="id" name="dng" id="0x7F0A04D5" />
+    <public type="id" name="dragDown" id="0x7F0A04D6" />
+    <public type="id" name="dragEnd" id="0x7F0A04D7" />
+    <public type="id" name="dragLeft" id="0x7F0A04D8" />
+    <public type="id" name="dragRight" id="0x7F0A04D9" />
+    <public type="id" name="dragStart" id="0x7F0A04DA" />
+    <public type="id" name="dragUp" id="0x7F0A04DB" />
+    <public type="id" name="draw3x3" id="0x7F0A04DC" />
+    <public type="id" name="draw4x4" id="0x7F0A04DD" />
+    <public type="id" name="drawPhi" id="0x7F0A04DE" />
+    <public type="id" name="dropdown_menu" id="0x7F0A04DF" />
+    <public type="id" name="dtddd" id="0x7F0A04E0" />
+    <public type="id" name="duration_selector" id="0x7F0A04E1" />
+    <public type="id" name="easeIn" id="0x7F0A04E2" />
+    <public type="id" name="easeInOut" id="0x7F0A04E3" />
+    <public type="id" name="easeOut" id="0x7F0A04E4" />
+    <public type="id" name="edit_account_discriminator_wrap" id="0x7F0A04E5" />
+    <public type="id" name="edit_account_email_wrap" id="0x7F0A04E6" />
+    <public type="id" name="edit_account_name_wrap" id="0x7F0A04E7" />
+    <public type="id" name="edit_account_password_wrap" id="0x7F0A04E8" />
+    <public type="id" name="edit_account_tag_layout_container" id="0x7F0A04E9" />
+    <public type="id" name="edit_account_username_wrap" id="0x7F0A04EA" />
+    <public type="id" name="edit_event" id="0x7F0A04EB" />
+    <public type="id" name="edit_guild_folder_name" id="0x7F0A04EC" />
+    <public type="id" name="edit_integration_custom_emotes_container" id="0x7F0A04ED" />
+    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7F0A04EE" />
+    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7F0A04EF" />
+    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7F0A04F0" />
+    <public type="id" name="edit_integration_expired_sub_container" id="0x7F0A04F1" />
+    <public type="id" name="edit_integration_grace_period_container" id="0x7F0A04F2" />
+    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7F0A04F3" />
+    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7F0A04F4" />
+    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7F0A04F5" />
+    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7F0A04F6" />
+    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7F0A04F7" />
+    <public type="id" name="edit_integration_icon" id="0x7F0A04F8" />
+    <public type="id" name="edit_integration_last_sync_time" id="0x7F0A04F9" />
+    <public type="id" name="edit_integration_name" id="0x7F0A04FA" />
+    <public type="id" name="edit_integration_name_container" id="0x7F0A04FB" />
+    <public type="id" name="edit_integration_owner_name" id="0x7F0A04FC" />
+    <public type="id" name="edit_integration_save" id="0x7F0A04FD" />
+    <public type="id" name="edit_integration_settings_scroll" id="0x7F0A04FE" />
+    <public type="id" name="edit_integration_subscriber_count" id="0x7F0A04FF" />
+    <public type="id" name="edit_integration_sync_container" id="0x7F0A0500" />
+    <public type="id" name="edit_integration_synced_role" id="0x7F0A0501" />
+    <public type="id" name="edit_integration_synced_role_container" id="0x7F0A0502" />
+    <public type="id" name="edit_member_administrative_container" id="0x7F0A0503" />
+    <public type="id" name="edit_member_ban_button" id="0x7F0A0504" />
+    <public type="id" name="edit_member_kick_button" id="0x7F0A0505" />
+    <public type="id" name="edit_member_nickname" id="0x7F0A0506" />
+    <public type="id" name="edit_member_roles_container" id="0x7F0A0507" />
+    <public type="id" name="edit_member_roles_recycler" id="0x7F0A0508" />
+    <public type="id" name="edit_member_save" id="0x7F0A0509" />
+    <public type="id" name="edit_member_transfer_ownership_button" id="0x7F0A050A" />
+    <public type="id" name="edit_query" id="0x7F0A050B" />
+    <public type="id" name="edit_role_name" id="0x7F0A050C" />
+    <public type="id" name="edit_role_save" id="0x7F0A050D" />
+    <public type="id" name="elastic" id="0x7F0A050E" />
+    <public type="id" name="email" id="0x7F0A050F" />
+    <public type="id" name="embed_image_container" id="0x7F0A0510" />
+    <public type="id" name="embed_inline_media" id="0x7F0A0511" />
+    <public type="id" name="emoji" id="0x7F0A0512" />
+    <public type="id" name="emojiPickerPremiumCta" id="0x7F0A0513" />
+    <public type="id" name="emoji_app_bar" id="0x7F0A0514" />
+    <public type="id" name="emoji_category_item_guild_icon" id="0x7F0A0515" />
+    <public type="id" name="emoji_category_item_standard_icon" id="0x7F0A0516" />
+    <public type="id" name="emoji_info_tv" id="0x7F0A0517" />
+    <public type="id" name="emoji_inline_search_button" id="0x7F0A0518" />
+    <public type="id" name="emoji_item_draweeview" id="0x7F0A0519" />
+    <public type="id" name="emoji_iv" id="0x7F0A051A" />
+    <public type="id" name="emoji_picker_backspace_icon" id="0x7F0A051B" />
+    <public type="id" name="emoji_picker_bottom_bar" id="0x7F0A051C" />
+    <public type="id" name="emoji_picker_bottom_bar_divider" id="0x7F0A051D" />
+    <public type="id" name="emoji_picker_category_barrier" id="0x7F0A051E" />
+    <public type="id" name="emoji_picker_category_recycler" id="0x7F0A051F" />
+    <public type="id" name="emoji_picker_container" id="0x7F0A0520" />
+    <public type="id" name="emoji_picker_unicode_emoji_shortcut_button" id="0x7F0A0521" />
+    <public type="id" name="emoji_search_bar" id="0x7F0A0522" />
+    <public type="id" name="emoji_search_clear" id="0x7F0A0523" />
+    <public type="id" name="emoji_search_input" id="0x7F0A0524" />
+    <public type="id" name="emoji_sheet_emoji_picker_content" id="0x7F0A0525" />
+    <public type="id" name="emoji_sheet_flipper" id="0x7F0A0526" />
+    <public type="id" name="emoji_text_view" id="0x7F0A0527" />
+    <public type="id" name="emoji_toolbar" id="0x7F0A0528" />
+    <public type="id" name="empty" id="0x7F0A0529" />
+    <public type="id" name="empty_description" id="0x7F0A052A" />
+    <public type="id" name="empty_friends_state_add_friend" id="0x7F0A052B" />
+    <public type="id" name="empty_friends_state_cs_button" id="0x7F0A052C" />
+    <public type="id" name="empty_friends_state_cs_image" id="0x7F0A052D" />
+    <public type="id" name="empty_friends_state_cs_title" id="0x7F0A052E" />
+    <public type="id" name="empty_friends_state_image" id="0x7F0A052F" />
+    <public type="id" name="empty_friends_state_title" id="0x7F0A0530" />
+    <public type="id" name="empty_guild_role_subscription_cta" id="0x7F0A0531" />
+    <public type="id" name="empty_results" id="0x7F0A0532" />
+    <public type="id" name="empty_state" id="0x7F0A0533" />
+    <public type="id" name="empty_state_body" id="0x7F0A0534" />
+    <public type="id" name="empty_state_img" id="0x7F0A0535" />
+    <public type="id" name="empty_state_invite_link" id="0x7F0A0536" />
+    <public type="id" name="empty_state_link_options" id="0x7F0A0537" />
+    <public type="id" name="empty_state_scroller" id="0x7F0A0538" />
+    <public type="id" name="empty_state_settings_subtext" id="0x7F0A0539" />
+    <public type="id" name="empty_state_share_btn" id="0x7F0A053A" />
+    <public type="id" name="empty_state_title" id="0x7F0A053B" />
+    <public type="id" name="empty_title" id="0x7F0A053C" />
+    <public type="id" name="empty_view" id="0x7F0A053D" />
+    <public type="id" name="enable_button" id="0x7F0A053E" />
+    <public type="id" name="enable_community_stepsview" id="0x7F0A053F" />
+    <public type="id" name="enable_mfa_key_code" id="0x7F0A0540" />
+    <public type="id" name="enable_mfa_key_launch_authy" id="0x7F0A0541" />
+    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7F0A0542" />
+    <public type="id" name="enable_mfa_stepsview" id="0x7F0A0543" />
+    <public type="id" name="enable_sms_backup_body" id="0x7F0A0544" />
+    <public type="id" name="enable_sms_backup_cancel" id="0x7F0A0545" />
+    <public type="id" name="enable_sms_backup_confirm" id="0x7F0A0546" />
+    <public type="id" name="enable_sms_backup_header" id="0x7F0A0547" />
+    <public type="id" name="enable_sms_backup_password_wrap" id="0x7F0A0548" />
+    <public type="id" name="enable_two_factor_password_body_container" id="0x7F0A0549" />
+    <public type="id" name="enable_two_factor_password_body_text" id="0x7F0A054A" />
+    <public type="id" name="enable_two_factor_password_cancel" id="0x7F0A054B" />
+    <public type="id" name="enable_two_factor_password_header" id="0x7F0A054C" />
+    <public type="id" name="enable_two_factor_password_header_container" id="0x7F0A054D" />
+    <public type="id" name="enable_two_factor_password_ok" id="0x7F0A054E" />
+    <public type="id" name="enable_two_factor_password_view_input" id="0x7F0A054F" />
+    <public type="id" name="end" id="0x7F0A0550" />
+    <public type="id" name="endToStart" id="0x7F0A0551" />
+    <public type="id" name="end_date_header" id="0x7F0A0552" />
+    <public type="id" name="end_date_input" id="0x7F0A0553" />
+    <public type="id" name="end_date_layout" id="0x7F0A0554" />
+    <public type="id" name="end_event" id="0x7F0A0555" />
+    <public type="id" name="end_padder" id="0x7F0A0556" />
+    <public type="id" name="end_time_header" id="0x7F0A0557" />
+    <public type="id" name="end_time_input" id="0x7F0A0558" />
+    <public type="id" name="end_time_layout" id="0x7F0A0559" />
+    <public type="id" name="enterAlways" id="0x7F0A055A" />
+    <public type="id" name="enterAlwaysCollapsed" id="0x7F0A055B" />
+    <public type="id" name="entire_server" id="0x7F0A055C" />
+    <public type="id" name="event_card" id="0x7F0A055D" />
+    <public type="id" name="event_channel" id="0x7F0A055E" />
+    <public type="id" name="event_connect_button" id="0x7F0A055F" />
+    <public type="id" name="event_icon" id="0x7F0A0560" />
+    <public type="id" name="event_name" id="0x7F0A0561" />
+    <public type="id" name="event_permissions_divider" id="0x7F0A0562" />
+    <public type="id" name="event_permissions_title" id="0x7F0A0563" />
+    <public type="id" name="event_prompt_overlay_stub" id="0x7F0A0564" />
+    <public type="id" name="event_topic" id="0x7F0A0565" />
+    <public type="id" name="exitUntilCollapsed" id="0x7F0A0566" />
+    <public type="id" name="exo_ad_overlay" id="0x7F0A0567" />
+    <public type="id" name="exo_artwork" id="0x7F0A0568" />
+    <public type="id" name="exo_audio_track" id="0x7F0A0569" />
+    <public type="id" name="exo_basic_controls" id="0x7F0A056A" />
+    <public type="id" name="exo_bottom_bar" id="0x7F0A056B" />
+    <public type="id" name="exo_buffering" id="0x7F0A056C" />
+    <public type="id" name="exo_center_controls" id="0x7F0A056D" />
+    <public type="id" name="exo_check" id="0x7F0A056E" />
+    <public type="id" name="exo_content_frame" id="0x7F0A056F" />
+    <public type="id" name="exo_controller" id="0x7F0A0570" />
+    <public type="id" name="exo_controller_placeholder" id="0x7F0A0571" />
+    <public type="id" name="exo_controls_background" id="0x7F0A0572" />
+    <public type="id" name="exo_duration" id="0x7F0A0573" />
+    <public type="id" name="exo_error_message" id="0x7F0A0574" />
+    <public type="id" name="exo_extra_controls" id="0x7F0A0575" />
+    <public type="id" name="exo_extra_controls_scroll_view" id="0x7F0A0576" />
+    <public type="id" name="exo_ffwd" id="0x7F0A0577" />
+    <public type="id" name="exo_ffwd_with_amount" id="0x7F0A0578" />
+    <public type="id" name="exo_fullscreen" id="0x7F0A0579" />
+    <public type="id" name="exo_icon" id="0x7F0A057A" />
+    <public type="id" name="exo_main_text" id="0x7F0A057B" />
+    <public type="id" name="exo_minimal_controls" id="0x7F0A057C" />
+    <public type="id" name="exo_minimal_fullscreen" id="0x7F0A057D" />
+    <public type="id" name="exo_next" id="0x7F0A057E" />
+    <public type="id" name="exo_overflow_hide" id="0x7F0A057F" />
+    <public type="id" name="exo_overflow_show" id="0x7F0A0580" />
+    <public type="id" name="exo_overlay" id="0x7F0A0581" />
+    <public type="id" name="exo_pause" id="0x7F0A0582" />
+    <public type="id" name="exo_play" id="0x7F0A0583" />
+    <public type="id" name="exo_play_pause" id="0x7F0A0584" />
+    <public type="id" name="exo_playback_speed" id="0x7F0A0585" />
+    <public type="id" name="exo_position" id="0x7F0A0586" />
+    <public type="id" name="exo_prev" id="0x7F0A0587" />
+    <public type="id" name="exo_progress" id="0x7F0A0588" />
+    <public type="id" name="exo_progress_placeholder" id="0x7F0A0589" />
+    <public type="id" name="exo_repeat_toggle" id="0x7F0A058A" />
+    <public type="id" name="exo_rew" id="0x7F0A058B" />
+    <public type="id" name="exo_rew_with_amount" id="0x7F0A058C" />
+    <public type="id" name="exo_settings" id="0x7F0A058D" />
+    <public type="id" name="exo_settings_listview" id="0x7F0A058E" />
+    <public type="id" name="exo_shuffle" id="0x7F0A058F" />
+    <public type="id" name="exo_shutter" id="0x7F0A0590" />
+    <public type="id" name="exo_sub_text" id="0x7F0A0591" />
+    <public type="id" name="exo_subtitle" id="0x7F0A0592" />
+    <public type="id" name="exo_subtitles" id="0x7F0A0593" />
+    <public type="id" name="exo_text" id="0x7F0A0594" />
+    <public type="id" name="exo_time" id="0x7F0A0595" />
+    <public type="id" name="exo_track_selection_view" id="0x7F0A0596" />
+    <public type="id" name="exo_vr" id="0x7F0A0597" />
+    <public type="id" name="expand_activities_button" id="0x7F0A0598" />
+    <public type="id" name="expand_btn" id="0x7F0A0599" />
+    <public type="id" name="expanded_menu" id="0x7F0A059A" />
+    <public type="id" name="experiment_override_bucket_descriptions" id="0x7F0A059B" />
+    <public type="id" name="experiment_override_buckets_spinner" id="0x7F0A059C" />
+    <public type="id" name="experiment_override_buckets_spinner_container" id="0x7F0A059D" />
+    <public type="id" name="experiment_override_clear" id="0x7F0A059E" />
+    <public type="id" name="experiment_override_experiment_api_name" id="0x7F0A059F" />
+    <public type="id" name="experiment_override_experiment_name" id="0x7F0A05A0" />
+    <public type="id" name="experiment_overrides_list_item_experiment_override_view" id="0x7F0A05A1" />
+    <public type="id" name="exposureCorrection" id="0x7F0A05A2" />
+    <public type="id" name="expression_btn" id="0x7F0A05A3" />
+    <public type="id" name="expression_btn_badge" id="0x7F0A05A4" />
+    <public type="id" name="expression_btn_container" id="0x7F0A05A5" />
+    <public type="id" name="expression_picker_category_selection_overline" id="0x7F0A05A6" />
+    <public type="id" name="expression_tray_container" id="0x7F0A05A7" />
+    <public type="id" name="expression_tray_content_container" id="0x7F0A05A8" />
+    <public type="id" name="expression_tray_detail_page" id="0x7F0A05A9" />
+    <public type="id" name="expression_tray_emoji_card" id="0x7F0A05AA" />
+    <public type="id" name="expression_tray_emoji_picker_content" id="0x7F0A05AB" />
+    <public type="id" name="expression_tray_gif_card" id="0x7F0A05AC" />
+    <public type="id" name="expression_tray_gif_picker_content" id="0x7F0A05AD" />
+    <public type="id" name="expression_tray_landing_page" id="0x7F0A05AE" />
+    <public type="id" name="expression_tray_search_bar" id="0x7F0A05AF" />
+    <public type="id" name="expression_tray_search_button" id="0x7F0A05B0" />
+    <public type="id" name="expression_tray_search_icon" id="0x7F0A05B1" />
+    <public type="id" name="expression_tray_segmented_control" id="0x7F0A05B2" />
+    <public type="id" name="expression_tray_sticker_card" id="0x7F0A05B3" />
+    <public type="id" name="expression_tray_sticker_picker_content" id="0x7F0A05B4" />
+    <public type="id" name="expression_tray_toolbar" id="0x7F0A05B5" />
+    <public type="id" name="expression_tray_toolbar_layout" id="0x7F0A05B6" />
+    <public type="id" name="external_divider" id="0x7F0A05B7" />
+    <public type="id" name="external_location_input" id="0x7F0A05B8" />
+    <public type="id" name="external_location_layout" id="0x7F0A05B9" />
+    <public type="id" name="external_option" id="0x7F0A05BA" />
+    <public type="id" name="external_share_activity_action_preview" id="0x7F0A05BB" />
+    <public type="id" name="external_share_comment" id="0x7F0A05BC" />
+    <public type="id" name="external_share_list" id="0x7F0A05BD" />
+    <public type="id" name="external_share_list_wrap" id="0x7F0A05BE" />
+    <public type="id" name="external_share_search" id="0x7F0A05BF" />
+    <public type="id" name="external_share_search_results" id="0x7F0A05C0" />
+    <public type="id" name="extra_button" id="0x7F0A05C1" />
+    <public type="id" name="extra_info" id="0x7F0A05C2" />
+    <public type="id" name="fab_menu_add_category" id="0x7F0A05C3" />
+    <public type="id" name="fab_menu_add_text" id="0x7F0A05C4" />
+    <public type="id" name="fab_menu_add_voice" id="0x7F0A05C5" />
+    <public type="id" name="fab_menu_main" id="0x7F0A05C6" />
+    <public type="id" name="fab_menu_main_fab" id="0x7F0A05C7" />
+    <public type="id" name="fab_menu_table" id="0x7F0A05C8" />
+    <public type="id" name="fade" id="0x7F0A05C9" />
+    <public type="id" name="failed_alert_icon" id="0x7F0A05CA" />
+    <public type="id" name="fatal_crash_app_version" id="0x7F0A05CB" />
+    <public type="id" name="fatal_crash_details" id="0x7F0A05CC" />
+    <public type="id" name="fatal_crash_device" id="0x7F0A05CD" />
+    <public type="id" name="fatal_crash_os_version" id="0x7F0A05CE" />
+    <public type="id" name="fatal_crash_source" id="0x7F0A05CF" />
+    <public type="id" name="fatal_crash_testers_invite" id="0x7F0A05D0" />
+    <public type="id" name="fatal_crash_time" id="0x7F0A05D1" />
+    <public type="id" name="favorite_add_button" id="0x7F0A05D2" />
+    <public type="id" name="favorite_container" id="0x7F0A05D3" />
+    <public type="id" name="favorite_remove_button" id="0x7F0A05D4" />
+    <public type="id" name="feature_list_item_feature" id="0x7F0A05D5" />
+    <public type="id" name="feature_list_item_squad" id="0x7F0A05D6" />
+    <public type="id" name="feedback_happy_rating" id="0x7F0A05D7" />
+    <public type="id" name="feedback_issue_section_header" id="0x7F0A05D8" />
+    <public type="id" name="feedback_issues_card" id="0x7F0A05D9" />
+    <public type="id" name="feedback_issues_recycler" id="0x7F0A05DA" />
+    <public type="id" name="feedback_neutral_rating" id="0x7F0A05DB" />
+    <public type="id" name="feedback_rating_container" id="0x7F0A05DC" />
+    <public type="id" name="feedback_rating_summary_prompt" id="0x7F0A05DD" />
+    <public type="id" name="feedback_sad_rating" id="0x7F0A05DE" />
+    <public type="id" name="feedback_sheet_close_button" id="0x7F0A05DF" />
+    <public type="id" name="feedback_sheet_container" id="0x7F0A05E0" />
+    <public type="id" name="feedback_sheet_feedback_view" id="0x7F0A05E1" />
+    <public type="id" name="feedback_sheet_title" id="0x7F0A05E2" />
+    <public type="id" name="file_image" id="0x7F0A05E3" />
+    <public type="id" name="file_name_tv" id="0x7F0A05E4" />
+    <public type="id" name="file_subtitle_tv" id="0x7F0A05E5" />
+    <public type="id" name="fill" id="0x7F0A05E6" />
+    <public type="id" name="fill_horizontal" id="0x7F0A05E7" />
+    <public type="id" name="fill_vertical" id="0x7F0A05E8" />
+    <public type="id" name="filled" id="0x7F0A05E9" />
+    <public type="id" name="filterControl1" id="0x7F0A05EA" />
+    <public type="id" name="filterControl2" id="0x7F0A05EB" />
+    <public type="id" name="fit" id="0x7F0A05EC" />
+    <public type="id" name="fitBottomStart" id="0x7F0A05ED" />
+    <public type="id" name="fitCenter" id="0x7F0A05EE" />
+    <public type="id" name="fitEnd" id="0x7F0A05EF" />
+    <public type="id" name="fitStart" id="0x7F0A05F0" />
+    <public type="id" name="fitToContents" id="0x7F0A05F1" />
+    <public type="id" name="fitXY" id="0x7F0A05F2" />
+    <public type="id" name="fixed" id="0x7F0A05F3" />
+    <public type="id" name="fixed_height" id="0x7F0A05F4" />
+    <public type="id" name="fixed_width" id="0x7F0A05F5" />
+    <public type="id" name="flClickShield" id="0x7F0A05F6" />
+    <public type="id" name="flIconContainer" id="0x7F0A05F7" />
+    <public type="id" name="flRightIconContainer" id="0x7F0A05F8" />
+    <public type="id" name="flag_icon" id="0x7F0A05F9" />
+    <public type="id" name="flag_icon_barrier" id="0x7F0A05FA" />
+    <public type="id" name="flex_end" id="0x7F0A05FB" />
+    <public type="id" name="flex_start" id="0x7F0A05FC" />
+    <public type="id" name="flip" id="0x7F0A05FD" />
+    <public type="id" name="flipper" id="0x7F0A05FE" />
+    <public type="id" name="floating" id="0x7F0A05FF" />
+    <public type="id" name="fluorescent" id="0x7F0A0600" />
+    <public type="id" name="focusCrop" id="0x7F0A0601" />
+    <public type="id" name="focusMarkerContainer" id="0x7F0A0602" />
+    <public type="id" name="focusMarkerFill" id="0x7F0A0603" />
+    <public type="id" name="folder_context_menu_card" id="0x7F0A0604" />
+    <public type="id" name="folder_context_menu_header" id="0x7F0A0605" />
+    <public type="id" name="folder_context_menu_header_divider" id="0x7F0A0606" />
+    <public type="id" name="folder_context_menu_mark_as_read" id="0x7F0A0607" />
+    <public type="id" name="folder_context_menu_settings" id="0x7F0A0608" />
+    <public type="id" name="folder_view_folder_image" id="0x7F0A0609" />
+    <public type="id" name="follow_sheet_view_flipper" id="0x7F0A060A" />
+    <public type="id" name="forever" id="0x7F0A060B" />
+    <public type="id" name="fragment_container_view_tag" id="0x7F0A060C" />
+    <public type="id" name="frequency_radio_all" id="0x7F0A060D" />
+    <public type="id" name="frequency_radio_mentions" id="0x7F0A060E" />
+    <public type="id" name="frequency_radio_nothing" id="0x7F0A060F" />
+    <public type="id" name="frequency_top_divider" id="0x7F0A0610" />
+    <public type="id" name="friend_add_username_indicator" id="0x7F0A0611" />
+    <public type="id" name="friend_container" id="0x7F0A0612" />
+    <public type="id" name="friend_suggestion_avatar" id="0x7F0A0613" />
+    <public type="id" name="friend_suggestion_container" id="0x7F0A0614" />
+    <public type="id" name="friend_suggestion_discriminator" id="0x7F0A0615" />
+    <public type="id" name="friend_suggestion_name" id="0x7F0A0616" />
+    <public type="id" name="friend_suggestion_nickname" id="0x7F0A0617" />
+    <public type="id" name="friend_suggestion_selected" id="0x7F0A0618" />
+    <public type="id" name="friends_add_container" id="0x7F0A0619" />
+    <public type="id" name="friends_add_send" id="0x7F0A061A" />
+    <public type="id" name="friends_add_text_edit_wrap" id="0x7F0A061B" />
+    <public type="id" name="friends_list_contact_sync_upsell_arrow" id="0x7F0A061C" />
+    <public type="id" name="friends_list_contact_sync_upsell_container" id="0x7F0A061D" />
+    <public type="id" name="friends_list_contact_sync_upsell_icon" id="0x7F0A061E" />
+    <public type="id" name="friends_list_contact_sync_upsell_subtitle" id="0x7F0A061F" />
+    <public type="id" name="friends_list_contact_sync_upsell_title" id="0x7F0A0620" />
+    <public type="id" name="friends_list_empty_friends_state_cs_view" id="0x7F0A0621" />
+    <public type="id" name="friends_list_empty_friends_state_view" id="0x7F0A0622" />
+    <public type="id" name="friends_list_expandable_header_button" id="0x7F0A0623" />
+    <public type="id" name="friends_list_flipper" id="0x7F0A0624" />
+    <public type="id" name="friends_list_item_accept_button" id="0x7F0A0625" />
+    <public type="id" name="friends_list_item_activity" id="0x7F0A0626" />
+    <public type="id" name="friends_list_item_avatar" id="0x7F0A0627" />
+    <public type="id" name="friends_list_item_avatar_wrap" id="0x7F0A0628" />
+    <public type="id" name="friends_list_item_buttons_wrap" id="0x7F0A0629" />
+    <public type="id" name="friends_list_item_call_button" id="0x7F0A062A" />
+    <public type="id" name="friends_list_item_chat_button" id="0x7F0A062B" />
+    <public type="id" name="friends_list_item_decline_button" id="0x7F0A062C" />
+    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7F0A062D" />
+    <public type="id" name="friends_list_item_game" id="0x7F0A062E" />
+    <public type="id" name="friends_list_item_header_text" id="0x7F0A062F" />
+    <public type="id" name="friends_list_item_name" id="0x7F0A0630" />
+    <public type="id" name="friends_list_item_status" id="0x7F0A0631" />
+    <public type="id" name="friends_list_item_text" id="0x7F0A0632" />
+    <public type="id" name="friends_list_loading" id="0x7F0A0633" />
+    <public type="id" name="friends_list_pending_item_header_text" id="0x7F0A0634" />
+    <public type="id" name="friends_list_recycler" id="0x7F0A0635" />
+    <public type="id" name="front" id="0x7F0A0636" />
+    <public type="id" name="gallery_btn" id="0x7F0A0637" />
+    <public type="id" name="gap" id="0x7F0A0638" />
+    <public type="id" name="get_premium_button" id="0x7F0A0639" />
+    <public type="id" name="ghost_view" id="0x7F0A063A" />
+    <public type="id" name="ghost_view_holder" id="0x7F0A063B" />
+    <public type="id" name="gif_category_container" id="0x7F0A063C" />
+    <public type="id" name="gif_category_gif_recycler" id="0x7F0A063D" />
+    <public type="id" name="gif_category_item_icon" id="0x7F0A063E" />
+    <public type="id" name="gif_category_item_preview" id="0x7F0A063F" />
+    <public type="id" name="gif_category_item_title" id="0x7F0A0640" />
+    <public type="id" name="gif_category_loading_view" id="0x7F0A0641" />
+    <public type="id" name="gif_category_title" id="0x7F0A0642" />
+    <public type="id" name="gif_item_image" id="0x7F0A0643" />
+    <public type="id" name="gif_picker_category_recycler" id="0x7F0A0644" />
+    <public type="id" name="gif_picker_container" id="0x7F0A0645" />
+    <public type="id" name="gif_picker_loading_view" id="0x7F0A0646" />
+    <public type="id" name="gif_search_app_bar" id="0x7F0A0647" />
+    <public type="id" name="gif_search_gif_recycler" id="0x7F0A0648" />
+    <public type="id" name="gif_search_loading_view" id="0x7F0A0649" />
+    <public type="id" name="gif_search_sheet_content" id="0x7F0A064A" />
+    <public type="id" name="gif_search_suggested_terms_container" id="0x7F0A064B" />
+    <public type="id" name="gif_search_suggested_terms_flex_box" id="0x7F0A064C" />
+    <public type="id" name="gif_search_suggested_terms_icon_text" id="0x7F0A064D" />
+    <public type="id" name="gif_search_toolbar" id="0x7F0A064E" />
+    <public type="id" name="gif_search_view_flipper" id="0x7F0A064F" />
+    <public type="id" name="gif_tag" id="0x7F0A0650" />
+    <public type="id" name="giftPromoButton" id="0x7F0A0651" />
+    <public type="id" name="giftPromoDescription" id="0x7F0A0652" />
+    <public type="id" name="giftPromoImage" id="0x7F0A0653" />
+    <public type="id" name="giftPromoMoreDetails" id="0x7F0A0654" />
+    <public type="id" name="giftPromoTitle" id="0x7F0A0655" />
+    <public type="id" name="gift_btn" id="0x7F0A0656" />
+    <public type="id" name="gift_entitlement_code" id="0x7F0A0657" />
+    <public type="id" name="gift_entitlement_code_container" id="0x7F0A0658" />
+    <public type="id" name="gift_entitlement_container" id="0x7F0A0659" />
+    <public type="id" name="gift_entitlement_copy" id="0x7F0A065A" />
+    <public type="id" name="gift_entitlement_divider" id="0x7F0A065B" />
+    <public type="id" name="gift_entitlement_flipper" id="0x7F0A065C" />
+    <public type="id" name="gift_entitlement_generate" id="0x7F0A065D" />
+    <public type="id" name="gift_entitlement_revoke" id="0x7F0A065E" />
+    <public type="id" name="gift_link_subtext" id="0x7F0A065F" />
+    <public type="id" name="gift_purchased_dialog_confirm" id="0x7F0A0660" />
+    <public type="id" name="gift_purchased_dialog_subtext" id="0x7F0A0661" />
+    <public type="id" name="gift_purchased_icon" id="0x7F0A0662" />
+    <public type="id" name="gift_select_premium_tier_1_month" id="0x7F0A0663" />
+    <public type="id" name="gift_select_premium_tier_1_year" id="0x7F0A0664" />
+    <public type="id" name="gift_select_premium_tier_2_month" id="0x7F0A0665" />
+    <public type="id" name="gift_select_premium_tier_2_year" id="0x7F0A0666" />
+    <public type="id" name="gift_sku_arrow" id="0x7F0A0667" />
+    <public type="id" name="gift_sku_copies" id="0x7F0A0668" />
+    <public type="id" name="gift_sku_icon" id="0x7F0A0669" />
+    <public type="id" name="gift_sku_name" id="0x7F0A066A" />
+    <public type="id" name="glSurface" id="0x7F0A066B" />
+    <public type="id" name="gl_surface_view" id="0x7F0A066C" />
+    <public type="id" name="global_search_add_a_friend_btn" id="0x7F0A066D" />
+    <public type="id" name="global_search_bar" id="0x7F0A066E" />
+    <public type="id" name="global_search_bar_text" id="0x7F0A066F" />
+    <public type="id" name="global_search_guild_list" id="0x7F0A0670" />
+    <public type="id" name="global_search_join_guild_btn" id="0x7F0A0671" />
+    <public type="id" name="global_search_recycler" id="0x7F0A0672" />
+    <public type="id" name="global_search_view_flipper" id="0x7F0A0673" />
+    <public type="id" name="gone" id="0x7F0A0674" />
+    <public type="id" name="graph" id="0x7F0A0675" />
+    <public type="id" name="graph_wrap" id="0x7F0A0676" />
+    <public type="id" name="gridView" id="0x7F0A0677" />
+    <public type="id" name="group_divider" id="0x7F0A0678" />
+    <public type="id" name="group_dm_notifications_mute_settings_view" id="0x7F0A0679" />
+    <public type="id" name="group_dm_settings_scroll_view" id="0x7F0A067A" />
+    <public type="id" name="group_invite_friends_chips" id="0x7F0A067B" />
+    <public type="id" name="group_invite_friends_recipients_container" id="0x7F0A067C" />
+    <public type="id" name="group_invite_friends_recycler" id="0x7F0A067D" />
+    <public type="id" name="group_invite_friends_save_fab" id="0x7F0A067E" />
+    <public type="id" name="group_invite_friends_text_to" id="0x7F0A067F" />
+    <public type="id" name="group_invite_friends_view_flipper" id="0x7F0A0680" />
+    <public type="id" name="grouping" id="0x7F0A0681" />
+    <public type="id" name="groups" id="0x7F0A0682" />
+    <public type="id" name="guard" id="0x7F0A0683" />
+    <public type="id" name="guard_member_verification" id="0x7F0A0684" />
+    <public type="id" name="guideline" id="0x7F0A0685" />
+    <public type="id" name="guildAvatarText" id="0x7F0A0686" />
+    <public type="id" name="guildAvatarWrap" id="0x7F0A0687" />
+    <public type="id" name="guild_actions_overview_header_tv" id="0x7F0A0688" />
+    <public type="id" name="guild_avatar" id="0x7F0A0689" />
+    <public type="id" name="guild_avatar_card" id="0x7F0A068A" />
+    <public type="id" name="guild_avatar_container" id="0x7F0A068B" />
+    <public type="id" name="guild_call_onboarding_connect" id="0x7F0A068C" />
+    <public type="id" name="guild_container" id="0x7F0A068D" />
+    <public type="id" name="guild_context_menu_card" id="0x7F0A068E" />
+    <public type="id" name="guild_context_menu_header" id="0x7F0A068F" />
+    <public type="id" name="guild_context_menu_header_divider" id="0x7F0A0690" />
+    <public type="id" name="guild_context_menu_leave_guild" id="0x7F0A0691" />
+    <public type="id" name="guild_context_menu_mark_as_read" id="0x7F0A0692" />
+    <public type="id" name="guild_context_menu_more_options" id="0x7F0A0693" />
+    <public type="id" name="guild_context_menu_notifications" id="0x7F0A0694" />
+    <public type="id" name="guild_create_button" id="0x7F0A0695" />
+    <public type="id" name="guild_create_flipper" id="0x7F0A0696" />
+    <public type="id" name="guild_create_guidelines" id="0x7F0A0697" />
+    <public type="id" name="guild_create_icon_uploader" id="0x7F0A0698" />
+    <public type="id" name="guild_create_name" id="0x7F0A0699" />
+    <public type="id" name="guild_create_protip" id="0x7F0A069A" />
+    <public type="id" name="guild_create_screen_title" id="0x7F0A069B" />
+    <public type="id" name="guild_folder_color_name" id="0x7F0A069C" />
+    <public type="id" name="guild_folder_settings_color" id="0x7F0A069D" />
+    <public type="id" name="guild_folder_settings_color_display" id="0x7F0A069E" />
+    <public type="id" name="guild_folder_settings_save" id="0x7F0A069F" />
+    <public type="id" name="guild_icon_barrier" id="0x7F0A06A0" />
+    <public type="id" name="guild_info_tv" id="0x7F0A06A1" />
+    <public type="id" name="guild_invite_accept" id="0x7F0A06A2" />
+    <public type="id" name="guild_invite_actions" id="0x7F0A06A3" />
+    <public type="id" name="guild_invite_cancel" id="0x7F0A06A4" />
+    <public type="id" name="guild_invite_channel_spinner" id="0x7F0A06A5" />
+    <public type="id" name="guild_invite_empty_results" id="0x7F0A06A6" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7F0A06A7" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7F0A06A8" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7F0A06A9" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7F0A06AA" />
+    <public type="id" name="guild_invite_event_info" id="0x7F0A06AB" />
+    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7F0A06AC" />
+    <public type="id" name="guild_invite_generate_link" id="0x7F0A06AD" />
+    <public type="id" name="guild_invite_info" id="0x7F0A06AE" />
+    <public type="id" name="guild_invite_link" id="0x7F0A06AF" />
+    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7F0A06B0" />
+    <public type="id" name="guild_invite_never_expire" id="0x7F0A06B1" />
+    <public type="id" name="guild_invite_settings_edit" id="0x7F0A06B2" />
+    <public type="id" name="guild_invite_share_btn" id="0x7F0A06B3" />
+    <public type="id" name="guild_invite_share_compact_search" id="0x7F0A06B4" />
+    <public type="id" name="guild_invite_share_search" id="0x7F0A06B5" />
+    <public type="id" name="guild_invite_suggestion_list" id="0x7F0A06B6" />
+    <public type="id" name="guild_invite_suggestions_flipper" id="0x7F0A06B7" />
+    <public type="id" name="guild_invite_temporary_membership" id="0x7F0A06B8" />
+    <public type="id" name="guild_item_sparkle" id="0x7F0A06B9" />
+    <public type="id" name="guild_iv" id="0x7F0A06BA" />
+    <public type="id" name="guild_join_action_btn" id="0x7F0A06BB" />
+    <public type="id" name="guild_join_content" id="0x7F0A06BC" />
+    <public type="id" name="guild_join_invite" id="0x7F0A06BD" />
+    <public type="id" name="guild_list" id="0x7F0A06BE" />
+    <public type="id" name="guild_list_add_hint" id="0x7F0A06BF" />
+    <public type="id" name="guild_list_unreads_stub" id="0x7F0A06C0" />
+    <public type="id" name="guild_member_avatar" id="0x7F0A06C1" />
+    <public type="id" name="guild_member_identity_barrier" id="0x7F0A06C2" />
+    <public type="id" name="guild_name_tv" id="0x7F0A06C3" />
+    <public type="id" name="guild_notifications_channel_list" id="0x7F0A06C4" />
+    <public type="id" name="guild_notifications_channel_search" id="0x7F0A06C5" />
+    <public type="id" name="guild_notifications_override_list" id="0x7F0A06C6" />
+    <public type="id" name="guild_profile_sheet_actions" id="0x7F0A06C7" />
+    <public type="id" name="guild_profile_sheet_actions_top_barrier" id="0x7F0A06C8" />
+    <public type="id" name="guild_profile_sheet_allow_dm" id="0x7F0A06C9" />
+    <public type="id" name="guild_profile_sheet_banner" id="0x7F0A06CA" />
+    <public type="id" name="guild_profile_sheet_boosts" id="0x7F0A06CB" />
+    <public type="id" name="guild_profile_sheet_bottom_actions" id="0x7F0A06CC" />
+    <public type="id" name="guild_profile_sheet_bottom_container" id="0x7F0A06CD" />
+    <public type="id" name="guild_profile_sheet_change_nickname" id="0x7F0A06CE" />
+    <public type="id" name="guild_profile_sheet_constraint_layout" id="0x7F0A06CF" />
+    <public type="id" name="guild_profile_sheet_content_container" id="0x7F0A06D0" />
+    <public type="id" name="guild_profile_sheet_content_container_bottom_divider" id="0x7F0A06D1" />
+    <public type="id" name="guild_profile_sheet_copy_id" id="0x7F0A06D2" />
+    <public type="id" name="guild_profile_sheet_create_category" id="0x7F0A06D3" />
+    <public type="id" name="guild_profile_sheet_create_channel" id="0x7F0A06D4" />
+    <public type="id" name="guild_profile_sheet_create_event" id="0x7F0A06D5" />
+    <public type="id" name="guild_profile_sheet_create_event_label" id="0x7F0A06D6" />
+    <public type="id" name="guild_profile_sheet_create_event_new" id="0x7F0A06D7" />
+    <public type="id" name="guild_profile_sheet_description" id="0x7F0A06D8" />
+    <public type="id" name="guild_profile_sheet_developer_actions" id="0x7F0A06D9" />
+    <public type="id" name="guild_profile_sheet_emoji_imageview" id="0x7F0A06DA" />
+    <public type="id" name="guild_profile_sheet_emojis" id="0x7F0A06DB" />
+    <public type="id" name="guild_profile_sheet_emojis_card" id="0x7F0A06DC" />
+    <public type="id" name="guild_profile_sheet_emojis_count" id="0x7F0A06DD" />
+    <public type="id" name="guild_profile_sheet_flipper" id="0x7F0A06DE" />
+    <public type="id" name="guild_profile_sheet_guild_avatar" id="0x7F0A06DF" />
+    <public type="id" name="guild_profile_sheet_guild_verified_premium_icon" id="0x7F0A06E0" />
+    <public type="id" name="guild_profile_sheet_hide_muted_channels" id="0x7F0A06E1" />
+    <public type="id" name="guild_profile_sheet_icon" id="0x7F0A06E2" />
+    <public type="id" name="guild_profile_sheet_icon_card" id="0x7F0A06E3" />
+    <public type="id" name="guild_profile_sheet_icon_name" id="0x7F0A06E4" />
+    <public type="id" name="guild_profile_sheet_invite" id="0x7F0A06E5" />
+    <public type="id" name="guild_profile_sheet_invite_action" id="0x7F0A06E6" />
+    <public type="id" name="guild_profile_sheet_join_server" id="0x7F0A06E7" />
+    <public type="id" name="guild_profile_sheet_leave_server" id="0x7F0A06E8" />
+    <public type="id" name="guild_profile_sheet_mark_as_read" id="0x7F0A06E9" />
+    <public type="id" name="guild_profile_sheet_mark_as_read_action" id="0x7F0A06EA" />
+    <public type="id" name="guild_profile_sheet_member_count" id="0x7F0A06EB" />
+    <public type="id" name="guild_profile_sheet_member_count_text" id="0x7F0A06EC" />
+    <public type="id" name="guild_profile_sheet_name" id="0x7F0A06ED" />
+    <public type="id" name="guild_profile_sheet_nickname" id="0x7F0A06EE" />
+    <public type="id" name="guild_profile_sheet_notifications" id="0x7F0A06EF" />
+    <public type="id" name="guild_profile_sheet_online_count" id="0x7F0A06F0" />
+    <public type="id" name="guild_profile_sheet_online_count_text" id="0x7F0A06F1" />
+    <public type="id" name="guild_profile_sheet_premium_upsell_dot_separator" id="0x7F0A06F2" />
+    <public type="id" name="guild_profile_sheet_premium_upsell_text" id="0x7F0A06F3" />
+    <public type="id" name="guild_profile_sheet_primary_actions" id="0x7F0A06F4" />
+    <public type="id" name="guild_profile_sheet_secondary_actions" id="0x7F0A06F5" />
+    <public type="id" name="guild_profile_sheet_settings" id="0x7F0A06F6" />
+    <public type="id" name="guild_profile_sheet_tab_items" id="0x7F0A06F7" />
+    <public type="id" name="guild_profile_sheet_upload_emoji" id="0x7F0A06F8" />
+    <public type="id" name="guild_profile_sheet_view_server" id="0x7F0A06F9" />
+    <public type="id" name="guild_region_help" id="0x7F0A06FA" />
+    <public type="id" name="guild_role_item_text" id="0x7F0A06FB" />
+    <public type="id" name="guild_role_subscription_add_benefit_image_circle" id="0x7F0A06FC" />
+    <public type="id" name="guild_role_subscription_add_benefit_text" id="0x7F0A06FD" />
+    <public type="id" name="guild_role_subscription_add_tier_image" id="0x7F0A06FE" />
+    <public type="id" name="guild_role_subscription_add_tier_text" id="0x7F0A06FF" />
+    <public type="id" name="guild_role_subscription_benefit_channel_label" id="0x7F0A0700" />
+    <public type="id" name="guild_role_subscription_benefit_description" id="0x7F0A0701" />
+    <public type="id" name="guild_role_subscription_benefit_image" id="0x7F0A0702" />
+    <public type="id" name="guild_role_subscription_benefit_name" id="0x7F0A0703" />
+    <public type="id" name="guild_role_subscription_edit_tier_publish" id="0x7F0A0704" />
+    <public type="id" name="guild_role_subscription_edit_tier_publish_description" id="0x7F0A0705" />
+    <public type="id" name="guild_role_subscription_edit_tier_publish_group" id="0x7F0A0706" />
+    <public type="id" name="guild_role_subscription_edit_tier_tabs" id="0x7F0A0707" />
+    <public type="id" name="guild_role_subscription_edit_tier_view_pager" id="0x7F0A0708" />
+    <public type="id" name="guild_role_subscription_edit_tier_view_pager_top_barrier" id="0x7F0A0709" />
+    <public type="id" name="guild_role_subscription_format_divider" id="0x7F0A070A" />
+    <public type="id" name="guild_role_subscription_format_subtitle" id="0x7F0A070B" />
+    <public type="id" name="guild_role_subscription_format_title" id="0x7F0A070C" />
+    <public type="id" name="guild_role_subscription_intangible_benefit_name" id="0x7F0A070D" />
+    <public type="id" name="guild_role_subscription_intangible_benefit_name_label" id="0x7F0A070E" />
+    <public type="id" name="guild_role_subscription_intangible_benefit_name_layout" id="0x7F0A070F" />
+    <public type="id" name="guild_role_subscription_plan_cover_image" id="0x7F0A0710" />
+    <public type="id" name="guild_role_subscription_plan_cover_image_info" id="0x7F0A0711" />
+    <public type="id" name="guild_role_subscription_plan_cover_image_label" id="0x7F0A0712" />
+    <public type="id" name="guild_role_subscription_plan_description" id="0x7F0A0713" />
+    <public type="id" name="guild_role_subscription_plan_description_label" id="0x7F0A0714" />
+    <public type="id" name="guild_role_subscription_plan_description_layout" id="0x7F0A0715" />
+    <public type="id" name="guild_role_subscription_plan_details" id="0x7F0A0716" />
+    <public type="id" name="guild_role_subscription_plan_details_divider" id="0x7F0A0717" />
+    <public type="id" name="guild_role_subscription_plan_details_header_group" id="0x7F0A0718" />
+    <public type="id" name="guild_role_subscription_plan_details_subtitle" id="0x7F0A0719" />
+    <public type="id" name="guild_role_subscription_plan_details_title" id="0x7F0A071A" />
+    <public type="id" name="guild_role_subscription_plan_entire_server_format" id="0x7F0A071B" />
+    <public type="id" name="guild_role_subscription_plan_format" id="0x7F0A071C" />
+    <public type="id" name="guild_role_subscription_plan_format_button" id="0x7F0A071D" />
+    <public type="id" name="guild_role_subscription_plan_format_button_subtitle" id="0x7F0A071E" />
+    <public type="id" name="guild_role_subscription_plan_format_button_title" id="0x7F0A071F" />
+    <public type="id" name="guild_role_subscription_plan_format_image" id="0x7F0A0720" />
+    <public type="id" name="guild_role_subscription_plan_some_channels_format" id="0x7F0A0721" />
+    <public type="id" name="guild_role_subscription_publish_tier" id="0x7F0A0722" />
+    <public type="id" name="guild_role_subscription_publish_tier_cancel" id="0x7F0A0723" />
+    <public type="id" name="guild_role_subscription_section_header" id="0x7F0A0724" />
+    <public type="id" name="guild_role_subscription_tier_all_channels" id="0x7F0A0725" />
+    <public type="id" name="guild_role_subscription_tier_appearance_color" id="0x7F0A0726" />
+    <public type="id" name="guild_role_subscription_tier_appearance_color_layout" id="0x7F0A0727" />
+    <public type="id" name="guild_role_subscription_tier_appearance_color_text" id="0x7F0A0728" />
+    <public type="id" name="guild_role_subscription_tier_appearance_subtitle" id="0x7F0A0729" />
+    <public type="id" name="guild_role_subscription_tier_appearance_title" id="0x7F0A072A" />
+    <public type="id" name="guild_role_subscription_tier_benefit_app_bar_layout" id="0x7F0A072B" />
+    <public type="id" name="guild_role_subscription_tier_benefit_cancel" id="0x7F0A072C" />
+    <public type="id" name="guild_role_subscription_tier_benefit_description" id="0x7F0A072D" />
+    <public type="id" name="guild_role_subscription_tier_benefit_emoji" id="0x7F0A072E" />
+    <public type="id" name="guild_role_subscription_tier_benefit_emoji_name" id="0x7F0A072F" />
+    <public type="id" name="guild_role_subscription_tier_benefit_name" id="0x7F0A0730" />
+    <public type="id" name="guild_role_subscription_tier_benefit_remove" id="0x7F0A0731" />
+    <public type="id" name="guild_role_subscription_tier_benefit_save" id="0x7F0A0732" />
+    <public type="id" name="guild_role_subscription_tier_benefit_scroll_view" id="0x7F0A0733" />
+    <public type="id" name="guild_role_subscription_tier_benefit_select_emoji" id="0x7F0A0734" />
+    <public type="id" name="guild_role_subscription_tier_benefit_subtitle" id="0x7F0A0735" />
+    <public type="id" name="guild_role_subscription_tier_benefit_title" id="0x7F0A0736" />
+    <public type="id" name="guild_role_subscription_tier_benefits_sub_title" id="0x7F0A0737" />
+    <public type="id" name="guild_role_subscription_tier_benefits_title" id="0x7F0A0738" />
+    <public type="id" name="guild_role_subscription_tier_channel_benefit_setting" id="0x7F0A0739" />
+    <public type="id" name="guild_role_subscription_tier_draft_tag" id="0x7F0A073A" />
+    <public type="id" name="guild_role_subscription_tier_edit" id="0x7F0A073B" />
+    <public type="id" name="guild_role_subscription_tier_header_description" id="0x7F0A073C" />
+    <public type="id" name="guild_role_subscription_tier_header_image" id="0x7F0A073D" />
+    <public type="id" name="guild_role_subscription_tier_header_name" id="0x7F0A073E" />
+    <public type="id" name="guild_role_subscription_tier_header_price" id="0x7F0A073F" />
+    <public type="id" name="guild_role_subscription_tier_header_price_interval" id="0x7F0A0740" />
+    <public type="id" name="guild_role_subscription_tier_header_subscribe" id="0x7F0A0741" />
+    <public type="id" name="guild_role_subscription_tier_icon" id="0x7F0A0742" />
+    <public type="id" name="guild_role_subscription_tier_manual_channels" id="0x7F0A0743" />
+    <public type="id" name="guild_role_subscription_tier_member_icon" id="0x7F0A0744" />
+    <public type="id" name="guild_role_subscription_tier_member_preview_dark" id="0x7F0A0745" />
+    <public type="id" name="guild_role_subscription_tier_member_preview_light" id="0x7F0A0746" />
+    <public type="id" name="guild_role_subscription_tier_name" id="0x7F0A0747" />
+    <public type="id" name="guild_role_subscription_tier_price" id="0x7F0A0748" />
+    <public type="id" name="guild_role_subscriptions_app_bar_layout" id="0x7F0A0749" />
+    <public type="id" name="guild_scheduled_event_date_view_icon" id="0x7F0A074A" />
+    <public type="id" name="guild_scheduled_event_date_view_text" id="0x7F0A074B" />
+    <public type="id" name="guild_scheduled_event_details_button_view" id="0x7F0A074C" />
+    <public type="id" name="guild_scheduled_event_details_channel_icon" id="0x7F0A074D" />
+    <public type="id" name="guild_scheduled_event_details_channel_name" id="0x7F0A074E" />
+    <public type="id" name="guild_scheduled_event_details_date_view" id="0x7F0A074F" />
+    <public type="id" name="guild_scheduled_event_details_desc_text" id="0x7F0A0750" />
+    <public type="id" name="guild_scheduled_event_details_guild_icon" id="0x7F0A0751" />
+    <public type="id" name="guild_scheduled_event_details_guild_name" id="0x7F0A0752" />
+    <public type="id" name="guild_scheduled_event_details_rsvp_count" id="0x7F0A0753" />
+    <public type="id" name="guild_scheduled_event_details_rsvp_icon" id="0x7F0A0754" />
+    <public type="id" name="guild_scheduled_event_details_title_text" id="0x7F0A0755" />
+    <public type="id" name="guild_scheduled_event_invite_container" id="0x7F0A0756" />
+    <public type="id" name="guild_scheduled_event_item_view" id="0x7F0A0757" />
+    <public type="id" name="guild_scheduled_event_list_empty_state" id="0x7F0A0758" />
+    <public type="id" name="guild_scheduled_event_list_empty_state_icon" id="0x7F0A0759" />
+    <public type="id" name="guild_scheduled_event_list_empty_state_subtitle" id="0x7F0A075A" />
+    <public type="id" name="guild_scheduled_event_list_empty_state_title" id="0x7F0A075B" />
+    <public type="id" name="guild_scheduled_event_list_item_buttom_view" id="0x7F0A075C" />
+    <public type="id" name="guild_scheduled_event_list_item_channel_guild_container" id="0x7F0A075D" />
+    <public type="id" name="guild_scheduled_event_list_item_date_view" id="0x7F0A075E" />
+    <public type="id" name="guild_scheduled_event_list_item_desc_text" id="0x7F0A075F" />
+    <public type="id" name="guild_scheduled_event_list_item_guild_channel_name" id="0x7F0A0760" />
+    <public type="id" name="guild_scheduled_event_list_item_guild_icon" id="0x7F0A0761" />
+    <public type="id" name="guild_scheduled_event_list_item_guild_icon_placeholder_text" id="0x7F0A0762" />
+    <public type="id" name="guild_scheduled_event_list_item_guild_name" id="0x7F0A0763" />
+    <public type="id" name="guild_scheduled_event_list_item_rsvp_text" id="0x7F0A0764" />
+    <public type="id" name="guild_scheduled_event_list_item_title_text" id="0x7F0A0765" />
+    <public type="id" name="guild_scheduled_event_list_recycler_view" id="0x7F0A0766" />
+    <public type="id" name="guild_scheduled_event_list_toolbar_container" id="0x7F0A0767" />
+    <public type="id" name="guild_scheduled_event_list_toolbar_title" id="0x7F0A0768" />
+    <public type="id" name="guild_scheduled_event_settings_description_header" id="0x7F0A0769" />
+    <public type="id" name="guild_scheduled_event_settings_description_input" id="0x7F0A076A" />
+    <public type="id" name="guild_scheduled_event_settings_description_input_layout" id="0x7F0A076B" />
+    <public type="id" name="guild_scheduled_event_settings_next_button" id="0x7F0A076C" />
+    <public type="id" name="guild_scheduled_event_settings_scroll_view" id="0x7F0A076D" />
+    <public type="id" name="guild_scheduled_event_settings_start_date_header" id="0x7F0A076E" />
+    <public type="id" name="guild_scheduled_event_settings_start_date_input" id="0x7F0A076F" />
+    <public type="id" name="guild_scheduled_event_settings_start_date_input_layout" id="0x7F0A0770" />
+    <public type="id" name="guild_scheduled_event_settings_start_time_header" id="0x7F0A0771" />
+    <public type="id" name="guild_scheduled_event_settings_start_time_input" id="0x7F0A0772" />
+    <public type="id" name="guild_scheduled_event_settings_start_time_input_layout" id="0x7F0A0773" />
+    <public type="id" name="guild_scheduled_event_settings_step_text" id="0x7F0A0774" />
+    <public type="id" name="guild_scheduled_event_settings_stv" id="0x7F0A0775" />
+    <public type="id" name="guild_scheduled_event_settings_toolbar" id="0x7F0A0776" />
+    <public type="id" name="guild_scheduled_event_settings_topic_header" id="0x7F0A0777" />
+    <public type="id" name="guild_scheduled_event_settings_topic_input" id="0x7F0A0778" />
+    <public type="id" name="guild_scheduled_event_settings_topic_layout" id="0x7F0A0779" />
+    <public type="id" name="guild_selector_list" id="0x7F0A077A" />
+    <public type="id" name="guild_sticker_sheet_button_container" id="0x7F0A077B" />
+    <public type="id" name="guild_sticker_sheet_description" id="0x7F0A077C" />
+    <public type="id" name="guild_sticker_sheet_flipper" id="0x7F0A077D" />
+    <public type="id" name="guild_sticker_sheet_guild_container" id="0x7F0A077E" />
+    <public type="id" name="guild_sticker_sheet_guild_header" id="0x7F0A077F" />
+    <public type="id" name="guild_sticker_sheet_guild_icon" id="0x7F0A0780" />
+    <public type="id" name="guild_sticker_sheet_guild_icon_text" id="0x7F0A0781" />
+    <public type="id" name="guild_sticker_sheet_guild_icon_wrapper" id="0x7F0A0782" />
+    <public type="id" name="guild_sticker_sheet_guild_info" id="0x7F0A0783" />
+    <public type="id" name="guild_sticker_sheet_guild_name" id="0x7F0A0784" />
+    <public type="id" name="guild_sticker_sheet_join_btn" id="0x7F0A0785" />
+    <public type="id" name="guild_sticker_sheet_premium_btn" id="0x7F0A0786" />
+    <public type="id" name="guild_sticker_sheet_sticker" id="0x7F0A0787" />
+    <public type="id" name="guild_sticker_sheet_sticker_name" id="0x7F0A0788" />
+    <public type="id" name="guild_subscription_custom_image_title" id="0x7F0A0789" />
+    <public type="id" name="guild_subscription_edit_image" id="0x7F0A078A" />
+    <public type="id" name="guild_subscription_image" id="0x7F0A078B" />
+    <public type="id" name="guild_subscription_perk" id="0x7F0A078C" />
+    <public type="id" name="guild_subscription_plan_details_edit_cover_image" id="0x7F0A078D" />
+    <public type="id" name="guild_subscription_plan_details_layout" id="0x7F0A078E" />
+    <public type="id" name="guild_subscription_plan_setup_step_views" id="0x7F0A078F" />
+    <public type="id" name="guild_subscription_upload_image" id="0x7F0A0790" />
+    <public type="id" name="guild_subscription_upload_image_label" id="0x7F0A0791" />
+    <public type="id" name="guild_template_channels_item_image" id="0x7F0A0792" />
+    <public type="id" name="guild_template_channels_item_name" id="0x7F0A0793" />
+    <public type="id" name="guild_template_channels_recycler_view" id="0x7F0A0794" />
+    <public type="id" name="guild_template_name" id="0x7F0A0795" />
+    <public type="id" name="guild_template_preview_channels" id="0x7F0A0796" />
+    <public type="id" name="guild_template_preview_roles" id="0x7F0A0797" />
+    <public type="id" name="guild_template_preview_roles_layout" id="0x7F0A0798" />
+    <public type="id" name="guild_text" id="0x7F0A0799" />
+    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7F0A079A" />
+    <public type="id" name="guild_transfer_ownership_cancel" id="0x7F0A079B" />
+    <public type="id" name="guild_transfer_ownership_confirm" id="0x7F0A079C" />
+    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7F0A079D" />
+    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7F0A079E" />
+    <public type="id" name="guild_video_at_capacity_confirm" id="0x7F0A079F" />
+    <public type="id" name="guild_view_1" id="0x7F0A07A0" />
+    <public type="id" name="guild_view_2" id="0x7F0A07A1" />
+    <public type="id" name="guild_view_3" id="0x7F0A07A2" />
+    <public type="id" name="guild_view_4" id="0x7F0A07A3" />
+    <public type="id" name="guild_views" id="0x7F0A07A4" />
+    <public type="id" name="guild_welcome_channel" id="0x7F0A07A5" />
+    <public type="id" name="guild_welcome_channel_description" id="0x7F0A07A6" />
+    <public type="id" name="guild_welcome_channel_details" id="0x7F0A07A7" />
+    <public type="id" name="guild_welcome_channel_emoji" id="0x7F0A07A8" />
+    <public type="id" name="guild_welcome_channel_hash" id="0x7F0A07A9" />
+    <public type="id" name="guild_welcome_channel_icon" id="0x7F0A07AA" />
+    <public type="id" name="guild_welcome_channel_name" id="0x7F0A07AB" />
+    <public type="id" name="guild_welcome_channel_text" id="0x7F0A07AC" />
+    <public type="id" name="guild_welcome_channel_unicode_emoji" id="0x7F0A07AD" />
+    <public type="id" name="guild_welcome_sheet_channels" id="0x7F0A07AE" />
+    <public type="id" name="guild_welcome_sheet_description" id="0x7F0A07AF" />
+    <public type="id" name="guild_welcome_sheet_flipper" id="0x7F0A07B0" />
+    <public type="id" name="guild_welcome_sheet_icon" id="0x7F0A07B1" />
+    <public type="id" name="guild_welcome_sheet_icon_card" id="0x7F0A07B2" />
+    <public type="id" name="guild_welcome_sheet_icon_name" id="0x7F0A07B3" />
+    <public type="id" name="guild_welcome_sheet_name" id="0x7F0A07B4" />
+    <public type="id" name="guilds_item_application_status" id="0x7F0A07B5" />
+    <public type="id" name="guilds_item_application_stream" id="0x7F0A07B6" />
+    <public type="id" name="guilds_item_avatar" id="0x7F0A07B7" />
+    <public type="id" name="guilds_item_avatar_text" id="0x7F0A07B8" />
+    <public type="id" name="guilds_item_avatar_wrap" id="0x7F0A07B9" />
+    <public type="id" name="guilds_item_dm_avatar" id="0x7F0A07BA" />
+    <public type="id" name="guilds_item_dm_count" id="0x7F0A07BB" />
+    <public type="id" name="guilds_item_event_status" id="0x7F0A07BC" />
+    <public type="id" name="guilds_item_folder" id="0x7F0A07BD" />
+    <public type="id" name="guilds_item_folder_container" id="0x7F0A07BE" />
+    <public type="id" name="guilds_item_highlight" id="0x7F0A07BF" />
+    <public type="id" name="guilds_item_mentions" id="0x7F0A07C0" />
+    <public type="id" name="guilds_item_profile_avatar" id="0x7F0A07C1" />
+    <public type="id" name="guilds_item_profile_avatar_wrap" id="0x7F0A07C2" />
+    <public type="id" name="guilds_item_profile_selected" id="0x7F0A07C3" />
+    <public type="id" name="guilds_item_selected" id="0x7F0A07C4" />
+    <public type="id" name="guilds_item_unread" id="0x7F0A07C5" />
+    <public type="id" name="guilds_item_voice" id="0x7F0A07C6" />
+    <public type="id" name="h263" id="0x7F0A07C7" />
+    <public type="id" name="h264" id="0x7F0A07C8" />
+    <public type="id" name="handle" id="0x7F0A07C9" />
+    <public type="id" name="hardware" id="0x7F0A07CA" />
+    <public type="id" name="heAac" id="0x7F0A07CB" />
+    <public type="id" name="header" id="0x7F0A07CC" />
+    <public type="id" name="header_barrier" id="0x7F0A07CD" />
+    <public type="id" name="header_item_text" id="0x7F0A07CE" />
+    <public type="id" name="header_name" id="0x7F0A07CF" />
+    <public type="id" name="header_title" id="0x7F0A07D0" />
+    <public type="id" name="hideable" id="0x7F0A07D1" />
+    <public type="id" name="home" id="0x7F0A07D2" />
+    <public type="id" name="homeAsUp" id="0x7F0A07D3" />
+    <public type="id" name="home_panel_center_channel_less" id="0x7F0A07D4" />
+    <public type="id" name="home_panel_center_channel_less_body" id="0x7F0A07D5" />
+    <public type="id" name="home_panel_center_channel_less_title" id="0x7F0A07D6" />
+    <public type="id" name="home_panel_center_nsfw" id="0x7F0A07D7" />
+    <public type="id" name="home_panel_center_nsfw_anchor_wrap" id="0x7F0A07D8" />
+    <public type="id" name="home_panel_center_nsfw_art" id="0x7F0A07D9" />
+    <public type="id" name="home_panel_center_nsfw_confirm" id="0x7F0A07DA" />
+    <public type="id" name="home_panel_center_nsfw_deny" id="0x7F0A07DB" />
+    <public type="id" name="home_panel_center_nsfw_description" id="0x7F0A07DC" />
+    <public type="id" name="home_panel_center_nsfw_title" id="0x7F0A07DD" />
+    <public type="id" name="home_toolbar_unread_count" id="0x7F0A07DE" />
+    <public type="id" name="honorRequest" id="0x7F0A07DF" />
+    <public type="id" name="html" id="0x7F0A07E0" />
+    <public type="id" name="hub_domains_section_title" id="0x7F0A07E1" />
+    <public type="id" name="hub_waitlist_button" id="0x7F0A07E2" />
+    <public type="id" name="hub_waitlist_description" id="0x7F0A07E3" />
+    <public type="id" name="hub_waitlist_edit_text" id="0x7F0A07E4" />
+    <public type="id" name="hub_waitlist_header" id="0x7F0A07E5" />
+    <public type="id" name="hub_waitlist_layout" id="0x7F0A07E6" />
+    <public type="id" name="icon" id="0x7F0A07E7" />
+    <public type="id" name="icon_bg" id="0x7F0A07E8" />
+    <public type="id" name="icon_frame" id="0x7F0A07E9" />
+    <public type="id" name="icon_group" id="0x7F0A07EA" />
+    <public type="id" name="icon_label" id="0x7F0A07EB" />
+    <public type="id" name="icon_only" id="0x7F0A07EC" />
+    <public type="id" name="icon_row" id="0x7F0A07ED" />
+    <public type="id" name="icon_uploader_image" id="0x7F0A07EE" />
+    <public type="id" name="icon_uploader_placeholder_border" id="0x7F0A07EF" />
+    <public type="id" name="icon_uploader_placeholder_icon" id="0x7F0A07F0" />
+    <public type="id" name="icon_uploader_placeholder_text" id="0x7F0A07F1" />
+    <public type="id" name="icon_uploader_plus" id="0x7F0A07F2" />
+    <public type="id" name="icon_uri" id="0x7F0A07F3" />
+    <public type="id" name="identity_perk" id="0x7F0A07F4" />
+    <public type="id" name="ifRoom" id="0x7F0A07F5" />
+    <public type="id" name="ignore" id="0x7F0A07F6" />
+    <public type="id" name="ignoreRequest" id="0x7F0A07F7" />
+    <public type="id" name="image" id="0x7F0A07F8" />
+    <public type="id" name="image_bottom_guideline" id="0x7F0A07F9" />
+    <public type="id" name="image_upload_failed_cancel" id="0x7F0A07FA" />
+    <public type="id" name="image_upload_failed_compression_settings_checkbox" id="0x7F0A07FB" />
+    <public type="id" name="image_upload_failed_compression_settings_container" id="0x7F0A07FC" />
+    <public type="id" name="image_upload_failed_divider" id="0x7F0A07FD" />
+    <public type="id" name="image_upload_failed_nitro" id="0x7F0A07FE" />
+    <public type="id" name="image_upload_failed_nitro_wrapper" id="0x7F0A07FF" />
+    <public type="id" name="image_upload_failed_okay" id="0x7F0A0800" />
+    <public type="id" name="image_upload_failed_send_compress" id="0x7F0A0801" />
+    <public type="id" name="image_upload_failed_text" id="0x7F0A0802" />
+    <public type="id" name="image_view_crop" id="0x7F0A0803" />
+    <public type="id" name="image_view_logo" id="0x7F0A0804" />
+    <public type="id" name="image_view_state_aspect_ratio" id="0x7F0A0805" />
+    <public type="id" name="image_view_state_rotate" id="0x7F0A0806" />
+    <public type="id" name="image_view_state_scale" id="0x7F0A0807" />
+    <public type="id" name="incandescent" id="0x7F0A0808" />
+    <public type="id" name="incoming_call_accept_alt_container" id="0x7F0A0809" />
+    <public type="id" name="incoming_call_accept_button" id="0x7F0A080A" />
+    <public type="id" name="incoming_call_accept_video_button" id="0x7F0A080B" />
+    <public type="id" name="incoming_call_blurred_view" id="0x7F0A080C" />
+    <public type="id" name="incoming_call_decline_button" id="0x7F0A080D" />
+    <public type="id" name="incoming_call_status_container" id="0x7F0A080E" />
+    <public type="id" name="incoming_call_status_primary" id="0x7F0A080F" />
+    <public type="id" name="incoming_call_status_secondary" id="0x7F0A0810" />
+    <public type="id" name="incoming_call_top_guideline" id="0x7F0A0811" />
+    <public type="id" name="incoming_call_users_grid_view" id="0x7F0A0812" />
+    <public type="id" name="incoming_share_no_results_img" id="0x7F0A0813" />
+    <public type="id" name="incoming_share_results_flipper" id="0x7F0A0814" />
+    <public type="id" name="index_entity_types" id="0x7F0A0815" />
+    <public type="id" name="indicator" id="0x7F0A0816" />
+    <public type="id" name="indicator_accept" id="0x7F0A0817" />
+    <public type="id" name="indicator_actions" id="0x7F0A0818" />
+    <public type="id" name="indicator_content" id="0x7F0A0819" />
+    <public type="id" name="indicator_decline" id="0x7F0A081A" />
+    <public type="id" name="indicator_icon" id="0x7F0A081B" />
+    <public type="id" name="indicator_text" id="0x7F0A081C" />
+    <public type="id" name="indicators_container" id="0x7F0A081D" />
+    <public type="id" name="info" id="0x7F0A081E" />
+    <public type="id" name="inline_media_gif_indicator" id="0x7F0A081F" />
+    <public type="id" name="inline_media_image_preview" id="0x7F0A0820" />
+    <public type="id" name="inline_media_loading_indicator" id="0x7F0A0821" />
+    <public type="id" name="inline_media_play_button" id="0x7F0A0822" />
+    <public type="id" name="inline_media_player_view" id="0x7F0A0823" />
+    <public type="id" name="inline_media_volume_toggle" id="0x7F0A0824" />
+    <public type="id" name="instant_message" id="0x7F0A0825" />
+    <public type="id" name="integration_header_container" id="0x7F0A0826" />
+    <public type="id" name="integration_header_disabled_overlay" id="0x7F0A0827" />
+    <public type="id" name="integration_icon" id="0x7F0A0828" />
+    <public type="id" name="integration_name" id="0x7F0A0829" />
+    <public type="id" name="integration_name_container" id="0x7F0A082A" />
+    <public type="id" name="integration_owner_name" id="0x7F0A082B" />
+    <public type="id" name="integration_settings_icon" id="0x7F0A082C" />
+    <public type="id" name="integration_sync_switch" id="0x7F0A082D" />
+    <public type="id" name="integration_syncing_progress_bar" id="0x7F0A082E" />
+    <public type="id" name="integrations_empty_body" id="0x7F0A082F" />
+    <public type="id" name="integrations_empty_header" id="0x7F0A0830" />
+    <public type="id" name="integrations_recycler" id="0x7F0A0831" />
+    <public type="id" name="integrations_root" id="0x7F0A0832" />
+    <public type="id" name="integrations_view_flipper" id="0x7F0A0833" />
+    <public type="id" name="intent_action" id="0x7F0A0834" />
+    <public type="id" name="intent_activity" id="0x7F0A0835" />
+    <public type="id" name="intent_data" id="0x7F0A0836" />
+    <public type="id" name="intent_data_id" id="0x7F0A0837" />
+    <public type="id" name="intent_extra_data" id="0x7F0A0838" />
+    <public type="id" name="interested_button" id="0x7F0A0839" />
+    <public type="id" name="interested_button_text" id="0x7F0A083A" />
+    <public type="id" name="interested_toggle" id="0x7F0A083B" />
+    <public type="id" name="invisible" id="0x7F0A083C" />
+    <public type="id" name="invite_actions_copy" id="0x7F0A083D" />
+    <public type="id" name="invite_actions_revoke" id="0x7F0A083E" />
+    <public type="id" name="invite_actions_share" id="0x7F0A083F" />
+    <public type="id" name="invite_actions_title" id="0x7F0A0840" />
+    <public type="id" name="invite_avatar" id="0x7F0A0841" />
+    <public type="id" name="invite_avatar_small" id="0x7F0A0842" />
+    <public type="id" name="invite_button" id="0x7F0A0843" />
+    <public type="id" name="invite_channel" id="0x7F0A0844" />
+    <public type="id" name="invite_code" id="0x7F0A0845" />
+    <public type="id" name="invite_container" id="0x7F0A0846" />
+    <public type="id" name="invite_divider" id="0x7F0A0847" />
+    <public type="id" name="invite_expiration_container" id="0x7F0A0848" />
+    <public type="id" name="invite_expiration_time" id="0x7F0A0849" />
+    <public type="id" name="invite_expires_label" id="0x7F0A084A" />
+    <public type="id" name="invite_member_container_layout" id="0x7F0A084B" />
+    <public type="id" name="invite_message" id="0x7F0A084C" />
+    <public type="id" name="invite_name_container" id="0x7F0A084D" />
+    <public type="id" name="invite_secondary_button" id="0x7F0A084E" />
+    <public type="id" name="invite_settings_bottom_sheet" id="0x7F0A084F" />
+    <public type="id" name="invite_settings_button" id="0x7F0A0850" />
+    <public type="id" name="invite_settings_icon" id="0x7F0A0851" />
+    <public type="id" name="invite_suggestions_header" id="0x7F0A0852" />
+    <public type="id" name="invite_title" id="0x7F0A0853" />
+    <public type="id" name="invite_uses" id="0x7F0A0854" />
+    <public type="id" name="invite_uses_label" id="0x7F0A0855" />
+    <public type="id" name="inward" id="0x7F0A0856" />
+    <public type="id" name="issue_details_cx_prompt" id="0x7F0A0857" />
+    <public type="id" name="issue_details_input" id="0x7F0A0858" />
+    <public type="id" name="issue_details_submit_button" id="0x7F0A0859" />
+    <public type="id" name="italic" id="0x7F0A085A" />
+    <public type="id" name="item_avatar_wrap" id="0x7F0A085B" />
+    <public type="id" name="item_backup_code_tv" id="0x7F0A085C" />
+    <public type="id" name="item_check_indicator" id="0x7F0A085D" />
+    <public type="id" name="item_description_tv" id="0x7F0A085E" />
+    <public type="id" name="item_directory_empty_header" id="0x7F0A085F" />
+    <public type="id" name="item_directory_empty_subheader" id="0x7F0A0860" />
+    <public type="id" name="item_game_invite" id="0x7F0A0861" />
+    <public type="id" name="item_game_invite_action_btn" id="0x7F0A0862" />
+    <public type="id" name="item_game_invite_application_name_tv" id="0x7F0A0863" />
+    <public type="id" name="item_game_invite_avatar_iv" id="0x7F0A0864" />
+    <public type="id" name="item_game_invite_avatar_status_iv" id="0x7F0A0865" />
+    <public type="id" name="item_game_invite_barrier" id="0x7F0A0866" />
+    <public type="id" name="item_game_invite_cover_iv" id="0x7F0A0867" />
+    <public type="id" name="item_game_invite_header" id="0x7F0A0868" />
+    <public type="id" name="item_game_invite_recycler" id="0x7F0A0869" />
+    <public type="id" name="item_game_invite_subtext" id="0x7F0A086A" />
+    <public type="id" name="item_gift_accept_button" id="0x7F0A086B" />
+    <public type="id" name="item_gift_cannot_claim_button" id="0x7F0A086C" />
+    <public type="id" name="item_gift_details" id="0x7F0A086D" />
+    <public type="id" name="item_gift_expires" id="0x7F0A086E" />
+    <public type="id" name="item_gift_header" id="0x7F0A086F" />
+    <public type="id" name="item_gift_image" id="0x7F0A0870" />
+    <public type="id" name="item_gift_image_background" id="0x7F0A0871" />
+    <public type="id" name="item_gift_loading_button_placeholder" id="0x7F0A0872" />
+    <public type="id" name="item_gift_name" id="0x7F0A0873" />
+    <public type="id" name="item_gift_subtext" id="0x7F0A0874" />
+    <public type="id" name="item_gift_verify_button" id="0x7F0A0875" />
+    <public type="id" name="item_group_tv" id="0x7F0A0876" />
+    <public type="id" name="item_guild_template_header" id="0x7F0A0877" />
+    <public type="id" name="item_guild_template_image" id="0x7F0A0878" />
+    <public type="id" name="item_guild_template_join_button" id="0x7F0A0879" />
+    <public type="id" name="item_guild_template_name" id="0x7F0A087A" />
+    <public type="id" name="item_guild_template_subtext" id="0x7F0A087B" />
+    <public type="id" name="item_guild_welcome_header" id="0x7F0A087C" />
+    <public type="id" name="item_guild_welcome_subheader" id="0x7F0A087D" />
+    <public type="id" name="item_guild_welcome_subheader_intro" id="0x7F0A087E" />
+    <public type="id" name="item_header" id="0x7F0A087F" />
+    <public type="id" name="item_header_tv" id="0x7F0A0880" />
+    <public type="id" name="item_icon" id="0x7F0A0881" />
+    <public type="id" name="item_icon_iv" id="0x7F0A0882" />
+    <public type="id" name="item_invite_btn" id="0x7F0A0883" />
+    <public type="id" name="item_invite_button_layout" id="0x7F0A0884" />
+    <public type="id" name="item_invite_channel_name" id="0x7F0A0885" />
+    <public type="id" name="item_invite_channel_topic" id="0x7F0A0886" />
+    <public type="id" name="item_invite_guild_name" id="0x7F0A0887" />
+    <public type="id" name="item_invite_header" id="0x7F0A0888" />
+    <public type="id" name="item_invite_hub_layout" id="0x7F0A0889" />
+    <public type="id" name="item_invite_hub_link" id="0x7F0A088A" />
+    <public type="id" name="item_invite_image" id="0x7F0A088B" />
+    <public type="id" name="item_invite_image_text" id="0x7F0A088C" />
+    <public type="id" name="item_invite_join_button" id="0x7F0A088D" />
+    <public type="id" name="item_invite_joined_button" id="0x7F0A088E" />
+    <public type="id" name="item_invite_loading_button" id="0x7F0A088F" />
+    <public type="id" name="item_invite_member_container" id="0x7F0A0890" />
+    <public type="id" name="item_invite_mention_button" id="0x7F0A0891" />
+    <public type="id" name="item_invite_name" id="0x7F0A0892" />
+    <public type="id" name="item_invite_online_dot" id="0x7F0A0893" />
+    <public type="id" name="item_invite_online_text" id="0x7F0A0894" />
+    <public type="id" name="item_invite_total_member_dot" id="0x7F0A0895" />
+    <public type="id" name="item_invite_total_member_text" id="0x7F0A0896" />
+    <public type="id" name="item_listen_together_album_image" id="0x7F0A0897" />
+    <public type="id" name="item_listen_together_artist" id="0x7F0A0898" />
+    <public type="id" name="item_listen_together_container" id="0x7F0A0899" />
+    <public type="id" name="item_listen_together_header" id="0x7F0A089A" />
+    <public type="id" name="item_listen_together_join" id="0x7F0A089B" />
+    <public type="id" name="item_listen_together_recycler" id="0x7F0A089C" />
+    <public type="id" name="item_listen_together_session_ended" id="0x7F0A089D" />
+    <public type="id" name="item_listen_together_track" id="0x7F0A089E" />
+    <public type="id" name="item_listeners_count" id="0x7F0A089F" />
+    <public type="id" name="item_mentions_tv" id="0x7F0A08A0" />
+    <public type="id" name="item_name" id="0x7F0A08A1" />
+    <public type="id" name="item_name_tv" id="0x7F0A08A2" />
+    <public type="id" name="item_sent" id="0x7F0A08A3" />
+    <public type="id" name="item_text" id="0x7F0A08A4" />
+    <public type="id" name="item_touch_helper_previous_elevation" id="0x7F0A08A5" />
+    <public type="id" name="item_unread" id="0x7F0A08A6" />
+    <public type="id" name="item_video_indicator" id="0x7F0A08A7" />
+    <public type="id" name="ivIcon" id="0x7F0A08A8" />
+    <public type="id" name="ivRightIcon" id="0x7F0A08A9" />
+    <public type="id" name="join_audience" id="0x7F0A08AA" />
+    <public type="id" name="join_btn" id="0x7F0A08AB" />
+    <public type="id" name="join_speaker" id="0x7F0A08AC" />
+    <public type="id" name="jpeg" id="0x7F0A08AD" />
+    <public type="id" name="jumpToEnd" id="0x7F0A08AE" />
+    <public type="id" name="jumpToStart" id="0x7F0A08AF" />
+    <public type="id" name="kick_user_body" id="0x7F0A08B0" />
+    <public type="id" name="kick_user_cancel" id="0x7F0A08B1" />
+    <public type="id" name="kick_user_confirm" id="0x7F0A08B2" />
+    <public type="id" name="kick_user_reason" id="0x7F0A08B3" />
+    <public type="id" name="kick_user_title" id="0x7F0A08B4" />
+    <public type="id" name="kicker" id="0x7F0A08B5" />
+    <public type="id" name="label" id="0x7F0A08B6" />
+    <public type="id" name="labelGroup" id="0x7F0A08B7" />
+    <public type="id" name="labeled" id="0x7F0A08B8" />
+    <public type="id" name="language" id="0x7F0A08B9" />
+    <public type="id" name="large" id="0x7F0A08BA" />
+    <public type="id" name="largeLabel" id="0x7F0A08BB" />
+    <public type="id" name="large_avatar" id="0x7F0A08BC" />
+    <public type="id" name="large_avatar_barrier" id="0x7F0A08BD" />
+    <public type="id" name="large_icon_uri" id="0x7F0A08BE" />
+    <public type="id" name="launch_btn" id="0x7F0A08BF" />
+    <public type="id" name="launch_camera_btn" id="0x7F0A08C0" />
+    <public type="id" name="layout" id="0x7F0A08C1" />
+    <public type="id" name="layout_aspect_ratio" id="0x7F0A08C2" />
+    <public type="id" name="layout_rotate_wheel" id="0x7F0A08C3" />
+    <public type="id" name="layout_scale_wheel" id="0x7F0A08C4" />
+    <public type="id" name="leave_guild_cancel_btn" id="0x7F0A08C5" />
+    <public type="id" name="leave_guild_confirm_btn" id="0x7F0A08C6" />
+    <public type="id" name="leave_guild_dialog_body" id="0x7F0A08C7" />
+    <public type="id" name="leave_guild_dialog_header" id="0x7F0A08C8" />
+    <public type="id" name="left" id="0x7F0A08C9" />
+    <public type="id" name="leftToRight" id="0x7F0A08CA" />
+    <public type="id" name="left_btns_container" id="0x7F0A08CB" />
+    <public type="id" name="light" id="0x7F0A08CC" />
+    <public type="id" name="line1" id="0x7F0A08CD" />
+    <public type="id" name="line3" id="0x7F0A08CE" />
+    <public type="id" name="linear" id="0x7F0A08CF" />
+    <public type="id" name="link_icon" id="0x7F0A08D0" />
+    <public type="id" name="link_settings_barrier" id="0x7F0A08D1" />
+    <public type="id" name="list" id="0x7F0A08D2" />
+    <public type="id" name="listMode" id="0x7F0A08D3" />
+    <public type="id" name="list_item" id="0x7F0A08D4" />
+    <public type="id" name="live_now_dot" id="0x7F0A08D5" />
+    <public type="id" name="live_now_label" id="0x7F0A08D6" />
+    <public type="id" name="llAlertBackground" id="0x7F0A08D7" />
+    <public type="id" name="llButtonContainer" id="0x7F0A08D8" />
+    <public type="id" name="loading" id="0x7F0A08D9" />
+    <public type="id" name="loadingContainer" id="0x7F0A08DA" />
+    <public type="id" name="loading_button_button" id="0x7F0A08DB" />
+    <public type="id" name="loading_button_progress" id="0x7F0A08DC" />
+    <public type="id" name="loading_dots" id="0x7F0A08DD" />
+    <public type="id" name="loading_progress_bar" id="0x7F0A08DE" />
+    <public type="id" name="location_header" id="0x7F0A08DF" />
+    <public type="id" name="location_options" id="0x7F0A08E0" />
+    <public type="id" name="log_message" id="0x7F0A08E1" />
+    <public type="id" name="logo" id="0x7F0A08E2" />
+    <public type="id" name="lottie_layer_name" id="0x7F0A08E3" />
+    <public type="id" name="main_input_container" id="0x7F0A08E4" />
+    <public type="id" name="main_panel_right_rounded_container" id="0x7F0A08E5" />
+    <public type="id" name="manage_reactions_emoji_container" id="0x7F0A08E6" />
+    <public type="id" name="manage_reactions_emoji_counter" id="0x7F0A08E7" />
+    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7F0A08E8" />
+    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7F0A08E9" />
+    <public type="id" name="manage_reactions_emojis_recycler" id="0x7F0A08EA" />
+    <public type="id" name="manage_reactions_result_error_img" id="0x7F0A08EB" />
+    <public type="id" name="manage_reactions_result_error_text" id="0x7F0A08EC" />
+    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7F0A08ED" />
+    <public type="id" name="manage_reactions_result_user_avatar" id="0x7F0A08EE" />
+    <public type="id" name="manage_reactions_result_user_name" id="0x7F0A08EF" />
+    <public type="id" name="manage_reactions_results_recycler" id="0x7F0A08F0" />
+    <public type="id" name="masked" id="0x7F0A08F1" />
+    <public type="id" name="masked_links_body_text" id="0x7F0A08F2" />
+    <public type="id" name="masked_links_cancel" id="0x7F0A08F3" />
+    <public type="id" name="masked_links_confirm" id="0x7F0A08F4" />
+    <public type="id" name="masked_links_trust_domain" id="0x7F0A08F5" />
+    <public type="id" name="match_global_nicknames" id="0x7F0A08F6" />
+    <public type="id" name="material_clock_display" id="0x7F0A08F7" />
+    <public type="id" name="material_clock_face" id="0x7F0A08F8" />
+    <public type="id" name="material_clock_hand" id="0x7F0A08F9" />
+    <public type="id" name="material_clock_period_am_button" id="0x7F0A08FA" />
+    <public type="id" name="material_clock_period_pm_button" id="0x7F0A08FB" />
+    <public type="id" name="material_clock_period_toggle" id="0x7F0A08FC" />
+    <public type="id" name="material_hour_text_input" id="0x7F0A08FD" />
+    <public type="id" name="material_hour_tv" id="0x7F0A08FE" />
+    <public type="id" name="material_label" id="0x7F0A08FF" />
+    <public type="id" name="material_minute_text_input" id="0x7F0A0900" />
+    <public type="id" name="material_minute_tv" id="0x7F0A0901" />
+    <public type="id" name="material_textinput_timepicker" id="0x7F0A0902" />
+    <public type="id" name="material_timepicker_cancel_button" id="0x7F0A0903" />
+    <public type="id" name="material_timepicker_container" id="0x7F0A0904" />
+    <public type="id" name="material_timepicker_edit_text" id="0x7F0A0905" />
+    <public type="id" name="material_timepicker_mode_button" id="0x7F0A0906" />
+    <public type="id" name="material_timepicker_ok_button" id="0x7F0A0907" />
+    <public type="id" name="material_timepicker_view" id="0x7F0A0908" />
+    <public type="id" name="material_value_index" id="0x7F0A0909" />
+    <public type="id" name="max_guilds_perk" id="0x7F0A090A" />
+    <public type="id" name="max_message_length_perk" id="0x7F0A090B" />
+    <public type="id" name="media_actions" id="0x7F0A090C" />
+    <public type="id" name="media_container" id="0x7F0A090D" />
+    <public type="id" name="media_controller_compat_view_tag" id="0x7F0A090E" />
+    <public type="id" name="media_image" id="0x7F0A090F" />
+    <public type="id" name="media_loading_indicator" id="0x7F0A0910" />
+    <public type="id" name="media_player_control_view" id="0x7F0A0911" />
+    <public type="id" name="media_player_view" id="0x7F0A0912" />
+    <public type="id" name="member_list_item_container" id="0x7F0A0913" />
+    <public type="id" name="member_list_item_lock" id="0x7F0A0914" />
+    <public type="id" name="member_list_item_overflow" id="0x7F0A0915" />
+    <public type="id" name="member_list_item_roles_list" id="0x7F0A0916" />
+    <public type="id" name="member_subtitle" id="0x7F0A0917" />
+    <public type="id" name="member_title" id="0x7F0A0918" />
+    <public type="id" name="member_verification_avatar" id="0x7F0A0919" />
+    <public type="id" name="member_verification_banner_image" id="0x7F0A091A" />
+    <public type="id" name="member_verification_confirm" id="0x7F0A091B" />
+    <public type="id" name="member_verification_container" id="0x7F0A091C" />
+    <public type="id" name="member_verification_guild_icon" id="0x7F0A091D" />
+    <public type="id" name="member_verification_guild_name" id="0x7F0A091E" />
+    <public type="id" name="member_verification_multiple_choice_radio_group" id="0x7F0A091F" />
+    <public type="id" name="member_verification_paragraph_field" id="0x7F0A0920" />
+    <public type="id" name="member_verification_pending_img" id="0x7F0A0921" />
+    <public type="id" name="member_verification_primary_btn" id="0x7F0A0922" />
+    <public type="id" name="member_verification_rule_container" id="0x7F0A0923" />
+    <public type="id" name="member_verification_rule_description" id="0x7F0A0924" />
+    <public type="id" name="member_verification_rule_divider" id="0x7F0A0925" />
+    <public type="id" name="member_verification_rule_index" id="0x7F0A0926" />
+    <public type="id" name="member_verification_rule_root" id="0x7F0A0927" />
+    <public type="id" name="member_verification_rules_check" id="0x7F0A0928" />
+    <public type="id" name="member_verification_rules_confirm" id="0x7F0A0929" />
+    <public type="id" name="member_verification_rules_header" id="0x7F0A092A" />
+    <public type="id" name="member_verification_rules_recycler" id="0x7F0A092B" />
+    <public type="id" name="member_verification_scrollview" id="0x7F0A092C" />
+    <public type="id" name="member_verification_secondary_btn" id="0x7F0A092D" />
+    <public type="id" name="member_verification_success_card" id="0x7F0A092E" />
+    <public type="id" name="member_verification_tertiary_btn" id="0x7F0A092F" />
+    <public type="id" name="member_verification_text" id="0x7F0A0930" />
+    <public type="id" name="member_verification_text_input_field" id="0x7F0A0931" />
+    <public type="id" name="member_verification_verified_check" id="0x7F0A0932" />
+    <public type="id" name="member_verification_verify_button" id="0x7F0A0933" />
+    <public type="id" name="member_verification_verify_icon" id="0x7F0A0934" />
+    <public type="id" name="member_verification_verify_text" id="0x7F0A0935" />
+    <public type="id" name="member_view" id="0x7F0A0936" />
+    <public type="id" name="members_container" id="0x7F0A0937" />
+    <public type="id" name="members_permission_owners_list" id="0x7F0A0938" />
+    <public type="id" name="members_recycler" id="0x7F0A0939" />
+    <public type="id" name="menu_add_connections" id="0x7F0A093A" />
+    <public type="id" name="menu_audit_log_sort_actions" id="0x7F0A093B" />
+    <public type="id" name="menu_audit_log_sort_users" id="0x7F0A093C" />
+    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7F0A093D" />
+    <public type="id" name="menu_auth_mfa_info" id="0x7F0A093E" />
+    <public type="id" name="menu_call_overlay_launcher" id="0x7F0A093F" />
+    <public type="id" name="menu_call_switch_camera" id="0x7F0A0940" />
+    <public type="id" name="menu_call_video_list" id="0x7F0A0941" />
+    <public type="id" name="menu_call_voice_settings" id="0x7F0A0942" />
+    <public type="id" name="menu_channel_settings_delete" id="0x7F0A0943" />
+    <public type="id" name="menu_channel_settings_reset" id="0x7F0A0944" />
+    <public type="id" name="menu_chat_add_friend" id="0x7F0A0945" />
+    <public type="id" name="menu_chat_search" id="0x7F0A0946" />
+    <public type="id" name="menu_chat_side_panel" id="0x7F0A0947" />
+    <public type="id" name="menu_chat_start_call" id="0x7F0A0948" />
+    <public type="id" name="menu_chat_start_group" id="0x7F0A0949" />
+    <public type="id" name="menu_chat_start_video_call" id="0x7F0A094A" />
+    <public type="id" name="menu_chat_stop_call" id="0x7F0A094B" />
+    <public type="id" name="menu_chat_thread_browser" id="0x7F0A094C" />
+    <public type="id" name="menu_code_verification_paste" id="0x7F0A094D" />
+    <public type="id" name="menu_contact_sync_skip" id="0x7F0A094E" />
+    <public type="id" name="menu_contact_sync_upsell_dismiss" id="0x7F0A094F" />
+    <public type="id" name="menu_continue" id="0x7F0A0950" />
+    <public type="id" name="menu_copy_id" id="0x7F0A0951" />
+    <public type="id" name="menu_crop" id="0x7F0A0952" />
+    <public type="id" name="menu_debugging_filter" id="0x7F0A0953" />
+    <public type="id" name="menu_edit_overwrite_delete" id="0x7F0A0954" />
+    <public type="id" name="menu_edit_role_delete" id="0x7F0A0955" />
+    <public type="id" name="menu_filter" id="0x7F0A0956" />
+    <public type="id" name="menu_friends_add_friend" id="0x7F0A0957" />
+    <public type="id" name="menu_friends_contact_sync" id="0x7F0A0958" />
+    <public type="id" name="menu_friends_start_group" id="0x7F0A0959" />
+    <public type="id" name="menu_leave_group" id="0x7F0A095A" />
+    <public type="id" name="menu_loader" id="0x7F0A095B" />
+    <public type="id" name="menu_media_browser" id="0x7F0A095C" />
+    <public type="id" name="menu_media_download" id="0x7F0A095D" />
+    <public type="id" name="menu_media_share" id="0x7F0A095E" />
+    <public type="id" name="menu_premium_guild" id="0x7F0A095F" />
+    <public type="id" name="menu_private_channel_sidebar_close" id="0x7F0A0960" />
+    <public type="id" name="menu_private_channel_sidebar_copy_id" id="0x7F0A0961" />
+    <public type="id" name="menu_private_channel_sidebar_customize_gorup" id="0x7F0A0962" />
+    <public type="id" name="menu_private_channel_sidebar_pinned_messages" id="0x7F0A0963" />
+    <public type="id" name="menu_reports_node_view_holder" id="0x7F0A0964" />
+    <public type="id" name="menu_send" id="0x7F0A0965" />
+    <public type="id" name="menu_server_settings_delete" id="0x7F0A0966" />
+    <public type="id" name="menu_server_settings_emoji_delete" id="0x7F0A0967" />
+    <public type="id" name="menu_server_settings_members_prune" id="0x7F0A0968" />
+    <public type="id" name="menu_settings_debugging" id="0x7F0A0969" />
+    <public type="id" name="menu_settings_log_out" id="0x7F0A096A" />
+    <public type="id" name="menu_settings_premium_guild_sub_cancel" id="0x7F0A096B" />
+    <public type="id" name="menu_settings_premium_guild_sub_transfer" id="0x7F0A096C" />
+    <public type="id" name="menu_settings_premium_guild_sub_uncancel" id="0x7F0A096D" />
+    <public type="id" name="menu_sort_channel" id="0x7F0A096E" />
+    <public type="id" name="menu_sort_done" id="0x7F0A096F" />
+    <public type="id" name="menu_thread_browser_create_thread" id="0x7F0A0970" />
+    <public type="id" name="menu_thread_browser_filters" id="0x7F0A0971" />
+    <public type="id" name="menu_user_mentions_filter" id="0x7F0A0972" />
+    <public type="id" name="message" id="0x7F0A0973" />
+    <public type="id" name="mfa_description_text" id="0x7F0A0974" />
+    <public type="id" name="mfa_download_body" id="0x7F0A0975" />
+    <public type="id" name="mfa_success_enable_sms" id="0x7F0A0976" />
+    <public type="id" name="middle" id="0x7F0A0977" />
+    <public type="id" name="mini" id="0x7F0A0978" />
+    <public type="id" name="mobile_reports_block_user_avatar" id="0x7F0A0979" />
+    <public type="id" name="mobile_reports_block_user_button" id="0x7F0A097A" />
+    <public type="id" name="mobile_reports_block_user_description" id="0x7F0A097B" />
+    <public type="id" name="mobile_reports_block_user_header" id="0x7F0A097C" />
+    <public type="id" name="mobile_reports_block_user_name" id="0x7F0A097D" />
+    <public type="id" name="mobile_reports_channel_preview" id="0x7F0A097E" />
+    <public type="id" name="mobile_reports_child" id="0x7F0A097F" />
+    <public type="id" name="mobile_reports_child_menu_title" id="0x7F0A0980" />
+    <public type="id" name="mobile_reports_directory_channel_preview" id="0x7F0A0981" />
+    <public type="id" name="mobile_reports_message_preview" id="0x7F0A0982" />
+    <public type="id" name="mobile_reports_multiselect" id="0x7F0A0983" />
+    <public type="id" name="mobile_reports_node_block_user" id="0x7F0A0984" />
+    <public type="id" name="mobile_reports_node_bottom_button" id="0x7F0A0985" />
+    <public type="id" name="mobile_reports_node_breadcrumbs" id="0x7F0A0986" />
+    <public type="id" name="mobile_reports_node_channel_preview" id="0x7F0A0987" />
+    <public type="id" name="mobile_reports_node_child_list" id="0x7F0A0988" />
+    <public type="id" name="mobile_reports_node_directory_channel_preview" id="0x7F0A0989" />
+    <public type="id" name="mobile_reports_node_directory_channel_preview_title" id="0x7F0A098A" />
+    <public type="id" name="mobile_reports_node_header" id="0x7F0A098B" />
+    <public type="id" name="mobile_reports_node_info_box" id="0x7F0A098C" />
+    <public type="id" name="mobile_reports_node_info_text" id="0x7F0A098D" />
+    <public type="id" name="mobile_reports_node_message_preview" id="0x7F0A098E" />
+    <public type="id" name="mobile_reports_node_subheader" id="0x7F0A098F" />
+    <public type="id" name="mobile_reports_node_success_shield" id="0x7F0A0990" />
+    <public type="id" name="mobile_reports_progress_bar" id="0x7F0A0991" />
+    <public type="id" name="moderator_start_stage_exit_stage_button" id="0x7F0A0992" />
+    <public type="id" name="moderator_start_stage_icon" id="0x7F0A0993" />
+    <public type="id" name="moderator_start_stage_subtitle" id="0x7F0A0994" />
+    <public type="id" name="moderator_start_stage_title" id="0x7F0A0995" />
+    <public type="id" name="moderator_start_stage_waiting_user_list" id="0x7F0A0996" />
+    <public type="id" name="moderator_start_stage_waiting_user_text" id="0x7F0A0997" />
+    <public type="id" name="mono" id="0x7F0A0998" />
+    <public type="id" name="month_grid" id="0x7F0A0999" />
+    <public type="id" name="month_navigation_bar" id="0x7F0A099A" />
+    <public type="id" name="month_navigation_fragment_toggle" id="0x7F0A099B" />
+    <public type="id" name="month_navigation_next" id="0x7F0A099C" />
+    <public type="id" name="month_navigation_previous" id="0x7F0A099D" />
+    <public type="id" name="month_title" id="0x7F0A099E" />
+    <public type="id" name="more_arrow" id="0x7F0A099F" />
+    <public type="id" name="motion_base" id="0x7F0A09A0" />
+    <public type="id" name="move_to_audience_button" id="0x7F0A09A1" />
+    <public type="id" name="mtrl_anchor_parent" id="0x7F0A09A2" />
+    <public type="id" name="mtrl_calendar_day_selector_frame" id="0x7F0A09A3" />
+    <public type="id" name="mtrl_calendar_days_of_week" id="0x7F0A09A4" />
+    <public type="id" name="mtrl_calendar_frame" id="0x7F0A09A5" />
+    <public type="id" name="mtrl_calendar_main_pane" id="0x7F0A09A6" />
+    <public type="id" name="mtrl_calendar_months" id="0x7F0A09A7" />
+    <public type="id" name="mtrl_calendar_selection_frame" id="0x7F0A09A8" />
+    <public type="id" name="mtrl_calendar_text_input_frame" id="0x7F0A09A9" />
+    <public type="id" name="mtrl_calendar_year_selector_frame" id="0x7F0A09AA" />
+    <public type="id" name="mtrl_card_checked_layer_id" id="0x7F0A09AB" />
+    <public type="id" name="mtrl_child_content_container" id="0x7F0A09AC" />
+    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7F0A09AD" />
+    <public type="id" name="mtrl_motion_snapshot_view" id="0x7F0A09AE" />
+    <public type="id" name="mtrl_picker_fullscreen" id="0x7F0A09AF" />
+    <public type="id" name="mtrl_picker_header" id="0x7F0A09B0" />
+    <public type="id" name="mtrl_picker_header_selection_text" id="0x7F0A09B1" />
+    <public type="id" name="mtrl_picker_header_title_and_selection" id="0x7F0A09B2" />
+    <public type="id" name="mtrl_picker_header_toggle" id="0x7F0A09B3" />
+    <public type="id" name="mtrl_picker_text_input_date" id="0x7F0A09B4" />
+    <public type="id" name="mtrl_picker_text_input_range_end" id="0x7F0A09B5" />
+    <public type="id" name="mtrl_picker_text_input_range_start" id="0x7F0A09B6" />
+    <public type="id" name="mtrl_picker_title_text" id="0x7F0A09B7" />
+    <public type="id" name="mtrl_view_tag_bottom_padding" id="0x7F0A09B8" />
+    <public type="id" name="multiply" id="0x7F0A09B9" />
+    <public type="id" name="mute_button" id="0x7F0A09BA" />
+    <public type="id" name="mute_settings" id="0x7F0A09BB" />
+    <public type="id" name="mute_settings_sheet_mute_options" id="0x7F0A09BC" />
+    <public type="id" name="mute_toggle" id="0x7F0A09BD" />
+    <public type="id" name="mutual_guild_pile" id="0x7F0A09BE" />
+    <public type="id" name="mutual_guilds" id="0x7F0A09BF" />
+    <public type="id" name="mutual_guilds_text" id="0x7F0A09C0" />
+    <public type="id" name="mutual_server_1" id="0x7F0A09C1" />
+    <public type="id" name="mutual_server_2" id="0x7F0A09C2" />
+    <public type="id" name="mutual_server_3" id="0x7F0A09C3" />
+    <public type="id" name="mutual_server_4" id="0x7F0A09C4" />
+    <public type="id" name="name" id="0x7F0A09C5" />
+    <public type="id" name="name_placeholder" id="0x7F0A09C6" />
+    <public type="id" name="name_placeholder_end_guideline" id="0x7F0A09C7" />
+    <public type="id" name="name_tv" id="0x7F0A09C8" />
+    <public type="id" name="navigation_header_container" id="0x7F0A09C9" />
+    <public type="id" name="navigation_help_close" id="0x7F0A09CA" />
+    <public type="id" name="navigation_help_indicators" id="0x7F0A09CB" />
+    <public type="id" name="navigation_help_nux_pager" id="0x7F0A09CC" />
+    <public type="id" name="navigation_indicator" id="0x7F0A09CD" />
+    <public type="id" name="nearby_friends_enable" id="0x7F0A09CE" />
+    <public type="id" name="nearby_friends_learn_more" id="0x7F0A09CF" />
+    <public type="id" name="nearby_friends_recycler" id="0x7F0A09D0" />
+    <public type="id" name="nearby_friends_searching_body" id="0x7F0A09D1" />
+    <public type="id" name="nearby_friends_searching_lottie" id="0x7F0A09D2" />
+    <public type="id" name="nearby_friends_searching_title" id="0x7F0A09D3" />
+    <public type="id" name="never" id="0x7F0A09D4" />
+    <public type="id" name="next_button" id="0x7F0A09D5" />
+    <public type="id" name="nickname_editor_card" id="0x7F0A09D6" />
+    <public type="id" name="nicknames" id="0x7F0A09D7" />
+    <public type="id" name="nitroGiftingBadge" id="0x7F0A09D8" />
+    <public type="id" name="nitroGiftingContainer" id="0x7F0A09D9" />
+    <public type="id" name="nitro_boosting" id="0x7F0A09DA" />
+    <public type="id" name="nitro_gifting" id="0x7F0A09DB" />
+    <public type="id" name="nitro_header" id="0x7F0A09DC" />
+    <public type="id" name="nitro_settings_container" id="0x7F0A09DD" />
+    <public type="id" name="noScroll" id="0x7F0A09DE" />
+    <public type="id" name="no_bans_body" id="0x7F0A09DF" />
+    <public type="id" name="no_guilds" id="0x7F0A09E0" />
+    <public type="id" name="no_invites_body" id="0x7F0A09E1" />
+    <public type="id" name="no_invites_header" id="0x7F0A09E2" />
+    <public type="id" name="no_logs_body" id="0x7F0A09E3" />
+    <public type="id" name="no_logs_title" id="0x7F0A09E4" />
+    <public type="id" name="no_results_text" id="0x7F0A09E5" />
+    <public type="id" name="noise_cancellation_enable_button" id="0x7F0A09E6" />
+    <public type="id" name="noise_cancellation_learn_more" id="0x7F0A09E7" />
+    <public type="id" name="non_member_text" id="0x7F0A09E8" />
+    <public type="id" name="none" id="0x7F0A09E9" />
+    <public type="id" name="normal" id="0x7F0A09EA" />
+    <public type="id" name="not_found" id="0x7F0A09EB" />
+    <public type="id" name="notice_body_container" id="0x7F0A09EC" />
+    <public type="id" name="notice_body_text" id="0x7F0A09ED" />
+    <public type="id" name="notice_cancel" id="0x7F0A09EE" />
+    <public type="id" name="notice_crop" id="0x7F0A09EF" />
+    <public type="id" name="notice_header" id="0x7F0A09F0" />
+    <public type="id" name="notice_header_container" id="0x7F0A09F1" />
+    <public type="id" name="notice_image" id="0x7F0A09F2" />
+    <public type="id" name="notice_ok" id="0x7F0A09F3" />
+    <public type="id" name="notice_upload" id="0x7F0A09F4" />
+    <public type="id" name="notification_background" id="0x7F0A09F5" />
+    <public type="id" name="notification_main_column" id="0x7F0A09F6" />
+    <public type="id" name="notification_main_column_container" id="0x7F0A09F7" />
+    <public type="id" name="notification_mute_settings_mute_item" id="0x7F0A09F8" />
+    <public type="id" name="notification_mute_settings_mute_item_description" id="0x7F0A09F9" />
+    <public type="id" name="notification_mute_settings_mute_item_status" id="0x7F0A09FA" />
+    <public type="id" name="notification_settings_button" id="0x7F0A09FB" />
+    <public type="id" name="notification_settings_button_container" id="0x7F0A09FC" />
+    <public type="id" name="notification_settings_label" id="0x7F0A09FD" />
+    <public type="id" name="notification_settings_overrides_label" id="0x7F0A09FE" />
+    <public type="id" name="notification_upsell" id="0x7F0A09FF" />
+    <public type="id" name="notification_upsell_enable" id="0x7F0A0A00" />
+    <public type="id" name="notifications" id="0x7F0A0A01" />
+    <public type="id" name="nowrap" id="0x7F0A0A02" />
+    <public type="id" name="nuf_channel_prompt_cta_button" id="0x7F0A0A03" />
+    <public type="id" name="nuf_channel_prompt_guild_icon" id="0x7F0A0A04" />
+    <public type="id" name="nuf_channel_prompt_guild_icon_name" id="0x7F0A0A05" />
+    <public type="id" name="nuf_channel_prompt_guild_name" id="0x7F0A0A06" />
+    <public type="id" name="nuf_channel_prompt_skip_button" id="0x7F0A0A07" />
+    <public type="id" name="nuf_channel_prompt_topic_wrap" id="0x7F0A0A08" />
+    <public type="id" name="numeric" id="0x7F0A0A09" />
+    <public type="id" name="nux_guild_template_action_join" id="0x7F0A0A0A" />
+    <public type="id" name="nux_guild_template_card" id="0x7F0A0A0B" />
+    <public type="id" name="nux_guild_template_section_bottom" id="0x7F0A0A0C" />
+    <public type="id" name="nux_guild_template_section_custom_label" id="0x7F0A0A0D" />
+    <public type="id" name="nux_guild_template_section_title" id="0x7F0A0A0E" />
+    <public type="id" name="nux_guild_template_text" id="0x7F0A0A0F" />
+    <public type="id" name="oauth_application_deauthorize_btn" id="0x7F0A0A10" />
+    <public type="id" name="oauth_application_description_label_tv" id="0x7F0A0A11" />
+    <public type="id" name="oauth_application_description_tv" id="0x7F0A0A12" />
+    <public type="id" name="oauth_application_icon_iv" id="0x7F0A0A13" />
+    <public type="id" name="oauth_application_list_item" id="0x7F0A0A14" />
+    <public type="id" name="oauth_application_name_tv" id="0x7F0A0A15" />
+    <public type="id" name="oauth_application_permissions_label_tv" id="0x7F0A0A16" />
+    <public type="id" name="oauth_application_permissions_rv" id="0x7F0A0A17" />
+    <public type="id" name="oauth_authorize_age_notice" id="0x7F0A0A18" />
+    <public type="id" name="oauth_authorize_age_notice_icon" id="0x7F0A0A19" />
+    <public type="id" name="oauth_authorize_application_icon" id="0x7F0A0A1A" />
+    <public type="id" name="oauth_authorize_application_name" id="0x7F0A0A1B" />
+    <public type="id" name="oauth_authorize_card" id="0x7F0A0A1C" />
+    <public type="id" name="oauth_authorize_connect_label" id="0x7F0A0A1D" />
+    <public type="id" name="oauth_authorize_content" id="0x7F0A0A1E" />
+    <public type="id" name="oauth_authorize_deny" id="0x7F0A0A1F" />
+    <public type="id" name="oauth_authorize_grant" id="0x7F0A0A20" />
+    <public type="id" name="oauth_authorize_loading" id="0x7F0A0A21" />
+    <public type="id" name="oauth_authorize_loading_cancel" id="0x7F0A0A22" />
+    <public type="id" name="oauth_authorize_logo" id="0x7F0A0A23" />
+    <public type="id" name="oauth_authorize_not_supported" id="0x7F0A0A24" />
+    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7F0A0A25" />
+    <public type="id" name="oauth_authorize_permissions_list" id="0x7F0A0A26" />
+    <public type="id" name="oauth_authorize_security_notice" id="0x7F0A0A27" />
+    <public type="id" name="oauth_authorize_security_notice_icon" id="0x7F0A0A28" />
+    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7F0A0A29" />
+    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7F0A0A2A" />
+    <public type="id" name="oauth_authorize_user_icon" id="0x7F0A0A2B" />
+    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7F0A0A2C" />
+    <public type="id" name="oauth_token_permission_detailed_name" id="0x7F0A0A2D" />
+    <public type="id" name="off" id="0x7F0A0A2E" />
+    <public type="id" name="off_disabled_overlay" id="0x7F0A0A2F" />
+    <public type="id" name="omnibox_title_section" id="0x7F0A0A30" />
+    <public type="id" name="omnibox_url_section" id="0x7F0A0A31" />
+    <public type="id" name="on" id="0x7F0A0A32" />
+    <public type="id" name="one" id="0x7F0A0A33" />
+    <public type="id" name="option_always" id="0x7F0A0A34" />
+    <public type="id" name="option_eight_hours" id="0x7F0A0A35" />
+    <public type="id" name="option_fifteen_minutes" id="0x7F0A0A36" />
+    <public type="id" name="option_one_hour" id="0x7F0A0A37" />
+    <public type="id" name="option_one_hour_radio" id="0x7F0A0A38" />
+    <public type="id" name="option_seven_days" id="0x7F0A0A39" />
+    <public type="id" name="option_seven_days_duration" id="0x7F0A0A3A" />
+    <public type="id" name="option_seven_days_icon" id="0x7F0A0A3B" />
+    <public type="id" name="option_seven_days_label" id="0x7F0A0A3C" />
+    <public type="id" name="option_seven_days_radio" id="0x7F0A0A3D" />
+    <public type="id" name="option_three_days" id="0x7F0A0A3E" />
+    <public type="id" name="option_three_days_duration" id="0x7F0A0A3F" />
+    <public type="id" name="option_three_days_icon" id="0x7F0A0A40" />
+    <public type="id" name="option_three_days_label" id="0x7F0A0A41" />
+    <public type="id" name="option_three_days_radio" id="0x7F0A0A42" />
+    <public type="id" name="option_twenty_four_hours" id="0x7F0A0A43" />
+    <public type="id" name="option_twenty_four_hours_radio" id="0x7F0A0A44" />
+    <public type="id" name="other_speakers_count_text" id="0x7F0A0A45" />
+    <public type="id" name="outline" id="0x7F0A0A46" />
+    <public type="id" name="outward" id="0x7F0A0A47" />
+    <public type="id" name="overlapping_panels" id="0x7F0A0A48" />
+    <public type="id" name="overlay_bubble_iv" id="0x7F0A0A49" />
+    <public type="id" name="overlay_channel_name" id="0x7F0A0A4A" />
+    <public type="id" name="overlay_channel_search" id="0x7F0A0A4B" />
+    <public type="id" name="overlay_guild_name" id="0x7F0A0A4C" />
+    <public type="id" name="overlay_header" id="0x7F0A0A4D" />
+    <public type="id" name="overlay_invite_link" id="0x7F0A0A4E" />
+    <public type="id" name="overlay_linked_anchor_view" id="0x7F0A0A4F" />
+    <public type="id" name="overlay_members_overflow_tv" id="0x7F0A0A50" />
+    <public type="id" name="overlay_members_rv" id="0x7F0A0A51" />
+    <public type="id" name="overlay_menu" id="0x7F0A0A52" />
+    <public type="id" name="overlay_network_icon" id="0x7F0A0A53" />
+    <public type="id" name="overlay_open_app" id="0x7F0A0A54" />
+    <public type="id" name="overlay_switch_channels" id="0x7F0A0A55" />
+    <public type="id" name="overline" id="0x7F0A0A56" />
+    <public type="id" name="overview_name" id="0x7F0A0A57" />
+    <public type="id" name="overview_region_wrap_help" id="0x7F0A0A58" />
+    <public type="id" name="packed" id="0x7F0A0A59" />
+    <public type="id" name="panel_center" id="0x7F0A0A5A" />
+    <public type="id" name="panel_left" id="0x7F0A0A5B" />
+    <public type="id" name="panel_right" id="0x7F0A0A5C" />
+    <public type="id" name="parallax" id="0x7F0A0A5D" />
+    <public type="id" name="parent" id="0x7F0A0A5E" />
+    <public type="id" name="parentPanel" id="0x7F0A0A5F" />
+    <public type="id" name="parentRelative" id="0x7F0A0A60" />
+    <public type="id" name="parent_matrix" id="0x7F0A0A61" />
+    <public type="id" name="participant_bg_avatar" id="0x7F0A0A62" />
+    <public type="id" name="participant_bg_letterbox" id="0x7F0A0A63" />
+    <public type="id" name="participant_deafen_status_indicator" id="0x7F0A0A64" />
+    <public type="id" name="participant_fullscreen_streamqual_container" id="0x7F0A0A65" />
+    <public type="id" name="participant_fullscreen_streamqual_divider" id="0x7F0A0A66" />
+    <public type="id" name="participant_fullscreen_streamqual_icon" id="0x7F0A0A67" />
+    <public type="id" name="participant_fullscreen_streamqual_info" id="0x7F0A0A68" />
+    <public type="id" name="participant_fullscreen_streamqual_info_container" id="0x7F0A0A69" />
+    <public type="id" name="participant_fullscreen_streamqual_live_indicator" id="0x7F0A0A6A" />
+    <public type="id" name="participant_live_indicator" id="0x7F0A0A6B" />
+    <public type="id" name="participant_mute_status_indicator" id="0x7F0A0A6C" />
+    <public type="id" name="participant_stream_ended" id="0x7F0A0A6D" />
+    <public type="id" name="participant_stream_ended_img" id="0x7F0A0A6E" />
+    <public type="id" name="participant_stream_ended_label" id="0x7F0A0A6F" />
+    <public type="id" name="participant_stream_paused" id="0x7F0A0A70" />
+    <public type="id" name="participant_stream_preview_image" id="0x7F0A0A71" />
+    <public type="id" name="participant_stream_preview_text" id="0x7F0A0A72" />
+    <public type="id" name="participant_video_label" id="0x7F0A0A73" />
+    <public type="id" name="participant_video_loading_indicator" id="0x7F0A0A74" />
+    <public type="id" name="participant_video_stream_renderer" id="0x7F0A0A75" />
+    <public type="id" name="participant_voice_indicators" id="0x7F0A0A76" />
+    <public type="id" name="participant_voice_user_view" id="0x7F0A0A77" />
+    <public type="id" name="password_toggle" id="0x7F0A0A78" />
+    <public type="id" name="path" id="0x7F0A0A79" />
+    <public type="id" name="pathRelative" id="0x7F0A0A7A" />
+    <public type="id" name="payment" id="0x7F0A0A7B" />
+    <public type="id" name="payment_method_edit" id="0x7F0A0A7C" />
+    <public type="id" name="payment_method_header" id="0x7F0A0A7D" />
+    <public type="id" name="payment_method_summary" id="0x7F0A0A7E" />
+    <public type="id" name="payment_source_edit_address1" id="0x7F0A0A7F" />
+    <public type="id" name="payment_source_edit_address2" id="0x7F0A0A80" />
+    <public type="id" name="payment_source_edit_city" id="0x7F0A0A81" />
+    <public type="id" name="payment_source_edit_country" id="0x7F0A0A82" />
+    <public type="id" name="payment_source_edit_default" id="0x7F0A0A83" />
+    <public type="id" name="payment_source_edit_error" id="0x7F0A0A84" />
+    <public type="id" name="payment_source_edit_help" id="0x7F0A0A85" />
+    <public type="id" name="payment_source_edit_name" id="0x7F0A0A86" />
+    <public type="id" name="payment_source_edit_postal_code" id="0x7F0A0A87" />
+    <public type="id" name="payment_source_edit_state" id="0x7F0A0A88" />
+    <public type="id" name="payment_source_summary" id="0x7F0A0A89" />
+    <public type="id" name="payment_source_view_icon" id="0x7F0A0A8A" />
+    <public type="id" name="payment_source_view_icon_wrapper" id="0x7F0A0A8B" />
+    <public type="id" name="payment_source_view_invalid" id="0x7F0A0A8C" />
+    <public type="id" name="payment_source_view_premium" id="0x7F0A0A8D" />
+    <public type="id" name="payment_source_view_subtext" id="0x7F0A0A8E" />
+    <public type="id" name="payment_source_view_title" id="0x7F0A0A8F" />
+    <public type="id" name="pbProgress" id="0x7F0A0A90" />
+    <public type="id" name="peekHeight" id="0x7F0A0A91" />
+    <public type="id" name="peek_container" id="0x7F0A0A92" />
+    <public type="id" name="peek_transition_bitmap" id="0x7F0A0A93" />
+    <public type="id" name="pending_dialog_desc" id="0x7F0A0A94" />
+    <public type="id" name="pending_dialog_title" id="0x7F0A0A95" />
+    <public type="id" name="pending_login" id="0x7F0A0A96" />
+    <public type="id" name="per_guild_identity_container" id="0x7F0A0A97" />
+    <public type="id" name="percent" id="0x7F0A0A98" />
+    <public type="id" name="perk_view_content_list_item" id="0x7F0A0A99" />
+    <public type="id" name="perks_level_contents_header" id="0x7F0A0A9A" />
+    <public type="id" name="perks_level_contents_recycler" id="0x7F0A0A9B" />
+    <public type="id" name="perks_level_header" id="0x7F0A0A9C" />
+    <public type="id" name="perks_level_header_boosts" id="0x7F0A0A9D" />
+    <public type="id" name="perks_level_header_boosts_container" id="0x7F0A0A9E" />
+    <public type="id" name="perks_level_header_text" id="0x7F0A0A9F" />
+    <public type="id" name="perks_level_header_unlocked" id="0x7F0A0AA0" />
+    <public type="id" name="perm_req_text" id="0x7F0A0AA1" />
+    <public type="id" name="permission_owner_view" id="0x7F0A0AA2" />
+    <public type="id" name="permissions_req_btn" id="0x7F0A0AA3" />
+    <public type="id" name="permissions_required_action_btn" id="0x7F0A0AA4" />
+    <public type="id" name="permissions_required_text" id="0x7F0A0AA5" />
+    <public type="id" name="permissions_view_stub" id="0x7F0A0AA6" />
+    <public type="id" name="phone" id="0x7F0A0AA7" />
+    <public type="id" name="phone_country_code_code" id="0x7F0A0AA8" />
+    <public type="id" name="phone_country_code_item" id="0x7F0A0AA9" />
+    <public type="id" name="phone_country_code_name" id="0x7F0A0AAA" />
+    <public type="id" name="phone_country_code_recycler" id="0x7F0A0AAB" />
+    <public type="id" name="phone_country_code_search" id="0x7F0A0AAC" />
+    <public type="id" name="phone_digit_verification_view" id="0x7F0A0AAD" />
+    <public type="id" name="phone_or_email_country_code_wrap" id="0x7F0A0AAE" />
+    <public type="id" name="phone_or_email_main_input" id="0x7F0A0AAF" />
+    <public type="id" name="phone_or_email_main_input_wrap" id="0x7F0A0AB0" />
+    <public type="id" name="picture" id="0x7F0A0AB1" />
+    <public type="id" name="pileItemBg" id="0x7F0A0AB2" />
+    <public type="id" name="pileItemImage" id="0x7F0A0AB3" />
+    <public type="id" name="pileItemInitials" id="0x7F0A0AB4" />
+    <public type="id" name="pile_item_text" id="0x7F0A0AB5" />
+    <public type="id" name="pin" id="0x7F0A0AB6" />
+    <public type="id" name="placeholder_group" id="0x7F0A0AB7" />
+    <public type="id" name="plain" id="0x7F0A0AB8" />
+    <public type="id" name="plan_item_border" id="0x7F0A0AB9" />
+    <public type="id" name="plan_item_container" id="0x7F0A0ABA" />
+    <public type="id" name="plan_item_current_plan" id="0x7F0A0ABB" />
+    <public type="id" name="plan_item_icon" id="0x7F0A0ABC" />
+    <public type="id" name="plan_item_name" id="0x7F0A0ABD" />
+    <public type="id" name="plan_item_price" id="0x7F0A0ABE" />
+    <public type="id" name="popup_attachment" id="0x7F0A0ABF" />
+    <public type="id" name="popup_body" id="0x7F0A0AC0" />
+    <public type="id" name="popup_close_btn" id="0x7F0A0AC1" />
+    <public type="id" name="popup_icon" id="0x7F0A0AC2" />
+    <public type="id" name="popup_sticker" id="0x7F0A0AC3" />
+    <public type="id" name="popup_subtitle" id="0x7F0A0AC4" />
+    <public type="id" name="popup_title" id="0x7F0A0AC5" />
+    <public type="id" name="popup_title_wrap" id="0x7F0A0AC6" />
+    <public type="id" name="position" id="0x7F0A0AC7" />
+    <public type="id" name="postLayout" id="0x7F0A0AC8" />
+    <public type="id" name="premium_activated_confirm" id="0x7F0A0AC9" />
+    <public type="id" name="premium_activated_description" id="0x7F0A0ACA" />
+    <public type="id" name="premium_activated_header_background" id="0x7F0A0ACB" />
+    <public type="id" name="premium_activated_logo" id="0x7F0A0ACC" />
+    <public type="id" name="premium_activated_title" id="0x7F0A0ACD" />
+    <public type="id" name="premium_activated_wumpus" id="0x7F0A0ACE" />
+    <public type="id" name="premium_and_premium_guild_activated_text" id="0x7F0A0ACF" />
+    <public type="id" name="premium_btn" id="0x7F0A0AD0" />
+    <public type="id" name="premium_guild_confirmation_avatar" id="0x7F0A0AD1" />
+    <public type="id" name="premium_guild_confirmation_guild_name" id="0x7F0A0AD2" />
+    <public type="id" name="premium_guild_confirmation_level_info_previous" id="0x7F0A0AD3" />
+    <public type="id" name="premium_guild_confirmation_level_info_upgrade" id="0x7F0A0AD4" />
+    <public type="id" name="premium_guild_confirmation_upgrade_arrow" id="0x7F0A0AD5" />
+    <public type="id" name="premium_guild_subscription_activated_body1" id="0x7F0A0AD6" />
+    <public type="id" name="premium_guild_subscription_activated_body2" id="0x7F0A0AD7" />
+    <public type="id" name="premium_guild_subscription_activated_lottie" id="0x7F0A0AD8" />
+    <public type="id" name="premium_guild_subscription_activated_ok" id="0x7F0A0AD9" />
+    <public type="id" name="premium_guild_subscription_cancel_body" id="0x7F0A0ADA" />
+    <public type="id" name="premium_guild_subscription_cancel_confirm" id="0x7F0A0ADB" />
+    <public type="id" name="premium_guild_subscription_cancel_error" id="0x7F0A0ADC" />
+    <public type="id" name="premium_guild_subscription_cancel_flipper" id="0x7F0A0ADD" />
+    <public type="id" name="premium_guild_subscription_cancel_header" id="0x7F0A0ADE" />
+    <public type="id" name="premium_guild_subscription_cancel_nevermind" id="0x7F0A0ADF" />
+    <public type="id" name="premium_guild_subscription_uncancel_body" id="0x7F0A0AE0" />
+    <public type="id" name="premium_guild_subscription_uncancel_confirm" id="0x7F0A0AE1" />
+    <public type="id" name="premium_guild_subscription_uncancel_error" id="0x7F0A0AE2" />
+    <public type="id" name="premium_guild_subscription_uncancel_flipper" id="0x7F0A0AE3" />
+    <public type="id" name="premium_guild_subscription_uncancel_header" id="0x7F0A0AE4" />
+    <public type="id" name="premium_guild_subscription_uncancel_image" id="0x7F0A0AE5" />
+    <public type="id" name="premium_guild_subscription_uncancel_nevermind" id="0x7F0A0AE6" />
+    <public type="id" name="premium_guild_transfer_confirmation_blurb" id="0x7F0A0AE7" />
+    <public type="id" name="premium_guild_transfer_error" id="0x7F0A0AE8" />
+    <public type="id" name="premium_guild_transfer_previous_guild" id="0x7F0A0AE9" />
+    <public type="id" name="premium_guild_transfer_previous_guild_header" id="0x7F0A0AEA" />
+    <public type="id" name="premium_guild_transfer_select" id="0x7F0A0AEB" />
+    <public type="id" name="premium_guild_transfer_target_guild" id="0x7F0A0AEC" />
+    <public type="id" name="premium_guild_transfer_target_guild_header" id="0x7F0A0AED" />
+    <public type="id" name="premium_guild_upsell_close" id="0x7F0A0AEE" />
+    <public type="id" name="premium_guild_upsell_close_button" id="0x7F0A0AEF" />
+    <public type="id" name="premium_guild_upsell_subscribe_button" id="0x7F0A0AF0" />
+    <public type="id" name="premium_perks" id="0x7F0A0AF1" />
+    <public type="id" name="premium_settings_active_guild_subscription" id="0x7F0A0AF2" />
+    <public type="id" name="premium_settings_active_subscription" id="0x7F0A0AF3" />
+    <public type="id" name="premium_settings_billing_divider" id="0x7F0A0AF4" />
+    <public type="id" name="premium_settings_billing_information" id="0x7F0A0AF5" />
+    <public type="id" name="premium_settings_credit_container" id="0x7F0A0AF6" />
+    <public type="id" name="premium_settings_credit_header" id="0x7F0A0AF7" />
+    <public type="id" name="premium_settings_google_play_manage" id="0x7F0A0AF8" />
+    <public type="id" name="premium_settings_grandfathered" id="0x7F0A0AF9" />
+    <public type="id" name="premium_settings_legalese" id="0x7F0A0AFA" />
+    <public type="id" name="premium_settings_nitro" id="0x7F0A0AFB" />
+    <public type="id" name="premium_settings_nitro_wumpus" id="0x7F0A0AFC" />
+    <public type="id" name="premium_settings_payment_container" id="0x7F0A0AFD" />
+    <public type="id" name="premium_settings_payment_header" id="0x7F0A0AFE" />
+    <public type="id" name="premium_settings_premium" id="0x7F0A0AFF" />
+    <public type="id" name="premium_settings_premium_classic" id="0x7F0A0B00" />
+    <public type="id" name="premium_settings_retry" id="0x7F0A0B01" />
+    <public type="id" name="premium_settings_scrollview" id="0x7F0A0B02" />
+    <public type="id" name="premium_settings_status_notice_button" id="0x7F0A0B03" />
+    <public type="id" name="premium_settings_status_notice_container" id="0x7F0A0B04" />
+    <public type="id" name="premium_settings_status_notice_tv" id="0x7F0A0B05" />
+    <public type="id" name="premium_settings_subscription_container" id="0x7F0A0B06" />
+    <public type="id" name="premium_settings_subscriptions_header" id="0x7F0A0B07" />
+    <public type="id" name="premium_settings_view_flipper" id="0x7F0A0B08" />
+    <public type="id" name="premium_tier_1" id="0x7F0A0B09" />
+    <public type="id" name="premium_tier_1_gift_learn_more" id="0x7F0A0B0A" />
+    <public type="id" name="premium_tier_2" id="0x7F0A0B0B" />
+    <public type="id" name="premium_tier_2_gift_learn_more" id="0x7F0A0B0C" />
+    <public type="id" name="premium_upsell_body" id="0x7F0A0B0D" />
+    <public type="id" name="premium_upsell_button" id="0x7F0A0B0E" />
+    <public type="id" name="premium_upsell_button_container" id="0x7F0A0B0F" />
+    <public type="id" name="premium_upsell_close" id="0x7F0A0B10" />
+    <public type="id" name="premium_upsell_description" id="0x7F0A0B11" />
+    <public type="id" name="premium_upsell_divider" id="0x7F0A0B12" />
+    <public type="id" name="premium_upsell_dots" id="0x7F0A0B13" />
+    <public type="id" name="premium_upsell_get_premium" id="0x7F0A0B14" />
+    <public type="id" name="premium_upsell_header" id="0x7F0A0B15" />
+    <public type="id" name="premium_upsell_img" id="0x7F0A0B16" />
+    <public type="id" name="premium_upsell_learn_more" id="0x7F0A0B17" />
+    <public type="id" name="premium_upsell_perk_boosts" id="0x7F0A0B18" />
+    <public type="id" name="premium_upsell_server_perk" id="0x7F0A0B19" />
+    <public type="id" name="premium_upsell_viewpager" id="0x7F0A0B1A" />
+    <public type="id" name="premium_upsell_yearly_description" id="0x7F0A0B1B" />
+    <public type="id" name="premium_upsell_yearly_title" id="0x7F0A0B1C" />
+    <public type="id" name="preset" id="0x7F0A0B1D" />
+    <public type="id" name="price_tier_picker_app_bar" id="0x7F0A0B1E" />
+    <public type="id" name="price_tier_picker_app_flipper" id="0x7F0A0B1F" />
+    <public type="id" name="price_tier_picker_recycler" id="0x7F0A0B20" />
+    <public type="id" name="price_tier_picker_toolbar" id="0x7F0A0B21" />
+    <public type="id" name="privacy" id="0x7F0A0B22" />
+    <public type="id" name="private_call" id="0x7F0A0B23" />
+    <public type="id" name="private_call_blurred_grid_view" id="0x7F0A0B24" />
+    <public type="id" name="private_call_connectivity_status_bar" id="0x7F0A0B25" />
+    <public type="id" name="private_call_container" id="0x7F0A0B26" />
+    <public type="id" name="private_call_container_content" id="0x7F0A0B27" />
+    <public type="id" name="private_call_grid_view" id="0x7F0A0B28" />
+    <public type="id" name="private_call_status_duration" id="0x7F0A0B29" />
+    <public type="id" name="private_call_status_primary" id="0x7F0A0B2A" />
+    <public type="id" name="private_call_status_secondary" id="0x7F0A0B2B" />
+    <public type="id" name="private_channel_sidebar_actions_call" id="0x7F0A0B2C" />
+    <public type="id" name="private_channel_sidebar_actions_notifications" id="0x7F0A0B2D" />
+    <public type="id" name="private_channel_sidebar_actions_search" id="0x7F0A0B2E" />
+    <public type="id" name="private_channel_sidebar_actions_video" id="0x7F0A0B2F" />
+    <public type="id" name="private_channel_start_image" id="0x7F0A0B30" />
+    <public type="id" name="private_channel_start_text" id="0x7F0A0B31" />
+    <public type="id" name="private_thread_toggle" id="0x7F0A0B32" />
+    <public type="id" name="private_thread_toggle_badge" id="0x7F0A0B33" />
+    <public type="id" name="private_thread_toggle_switch" id="0x7F0A0B34" />
+    <public type="id" name="private_thread_toggle_text" id="0x7F0A0B35" />
+    <public type="id" name="profile" id="0x7F0A0B36" />
+    <public type="id" name="profile_container" id="0x7F0A0B37" />
+    <public type="id" name="progress" id="0x7F0A0B38" />
+    <public type="id" name="progress_bar" id="0x7F0A0B39" />
+    <public type="id" name="progress_cancel_centered" id="0x7F0A0B3A" />
+    <public type="id" name="progress_cancel_top" id="0x7F0A0B3B" />
+    <public type="id" name="progress_circular" id="0x7F0A0B3C" />
+    <public type="id" name="progress_file_image" id="0x7F0A0B3D" />
+    <public type="id" name="progress_gem_icon" id="0x7F0A0B3E" />
+    <public type="id" name="progress_horizontal" id="0x7F0A0B3F" />
+    <public type="id" name="progress_level_text" id="0x7F0A0B40" />
+    <public type="id" name="progress_progress" id="0x7F0A0B41" />
+    <public type="id" name="progress_subtext" id="0x7F0A0B42" />
+    <public type="id" name="progress_text" id="0x7F0A0B43" />
+    <public type="id" name="promoTermsClose" id="0x7F0A0B44" />
+    <public type="id" name="promoTermsContent" id="0x7F0A0B45" />
+    <public type="id" name="prune_user_cancel" id="0x7F0A0B46" />
+    <public type="id" name="prune_user_header" id="0x7F0A0B47" />
+    <public type="id" name="prune_user_prune" id="0x7F0A0B48" />
+    <public type="id" name="prune_users_estimate_text" id="0x7F0A0B49" />
+    <public type="id" name="prune_users_history_1_radio" id="0x7F0A0B4A" />
+    <public type="id" name="prune_users_history_2_radio" id="0x7F0A0B4B" />
+    <public type="id" name="prune_users_loading_progressbar" id="0x7F0A0B4C" />
+    <public type="id" name="public_dot" id="0x7F0A0B4D" />
+    <public type="id" name="public_icon" id="0x7F0A0B4E" />
+    <public type="id" name="public_text" id="0x7F0A0B4F" />
+    <public type="id" name="purchase_premium_monthly" id="0x7F0A0B50" />
+    <public type="id" name="purchase_premium_yearly" id="0x7F0A0B51" />
+    <public type="id" name="push_to_talk_button" id="0x7F0A0B52" />
+    <public type="id" name="qr_scanner" id="0x7F0A0B53" />
+    <public type="id" name="qr_scanner_chip" id="0x7F0A0B54" />
+    <public type="id" name="radio" id="0x7F0A0B55" />
+    <public type="id" name="raise_hand_badge" id="0x7F0A0B56" />
+    <public type="id" name="raise_hand_button" id="0x7F0A0B57" />
+    <public type="id" name="raised_hands_count_label" id="0x7F0A0B58" />
+    <public type="id" name="raised_hands_empty_group" id="0x7F0A0B59" />
+    <public type="id" name="raised_hands_empty_sparkle" id="0x7F0A0B5A" />
+    <public type="id" name="raised_hands_empty_subtitle" id="0x7F0A0B5B" />
+    <public type="id" name="raised_hands_empty_title" id="0x7F0A0B5C" />
+    <public type="id" name="ratio" id="0x7F0A0B5D" />
+    <public type="id" name="reaction_quick_add" id="0x7F0A0B5E" />
+    <public type="id" name="rectangles" id="0x7F0A0B5F" />
+    <public type="id" name="recycler" id="0x7F0A0B60" />
+    <public type="id" name="recycler_view" id="0x7F0A0B61" />
+    <public type="id" name="region_help" id="0x7F0A0B62" />
+    <public type="id" name="region_override_divider" id="0x7F0A0B63" />
+    <public type="id" name="regular" id="0x7F0A0B64" />
+    <public type="id" name="remote_auth_cancel_button" id="0x7F0A0B65" />
+    <public type="id" name="remote_auth_finish_button" id="0x7F0A0B66" />
+    <public type="id" name="remote_auth_login_button" id="0x7F0A0B67" />
+    <public type="id" name="remote_auth_not_found_cancel_button" id="0x7F0A0B68" />
+    <public type="id" name="remote_auth_temporary_switch" id="0x7F0A0B69" />
+    <public type="id" name="remote_auth_view_flipper" id="0x7F0A0B6A" />
+    <public type="id" name="remove" id="0x7F0A0B6B" />
+    <public type="id" name="remove_phone" id="0x7F0A0B6C" />
+    <public type="id" name="report_button" id="0x7F0A0B6D" />
+    <public type="id" name="report_header" id="0x7F0A0B6E" />
+    <public type="id" name="report_message_end_guideline" id="0x7F0A0B6F" />
+    <public type="id" name="report_message_start_guideline" id="0x7F0A0B70" />
+    <public type="id" name="report_message_top_guideline" id="0x7F0A0B71" />
+    <public type="id" name="report_node_bottom_button" id="0x7F0A0B72" />
+    <public type="id" name="report_node_bottom_button_cancel" id="0x7F0A0B73" />
+    <public type="id" name="report_node_bottom_button_description" id="0x7F0A0B74" />
+    <public type="id" name="report_node_bottom_button_error_text" id="0x7F0A0B75" />
+    <public type="id" name="report_reason_descriptipn" id="0x7F0A0B76" />
+    <public type="id" name="report_reason_header" id="0x7F0A0B77" />
+    <public type="id" name="report_reason_radio" id="0x7F0A0B78" />
+    <public type="id" name="report_reasons_container" id="0x7F0A0B79" />
+    <public type="id" name="report_reasons_header" id="0x7F0A0B7A" />
+    <public type="id" name="report_reasons_loading" id="0x7F0A0B7B" />
+    <public type="id" name="report_tooltip" id="0x7F0A0B7C" />
+    <public type="id" name="reports_breadcrumbs_item_dot" id="0x7F0A0B7D" />
+    <public type="id" name="reports_breadcrumbs_item_title" id="0x7F0A0B7E" />
+    <public type="id" name="request_data_link" id="0x7F0A0B7F" />
+    <public type="id" name="restart" id="0x7F0A0B80" />
+    <public type="id" name="result_count" id="0x7F0A0B81" />
+    <public type="id" name="results_rv" id="0x7F0A0B82" />
+    <public type="id" name="reverse" id="0x7F0A0B83" />
+    <public type="id" name="reverseSawtooth" id="0x7F0A0B84" />
+    <public type="id" name="rfc822" id="0x7F0A0B85" />
+    <public type="id" name="rich_presence_container" id="0x7F0A0B86" />
+    <public type="id" name="rich_presence_container_data" id="0x7F0A0B87" />
+    <public type="id" name="rich_presence_details" id="0x7F0A0B88" />
+    <public type="id" name="rich_presence_header" id="0x7F0A0B89" />
+    <public type="id" name="rich_presence_image_large" id="0x7F0A0B8A" />
+    <public type="id" name="rich_presence_image_large_text" id="0x7F0A0B8B" />
+    <public type="id" name="rich_presence_image_large_wrap" id="0x7F0A0B8C" />
+    <public type="id" name="rich_presence_image_small" id="0x7F0A0B8D" />
+    <public type="id" name="rich_presence_music_duration" id="0x7F0A0B8E" />
+    <public type="id" name="rich_presence_music_elapsed" id="0x7F0A0B8F" />
+    <public type="id" name="rich_presence_music_progress_container" id="0x7F0A0B90" />
+    <public type="id" name="rich_presence_primary_button" id="0x7F0A0B91" />
+    <public type="id" name="rich_presence_secondary_button" id="0x7F0A0B92" />
+    <public type="id" name="rich_presence_seekbar" id="0x7F0A0B93" />
+    <public type="id" name="rich_presence_state" id="0x7F0A0B94" />
+    <public type="id" name="rich_presence_time" id="0x7F0A0B95" />
+    <public type="id" name="rich_presence_title" id="0x7F0A0B96" />
+    <public type="id" name="right" id="0x7F0A0B97" />
+    <public type="id" name="rightToLeft" id="0x7F0A0B98" />
+    <public type="id" name="right_icon" id="0x7F0A0B99" />
+    <public type="id" name="right_side" id="0x7F0A0B9A" />
+    <public type="id" name="role_chip_dot" id="0x7F0A0B9B" />
+    <public type="id" name="role_chip_icon" id="0x7F0A0B9C" />
+    <public type="id" name="role_chip_text" id="0x7F0A0B9D" />
+    <public type="id" name="role_icon_iv" id="0x7F0A0B9E" />
+    <public type="id" name="role_item_checked_setting" id="0x7F0A0B9F" />
+    <public type="id" name="role_members_app_view_flipper" id="0x7F0A0BA0" />
+    <public type="id" name="role_settings_add_reactions" id="0x7F0A0BA1" />
+    <public type="id" name="role_settings_administrator" id="0x7F0A0BA2" />
+    <public type="id" name="role_settings_attach_files" id="0x7F0A0BA3" />
+    <public type="id" name="role_settings_ban_members" id="0x7F0A0BA4" />
+    <public type="id" name="role_settings_change_nickname" id="0x7F0A0BA5" />
+    <public type="id" name="role_settings_color_disabled_overlay" id="0x7F0A0BA6" />
+    <public type="id" name="role_settings_color_selector_container" id="0x7F0A0BA7" />
+    <public type="id" name="role_settings_create_instant_invite" id="0x7F0A0BA8" />
+    <public type="id" name="role_settings_create_private_threads" id="0x7F0A0BA9" />
+    <public type="id" name="role_settings_create_public_threads" id="0x7F0A0BAA" />
+    <public type="id" name="role_settings_current_color_display" id="0x7F0A0BAB" />
+    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7F0A0BAC" />
+    <public type="id" name="role_settings_embed_links" id="0x7F0A0BAD" />
+    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7F0A0BAE" />
+    <public type="id" name="role_settings_icon_container" id="0x7F0A0BAF" />
+    <public type="id" name="role_settings_kick_members" id="0x7F0A0BB0" />
+    <public type="id" name="role_settings_manage_channels" id="0x7F0A0BB1" />
+    <public type="id" name="role_settings_manage_emojis_and_stickers" id="0x7F0A0BB2" />
+    <public type="id" name="role_settings_manage_events" id="0x7F0A0BB3" />
+    <public type="id" name="role_settings_manage_messages" id="0x7F0A0BB4" />
+    <public type="id" name="role_settings_manage_nicknames" id="0x7F0A0BB5" />
+    <public type="id" name="role_settings_manage_roles" id="0x7F0A0BB6" />
+    <public type="id" name="role_settings_manage_server" id="0x7F0A0BB7" />
+    <public type="id" name="role_settings_manage_threads" id="0x7F0A0BB8" />
+    <public type="id" name="role_settings_manage_webhooks" id="0x7F0A0BB9" />
+    <public type="id" name="role_settings_mention_everyone" id="0x7F0A0BBA" />
+    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7F0A0BBB" />
+    <public type="id" name="role_settings_overview_scroll" id="0x7F0A0BBC" />
+    <public type="id" name="role_settings_priority_speaker" id="0x7F0A0BBD" />
+    <public type="id" name="role_settings_read_message_history" id="0x7F0A0BBE" />
+    <public type="id" name="role_settings_read_messages" id="0x7F0A0BBF" />
+    <public type="id" name="role_settings_request_to_speak" id="0x7F0A0BC0" />
+    <public type="id" name="role_settings_role_icon" id="0x7F0A0BC1" />
+    <public type="id" name="role_settings_role_icon_divider" id="0x7F0A0BC2" />
+    <public type="id" name="role_settings_role_icon_header" id="0x7F0A0BC3" />
+    <public type="id" name="role_settings_send_messages" id="0x7F0A0BC4" />
+    <public type="id" name="role_settings_send_messages_in_threads" id="0x7F0A0BC5" />
+    <public type="id" name="role_settings_send_tts_messages" id="0x7F0A0BC6" />
+    <public type="id" name="role_settings_use_application_commands" id="0x7F0A0BC7" />
+    <public type="id" name="role_settings_use_external_emojis" id="0x7F0A0BC8" />
+    <public type="id" name="role_settings_use_external_stickers" id="0x7F0A0BC9" />
+    <public type="id" name="role_settings_view_audit_log" id="0x7F0A0BCA" />
+    <public type="id" name="role_settings_view_guild_analytics" id="0x7F0A0BCB" />
+    <public type="id" name="role_settings_voice_connect" id="0x7F0A0BCC" />
+    <public type="id" name="role_settings_voice_deafen_members" id="0x7F0A0BCD" />
+    <public type="id" name="role_settings_voice_move_members" id="0x7F0A0BCE" />
+    <public type="id" name="role_settings_voice_mute_members" id="0x7F0A0BCF" />
+    <public type="id" name="role_settings_voice_speak" id="0x7F0A0BD0" />
+    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7F0A0BD1" />
+    <public type="id" name="role_settings_voice_video" id="0x7F0A0BD2" />
+    <public type="id" name="role_spinner_item_textview" id="0x7F0A0BD3" />
+    <public type="id" name="roles_container" id="0x7F0A0BD4" />
+    <public type="id" name="roles_list_add_role_fab" id="0x7F0A0BD5" />
+    <public type="id" name="roles_permission_owners_list" id="0x7F0A0BD6" />
+    <public type="id" name="roles_recycler" id="0x7F0A0BD7" />
+    <public type="id" name="root" id="0x7F0A0BD8" />
+    <public type="id" name="rotate_scroll_wheel" id="0x7F0A0BD9" />
+    <public type="id" name="rounded" id="0x7F0A0BDA" />
+    <public type="id" name="row" id="0x7F0A0BDB" />
+    <public type="id" name="row_index_key" id="0x7F0A0BDC" />
+    <public type="id" name="row_reverse" id="0x7F0A0BDD" />
+    <public type="id" name="save" id="0x7F0A0BDE" />
+    <public type="id" name="save_fab" id="0x7F0A0BDF" />
+    <public type="id" name="save_non_transition_alpha" id="0x7F0A0BE0" />
+    <public type="id" name="save_overlay_view" id="0x7F0A0BE1" />
+    <public type="id" name="sawtooth" id="0x7F0A0BE2" />
+    <public type="id" name="scale" id="0x7F0A0BE3" />
+    <public type="id" name="scale_scroll_wheel" id="0x7F0A0BE4" />
+    <public type="id" name="screen" id="0x7F0A0BE5" />
+    <public type="id" name="screen_share_button" id="0x7F0A0BE6" />
+    <public type="id" name="screen_share_nfx_cancel_button" id="0x7F0A0BE7" />
+    <public type="id" name="screen_share_nfx_cta" id="0x7F0A0BE8" />
+    <public type="id" name="screen_share_secondary_button" id="0x7F0A0BE9" />
+    <public type="id" name="screen_title" id="0x7F0A0BEA" />
+    <public type="id" name="screen_title_subtitle" id="0x7F0A0BEB" />
+    <public type="id" name="screen_title_title" id="0x7F0A0BEC" />
+    <public type="id" name="scroll" id="0x7F0A0BED" />
+    <public type="id" name="scrollIndicatorDown" id="0x7F0A0BEE" />
+    <public type="id" name="scrollIndicatorUp" id="0x7F0A0BEF" />
+    <public type="id" name="scrollView" id="0x7F0A0BF0" />
+    <public type="id" name="scroll_view" id="0x7F0A0BF1" />
+    <public type="id" name="scrollable" id="0x7F0A0BF2" />
+    <public type="id" name="search" id="0x7F0A0BF3" />
+    <public type="id" name="search_badge" id="0x7F0A0BF4" />
+    <public type="id" name="search_bar" id="0x7F0A0BF5" />
+    <public type="id" name="search_bar_text" id="0x7F0A0BF6" />
+    <public type="id" name="search_barrier" id="0x7F0A0BF7" />
+    <public type="id" name="search_button" id="0x7F0A0BF8" />
+    <public type="id" name="search_clear" id="0x7F0A0BF9" />
+    <public type="id" name="search_close_btn" id="0x7F0A0BFA" />
+    <public type="id" name="search_edit_frame" id="0x7F0A0BFB" />
+    <public type="id" name="search_flipper" id="0x7F0A0BFC" />
+    <public type="id" name="search_go_btn" id="0x7F0A0BFD" />
+    <public type="id" name="search_icon" id="0x7F0A0BFE" />
+    <public type="id" name="search_input" id="0x7F0A0BFF" />
+    <public type="id" name="search_input_edit_text" id="0x7F0A0C00" />
+    <public type="id" name="search_mag_icon" id="0x7F0A0C01" />
+    <public type="id" name="search_plate" id="0x7F0A0C02" />
+    <public type="id" name="search_results_list" id="0x7F0A0C03" />
+    <public type="id" name="search_send_query_fab" id="0x7F0A0C04" />
+    <public type="id" name="search_src_text" id="0x7F0A0C05" />
+    <public type="id" name="search_suggestion_item_channel_container" id="0x7F0A0C06" />
+    <public type="id" name="search_suggestion_item_has_container" id="0x7F0A0C07" />
+    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7F0A0C08" />
+    <public type="id" name="search_suggestion_item_user_container" id="0x7F0A0C09" />
+    <public type="id" name="search_suggestions_item_channel_icon" id="0x7F0A0C0A" />
+    <public type="id" name="search_suggestions_item_channel_text" id="0x7F0A0C0B" />
+    <public type="id" name="search_suggestions_item_has_icon" id="0x7F0A0C0C" />
+    <public type="id" name="search_suggestions_item_has_text" id="0x7F0A0C0D" />
+    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7F0A0C0E" />
+    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7F0A0C0F" />
+    <public type="id" name="search_suggestions_recycler" id="0x7F0A0C10" />
+    <public type="id" name="search_voice_btn" id="0x7F0A0C11" />
+    <public type="id" name="secondary_actions_card" id="0x7F0A0C12" />
+    <public type="id" name="section_general_permissions" id="0x7F0A0C13" />
+    <public type="id" name="seekbar" id="0x7F0A0C14" />
+    <public type="id" name="seekbar_value" id="0x7F0A0C15" />
+    <public type="id" name="segmented_control" id="0x7F0A0C16" />
+    <public type="id" name="segmented_control_guilds_added" id="0x7F0A0C17" />
+    <public type="id" name="segmented_control_guilds_not_added" id="0x7F0A0C18" />
+    <public type="id" name="select_component_chevron" id="0x7F0A0C19" />
+    <public type="id" name="select_component_loading" id="0x7F0A0C1A" />
+    <public type="id" name="select_component_selection_icon" id="0x7F0A0C1B" />
+    <public type="id" name="select_component_selection_text" id="0x7F0A0C1C" />
+    <public type="id" name="select_component_selections_root" id="0x7F0A0C1D" />
+    <public type="id" name="select_component_sheet_item_description" id="0x7F0A0C1E" />
+    <public type="id" name="select_component_sheet_item_divider" id="0x7F0A0C1F" />
+    <public type="id" name="select_component_sheet_item_divider_icon" id="0x7F0A0C20" />
+    <public type="id" name="select_component_sheet_item_icon" id="0x7F0A0C21" />
+    <public type="id" name="select_component_sheet_item_selected" id="0x7F0A0C22" />
+    <public type="id" name="select_component_sheet_item_title" id="0x7F0A0C23" />
+    <public type="id" name="select_dialog_listview" id="0x7F0A0C24" />
+    <public type="id" name="select_subscription_header_text" id="0x7F0A0C25" />
+    <public type="id" name="selected" id="0x7F0A0C26" />
+    <public type="id" name="selection_indicator" id="0x7F0A0C27" />
+    <public type="id" name="selection_type" id="0x7F0A0C28" />
+    <public type="id" name="send_btn_container" id="0x7F0A0C29" />
+    <public type="id" name="send_btn_image" id="0x7F0A0C2A" />
+    <public type="id" name="send_sticker_greet_button" id="0x7F0A0C2B" />
+    <public type="id" name="server_discovery_header_description" id="0x7F0A0C2C" />
+    <public type="id" name="server_discovery_header_image" id="0x7F0A0C2D" />
+    <public type="id" name="server_discovery_header_search_layout" id="0x7F0A0C2E" />
+    <public type="id" name="server_discovery_header_title" id="0x7F0A0C2F" />
+    <public type="id" name="server_discovery_item_barrier" id="0x7F0A0C30" />
+    <public type="id" name="server_discovery_item_button" id="0x7F0A0C31" />
+    <public type="id" name="server_discovery_item_button_joined" id="0x7F0A0C32" />
+    <public type="id" name="server_discovery_item_count_container" id="0x7F0A0C33" />
+    <public type="id" name="server_discovery_item_description" id="0x7F0A0C34" />
+    <public type="id" name="server_discovery_item_image" id="0x7F0A0C35" />
+    <public type="id" name="server_discovery_item_overflow" id="0x7F0A0C36" />
+    <public type="id" name="server_discovery_item_title" id="0x7F0A0C37" />
+    <public type="id" name="server_notifications_everyone_switch" id="0x7F0A0C38" />
+    <public type="id" name="server_notifications_frequency_0_radio" id="0x7F0A0C39" />
+    <public type="id" name="server_notifications_frequency_1_radio" id="0x7F0A0C3A" />
+    <public type="id" name="server_notifications_frequency_2_radio" id="0x7F0A0C3B" />
+    <public type="id" name="server_notifications_frequency_divider" id="0x7F0A0C3C" />
+    <public type="id" name="server_notifications_frequency_wrap" id="0x7F0A0C3D" />
+    <public type="id" name="server_notifications_mute_settings_view" id="0x7F0A0C3E" />
+    <public type="id" name="server_notifications_push_switch" id="0x7F0A0C3F" />
+    <public type="id" name="server_notifications_roles_switch" id="0x7F0A0C40" />
+    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7F0A0C41" />
+    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7F0A0C42" />
+    <public type="id" name="server_settings_audit_logs_recycler" id="0x7F0A0C43" />
+    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7F0A0C44" />
+    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7F0A0C45" />
+    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7F0A0C46" />
+    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7F0A0C47" />
+    <public type="id" name="server_settings_bans_option" id="0x7F0A0C48" />
+    <public type="id" name="server_settings_bans_recycler" id="0x7F0A0C49" />
+    <public type="id" name="server_settings_bans_search" id="0x7F0A0C4A" />
+    <public type="id" name="server_settings_bans_view_flipper" id="0x7F0A0C4B" />
+    <public type="id" name="server_settings_channels_create_channel" id="0x7F0A0C4C" />
+    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7F0A0C4D" />
+    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7F0A0C4E" />
+    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7F0A0C4F" />
+    <public type="id" name="server_settings_channels_text_recycler" id="0x7F0A0C50" />
+    <public type="id" name="server_settings_community_locale" id="0x7F0A0C51" />
+    <public type="id" name="server_settings_community_overview_option" id="0x7F0A0C52" />
+    <public type="id" name="server_settings_community_overview_scroll" id="0x7F0A0C53" />
+    <public type="id" name="server_settings_community_setting_selector_description" id="0x7F0A0C54" />
+    <public type="id" name="server_settings_community_setting_selector_dropdown_icon" id="0x7F0A0C55" />
+    <public type="id" name="server_settings_community_setting_selector_subtitle" id="0x7F0A0C56" />
+    <public type="id" name="server_settings_community_setting_selector_title" id="0x7F0A0C57" />
+    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7F0A0C58" />
+    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7F0A0C59" />
+    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7F0A0C5A" />
+    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7F0A0C5B" />
+    <public type="id" name="server_settings_delete_server_cancel" id="0x7F0A0C5C" />
+    <public type="id" name="server_settings_delete_server_confirm" id="0x7F0A0C5D" />
+    <public type="id" name="server_settings_delete_server_header" id="0x7F0A0C5E" />
+    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7F0A0C5F" />
+    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7F0A0C60" />
+    <public type="id" name="server_settings_delete_server_text" id="0x7F0A0C61" />
+    <public type="id" name="server_settings_disable_community_button" id="0x7F0A0C62" />
+    <public type="id" name="server_settings_disable_community_message" id="0x7F0A0C63" />
+    <public type="id" name="server_settings_emojis_avatar" id="0x7F0A0C64" />
+    <public type="id" name="server_settings_emojis_container" id="0x7F0A0C65" />
+    <public type="id" name="server_settings_emojis_edit_alias" id="0x7F0A0C66" />
+    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7F0A0C67" />
+    <public type="id" name="server_settings_emojis_name" id="0x7F0A0C68" />
+    <public type="id" name="server_settings_emojis_nickname" id="0x7F0A0C69" />
+    <public type="id" name="server_settings_emojis_option" id="0x7F0A0C6A" />
+    <public type="id" name="server_settings_emojis_overflow" id="0x7F0A0C6B" />
+    <public type="id" name="server_settings_emojis_username" id="0x7F0A0C6C" />
+    <public type="id" name="server_settings_emojis_username_avatar" id="0x7F0A0C6D" />
+    <public type="id" name="server_settings_enable_community_option" id="0x7F0A0C6E" />
+    <public type="id" name="server_settings_guild_role_subscription_basic_info" id="0x7F0A0C6F" />
+    <public type="id" name="server_settings_guild_role_subscription_edit_tier_app_bar" id="0x7F0A0C70" />
+    <public type="id" name="server_settings_guild_role_subscription_edit_tier_save" id="0x7F0A0C71" />
+    <public type="id" name="server_settings_guild_role_subscription_edit_tier_view_flipper" id="0x7F0A0C72" />
+    <public type="id" name="server_settings_guild_role_subscription_get_started" id="0x7F0A0C73" />
+    <public type="id" name="server_settings_guild_role_subscription_save" id="0x7F0A0C74" />
+    <public type="id" name="server_settings_guild_role_subscription_tier_list" id="0x7F0A0C75" />
+    <public type="id" name="server_settings_guild_role_subscription_tier_list_view_flipper" id="0x7F0A0C76" />
+    <public type="id" name="server_settings_guild_role_subscription_tiers" id="0x7F0A0C77" />
+    <public type="id" name="server_settings_guild_role_subscription_view_flipper" id="0x7F0A0C78" />
+    <public type="id" name="server_settings_help_item" id="0x7F0A0C79" />
+    <public type="id" name="server_settings_instant_invites_option" id="0x7F0A0C7A" />
+    <public type="id" name="server_settings_instant_invites_recycler" id="0x7F0A0C7B" />
+    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7F0A0C7C" />
+    <public type="id" name="server_settings_members_header_container" id="0x7F0A0C7D" />
+    <public type="id" name="server_settings_members_name_search" id="0x7F0A0C7E" />
+    <public type="id" name="server_settings_members_option" id="0x7F0A0C7F" />
+    <public type="id" name="server_settings_members_recycler" id="0x7F0A0C80" />
+    <public type="id" name="server_settings_members_roles_spinner" id="0x7F0A0C81" />
+    <public type="id" name="server_settings_members_view_flipper" id="0x7F0A0C82" />
+    <public type="id" name="server_settings_moderation_explicit_1" id="0x7F0A0C83" />
+    <public type="id" name="server_settings_moderation_explicit_2" id="0x7F0A0C84" />
+    <public type="id" name="server_settings_moderation_explicit_3" id="0x7F0A0C85" />
+    <public type="id" name="server_settings_moderation_explicit_help" id="0x7F0A0C86" />
+    <public type="id" name="server_settings_moderation_verification_1" id="0x7F0A0C87" />
+    <public type="id" name="server_settings_moderation_verification_2" id="0x7F0A0C88" />
+    <public type="id" name="server_settings_moderation_verification_3" id="0x7F0A0C89" />
+    <public type="id" name="server_settings_moderation_verification_4" id="0x7F0A0C8A" />
+    <public type="id" name="server_settings_moderation_verification_5" id="0x7F0A0C8B" />
+    <public type="id" name="server_settings_moderation_verification_help" id="0x7F0A0C8C" />
+    <public type="id" name="server_settings_option_audit_log" id="0x7F0A0C8D" />
+    <public type="id" name="server_settings_option_channels" id="0x7F0A0C8E" />
+    <public type="id" name="server_settings_option_integrations" id="0x7F0A0C8F" />
+    <public type="id" name="server_settings_option_moderation" id="0x7F0A0C90" />
+    <public type="id" name="server_settings_option_overview" id="0x7F0A0C91" />
+    <public type="id" name="server_settings_option_security" id="0x7F0A0C92" />
+    <public type="id" name="server_settings_option_vanity_url" id="0x7F0A0C93" />
+    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7F0A0C94" />
+    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7F0A0C95" />
+    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7F0A0C96" />
+    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7F0A0C97" />
+    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7F0A0C98" />
+    <public type="id" name="server_settings_overview_icon" id="0x7F0A0C99" />
+    <public type="id" name="server_settings_overview_icon_name_container" id="0x7F0A0C9A" />
+    <public type="id" name="server_settings_overview_icon_remove" id="0x7F0A0C9B" />
+    <public type="id" name="server_settings_overview_icon_text" id="0x7F0A0C9C" />
+    <public type="id" name="server_settings_overview_notification_all" id="0x7F0A0C9D" />
+    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7F0A0C9E" />
+    <public type="id" name="server_settings_overview_scroll" id="0x7F0A0C9F" />
+    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7F0A0CA0" />
+    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7F0A0CA1" />
+    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7F0A0CA2" />
+    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7F0A0CA3" />
+    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7F0A0CA4" />
+    <public type="id" name="server_settings_public_setting_selector" id="0x7F0A0CA5" />
+    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7F0A0CA6" />
+    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7F0A0CA7" />
+    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7F0A0CA8" />
+    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7F0A0CA9" />
+    <public type="id" name="server_settings_role_item_name" id="0x7F0A0CAA" />
+    <public type="id" name="server_settings_role_item_role_icon" id="0x7F0A0CAB" />
+    <public type="id" name="server_settings_role_members_list" id="0x7F0A0CAC" />
+    <public type="id" name="server_settings_role_members_search_input" id="0x7F0A0CAD" />
+    <public type="id" name="server_settings_roles_option" id="0x7F0A0CAE" />
+    <public type="id" name="server_settings_roles_recycler" id="0x7F0A0CAF" />
+    <public type="id" name="server_settings_section_community" id="0x7F0A0CB0" />
+    <public type="id" name="server_settings_section_community_divider" id="0x7F0A0CB1" />
+    <public type="id" name="server_settings_section_general_settings" id="0x7F0A0CB2" />
+    <public type="id" name="server_settings_section_server_monetization" id="0x7F0A0CB3" />
+    <public type="id" name="server_settings_section_server_monetization_divider" id="0x7F0A0CB4" />
+    <public type="id" name="server_settings_section_user_management" id="0x7F0A0CB5" />
+    <public type="id" name="server_settings_section_user_management_divider" id="0x7F0A0CB6" />
+    <public type="id" name="server_settings_security_dialog_cancel" id="0x7F0A0CB7" />
+    <public type="id" name="server_settings_security_dialog_confirm" id="0x7F0A0CB8" />
+    <public type="id" name="server_settings_security_label" id="0x7F0A0CB9" />
+    <public type="id" name="server_settings_security_server_mfa_code" id="0x7F0A0CBA" />
+    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7F0A0CBB" />
+    <public type="id" name="server_settings_server_icon" id="0x7F0A0CBC" />
+    <public type="id" name="server_settings_server_icon_text" id="0x7F0A0CBD" />
+    <public type="id" name="server_settings_server_name" id="0x7F0A0CBE" />
+    <public type="id" name="server_settings_vanity_input" id="0x7F0A0CBF" />
+    <public type="id" name="server_settings_vanity_url_current_url" id="0x7F0A0CC0" />
+    <public type="id" name="server_settings_vanity_url_error_text" id="0x7F0A0CC1" />
+    <public type="id" name="server_settings_vanity_url_header" id="0x7F0A0CC2" />
+    <public type="id" name="server_settings_vanity_url_input_container" id="0x7F0A0CC3" />
+    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7F0A0CC4" />
+    <public type="id" name="server_settings_vanity_url_prefix" id="0x7F0A0CC5" />
+    <public type="id" name="server_settings_vanity_url_remove" id="0x7F0A0CC6" />
+    <public type="id" name="server_settings_vanity_url_save" id="0x7F0A0CC7" />
+    <public type="id" name="set_custom_status_emoji" id="0x7F0A0CC8" />
+    <public type="id" name="set_custom_status_emoji_button" id="0x7F0A0CC9" />
+    <public type="id" name="set_custom_status_expiration" id="0x7F0A0CCA" />
+    <public type="id" name="set_custom_status_expiration_1_hour" id="0x7F0A0CCB" />
+    <public type="id" name="set_custom_status_expiration_30_minutes" id="0x7F0A0CCC" />
+    <public type="id" name="set_custom_status_expiration_4_hours" id="0x7F0A0CCD" />
+    <public type="id" name="set_custom_status_expiration_never" id="0x7F0A0CCE" />
+    <public type="id" name="set_custom_status_expiration_tomorrow" id="0x7F0A0CCF" />
+    <public type="id" name="set_custom_status_save" id="0x7F0A0CD0" />
+    <public type="id" name="set_custom_status_text" id="0x7F0A0CD1" />
+    <public type="id" name="set_nickname_text" id="0x7F0A0CD2" />
+    <public type="id" name="set_status_container" id="0x7F0A0CD3" />
+    <public type="id" name="setting_button" id="0x7F0A0CD4" />
+    <public type="id" name="setting_container" id="0x7F0A0CD5" />
+    <public type="id" name="setting_disabled_overlay" id="0x7F0A0CD6" />
+    <public type="id" name="setting_drawable_left" id="0x7F0A0CD7" />
+    <public type="id" name="setting_label" id="0x7F0A0CD8" />
+    <public type="id" name="setting_subtext" id="0x7F0A0CD9" />
+    <public type="id" name="setting_tag" id="0x7F0A0CDA" />
+    <public type="id" name="settings_accessibility_allow_animate_emoji_switch" id="0x7F0A0CDB" />
+    <public type="id" name="settings_accessibility_allow_autoplay_gif_switch" id="0x7F0A0CDC" />
+    <public type="id" name="settings_accessibility_images_header" id="0x7F0A0CDD" />
+    <public type="id" name="settings_accessibility_reduced_motion_description" id="0x7F0A0CDE" />
+    <public type="id" name="settings_accessibility_reduced_motion_header" id="0x7F0A0CDF" />
+    <public type="id" name="settings_accessibility_reduced_motion_switch" id="0x7F0A0CE0" />
+    <public type="id" name="settings_accessibility_stickers_container" id="0x7F0A0CE1" />
+    <public type="id" name="settings_accessibility_stickers_header" id="0x7F0A0CE2" />
+    <public type="id" name="settings_account_2fa_header" id="0x7F0A0CE3" />
+    <public type="id" name="settings_account_change_password" id="0x7F0A0CE4" />
+    <public type="id" name="settings_account_email_container" id="0x7F0A0CE5" />
+    <public type="id" name="settings_account_email_label" id="0x7F0A0CE6" />
+    <public type="id" name="settings_account_email_text" id="0x7F0A0CE7" />
+    <public type="id" name="settings_account_information_data_wrap" id="0x7F0A0CE8" />
+    <public type="id" name="settings_account_information_header" id="0x7F0A0CE9" />
+    <public type="id" name="settings_account_management_header" id="0x7F0A0CEA" />
+    <public type="id" name="settings_account_mfa_container" id="0x7F0A0CEB" />
+    <public type="id" name="settings_account_mfa_disabled_container" id="0x7F0A0CEC" />
+    <public type="id" name="settings_account_mfa_enable" id="0x7F0A0CED" />
+    <public type="id" name="settings_account_mfa_enabled_container" id="0x7F0A0CEE" />
+    <public type="id" name="settings_account_mfa_enabled_header" id="0x7F0A0CEF" />
+    <public type="id" name="settings_account_mfa_flipper" id="0x7F0A0CF0" />
+    <public type="id" name="settings_account_mfa_lottie" id="0x7F0A0CF1" />
+    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7F0A0CF2" />
+    <public type="id" name="settings_account_name_clear" id="0x7F0A0CF3" />
+    <public type="id" name="settings_account_name_container" id="0x7F0A0CF4" />
+    <public type="id" name="settings_account_name_label" id="0x7F0A0CF5" />
+    <public type="id" name="settings_account_name_text" id="0x7F0A0CF6" />
+    <public type="id" name="settings_account_phone_container" id="0x7F0A0CF7" />
+    <public type="id" name="settings_account_phone_label" id="0x7F0A0CF8" />
+    <public type="id" name="settings_account_phone_text" id="0x7F0A0CF9" />
+    <public type="id" name="settings_account_private_data_delete" id="0x7F0A0CFA" />
+    <public type="id" name="settings_account_private_data_disable" id="0x7F0A0CFB" />
+    <public type="id" name="settings_account_private_data_wrap" id="0x7F0A0CFC" />
+    <public type="id" name="settings_account_remove_two_fa" id="0x7F0A0CFD" />
+    <public type="id" name="settings_account_save" id="0x7F0A0CFE" />
+    <public type="id" name="settings_account_scroll" id="0x7F0A0CFF" />
+    <public type="id" name="settings_account_sms_backup" id="0x7F0A0D00" />
+    <public type="id" name="settings_account_sms_phone" id="0x7F0A0D01" />
+    <public type="id" name="settings_account_tag_container" id="0x7F0A0D02" />
+    <public type="id" name="settings_account_tag_label" id="0x7F0A0D03" />
+    <public type="id" name="settings_account_tag_text" id="0x7F0A0D04" />
+    <public type="id" name="settings_account_verification" id="0x7F0A0D05" />
+    <public type="id" name="settings_account_verification_button" id="0x7F0A0D06" />
+    <public type="id" name="settings_account_verification_title" id="0x7F0A0D07" />
+    <public type="id" name="settings_account_view_backup_codes" id="0x7F0A0D08" />
+    <public type="id" name="settings_appearance_font_scale_header" id="0x7F0A0D09" />
+    <public type="id" name="settings_appearance_font_scale_platform" id="0x7F0A0D0A" />
+    <public type="id" name="settings_appearance_font_scaling_container" id="0x7F0A0D0B" />
+    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7F0A0D0C" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7F0A0D0D" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7F0A0D0E" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7F0A0D0F" />
+    <public type="id" name="settings_appearance_holy_light" id="0x7F0A0D10" />
+    <public type="id" name="settings_appearance_sync_header" id="0x7F0A0D11" />
+    <public type="id" name="settings_appearance_sync_switch" id="0x7F0A0D12" />
+    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7F0A0D13" />
+    <public type="id" name="settings_appearance_theme_header" id="0x7F0A0D14" />
+    <public type="id" name="settings_appearance_theme_light_radio" id="0x7F0A0D15" />
+    <public type="id" name="settings_appearance_theme_pure_evil_switch" id="0x7F0A0D16" />
+    <public type="id" name="settings_backup_codes_generate" id="0x7F0A0D17" />
+    <public type="id" name="settings_backup_codes_info" id="0x7F0A0D18" />
+    <public type="id" name="settings_backup_codes_rv" id="0x7F0A0D19" />
+    <public type="id" name="settings_behavior_browser_switch" id="0x7F0A0D1A" />
+    <public type="id" name="settings_behavior_chat_header" id="0x7F0A0D1B" />
+    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7F0A0D1C" />
+    <public type="id" name="settings_behavior_keyboard_header" id="0x7F0A0D1D" />
+    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7F0A0D1E" />
+    <public type="id" name="settings_billing" id="0x7F0A0D1F" />
+    <public type="id" name="settings_bitrate" id="0x7F0A0D20" />
+    <public type="id" name="settings_bitrate_help" id="0x7F0A0D21" />
+    <public type="id" name="settings_blocked_users" id="0x7F0A0D22" />
+    <public type="id" name="settings_boost_flipper" id="0x7F0A0D23" />
+    <public type="id" name="settings_boost_marketing_view" id="0x7F0A0D24" />
+    <public type="id" name="settings_boost_no_guilds_image" id="0x7F0A0D25" />
+    <public type="id" name="settings_boost_no_guilds_subtitle" id="0x7F0A0D26" />
+    <public type="id" name="settings_boost_no_guilds_title" id="0x7F0A0D27" />
+    <public type="id" name="settings_boost_recycler" id="0x7F0A0D28" />
+    <public type="id" name="settings_boost_retry" id="0x7F0A0D29" />
+    <public type="id" name="settings_boost_sample_guilds" id="0x7F0A0D2A" />
+    <public type="id" name="settings_boost_subtext" id="0x7F0A0D2B" />
+    <public type="id" name="settings_boost_subtext_container" id="0x7F0A0D2C" />
+    <public type="id" name="settings_boost_upsell_view" id="0x7F0A0D2D" />
+    <public type="id" name="settings_channel_list_category_item_drag" id="0x7F0A0D2E" />
+    <public type="id" name="settings_channel_list_category_item_text" id="0x7F0A0D2F" />
+    <public type="id" name="settings_channel_list_item_drag" id="0x7F0A0D30" />
+    <public type="id" name="settings_channel_list_item_hash" id="0x7F0A0D31" />
+    <public type="id" name="settings_channel_list_item_name" id="0x7F0A0D32" />
+    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7F0A0D33" />
+    <public type="id" name="settings_developer_screenshot_bug_reporting" id="0x7F0A0D34" />
+    <public type="id" name="settings_gifting_flipper" id="0x7F0A0D35" />
+    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7F0A0D36" />
+    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7F0A0D37" />
+    <public type="id" name="settings_gifting_gifts_you_purchased_header" id="0x7F0A0D38" />
+    <public type="id" name="settings_gifting_gifts_you_purchased_recycler" id="0x7F0A0D39" />
+    <public type="id" name="settings_gifting_purchase_gift_section" id="0x7F0A0D3A" />
+    <public type="id" name="settings_gifting_redeem_codes_header" id="0x7F0A0D3B" />
+    <public type="id" name="settings_gifting_retry" id="0x7F0A0D3C" />
+    <public type="id" name="settings_gifting_select_classic_gift_header" id="0x7F0A0D3D" />
+    <public type="id" name="settings_gifting_select_gift_header" id="0x7F0A0D3E" />
+    <public type="id" name="settings_gifting_your_gifts_header" id="0x7F0A0D3F" />
+    <public type="id" name="settings_gifting_your_gifts_recycler" id="0x7F0A0D40" />
+    <public type="id" name="settings_group_icon" id="0x7F0A0D41" />
+    <public type="id" name="settings_group_icon_label" id="0x7F0A0D42" />
+    <public type="id" name="settings_group_icon_remove" id="0x7F0A0D43" />
+    <public type="id" name="settings_inapp_notifs_switch" id="0x7F0A0D44" />
+    <public type="id" name="settings_language_current" id="0x7F0A0D45" />
+    <public type="id" name="settings_language_current_flag" id="0x7F0A0D46" />
+    <public type="id" name="settings_language_current_text" id="0x7F0A0D47" />
+    <public type="id" name="settings_language_header" id="0x7F0A0D48" />
+    <public type="id" name="settings_language_select_item_name" id="0x7F0A0D49" />
+    <public type="id" name="settings_language_select_item_name_localized" id="0x7F0A0D4A" />
+    <public type="id" name="settings_language_select_list" id="0x7F0A0D4B" />
+    <public type="id" name="settings_language_sync_check" id="0x7F0A0D4C" />
+    <public type="id" name="settings_language_sync_header" id="0x7F0A0D4D" />
+    <public type="id" name="settings_member" id="0x7F0A0D4E" />
+    <public type="id" name="settings_member_view" id="0x7F0A0D4F" />
+    <public type="id" name="settings_nitro" id="0x7F0A0D50" />
+    <public type="id" name="settings_notification_os" id="0x7F0A0D51" />
+    <public type="id" name="settings_notification_os_label" id="0x7F0A0D52" />
+    <public type="id" name="settings_notification_switch" id="0x7F0A0D53" />
+    <public type="id" name="settings_notifications_blink" id="0x7F0A0D54" />
+    <public type="id" name="settings_notifications_enabled" id="0x7F0A0D55" />
+    <public type="id" name="settings_notifications_mute_all" id="0x7F0A0D56" />
+    <public type="id" name="settings_notifications_vibrations" id="0x7F0A0D57" />
+    <public type="id" name="settings_notifications_wrap" id="0x7F0A0D58" />
+    <public type="id" name="settings_presence_text" id="0x7F0A0D59" />
+    <public type="id" name="settings_privacy_basic_service" id="0x7F0A0D5A" />
+    <public type="id" name="settings_privacy_contact_sync" id="0x7F0A0D5B" />
+    <public type="id" name="settings_privacy_contact_sync_title" id="0x7F0A0D5C" />
+    <public type="id" name="settings_privacy_controls" id="0x7F0A0D5D" />
+    <public type="id" name="settings_privacy_data_header" id="0x7F0A0D5E" />
+    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7F0A0D5F" />
+    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7F0A0D60" />
+    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7F0A0D61" />
+    <public type="id" name="settings_privacy_defaults_header" id="0x7F0A0D62" />
+    <public type="id" name="settings_privacy_explicit_0" id="0x7F0A0D63" />
+    <public type="id" name="settings_privacy_explicit_1" id="0x7F0A0D64" />
+    <public type="id" name="settings_privacy_explicit_2" id="0x7F0A0D65" />
+    <public type="id" name="settings_privacy_friend_source_0" id="0x7F0A0D66" />
+    <public type="id" name="settings_privacy_friend_source_1" id="0x7F0A0D67" />
+    <public type="id" name="settings_privacy_friend_source_2" id="0x7F0A0D68" />
+    <public type="id" name="settings_privacy_friend_source_header" id="0x7F0A0D69" />
+    <public type="id" name="settings_privacy_personalization" id="0x7F0A0D6A" />
+    <public type="id" name="settings_privacy_request_data" id="0x7F0A0D6B" />
+    <public type="id" name="settings_privacy_safe_messaging_header" id="0x7F0A0D6C" />
+    <public type="id" name="settings_privacy_screenreader_detection" id="0x7F0A0D6D" />
+    <public type="id" name="settings_privacy_statistics" id="0x7F0A0D6E" />
+    <public type="id" name="settings_profile_scroll" id="0x7F0A0D6F" />
+    <public type="id" name="settings_status_view" id="0x7F0A0D70" />
+    <public type="id" name="settings_text_images_compression_header" id="0x7F0A0D71" />
+    <public type="id" name="settings_text_images_display_header" id="0x7F0A0D72" />
+    <public type="id" name="settings_text_images_embeds_toggle" id="0x7F0A0D73" />
+    <public type="id" name="settings_text_images_links_toggle" id="0x7F0A0D74" />
+    <public type="id" name="settings_text_images_preview_header" id="0x7F0A0D75" />
+    <public type="id" name="settings_text_images_stickers_header" id="0x7F0A0D76" />
+    <public type="id" name="settings_text_images_sync_header" id="0x7F0A0D77" />
+    <public type="id" name="settings_text_images_sync_toggle" id="0x7F0A0D78" />
+    <public type="id" name="settings_user_limit" id="0x7F0A0D79" />
+    <public type="id" name="settings_user_limit_help" id="0x7F0A0D7A" />
+    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7F0A0D7B" />
+    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7F0A0D7C" />
+    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7F0A0D7D" />
+    <public type="id" name="settings_voice_gain_control_toggle" id="0x7F0A0D7E" />
+    <public type="id" name="settings_voice_input_header" id="0x7F0A0D7F" />
+    <public type="id" name="settings_voice_input_mode_ptt" id="0x7F0A0D80" />
+    <public type="id" name="settings_voice_input_mode_vad" id="0x7F0A0D81" />
+    <public type="id" name="settings_voice_krisp_info" id="0x7F0A0D82" />
+    <public type="id" name="settings_voice_krisp_vad_toggle" id="0x7F0A0D83" />
+    <public type="id" name="settings_voice_mode" id="0x7F0A0D84" />
+    <public type="id" name="settings_voice_mode_header" id="0x7F0A0D85" />
+    <public type="id" name="settings_voice_mode_value" id="0x7F0A0D86" />
+    <public type="id" name="settings_voice_noise_cancellation_toggle" id="0x7F0A0D87" />
+    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7F0A0D88" />
+    <public type="id" name="settings_voice_opensl_header" id="0x7F0A0D89" />
+    <public type="id" name="settings_voice_opensles_default" id="0x7F0A0D8A" />
+    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7F0A0D8B" />
+    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7F0A0D8C" />
+    <public type="id" name="settings_voice_opensles_help" id="0x7F0A0D8D" />
+    <public type="id" name="settings_voice_output_header" id="0x7F0A0D8E" />
+    <public type="id" name="settings_voice_output_volume" id="0x7F0A0D8F" />
+    <public type="id" name="settings_voice_output_volume_wrap" id="0x7F0A0D90" />
+    <public type="id" name="settings_voice_overlay_header" id="0x7F0A0D91" />
+    <public type="id" name="settings_voice_overlay_toggle" id="0x7F0A0D92" />
+    <public type="id" name="settings_voice_processing_header" id="0x7F0A0D93" />
+    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7F0A0D94" />
+    <public type="id" name="settings_voice_sensitivity_header" id="0x7F0A0D95" />
+    <public type="id" name="settings_voice_sensitivity_label" id="0x7F0A0D96" />
+    <public type="id" name="settings_voice_sensitivity_manual" id="0x7F0A0D97" />
+    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7F0A0D98" />
+    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7F0A0D99" />
+    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7F0A0D9A" />
+    <public type="id" name="settings_voice_video_container" id="0x7F0A0D9B" />
+    <public type="id" name="settings_voice_video_header" id="0x7F0A0D9C" />
+    <public type="id" name="settings_voice_video_troubleshooting_guide" id="0x7F0A0D9D" />
+    <public type="id" name="shades_divider" id="0x7F0A0D9E" />
+    <public type="id" name="shades_layout" id="0x7F0A0D9F" />
+    <public type="id" name="share_button" id="0x7F0A0DA0" />
+    <public type="id" name="shortcut" id="0x7F0A0DA1" />
+    <public type="id" name="showCustom" id="0x7F0A0DA2" />
+    <public type="id" name="showHome" id="0x7F0A0DA3" />
+    <public type="id" name="showTitle" id="0x7F0A0DA4" />
+    <public type="id" name="show_current_activity" id="0x7F0A0DA5" />
+    <public type="id" name="simple_confirmation_dialog_description" id="0x7F0A0DA6" />
+    <public type="id" name="simple_confirmation_dialog_negative" id="0x7F0A0DA7" />
+    <public type="id" name="simple_confirmation_dialog_positive" id="0x7F0A0DA8" />
+    <public type="id" name="simple_confirmation_dialog_title" id="0x7F0A0DA9" />
+    <public type="id" name="sin" id="0x7F0A0DAA" />
+    <public type="id" name="skipCollapsed" id="0x7F0A0DAB" />
+    <public type="id" name="slide" id="0x7F0A0DAC" />
+    <public type="id" name="smallLabel" id="0x7F0A0DAD" />
+    <public type="id" name="snackbar_action" id="0x7F0A0DAE" />
+    <public type="id" name="snackbar_text" id="0x7F0A0DAF" />
+    <public type="id" name="snap" id="0x7F0A0DB0" />
+    <public type="id" name="snapMargins" id="0x7F0A0DB1" />
+    <public type="id" name="software" id="0x7F0A0DB2" />
+    <public type="id" name="some_channels" id="0x7F0A0DB3" />
+    <public type="id" name="space_around" id="0x7F0A0DB4" />
+    <public type="id" name="space_between" id="0x7F0A0DB5" />
+    <public type="id" name="space_evenly" id="0x7F0A0DB6" />
+    <public type="id" name="space_for_measuring" id="0x7F0A0DB7" />
+    <public type="id" name="spacer" id="0x7F0A0DB8" />
+    <public type="id" name="sparkle" id="0x7F0A0DB9" />
+    <public type="id" name="sparkle_view_image" id="0x7F0A0DBA" />
+    <public type="id" name="speaker_hint" id="0x7F0A0DBB" />
+    <public type="id" name="special_effects_controller_view_tag" id="0x7F0A0DBC" />
+    <public type="id" name="spherical_gl_surface_view" id="0x7F0A0DBD" />
+    <public type="id" name="spinner" id="0x7F0A0DBE" />
+    <public type="id" name="spline" id="0x7F0A0DBF" />
+    <public type="id" name="split_action_bar" id="0x7F0A0DC0" />
+    <public type="id" name="spread" id="0x7F0A0DC1" />
+    <public type="id" name="spread_inside" id="0x7F0A0DC2" />
+    <public type="id" name="square" id="0x7F0A0DC3" />
+    <public type="id" name="src_atop" id="0x7F0A0DC4" />
+    <public type="id" name="src_in" id="0x7F0A0DC5" />
+    <public type="id" name="src_over" id="0x7F0A0DC6" />
+    <public type="id" name="src_toggle" id="0x7F0A0DC7" />
+    <public type="id" name="stage_call_speaking_chip" id="0x7F0A0DC8" />
+    <public type="id" name="stage_call_speaking_user_summary" id="0x7F0A0DC9" />
+    <public type="id" name="stage_call_speaking_user_summary_label" id="0x7F0A0DCA" />
+    <public type="id" name="stage_channel_audience_icon" id="0x7F0A0DCB" />
+    <public type="id" name="stage_channel_audience_member_container" id="0x7F0A0DCC" />
+    <public type="id" name="stage_channel_audience_member_icon" id="0x7F0A0DCD" />
+    <public type="id" name="stage_channel_audience_member_icon_container" id="0x7F0A0DCE" />
+    <public type="id" name="stage_channel_audience_member_name" id="0x7F0A0DCF" />
+    <public type="id" name="stage_channel_audience_member_raised_hand" id="0x7F0A0DD0" />
+    <public type="id" name="stage_channel_audience_role_text" id="0x7F0A0DD1" />
+    <public type="id" name="stage_channel_blocked_member_container" id="0x7F0A0DD2" />
+    <public type="id" name="stage_channel_blocked_member_icon" id="0x7F0A0DD3" />
+    <public type="id" name="stage_channel_blocked_member_icon_container" id="0x7F0A0DD4" />
+    <public type="id" name="stage_channel_blocked_member_name" id="0x7F0A0DD5" />
+    <public type="id" name="stage_channel_blocked_member_speaker" id="0x7F0A0DD6" />
+    <public type="id" name="stage_channel_blocked_text" id="0x7F0A0DD7" />
+    <public type="id" name="stage_channel_blocked_text_divider" id="0x7F0A0DD8" />
+    <public type="id" name="stage_channel_blocked_text_speaker" id="0x7F0A0DD9" />
+    <public type="id" name="stage_channel_item_stage_channel_icon" id="0x7F0A0DDA" />
+    <public type="id" name="stage_channel_item_voice_channel_name" id="0x7F0A0DDB" />
+    <public type="id" name="stage_channel_item_voice_channel_topic" id="0x7F0A0DDC" />
+    <public type="id" name="stage_channel_option" id="0x7F0A0DDD" />
+    <public type="id" name="stage_channel_speaker" id="0x7F0A0DDE" />
+    <public type="id" name="stage_channel_speaker_blocked" id="0x7F0A0DDF" />
+    <public type="id" name="stage_channel_speaker_container" id="0x7F0A0DE0" />
+    <public type="id" name="stage_channel_speaker_deafen_indicator" id="0x7F0A0DE1" />
+    <public type="id" name="stage_channel_speaker_mod_indicator" id="0x7F0A0DE2" />
+    <public type="id" name="stage_channel_speaker_mute_indicator" id="0x7F0A0DE3" />
+    <public type="id" name="stage_channel_speaker_name" id="0x7F0A0DE4" />
+    <public type="id" name="stage_channel_speaker_pulse" id="0x7F0A0DE5" />
+    <public type="id" name="stage_channels_audience_count" id="0x7F0A0DE6" />
+    <public type="id" name="stage_disconnect_button_large" id="0x7F0A0DE7" />
+    <public type="id" name="stage_discovery_speakers_view" id="0x7F0A0DE8" />
+    <public type="id" name="stage_event_listeners" id="0x7F0A0DE9" />
+    <public type="id" name="stage_moderator_permissions_fragment" id="0x7F0A0DEA" />
+    <public type="id" name="stage_raise_hands_enabled_toggle" id="0x7F0A0DEB" />
+    <public type="id" name="stage_raised_hands_bottom_sheet_root" id="0x7F0A0DEC" />
+    <public type="id" name="stage_raised_hands_item_dismiss_button" id="0x7F0A0DED" />
+    <public type="id" name="stage_raised_hands_item_invite_button" id="0x7F0A0DEE" />
+    <public type="id" name="stage_raised_hands_item_role" id="0x7F0A0DEF" />
+    <public type="id" name="stage_raised_hands_item_user_avatar" id="0x7F0A0DF0" />
+    <public type="id" name="stage_raised_hands_item_user_name" id="0x7F0A0DF1" />
+    <public type="id" name="stage_raised_hands_recycler" id="0x7F0A0DF2" />
+    <public type="id" name="standalone_channel_icon" id="0x7F0A0DF3" />
+    <public type="id" name="standalone_channel_name" id="0x7F0A0DF4" />
+    <public type="id" name="standard" id="0x7F0A0DF5" />
+    <public type="id" name="start" id="0x7F0A0DF6" />
+    <public type="id" name="startHorizontal" id="0x7F0A0DF7" />
+    <public type="id" name="startToEnd" id="0x7F0A0DF8" />
+    <public type="id" name="startVertical" id="0x7F0A0DF9" />
+    <public type="id" name="start_call_sheet_video_item" id="0x7F0A0DFA" />
+    <public type="id" name="start_call_sheet_voice_item" id="0x7F0A0DFB" />
+    <public type="id" name="start_event" id="0x7F0A0DFC" />
+    <public type="id" name="start_event_button" id="0x7F0A0DFD" />
+    <public type="id" name="start_event_button_text" id="0x7F0A0DFE" />
+    <public type="id" name="start_stage_button" id="0x7F0A0DFF" />
+    <public type="id" name="state_aspect_ratio" id="0x7F0A0E00" />
+    <public type="id" name="state_rotate" id="0x7F0A0E01" />
+    <public type="id" name="state_scale" id="0x7F0A0E02" />
+    <public type="id" name="staticLayout" id="0x7F0A0E03" />
+    <public type="id" name="staticPostLayout" id="0x7F0A0E04" />
+    <public type="id" name="static_avatar" id="0x7F0A0E05" />
+    <public type="id" name="status_bar_latest_event_content" id="0x7F0A0E06" />
+    <public type="id" name="step_text" id="0x7F0A0E07" />
+    <public type="id" name="steps_button_container" id="0x7F0A0E08" />
+    <public type="id" name="steps_cancel" id="0x7F0A0E09" />
+    <public type="id" name="steps_close" id="0x7F0A0E0A" />
+    <public type="id" name="steps_done" id="0x7F0A0E0B" />
+    <public type="id" name="steps_next" id="0x7F0A0E0C" />
+    <public type="id" name="steps_progress_indicator" id="0x7F0A0E0D" />
+    <public type="id" name="steps_title" id="0x7F0A0E0E" />
+    <public type="id" name="steps_viewpager" id="0x7F0A0E0F" />
+    <public type="id" name="stereo" id="0x7F0A0E10" />
+    <public type="id" name="sticker_app_bar" id="0x7F0A0E11" />
+    <public type="id" name="sticker_autocomplete_sticker" id="0x7F0A0E12" />
+    <public type="id" name="sticker_category_item_guild_icon" id="0x7F0A0E13" />
+    <public type="id" name="sticker_category_item_pack_avatar" id="0x7F0A0E14" />
+    <public type="id" name="sticker_full_size_sticker" id="0x7F0A0E15" />
+    <public type="id" name="sticker_pack_details_animated" id="0x7F0A0E16" />
+    <public type="id" name="sticker_pack_details_close" id="0x7F0A0E17" />
+    <public type="id" name="sticker_pack_details_limited" id="0x7F0A0E18" />
+    <public type="id" name="sticker_pack_details_pack" id="0x7F0A0E19" />
+    <public type="id" name="sticker_pack_details_premium" id="0x7F0A0E1A" />
+    <public type="id" name="sticker_pack_store_sheet_buy_button_container" id="0x7F0A0E1B" />
+    <public type="id" name="sticker_pack_store_sheet_container" id="0x7F0A0E1C" />
+    <public type="id" name="sticker_pack_store_sheet_recycler" id="0x7F0A0E1D" />
+    <public type="id" name="sticker_pack_view_all_banner" id="0x7F0A0E1E" />
+    <public type="id" name="sticker_picker_bottom_bar" id="0x7F0A0E1F" />
+    <public type="id" name="sticker_picker_bottom_bar_divider" id="0x7F0A0E20" />
+    <public type="id" name="sticker_picker_category_recycler" id="0x7F0A0E21" />
+    <public type="id" name="sticker_picker_container" id="0x7F0A0E22" />
+    <public type="id" name="sticker_picker_sticker" id="0x7F0A0E23" />
+    <public type="id" name="sticker_premium_upsell_close_button" id="0x7F0A0E24" />
+    <public type="id" name="sticker_premium_upsell_description" id="0x7F0A0E25" />
+    <public type="id" name="sticker_premium_upsell_subscribe_button" id="0x7F0A0E26" />
+    <public type="id" name="sticker_search_input" id="0x7F0A0E27" />
+    <public type="id" name="sticker_sheet_buy_button" id="0x7F0A0E28" />
+    <public type="id" name="sticker_sheet_sticker_info" id="0x7F0A0E29" />
+    <public type="id" name="sticker_sheet_sticker_name" id="0x7F0A0E2A" />
+    <public type="id" name="sticker_sheet_sticker_picker_content" id="0x7F0A0E2B" />
+    <public type="id" name="sticker_sheet_stickers_container" id="0x7F0A0E2C" />
+    <public type="id" name="sticker_sheet_view_button" id="0x7F0A0E2D" />
+    <public type="id" name="sticker_sheet_view_limited_chip" id="0x7F0A0E2E" />
+    <public type="id" name="sticker_sheet_view_limited_container" id="0x7F0A0E2F" />
+    <public type="id" name="sticker_store_buy_button_premium" id="0x7F0A0E30" />
+    <public type="id" name="sticker_store_header_item_animated" id="0x7F0A0E31" />
+    <public type="id" name="sticker_store_header_item_container" id="0x7F0A0E32" />
+    <public type="id" name="sticker_store_header_item_description" id="0x7F0A0E33" />
+    <public type="id" name="sticker_store_header_item_new" id="0x7F0A0E34" />
+    <public type="id" name="sticker_store_header_item_premium" id="0x7F0A0E35" />
+    <public type="id" name="sticker_store_header_item_subtitle" id="0x7F0A0E36" />
+    <public type="id" name="sticker_store_header_item_title" id="0x7F0A0E37" />
+    <public type="id" name="sticker_toolbar" id="0x7F0A0E38" />
+    <public type="id" name="sticker_view_imageview" id="0x7F0A0E39" />
+    <public type="id" name="sticker_view_lottie" id="0x7F0A0E3A" />
+    <public type="id" name="sticker_view_placeholder" id="0x7F0A0E3B" />
+    <public type="id" name="stickers_always_animate" id="0x7F0A0E3C" />
+    <public type="id" name="stickers_animate_on_interaction" id="0x7F0A0E3D" />
+    <public type="id" name="stickers_never_animate" id="0x7F0A0E3E" />
+    <public type="id" name="stickers_sheet_sticker_1" id="0x7F0A0E3F" />
+    <public type="id" name="stickers_sheet_sticker_2" id="0x7F0A0E40" />
+    <public type="id" name="stickers_sheet_sticker_3" id="0x7F0A0E41" />
+    <public type="id" name="stickers_sheet_sticker_4" id="0x7F0A0E42" />
+    <public type="id" name="stickers_suggestions" id="0x7F0A0E43" />
+    <public type="id" name="stop" id="0x7F0A0E44" />
+    <public type="id" name="stop_watching_button" id="0x7F0A0E45" />
+    <public type="id" name="stream_preview" id="0x7F0A0E46" />
+    <public type="id" name="stream_preview_image" id="0x7F0A0E47" />
+    <public type="id" name="stream_preview_overlay_text" id="0x7F0A0E48" />
+    <public type="id" name="stream_preview_placeholder_caption" id="0x7F0A0E49" />
+    <public type="id" name="stream_volume_label" id="0x7F0A0E4A" />
+    <public type="id" name="stream_volume_slider" id="0x7F0A0E4B" />
+    <public type="id" name="stretch" id="0x7F0A0E4C" />
+    <public type="id" name="submenuarrow" id="0x7F0A0E4D" />
+    <public type="id" name="submit_area" id="0x7F0A0E4E" />
+    <public type="id" name="submit_report_error" id="0x7F0A0E4F" />
+    <public type="id" name="subscribe_button" id="0x7F0A0E50" />
+    <public type="id" name="subscription_tier_benefits_recycler" id="0x7F0A0E51" />
+    <public type="id" name="subscription_tier_review_recycler" id="0x7F0A0E52" />
+    <public type="id" name="subtitle" id="0x7F0A0E53" />
+    <public type="id" name="subtitle_text" id="0x7F0A0E54" />
+    <public type="id" name="suggested_friend_avatar" id="0x7F0A0E55" />
+    <public type="id" name="suggested_friend_decline" id="0x7F0A0E56" />
+    <public type="id" name="suggested_friend_public_name" id="0x7F0A0E57" />
+    <public type="id" name="suggested_friend_send_request" id="0x7F0A0E58" />
+    <public type="id" name="suggested_friend_username" id="0x7F0A0E59" />
+    <public type="id" name="suggested_friend_view" id="0x7F0A0E5A" />
+    <public type="id" name="suggestion_example_answer" id="0x7F0A0E5B" />
+    <public type="id" name="suggestion_example_container" id="0x7F0A0E5C" />
+    <public type="id" name="suggestion_example_filter" id="0x7F0A0E5D" />
+    <public type="id" name="suggestion_example_icon" id="0x7F0A0E5E" />
+    <public type="id" name="suggestion_item_header" id="0x7F0A0E5F" />
+    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7F0A0E60" />
+    <public type="id" name="suggestion_item_header_history_divider" id="0x7F0A0E61" />
+    <public type="id" name="suggestion_item_header_history_text" id="0x7F0A0E62" />
+    <public type="id" name="suggestion_list" id="0x7F0A0E63" />
+    <public type="id" name="suggestions_flipper" id="0x7F0A0E64" />
+    <public type="id" name="support" id="0x7F0A0E65" />
+    <public type="id" name="surface" id="0x7F0A0E66" />
+    <public type="id" name="surface_view" id="0x7F0A0E67" />
+    <public type="id" name="surface_view_root" id="0x7F0A0E68" />
+    <public type="id" name="swipeRefreshLayout" id="0x7F0A0E69" />
+    <public type="id" name="switchWidget" id="0x7F0A0E6A" />
+    <public type="id" name="switchview" id="0x7F0A0E6B" />
+    <public type="id" name="sync_friends_switch" id="0x7F0A0E6C" />
+    <public type="id" name="sync_settings" id="0x7F0A0E6D" />
+    <public type="id" name="systemChannel" id="0x7F0A0E6E" />
+    <public type="id" name="system_channel" id="0x7F0A0E6F" />
+    <public type="id" name="system_channel_boost" id="0x7F0A0E70" />
+    <public type="id" name="system_channel_join" id="0x7F0A0E71" />
+    <public type="id" name="system_channel_wrap" id="0x7F0A0E72" />
+    <public type="id" name="system_icon" id="0x7F0A0E73" />
+    <public type="id" name="system_text" id="0x7F0A0E74" />
+    <public type="id" name="system_timestamp" id="0x7F0A0E75" />
+    <public type="id" name="system_welcome_cta_button" id="0x7F0A0E76" />
+    <public type="id" name="system_welcome_cta_button_sticker" id="0x7F0A0E77" />
+    <public type="id" name="tabMode" id="0x7F0A0E78" />
+    <public type="id" name="tab_contents" id="0x7F0A0E79" />
+    <public type="id" name="tab_view" id="0x7F0A0E7A" />
+    <public type="id" name="tabs" id="0x7F0A0E7B" />
+    <public type="id" name="tabs_host_bottom_nav_friends_icon" id="0x7F0A0E7C" />
+    <public type="id" name="tabs_host_bottom_nav_friends_item" id="0x7F0A0E7D" />
+    <public type="id" name="tabs_host_bottom_nav_friends_notifications_badge" id="0x7F0A0E7E" />
+    <public type="id" name="tabs_host_bottom_nav_home_icon" id="0x7F0A0E7F" />
+    <public type="id" name="tabs_host_bottom_nav_home_item" id="0x7F0A0E80" />
+    <public type="id" name="tabs_host_bottom_nav_home_notifications_badge" id="0x7F0A0E81" />
+    <public type="id" name="tabs_host_bottom_nav_mentions_icon" id="0x7F0A0E82" />
+    <public type="id" name="tabs_host_bottom_nav_mentions_item" id="0x7F0A0E83" />
+    <public type="id" name="tabs_host_bottom_nav_search_icon" id="0x7F0A0E84" />
+    <public type="id" name="tabs_host_bottom_nav_search_item" id="0x7F0A0E85" />
+    <public type="id" name="tabs_host_bottom_nav_stage_discovery_icon" id="0x7F0A0E86" />
+    <public type="id" name="tabs_host_bottom_nav_stage_discovery_item" id="0x7F0A0E87" />
+    <public type="id" name="tabs_host_bottom_nav_tabs_container" id="0x7F0A0E88" />
+    <public type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" id="0x7F0A0E89" />
+    <public type="id" name="tabs_host_bottom_nav_user_settings_item" id="0x7F0A0E8A" />
+    <public type="id" name="tag_accessibility_actions" id="0x7F0A0E8B" />
+    <public type="id" name="tag_accessibility_clickable_spans" id="0x7F0A0E8C" />
+    <public type="id" name="tag_accessibility_heading" id="0x7F0A0E8D" />
+    <public type="id" name="tag_accessibility_pane_title" id="0x7F0A0E8E" />
+    <public type="id" name="tag_on_apply_window_listener" id="0x7F0A0E8F" />
+    <public type="id" name="tag_on_receive_content_listener" id="0x7F0A0E90" />
+    <public type="id" name="tag_on_receive_content_mime_types" id="0x7F0A0E91" />
+    <public type="id" name="tag_screen_reader_focusable" id="0x7F0A0E92" />
+    <public type="id" name="tag_state_description" id="0x7F0A0E93" />
+    <public type="id" name="tag_transition_group" id="0x7F0A0E94" />
+    <public type="id" name="tag_unhandled_key_event_manager" id="0x7F0A0E95" />
+    <public type="id" name="tag_unhandled_key_listeners" id="0x7F0A0E96" />
+    <public type="id" name="tag_window_insets_animation_callback" id="0x7F0A0E97" />
+    <public type="id" name="takePicture" id="0x7F0A0E98" />
+    <public type="id" name="takePictureSnapshot" id="0x7F0A0E99" />
+    <public type="id" name="take_photo_btn" id="0x7F0A0E9A" />
+    <public type="id" name="ternary_check_neutral" id="0x7F0A0E9B" />
+    <public type="id" name="ternary_check_off" id="0x7F0A0E9C" />
+    <public type="id" name="ternary_check_on" id="0x7F0A0E9D" />
+    <public type="id" name="test" id="0x7F0A0E9E" />
+    <public type="id" name="test_checkbox_android_button_tint" id="0x7F0A0E9F" />
+    <public type="id" name="test_checkbox_app_button_tint" id="0x7F0A0EA0" />
+    <public type="id" name="test_radiobutton_android_button_tint" id="0x7F0A0EA1" />
+    <public type="id" name="test_radiobutton_app_button_tint" id="0x7F0A0EA2" />
+    <public type="id" name="text" id="0x7F0A0EA3" />
+    <public type="id" name="text1" id="0x7F0A0EA4" />
+    <public type="id" name="text2" id="0x7F0A0EA5" />
+    <public type="id" name="textEnd" id="0x7F0A0EA6" />
+    <public type="id" name="textSpacerNoButtons" id="0x7F0A0EA7" />
+    <public type="id" name="textSpacerNoTitle" id="0x7F0A0EA8" />
+    <public type="id" name="textStart" id="0x7F0A0EA9" />
+    <public type="id" name="textTop" id="0x7F0A0EAA" />
+    <public type="id" name="textView" id="0x7F0A0EAB" />
+    <public type="id" name="text_action_mark_as_read" id="0x7F0A0EAC" />
+    <public type="id" name="text_action_mute" id="0x7F0A0EAD" />
+    <public type="id" name="text_action_thread_browser" id="0x7F0A0EAE" />
+    <public type="id" name="text_images_settings" id="0x7F0A0EAF" />
+    <public type="id" name="text_input" id="0x7F0A0EB0" />
+    <public type="id" name="text_input_end_icon" id="0x7F0A0EB1" />
+    <public type="id" name="text_input_error_icon" id="0x7F0A0EB2" />
+    <public type="id" name="text_input_start_icon" id="0x7F0A0EB3" />
+    <public type="id" name="text_view_crop" id="0x7F0A0EB4" />
+    <public type="id" name="text_view_rotate" id="0x7F0A0EB5" />
+    <public type="id" name="text_view_scale" id="0x7F0A0EB6" />
+    <public type="id" name="textinput_counter" id="0x7F0A0EB7" />
+    <public type="id" name="textinput_error" id="0x7F0A0EB8" />
+    <public type="id" name="textinput_helper_text" id="0x7F0A0EB9" />
+    <public type="id" name="textinput_placeholder" id="0x7F0A0EBA" />
+    <public type="id" name="textinput_prefix_text" id="0x7F0A0EBB" />
+    <public type="id" name="textinput_suffix_text" id="0x7F0A0EBC" />
+    <public type="id" name="texture" id="0x7F0A0EBD" />
+    <public type="id" name="texture_view" id="0x7F0A0EBE" />
+    <public type="id" name="thing_proto" id="0x7F0A0EBF" />
+    <public type="id" name="thread_avatar" id="0x7F0A0EC0" />
+    <public type="id" name="thread_browser_count" id="0x7F0A0EC1" />
+    <public type="id" name="thread_browser_empty" id="0x7F0A0EC2" />
+    <public type="id" name="thread_browser_empty_create_button" id="0x7F0A0EC3" />
+    <public type="id" name="thread_browser_empty_heading" id="0x7F0A0EC4" />
+    <public type="id" name="thread_browser_empty_subheading" id="0x7F0A0EC5" />
+    <public type="id" name="thread_browser_error_msg" id="0x7F0A0EC6" />
+    <public type="id" name="thread_browser_error_overlay" id="0x7F0A0EC7" />
+    <public type="id" name="thread_browser_icon" id="0x7F0A0EC8" />
+    <public type="id" name="thread_browser_moderator_view" id="0x7F0A0EC9" />
+    <public type="id" name="thread_browser_moderator_view_card" id="0x7F0A0ECA" />
+    <public type="id" name="thread_browser_root" id="0x7F0A0ECB" />
+    <public type="id" name="thread_browser_toolbar" id="0x7F0A0ECC" />
+    <public type="id" name="thread_browser_try_again" id="0x7F0A0ECD" />
+    <public type="id" name="thread_browser_view_pager" id="0x7F0A0ECE" />
+    <public type="id" name="thread_browser_visibility_private" id="0x7F0A0ECF" />
+    <public type="id" name="thread_browser_visibility_public" id="0x7F0A0ED0" />
+    <public type="id" name="thread_embed_container" id="0x7F0A0ED1" />
+    <public type="id" name="thread_embed_icon" id="0x7F0A0ED2" />
+    <public type="id" name="thread_embed_message_center_guideline" id="0x7F0A0ED3" />
+    <public type="id" name="thread_embed_messages_count" id="0x7F0A0ED4" />
+    <public type="id" name="thread_embed_messages_count_chevron" id="0x7F0A0ED5" />
+    <public type="id" name="thread_embed_most_recent_message_avatar" id="0x7F0A0ED6" />
+    <public type="id" name="thread_embed_most_recent_message_content" id="0x7F0A0ED7" />
+    <public type="id" name="thread_embed_most_recent_message_header" id="0x7F0A0ED8" />
+    <public type="id" name="thread_embed_most_recent_message_name" id="0x7F0A0ED9" />
+    <public type="id" name="thread_embed_name" id="0x7F0A0EDA" />
+    <public type="id" name="thread_embed_selectable_background" id="0x7F0A0EDB" />
+    <public type="id" name="thread_embed_spine" id="0x7F0A0EDC" />
+    <public type="id" name="thread_icon" id="0x7F0A0EDD" />
+    <public type="id" name="thread_image" id="0x7F0A0EDE" />
+    <public type="id" name="thread_message" id="0x7F0A0EDF" />
+    <public type="id" name="thread_name" id="0x7F0A0EE0" />
+    <public type="id" name="thread_name_input" id="0x7F0A0EE1" />
+    <public type="id" name="thread_settings_edit_name" id="0x7F0A0EE2" />
+    <public type="id" name="thread_settings_edit_wrap" id="0x7F0A0EE3" />
+    <public type="id" name="thread_settings_save" id="0x7F0A0EE4" />
+    <public type="id" name="thread_settings_section_slow_mode" id="0x7F0A0EE5" />
+    <public type="id" name="thread_settings_slow_mode_cooldown_label" id="0x7F0A0EE6" />
+    <public type="id" name="thread_settings_slow_mode_cooldown_slider" id="0x7F0A0EE7" />
+    <public type="id" name="thread_settings_slowmode_label" id="0x7F0A0EE8" />
+    <public type="id" name="thread_starter_message_header" id="0x7F0A0EE9" />
+    <public type="id" name="thread_starter_message_header_icon" id="0x7F0A0EEA" />
+    <public type="id" name="thread_starter_message_header_text" id="0x7F0A0EEB" />
+    <public type="id" name="thread_status" id="0x7F0A0EEC" />
+    <public type="id" name="thread_status_button" id="0x7F0A0EED" />
+    <public type="id" name="thread_status_text" id="0x7F0A0EEE" />
+    <public type="id" name="thread_timestamp" id="0x7F0A0EEF" />
+    <public type="id" name="thread_timestamp_separator" id="0x7F0A0EF0" />
+    <public type="id" name="thread_view" id="0x7F0A0EF1" />
+    <public type="id" name="thumb_iv" id="0x7F0A0EF2" />
+    <public type="id" name="tier1_upload_size_perk" id="0x7F0A0EF3" />
+    <public type="id" name="tier_1_guild_subscription_perk" id="0x7F0A0EF4" />
+    <public type="id" name="tile" id="0x7F0A0EF5" />
+    <public type="id" name="time" id="0x7F0A0EF6" />
+    <public type="id" name="title" id="0x7F0A0EF7" />
+    <public type="id" name="titleDividerNoCustom" id="0x7F0A0EF8" />
+    <public type="id" name="title_layout" id="0x7F0A0EF9" />
+    <public type="id" name="title_template" id="0x7F0A0EFA" />
+    <public type="id" name="title_text_barrier" id="0x7F0A0EFB" />
+    <public type="id" name="title_view" id="0x7F0A0EFC" />
+    <public type="id" name="toggle" id="0x7F0A0EFD" />
+    <public type="id" name="toggle_speaker_state_button" id="0x7F0A0EFE" />
+    <public type="id" name="toggle_speaker_state_group" id="0x7F0A0EFF" />
+    <public type="id" name="toggle_speaker_state_icon" id="0x7F0A0F00" />
+    <public type="id" name="toolbar" id="0x7F0A0F01" />
+    <public type="id" name="toolbar_events_button" id="0x7F0A0F02" />
+    <public type="id" name="toolbar_icon" id="0x7F0A0F03" />
+    <public type="id" name="toolbar_presence" id="0x7F0A0F04" />
+    <public type="id" name="toolbar_title" id="0x7F0A0F05" />
+    <public type="id" name="toolbar_title_subtext" id="0x7F0A0F06" />
+    <public type="id" name="toolbar_voice_active_event" id="0x7F0A0F07" />
+    <public type="id" name="top" id="0x7F0A0F08" />
+    <public type="id" name="topPanel" id="0x7F0A0F09" />
+    <public type="id" name="top_of_ui" id="0x7F0A0F0A" />
+    <public type="id" name="top_to_end" id="0x7F0A0F0B" />
+    <public type="id" name="topic_input" id="0x7F0A0F0C" />
+    <public type="id" name="topic_label" id="0x7F0A0F0D" />
+    <public type="id" name="topic_layout" id="0x7F0A0F0E" />
+    <public type="id" name="torch" id="0x7F0A0F0F" />
+    <public type="id" name="touch_outside" id="0x7F0A0F10" />
+    <public type="id" name="transitionToEnd" id="0x7F0A0F11" />
+    <public type="id" name="transitionToStart" id="0x7F0A0F12" />
+    <public type="id" name="transition_current_scene" id="0x7F0A0F13" />
+    <public type="id" name="transition_layout_save" id="0x7F0A0F14" />
+    <public type="id" name="transition_position" id="0x7F0A0F15" />
+    <public type="id" name="transition_scene_layoutid_cache" id="0x7F0A0F16" />
+    <public type="id" name="transition_transform" id="0x7F0A0F17" />
+    <public type="id" name="transparency_layout" id="0x7F0A0F18" />
+    <public type="id" name="transparency_seekbar" id="0x7F0A0F19" />
+    <public type="id" name="transparency_text" id="0x7F0A0F1A" />
+    <public type="id" name="transparency_title" id="0x7F0A0F1B" />
+    <public type="id" name="transparent_space" id="0x7F0A0F1C" />
+    <public type="id" name="trash_wrap_icon" id="0x7F0A0F1D" />
+    <public type="id" name="trash_wrap_target_container" id="0x7F0A0F1E" />
+    <public type="id" name="trash_wrap_target_zone" id="0x7F0A0F1F" />
+    <public type="id" name="triangle" id="0x7F0A0F20" />
+    <public type="id" name="tvText" id="0x7F0A0F21" />
+    <public type="id" name="tvTitle" id="0x7F0A0F22" />
+    <public type="id" name="type_iv" id="0x7F0A0F23" />
+    <public type="id" name="ucrop" id="0x7F0A0F24" />
+    <public type="id" name="ucrop_frame" id="0x7F0A0F25" />
+    <public type="id" name="ucrop_photobox" id="0x7F0A0F26" />
+    <public type="id" name="uikit_chat_guideline" id="0x7F0A0F27" />
+    <public type="id" name="uikit_icon_url" id="0x7F0A0F28" />
+    <public type="id" name="uikit_sheet_header_guideline" id="0x7F0A0F29" />
+    <public type="id" name="unblock_user_button" id="0x7F0A0F2A" />
+    <public type="id" name="unchecked" id="0x7F0A0F2B" />
+    <public type="id" name="underage" id="0x7F0A0F2C" />
+    <public type="id" name="underage_warning" id="0x7F0A0F2D" />
+    <public type="id" name="unhandled_uri_display" id="0x7F0A0F2E" />
+    <public type="id" name="unhandled_uri_okay" id="0x7F0A0F2F" />
+    <public type="id" name="uniform" id="0x7F0A0F30" />
+    <public type="id" name="unknown_sticker_sheet_sticker" id="0x7F0A0F31" />
+    <public type="id" name="unknown_sticker_sheet_sticker_name" id="0x7F0A0F32" />
+    <public type="id" name="unlabeled" id="0x7F0A0F33" />
+    <public type="id" name="unmute_button" id="0x7F0A0F34" />
+    <public type="id" name="unmute_button_details_label" id="0x7F0A0F35" />
+    <public type="id" name="unmute_button_label" id="0x7F0A0F36" />
+    <public type="id" name="unread" id="0x7F0A0F37" />
+    <public type="id" name="up" id="0x7F0A0F38" />
+    <public type="id" name="upgrade_button" id="0x7F0A0F39" />
+    <public type="id" name="uploadBanner" id="0x7F0A0F3A" />
+    <public type="id" name="uploadSplash" id="0x7F0A0F3B" />
+    <public type="id" name="upload_banner" id="0x7F0A0F3C" />
+    <public type="id" name="upload_banner_fab" id="0x7F0A0F3D" />
+    <public type="id" name="upload_banner_learn_more" id="0x7F0A0F3E" />
+    <public type="id" name="upload_banner_nitro_tier" id="0x7F0A0F3F" />
+    <public type="id" name="upload_banner_unlock" id="0x7F0A0F40" />
+    <public type="id" name="upload_debug_logs" id="0x7F0A0F41" />
+    <public type="id" name="upload_progress_1" id="0x7F0A0F42" />
+    <public type="id" name="upload_progress_2" id="0x7F0A0F43" />
+    <public type="id" name="upload_progress_3" id="0x7F0A0F44" />
+    <public type="id" name="upload_size_perk" id="0x7F0A0F45" />
+    <public type="id" name="upload_splash" id="0x7F0A0F46" />
+    <public type="id" name="upload_splash_learn_more" id="0x7F0A0F47" />
+    <public type="id" name="upload_splash_nitro_tier" id="0x7F0A0F48" />
+    <public type="id" name="upload_splash_unlock" id="0x7F0A0F49" />
+    <public type="id" name="upsell_body" id="0x7F0A0F4A" />
+    <public type="id" name="upsell_body_text" id="0x7F0A0F4B" />
+    <public type="id" name="upsell_header_part_1" id="0x7F0A0F4C" />
+    <public type="id" name="upsell_header_part_2" id="0x7F0A0F4D" />
+    <public type="id" name="upsell_header_text" id="0x7F0A0F4E" />
+    <public type="id" name="upsell_image" id="0x7F0A0F4F" />
+    <public type="id" name="upsell_section" id="0x7F0A0F50" />
+    <public type="id" name="url" id="0x7F0A0F51" />
+    <public type="id" name="useLogo" id="0x7F0A0F52" />
+    <public type="id" name="user_actions_dialog_avatar" id="0x7F0A0F53" />
+    <public type="id" name="user_actions_dialog_block_item" id="0x7F0A0F54" />
+    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7F0A0F55" />
+    <public type="id" name="user_actions_dialog_unblock_item" id="0x7F0A0F56" />
+    <public type="id" name="user_actions_dialog_user_name" id="0x7F0A0F57" />
+    <public type="id" name="user_aka" id="0x7F0A0F58" />
+    <public type="id" name="user_avatar_presence_container" id="0x7F0A0F59" />
+    <public type="id" name="user_avatar_presence_status" id="0x7F0A0F5A" />
+    <public type="id" name="user_limit_divider" id="0x7F0A0F5B" />
+    <public type="id" name="user_limit_seekbar" id="0x7F0A0F5C" />
+    <public type="id" name="user_limit_title" id="0x7F0A0F5D" />
+    <public type="id" name="user_list_item_avatar" id="0x7F0A0F5E" />
+    <public type="id" name="user_list_item_name" id="0x7F0A0F5F" />
+    <public type="id" name="user_list_item_name_secondary" id="0x7F0A0F60" />
+    <public type="id" name="user_list_item_status" id="0x7F0A0F61" />
+    <public type="id" name="user_mentions_filter_include_everyone" id="0x7F0A0F62" />
+    <public type="id" name="user_mentions_filter_include_roles" id="0x7F0A0F63" />
+    <public type="id" name="user_mentions_filter_this_server" id="0x7F0A0F64" />
+    <public type="id" name="user_mentions_list" id="0x7F0A0F65" />
+    <public type="id" name="user_mutual_friends_recycler_view" id="0x7F0A0F66" />
+    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7F0A0F67" />
+    <public type="id" name="user_phone_add_description_note" id="0x7F0A0F68" />
+    <public type="id" name="user_phone_add_next" id="0x7F0A0F69" />
+    <public type="id" name="user_phone_add_number" id="0x7F0A0F6A" />
+    <public type="id" name="user_phone_title" id="0x7F0A0F6B" />
+    <public type="id" name="user_profile_adapter_item_empty" id="0x7F0A0F6C" />
+    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7F0A0F6D" />
+    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7F0A0F6E" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7F0A0F6F" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7F0A0F70" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7F0A0F71" />
+    <public type="id" name="user_profile_adapter_item_friend_status" id="0x7F0A0F72" />
+    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7F0A0F73" />
+    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7F0A0F74" />
+    <public type="id" name="user_profile_adapter_item_server_image" id="0x7F0A0F75" />
+    <public type="id" name="user_profile_adapter_item_server_name" id="0x7F0A0F76" />
+    <public type="id" name="user_profile_adapter_item_server_text" id="0x7F0A0F77" />
+    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7F0A0F78" />
+    <public type="id" name="user_profile_adapter_item_user_display_name" id="0x7F0A0F79" />
+    <public type="id" name="user_profile_admin_ban" id="0x7F0A0F7A" />
+    <public type="id" name="user_profile_admin_edit_member" id="0x7F0A0F7B" />
+    <public type="id" name="user_profile_admin_kick" id="0x7F0A0F7C" />
+    <public type="id" name="user_profile_admin_server_deafen" id="0x7F0A0F7D" />
+    <public type="id" name="user_profile_admin_server_disconnect" id="0x7F0A0F7E" />
+    <public type="id" name="user_profile_admin_server_move" id="0x7F0A0F7F" />
+    <public type="id" name="user_profile_admin_server_mute" id="0x7F0A0F80" />
+    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7F0A0F81" />
+    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7F0A0F82" />
+    <public type="id" name="user_profile_connections_view_recycler" id="0x7F0A0F83" />
+    <public type="id" name="user_profile_header_badges_recycler" id="0x7F0A0F84" />
+    <public type="id" name="user_profile_header_custom_status" id="0x7F0A0F85" />
+    <public type="id" name="user_profile_header_name_wrap" id="0x7F0A0F86" />
+    <public type="id" name="user_profile_header_primary_name" id="0x7F0A0F87" />
+    <public type="id" name="user_profile_header_secondary_name" id="0x7F0A0F88" />
+    <public type="id" name="user_profile_stage_invite_to_speak" id="0x7F0A0F89" />
+    <public type="id" name="user_profile_stage_move_to_audience" id="0x7F0A0F8A" />
+    <public type="id" name="user_selected_checkbox" id="0x7F0A0F8B" />
+    <public type="id" name="user_settings_header" id="0x7F0A0F8C" />
+    <public type="id" name="user_settings_mfa_enable_input_code" id="0x7F0A0F8D" />
+    <public type="id" name="user_settings_profile_header_view" id="0x7F0A0F8E" />
+    <public type="id" name="user_sheet_add_friend_action_button" id="0x7F0A0F8F" />
+    <public type="id" name="user_sheet_admin_card" id="0x7F0A0F90" />
+    <public type="id" name="user_sheet_admin_view" id="0x7F0A0F91" />
+    <public type="id" name="user_sheet_badge_image" id="0x7F0A0F92" />
+    <public type="id" name="user_sheet_call_action_button" id="0x7F0A0F93" />
+    <public type="id" name="user_sheet_connections_header" id="0x7F0A0F94" />
+    <public type="id" name="user_sheet_connections_view" id="0x7F0A0F95" />
+    <public type="id" name="user_sheet_content" id="0x7F0A0F96" />
+    <public type="id" name="user_sheet_copy_id" id="0x7F0A0F97" />
+    <public type="id" name="user_sheet_deafen" id="0x7F0A0F98" />
+    <public type="id" name="user_sheet_developer_header" id="0x7F0A0F99" />
+    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7F0A0F9A" />
+    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7F0A0F9B" />
+    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7F0A0F9C" />
+    <public type="id" name="user_sheet_guild_container" id="0x7F0A0F9D" />
+    <public type="id" name="user_sheet_guild_header" id="0x7F0A0F9E" />
+    <public type="id" name="user_sheet_header" id="0x7F0A0F9F" />
+    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7F0A0FA0" />
+    <public type="id" name="user_sheet_loading_container" id="0x7F0A0FA1" />
+    <public type="id" name="user_sheet_message_action_button" id="0x7F0A0FA2" />
+    <public type="id" name="user_sheet_more_button" id="0x7F0A0FA3" />
+    <public type="id" name="user_sheet_muted" id="0x7F0A0FA4" />
+    <public type="id" name="user_sheet_note_header" id="0x7F0A0FA5" />
+    <public type="id" name="user_sheet_note_text_field" id="0x7F0A0FA6" />
+    <public type="id" name="user_sheet_note_text_field_wrap" id="0x7F0A0FA7" />
+    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7F0A0FA8" />
+    <public type="id" name="user_sheet_profile_actions_container" id="0x7F0A0FA9" />
+    <public type="id" name="user_sheet_profile_actions_divider" id="0x7F0A0FAA" />
+    <public type="id" name="user_sheet_profile_edit_button" id="0x7F0A0FAB" />
+    <public type="id" name="user_sheet_profile_edit_container" id="0x7F0A0FAC" />
+    <public type="id" name="user_sheet_profile_header_view" id="0x7F0A0FAD" />
+    <public type="id" name="user_sheet_profile_identity_button" id="0x7F0A0FAE" />
+    <public type="id" name="user_sheet_profile_stage_actions_card" id="0x7F0A0FAF" />
+    <public type="id" name="user_sheet_profile_stage_actions_view" id="0x7F0A0FB0" />
+    <public type="id" name="user_sheet_profile_voice_settings_header" id="0x7F0A0FB1" />
+    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7F0A0FB2" />
+    <public type="id" name="user_sheet_roles_list" id="0x7F0A0FB3" />
+    <public type="id" name="user_sheet_video_action_button" id="0x7F0A0FB4" />
+    <public type="id" name="user_sheet_volume_label" id="0x7F0A0FB5" />
+    <public type="id" name="user_sheet_volume_slider" id="0x7F0A0FB6" />
+    <public type="id" name="user_status_presence_custom_clear" id="0x7F0A0FB7" />
+    <public type="id" name="user_status_presence_custom_emoji" id="0x7F0A0FB8" />
+    <public type="id" name="user_status_presence_custom_text" id="0x7F0A0FB9" />
+    <public type="id" name="user_status_presence_dot" id="0x7F0A0FBA" />
+    <public type="id" name="user_status_presence_subtitle" id="0x7F0A0FBB" />
+    <public type="id" name="user_status_presence_title" id="0x7F0A0FBC" />
+    <public type="id" name="user_status_update_custom" id="0x7F0A0FBD" />
+    <public type="id" name="user_status_update_dnd" id="0x7F0A0FBE" />
+    <public type="id" name="user_status_update_idle" id="0x7F0A0FBF" />
+    <public type="id" name="user_status_update_invisible" id="0x7F0A0FC0" />
+    <public type="id" name="user_status_update_online" id="0x7F0A0FC1" />
+    <public type="id" name="user_summary" id="0x7F0A0FC2" />
+    <public type="id" name="user_summary_label" id="0x7F0A0FC3" />
+    <public type="id" name="username_placeholder_end_guideline" id="0x7F0A0FC4" />
+    <public type="id" name="username_tag" id="0x7F0A0FC5" />
+    <public type="id" name="username_text" id="0x7F0A0FC6" />
+    <public type="id" name="vAlertContentContainer" id="0x7F0A0FC7" />
+    <public type="id" name="value_prop_image" id="0x7F0A0FC8" />
+    <public type="id" name="verification" id="0x7F0A0FC9" />
+    <public type="id" name="verify" id="0x7F0A0FCA" />
+    <public type="id" name="verify_account_by_email" id="0x7F0A0FCB" />
+    <public type="id" name="verify_account_by_phone" id="0x7F0A0FCC" />
+    <public type="id" name="verify_account_support" id="0x7F0A0FCD" />
+    <public type="id" name="verify_account_text_body" id="0x7F0A0FCE" />
+    <public type="id" name="video" id="0x7F0A0FCF" />
+    <public type="id" name="video_button" id="0x7F0A0FD0" />
+    <public type="id" name="video_decoder_gl_surface_view" id="0x7F0A0FD1" />
+    <public type="id" name="view_dialog_confirmation_cancel" id="0x7F0A0FD2" />
+    <public type="id" name="view_dialog_confirmation_confirm" id="0x7F0A0FD3" />
+    <public type="id" name="view_dialog_confirmation_header" id="0x7F0A0FD4" />
+    <public type="id" name="view_dialog_confirmation_text" id="0x7F0A0FD5" />
+    <public type="id" name="view_input" id="0x7F0A0FD6" />
+    <public type="id" name="view_interaction_failed_label_icon" id="0x7F0A0FD7" />
+    <public type="id" name="view_interaction_failed_label_message" id="0x7F0A0FD8" />
+    <public type="id" name="view_offset_helper" id="0x7F0A0FD9" />
+    <public type="id" name="view_overlay" id="0x7F0A0FDA" />
+    <public type="id" name="view_pager" id="0x7F0A0FDB" />
+    <public type="id" name="view_premium_marketing_container_tier1" id="0x7F0A0FDC" />
+    <public type="id" name="view_premium_marketing_learn_more" id="0x7F0A0FDD" />
+    <public type="id" name="view_premium_marketing_marketing_container" id="0x7F0A0FDE" />
+    <public type="id" name="view_premium_marketing_marketing_subtitle" id="0x7F0A0FDF" />
+    <public type="id" name="view_premium_marketing_marketing_title" id="0x7F0A0FE0" />
+    <public type="id" name="view_premium_marketing_nitro_boost_count" id="0x7F0A0FE1" />
+    <public type="id" name="view_premium_marketing_nitro_boost_discount" id="0x7F0A0FE2" />
+    <public type="id" name="view_premium_marketing_nitro_classic_boost_count" id="0x7F0A0FE3" />
+    <public type="id" name="view_premium_marketing_nitro_classic_boost_discount" id="0x7F0A0FE4" />
+    <public type="id" name="view_premium_upsell_info_subheading" id="0x7F0A0FE5" />
+    <public type="id" name="view_premium_upsell_info_subheading_blurb" id="0x7F0A0FE6" />
+    <public type="id" name="view_premium_upsell_info_subheading_price" id="0x7F0A0FE7" />
+    <public type="id" name="view_tree_lifecycle_owner" id="0x7F0A0FE8" />
+    <public type="id" name="view_tree_saved_state_registry_owner" id="0x7F0A0FE9" />
+    <public type="id" name="view_tree_view_model_store_owner" id="0x7F0A0FEA" />
+    <public type="id" name="view_typing_dots_1" id="0x7F0A0FEB" />
+    <public type="id" name="view_typing_dots_2" id="0x7F0A0FEC" />
+    <public type="id" name="view_typing_dots_3" id="0x7F0A0FED" />
+    <public type="id" name="visible" id="0x7F0A0FEE" />
+    <public type="id" name="visible_removing_fragment_view_tag" id="0x7F0A0FEF" />
+    <public type="id" name="visit_community_icon" id="0x7F0A0FF0" />
+    <public type="id" name="visit_community_icon_text" id="0x7F0A0FF1" />
+    <public type="id" name="visit_community_text" id="0x7F0A0FF2" />
+    <public type="id" name="voice" id="0x7F0A0FF3" />
+    <public type="id" name="voice_bottom_sheet_bottom_content_container" id="0x7F0A0FF4" />
+    <public type="id" name="voice_bottom_sheet_connect" id="0x7F0A0FF5" />
+    <public type="id" name="voice_bottom_sheet_connect_container" id="0x7F0A0FF6" />
+    <public type="id" name="voice_bottom_sheet_controls" id="0x7F0A0FF7" />
+    <public type="id" name="voice_bottom_sheet_header_deafen" id="0x7F0A0FF8" />
+    <public type="id" name="voice_bottom_sheet_header_icon" id="0x7F0A0FF9" />
+    <public type="id" name="voice_bottom_sheet_header_invite" id="0x7F0A0FFA" />
+    <public type="id" name="voice_bottom_sheet_header_noise_cancellation" id="0x7F0A0FFB" />
+    <public type="id" name="voice_bottom_sheet_header_settings" id="0x7F0A0FFC" />
+    <public type="id" name="voice_bottom_sheet_header_subtitle" id="0x7F0A0FFD" />
+    <public type="id" name="voice_bottom_sheet_header_title" id="0x7F0A0FFE" />
+    <public type="id" name="voice_bottom_sheet_join_video" id="0x7F0A0FFF" />
+    <public type="id" name="voice_bottom_sheet_recycler" id="0x7F0A1000" />
+    <public type="id" name="voice_bottom_sheet_root" id="0x7F0A1001" />
+    <public type="id" name="voice_call_inline_container" id="0x7F0A1002" />
+    <public type="id" name="voice_channel_divider" id="0x7F0A1003" />
+    <public type="id" name="voice_channel_option" id="0x7F0A1004" />
+    <public type="id" name="voice_connected_ptt" id="0x7F0A1005" />
+    <public type="id" name="voice_controls_sheet_view" id="0x7F0A1006" />
+    <public type="id" name="voice_fullscreen_controls_camera" id="0x7F0A1007" />
+    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7F0A1008" />
+    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7F0A1009" />
+    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7F0A100A" />
+    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7F0A100B" />
+    <public type="id" name="voice_fullscreen_controls_screenshare" id="0x7F0A100C" />
+    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7F0A100D" />
+    <public type="id" name="voice_settings_events" id="0x7F0A100E" />
+    <public type="id" name="voice_settings_invite" id="0x7F0A100F" />
+    <public type="id" name="voice_settings_noise_suppression" id="0x7F0A1010" />
+    <public type="id" name="voice_settings_notifications" id="0x7F0A1011" />
+    <public type="id" name="voice_settings_report" id="0x7F0A1012" />
+    <public type="id" name="voice_settings_sheet_container" id="0x7F0A1013" />
+    <public type="id" name="voice_settings_stage_settings" id="0x7F0A1014" />
+    <public type="id" name="voice_settings_toggle_video_participants" id="0x7F0A1015" />
+    <public type="id" name="voice_settings_view_card" id="0x7F0A1016" />
+    <public type="id" name="voice_settings_voice_settings" id="0x7F0A1017" />
+    <public type="id" name="voice_user_avatar" id="0x7F0A1018" />
+    <public type="id" name="voice_user_limit_current" id="0x7F0A1019" />
+    <public type="id" name="voice_user_limit_max" id="0x7F0A101A" />
+    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7F0A101B" />
+    <public type="id" name="voice_user_list_item_header_label" id="0x7F0A101C" />
+    <public type="id" name="voice_user_list_item_live_indicator" id="0x7F0A101D" />
+    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7F0A101E" />
+    <public type="id" name="voice_user_list_item_spectating_indicator" id="0x7F0A101F" />
+    <public type="id" name="voice_user_list_item_toggle_ringing" id="0x7F0A1020" />
+    <public type="id" name="voice_user_list_item_user_avatar" id="0x7F0A1021" />
+    <public type="id" name="voice_user_list_item_user_name" id="0x7F0A1022" />
+    <public type="id" name="voice_user_list_item_user_stream_preview" id="0x7F0A1023" />
+    <public type="id" name="voice_user_list_item_video_indicator" id="0x7F0A1024" />
+    <public type="id" name="voice_user_name_display" id="0x7F0A1025" />
+    <public type="id" name="volume_slider_max_vol" id="0x7F0A1026" />
+    <public type="id" name="volume_slider_min_vol" id="0x7F0A1027" />
+    <public type="id" name="volume_slider_seek_bar" id="0x7F0A1028" />
+    <public type="id" name="waitlist_button" id="0x7F0A1029" />
+    <public type="id" name="webView" id="0x7F0A102A" />
+    <public type="id" name="welcome_card_add_server" id="0x7F0A102B" />
+    <public type="id" name="welcome_card_invite_friends" id="0x7F0A102C" />
+    <public type="id" name="welcome_card_upload_icon" id="0x7F0A102D" />
+    <public type="id" name="when_playing" id="0x7F0A102E" />
+    <public type="id" name="wide" id="0x7F0A102F" />
+    <public type="id" name="widget_add_friend_user_list_item" id="0x7F0A1030" />
+    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7F0A1031" />
+    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7F0A1032" />
+    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7F0A1033" />
+    <public type="id" name="widget_auth_mfa_info_okay" id="0x7F0A1034" />
+    <public type="id" name="widget_auth_mfa_info_text" id="0x7F0A1035" />
+    <public type="id" name="widget_bug_report_feature_touch_delegate" id="0x7F0A1036" />
+    <public type="id" name="widget_bug_report_severity_touch_delegate" id="0x7F0A1037" />
+    <public type="id" name="widget_channel_action_bar" id="0x7F0A1038" />
+    <public type="id" name="widget_channel_search_item" id="0x7F0A1039" />
+    <public type="id" name="widget_channel_search_item_remove" id="0x7F0A103A" />
+    <public type="id" name="widget_channel_sidebar_actions_guild_view" id="0x7F0A103B" />
+    <public type="id" name="widget_channel_sidebar_actions_private_view" id="0x7F0A103C" />
+    <public type="id" name="widget_channel_topic" id="0x7F0A103D" />
+    <public type="id" name="widget_channels" id="0x7F0A103E" />
+    <public type="id" name="widget_channels_list_container" id="0x7F0A103F" />
+    <public type="id" name="widget_channels_list_empty_friends_state_cs_view" id="0x7F0A1040" />
+    <public type="id" name="widget_channels_list_empty_friends_state_view" id="0x7F0A1041" />
+    <public type="id" name="widget_chat_bottom_space" id="0x7F0A1042" />
+    <public type="id" name="widget_chat_input" id="0x7F0A1043" />
+    <public type="id" name="widget_chat_list" id="0x7F0A1044" />
+    <public type="id" name="widget_chat_list_adapter_item_text_root" id="0x7F0A1045" />
+    <public type="id" name="widget_chat_overlay_actions" id="0x7F0A1046" />
+    <public type="id" name="widget_chat_voice_inline" id="0x7F0A1047" />
+    <public type="id" name="widget_collapsed_user_count" id="0x7F0A1048" />
+    <public type="id" name="widget_collapsed_user_imageview" id="0x7F0A1049" />
+    <public type="id" name="widget_connected_list" id="0x7F0A104A" />
+    <public type="id" name="widget_connection_integration_guild_handle" id="0x7F0A104B" />
+    <public type="id" name="widget_connection_integration_guild_icon" id="0x7F0A104C" />
+    <public type="id" name="widget_connection_integration_guild_join_error" id="0x7F0A104D" />
+    <public type="id" name="widget_connection_integration_guild_name" id="0x7F0A104E" />
+    <public type="id" name="widget_connection_integration_join_guild" id="0x7F0A104F" />
+    <public type="id" name="widget_directory_channel_empty" id="0x7F0A1050" />
+    <public type="id" name="widget_global_search_container" id="0x7F0A1051" />
+    <public type="id" name="widget_global_status" id="0x7F0A1052" />
+    <public type="id" name="widget_guild_hub_profile_actions" id="0x7F0A1053" />
+    <public type="id" name="widget_guild_profile_actions" id="0x7F0A1054" />
+    <public type="id" name="widget_guilds" id="0x7F0A1055" />
+    <public type="id" name="widget_home_container" id="0x7F0A1056" />
+    <public type="id" name="widget_home_panel_center_chat" id="0x7F0A1057" />
+    <public type="id" name="widget_home_panel_directory" id="0x7F0A1058" />
+    <public type="id" name="widget_profile_strip" id="0x7F0A1059" />
+    <public type="id" name="widget_search_input" id="0x7F0A105A" />
+    <public type="id" name="widget_search_results" id="0x7F0A105B" />
+    <public type="id" name="widget_search_suggestions" id="0x7F0A105C" />
+    <public type="id" name="widget_server_settings_channels_container" id="0x7F0A105D" />
+    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7F0A105E" />
+    <public type="id" name="widget_server_settings_emojis_section" id="0x7F0A105F" />
+    <public type="id" name="widget_server_settings_emojis_upload" id="0x7F0A1060" />
+    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7F0A1061" />
+    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7F0A1062" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_header" id="0x7F0A1063" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_placeholder" id="0x7F0A1064" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_recycler" id="0x7F0A1065" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_select" id="0x7F0A1066" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_subtitle" id="0x7F0A1067" />
+    <public type="id" name="widget_simple_bottom_sheet_selector_header" id="0x7F0A1068" />
+    <public type="id" name="widget_simple_bottom_sheet_selector_placeholder" id="0x7F0A1069" />
+    <public type="id" name="widget_simple_bottom_sheet_selector_recycler" id="0x7F0A106A" />
+    <public type="id" name="widget_stage_channel_details_blocked_count" id="0x7F0A106B" />
+    <public type="id" name="widget_stage_channel_details_blocked_icon" id="0x7F0A106C" />
+    <public type="id" name="widget_stage_channel_details_dot" id="0x7F0A106D" />
+    <public type="id" name="widget_stage_channel_details_listener_count" id="0x7F0A106E" />
+    <public type="id" name="widget_stage_channel_details_listener_icon" id="0x7F0A106F" />
+    <public type="id" name="widget_stage_channel_details_name" id="0x7F0A1070" />
+    <public type="id" name="widget_stage_channel_details_speaker_count" id="0x7F0A1071" />
+    <public type="id" name="widget_stage_channel_details_speaker_icon" id="0x7F0A1072" />
+    <public type="id" name="widget_stage_channel_details_topic" id="0x7F0A1073" />
+    <public type="id" name="widget_status" id="0x7F0A1074" />
+    <public type="id" name="widget_tabs_host_bottom_navigation_view" id="0x7F0A1075" />
+    <public type="id" name="widget_tabs_host_container" id="0x7F0A1076" />
+    <public type="id" name="widget_tabs_host_friends" id="0x7F0A1077" />
+    <public type="id" name="widget_tabs_host_global_status_indicator" id="0x7F0A1078" />
+    <public type="id" name="widget_tabs_host_home" id="0x7F0A1079" />
+    <public type="id" name="widget_tabs_host_mentions" id="0x7F0A107A" />
+    <public type="id" name="widget_tabs_host_nav_host" id="0x7F0A107B" />
+    <public type="id" name="widget_tabs_host_non_fullscreen_nav_host" id="0x7F0A107C" />
+    <public type="id" name="widget_tabs_host_user_settings" id="0x7F0A107D" />
+    <public type="id" name="widget_thread_status" id="0x7F0A107E" />
+    <public type="id" name="withText" id="0x7F0A107F" />
+    <public type="id" name="withinBounds" id="0x7F0A1080" />
+    <public type="id" name="wrap" id="0x7F0A1081" />
+    <public type="id" name="wrap_content" id="0x7F0A1082" />
+    <public type="id" name="wrap_reverse" id="0x7F0A1083" />
+    <public type="id" name="wrapper_controls" id="0x7F0A1084" />
+    <public type="id" name="wrapper_reset_rotate" id="0x7F0A1085" />
+    <public type="id" name="wrapper_rotate_by_angle" id="0x7F0A1086" />
+    <public type="id" name="wrapper_states" id="0x7F0A1087" />
+    <public type="id" name="zero_corner_chip" id="0x7F0A1088" />
+    <public type="id" name="zoom" id="0x7F0A1089" />
     <public type="integer" name="abc_config_activityDefaultDur" id="0x7F0B0000" />
     <public type="integer" name="abc_config_activityShortDur" id="0x7F0B0001" />
     <public type="integer" name="animation_time_fast" id="0x7F0B0002" />
@@ -9952,441 +9946,439 @@
     <public type="layout" name="widget_channel_sidebar_actions" id="0x7F0D0216" />
     <public type="layout" name="widget_channel_topic" id="0x7F0D0217" />
     <public type="layout" name="widget_channels_list" id="0x7F0D0218" />
-    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7F0D0219" />
-    <public type="layout" name="widget_channels_list_item_actions" id="0x7F0D021A" />
-    <public type="layout" name="widget_channels_list_item_active_event" id="0x7F0D021B" />
-    <public type="layout" name="widget_channels_list_item_audience_count" id="0x7F0D021C" />
-    <public type="layout" name="widget_channels_list_item_category" id="0x7F0D021D" />
-    <public type="layout" name="widget_channels_list_item_channel" id="0x7F0D021E" />
-    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7F0D021F" />
-    <public type="layout" name="widget_channels_list_item_channel_stage_voice" id="0x7F0D0220" />
-    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7F0D0221" />
-    <public type="layout" name="widget_channels_list_item_directory" id="0x7F0D0222" />
-    <public type="layout" name="widget_channels_list_item_guild_role_subs" id="0x7F0D0223" />
-    <public type="layout" name="widget_channels_list_item_guild_scheduled_events" id="0x7F0D0224" />
-    <public type="layout" name="widget_channels_list_item_header" id="0x7F0D0225" />
-    <public type="layout" name="widget_channels_list_item_invite" id="0x7F0D0226" />
-    <public type="layout" name="widget_channels_list_item_mfa" id="0x7F0D0227" />
-    <public type="layout" name="widget_channels_list_item_stage_events_separator" id="0x7F0D0228" />
-    <public type="layout" name="widget_channels_list_item_thread" id="0x7F0D0229" />
-    <public type="layout" name="widget_channels_list_item_thread_actions" id="0x7F0D022A" />
-    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7F0D022B" />
-    <public type="layout" name="widget_channels_list_unreads" id="0x7F0D022C" />
-    <public type="layout" name="widget_chat_input" id="0x7F0D022D" />
-    <public type="layout" name="widget_chat_input_application_commands" id="0x7F0D022E" />
-    <public type="layout" name="widget_chat_input_autocomplete_item" id="0x7F0D022F" />
-    <public type="layout" name="widget_chat_input_command_application_header_item" id="0x7F0D0230" />
-    <public type="layout" name="widget_chat_input_emoji_autocomplete_upsell_item" id="0x7F0D0231" />
-    <public type="layout" name="widget_chat_input_guard" id="0x7F0D0232" />
-    <public type="layout" name="widget_chat_input_item" id="0x7F0D0233" />
-    <public type="layout" name="widget_chat_input_member_verification_guard" id="0x7F0D0234" />
-    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7F0D0235" />
-    <public type="layout" name="widget_chat_input_slash_loading_item" id="0x7F0D0236" />
-    <public type="layout" name="widget_chat_input_sticker_suggestions" id="0x7F0D0237" />
-    <public type="layout" name="widget_chat_list" id="0x7F0D0238" />
-    <public type="layout" name="widget_chat_list_actions" id="0x7F0D0239" />
-    <public type="layout" name="widget_chat_list_adapter_item_application_command" id="0x7F0D023A" />
-    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7F0D023B" />
-    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7F0D023C" />
-    <public type="layout" name="widget_chat_list_adapter_item_bot_component_row" id="0x7F0D023D" />
-    <public type="layout" name="widget_chat_list_adapter_item_call" id="0x7F0D023E" />
-    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7F0D023F" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7F0D0240" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7F0D0241" />
-    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7F0D0242" />
-    <public type="layout" name="widget_chat_list_adapter_item_ephemeral_message" id="0x7F0D0243" />
-    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7F0D0244" />
-    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7F0D0245" />
-    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7F0D0246" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_invite_reminder" id="0x7F0D0247" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_scheduled_event_invite" id="0x7F0D0248" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_template" id="0x7F0D0249" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7F0D024A" />
-    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7F0D024B" />
-    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7F0D024C" />
-    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7F0D024D" />
-    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7F0D024E" />
-    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7F0D024F" />
-    <public type="layout" name="widget_chat_list_adapter_item_private_channel_start" id="0x7F0D0250" />
-    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7F0D0251" />
-    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7F0D0252" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7F0D0253" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7F0D0254" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7F0D0255" />
-    <public type="layout" name="widget_chat_list_adapter_item_single_line_message_preview" id="0x7F0D0256" />
-    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7F0D0257" />
-    <public type="layout" name="widget_chat_list_adapter_item_spotify_listen_together" id="0x7F0D0258" />
-    <public type="layout" name="widget_chat_list_adapter_item_stage_invite" id="0x7F0D0259" />
-    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7F0D025A" />
-    <public type="layout" name="widget_chat_list_adapter_item_sticker" id="0x7F0D025B" />
-    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet" id="0x7F0D025C" />
-    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet_compact" id="0x7F0D025D" />
-    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7F0D025E" />
-    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7F0D025F" />
-    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7F0D0260" />
-    <public type="layout" name="widget_chat_list_adapter_item_thread_draft_form" id="0x7F0D0261" />
-    <public type="layout" name="widget_chat_list_adapter_item_thread_embed" id="0x7F0D0262" />
-    <public type="layout" name="widget_chat_list_adapter_item_thread_starter_divider" id="0x7F0D0263" />
-    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7F0D0264" />
-    <public type="layout" name="widget_chat_list_bot_ui_action_row_component" id="0x7F0D0265" />
-    <public type="layout" name="widget_chat_list_bot_ui_button_component" id="0x7F0D0266" />
-    <public type="layout" name="widget_chat_list_bot_ui_select_component" id="0x7F0D0267" />
-    <public type="layout" name="widget_chat_list_bot_ui_select_component_pill" id="0x7F0D0268" />
-    <public type="layout" name="widget_chat_overlay" id="0x7F0D0269" />
-    <public type="layout" name="widget_chat_status" id="0x7F0D026A" />
-    <public type="layout" name="widget_choose_plan" id="0x7F0D026B" />
-    <public type="layout" name="widget_choose_plan_adapter_divider_item" id="0x7F0D026C" />
-    <public type="layout" name="widget_choose_plan_adapter_header_item" id="0x7F0D026D" />
-    <public type="layout" name="widget_choose_plan_adapter_plan_item" id="0x7F0D026E" />
-    <public type="layout" name="widget_claim_outbound_promo" id="0x7F0D026F" />
-    <public type="layout" name="widget_client_outdated" id="0x7F0D0270" />
-    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7F0D0271" />
-    <public type="layout" name="widget_confirm_remove_community_dialog" id="0x7F0D0272" />
-    <public type="layout" name="widget_connections_add_xbox" id="0x7F0D0273" />
-    <public type="layout" name="widget_contact_sync" id="0x7F0D0274" />
-    <public type="layout" name="widget_create_channel" id="0x7F0D0275" />
-    <public type="layout" name="widget_create_channel_add_member" id="0x7F0D0276" />
-    <public type="layout" name="widget_create_guild_role_subscription_tier" id="0x7F0D0277" />
-    <public type="layout" name="widget_creation_intent" id="0x7F0D0278" />
-    <public type="layout" name="widget_debugging" id="0x7F0D0279" />
-    <public type="layout" name="widget_debugging_adapter_item" id="0x7F0D027A" />
-    <public type="layout" name="widget_directories_search" id="0x7F0D027B" />
-    <public type="layout" name="widget_directory_category" id="0x7F0D027C" />
-    <public type="layout" name="widget_directory_channel" id="0x7F0D027D" />
-    <public type="layout" name="widget_directory_channel_empty" id="0x7F0D027E" />
-    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7F0D027F" />
-    <public type="layout" name="widget_discord_hub_email_input" id="0x7F0D0280" />
-    <public type="layout" name="widget_discovery_other_speakers_count" id="0x7F0D0281" />
-    <public type="layout" name="widget_discovery_stage_card_speaker" id="0x7F0D0282" />
-    <public type="layout" name="widget_edit_profile_banner_sheet" id="0x7F0D0283" />
-    <public type="layout" name="widget_edit_role" id="0x7F0D0284" />
-    <public type="layout" name="widget_emoji_picker" id="0x7F0D0285" />
-    <public type="layout" name="widget_emoji_picker_sheet" id="0x7F0D0286" />
-    <public type="layout" name="widget_emoji_sheet" id="0x7F0D0287" />
-    <public type="layout" name="widget_enable_community_steps" id="0x7F0D0288" />
-    <public type="layout" name="widget_enable_mfa_steps" id="0x7F0D0289" />
-    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7F0D028A" />
-    <public type="layout" name="widget_enable_two_factor_password_dialog" id="0x7F0D028B" />
-    <public type="layout" name="widget_end_stage_bottom_sheet" id="0x7F0D028C" />
-    <public type="layout" name="widget_expression_tray" id="0x7F0D028D" />
-    <public type="layout" name="widget_fatal_crash" id="0x7F0D028E" />
-    <public type="layout" name="widget_feedback_sheet" id="0x7F0D028F" />
-    <public type="layout" name="widget_folder_context_menu" id="0x7F0D0290" />
-    <public type="layout" name="widget_friends_add" id="0x7F0D0291" />
-    <public type="layout" name="widget_friends_add_by_id" id="0x7F0D0292" />
-    <public type="layout" name="widget_friends_list" id="0x7F0D0293" />
-    <public type="layout" name="widget_friends_list_adapter_item_friend" id="0x7F0D0294" />
-    <public type="layout" name="widget_friends_list_adapter_item_header" id="0x7F0D0295" />
-    <public type="layout" name="widget_friends_list_adapter_item_loading" id="0x7F0D0296" />
-    <public type="layout" name="widget_friends_list_adapter_item_pending" id="0x7F0D0297" />
-    <public type="layout" name="widget_friends_list_adapter_suggested_friend" id="0x7F0D0298" />
-    <public type="layout" name="widget_friends_list_contact_sync_upsell" id="0x7F0D0299" />
-    <public type="layout" name="widget_friends_list_expandable_header" id="0x7F0D029A" />
-    <public type="layout" name="widget_friends_nearby" id="0x7F0D029B" />
-    <public type="layout" name="widget_gif_category" id="0x7F0D029C" />
-    <public type="layout" name="widget_gif_picker" id="0x7F0D029D" />
-    <public type="layout" name="widget_gif_picker_search" id="0x7F0D029E" />
-    <public type="layout" name="widget_gif_picker_sheet" id="0x7F0D029F" />
-    <public type="layout" name="widget_global_search" id="0x7F0D02A0" />
-    <public type="layout" name="widget_global_search_dialog" id="0x7F0D02A1" />
-    <public type="layout" name="widget_global_search_item_divider" id="0x7F0D02A2" />
-    <public type="layout" name="widget_global_search_item_dm" id="0x7F0D02A3" />
-    <public type="layout" name="widget_global_search_item_guild" id="0x7F0D02A4" />
-    <public type="layout" name="widget_global_status_indicator" id="0x7F0D02A5" />
-    <public type="layout" name="widget_group_invite_friends" id="0x7F0D02A6" />
-    <public type="layout" name="widget_group_invite_friends_item" id="0x7F0D02A7" />
-    <public type="layout" name="widget_guild_call_onboarding" id="0x7F0D02A8" />
-    <public type="layout" name="widget_guild_clone" id="0x7F0D02A9" />
-    <public type="layout" name="widget_guild_context_menu" id="0x7F0D02AA" />
-    <public type="layout" name="widget_guild_create" id="0x7F0D02AB" />
-    <public type="layout" name="widget_guild_folder_settings" id="0x7F0D02AC" />
-    <public type="layout" name="widget_guild_hub_profile_actions" id="0x7F0D02AD" />
-    <public type="layout" name="widget_guild_identity_marketing_sheet" id="0x7F0D02AE" />
-    <public type="layout" name="widget_guild_invite_info_view" id="0x7F0D02AF" />
-    <public type="layout" name="widget_guild_invite_page" id="0x7F0D02B0" />
-    <public type="layout" name="widget_guild_invite_settings" id="0x7F0D02B1" />
-    <public type="layout" name="widget_guild_invite_share" id="0x7F0D02B2" />
-    <public type="layout" name="widget_guild_invite_share_compact" id="0x7F0D02B3" />
-    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7F0D02B4" />
-    <public type="layout" name="widget_guild_invite_share_item" id="0x7F0D02B5" />
-    <public type="layout" name="widget_guild_invite_share_sheet" id="0x7F0D02B6" />
-    <public type="layout" name="widget_guild_join" id="0x7F0D02B7" />
-    <public type="layout" name="widget_guild_join_invite_examples" id="0x7F0D02B8" />
-    <public type="layout" name="widget_guild_profile_actions" id="0x7F0D02B9" />
-    <public type="layout" name="widget_guild_profile_emoji_extra" id="0x7F0D02BA" />
-    <public type="layout" name="widget_guild_profile_emoji_item" id="0x7F0D02BB" />
-    <public type="layout" name="widget_guild_profile_sheet" id="0x7F0D02BC" />
-    <public type="layout" name="widget_guild_role_subscription_details" id="0x7F0D02BD" />
-    <public type="layout" name="widget_guild_role_subscription_entry_point" id="0x7F0D02BE" />
-    <public type="layout" name="widget_guild_role_subscription_plan_details" id="0x7F0D02BF" />
-    <public type="layout" name="widget_guild_role_subscription_plan_format" id="0x7F0D02C0" />
-    <public type="layout" name="widget_guild_role_subscription_tier_benefit" id="0x7F0D02C1" />
-    <public type="layout" name="widget_guild_role_subscription_tier_benefits" id="0x7F0D02C2" />
-    <public type="layout" name="widget_guild_role_subscription_tier_design" id="0x7F0D02C3" />
-    <public type="layout" name="widget_guild_role_subscription_tier_review" id="0x7F0D02C4" />
-    <public type="layout" name="widget_guild_scheduled_event_details_bottom_sheet" id="0x7F0D02C5" />
-    <public type="layout" name="widget_guild_scheduled_event_details_extras_bottom_sheet" id="0x7F0D02C6" />
-    <public type="layout" name="widget_guild_scheduled_event_list_bottom_sheet" id="0x7F0D02C7" />
-    <public type="layout" name="widget_guild_scheduled_event_location_select" id="0x7F0D02C8" />
-    <public type="layout" name="widget_guild_scheduled_event_settings" id="0x7F0D02C9" />
-    <public type="layout" name="widget_guild_scheduled_event_upsell_bottom_sheet" id="0x7F0D02CA" />
-    <public type="layout" name="widget_guild_selector" id="0x7F0D02CB" />
-    <public type="layout" name="widget_guild_selector_item" id="0x7F0D02CC" />
-    <public type="layout" name="widget_guild_sticker_sheet" id="0x7F0D02CD" />
-    <public type="layout" name="widget_guild_subscription_plan_setup" id="0x7F0D02CE" />
-    <public type="layout" name="widget_guild_transfer_ownership" id="0x7F0D02CF" />
-    <public type="layout" name="widget_guild_welcome_channel" id="0x7F0D02D0" />
-    <public type="layout" name="widget_guild_welcome_sheet" id="0x7F0D02D1" />
-    <public type="layout" name="widget_guilds_list" id="0x7F0D02D2" />
-    <public type="layout" name="widget_guilds_list_item_divider" id="0x7F0D02D3" />
-    <public type="layout" name="widget_guilds_list_item_dm" id="0x7F0D02D4" />
-    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7F0D02D5" />
-    <public type="layout" name="widget_guilds_list_item_folder" id="0x7F0D02D6" />
-    <public type="layout" name="widget_guilds_list_item_guild" id="0x7F0D02D7" />
-    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7F0D02D8" />
-    <public type="layout" name="widget_guilds_list_item_guild_nux" id="0x7F0D02D9" />
-    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7F0D02DA" />
-    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7F0D02DB" />
-    <public type="layout" name="widget_guilds_list_item_hub_verification" id="0x7F0D02DC" />
-    <public type="layout" name="widget_guilds_list_item_profile" id="0x7F0D02DD" />
-    <public type="layout" name="widget_home" id="0x7F0D02DE" />
-    <public type="layout" name="widget_home_panel_center" id="0x7F0D02DF" />
-    <public type="layout" name="widget_home_panel_center_channel_less" id="0x7F0D02E0" />
-    <public type="layout" name="widget_home_panel_center_chat" id="0x7F0D02E1" />
-    <public type="layout" name="widget_home_panel_center_content_unread" id="0x7F0D02E2" />
-    <public type="layout" name="widget_home_panel_center_nsfw" id="0x7F0D02E3" />
-    <public type="layout" name="widget_home_panel_left" id="0x7F0D02E4" />
-    <public type="layout" name="widget_home_panel_loading" id="0x7F0D02E5" />
-    <public type="layout" name="widget_home_panel_right" id="0x7F0D02E6" />
-    <public type="layout" name="widget_hub_add_name" id="0x7F0D02E7" />
-    <public type="layout" name="widget_hub_add_server" id="0x7F0D02E8" />
-    <public type="layout" name="widget_hub_authentication" id="0x7F0D02E9" />
-    <public type="layout" name="widget_hub_description" id="0x7F0D02EA" />
-    <public type="layout" name="widget_hub_domain_search" id="0x7F0D02EB" />
-    <public type="layout" name="widget_hub_domains" id="0x7F0D02EC" />
-    <public type="layout" name="widget_hub_email_flow" id="0x7F0D02ED" />
-    <public type="layout" name="widget_hub_email_flow_confirmation" id="0x7F0D02EE" />
-    <public type="layout" name="widget_hub_email_flow_waitlist" id="0x7F0D02EF" />
-    <public type="layout" name="widget_hub_waitlist" id="0x7F0D02F0" />
-    <public type="layout" name="widget_incoming_share" id="0x7F0D02F1" />
-    <public type="layout" name="widget_issue_details_form" id="0x7F0D02F2" />
-    <public type="layout" name="widget_kick_user" id="0x7F0D02F3" />
-    <public type="layout" name="widget_manage_reactions" id="0x7F0D02F4" />
-    <public type="layout" name="widget_manage_reactions_emoji" id="0x7F0D02F5" />
-    <public type="layout" name="widget_manage_reactions_result_error" id="0x7F0D02F6" />
-    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7F0D02F7" />
-    <public type="layout" name="widget_manage_reactions_result_user" id="0x7F0D02F8" />
-    <public type="layout" name="widget_masked_links_dialog" id="0x7F0D02F9" />
-    <public type="layout" name="widget_media" id="0x7F0D02FA" />
-    <public type="layout" name="widget_member_verification" id="0x7F0D02FB" />
-    <public type="layout" name="widget_member_verification_approve_terms_item" id="0x7F0D02FC" />
-    <public type="layout" name="widget_member_verification_header_item" id="0x7F0D02FD" />
-    <public type="layout" name="widget_member_verification_multiple_choice_item" id="0x7F0D02FE" />
-    <public type="layout" name="widget_member_verification_multiple_choice_radio_item" id="0x7F0D02FF" />
-    <public type="layout" name="widget_member_verification_paragraph_item" id="0x7F0D0300" />
-    <public type="layout" name="widget_member_verification_pending_dialog" id="0x7F0D0301" />
-    <public type="layout" name="widget_member_verification_rule_item" id="0x7F0D0302" />
-    <public type="layout" name="widget_member_verification_success" id="0x7F0D0303" />
-    <public type="layout" name="widget_member_verification_text_input_item" id="0x7F0D0304" />
-    <public type="layout" name="widget_mobile_reports" id="0x7F0D0305" />
-    <public type="layout" name="widget_moderator_start_stage" id="0x7F0D0306" />
-    <public type="layout" name="widget_music_rich_presence" id="0x7F0D0307" />
-    <public type="layout" name="widget_mute_settings_sheet" id="0x7F0D0308" />
-    <public type="layout" name="widget_navigation_help" id="0x7F0D0309" />
-    <public type="layout" name="widget_navigation_help_nux_channels" id="0x7F0D030A" />
-    <public type="layout" name="widget_navigation_help_nux_dms" id="0x7F0D030B" />
-    <public type="layout" name="widget_navigation_help_nux_guilds" id="0x7F0D030C" />
-    <public type="layout" name="widget_notice_dialog" id="0x7F0D030D" />
-    <public type="layout" name="widget_notice_nux_overlay" id="0x7F0D030E" />
-    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7F0D030F" />
-    <public type="layout" name="widget_notice_popup" id="0x7F0D0310" />
-    <public type="layout" name="widget_nux_channel_prompt" id="0x7F0D0311" />
-    <public type="layout" name="widget_nux_guild_template" id="0x7F0D0312" />
-    <public type="layout" name="widget_nux_post_registration" id="0x7F0D0313" />
-    <public type="layout" name="widget_oauth_authorize" id="0x7F0D0314" />
-    <public type="layout" name="widget_outbound_promo_terms" id="0x7F0D0315" />
-    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7F0D0316" />
-    <public type="layout" name="widget_phone_country_code_bottom_sheet" id="0x7F0D0317" />
-    <public type="layout" name="widget_phone_country_code_list_item" id="0x7F0D0318" />
-    <public type="layout" name="widget_platform_rich_presence" id="0x7F0D0319" />
-    <public type="layout" name="widget_premium_guild_transfer" id="0x7F0D031A" />
-    <public type="layout" name="widget_premium_upsell" id="0x7F0D031B" />
-    <public type="layout" name="widget_preview_guild_scheduled_event" id="0x7F0D031C" />
-    <public type="layout" name="widget_price_tier_picker_bottom_sheet" id="0x7F0D031D" />
-    <public type="layout" name="widget_prune_users" id="0x7F0D031E" />
-    <public type="layout" name="widget_qr_scanner" id="0x7F0D031F" />
-    <public type="layout" name="widget_quick_mentions_dialog" id="0x7F0D0320" />
-    <public type="layout" name="widget_radio_selector_bottom_sheet" id="0x7F0D0321" />
-    <public type="layout" name="widget_radio_selector_view_holder" id="0x7F0D0322" />
-    <public type="layout" name="widget_remote_auth" id="0x7F0D0323" />
-    <public type="layout" name="widget_remote_auth_not_found" id="0x7F0D0324" />
-    <public type="layout" name="widget_remote_auth_pending_login" id="0x7F0D0325" />
-    <public type="layout" name="widget_remote_auth_success" id="0x7F0D0326" />
-    <public type="layout" name="widget_screen_share_nfx_sheet" id="0x7F0D0327" />
-    <public type="layout" name="widget_search" id="0x7F0D0328" />
-    <public type="layout" name="widget_search_results" id="0x7F0D0329" />
-    <public type="layout" name="widget_search_suggestion_item_header" id="0x7F0D032A" />
-    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7F0D032B" />
-    <public type="layout" name="widget_search_suggestions" id="0x7F0D032C" />
-    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7F0D032D" />
-    <public type="layout" name="widget_search_suggestions_item_has" id="0x7F0D032E" />
-    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7F0D032F" />
-    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7F0D0330" />
-    <public type="layout" name="widget_search_suggestions_item_user" id="0x7F0D0331" />
-    <public type="layout" name="widget_select_component_bottom_sheet" id="0x7F0D0332" />
-    <public type="layout" name="widget_select_component_bottom_sheet_item" id="0x7F0D0333" />
-    <public type="layout" name="widget_server_boost_confirmation" id="0x7F0D0334" />
-    <public type="layout" name="widget_server_boost_status" id="0x7F0D0335" />
-    <public type="layout" name="widget_server_delete_dialog" id="0x7F0D0336" />
-    <public type="layout" name="widget_server_notification_override_selector" id="0x7F0D0337" />
-    <public type="layout" name="widget_server_notifications" id="0x7F0D0338" />
-    <public type="layout" name="widget_server_settings" id="0x7F0D0339" />
-    <public type="layout" name="widget_server_settings_audit_log" id="0x7F0D033A" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7F0D033B" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7F0D033C" />
-    <public type="layout" name="widget_server_settings_audit_log_list_item" id="0x7F0D033D" />
-    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7F0D033E" />
-    <public type="layout" name="widget_server_settings_audit_log_menu_filter" id="0x7F0D033F" />
-    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7F0D0340" />
-    <public type="layout" name="widget_server_settings_bans" id="0x7F0D0341" />
-    <public type="layout" name="widget_server_settings_channels" id="0x7F0D0342" />
-    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7F0D0343" />
-    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7F0D0344" />
-    <public type="layout" name="widget_server_settings_community_overview" id="0x7F0D0345" />
-    <public type="layout" name="widget_server_settings_community_setup_first_step" id="0x7F0D0346" />
-    <public type="layout" name="widget_server_settings_community_setup_second_step" id="0x7F0D0347" />
-    <public type="layout" name="widget_server_settings_community_setup_third_step" id="0x7F0D0348" />
-    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7F0D0349" />
-    <public type="layout" name="widget_server_settings_edit_integration" id="0x7F0D034A" />
-    <public type="layout" name="widget_server_settings_edit_member" id="0x7F0D034B" />
-    <public type="layout" name="widget_server_settings_emojis" id="0x7F0D034C" />
-    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7F0D034D" />
-    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7F0D034E" />
-    <public type="layout" name="widget_server_settings_emojis_header" id="0x7F0D034F" />
-    <public type="layout" name="widget_server_settings_emojis_item" id="0x7F0D0350" />
-    <public type="layout" name="widget_server_settings_emojis_section" id="0x7F0D0351" />
-    <public type="layout" name="widget_server_settings_empty_guild_role_subscription" id="0x7F0D0352" />
-    <public type="layout" name="widget_server_settings_enable_community" id="0x7F0D0353" />
-    <public type="layout" name="widget_server_settings_guild_role_subscription_edit_tier" id="0x7F0D0354" />
-    <public type="layout" name="widget_server_settings_guild_role_subscription_tier_list" id="0x7F0D0355" />
-    <public type="layout" name="widget_server_settings_guild_role_subscriptions" id="0x7F0D0356" />
-    <public type="layout" name="widget_server_settings_help_item" id="0x7F0D0357" />
-    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7F0D0358" />
-    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7F0D0359" />
-    <public type="layout" name="widget_server_settings_instant_invites" id="0x7F0D035A" />
-    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7F0D035B" />
-    <public type="layout" name="widget_server_settings_integrations" id="0x7F0D035C" />
-    <public type="layout" name="widget_server_settings_member_list_item" id="0x7F0D035D" />
-    <public type="layout" name="widget_server_settings_members" id="0x7F0D035E" />
-    <public type="layout" name="widget_server_settings_moderation" id="0x7F0D035F" />
-    <public type="layout" name="widget_server_settings_overview" id="0x7F0D0360" />
-    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7F0D0361" />
-    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7F0D0362" />
-    <public type="layout" name="widget_server_settings_role_item" id="0x7F0D0363" />
-    <public type="layout" name="widget_server_settings_role_members" id="0x7F0D0364" />
-    <public type="layout" name="widget_server_settings_roles" id="0x7F0D0365" />
-    <public type="layout" name="widget_server_settings_security" id="0x7F0D0366" />
-    <public type="layout" name="widget_server_settings_security_dialog" id="0x7F0D0367" />
-    <public type="layout" name="widget_server_settings_vanity_url" id="0x7F0D0368" />
-    <public type="layout" name="widget_settings" id="0x7F0D0369" />
-    <public type="layout" name="widget_settings_accessibility" id="0x7F0D036A" />
-    <public type="layout" name="widget_settings_account" id="0x7F0D036B" />
-    <public type="layout" name="widget_settings_account_backup_codes" id="0x7F0D036C" />
-    <public type="layout" name="widget_settings_account_change_password" id="0x7F0D036D" />
-    <public type="layout" name="widget_settings_account_contacts_name_edit" id="0x7F0D036E" />
-    <public type="layout" name="widget_settings_account_edit" id="0x7F0D036F" />
-    <public type="layout" name="widget_settings_account_email_edit" id="0x7F0D0370" />
-    <public type="layout" name="widget_settings_activity_status" id="0x7F0D0371" />
-    <public type="layout" name="widget_settings_appearance" id="0x7F0D0372" />
-    <public type="layout" name="widget_settings_authorized_apps" id="0x7F0D0373" />
-    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7F0D0374" />
-    <public type="layout" name="widget_settings_behavior" id="0x7F0D0375" />
-    <public type="layout" name="widget_settings_blocked_users" id="0x7F0D0376" />
-    <public type="layout" name="widget_settings_boost" id="0x7F0D0377" />
-    <public type="layout" name="widget_settings_connections" id="0x7F0D0378" />
-    <public type="layout" name="widget_settings_connections_add" id="0x7F0D0379" />
-    <public type="layout" name="widget_settings_developer" id="0x7F0D037A" />
-    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7F0D037B" />
-    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7F0D037C" />
-    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7F0D037D" />
-    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7F0D037E" />
-    <public type="layout" name="widget_settings_gifting" id="0x7F0D037F" />
-    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7F0D0380" />
-    <public type="layout" name="widget_settings_item_backup_code" id="0x7F0D0381" />
-    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7F0D0382" />
-    <public type="layout" name="widget_settings_item_blocked_user" id="0x7F0D0383" />
-    <public type="layout" name="widget_settings_item_connected_account" id="0x7F0D0384" />
-    <public type="layout" name="widget_settings_language" id="0x7F0D0385" />
-    <public type="layout" name="widget_settings_language_select" id="0x7F0D0386" />
-    <public type="layout" name="widget_settings_language_select_item" id="0x7F0D0387" />
-    <public type="layout" name="widget_settings_media" id="0x7F0D0388" />
-    <public type="layout" name="widget_settings_notification_os" id="0x7F0D0389" />
-    <public type="layout" name="widget_settings_notifications" id="0x7F0D038A" />
-    <public type="layout" name="widget_settings_premium" id="0x7F0D038B" />
-    <public type="layout" name="widget_settings_privacy" id="0x7F0D038C" />
-    <public type="layout" name="widget_settings_privacy_defaults" id="0x7F0D038D" />
-    <public type="layout" name="widget_settings_user_profile" id="0x7F0D038E" />
-    <public type="layout" name="widget_settings_voice" id="0x7F0D038F" />
-    <public type="layout" name="widget_settings_voice_input_mode" id="0x7F0D0390" />
-    <public type="layout" name="widget_stage_audience_blocked_bottom_sheet" id="0x7F0D0391" />
-    <public type="layout" name="widget_stage_audience_notice_bottom_sheet" id="0x7F0D0392" />
-    <public type="layout" name="widget_stage_channel_audience" id="0x7F0D0393" />
-    <public type="layout" name="widget_stage_channel_audience_role" id="0x7F0D0394" />
-    <public type="layout" name="widget_stage_channel_details" id="0x7F0D0395" />
-    <public type="layout" name="widget_stage_channel_divider" id="0x7F0D0396" />
-    <public type="layout" name="widget_stage_channel_moderator_permissions" id="0x7F0D0397" />
-    <public type="layout" name="widget_stage_channel_prestart_details" id="0x7F0D0398" />
-    <public type="layout" name="widget_stage_channel_rich_presence" id="0x7F0D0399" />
-    <public type="layout" name="widget_stage_channel_speaker" id="0x7F0D039A" />
-    <public type="layout" name="widget_stage_moderator_join_bottom_sheet" id="0x7F0D039B" />
-    <public type="layout" name="widget_stage_raised_hands_bottom_sheet" id="0x7F0D039C" />
-    <public type="layout" name="widget_stage_start_event_bottom_sheet" id="0x7F0D039D" />
-    <public type="layout" name="widget_start_call_sheet" id="0x7F0D039E" />
-    <public type="layout" name="widget_sticker_pack_store_sheet" id="0x7F0D039F" />
-    <public type="layout" name="widget_sticker_picker" id="0x7F0D03A0" />
-    <public type="layout" name="widget_sticker_picker_sheet" id="0x7F0D03A1" />
-    <public type="layout" name="widget_sticker_sheet" id="0x7F0D03A2" />
-    <public type="layout" name="widget_stream_rich_presence" id="0x7F0D03A3" />
-    <public type="layout" name="widget_tabs_host" id="0x7F0D03A4" />
-    <public type="layout" name="widget_text_channel_settings" id="0x7F0D03A5" />
-    <public type="layout" name="widget_thread_archive_actions_sheet" id="0x7F0D03A6" />
-    <public type="layout" name="widget_thread_browser" id="0x7F0D03A7" />
-    <public type="layout" name="widget_thread_browser_active" id="0x7F0D03A8" />
-    <public type="layout" name="widget_thread_browser_archived" id="0x7F0D03A9" />
-    <public type="layout" name="widget_thread_browser_filter_sheet" id="0x7F0D03AA" />
-    <public type="layout" name="widget_thread_settings" id="0x7F0D03AB" />
-    <public type="layout" name="widget_thread_status" id="0x7F0D03AC" />
-    <public type="layout" name="widget_tos_accept" id="0x7F0D03AD" />
-    <public type="layout" name="widget_tos_report_violation" id="0x7F0D03AE" />
-    <public type="layout" name="widget_tos_report_violation_reason" id="0x7F0D03AF" />
-    <public type="layout" name="widget_unknown_sticker_sheet" id="0x7F0D03B0" />
-    <public type="layout" name="widget_urgent_message_dialog" id="0x7F0D03B1" />
-    <public type="layout" name="widget_url_actions" id="0x7F0D03B2" />
-    <public type="layout" name="widget_usage_settings_dialog" id="0x7F0D03B3" />
-    <public type="layout" name="widget_user_account_verify" id="0x7F0D03B4" />
-    <public type="layout" name="widget_user_email_update" id="0x7F0D03B5" />
-    <public type="layout" name="widget_user_email_verify" id="0x7F0D03B6" />
-    <public type="layout" name="widget_user_mentions" id="0x7F0D03B7" />
-    <public type="layout" name="widget_user_mentions_filter" id="0x7F0D03B8" />
-    <public type="layout" name="widget_user_mutual_friends" id="0x7F0D03B9" />
-    <public type="layout" name="widget_user_mutual_guilds" id="0x7F0D03BA" />
-    <public type="layout" name="widget_user_password_verify" id="0x7F0D03BB" />
-    <public type="layout" name="widget_user_phone_manage" id="0x7F0D03BC" />
-    <public type="layout" name="widget_user_phone_verify" id="0x7F0D03BD" />
-    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7F0D03BE" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7F0D03BF" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7F0D03C0" />
-    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7F0D03C1" />
-    <public type="layout" name="widget_user_rich_presence" id="0x7F0D03C2" />
-    <public type="layout" name="widget_user_set_custom_status" id="0x7F0D03C3" />
-    <public type="layout" name="widget_user_sheet" id="0x7F0D03C4" />
-    <public type="layout" name="widget_user_status_update" id="0x7F0D03C5" />
-    <public type="layout" name="widget_voice_bottom_sheet" id="0x7F0D03C6" />
-    <public type="layout" name="widget_voice_call_incoming" id="0x7F0D03C7" />
-    <public type="layout" name="widget_voice_call_inline" id="0x7F0D03C8" />
-    <public type="layout" name="widget_voice_channel_settings" id="0x7F0D03C9" />
-    <public type="layout" name="widget_voice_noise_cancellation_bottom_sheet" id="0x7F0D03CA" />
-    <public type="layout" name="widget_voice_settings_bottom_sheet" id="0x7F0D03CB" />
+    <public type="layout" name="widget_channels_list_item_actions" id="0x7F0D0219" />
+    <public type="layout" name="widget_channels_list_item_active_event" id="0x7F0D021A" />
+    <public type="layout" name="widget_channels_list_item_audience_count" id="0x7F0D021B" />
+    <public type="layout" name="widget_channels_list_item_category" id="0x7F0D021C" />
+    <public type="layout" name="widget_channels_list_item_channel" id="0x7F0D021D" />
+    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7F0D021E" />
+    <public type="layout" name="widget_channels_list_item_channel_stage_voice" id="0x7F0D021F" />
+    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7F0D0220" />
+    <public type="layout" name="widget_channels_list_item_directory" id="0x7F0D0221" />
+    <public type="layout" name="widget_channels_list_item_guild_role_subs" id="0x7F0D0222" />
+    <public type="layout" name="widget_channels_list_item_guild_scheduled_events" id="0x7F0D0223" />
+    <public type="layout" name="widget_channels_list_item_header" id="0x7F0D0224" />
+    <public type="layout" name="widget_channels_list_item_invite" id="0x7F0D0225" />
+    <public type="layout" name="widget_channels_list_item_mfa" id="0x7F0D0226" />
+    <public type="layout" name="widget_channels_list_item_stage_events_separator" id="0x7F0D0227" />
+    <public type="layout" name="widget_channels_list_item_thread" id="0x7F0D0228" />
+    <public type="layout" name="widget_channels_list_item_thread_actions" id="0x7F0D0229" />
+    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7F0D022A" />
+    <public type="layout" name="widget_channels_list_unreads" id="0x7F0D022B" />
+    <public type="layout" name="widget_chat_input" id="0x7F0D022C" />
+    <public type="layout" name="widget_chat_input_application_commands" id="0x7F0D022D" />
+    <public type="layout" name="widget_chat_input_autocomplete_item" id="0x7F0D022E" />
+    <public type="layout" name="widget_chat_input_command_application_header_item" id="0x7F0D022F" />
+    <public type="layout" name="widget_chat_input_emoji_autocomplete_upsell_item" id="0x7F0D0230" />
+    <public type="layout" name="widget_chat_input_guard" id="0x7F0D0231" />
+    <public type="layout" name="widget_chat_input_item" id="0x7F0D0232" />
+    <public type="layout" name="widget_chat_input_member_verification_guard" id="0x7F0D0233" />
+    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7F0D0234" />
+    <public type="layout" name="widget_chat_input_slash_loading_item" id="0x7F0D0235" />
+    <public type="layout" name="widget_chat_input_sticker_suggestions" id="0x7F0D0236" />
+    <public type="layout" name="widget_chat_list" id="0x7F0D0237" />
+    <public type="layout" name="widget_chat_list_actions" id="0x7F0D0238" />
+    <public type="layout" name="widget_chat_list_adapter_item_application_command" id="0x7F0D0239" />
+    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7F0D023A" />
+    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7F0D023B" />
+    <public type="layout" name="widget_chat_list_adapter_item_bot_component_row" id="0x7F0D023C" />
+    <public type="layout" name="widget_chat_list_adapter_item_call" id="0x7F0D023D" />
+    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7F0D023E" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7F0D023F" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7F0D0240" />
+    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7F0D0241" />
+    <public type="layout" name="widget_chat_list_adapter_item_ephemeral_message" id="0x7F0D0242" />
+    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7F0D0243" />
+    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7F0D0244" />
+    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7F0D0245" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_invite_reminder" id="0x7F0D0246" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_scheduled_event_invite" id="0x7F0D0247" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_template" id="0x7F0D0248" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7F0D0249" />
+    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7F0D024A" />
+    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7F0D024B" />
+    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7F0D024C" />
+    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7F0D024D" />
+    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7F0D024E" />
+    <public type="layout" name="widget_chat_list_adapter_item_private_channel_start" id="0x7F0D024F" />
+    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7F0D0250" />
+    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7F0D0251" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7F0D0252" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7F0D0253" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7F0D0254" />
+    <public type="layout" name="widget_chat_list_adapter_item_single_line_message_preview" id="0x7F0D0255" />
+    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7F0D0256" />
+    <public type="layout" name="widget_chat_list_adapter_item_spotify_listen_together" id="0x7F0D0257" />
+    <public type="layout" name="widget_chat_list_adapter_item_stage_invite" id="0x7F0D0258" />
+    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7F0D0259" />
+    <public type="layout" name="widget_chat_list_adapter_item_sticker" id="0x7F0D025A" />
+    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet" id="0x7F0D025B" />
+    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet_compact" id="0x7F0D025C" />
+    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7F0D025D" />
+    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7F0D025E" />
+    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7F0D025F" />
+    <public type="layout" name="widget_chat_list_adapter_item_thread_draft_form" id="0x7F0D0260" />
+    <public type="layout" name="widget_chat_list_adapter_item_thread_embed" id="0x7F0D0261" />
+    <public type="layout" name="widget_chat_list_adapter_item_thread_starter_divider" id="0x7F0D0262" />
+    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7F0D0263" />
+    <public type="layout" name="widget_chat_list_bot_ui_action_row_component" id="0x7F0D0264" />
+    <public type="layout" name="widget_chat_list_bot_ui_button_component" id="0x7F0D0265" />
+    <public type="layout" name="widget_chat_list_bot_ui_select_component" id="0x7F0D0266" />
+    <public type="layout" name="widget_chat_list_bot_ui_select_component_pill" id="0x7F0D0267" />
+    <public type="layout" name="widget_chat_overlay" id="0x7F0D0268" />
+    <public type="layout" name="widget_chat_status" id="0x7F0D0269" />
+    <public type="layout" name="widget_choose_plan" id="0x7F0D026A" />
+    <public type="layout" name="widget_choose_plan_adapter_divider_item" id="0x7F0D026B" />
+    <public type="layout" name="widget_choose_plan_adapter_header_item" id="0x7F0D026C" />
+    <public type="layout" name="widget_choose_plan_adapter_plan_item" id="0x7F0D026D" />
+    <public type="layout" name="widget_claim_outbound_promo" id="0x7F0D026E" />
+    <public type="layout" name="widget_client_outdated" id="0x7F0D026F" />
+    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7F0D0270" />
+    <public type="layout" name="widget_confirm_remove_community_dialog" id="0x7F0D0271" />
+    <public type="layout" name="widget_connections_add_xbox" id="0x7F0D0272" />
+    <public type="layout" name="widget_contact_sync" id="0x7F0D0273" />
+    <public type="layout" name="widget_create_channel" id="0x7F0D0274" />
+    <public type="layout" name="widget_create_channel_add_member" id="0x7F0D0275" />
+    <public type="layout" name="widget_create_guild_role_subscription_tier" id="0x7F0D0276" />
+    <public type="layout" name="widget_creation_intent" id="0x7F0D0277" />
+    <public type="layout" name="widget_debugging" id="0x7F0D0278" />
+    <public type="layout" name="widget_debugging_adapter_item" id="0x7F0D0279" />
+    <public type="layout" name="widget_directories_search" id="0x7F0D027A" />
+    <public type="layout" name="widget_directory_category" id="0x7F0D027B" />
+    <public type="layout" name="widget_directory_channel" id="0x7F0D027C" />
+    <public type="layout" name="widget_directory_channel_empty" id="0x7F0D027D" />
+    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7F0D027E" />
+    <public type="layout" name="widget_discord_hub_email_input" id="0x7F0D027F" />
+    <public type="layout" name="widget_discovery_other_speakers_count" id="0x7F0D0280" />
+    <public type="layout" name="widget_discovery_stage_card_speaker" id="0x7F0D0281" />
+    <public type="layout" name="widget_edit_profile_banner_sheet" id="0x7F0D0282" />
+    <public type="layout" name="widget_edit_role" id="0x7F0D0283" />
+    <public type="layout" name="widget_emoji_picker" id="0x7F0D0284" />
+    <public type="layout" name="widget_emoji_picker_sheet" id="0x7F0D0285" />
+    <public type="layout" name="widget_emoji_sheet" id="0x7F0D0286" />
+    <public type="layout" name="widget_enable_community_steps" id="0x7F0D0287" />
+    <public type="layout" name="widget_enable_mfa_steps" id="0x7F0D0288" />
+    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7F0D0289" />
+    <public type="layout" name="widget_enable_two_factor_password_dialog" id="0x7F0D028A" />
+    <public type="layout" name="widget_end_stage_bottom_sheet" id="0x7F0D028B" />
+    <public type="layout" name="widget_expression_tray" id="0x7F0D028C" />
+    <public type="layout" name="widget_fatal_crash" id="0x7F0D028D" />
+    <public type="layout" name="widget_feedback_sheet" id="0x7F0D028E" />
+    <public type="layout" name="widget_folder_context_menu" id="0x7F0D028F" />
+    <public type="layout" name="widget_friends_add" id="0x7F0D0290" />
+    <public type="layout" name="widget_friends_add_by_id" id="0x7F0D0291" />
+    <public type="layout" name="widget_friends_list" id="0x7F0D0292" />
+    <public type="layout" name="widget_friends_list_adapter_item_friend" id="0x7F0D0293" />
+    <public type="layout" name="widget_friends_list_adapter_item_header" id="0x7F0D0294" />
+    <public type="layout" name="widget_friends_list_adapter_item_loading" id="0x7F0D0295" />
+    <public type="layout" name="widget_friends_list_adapter_item_pending" id="0x7F0D0296" />
+    <public type="layout" name="widget_friends_list_adapter_suggested_friend" id="0x7F0D0297" />
+    <public type="layout" name="widget_friends_list_contact_sync_upsell" id="0x7F0D0298" />
+    <public type="layout" name="widget_friends_list_expandable_header" id="0x7F0D0299" />
+    <public type="layout" name="widget_friends_nearby" id="0x7F0D029A" />
+    <public type="layout" name="widget_gif_category" id="0x7F0D029B" />
+    <public type="layout" name="widget_gif_picker" id="0x7F0D029C" />
+    <public type="layout" name="widget_gif_picker_search" id="0x7F0D029D" />
+    <public type="layout" name="widget_gif_picker_sheet" id="0x7F0D029E" />
+    <public type="layout" name="widget_global_search" id="0x7F0D029F" />
+    <public type="layout" name="widget_global_search_dialog" id="0x7F0D02A0" />
+    <public type="layout" name="widget_global_search_item_divider" id="0x7F0D02A1" />
+    <public type="layout" name="widget_global_search_item_dm" id="0x7F0D02A2" />
+    <public type="layout" name="widget_global_search_item_guild" id="0x7F0D02A3" />
+    <public type="layout" name="widget_global_status_indicator" id="0x7F0D02A4" />
+    <public type="layout" name="widget_group_invite_friends" id="0x7F0D02A5" />
+    <public type="layout" name="widget_group_invite_friends_item" id="0x7F0D02A6" />
+    <public type="layout" name="widget_guild_call_onboarding" id="0x7F0D02A7" />
+    <public type="layout" name="widget_guild_clone" id="0x7F0D02A8" />
+    <public type="layout" name="widget_guild_context_menu" id="0x7F0D02A9" />
+    <public type="layout" name="widget_guild_create" id="0x7F0D02AA" />
+    <public type="layout" name="widget_guild_folder_settings" id="0x7F0D02AB" />
+    <public type="layout" name="widget_guild_hub_profile_actions" id="0x7F0D02AC" />
+    <public type="layout" name="widget_guild_invite_info_view" id="0x7F0D02AD" />
+    <public type="layout" name="widget_guild_invite_page" id="0x7F0D02AE" />
+    <public type="layout" name="widget_guild_invite_settings" id="0x7F0D02AF" />
+    <public type="layout" name="widget_guild_invite_share" id="0x7F0D02B0" />
+    <public type="layout" name="widget_guild_invite_share_compact" id="0x7F0D02B1" />
+    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7F0D02B2" />
+    <public type="layout" name="widget_guild_invite_share_item" id="0x7F0D02B3" />
+    <public type="layout" name="widget_guild_invite_share_sheet" id="0x7F0D02B4" />
+    <public type="layout" name="widget_guild_join" id="0x7F0D02B5" />
+    <public type="layout" name="widget_guild_join_invite_examples" id="0x7F0D02B6" />
+    <public type="layout" name="widget_guild_profile_actions" id="0x7F0D02B7" />
+    <public type="layout" name="widget_guild_profile_emoji_extra" id="0x7F0D02B8" />
+    <public type="layout" name="widget_guild_profile_emoji_item" id="0x7F0D02B9" />
+    <public type="layout" name="widget_guild_profile_sheet" id="0x7F0D02BA" />
+    <public type="layout" name="widget_guild_role_subscription_details" id="0x7F0D02BB" />
+    <public type="layout" name="widget_guild_role_subscription_entry_point" id="0x7F0D02BC" />
+    <public type="layout" name="widget_guild_role_subscription_plan_details" id="0x7F0D02BD" />
+    <public type="layout" name="widget_guild_role_subscription_plan_format" id="0x7F0D02BE" />
+    <public type="layout" name="widget_guild_role_subscription_tier_benefit" id="0x7F0D02BF" />
+    <public type="layout" name="widget_guild_role_subscription_tier_benefits" id="0x7F0D02C0" />
+    <public type="layout" name="widget_guild_role_subscription_tier_design" id="0x7F0D02C1" />
+    <public type="layout" name="widget_guild_role_subscription_tier_review" id="0x7F0D02C2" />
+    <public type="layout" name="widget_guild_scheduled_event_details_bottom_sheet" id="0x7F0D02C3" />
+    <public type="layout" name="widget_guild_scheduled_event_details_extras_bottom_sheet" id="0x7F0D02C4" />
+    <public type="layout" name="widget_guild_scheduled_event_list_bottom_sheet" id="0x7F0D02C5" />
+    <public type="layout" name="widget_guild_scheduled_event_location_select" id="0x7F0D02C6" />
+    <public type="layout" name="widget_guild_scheduled_event_settings" id="0x7F0D02C7" />
+    <public type="layout" name="widget_guild_scheduled_event_upsell_bottom_sheet" id="0x7F0D02C8" />
+    <public type="layout" name="widget_guild_selector" id="0x7F0D02C9" />
+    <public type="layout" name="widget_guild_selector_item" id="0x7F0D02CA" />
+    <public type="layout" name="widget_guild_sticker_sheet" id="0x7F0D02CB" />
+    <public type="layout" name="widget_guild_subscription_plan_setup" id="0x7F0D02CC" />
+    <public type="layout" name="widget_guild_transfer_ownership" id="0x7F0D02CD" />
+    <public type="layout" name="widget_guild_welcome_channel" id="0x7F0D02CE" />
+    <public type="layout" name="widget_guild_welcome_sheet" id="0x7F0D02CF" />
+    <public type="layout" name="widget_guilds_list" id="0x7F0D02D0" />
+    <public type="layout" name="widget_guilds_list_item_divider" id="0x7F0D02D1" />
+    <public type="layout" name="widget_guilds_list_item_dm" id="0x7F0D02D2" />
+    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7F0D02D3" />
+    <public type="layout" name="widget_guilds_list_item_folder" id="0x7F0D02D4" />
+    <public type="layout" name="widget_guilds_list_item_guild" id="0x7F0D02D5" />
+    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7F0D02D6" />
+    <public type="layout" name="widget_guilds_list_item_guild_nux" id="0x7F0D02D7" />
+    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7F0D02D8" />
+    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7F0D02D9" />
+    <public type="layout" name="widget_guilds_list_item_hub_verification" id="0x7F0D02DA" />
+    <public type="layout" name="widget_guilds_list_item_profile" id="0x7F0D02DB" />
+    <public type="layout" name="widget_home" id="0x7F0D02DC" />
+    <public type="layout" name="widget_home_panel_center" id="0x7F0D02DD" />
+    <public type="layout" name="widget_home_panel_center_channel_less" id="0x7F0D02DE" />
+    <public type="layout" name="widget_home_panel_center_chat" id="0x7F0D02DF" />
+    <public type="layout" name="widget_home_panel_center_content_unread" id="0x7F0D02E0" />
+    <public type="layout" name="widget_home_panel_center_nsfw" id="0x7F0D02E1" />
+    <public type="layout" name="widget_home_panel_left" id="0x7F0D02E2" />
+    <public type="layout" name="widget_home_panel_loading" id="0x7F0D02E3" />
+    <public type="layout" name="widget_home_panel_right" id="0x7F0D02E4" />
+    <public type="layout" name="widget_hub_add_name" id="0x7F0D02E5" />
+    <public type="layout" name="widget_hub_add_server" id="0x7F0D02E6" />
+    <public type="layout" name="widget_hub_authentication" id="0x7F0D02E7" />
+    <public type="layout" name="widget_hub_description" id="0x7F0D02E8" />
+    <public type="layout" name="widget_hub_domain_search" id="0x7F0D02E9" />
+    <public type="layout" name="widget_hub_domains" id="0x7F0D02EA" />
+    <public type="layout" name="widget_hub_email_flow" id="0x7F0D02EB" />
+    <public type="layout" name="widget_hub_email_flow_confirmation" id="0x7F0D02EC" />
+    <public type="layout" name="widget_hub_email_flow_waitlist" id="0x7F0D02ED" />
+    <public type="layout" name="widget_hub_waitlist" id="0x7F0D02EE" />
+    <public type="layout" name="widget_incoming_share" id="0x7F0D02EF" />
+    <public type="layout" name="widget_issue_details_form" id="0x7F0D02F0" />
+    <public type="layout" name="widget_kick_user" id="0x7F0D02F1" />
+    <public type="layout" name="widget_manage_reactions" id="0x7F0D02F2" />
+    <public type="layout" name="widget_manage_reactions_emoji" id="0x7F0D02F3" />
+    <public type="layout" name="widget_manage_reactions_result_error" id="0x7F0D02F4" />
+    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7F0D02F5" />
+    <public type="layout" name="widget_manage_reactions_result_user" id="0x7F0D02F6" />
+    <public type="layout" name="widget_masked_links_dialog" id="0x7F0D02F7" />
+    <public type="layout" name="widget_media" id="0x7F0D02F8" />
+    <public type="layout" name="widget_member_verification" id="0x7F0D02F9" />
+    <public type="layout" name="widget_member_verification_approve_terms_item" id="0x7F0D02FA" />
+    <public type="layout" name="widget_member_verification_header_item" id="0x7F0D02FB" />
+    <public type="layout" name="widget_member_verification_multiple_choice_item" id="0x7F0D02FC" />
+    <public type="layout" name="widget_member_verification_multiple_choice_radio_item" id="0x7F0D02FD" />
+    <public type="layout" name="widget_member_verification_paragraph_item" id="0x7F0D02FE" />
+    <public type="layout" name="widget_member_verification_pending_dialog" id="0x7F0D02FF" />
+    <public type="layout" name="widget_member_verification_rule_item" id="0x7F0D0300" />
+    <public type="layout" name="widget_member_verification_success" id="0x7F0D0301" />
+    <public type="layout" name="widget_member_verification_text_input_item" id="0x7F0D0302" />
+    <public type="layout" name="widget_mobile_reports" id="0x7F0D0303" />
+    <public type="layout" name="widget_moderator_start_stage" id="0x7F0D0304" />
+    <public type="layout" name="widget_music_rich_presence" id="0x7F0D0305" />
+    <public type="layout" name="widget_mute_settings_sheet" id="0x7F0D0306" />
+    <public type="layout" name="widget_navigation_help" id="0x7F0D0307" />
+    <public type="layout" name="widget_navigation_help_nux_channels" id="0x7F0D0308" />
+    <public type="layout" name="widget_navigation_help_nux_dms" id="0x7F0D0309" />
+    <public type="layout" name="widget_navigation_help_nux_guilds" id="0x7F0D030A" />
+    <public type="layout" name="widget_notice_dialog" id="0x7F0D030B" />
+    <public type="layout" name="widget_notice_nux_overlay" id="0x7F0D030C" />
+    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7F0D030D" />
+    <public type="layout" name="widget_notice_popup" id="0x7F0D030E" />
+    <public type="layout" name="widget_nux_channel_prompt" id="0x7F0D030F" />
+    <public type="layout" name="widget_nux_guild_template" id="0x7F0D0310" />
+    <public type="layout" name="widget_nux_post_registration" id="0x7F0D0311" />
+    <public type="layout" name="widget_oauth_authorize" id="0x7F0D0312" />
+    <public type="layout" name="widget_outbound_promo_terms" id="0x7F0D0313" />
+    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7F0D0314" />
+    <public type="layout" name="widget_phone_country_code_bottom_sheet" id="0x7F0D0315" />
+    <public type="layout" name="widget_phone_country_code_list_item" id="0x7F0D0316" />
+    <public type="layout" name="widget_platform_rich_presence" id="0x7F0D0317" />
+    <public type="layout" name="widget_premium_guild_transfer" id="0x7F0D0318" />
+    <public type="layout" name="widget_premium_upsell" id="0x7F0D0319" />
+    <public type="layout" name="widget_preview_guild_scheduled_event" id="0x7F0D031A" />
+    <public type="layout" name="widget_price_tier_picker_bottom_sheet" id="0x7F0D031B" />
+    <public type="layout" name="widget_prune_users" id="0x7F0D031C" />
+    <public type="layout" name="widget_qr_scanner" id="0x7F0D031D" />
+    <public type="layout" name="widget_quick_mentions_dialog" id="0x7F0D031E" />
+    <public type="layout" name="widget_radio_selector_bottom_sheet" id="0x7F0D031F" />
+    <public type="layout" name="widget_radio_selector_view_holder" id="0x7F0D0320" />
+    <public type="layout" name="widget_remote_auth" id="0x7F0D0321" />
+    <public type="layout" name="widget_remote_auth_not_found" id="0x7F0D0322" />
+    <public type="layout" name="widget_remote_auth_pending_login" id="0x7F0D0323" />
+    <public type="layout" name="widget_remote_auth_success" id="0x7F0D0324" />
+    <public type="layout" name="widget_screen_share_nfx_sheet" id="0x7F0D0325" />
+    <public type="layout" name="widget_search" id="0x7F0D0326" />
+    <public type="layout" name="widget_search_results" id="0x7F0D0327" />
+    <public type="layout" name="widget_search_suggestion_item_header" id="0x7F0D0328" />
+    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7F0D0329" />
+    <public type="layout" name="widget_search_suggestions" id="0x7F0D032A" />
+    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7F0D032B" />
+    <public type="layout" name="widget_search_suggestions_item_has" id="0x7F0D032C" />
+    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7F0D032D" />
+    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7F0D032E" />
+    <public type="layout" name="widget_search_suggestions_item_user" id="0x7F0D032F" />
+    <public type="layout" name="widget_select_component_bottom_sheet" id="0x7F0D0330" />
+    <public type="layout" name="widget_select_component_bottom_sheet_item" id="0x7F0D0331" />
+    <public type="layout" name="widget_server_boost_confirmation" id="0x7F0D0332" />
+    <public type="layout" name="widget_server_boost_status" id="0x7F0D0333" />
+    <public type="layout" name="widget_server_delete_dialog" id="0x7F0D0334" />
+    <public type="layout" name="widget_server_notification_override_selector" id="0x7F0D0335" />
+    <public type="layout" name="widget_server_notifications" id="0x7F0D0336" />
+    <public type="layout" name="widget_server_settings" id="0x7F0D0337" />
+    <public type="layout" name="widget_server_settings_audit_log" id="0x7F0D0338" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7F0D0339" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7F0D033A" />
+    <public type="layout" name="widget_server_settings_audit_log_list_item" id="0x7F0D033B" />
+    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7F0D033C" />
+    <public type="layout" name="widget_server_settings_audit_log_menu_filter" id="0x7F0D033D" />
+    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7F0D033E" />
+    <public type="layout" name="widget_server_settings_bans" id="0x7F0D033F" />
+    <public type="layout" name="widget_server_settings_channels" id="0x7F0D0340" />
+    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7F0D0341" />
+    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7F0D0342" />
+    <public type="layout" name="widget_server_settings_community_overview" id="0x7F0D0343" />
+    <public type="layout" name="widget_server_settings_community_setup_first_step" id="0x7F0D0344" />
+    <public type="layout" name="widget_server_settings_community_setup_second_step" id="0x7F0D0345" />
+    <public type="layout" name="widget_server_settings_community_setup_third_step" id="0x7F0D0346" />
+    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7F0D0347" />
+    <public type="layout" name="widget_server_settings_edit_integration" id="0x7F0D0348" />
+    <public type="layout" name="widget_server_settings_edit_member" id="0x7F0D0349" />
+    <public type="layout" name="widget_server_settings_emojis" id="0x7F0D034A" />
+    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7F0D034B" />
+    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7F0D034C" />
+    <public type="layout" name="widget_server_settings_emojis_header" id="0x7F0D034D" />
+    <public type="layout" name="widget_server_settings_emojis_item" id="0x7F0D034E" />
+    <public type="layout" name="widget_server_settings_emojis_section" id="0x7F0D034F" />
+    <public type="layout" name="widget_server_settings_empty_guild_role_subscription" id="0x7F0D0350" />
+    <public type="layout" name="widget_server_settings_enable_community" id="0x7F0D0351" />
+    <public type="layout" name="widget_server_settings_guild_role_subscription_edit_tier" id="0x7F0D0352" />
+    <public type="layout" name="widget_server_settings_guild_role_subscription_tier_list" id="0x7F0D0353" />
+    <public type="layout" name="widget_server_settings_guild_role_subscriptions" id="0x7F0D0354" />
+    <public type="layout" name="widget_server_settings_help_item" id="0x7F0D0355" />
+    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7F0D0356" />
+    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7F0D0357" />
+    <public type="layout" name="widget_server_settings_instant_invites" id="0x7F0D0358" />
+    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7F0D0359" />
+    <public type="layout" name="widget_server_settings_integrations" id="0x7F0D035A" />
+    <public type="layout" name="widget_server_settings_member_list_item" id="0x7F0D035B" />
+    <public type="layout" name="widget_server_settings_members" id="0x7F0D035C" />
+    <public type="layout" name="widget_server_settings_moderation" id="0x7F0D035D" />
+    <public type="layout" name="widget_server_settings_overview" id="0x7F0D035E" />
+    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7F0D035F" />
+    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7F0D0360" />
+    <public type="layout" name="widget_server_settings_role_item" id="0x7F0D0361" />
+    <public type="layout" name="widget_server_settings_role_members" id="0x7F0D0362" />
+    <public type="layout" name="widget_server_settings_roles" id="0x7F0D0363" />
+    <public type="layout" name="widget_server_settings_security" id="0x7F0D0364" />
+    <public type="layout" name="widget_server_settings_security_dialog" id="0x7F0D0365" />
+    <public type="layout" name="widget_server_settings_vanity_url" id="0x7F0D0366" />
+    <public type="layout" name="widget_settings" id="0x7F0D0367" />
+    <public type="layout" name="widget_settings_accessibility" id="0x7F0D0368" />
+    <public type="layout" name="widget_settings_account" id="0x7F0D0369" />
+    <public type="layout" name="widget_settings_account_backup_codes" id="0x7F0D036A" />
+    <public type="layout" name="widget_settings_account_change_password" id="0x7F0D036B" />
+    <public type="layout" name="widget_settings_account_contacts_name_edit" id="0x7F0D036C" />
+    <public type="layout" name="widget_settings_account_edit" id="0x7F0D036D" />
+    <public type="layout" name="widget_settings_account_email_edit" id="0x7F0D036E" />
+    <public type="layout" name="widget_settings_activity_status" id="0x7F0D036F" />
+    <public type="layout" name="widget_settings_appearance" id="0x7F0D0370" />
+    <public type="layout" name="widget_settings_authorized_apps" id="0x7F0D0371" />
+    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7F0D0372" />
+    <public type="layout" name="widget_settings_behavior" id="0x7F0D0373" />
+    <public type="layout" name="widget_settings_blocked_users" id="0x7F0D0374" />
+    <public type="layout" name="widget_settings_boost" id="0x7F0D0375" />
+    <public type="layout" name="widget_settings_connections" id="0x7F0D0376" />
+    <public type="layout" name="widget_settings_connections_add" id="0x7F0D0377" />
+    <public type="layout" name="widget_settings_developer" id="0x7F0D0378" />
+    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7F0D0379" />
+    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7F0D037A" />
+    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7F0D037B" />
+    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7F0D037C" />
+    <public type="layout" name="widget_settings_gifting" id="0x7F0D037D" />
+    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7F0D037E" />
+    <public type="layout" name="widget_settings_item_backup_code" id="0x7F0D037F" />
+    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7F0D0380" />
+    <public type="layout" name="widget_settings_item_blocked_user" id="0x7F0D0381" />
+    <public type="layout" name="widget_settings_item_connected_account" id="0x7F0D0382" />
+    <public type="layout" name="widget_settings_language" id="0x7F0D0383" />
+    <public type="layout" name="widget_settings_language_select" id="0x7F0D0384" />
+    <public type="layout" name="widget_settings_language_select_item" id="0x7F0D0385" />
+    <public type="layout" name="widget_settings_media" id="0x7F0D0386" />
+    <public type="layout" name="widget_settings_notification_os" id="0x7F0D0387" />
+    <public type="layout" name="widget_settings_notifications" id="0x7F0D0388" />
+    <public type="layout" name="widget_settings_premium" id="0x7F0D0389" />
+    <public type="layout" name="widget_settings_privacy" id="0x7F0D038A" />
+    <public type="layout" name="widget_settings_privacy_defaults" id="0x7F0D038B" />
+    <public type="layout" name="widget_settings_user_profile" id="0x7F0D038C" />
+    <public type="layout" name="widget_settings_voice" id="0x7F0D038D" />
+    <public type="layout" name="widget_settings_voice_input_mode" id="0x7F0D038E" />
+    <public type="layout" name="widget_stage_audience_blocked_bottom_sheet" id="0x7F0D038F" />
+    <public type="layout" name="widget_stage_audience_notice_bottom_sheet" id="0x7F0D0390" />
+    <public type="layout" name="widget_stage_channel_audience" id="0x7F0D0391" />
+    <public type="layout" name="widget_stage_channel_audience_role" id="0x7F0D0392" />
+    <public type="layout" name="widget_stage_channel_details" id="0x7F0D0393" />
+    <public type="layout" name="widget_stage_channel_divider" id="0x7F0D0394" />
+    <public type="layout" name="widget_stage_channel_moderator_permissions" id="0x7F0D0395" />
+    <public type="layout" name="widget_stage_channel_prestart_details" id="0x7F0D0396" />
+    <public type="layout" name="widget_stage_channel_rich_presence" id="0x7F0D0397" />
+    <public type="layout" name="widget_stage_channel_speaker" id="0x7F0D0398" />
+    <public type="layout" name="widget_stage_moderator_join_bottom_sheet" id="0x7F0D0399" />
+    <public type="layout" name="widget_stage_raised_hands_bottom_sheet" id="0x7F0D039A" />
+    <public type="layout" name="widget_stage_start_event_bottom_sheet" id="0x7F0D039B" />
+    <public type="layout" name="widget_start_call_sheet" id="0x7F0D039C" />
+    <public type="layout" name="widget_sticker_pack_store_sheet" id="0x7F0D039D" />
+    <public type="layout" name="widget_sticker_picker" id="0x7F0D039E" />
+    <public type="layout" name="widget_sticker_picker_sheet" id="0x7F0D039F" />
+    <public type="layout" name="widget_sticker_sheet" id="0x7F0D03A0" />
+    <public type="layout" name="widget_stream_rich_presence" id="0x7F0D03A1" />
+    <public type="layout" name="widget_tabs_host" id="0x7F0D03A2" />
+    <public type="layout" name="widget_text_channel_settings" id="0x7F0D03A3" />
+    <public type="layout" name="widget_thread_archive_actions_sheet" id="0x7F0D03A4" />
+    <public type="layout" name="widget_thread_browser" id="0x7F0D03A5" />
+    <public type="layout" name="widget_thread_browser_active" id="0x7F0D03A6" />
+    <public type="layout" name="widget_thread_browser_archived" id="0x7F0D03A7" />
+    <public type="layout" name="widget_thread_browser_filter_sheet" id="0x7F0D03A8" />
+    <public type="layout" name="widget_thread_settings" id="0x7F0D03A9" />
+    <public type="layout" name="widget_thread_status" id="0x7F0D03AA" />
+    <public type="layout" name="widget_tos_accept" id="0x7F0D03AB" />
+    <public type="layout" name="widget_tos_report_violation" id="0x7F0D03AC" />
+    <public type="layout" name="widget_tos_report_violation_reason" id="0x7F0D03AD" />
+    <public type="layout" name="widget_unknown_sticker_sheet" id="0x7F0D03AE" />
+    <public type="layout" name="widget_urgent_message_dialog" id="0x7F0D03AF" />
+    <public type="layout" name="widget_url_actions" id="0x7F0D03B0" />
+    <public type="layout" name="widget_usage_settings_dialog" id="0x7F0D03B1" />
+    <public type="layout" name="widget_user_account_verify" id="0x7F0D03B2" />
+    <public type="layout" name="widget_user_email_update" id="0x7F0D03B3" />
+    <public type="layout" name="widget_user_email_verify" id="0x7F0D03B4" />
+    <public type="layout" name="widget_user_mentions" id="0x7F0D03B5" />
+    <public type="layout" name="widget_user_mentions_filter" id="0x7F0D03B6" />
+    <public type="layout" name="widget_user_mutual_friends" id="0x7F0D03B7" />
+    <public type="layout" name="widget_user_mutual_guilds" id="0x7F0D03B8" />
+    <public type="layout" name="widget_user_password_verify" id="0x7F0D03B9" />
+    <public type="layout" name="widget_user_phone_manage" id="0x7F0D03BA" />
+    <public type="layout" name="widget_user_phone_verify" id="0x7F0D03BB" />
+    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7F0D03BC" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7F0D03BD" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7F0D03BE" />
+    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7F0D03BF" />
+    <public type="layout" name="widget_user_rich_presence" id="0x7F0D03C0" />
+    <public type="layout" name="widget_user_set_custom_status" id="0x7F0D03C1" />
+    <public type="layout" name="widget_user_sheet" id="0x7F0D03C2" />
+    <public type="layout" name="widget_user_status_update" id="0x7F0D03C3" />
+    <public type="layout" name="widget_voice_bottom_sheet" id="0x7F0D03C4" />
+    <public type="layout" name="widget_voice_call_incoming" id="0x7F0D03C5" />
+    <public type="layout" name="widget_voice_call_inline" id="0x7F0D03C6" />
+    <public type="layout" name="widget_voice_channel_settings" id="0x7F0D03C7" />
+    <public type="layout" name="widget_voice_noise_cancellation_bottom_sheet" id="0x7F0D03C8" />
+    <public type="layout" name="widget_voice_settings_bottom_sheet" id="0x7F0D03C9" />
     <public type="menu" name="menu_add_member_continue" id="0x7F0E0000" />
     <public type="menu" name="menu_audit_log_sort" id="0x7F0E0001" />
     <public type="menu" name="menu_auth_mfa" id="0x7F0E0002" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d91aedda09..68eb4100b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1439,7 +1439,7 @@
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887519_com_crashlytics_android_build_id">2d32f50d9d574f9c8db744014099b0e9</string>
+    <string name="res_2131887519_com_crashlytics_android_build_id">5c3c1270ffe4420595a2589ed52467d7</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>