From c8d14056fe7d6167e1da86f702a8539a7975b53e Mon Sep 17 00:00:00 2001 From: Juby210 Date: Wed, 14 Jul 2021 23:30:13 +0200 Subject: [PATCH] 83.12 - Beta (83112) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/c/a/i/q4.java | 7 +- app/src/main/java/com/discord/app/App.java | 2 +- .../discord/stores/StoreClientVersion.java | 2 +- .../com/discord/stores/StoreDirectories.java | 26 ++++ .../analytics/AnalyticSuperProperties.java | 2 +- .../com/discord/utilities/rest/RestAPI.java | 2 +- .../widgets/debugging/WidgetFatalCrash.java | 2 +- ...stViewModel$Companion$observeStores$2.java | 22 +-- ...stViewModel$Companion$observeStores$6.java | 2 +- .../list/WidgetGuildsListViewModel.java | 125 +++++++++++------- .../WidgetDiscordHubEmailFlow$binding$2.java | 18 +-- .../hubs/WidgetDiscordHubEmailFlow.java | 19 ++- .../widgets/settings/WidgetSettings.java | 2 +- .../layout/widget_discord_hub_email_flow.xml | 2 +- .../layout/widget_discord_hub_email_input.xml | 8 +- app/src/main/res/values/public.xml | 8 +- app/src/main/res/values/strings.xml | 2 +- 19 files changed, 166 insertions(+), 91 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 907db55bb0..c03ea04668 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 17f611b734..988a898bb9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/i/q4.java b/app/src/main/java/c/a/i/q4.java index 6110a06730..7ade716c3b 100644 --- a/app/src/main/java/c/a/i/q4.java +++ b/app/src/main/java/c/a/i/q4.java @@ -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 diff --git a/app/src/main/java/com/discord/app/App.java b/app/src/main/java/com/discord/app/App.java index ad967584ea..ea2177cea5 100644 --- a/app/src/main/java/com/discord/app/App.java +++ b/app/src/main/java/com/discord/app/App.java @@ -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); diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java index 7150b2f103..e69d15922d 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 @@ public final class StoreClientVersion extends Store { private int clientMinVersion; private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY"; private final SerializedSubject 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); diff --git a/app/src/main/java/com/discord/stores/StoreDirectories.java b/app/src/main/java/com/discord/stores/StoreDirectories.java index b9518f965f..02e4b153ba 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories.java @@ -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>> directoriesMap; private Map>> directoriesMapSnapshot; + private final Persister 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 observeDiscordHubClicked() { + Observable 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); diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java index ca4a66de37..a30b314a41 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java @@ -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 map) { 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 ca75cdcd95..a5d864b5a5 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -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"; } } 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 a12793e8ad..eda50b40fc 100644 --- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java +++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java @@ -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)); diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$2.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$2.java index 17bd27e5be..c81e5e4cd2 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$2.java @@ -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> { 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 implements Func5, Map, Set, Set, Map, WidgetGuildsListViewModel.Companion.SecondChunk> { + public static final class AnonymousClass1 implements Func6, Map, Set, Set, Map, Boolean, WidgetGuildsListViewModel.Companion.SecondChunk> { public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); - public final WidgetGuildsListViewModel.Companion.SecondChunk call(Map map, Map map2, Set set, Set set2, Map map3) { + public final WidgetGuildsListViewModel.Companion.SecondChunk call(Map map, Map map2, Set set, Set set2, Map 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 map, Map map2, Set set, Set set2, Map map3) { - return call((Map) map, (Map) map2, (Set) set, (Set) set2, (Map) 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 map, Map map2, Set set, Set set2, Map map3, Boolean bool) { + return call((Map) map, (Map) map2, (Set) set, (Set) set2, (Map) map3, bool); } } @@ -48,8 +48,8 @@ public final class WidgetGuildsListViewModel$Companion$observeStores$2 extends o /* renamed from: invoke */ public final Observable mo1invoke() { StoreStream.Companion companion = StoreStream.Companion; - Observable 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 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; } } diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$6.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$6.java index f0e3c8a9e7..443f2e0d86 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$6.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$6.java @@ -40,7 +40,7 @@ public final class WidgetGuildsListViewModel$Companion$observeStores$6 { 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 discordHubClickedPersister; private final PublishSubject eventSubject; private boolean wasLeftPanelOpened; private boolean wasOnHomeTab; @@ -277,8 +273,9 @@ public final class WidgetGuildsListViewModel extends AppViewModel { private final Set guildIdsWithActiveStageEvents; private final Map guildJoinRequests; private final List pendingGuilds; + private final boolean showHubSparkle; - public SecondChunk(Map map, List list, Set set, Set set2, Map map2) { + public SecondChunk(Map map, List list, Set set, Set set2, Map 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 { 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 { 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 component1() { @@ -332,13 +333,17 @@ public final class WidgetGuildsListViewModel extends AppViewModel { return this.channels; } - public final SecondChunk copy(Map map, List list, Set set, Set set2, Map map2) { + public final boolean component6() { + return this.showHubSparkle; + } + + public final SecondChunk copy(Map map, List list, Set set, Set set2, Map 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 { 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 getChannels() { @@ -372,6 +377,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel { return this.pendingGuilds; } + public final boolean getShowHubSparkle() { + return this.showHubSparkle; + } + public int hashCode() { Map map = this.guildJoinRequests; int i = 0; @@ -386,7 +395,15 @@ public final class WidgetGuildsListViewModel extends AppViewModel { 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 { 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 { Observable 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 { private final Map privateChannels; private final long selectedGuildId; private final long selectedVoiceChannelId; + private final boolean showHubSparkle; private final List sortedGuilds; private final Set unavailableGuilds; private final Set unreadGuildIds; @@ -643,7 +663,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel { /* JADX DEBUG: Multi-variable search result rejected for r24v0, resolved type: java.util.Map> */ /* JADX DEBUG: Multi-variable search result rejected for r27v0, resolved type: java.util.List */ /* JADX WARN: Multi-variable type inference failed */ - public 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) { + public 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) { m.checkNotNullParameter(map, "guildSettings"); m.checkNotNullParameter(set, "unreadGuildIds"); m.checkNotNullParameter(map2, "mentionCounts"); @@ -681,10 +701,11 @@ public final class WidgetGuildsListViewModel extends AppViewModel { 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 { return this.isOnHomeTab; } + public final boolean component22() { + return this.showHubSparkle; + } + public final Map component3() { return this.guildSettings; } @@ -771,7 +796,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel { return this.sortedGuilds; } - public final StoreState copy(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) { + public final StoreState copy(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) { m.checkNotNullParameter(map, "guildSettings"); m.checkNotNullParameter(set, "unreadGuildIds"); m.checkNotNullParameter(map2, "mentionCounts"); @@ -788,7 +813,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel { 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 { 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 getAllApplicationStreamContexts() { @@ -862,6 +887,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel { return this.selectedVoiceChannelId; } + public final boolean getShowHubSparkle() { + return this.showHubSparkle; + } + public final List getSortedGuilds() { return this.sortedGuilds; } @@ -930,10 +959,18 @@ public final class WidgetGuildsListViewModel extends AppViewModel { 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 { 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 { 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 { /* 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 { boolean z2; ArrayList arrayList; ArrayList arrayList2; - WidgetGuildsListViewModel widgetGuildsListViewModel; ArrayList arrayList3; Sequence sequence; HashMap hashMap; @@ -1466,11 +1502,8 @@ public final class WidgetGuildsListViewModel extends AppViewModel { 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 { } 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 { 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 { 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 { } 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); diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java index d7a9399c24..0eeb00ee2f 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java @@ -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; } } } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java index 20a5c24a81..16c8866166 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java @@ -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 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"); 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 f9d00d5b6a..1c799ef81b 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -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); diff --git a/app/src/main/res/layout/widget_discord_hub_email_flow.xml b/app/src/main/res/layout/widget_discord_hub_email_flow.xml index 127748a425..0b1be1aa6b 100644 --- a/app/src/main/res/layout/widget_discord_hub_email_flow.xml +++ b/app/src/main/res/layout/widget_discord_hub_email_flow.xml @@ -8,6 +8,6 @@ - + diff --git a/app/src/main/res/layout/widget_discord_hub_email_input.xml b/app/src/main/res/layout/widget_discord_hub_email_input.xml index 93a27bf065..ee6455853e 100644 --- a/app/src/main/res/layout/widget_discord_hub_email_input.xml +++ b/app/src/main/res/layout/widget_discord_hub_email_input.xml @@ -1,12 +1,12 @@ - + - + - + - + diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 5b17fb4723..1d1d88df2f 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -6146,10 +6146,10 @@ - - - - + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 98d31e3512..ecf4cdf294 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1342,7 +1342,7 @@ Presets Select a color Transparency - a8b55c11cb2d4b14b512c04fd752e077 + fc58ef7017e545678df734d8d74799b8 Coming Soon Slash command application {applicationName} {applicationName} application