83.12 - Beta (83112)
This commit is contained in:
parent
d6a3f93327
commit
c8d14056fe
19 changed files with 166 additions and 91 deletions
|
|
@ -10,8 +10,8 @@ android {
|
|||
applicationId 'com.discord'
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 83111
|
||||
versionName "83.11 - Beta"
|
||||
versionCode 83112
|
||||
versionName "83.12 - Beta"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="83111" android:versionName="83.11 - Beta" 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="83112" android:versionName="83.12 - Beta" 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"/>
|
||||
|
|
|
|||
|
|
@ -23,13 +23,16 @@ public final class q4 implements ViewBinding {
|
|||
public final TextInputLayout d;
|
||||
@NonNull
|
||||
public final TextView e;
|
||||
@NonNull
|
||||
public final TextView f;
|
||||
|
||||
public q4(@NonNull NestedScrollView nestedScrollView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2) {
|
||||
public q4(@NonNull NestedScrollView nestedScrollView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
|
||||
this.a = nestedScrollView;
|
||||
this.b = linkifiedTextView;
|
||||
this.f149c = textInputEditText;
|
||||
this.d = textInputLayout;
|
||||
this.e = textView2;
|
||||
this.e = textView;
|
||||
this.f = textView2;
|
||||
}
|
||||
|
||||
@Override // androidx.viewbinding.ViewBinding
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ public class App extends Application {
|
|||
loggingProvider.init(appLog);
|
||||
c.i.c.c.e(this);
|
||||
String str = null;
|
||||
if (BuildUtils.INSTANCE.isValidBuildVersionName("83.11 - Beta")) {
|
||||
if (BuildUtils.INSTANCE.isValidBuildVersionName("83.12 - Beta")) {
|
||||
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
|
||||
} else {
|
||||
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ 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.l0(Boolean.FALSE));
|
||||
private final int clientVersion = 83111;
|
||||
private final int clientVersion = 83112;
|
||||
|
||||
public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
|
||||
storeClientVersion.setClientMinVersion(i);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.discord.api.directory.DirectoryEntry;
|
|||
import com.discord.stores.updates.ObservationDeck;
|
||||
import com.discord.stores.utilities.RestCallState;
|
||||
import com.discord.stores.utilities.RestCallStateKt;
|
||||
import com.discord.utilities.persister.Persister;
|
||||
import com.discord.utilities.rest.RestAPI;
|
||||
import d0.t.h0;
|
||||
import d0.z.d.m;
|
||||
|
|
@ -12,14 +13,28 @@ import java.util.LinkedHashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import kotlin.jvm.internal.DefaultConstructorMarker;
|
||||
import rx.Observable;
|
||||
/* compiled from: StoreDirectories.kt */
|
||||
public final class StoreDirectories extends StoreV2 {
|
||||
public static final Companion Companion = new Companion(null);
|
||||
private static final String DISCORD_HUB_VERIFICATION_CLICKED_KEY = "hub_verification_clicked_key";
|
||||
private Map<Long, RestCallState<List<DirectoryEntry>>> directoriesMap;
|
||||
private Map<Long, ? extends RestCallState<? extends List<DirectoryEntry>>> directoriesMapSnapshot;
|
||||
private final Persister<Boolean> discordHubClickedPersister;
|
||||
private final Dispatcher dispatcher;
|
||||
private final ObservationDeck observationDeck;
|
||||
private final RestAPI restApi;
|
||||
|
||||
/* compiled from: StoreDirectories.kt */
|
||||
public static final class Companion {
|
||||
private Companion() {
|
||||
}
|
||||
|
||||
public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
|
||||
this();
|
||||
}
|
||||
}
|
||||
|
||||
public StoreDirectories(Dispatcher dispatcher, ObservationDeck observationDeck, RestAPI restAPI) {
|
||||
m.checkNotNullParameter(dispatcher, "dispatcher");
|
||||
m.checkNotNullParameter(observationDeck, "observationDeck");
|
||||
|
|
@ -29,6 +44,7 @@ public final class StoreDirectories extends StoreV2 {
|
|||
this.restApi = restAPI;
|
||||
this.directoriesMapSnapshot = h0.emptyMap();
|
||||
this.directoriesMap = new LinkedHashMap();
|
||||
this.discordHubClickedPersister = new Persister<>("hub_verification_clicked_key", Boolean.FALSE);
|
||||
}
|
||||
|
||||
/* JADX INFO: this call moved to the top of the method (can break code semantics) */
|
||||
|
|
@ -64,10 +80,20 @@ public final class StoreDirectories extends StoreV2 {
|
|||
return (RestCallState) this.directoriesMapSnapshot.get(Long.valueOf(j));
|
||||
}
|
||||
|
||||
public final void markDiscordHubClicked() {
|
||||
Persister.set$default(this.discordHubClickedPersister, Boolean.TRUE, false, 2, null);
|
||||
}
|
||||
|
||||
public final ObservationDeck.Observer observeDirectoriesForChannel(long j) {
|
||||
return ObservationDeck.connect$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, new StoreDirectories$observeDirectoriesForChannel$1(this, j), 6, null);
|
||||
}
|
||||
|
||||
public final Observable<Boolean> observeDiscordHubClicked() {
|
||||
Observable<Boolean> r = this.discordHubClickedPersister.getObservable().r();
|
||||
m.checkNotNullExpressionValue(r, "discordHubClickedPersist… .distinctUntilChanged()");
|
||||
return r;
|
||||
}
|
||||
|
||||
@Override // com.discord.stores.StoreV2
|
||||
public void snapshotData() {
|
||||
this.directoriesMapSnapshot = new HashMap(this.directoriesMap);
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public final class AnalyticSuperProperties {
|
|||
private final void setBaselineProperties() {
|
||||
String locale = Locale.getDefault().toString();
|
||||
m.checkNotNullExpressionValue(locale, "Locale.getDefault().toString()");
|
||||
updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/83111"), o.to("client_build_number", 83111), o.to("client_version", "83.11 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
|
||||
updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/83112"), o.to("client_build_number", 83112), o.to("client_version", "83.12 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
|
||||
}
|
||||
|
||||
private final void setSuperProperties(Map<String, ? extends Object> map) {
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ public final class RestAPI implements RestAPIInterface {
|
|||
|
||||
@Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider
|
||||
public String getUserAgent() {
|
||||
return "Discord-Android/83111";
|
||||
return "Discord-Android/83112";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public final class WidgetFatalCrash extends AppFragment {
|
|||
textView2.setText(b.j(this, 2131887893, objArr2, null, 4));
|
||||
TextView textView3 = getBinding().b;
|
||||
m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion");
|
||||
textView3.setText(b.j(this, 2131887886, new Object[]{"83.11 - Beta"}, null, 4));
|
||||
textView3.setText(b.j(this, 2131887886, new Object[]{"83.12 - Beta"}, null, 4));
|
||||
TextView textView4 = getBinding().d;
|
||||
m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
|
||||
textView4.setText(b.j(this, 2131887889, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
|
||||
|
|
|
|||
|
|
@ -13,30 +13,30 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import kotlin.jvm.functions.Function0;
|
||||
import rx.Observable;
|
||||
import rx.functions.Func5;
|
||||
import rx.functions.Func6;
|
||||
/* compiled from: WidgetGuildsListViewModel.kt */
|
||||
public final class WidgetGuildsListViewModel$Companion$observeStores$2 extends o implements Function0<Observable<WidgetGuildsListViewModel.Companion.SecondChunk>> {
|
||||
public static final WidgetGuildsListViewModel$Companion$observeStores$2 INSTANCE = new WidgetGuildsListViewModel$Companion$observeStores$2();
|
||||
|
||||
/* compiled from: WidgetGuildsListViewModel.kt */
|
||||
/* renamed from: com.discord.widgets.guilds.list.WidgetGuildsListViewModel$Companion$observeStores$2$1 reason: invalid class name */
|
||||
public static final class AnonymousClass1<T1, T2, T3, T4, T5, R> implements Func5<Map<Long, ? extends GuildJoinRequest>, Map<Long, ? extends Guild>, Set<? extends Long>, Set<? extends Long>, Map<Long, ? extends Channel>, WidgetGuildsListViewModel.Companion.SecondChunk> {
|
||||
public static final class AnonymousClass1<T1, T2, T3, T4, T5, T6, R> implements Func6<Map<Long, ? extends GuildJoinRequest>, Map<Long, ? extends Guild>, Set<? extends Long>, Set<? extends Long>, Map<Long, ? extends Channel>, Boolean, WidgetGuildsListViewModel.Companion.SecondChunk> {
|
||||
public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
|
||||
|
||||
public final WidgetGuildsListViewModel.Companion.SecondChunk call(Map<Long, GuildJoinRequest> map, Map<Long, Guild> map2, Set<Long> set, Set<Long> set2, Map<Long, Channel> map3) {
|
||||
public final WidgetGuildsListViewModel.Companion.SecondChunk call(Map<Long, GuildJoinRequest> map, Map<Long, Guild> map2, Set<Long> set, Set<Long> set2, Map<Long, Channel> map3, Boolean bool) {
|
||||
m.checkNotNullExpressionValue(map, "guildJoinRequests");
|
||||
ArrayList arrayList = new ArrayList(map2.values());
|
||||
m.checkNotNullExpressionValue(set, "guildIds");
|
||||
m.checkNotNullExpressionValue(set2, "guildIdsWithActiveStageEvents");
|
||||
m.checkNotNullExpressionValue(map3, "channels");
|
||||
return new WidgetGuildsListViewModel.Companion.SecondChunk(map, arrayList, set, set2, map3);
|
||||
return new WidgetGuildsListViewModel.Companion.SecondChunk(map, arrayList, set, set2, map3, !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] */
|
||||
@Override // rx.functions.Func5
|
||||
public /* bridge */ /* synthetic */ WidgetGuildsListViewModel.Companion.SecondChunk call(Map<Long, ? extends GuildJoinRequest> map, Map<Long, ? extends Guild> map2, Set<? extends Long> set, Set<? extends Long> set2, Map<Long, ? extends Channel> map3) {
|
||||
return call((Map<Long, GuildJoinRequest>) map, (Map<Long, Guild>) map2, (Set<Long>) set, (Set<Long>) set2, (Map<Long, Channel>) map3);
|
||||
/* 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] */
|
||||
@Override // rx.functions.Func6
|
||||
public /* bridge */ /* synthetic */ WidgetGuildsListViewModel.Companion.SecondChunk call(Map<Long, ? extends GuildJoinRequest> map, Map<Long, ? extends Guild> map2, Set<? extends Long> set, Set<? extends Long> set2, Map<Long, ? extends Channel> map3, Boolean bool) {
|
||||
return call((Map<Long, GuildJoinRequest>) map, (Map<Long, Guild>) map2, (Set<Long>) set, (Set<Long>) set2, (Map<Long, Channel>) map3, bool);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -48,8 +48,8 @@ public final class WidgetGuildsListViewModel$Companion$observeStores$2 extends o
|
|||
/* renamed from: invoke */
|
||||
public final Observable<WidgetGuildsListViewModel.Companion.SecondChunk> mo1invoke() {
|
||||
StoreStream.Companion companion = StoreStream.Companion;
|
||||
Observable<WidgetGuildsListViewModel.Companion.SecondChunk> g = Observable.g(companion.getGuildJoinRequests().observeGuildJoinRequests(), companion.getGuildJoinRequests().observePendingGuilds(), companion.getGuilds().observeGuildIds(), GuildIdsWithVisibleStageInstanceModel.observe$default(GuildIdsWithVisibleStageInstanceModel.INSTANCE, null, null, null, 7, null), companion.getChannels().observeGuildAndPrivateChannels(), AnonymousClass1.INSTANCE);
|
||||
m.checkNotNullExpressionValue(g, "Observable.combineLatest…ls,\n )\n }");
|
||||
return g;
|
||||
Observable<WidgetGuildsListViewModel.Companion.SecondChunk> f = Observable.f(companion.getGuildJoinRequests().observeGuildJoinRequests(), companion.getGuildJoinRequests().observePendingGuilds(), companion.getGuilds().observeGuildIds(), GuildIdsWithVisibleStageInstanceModel.observe$default(GuildIdsWithVisibleStageInstanceModel.INSTANCE, null, null, null, 7, null), companion.getChannels().observeGuildAndPrivateChannels(), companion.getDirectories().observeDiscordHubClicked(), AnonymousClass1.INSTANCE);
|
||||
m.checkNotNullExpressionValue(f, "Observable.combineLatest…ked\n )\n }");
|
||||
return f;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public final class WidgetGuildsListViewModel$Companion$observeStores$6<T1, T2, T
|
|||
m.checkNotNullExpressionValue(bool2, "isLeftPanelOpened");
|
||||
boolean booleanValue2 = bool2.booleanValue();
|
||||
m.checkNotNullExpressionValue(bool3, "isOnHomeTab");
|
||||
return new WidgetGuildsListViewModel.StoreState(selectedGuildId, selectedVoiceChannelId, guildSettings, unreadGuildIds, mentionCounts, channelIds, unavailableGuilds, privateChannels, sortedGuilds, guildJoinRequests, pendingGuilds, guildIds, set, guildIdsWithActiveStageEvents, channels, set2, booleanValue, map, map2, booleanValue2, bool3.booleanValue());
|
||||
return new WidgetGuildsListViewModel.StoreState(selectedGuildId, selectedVoiceChannelId, guildSettings, unreadGuildIds, mentionCounts, channelIds, unavailableGuilds, privateChannels, sortedGuilds, guildJoinRequests, pendingGuilds, guildIds, set, guildIdsWithActiveStageEvents, channels, set2, booleanValue, map, map2, booleanValue2, bool3.booleanValue(), secondChunk.getShowHubSparkle());
|
||||
}
|
||||
|
||||
/* Return type fixed from 'java.lang.Object' to match base method */
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import androidx.fragment.app.FragmentManager;
|
|||
import c.d.b.a.a;
|
||||
import com.airbnb.lottie.parser.AnimatableValueParser;
|
||||
import com.discord.api.channel.Channel;
|
||||
import com.discord.api.guild.GuildFeature;
|
||||
import com.discord.api.guildjoinrequest.ApplicationStatus;
|
||||
import com.discord.api.guildjoinrequest.GuildJoinRequest;
|
||||
import com.discord.app.AppViewModel;
|
||||
|
|
@ -21,7 +20,6 @@ import com.discord.utilities.channel.ChannelSelector;
|
|||
import com.discord.utilities.features.GrowthTeamFeatures;
|
||||
import com.discord.utilities.guilds.MemberVerificationUtils;
|
||||
import com.discord.utilities.permissions.PermissionUtils;
|
||||
import com.discord.utilities.persister.Persister;
|
||||
import com.discord.utilities.rest.RestAPI;
|
||||
import com.discord.utilities.rx.ObservableExtensionsKt;
|
||||
import com.discord.utilities.streams.StreamContext;
|
||||
|
|
@ -56,10 +54,8 @@ import rx.subjects.PublishSubject;
|
|||
/* compiled from: WidgetGuildsListViewModel.kt */
|
||||
public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
||||
public static final Companion Companion = new Companion(null);
|
||||
private static final String DISCORD_HUB_VERIFICATION_CLICKED_KEY = "hub_verification_clicked_key";
|
||||
private final Clock clock;
|
||||
private WidgetGuildListAdapter.Operation.TargetOperation currentTargetOperation;
|
||||
private final Persister<Boolean> discordHubClickedPersister;
|
||||
private final PublishSubject<Event> eventSubject;
|
||||
private boolean wasLeftPanelOpened;
|
||||
private boolean wasOnHomeTab;
|
||||
|
|
@ -277,8 +273,9 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
private final Set<Long> guildIdsWithActiveStageEvents;
|
||||
private final Map<Long, GuildJoinRequest> guildJoinRequests;
|
||||
private final List<Guild> pendingGuilds;
|
||||
private final boolean showHubSparkle;
|
||||
|
||||
public SecondChunk(Map<Long, GuildJoinRequest> map, List<Guild> list, Set<Long> set, Set<Long> set2, Map<Long, Channel> map2) {
|
||||
public SecondChunk(Map<Long, GuildJoinRequest> map, List<Guild> list, Set<Long> set, Set<Long> set2, Map<Long, Channel> map2, boolean z2) {
|
||||
m.checkNotNullParameter(map, "guildJoinRequests");
|
||||
m.checkNotNullParameter(list, "pendingGuilds");
|
||||
m.checkNotNullParameter(set, "guildIds");
|
||||
|
|
@ -289,11 +286,12 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
this.guildIds = set;
|
||||
this.guildIdsWithActiveStageEvents = set2;
|
||||
this.channels = map2;
|
||||
this.showHubSparkle = z2;
|
||||
}
|
||||
|
||||
/* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.guilds.list.WidgetGuildsListViewModel$Companion$SecondChunk */
|
||||
/* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.guilds.list.WidgetGuildsListViewModel$Companion$SecondChunk */
|
||||
/* JADX WARN: Multi-variable type inference failed */
|
||||
public static /* synthetic */ SecondChunk copy$default(SecondChunk secondChunk, Map map, List list, Set set, Set set2, Map map2, int i, Object obj) {
|
||||
public static /* synthetic */ SecondChunk copy$default(SecondChunk secondChunk, Map map, List list, Set set, Set set2, Map map2, boolean z2, int i, Object obj) {
|
||||
if ((i & 1) != 0) {
|
||||
map = secondChunk.guildJoinRequests;
|
||||
}
|
||||
|
|
@ -309,7 +307,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
if ((i & 16) != 0) {
|
||||
map2 = secondChunk.channels;
|
||||
}
|
||||
return secondChunk.copy(map, list, set, set2, map2);
|
||||
if ((i & 32) != 0) {
|
||||
z2 = secondChunk.showHubSparkle;
|
||||
}
|
||||
return secondChunk.copy(map, list, set, set2, map2, z2);
|
||||
}
|
||||
|
||||
public final Map<Long, GuildJoinRequest> component1() {
|
||||
|
|
@ -332,13 +333,17 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return this.channels;
|
||||
}
|
||||
|
||||
public final SecondChunk copy(Map<Long, GuildJoinRequest> map, List<Guild> list, Set<Long> set, Set<Long> set2, Map<Long, Channel> map2) {
|
||||
public final boolean component6() {
|
||||
return this.showHubSparkle;
|
||||
}
|
||||
|
||||
public final SecondChunk copy(Map<Long, GuildJoinRequest> map, List<Guild> list, Set<Long> set, Set<Long> set2, Map<Long, Channel> map2, boolean z2) {
|
||||
m.checkNotNullParameter(map, "guildJoinRequests");
|
||||
m.checkNotNullParameter(list, "pendingGuilds");
|
||||
m.checkNotNullParameter(set, "guildIds");
|
||||
m.checkNotNullParameter(set2, "guildIdsWithActiveStageEvents");
|
||||
m.checkNotNullParameter(map2, "channels");
|
||||
return new SecondChunk(map, list, set, set2, map2);
|
||||
return new SecondChunk(map, list, set, set2, map2, z2);
|
||||
}
|
||||
|
||||
public boolean equals(Object obj) {
|
||||
|
|
@ -349,7 +354,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return false;
|
||||
}
|
||||
SecondChunk secondChunk = (SecondChunk) obj;
|
||||
return m.areEqual(this.guildJoinRequests, secondChunk.guildJoinRequests) && m.areEqual(this.pendingGuilds, secondChunk.pendingGuilds) && m.areEqual(this.guildIds, secondChunk.guildIds) && m.areEqual(this.guildIdsWithActiveStageEvents, secondChunk.guildIdsWithActiveStageEvents) && m.areEqual(this.channels, secondChunk.channels);
|
||||
return m.areEqual(this.guildJoinRequests, secondChunk.guildJoinRequests) && m.areEqual(this.pendingGuilds, secondChunk.pendingGuilds) && m.areEqual(this.guildIds, secondChunk.guildIds) && m.areEqual(this.guildIdsWithActiveStageEvents, secondChunk.guildIdsWithActiveStageEvents) && m.areEqual(this.channels, secondChunk.channels) && this.showHubSparkle == secondChunk.showHubSparkle;
|
||||
}
|
||||
|
||||
public final Map<Long, Channel> getChannels() {
|
||||
|
|
@ -372,6 +377,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return this.pendingGuilds;
|
||||
}
|
||||
|
||||
public final boolean getShowHubSparkle() {
|
||||
return this.showHubSparkle;
|
||||
}
|
||||
|
||||
public int hashCode() {
|
||||
Map<Long, GuildJoinRequest> map = this.guildJoinRequests;
|
||||
int i = 0;
|
||||
|
|
@ -386,7 +395,15 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
if (map2 != null) {
|
||||
i = map2.hashCode();
|
||||
}
|
||||
return hashCode4 + i;
|
||||
int i2 = (hashCode4 + i) * 31;
|
||||
boolean z2 = this.showHubSparkle;
|
||||
if (z2) {
|
||||
z2 = true;
|
||||
}
|
||||
int i3 = z2 ? 1 : 0;
|
||||
int i4 = z2 ? 1 : 0;
|
||||
int i5 = z2 ? 1 : 0;
|
||||
return i2 + i3;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
|
|
@ -399,7 +416,9 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
L.append(", guildIdsWithActiveStageEvents=");
|
||||
L.append(this.guildIdsWithActiveStageEvents);
|
||||
L.append(", channels=");
|
||||
return a.F(L, this.channels, ")");
|
||||
L.append(this.channels);
|
||||
L.append(", showHubSparkle=");
|
||||
return a.G(L, this.showHubSparkle, ")");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -421,7 +440,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
Observable<SecondChunk> invoke2 = widgetGuildsListViewModel$Companion$observeStores$2.mo1invoke();
|
||||
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).r().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…omeTab,\n )\n }");
|
||||
m.checkNotNullExpressionValue(c2, "Observable.combineLatest…Sparkle\n )\n }");
|
||||
return ObservableExtensionsKt.leadingEdgeThrottle(c2, 100, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
|
@ -635,6 +654,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
private final Map<Long, Channel> privateChannels;
|
||||
private final long selectedGuildId;
|
||||
private final long selectedVoiceChannelId;
|
||||
private final boolean showHubSparkle;
|
||||
private final List<StoreGuildsSorted.Entry> sortedGuilds;
|
||||
private final Set<Long> unavailableGuilds;
|
||||
private final Set<Long> unreadGuildIds;
|
||||
|
|
@ -643,7 +663,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
/* JADX DEBUG: Multi-variable search result rejected for r24v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.List<java.lang.Long>> */
|
||||
/* JADX DEBUG: Multi-variable search result rejected for r27v0, resolved type: java.util.List<? extends com.discord.stores.StoreGuildsSorted$Entry> */
|
||||
/* JADX WARN: Multi-variable type inference failed */
|
||||
public StoreState(long j, long j2, Map<Long, ? extends ModelNotificationSettings> map, Set<Long> set, Map<Long, Integer> map2, Map<Long, ? extends List<Long>> map3, Set<Long> set2, Map<Long, Channel> map4, List<? extends StoreGuildsSorted.Entry> list, Map<Long, GuildJoinRequest> map5, List<Guild> list2, Set<Long> set3, Set<Long> set4, Set<Long> set5, Map<Long, Channel> map6, Set<Long> set6, boolean z2, Map<Long, StreamContext> map7, Map<Long, Long> map8, boolean z3, boolean z4) {
|
||||
public StoreState(long j, long j2, Map<Long, ? extends ModelNotificationSettings> map, Set<Long> set, Map<Long, Integer> map2, Map<Long, ? extends List<Long>> map3, Set<Long> set2, Map<Long, Channel> map4, List<? extends StoreGuildsSorted.Entry> list, Map<Long, GuildJoinRequest> map5, List<Guild> list2, Set<Long> set3, Set<Long> set4, Set<Long> set5, Map<Long, Channel> map6, Set<Long> set6, boolean z2, Map<Long, StreamContext> map7, Map<Long, Long> map8, boolean z3, boolean z4, boolean z5) {
|
||||
m.checkNotNullParameter(map, "guildSettings");
|
||||
m.checkNotNullParameter(set, "unreadGuildIds");
|
||||
m.checkNotNullParameter(map2, "mentionCounts");
|
||||
|
|
@ -681,10 +701,11 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
this.allChannelPermissions = map8;
|
||||
this.isLeftPanelOpened = z3;
|
||||
this.isOnHomeTab = z4;
|
||||
this.showHubSparkle = z5;
|
||||
}
|
||||
|
||||
public static /* synthetic */ StoreState copy$default(StoreState storeState, long j, long j2, Map map, Set set, Map map2, Map map3, Set set2, Map map4, List list, Map map5, List list2, Set set3, Set set4, Set set5, Map map6, Set set6, boolean z2, Map map7, Map map8, boolean z3, boolean z4, int i, Object obj) {
|
||||
return storeState.copy((i & 1) != 0 ? storeState.selectedGuildId : j, (i & 2) != 0 ? storeState.selectedVoiceChannelId : j2, (i & 4) != 0 ? storeState.guildSettings : map, (i & 8) != 0 ? storeState.unreadGuildIds : set, (i & 16) != 0 ? storeState.mentionCounts : map2, (i & 32) != 0 ? storeState.channelIds : map3, (i & 64) != 0 ? storeState.unavailableGuilds : set2, (i & 128) != 0 ? storeState.privateChannels : map4, (i & 256) != 0 ? storeState.sortedGuilds : list, (i & 512) != 0 ? storeState.guildJoinRequests : map5, (i & 1024) != 0 ? storeState.pendingGuilds : list2, (i & 2048) != 0 ? storeState.guildIds : set3, (i & 4096) != 0 ? storeState.lurkingGuildIds : set4, (i & 8192) != 0 ? storeState.guildIdsWithActiveStageEvents : set5, (i & 16384) != 0 ? storeState.channels : map6, (i & 32768) != 0 ? storeState.openFolderIds : set6, (i & 65536) != 0 ? storeState.isNewUser : z2, (i & 131072) != 0 ? storeState.allApplicationStreamContexts : map7, (i & 262144) != 0 ? storeState.allChannelPermissions : map8, (i & 524288) != 0 ? storeState.isLeftPanelOpened : z3, (i & 1048576) != 0 ? storeState.isOnHomeTab : z4);
|
||||
public static /* synthetic */ StoreState copy$default(StoreState storeState, long j, long j2, Map map, Set set, Map map2, Map map3, Set set2, Map map4, List list, Map map5, List list2, Set set3, Set set4, Set set5, Map map6, Set set6, boolean z2, Map map7, Map map8, boolean z3, boolean z4, boolean z5, int i, Object obj) {
|
||||
return storeState.copy((i & 1) != 0 ? storeState.selectedGuildId : j, (i & 2) != 0 ? storeState.selectedVoiceChannelId : j2, (i & 4) != 0 ? storeState.guildSettings : map, (i & 8) != 0 ? storeState.unreadGuildIds : set, (i & 16) != 0 ? storeState.mentionCounts : map2, (i & 32) != 0 ? storeState.channelIds : map3, (i & 64) != 0 ? storeState.unavailableGuilds : set2, (i & 128) != 0 ? storeState.privateChannels : map4, (i & 256) != 0 ? storeState.sortedGuilds : list, (i & 512) != 0 ? storeState.guildJoinRequests : map5, (i & 1024) != 0 ? storeState.pendingGuilds : list2, (i & 2048) != 0 ? storeState.guildIds : set3, (i & 4096) != 0 ? storeState.lurkingGuildIds : set4, (i & 8192) != 0 ? storeState.guildIdsWithActiveStageEvents : set5, (i & 16384) != 0 ? storeState.channels : map6, (i & 32768) != 0 ? storeState.openFolderIds : set6, (i & 65536) != 0 ? storeState.isNewUser : z2, (i & 131072) != 0 ? storeState.allApplicationStreamContexts : map7, (i & 262144) != 0 ? storeState.allChannelPermissions : map8, (i & 524288) != 0 ? storeState.isLeftPanelOpened : z3, (i & 1048576) != 0 ? storeState.isOnHomeTab : z4, (i & 2097152) != 0 ? storeState.showHubSparkle : z5);
|
||||
}
|
||||
|
||||
public final long component1() {
|
||||
|
|
@ -743,6 +764,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return this.isOnHomeTab;
|
||||
}
|
||||
|
||||
public final boolean component22() {
|
||||
return this.showHubSparkle;
|
||||
}
|
||||
|
||||
public final Map<Long, ModelNotificationSettings> component3() {
|
||||
return this.guildSettings;
|
||||
}
|
||||
|
|
@ -771,7 +796,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return this.sortedGuilds;
|
||||
}
|
||||
|
||||
public final StoreState copy(long j, long j2, Map<Long, ? extends ModelNotificationSettings> map, Set<Long> set, Map<Long, Integer> map2, Map<Long, ? extends List<Long>> map3, Set<Long> set2, Map<Long, Channel> map4, List<? extends StoreGuildsSorted.Entry> list, Map<Long, GuildJoinRequest> map5, List<Guild> list2, Set<Long> set3, Set<Long> set4, Set<Long> set5, Map<Long, Channel> map6, Set<Long> set6, boolean z2, Map<Long, StreamContext> map7, Map<Long, Long> map8, boolean z3, boolean z4) {
|
||||
public final StoreState copy(long j, long j2, Map<Long, ? extends ModelNotificationSettings> map, Set<Long> set, Map<Long, Integer> map2, Map<Long, ? extends List<Long>> map3, Set<Long> set2, Map<Long, Channel> map4, List<? extends StoreGuildsSorted.Entry> list, Map<Long, GuildJoinRequest> map5, List<Guild> list2, Set<Long> set3, Set<Long> set4, Set<Long> set5, Map<Long, Channel> map6, Set<Long> set6, boolean z2, Map<Long, StreamContext> map7, Map<Long, Long> map8, boolean z3, boolean z4, boolean z5) {
|
||||
m.checkNotNullParameter(map, "guildSettings");
|
||||
m.checkNotNullParameter(set, "unreadGuildIds");
|
||||
m.checkNotNullParameter(map2, "mentionCounts");
|
||||
|
|
@ -788,7 +813,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
m.checkNotNullParameter(set6, "openFolderIds");
|
||||
m.checkNotNullParameter(map7, "allApplicationStreamContexts");
|
||||
m.checkNotNullParameter(map8, "allChannelPermissions");
|
||||
return new StoreState(j, j2, map, set, map2, map3, set2, map4, list, map5, list2, set3, set4, set5, map6, set6, z2, map7, map8, z3, z4);
|
||||
return new StoreState(j, j2, map, set, map2, map3, set2, map4, list, map5, list2, set3, set4, set5, map6, set6, z2, map7, map8, z3, z4, z5);
|
||||
}
|
||||
|
||||
public boolean equals(Object obj) {
|
||||
|
|
@ -799,7 +824,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return false;
|
||||
}
|
||||
StoreState storeState = (StoreState) obj;
|
||||
return this.selectedGuildId == storeState.selectedGuildId && this.selectedVoiceChannelId == storeState.selectedVoiceChannelId && m.areEqual(this.guildSettings, storeState.guildSettings) && m.areEqual(this.unreadGuildIds, storeState.unreadGuildIds) && m.areEqual(this.mentionCounts, storeState.mentionCounts) && m.areEqual(this.channelIds, storeState.channelIds) && m.areEqual(this.unavailableGuilds, storeState.unavailableGuilds) && m.areEqual(this.privateChannels, storeState.privateChannels) && m.areEqual(this.sortedGuilds, storeState.sortedGuilds) && m.areEqual(this.guildJoinRequests, storeState.guildJoinRequests) && m.areEqual(this.pendingGuilds, storeState.pendingGuilds) && m.areEqual(this.guildIds, storeState.guildIds) && m.areEqual(this.lurkingGuildIds, storeState.lurkingGuildIds) && m.areEqual(this.guildIdsWithActiveStageEvents, storeState.guildIdsWithActiveStageEvents) && m.areEqual(this.channels, storeState.channels) && m.areEqual(this.openFolderIds, storeState.openFolderIds) && this.isNewUser == storeState.isNewUser && m.areEqual(this.allApplicationStreamContexts, storeState.allApplicationStreamContexts) && m.areEqual(this.allChannelPermissions, storeState.allChannelPermissions) && this.isLeftPanelOpened == storeState.isLeftPanelOpened && this.isOnHomeTab == storeState.isOnHomeTab;
|
||||
return this.selectedGuildId == storeState.selectedGuildId && this.selectedVoiceChannelId == storeState.selectedVoiceChannelId && m.areEqual(this.guildSettings, storeState.guildSettings) && m.areEqual(this.unreadGuildIds, storeState.unreadGuildIds) && m.areEqual(this.mentionCounts, storeState.mentionCounts) && m.areEqual(this.channelIds, storeState.channelIds) && m.areEqual(this.unavailableGuilds, storeState.unavailableGuilds) && m.areEqual(this.privateChannels, storeState.privateChannels) && m.areEqual(this.sortedGuilds, storeState.sortedGuilds) && m.areEqual(this.guildJoinRequests, storeState.guildJoinRequests) && m.areEqual(this.pendingGuilds, storeState.pendingGuilds) && m.areEqual(this.guildIds, storeState.guildIds) && m.areEqual(this.lurkingGuildIds, storeState.lurkingGuildIds) && m.areEqual(this.guildIdsWithActiveStageEvents, storeState.guildIdsWithActiveStageEvents) && m.areEqual(this.channels, storeState.channels) && m.areEqual(this.openFolderIds, storeState.openFolderIds) && this.isNewUser == storeState.isNewUser && m.areEqual(this.allApplicationStreamContexts, storeState.allApplicationStreamContexts) && m.areEqual(this.allChannelPermissions, storeState.allChannelPermissions) && this.isLeftPanelOpened == storeState.isLeftPanelOpened && this.isOnHomeTab == storeState.isOnHomeTab && this.showHubSparkle == storeState.showHubSparkle;
|
||||
}
|
||||
|
||||
public final Map<Long, StreamContext> getAllApplicationStreamContexts() {
|
||||
|
|
@ -862,6 +887,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
return this.selectedVoiceChannelId;
|
||||
}
|
||||
|
||||
public final boolean getShowHubSparkle() {
|
||||
return this.showHubSparkle;
|
||||
}
|
||||
|
||||
public final List<StoreGuildsSorted.Entry> getSortedGuilds() {
|
||||
return this.sortedGuilds;
|
||||
}
|
||||
|
|
@ -930,10 +959,18 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
int i10 = z3 ? 1 : 0;
|
||||
int i11 = (i7 + i8) * 31;
|
||||
boolean z4 = this.isOnHomeTab;
|
||||
if (!z4) {
|
||||
i2 = z4 ? 1 : 0;
|
||||
if (z4) {
|
||||
z4 = true;
|
||||
}
|
||||
return i11 + i2;
|
||||
int i12 = z4 ? 1 : 0;
|
||||
int i13 = z4 ? 1 : 0;
|
||||
int i14 = z4 ? 1 : 0;
|
||||
int i15 = (i11 + i12) * 31;
|
||||
boolean z5 = this.showHubSparkle;
|
||||
if (!z5) {
|
||||
i2 = z5 ? 1 : 0;
|
||||
}
|
||||
return i15 + i2;
|
||||
}
|
||||
|
||||
public final boolean isLeftPanelOpened() {
|
||||
|
|
@ -990,7 +1027,9 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
L.append(", isLeftPanelOpened=");
|
||||
L.append(this.isLeftPanelOpened);
|
||||
L.append(", isOnHomeTab=");
|
||||
return a.G(L, this.isOnHomeTab, ")");
|
||||
L.append(this.isOnHomeTab);
|
||||
L.append(", showHubSparkle=");
|
||||
return a.G(L, this.showHubSparkle, ")");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1126,7 +1165,6 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
m.checkNotNullParameter(observable, "storeObservable");
|
||||
this.clock = clock;
|
||||
this.eventSubject = PublishSubject.k0();
|
||||
this.discordHubClickedPersister = new Persister<>("hub_verification_clicked_key", Boolean.FALSE);
|
||||
Observable r = ObservableExtensionsKt.computationLatest(observable).r();
|
||||
m.checkNotNullExpressionValue(r, "storeObservable\n … .distinctUntilChanged()");
|
||||
ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetGuildsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
|
||||
|
|
@ -1221,9 +1259,8 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
/* JADX WARNING: Removed duplicated region for block: B:113:0x0471 */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:116:0x0490 */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:119:0x04ad */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:120:0x04c6 */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:123:0x04ce */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:149:0x029d A[SYNTHETIC] */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:122:0x04bf */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:148:0x029d A[SYNTHETIC] */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:50:0x0235 */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:56:0x0254 */
|
||||
/* JADX WARNING: Removed duplicated region for block: B:59:0x0258 */
|
||||
|
|
@ -1232,7 +1269,6 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
boolean z2;
|
||||
ArrayList arrayList;
|
||||
ArrayList arrayList2;
|
||||
WidgetGuildsListViewModel widgetGuildsListViewModel;
|
||||
ArrayList arrayList3;
|
||||
Sequence sequence;
|
||||
HashMap hashMap;
|
||||
|
|
@ -1466,11 +1502,8 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
arrayList2.add(new GuildListItem.UnavailableItem(storeState.getUnavailableGuilds().size()));
|
||||
}
|
||||
arrayList2.add(GuildListItem.CreateItem.INSTANCE);
|
||||
if (!GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
|
||||
widgetGuildsListViewModel = this;
|
||||
arrayList2.add(new GuildListItem.HubItem(!widgetGuildsListViewModel.discordHubClickedPersister.get().booleanValue()));
|
||||
} else {
|
||||
widgetGuildsListViewModel = this;
|
||||
if (GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
|
||||
arrayList2.add(new GuildListItem.HubItem(storeState.getShowHubSparkle()));
|
||||
}
|
||||
if (storeState.isNewUser()) {
|
||||
arrayList2.add(dividerItem);
|
||||
|
|
@ -1478,14 +1511,14 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
}
|
||||
arrayList2.add(GuildListItem.SpaceItem.INSTANCE);
|
||||
ViewState.Loaded loaded = new ViewState.Loaded(arrayList2, !storeState.getChannelIds().isEmpty(), false);
|
||||
if (!(storeState.isLeftPanelOpened() == widgetGuildsListViewModel.wasLeftPanelOpened && storeState.isOnHomeTab() == widgetGuildsListViewModel.wasOnHomeTab)) {
|
||||
if (!(storeState.isLeftPanelOpened() == this.wasLeftPanelOpened && storeState.isOnHomeTab() == this.wasOnHomeTab)) {
|
||||
if (storeState.isLeftPanelOpened() && storeState.isOnHomeTab()) {
|
||||
widgetGuildsListViewModel.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
|
||||
this.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
|
||||
}
|
||||
widgetGuildsListViewModel.wasLeftPanelOpened = storeState.isLeftPanelOpened();
|
||||
widgetGuildsListViewModel.wasOnHomeTab = storeState.isOnHomeTab();
|
||||
this.wasLeftPanelOpened = storeState.isLeftPanelOpened();
|
||||
this.wasOnHomeTab = storeState.isOnHomeTab();
|
||||
}
|
||||
widgetGuildsListViewModel.updateViewState(loaded);
|
||||
updateViewState(loaded);
|
||||
}
|
||||
z2 = false;
|
||||
if (!z2) {
|
||||
|
|
@ -1497,16 +1530,16 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
if (!storeState.getUnavailableGuilds().isEmpty()) {
|
||||
}
|
||||
arrayList2.add(GuildListItem.CreateItem.INSTANCE);
|
||||
if (!GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
|
||||
if (GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
|
||||
}
|
||||
if (storeState.isNewUser()) {
|
||||
}
|
||||
arrayList2.add(GuildListItem.SpaceItem.INSTANCE);
|
||||
ViewState.Loaded loaded = new ViewState.Loaded(arrayList2, !storeState.getChannelIds().isEmpty(), false);
|
||||
widgetGuildsListViewModel.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
|
||||
widgetGuildsListViewModel.wasLeftPanelOpened = storeState.isLeftPanelOpened();
|
||||
widgetGuildsListViewModel.wasOnHomeTab = storeState.isOnHomeTab();
|
||||
widgetGuildsListViewModel.updateViewState(loaded);
|
||||
this.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
|
||||
this.wasLeftPanelOpened = storeState.isLeftPanelOpened();
|
||||
this.wasOnHomeTab = storeState.isOnHomeTab();
|
||||
updateViewState(loaded);
|
||||
}
|
||||
|
||||
private final void move(int i, int i2, Long l) {
|
||||
|
|
@ -1766,7 +1799,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
MemberVerificationUtils.maybeShowVerificationGate$default(MemberVerificationUtils.INSTANCE, context, fragmentManager, guildItem.getGuild().getId(), "Guilds List", null, WidgetGuildsListViewModel$onItemClicked$1.INSTANCE, 16, null);
|
||||
} else if (guildItem.isSelected()) {
|
||||
StoreNavigation.setNavigationPanelAction$default(StoreStream.Companion.getNavigation(), StoreNavigation.PanelAction.CLOSE, null, 2, null);
|
||||
} else if (!guildItem.getGuild().hasFeature(GuildFeature.HUB) || !z2) {
|
||||
} else if (!guildItem.getGuild().isHub() || !z2) {
|
||||
StoreStream.Companion.getGuildSelected().set(guildItem.getGuild().getId());
|
||||
} else {
|
||||
c.a.d.o.g(context, 2131888154, 0, null, 12);
|
||||
|
|
@ -1784,7 +1817,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
|
|||
} else if (m.areEqual(guildListItem, GuildListItem.CreateItem.INSTANCE)) {
|
||||
this.eventSubject.j.onNext(Event.ShowCreateGuild.INSTANCE);
|
||||
} else if (guildListItem instanceof GuildListItem.HubItem) {
|
||||
Persister.set$default(this.discordHubClickedPersister, Boolean.TRUE, false, 2, null);
|
||||
StoreStream.Companion.getDirectories().markDiscordHubClicked();
|
||||
this.eventSubject.j.onNext(Event.ShowHubVerification.INSTANCE);
|
||||
} else if (m.areEqual(guildListItem, GuildListItem.HelpItem.INSTANCE)) {
|
||||
this.eventSubject.j.onNext(Event.ShowHelp.INSTANCE);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public final /* synthetic */ class WidgetDiscordHubEmailFlow$binding$2 extends k
|
|||
LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById.findViewById(2131362951);
|
||||
if (linkifiedTextView2 != null) {
|
||||
p4 p4Var = new p4((NestedScrollView) findViewById, linkifiedTextView, textView, linkifiedTextView2);
|
||||
View findViewById2 = view.findViewById(2131362958);
|
||||
View findViewById2 = view.findViewById(2131362957);
|
||||
if (findViewById2 != null) {
|
||||
int i3 = 2131362952;
|
||||
LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById2.findViewById(2131362952);
|
||||
|
|
@ -55,15 +55,15 @@ public final /* synthetic */ class WidgetDiscordHubEmailFlow$binding$2 extends k
|
|||
TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131362954);
|
||||
if (textInputLayout != null) {
|
||||
i3 = 2131362955;
|
||||
TextView textView2 = (TextView) findViewById2.findViewById(2131362955);
|
||||
if (textView2 != null) {
|
||||
ImageView imageView = (ImageView) findViewById2.findViewById(2131362955);
|
||||
if (imageView != null) {
|
||||
i3 = 2131362956;
|
||||
ImageView imageView = (ImageView) findViewById2.findViewById(2131362956);
|
||||
if (imageView != null) {
|
||||
i3 = 2131362957;
|
||||
TextView textView3 = (TextView) findViewById2.findViewById(2131362957);
|
||||
TextView textView2 = (TextView) findViewById2.findViewById(2131362956);
|
||||
if (textView2 != null) {
|
||||
i3 = 2131362958;
|
||||
TextView textView3 = (TextView) findViewById2.findViewById(2131362958);
|
||||
if (textView3 != null) {
|
||||
q4 q4Var = new q4((NestedScrollView) findViewById2, linkifiedTextView3, textInputEditText, textInputLayout, textView2, imageView, textView3);
|
||||
q4 q4Var = new q4((NestedScrollView) findViewById2, linkifiedTextView3, textInputEditText, textInputLayout, imageView, textView2, textView3);
|
||||
MaterialButton materialButton = (MaterialButton) view.findViewById(2131362959);
|
||||
if (materialButton != null) {
|
||||
LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362960);
|
||||
|
|
@ -87,7 +87,7 @@ public final /* synthetic */ class WidgetDiscordHubEmailFlow$binding$2 extends k
|
|||
}
|
||||
throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i3)));
|
||||
}
|
||||
i = 2131362958;
|
||||
i = 2131362957;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,10 @@ import c.d.b.a.a;
|
|||
import com.discord.api.hubs.EmailVerification;
|
||||
import com.discord.app.AppFragment;
|
||||
import com.discord.databinding.WidgetDiscordHubEmailFlowBinding;
|
||||
import com.discord.stores.StoreStream;
|
||||
import com.discord.stores.utilities.Failure;
|
||||
import com.discord.stores.utilities.Loading;
|
||||
import com.discord.stores.utilities.RestCallState;
|
||||
import com.discord.stores.utilities.Success;
|
||||
import com.discord.utilities.resources.StringResourceUtilsKt;
|
||||
import com.discord.utilities.rx.ObservableExtensionsKt;
|
||||
|
|
@ -127,15 +129,26 @@ public final class WidgetDiscordHubEmailFlow extends AppFragment {
|
|||
}
|
||||
loadingButton.setVisibility(i);
|
||||
getBinding().e.setIsLoading(discordHubEmailState.getVerifyEmailAsync() instanceof Loading);
|
||||
getBinding().e.setText(z4 ? getString(2131890251) : getString(2131890807));
|
||||
if (discordHubEmailState.getVerifyEmailAsync() instanceof Failure) {
|
||||
getBinding().e.setText(z4 ? getString(2131890251) : getString(2131890286));
|
||||
RestCallState<EmailVerification> verifyEmailAsync = discordHubEmailState.getVerifyEmailAsync();
|
||||
if (verifyEmailAsync instanceof Failure) {
|
||||
((Failure) discordHubEmailState.getVerifyEmailAsync()).getError().showToasts(context);
|
||||
} else if (verifyEmailAsync instanceof Success) {
|
||||
StoreStream.Companion.getDirectories().markDiscordHubClicked();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private final void verifyEmail() {
|
||||
if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
|
||||
int i = 0;
|
||||
boolean validate$default = ValidationManager.validate$default(getValidationManager(), false, 1, null);
|
||||
TextView textView = getBinding().f1772c.f;
|
||||
m.checkNotNullExpressionValue(textView, "binding.discordHubEmailInput.discordHubEmailLabel");
|
||||
if (!validate$default) {
|
||||
i = 8;
|
||||
}
|
||||
textView.setVisibility(i);
|
||||
if (validate$default) {
|
||||
DiscordHubEmailViewModel viewModel = getViewModel();
|
||||
TextInputEditText textInputEditText = getBinding().f1772c.f149c;
|
||||
m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubEmailI…aderDescriptionEmailInput");
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
|
|||
TextView textView = binding.f;
|
||||
m.checkNotNullExpressionValue(textView, "appInfoHeader");
|
||||
String string = getString(2131886360);
|
||||
textView.setText(string + " - 83.11 - Beta (83111)");
|
||||
textView.setText(string + " - 83.12 - Beta (83112)");
|
||||
binding.f1933z.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this));
|
||||
binding.u.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE);
|
||||
binding.q.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
<include android:id="@+id/discord_hub_waitlist" android:visibility="gone" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" layout="@layout/widget_discord_hub_waitlist"/>
|
||||
<LinearLayout android:orientation="vertical" android:id="@+id/discord_hub_email_button_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp">
|
||||
<com.discord.views.LoadingButton android:id="@+id/discord_hub_email_yes" android:layout_width="match_parent" android:layout_height="wrap_content" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
|
||||
<com.google.android.material.button.MaterialButton android:id="@+id/discord_hub_email_no" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/dismiss" style="@style/res_2131952469_uikit_material_button_transparent"/>
|
||||
<com.google.android.material.button.MaterialButton android:id="@+id/discord_hub_email_no" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/invite_no_thanks" style="@style/res_2131952469_uikit_material_button_transparent"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952598_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
|
||||
<LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:id="@+id/discord_hub_email_header_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/bg_discord_hub_email_verification" android:scaleType="centerCrop" android:importantForAccessibility="no"/>
|
||||
<ImageView android:layout_gravity="center_horizontal" android:id="@+id/discord_hub_email_header_image" android:layout_width="match_parent" android:layout_height="150dp" android:layout_marginBottom="16dp" android:src="@drawable/bg_discord_hub_email_verification" android:scaleType="fitCenter" android:importantForAccessibility="no"/>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_email_header_title" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_join_header" style="@style/res_2131952564_uikit_textview_h1_bold"/>
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/discord_hub_email_header_description" android:layout_marginBottom="24dp" android:text="@string/hub_waitlist_modal_join_subheader" style="@style/res_2131952561_uikit_textview"/>
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/discord_hub_email_header_description" android:layout_marginBottom="24dp" android:text="@string/hub_waitlist_modal_join_subheader" android:lineSpacingMultiplier="1" style="@style/res_2131952561_uikit_textview"/>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@+id/discord_hub_email_header_description_email_input_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_waitlist_modal_form_title" app:expandedHintEnabled="false" style="@style/res_2131952543_uikit_textinputlayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@+id/discord_hub_email_header_description_email_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hub_waitlist_modal_form_placeholder" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline_email"/>
|
||||
<com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/discord_hub_email_header_description_email_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hub_email_connection_content_input_placeholder" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline_email"/>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discord_hub_email_header_description_email_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hub_waitlist_modal_form_description" style="@style/res_2131952561_uikit_textview"/>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discord_hub_email_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hub_waitlist_modal_form_description" style="@style/res_2131952561_uikit_textview"/>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
|
|
|||
|
|
@ -6146,10 +6146,10 @@
|
|||
<public type="id" name="discord_hub_email_header_description" id="0x7F0A0488" />
|
||||
<public type="id" name="discord_hub_email_header_description_email_input" id="0x7F0A0489" />
|
||||
<public type="id" name="discord_hub_email_header_description_email_input_layout" id="0x7F0A048A" />
|
||||
<public type="id" name="discord_hub_email_header_description_email_label" id="0x7F0A048B" />
|
||||
<public type="id" name="discord_hub_email_header_image" id="0x7F0A048C" />
|
||||
<public type="id" name="discord_hub_email_header_title" id="0x7F0A048D" />
|
||||
<public type="id" name="discord_hub_email_input" id="0x7F0A048E" />
|
||||
<public type="id" name="discord_hub_email_header_image" id="0x7F0A048B" />
|
||||
<public type="id" name="discord_hub_email_header_title" id="0x7F0A048C" />
|
||||
<public type="id" name="discord_hub_email_input" id="0x7F0A048D" />
|
||||
<public type="id" name="discord_hub_email_label" id="0x7F0A048E" />
|
||||
<public type="id" name="discord_hub_email_no" id="0x7F0A048F" />
|
||||
<public type="id" name="discord_hub_email_yes" id="0x7F0A0490" />
|
||||
<public type="id" name="discord_hub_waitlist" id="0x7F0A0491" />
|
||||
|
|
|
|||
|
|
@ -1342,7 +1342,7 @@
|
|||
<string name="color_picker_presets">Presets</string>
|
||||
<string name="color_picker_title">Select a color</string>
|
||||
<string name="color_picker_transparency">Transparency</string>
|
||||
<string name="res_2131887422_com_crashlytics_android_build_id">a8b55c11cb2d4b14b512c04fd752e077</string>
|
||||
<string name="res_2131887422_com_crashlytics_android_build_id">fc58ef7017e545678df734d8d74799b8</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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue