From 61ba5608bfddac80fd8f75550c634cd095882ef0 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Thu, 30 Sep 2021 01:07:52 +0200 Subject: [PATCH] 94.8 - Beta (94108) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../GuildScheduledEventEntityMetadata.java | 4 + .../WidgetGuildProfileActionsBinding.java | 72 +- .../com/discord/restapi/RestAPIParams.java | 39 +- ...vents$fetchUserGuildScheduledEvents$1.java | 6 +- ...vents$toggleRsvpGuildScheduledEvent$1.java | 8 +- .../stores/StoreGuildScheduledEvents.java | 55 +- .../auth/WidgetAuthMfa$onViewBound$1.java | 4 +- .../WidgetChannelsList$configureUI$3.java | 2 +- ...dgetTextChannelSettings$configureUI$1.java | 4 +- .../WidgetThreadBrowser$updateMenu$1.java | 4 +- .../WidgetChatListAdapterEventsHandler.java | 2 +- ...EventInvite$Model$Companion$observe$1.java | 2 +- .../WidgetFriendsList$configureToolbar$1.java | 6 +- ...etGuildContextMenu$configureValidUI$4.java | 2 +- ...eGuildActions$$inlined$apply$lambda$3.java | 8 +- ...ldProfileSheet$fromGuildEventUpsell$2.java | 22 + .../profile/WidgetGuildProfileSheet.java | 307 +- ...lsViewModel$Companion$observeStores$1.java | 2 +- ...stViewModel$Companion$observeStores$1.java | 2 +- .../GuildScheduledEventModel.java | 6 +- ...getGuildScheduledEventListBottomSheet.java | 15 +- ...ventUpsellBottomSheet$onViewCreated$1.java | 22 +- ...meHeaderManager$getOnSelectedAction$1.java | 14 +- ...serveStoreState$guildInfoObservable$1.java | 20 +- .../widgets/home/WidgetHomeViewModel.java | 51 +- .../WidgetMedia$onViewBoundOrOnResume$1.java | 6 +- .../widgets/notice/WidgetNoticeDialog.java | 4 +- ...tServerSettingsChannels$configureUI$1.java | 4 +- .../servers/WidgetServerSettingsEditRole.java | 100 +- ...tServerSettingsAuditLog$onViewBound$1.java | 4 +- .../WidgetSettings$configureToolbar$1.java | 4 +- .../widgets/settings/WidgetSettings.java | 2 +- .../WidgetGlobalSearch$configureUI$1.java | 2 +- .../WidgetCallFullscreen$configureMenu$1.java | 8 +- .../layout-sw600dp/design_layout_snackbar.xml | 2 +- .../res/layout-v22/view_upload_progress.xml | 2 +- .../main/res/layout-v22/widget_bug_report.xml | 2 +- .../widget_channel_picker_sheet.xml | 2 +- ...ings_guild_role_subscription_edit_tier.xml | 2 +- ...rver_settings_guild_role_subscriptions.xml | 2 +- .../widget_server_settings_role_members.xml | 2 +- .../res/layout/abc_select_dialog_material.xml | 2 +- .../res/layout/design_layout_snackbar.xml | 2 +- .../main/res/layout/material_time_input.xml | 4 +- .../main/res/layout/notification_action.xml | 4 +- .../layout/notification_action_tombstone.xml | 4 +- app/src/main/res/layout/test_action_chip.xml | 2 +- .../layout/test_chip_zero_corner_radius.xml | 2 +- .../main/res/layout/test_reflow_chipgroup.xml | 6 +- .../main/res/layout/test_toolbar_surface.xml | 2 +- .../layout/thread_browser_item_loading.xml | 2 +- .../res/layout/view_experiment_override.xml | 2 +- .../main/res/layout/view_upload_progress.xml | 2 +- app/src/main/res/layout/widget_bug_report.xml | 2 +- .../layout/widget_channel_picker_sheet.xml | 2 +- .../widget_chat_list_adapter_item_loading.xml | 2 +- .../layout/widget_guild_profile_actions.xml | 5 +- .../res/layout/widget_oauth_authorize.xml | 2 +- .../widget_price_tier_picker_bottom_sheet.xml | 2 +- .../layout/widget_server_settings_emojis.xml | 2 +- ...ings_guild_role_subscription_edit_tier.xml | 2 +- ...rver_settings_guild_role_subscriptions.xml | 2 +- .../widget_server_settings_role_members.xml | 2 +- .../res/layout/widget_settings_developer.xml | 2 +- app/src/main/res/values-land/styles.xml | 4 +- app/src/main/res/values-night/styles.xml | 12 +- app/src/main/res/values-sw600dp/styles.xml | 2 +- app/src/main/res/values-v23/styles.xml | 4 +- app/src/main/res/values-v24/styles.xml | 164 +- app/src/main/res/values-v26/styles.xml | 2 +- app/src/main/res/values-v28/styles.xml | 10 +- app/src/main/res/values/public.xml | 5557 +++++++++-------- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 1021 +-- 76 files changed, 3910 insertions(+), 3760 deletions(-) create mode 100644 app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$fromGuildEventUpsell$2.java diff --git a/app/build.gradle b/app/build.gradle index f1b10bda35..de235030c1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 94107 - versionName "94.7 - Beta" + versionCode 94108 + versionName "94.8 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cde47d216a..3e0e45c444 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventEntityMetadata.java b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventEntityMetadata.java index 1427de5783..5a637c14f5 100644 --- a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventEntityMetadata.java +++ b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventEntityMetadata.java @@ -58,6 +58,10 @@ public final class GuildScheduledEventEntityMetadata implements Serializable { return this.speakerIds; } + public final boolean c() { + return this.speakerIds == null && this.location == null; + } + @Override // java.lang.Object public boolean equals(Object obj) { if (this == obj) { diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java index ab66baff6f..01cfdbda38 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java @@ -6,6 +6,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.cardview.widget.CardView; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; import com.discord.views.CheckedSetting; @@ -15,7 +16,9 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { @NonNull public final MaterialButton A; @NonNull - public final LinearLayout B; + public final MaterialButton B; + @NonNull + public final LinearLayout C; @NonNull public final LinearLayout a; @NonNull @@ -39,47 +42,47 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { @NonNull public final TextView j; @NonNull - public final TextView k; + public final ConstraintLayout k; @NonNull - public final CardView l; + public final TextView l; @NonNull - public final RecyclerView m; + public final CardView m; @NonNull - public final CardView n; + public final RecyclerView n; @NonNull - public final TextView o; + public final CardView o; @NonNull - public final SimpleDraweeView p; + public final TextView p; @NonNull - public final CheckedSetting q; + public final SimpleDraweeView q; @NonNull - public final MaterialButton r; + public final CheckedSetting r; @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f1862s; + public final MaterialButton f1862s; @NonNull public final TextView t; @NonNull - public final CardView u; + public final TextView u; @NonNull - public final TextView v; + public final CardView v; @NonNull - public final ImageView w; + public final TextView w; @NonNull /* renamed from: x reason: collision with root package name */ - public final TextView f1863x; + public final ImageView f1863x; @NonNull /* renamed from: y reason: collision with root package name */ - public final CardView f1864y; + public final TextView f1864y; @NonNull /* renamed from: z reason: collision with root package name */ - public final MaterialButton f1865z; + public final CardView f1865z; - public WidgetGuildProfileActionsBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull CheckedSetting checkedSetting, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull CardView cardView2, @NonNull TextView textView6, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CheckedSetting checkedSetting2, @NonNull MaterialButton materialButton, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull CardView cardView3, @NonNull TextView textView9, @NonNull ImageView imageView, @NonNull TextView textView10, @NonNull CardView cardView4, @NonNull CardView cardView5, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout6) { + public WidgetGuildProfileActionsBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull CheckedSetting checkedSetting, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ConstraintLayout constraintLayout, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull CardView cardView2, @NonNull TextView textView7, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CheckedSetting checkedSetting2, @NonNull MaterialButton materialButton, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull CardView cardView3, @NonNull TextView textView10, @NonNull ImageView imageView, @NonNull TextView textView11, @NonNull CardView cardView4, @NonNull CardView cardView5, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout6) { this.a = linearLayout; this.b = linearLayout2; this.f1861c = textView; @@ -90,24 +93,25 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { this.h = textView2; this.i = textView3; this.j = textView4; - this.k = textView5; - this.l = cardView; - this.m = recyclerView; - this.n = cardView2; - this.o = textView6; - this.p = simpleDraweeView; - this.q = checkedSetting2; - this.r = materialButton; - this.f1862s = textView7; + this.k = constraintLayout; + this.l = textView6; + this.m = cardView; + this.n = recyclerView; + this.o = cardView2; + this.p = textView7; + this.q = simpleDraweeView; + this.r = checkedSetting2; + this.f1862s = materialButton; this.t = textView8; - this.u = cardView3; - this.v = textView9; - this.w = imageView; - this.f1863x = textView10; - this.f1864y = cardView4; - this.f1865z = materialButton2; - this.A = materialButton3; - this.B = linearLayout6; + this.u = textView9; + this.v = cardView3; + this.w = textView10; + this.f1863x = imageView; + this.f1864y = textView11; + this.f1865z = cardView4; + this.A = materialButton2; + this.B = materialButton3; + this.C = linearLayout6; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/restapi/RestAPIParams.java b/app/src/main/java/com/discord/restapi/RestAPIParams.java index 3b81ad3ba4..d79f3ef49e 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIParams.java +++ b/app/src/main/java/com/discord/restapi/RestAPIParams.java @@ -35,6 +35,7 @@ import com.discord.models.domain.ModelGuildFolder; import com.discord.models.domain.ModelMemberVerificationForm; import com.discord.models.domain.ModelMuteConfig; import com.discord.models.domain.ModelSubscription; +import com.discord.nullserializable.NullSerializable; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import d0.t.g0; @@ -3535,9 +3536,9 @@ public final class RestAPIParams { /* compiled from: RestAPIParams.kt */ public static final class UpdateGuildScheduledEventBody { - private final Long channelId; + private final NullSerializable channelId; private final String description; - private final GuildScheduledEventEntityMetadata entityMetadata; + private final NullSerializable entityMetadata; private final GuildScheduledEventEntityType entityType; private final String name; private final StageInstancePrivacyLevel privacyLevel; @@ -3549,25 +3550,25 @@ public final class RestAPIParams { this(null, null, null, null, null, null, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null); } - public UpdateGuildScheduledEventBody(String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, Long l, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, GuildScheduledEventStatus guildScheduledEventStatus) { + public UpdateGuildScheduledEventBody(String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, NullSerializable nullSerializable, GuildScheduledEventEntityType guildScheduledEventEntityType, NullSerializable nullSerializable2, GuildScheduledEventStatus guildScheduledEventStatus) { this.name = str; this.description = str2; this.privacyLevel = stageInstancePrivacyLevel; this.scheduledStartTime = str3; this.scheduledEndTime = str4; - this.channelId = l; + this.channelId = nullSerializable; this.entityType = guildScheduledEventEntityType; - this.entityMetadata = guildScheduledEventEntityMetadata; + this.entityMetadata = nullSerializable2; this.status = guildScheduledEventStatus; } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ UpdateGuildScheduledEventBody(String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, Long l, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, GuildScheduledEventStatus guildScheduledEventStatus, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : str2, (i & 4) != 0 ? null : stageInstancePrivacyLevel, (i & 8) != 0 ? null : str3, (i & 16) != 0 ? null : str4, (i & 32) != 0 ? null : l, (i & 64) != 0 ? null : guildScheduledEventEntityType, (i & 128) != 0 ? null : guildScheduledEventEntityMetadata, (i & 256) == 0 ? guildScheduledEventStatus : null); + public /* synthetic */ UpdateGuildScheduledEventBody(String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, NullSerializable nullSerializable, GuildScheduledEventEntityType guildScheduledEventEntityType, NullSerializable nullSerializable2, GuildScheduledEventStatus guildScheduledEventStatus, int i, DefaultConstructorMarker defaultConstructorMarker) { + this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : str2, (i & 4) != 0 ? null : stageInstancePrivacyLevel, (i & 8) != 0 ? null : str3, (i & 16) != 0 ? null : str4, (i & 32) != 0 ? null : nullSerializable, (i & 64) != 0 ? null : guildScheduledEventEntityType, (i & 128) != 0 ? null : nullSerializable2, (i & 256) == 0 ? guildScheduledEventStatus : null); } - public static /* synthetic */ UpdateGuildScheduledEventBody copy$default(UpdateGuildScheduledEventBody updateGuildScheduledEventBody, String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, Long l, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, GuildScheduledEventStatus guildScheduledEventStatus, int i, Object obj) { - return updateGuildScheduledEventBody.copy((i & 1) != 0 ? updateGuildScheduledEventBody.name : str, (i & 2) != 0 ? updateGuildScheduledEventBody.description : str2, (i & 4) != 0 ? updateGuildScheduledEventBody.privacyLevel : stageInstancePrivacyLevel, (i & 8) != 0 ? updateGuildScheduledEventBody.scheduledStartTime : str3, (i & 16) != 0 ? updateGuildScheduledEventBody.scheduledEndTime : str4, (i & 32) != 0 ? updateGuildScheduledEventBody.channelId : l, (i & 64) != 0 ? updateGuildScheduledEventBody.entityType : guildScheduledEventEntityType, (i & 128) != 0 ? updateGuildScheduledEventBody.entityMetadata : guildScheduledEventEntityMetadata, (i & 256) != 0 ? updateGuildScheduledEventBody.status : guildScheduledEventStatus); + public static /* synthetic */ UpdateGuildScheduledEventBody copy$default(UpdateGuildScheduledEventBody updateGuildScheduledEventBody, String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, NullSerializable nullSerializable, GuildScheduledEventEntityType guildScheduledEventEntityType, NullSerializable nullSerializable2, GuildScheduledEventStatus guildScheduledEventStatus, int i, Object obj) { + return updateGuildScheduledEventBody.copy((i & 1) != 0 ? updateGuildScheduledEventBody.name : str, (i & 2) != 0 ? updateGuildScheduledEventBody.description : str2, (i & 4) != 0 ? updateGuildScheduledEventBody.privacyLevel : stageInstancePrivacyLevel, (i & 8) != 0 ? updateGuildScheduledEventBody.scheduledStartTime : str3, (i & 16) != 0 ? updateGuildScheduledEventBody.scheduledEndTime : str4, (i & 32) != 0 ? updateGuildScheduledEventBody.channelId : nullSerializable, (i & 64) != 0 ? updateGuildScheduledEventBody.entityType : guildScheduledEventEntityType, (i & 128) != 0 ? updateGuildScheduledEventBody.entityMetadata : nullSerializable2, (i & 256) != 0 ? updateGuildScheduledEventBody.status : guildScheduledEventStatus); } public final String component1() { @@ -3590,7 +3591,7 @@ public final class RestAPIParams { return this.scheduledEndTime; } - public final Long component6() { + public final NullSerializable component6() { return this.channelId; } @@ -3598,7 +3599,7 @@ public final class RestAPIParams { return this.entityType; } - public final GuildScheduledEventEntityMetadata component8() { + public final NullSerializable component8() { return this.entityMetadata; } @@ -3606,8 +3607,8 @@ public final class RestAPIParams { return this.status; } - public final UpdateGuildScheduledEventBody copy(String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, Long l, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, GuildScheduledEventStatus guildScheduledEventStatus) { - return new UpdateGuildScheduledEventBody(str, str2, stageInstancePrivacyLevel, str3, str4, l, guildScheduledEventEntityType, guildScheduledEventEntityMetadata, guildScheduledEventStatus); + public final UpdateGuildScheduledEventBody copy(String str, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, String str4, NullSerializable nullSerializable, GuildScheduledEventEntityType guildScheduledEventEntityType, NullSerializable nullSerializable2, GuildScheduledEventStatus guildScheduledEventStatus) { + return new UpdateGuildScheduledEventBody(str, str2, stageInstancePrivacyLevel, str3, str4, nullSerializable, guildScheduledEventEntityType, nullSerializable2, guildScheduledEventStatus); } public boolean equals(Object obj) { @@ -3621,7 +3622,7 @@ public final class RestAPIParams { return m.areEqual(this.name, updateGuildScheduledEventBody.name) && m.areEqual(this.description, updateGuildScheduledEventBody.description) && m.areEqual(this.privacyLevel, updateGuildScheduledEventBody.privacyLevel) && m.areEqual(this.scheduledStartTime, updateGuildScheduledEventBody.scheduledStartTime) && m.areEqual(this.scheduledEndTime, updateGuildScheduledEventBody.scheduledEndTime) && m.areEqual(this.channelId, updateGuildScheduledEventBody.channelId) && m.areEqual(this.entityType, updateGuildScheduledEventBody.entityType) && m.areEqual(this.entityMetadata, updateGuildScheduledEventBody.entityMetadata) && m.areEqual(this.status, updateGuildScheduledEventBody.status); } - public final Long getChannelId() { + public final NullSerializable getChannelId() { return this.channelId; } @@ -3629,7 +3630,7 @@ public final class RestAPIParams { return this.description; } - public final GuildScheduledEventEntityMetadata getEntityMetadata() { + public final NullSerializable getEntityMetadata() { return this.entityMetadata; } @@ -3669,12 +3670,12 @@ public final class RestAPIParams { int hashCode4 = (hashCode3 + (str3 != null ? str3.hashCode() : 0)) * 31; String str4 = this.scheduledEndTime; int hashCode5 = (hashCode4 + (str4 != null ? str4.hashCode() : 0)) * 31; - Long l = this.channelId; - int hashCode6 = (hashCode5 + (l != null ? l.hashCode() : 0)) * 31; + NullSerializable nullSerializable = this.channelId; + int hashCode6 = (hashCode5 + (nullSerializable != null ? nullSerializable.hashCode() : 0)) * 31; GuildScheduledEventEntityType guildScheduledEventEntityType = this.entityType; int hashCode7 = (hashCode6 + (guildScheduledEventEntityType != null ? guildScheduledEventEntityType.hashCode() : 0)) * 31; - GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata = this.entityMetadata; - int hashCode8 = (hashCode7 + (guildScheduledEventEntityMetadata != null ? guildScheduledEventEntityMetadata.hashCode() : 0)) * 31; + NullSerializable nullSerializable2 = this.entityMetadata; + int hashCode8 = (hashCode7 + (nullSerializable2 != null ? nullSerializable2.hashCode() : 0)) * 31; GuildScheduledEventStatus guildScheduledEventStatus = this.status; if (guildScheduledEventStatus != null) { i = guildScheduledEventStatus.hashCode(); diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchUserGuildScheduledEvents$1.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchUserGuildScheduledEvents$1.java index 603724f73c..986bf87e30 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchUserGuildScheduledEvents$1.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchUserGuildScheduledEvents$1.java @@ -1,10 +1,10 @@ package com.discord.stores; import com.discord.api.guildscheduledevent.GuildScheduledEventUser; +import d0.t.u; import d0.z.d.m; import d0.z.d.o; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function0; @@ -30,14 +30,12 @@ public final class StoreGuildScheduledEvents$fetchUserGuildScheduledEvents$1 ext @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - StoreGuildScheduledEvents.access$getUserGuildScheduledEventIds$p(this.this$0.this$0).clear(); - HashSet access$getUserGuildScheduledEventIds$p = StoreGuildScheduledEvents.access$getUserGuildScheduledEventIds$p(this.this$0.this$0); List list = this.$eventUsers; ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(list, 10)); for (GuildScheduledEventUser guildScheduledEventUser : list) { arrayList.add(Long.valueOf(guildScheduledEventUser.a())); } - access$getUserGuildScheduledEventIds$p.addAll(arrayList); + StoreGuildScheduledEvents.access$getUserGuildScheduledEventIds$p(this.this$0.this$0).put(Long.valueOf(this.this$0.$guildId), u.toMutableSet(arrayList)); StoreGuildScheduledEvents.access$getUserGuildScheduledEventsFetches$p(this.this$0.this$0).add(Long.valueOf(this.this$0.$guildId)); this.this$0.this$0.markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1.java index a4eb5509d9..dfa19d185d 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1.java @@ -13,6 +13,7 @@ import kotlin.jvm.functions.Function1; /* compiled from: StoreGuildScheduledEvents.kt */ public final class StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1 extends o implements Function0 { public final /* synthetic */ long $eventId; + public final /* synthetic */ GuildScheduledEvent $guildScheduledEvent; public final /* synthetic */ GuildScheduledEvent $storeEvent; public final /* synthetic */ StoreGuildScheduledEvents this$0; @@ -122,17 +123,18 @@ public final class StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1 ext } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1(StoreGuildScheduledEvents storeGuildScheduledEvents, long j, GuildScheduledEvent guildScheduledEvent) { + public StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1(StoreGuildScheduledEvents storeGuildScheduledEvents, GuildScheduledEvent guildScheduledEvent, long j, GuildScheduledEvent guildScheduledEvent2) { super(0); this.this$0 = storeGuildScheduledEvents; + this.$guildScheduledEvent = guildScheduledEvent; this.$eventId = j; - this.$storeEvent = guildScheduledEvent; + this.$storeEvent = guildScheduledEvent2; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - if (StoreGuildScheduledEvents.access$getUserGuildScheduledEventIds$p(this.this$0).contains(Long.valueOf(this.$eventId))) { + if (this.this$0.isRsvpedToEvent(this.$guildScheduledEvent.f(), this.$eventId)) { StoreGuildScheduledEvents.processRsvpDelete$default(this.this$0, this.$storeEvent, 0, 2, null); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteGuildScheduledEventRsvp(this.$storeEvent.g()), false, 1, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass1(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null); return; diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java index da6c0b7137..bfcf31fc4e 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java @@ -41,8 +41,8 @@ public final class StoreGuildScheduledEvents extends StoreV2 { private final StorePermissions permissionsStore; private final HashSet rsvpsAwaitingNetwork = new HashSet<>(); private HashSet rsvpsAwaitingSnapshot = new HashSet<>(); - private final HashSet userGuildScheduledEventIds = new HashSet<>(); - private Set userGuildScheduledEventIdsSnapshot = n0.emptySet(); + private final HashMap> userGuildScheduledEventIds = new HashMap<>(); + private Map> userGuildScheduledEventIdsSnapshot = h0.emptyMap(); private final HashSet userGuildScheduledEventsFetches = new HashSet<>(); private final StoreUser userStore; @@ -93,7 +93,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { return storeGuildScheduledEvents.rsvpsAwaitingNetwork; } - public static final /* synthetic */ HashSet access$getUserGuildScheduledEventIds$p(StoreGuildScheduledEvents storeGuildScheduledEvents) { + public static final /* synthetic */ HashMap access$getUserGuildScheduledEventIds$p(StoreGuildScheduledEvents storeGuildScheduledEvents) { return storeGuildScheduledEvents.userGuildScheduledEventIds; } @@ -101,6 +101,18 @@ public final class StoreGuildScheduledEvents extends StoreV2 { return storeGuildScheduledEvents.userGuildScheduledEventsFetches; } + private final void addUserRsvpForEvent(long j, long j2) { + if (this.userGuildScheduledEventIds.containsKey(Long.valueOf(j))) { + Set set = this.userGuildScheduledEventIds.get(Long.valueOf(j)); + if (set != null) { + set.add(Long.valueOf(j2)); + return; + } + return; + } + this.userGuildScheduledEventIds.put(Long.valueOf(j), n0.mutableSetOf(Long.valueOf(j2))); + } + private final GuildScheduledEvent findEventFromStore(GuildScheduledEvent guildScheduledEvent) { GuildScheduledEvent findEventFromStore = findEventFromStore(guildScheduledEvent.g(), Long.valueOf(guildScheduledEvent.f())); return findEventFromStore != null ? findEventFromStore : guildScheduledEvent; @@ -181,9 +193,9 @@ public final class StoreGuildScheduledEvents extends StoreV2 { @StoreThread private final void processRsvpCreate(GuildScheduledEvent guildScheduledEvent, long j) { long g = guildScheduledEvent.g(); - if (!this.userGuildScheduledEventIds.contains(Long.valueOf(g)) || j != this.userStore.getMe().getId()) { + if (!isRsvpedToEvent(guildScheduledEvent.f(), g) || j != this.userStore.getMe().getId()) { this.rsvpsAwaitingSnapshot.add(Long.valueOf(g)); - this.userGuildScheduledEventIds.add(Long.valueOf(g)); + addUserRsvpForEvent(guildScheduledEvent.f(), guildScheduledEvent.g()); Integer l = guildScheduledEvent.l(); GuildScheduledEvent a = GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(l != null ? l.intValue() + 1 : 1), null, 49151); List list = this.guildScheduledEvents.get(Long.valueOf(a.f())); @@ -223,9 +235,9 @@ public final class StoreGuildScheduledEvents extends StoreV2 { @StoreThread private final void processRsvpDelete(GuildScheduledEvent guildScheduledEvent, long j) { long g = guildScheduledEvent.g(); - if (this.userGuildScheduledEventIds.contains(Long.valueOf(g)) || j != this.userStore.getMe().getId()) { + if (isRsvpedToEvent(guildScheduledEvent.f(), g) || j != this.userStore.getMe().getId()) { this.rsvpsAwaitingSnapshot.add(Long.valueOf(g)); - this.userGuildScheduledEventIds.remove(Long.valueOf(g)); + removeUserRsvpForEvent(guildScheduledEvent.f(), g); List list = this.guildScheduledEvents.get(Long.valueOf(guildScheduledEvent.f())); if (list != null) { m.checkNotNullExpressionValue(list, "eventList"); @@ -266,6 +278,13 @@ public final class StoreGuildScheduledEvents extends StoreV2 { storeGuildScheduledEvents.processRsvpDelete(guildScheduledEvent, j); } + private final void removeUserRsvpForEvent(long j, long j2) { + Set set = this.userGuildScheduledEventIds.get(Long.valueOf(j)); + if (set != null) { + set.remove(Long.valueOf(j2)); + } + } + /* JADX WARNING: Removed duplicated region for block: B:17:0x0063 */ /* JADX WARNING: Removed duplicated region for block: B:18:0x0073 */ /* JADX WARNING: Removed duplicated region for block: B:21:0x0088 */ @@ -294,7 +313,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { ((List) h0.getValue(this.guildScheduledEvents, Long.valueOf(f))).set(i, guildScheduledEvent); } if (guildScheduledEvent.m() != null) { - this.userGuildScheduledEventIds.add(Long.valueOf(guildScheduledEvent.g())); + addUserRsvpForEvent(f, guildScheduledEvent.g()); } markChanged(); } @@ -441,8 +460,9 @@ public final class StoreGuildScheduledEvents extends StoreV2 { return arrayList; } - public final Set getUserGuildScheduledEventIds() { - return this.userGuildScheduledEventIdsSnapshot; + public final Set getUserGuildScheduledEventIds(long j) { + Set set = (Set) this.userGuildScheduledEventIdsSnapshot.get(Long.valueOf(j)); + return set != null ? set : n0.emptySet(); } @StoreThread @@ -477,6 +497,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { public final void handleGuildRemove(long j) { this.guildScheduledEvents.remove(Long.valueOf(j)); this.guildScheduledEventsFetchTimestamps.remove(Long.valueOf(j)); + this.userGuildScheduledEventIds.remove(Long.valueOf(j)); this.userGuildScheduledEventsFetches.remove(Long.valueOf(j)); markChanged(); } @@ -508,7 +529,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { if (!(i == -1 || (list = this.guildScheduledEvents.get(Long.valueOf(guildScheduledEvent.f()))) == null)) { list.remove(i); } - this.userGuildScheduledEventIds.remove(Long.valueOf(guildScheduledEvent.g())); + removeUserRsvpForEvent(guildScheduledEvent.f(), guildScheduledEvent.g()); markChanged(); } } @@ -537,8 +558,12 @@ public final class StoreGuildScheduledEvents extends StoreV2 { } } - public final boolean isRsvpedToEvent(long j) { - return this.userGuildScheduledEventIdsSnapshot.contains(Long.valueOf(j)); + public final boolean isRsvpedToEvent(long j, long j2) { + Set set = (Set) this.userGuildScheduledEventIdsSnapshot.get(Long.valueOf(j)); + if (set == null) { + set = n0.emptySet(); + } + return set.contains(Long.valueOf(j2)); } public final Observable observeGuildScheduledEvent(Long l, Long l2) { @@ -553,7 +578,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { public void snapshotData() { super.snapshotData(); this.guildScheduledEventsSnapshot = new HashMap(this.guildScheduledEvents); - this.userGuildScheduledEventIdsSnapshot = new HashSet(this.userGuildScheduledEventIds); + this.userGuildScheduledEventIdsSnapshot = new HashMap(this.userGuildScheduledEventIds); this.rsvpsAwaitingSnapshot.clear(); } @@ -563,7 +588,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { long g = findEventFromStore.g(); if (!this.rsvpsAwaitingNetwork.contains(Long.valueOf(g)) && !this.rsvpsAwaitingSnapshot.contains(Long.valueOf(g))) { this.rsvpsAwaitingNetwork.add(Long.valueOf(g)); - this.dispatcher.schedule(new StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1(this, g, findEventFromStore)); + this.dispatcher.schedule(new StoreGuildScheduledEvents$toggleRsvpGuildScheduledEvent$1(this, guildScheduledEvent, g, findEventFromStore)); } } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java index 2458fe73f9..cd4cce94a7 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java @@ -16,10 +16,10 @@ public final class WidgetAuthMfa$onViewBound$1 implements Action2 implements Ac public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_channel_settings_delete /* 2131364177 */: + case R.id.menu_channel_settings_delete /* 2131364179 */: if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) { WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel()); return; @@ -29,7 +29,7 @@ public final class WidgetTextChannelSettings$configureUI$1 implements Ac WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel()); return; } - case R.id.menu_channel_settings_reset /* 2131364178 */: + case R.id.menu_channel_settings_reset /* 2131364180 */: StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings(); m.checkNotNullExpressionValue(context, "context"); userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel()); diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java index 84d826e78e..83b6facdeb 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java @@ -19,11 +19,11 @@ public final class WidgetThreadBrowser$updateMenu$1 implements Action2 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_friends_add_friend /* 2131364197 */: + case R.id.menu_friends_add_friend /* 2131364199 */: WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null); return; - case R.id.menu_friends_contact_sync /* 2131364198 */: + case R.id.menu_friends_contact_sync /* 2131364200 */: ContactSyncAnalytics.Companion.trackStart$default(ContactSyncAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null); AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null)); WidgetContactSync.Companion companion2 = WidgetContactSync.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null); return; - case R.id.menu_friends_start_group /* 2131364199 */: + case R.id.menu_friends_start_group /* 2131364201 */: if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) { GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.java index 44d54d2076..8cec17bfe9 100644 --- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.java +++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.java @@ -21,6 +21,6 @@ public final class WidgetGuildContextMenu$configureValidUI$4 implements View.OnC WidgetGuildProfileSheet.Companion companion = WidgetGuildProfileSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetGuildProfileSheet.Companion.show$default(companion, parentFragmentManager, this.$viewState.isGuildSelected(), this.$viewState.getGuild().getId(), 0, 8, null); + WidgetGuildProfileSheet.Companion.show$default(companion, parentFragmentManager, this.$viewState.isGuildSelected(), this.$viewState.getGuild().getId(), 0, false, 24, null); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3.java index e822164684..73f8c8a511 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3.java @@ -2,7 +2,7 @@ package com.discord.widgets.guilds.profile; import android.content.Context; import android.view.View; -import android.widget.TextView; +import androidx.constraintlayout.widget.ConstraintLayout; import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventLocationSelect; import d0.z.d.m; import d0.z.d.o; @@ -12,13 +12,13 @@ import kotlin.jvm.functions.Function1; public final class WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3 extends o implements Function1 { public final /* synthetic */ boolean $canManageEvents$inlined; public final /* synthetic */ long $guildId$inlined; - public final /* synthetic */ TextView $this_apply; + public final /* synthetic */ ConstraintLayout $this_apply; public final /* synthetic */ WidgetGuildProfileSheet this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3(TextView textView, WidgetGuildProfileSheet widgetGuildProfileSheet, boolean z2, long j) { + public WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3(ConstraintLayout constraintLayout, WidgetGuildProfileSheet widgetGuildProfileSheet, boolean z2, long j) { super(1); - this.$this_apply = textView; + this.$this_apply = constraintLayout; this.this$0 = widgetGuildProfileSheet; this.$canManageEvents$inlined = z2; this.$guildId$inlined = j; diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$fromGuildEventUpsell$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$fromGuildEventUpsell$2.java new file mode 100644 index 0000000000..c4c5c5a315 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$fromGuildEventUpsell$2.java @@ -0,0 +1,22 @@ +package com.discord.widgets.guilds.profile; + +import d0.z.d.o; +import kotlin.jvm.functions.Function0; +/* compiled from: WidgetGuildProfileSheet.kt */ +public final class WidgetGuildProfileSheet$fromGuildEventUpsell$2 extends o implements Function0 { + public final /* synthetic */ WidgetGuildProfileSheet this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetGuildProfileSheet$fromGuildEventUpsell$2(WidgetGuildProfileSheet widgetGuildProfileSheet) { + super(0); + this.this$0 = widgetGuildProfileSheet; + } + + /* Return type fixed from 'boolean' to match base method */ + /* JADX WARNING: Unknown variable types count: 1 */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final Boolean mo1invoke() { + return WidgetGuildProfileSheet.access$getArgumentsOrDefault$p(this.this$0).getBoolean("EXTRA_FROM_UPSELL", false); + } +} diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java index 0b7bd86a6d..75194439df 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java @@ -49,6 +49,7 @@ import com.discord.widgets.stage.start.StageEventsGuildsFeatureFlag; import com.facebook.drawee.view.SimpleDraweeView; import com.google.android.material.button.MaterialButton; import com.google.android.material.textfield.TextInputLayout; +import d0.g; import d0.g0.t; import d0.z.d.a0; import d0.z.d.m; @@ -65,6 +66,7 @@ import kotlin.reflect.KProperty; public final class WidgetGuildProfileSheet extends AppBottomSheet { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.a0(WidgetGuildProfileSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetGuildProfileSheetBinding;", 0)}; public static final Companion Companion = new Companion(null); + private static final String EXTRA_FROM_UPSELL = "EXTRA_FROM_UPSELL"; private static final int LOADED_VIEW_INDEX = 1; private static final int LOADING_VIEW_INDEX = 0; private static final int NUM_ROWS_EMOJIS = 2; @@ -72,6 +74,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { private Long channelId; private AlertDialog dialog; private final WidgetGuildProfileSheetEmojisAdapter emojisAdapter; + private final Lazy fromGuildEventUpsell$delegate; private WidgetGuildProfileActionsBinding guildActionBinding; private WidgetGuildHubProfileActionsBinding guildHubActionBinding; private final Lazy viewModel$delegate; @@ -85,19 +88,17 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { this(); } - public static /* synthetic */ void show$default(Companion companion, FragmentManager fragmentManager, boolean z2, long j, long j2, int i, Object obj) { - if ((i & 8) != 0) { - j2 = 0; - } - companion.show(fragmentManager, z2, j, j2); + public static /* synthetic */ void show$default(Companion companion, FragmentManager fragmentManager, boolean z2, long j, long j2, boolean z3, int i, Object obj) { + companion.show(fragmentManager, z2, j, (i & 8) != 0 ? 0 : j2, (i & 16) != 0 ? false : z3); } - public final void show(FragmentManager fragmentManager, boolean z2, long j, long j2) { + public final void show(FragmentManager fragmentManager, boolean z2, long j, long j2, boolean z3) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); WidgetGuildProfileSheet widgetGuildProfileSheet = new WidgetGuildProfileSheet(); Bundle I = a.I("com.discord.intent.extra.EXTRA_GUILD_ID", j); I.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", j2); I.putBoolean("com.discord.intent.extra.EXTRA_VIEWING_GUILD", z2); + I.putBoolean(WidgetGuildProfileSheet.EXTRA_FROM_UPSELL, z3); widgetGuildProfileSheet.setArguments(I); widgetGuildProfileSheet.show(fragmentManager, WidgetGuildProfileSheet.class.getName()); } @@ -120,6 +121,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { WidgetGuildProfileSheet$viewModel$2 widgetGuildProfileSheet$viewModel$2 = new WidgetGuildProfileSheet$viewModel$2(this); f0 f0Var = new f0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildProfileSheetViewModel.class), new WidgetGuildProfileSheet$appViewModels$$inlined$viewModels$1(f0Var), new h0(widgetGuildProfileSheet$viewModel$2)); + this.fromGuildEventUpsell$delegate = g.lazy(new WidgetGuildProfileSheet$fromGuildEventUpsell$2(this)); this.emojisAdapter = new WidgetGuildProfileSheetEmojisAdapter(); } @@ -196,21 +198,21 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding2 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - MaterialButton materialButton = widgetGuildProfileActionsBinding2.f1865z; + MaterialButton materialButton = widgetGuildProfileActionsBinding2.A; materialButton.setVisibility(showUploadEmoji ? 0 : 8); setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1(this, showUploadEmoji, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding; if (widgetGuildProfileActionsBinding3 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - MaterialButton materialButton2 = widgetGuildProfileActionsBinding3.r; + MaterialButton materialButton2 = widgetGuildProfileActionsBinding3.f1862s; materialButton2.setVisibility(showJoinServer ? 0 : 8); setOnClickAndDismissListener(materialButton2, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2(this, showJoinServer, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding4 = this.guildActionBinding; if (widgetGuildProfileActionsBinding4 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - MaterialButton materialButton3 = widgetGuildProfileActionsBinding4.A; + MaterialButton materialButton3 = widgetGuildProfileActionsBinding4.B; if (showViewServer) { i = 0; } @@ -237,7 +239,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - TextView textView = widgetGuildProfileActionsBinding.o; + TextView textView = widgetGuildProfileActionsBinding.p; m.checkNotNullExpressionValue(textView, "guildActionBinding.guildProfileSheetEmojisCount"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); @@ -246,14 +248,14 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding2 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - ImageView imageView = widgetGuildProfileActionsBinding2.w; + ImageView imageView = widgetGuildProfileActionsBinding2.f1863x; m.checkNotNullExpressionValue(imageView, "guildActionBinding.guild…PremiumUpsellDotSeparator"); imageView.setVisibility(isPremium ^ true ? 0 : 8); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding; if (widgetGuildProfileActionsBinding3 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - TextView textView2 = widgetGuildProfileActionsBinding3.f1863x; + TextView textView2 = widgetGuildProfileActionsBinding3.f1864y; m.checkNotNullExpressionValue(textView2, "guildActionBinding.guild…ileSheetPremiumUpsellText"); textView2.setVisibility(isPremium ^ true ? 0 : 8); if (size != 0) { @@ -261,7 +263,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding4 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView = widgetGuildProfileActionsBinding4.n; + CardView cardView = widgetGuildProfileActionsBinding4.o; m.checkNotNullExpressionValue(cardView, "guildActionBinding.guildProfileSheetEmojisCard"); cardView.setVisibility(0); int maxEmojisPerRow = maxEmojisPerRow(); @@ -269,7 +271,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding5 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - RecyclerView recyclerView = widgetGuildProfileActionsBinding5.m; + RecyclerView recyclerView = widgetGuildProfileActionsBinding5.n; m.checkNotNullExpressionValue(recyclerView, "guildActionBinding.guildProfileSheetEmojis"); RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager(); Objects.requireNonNull(layoutManager, "null cannot be cast to non-null type androidx.recyclerview.widget.GridLayoutManager"); @@ -281,7 +283,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding6 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView2 = widgetGuildProfileActionsBinding6.n; + CardView cardView2 = widgetGuildProfileActionsBinding6.o; m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetEmojisCard"); cardView2.setVisibility(8); } @@ -313,19 +315,19 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding3 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView = widgetGuildProfileActionsBinding3.u; + CardView cardView = widgetGuildProfileActionsBinding3.v; m.checkNotNullExpressionValue(cardView, "guildActionBinding.guild…fileSheetMarkAsReadAction"); cardView.setVisibility(isUnread ? 0 : 8); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding4 = this.guildActionBinding; if (widgetGuildProfileActionsBinding4 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - widgetGuildProfileActionsBinding4.t.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$1(this, j)); + widgetGuildProfileActionsBinding4.u.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$1(this, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding5 = this.guildActionBinding; if (widgetGuildProfileActionsBinding5 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView2 = widgetGuildProfileActionsBinding5.f1864y; + CardView cardView2 = widgetGuildProfileActionsBinding5.f1865z; m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetPrimaryActions"); cardView2.setVisibility(canManageChannels || (canManageEvents && StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(j)) ? 0 : 8); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding6 = this.guildActionBinding; @@ -346,79 +348,86 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding8 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - TextView textView3 = widgetGuildProfileActionsBinding8.k; - textView3.setVisibility(canManageEvents && StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(j) ? 0 : 8); - setOnClickAndDismissListener(textView3, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3(textView3, this, canManageEvents, j)); + ConstraintLayout constraintLayout = widgetGuildProfileActionsBinding8.k; + constraintLayout.setVisibility(canManageEvents && StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(j) ? 0 : 8); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding9 = this.guildActionBinding; if (widgetGuildProfileActionsBinding9 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - widgetGuildProfileActionsBinding9.f1861c.setText(z2 ? R.string.change_identity : R.string.change_nickname); + TextView textView3 = widgetGuildProfileActionsBinding9.l; + m.checkNotNullExpressionValue(textView3, "guildActionBinding.guildProfileSheetCreateEventNew"); + textView3.setVisibility(getFromGuildEventUpsell() ? 0 : 8); + setOnClickAndDismissListener(constraintLayout, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$3(constraintLayout, this, canManageEvents, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding10 = this.guildActionBinding; if (widgetGuildProfileActionsBinding10 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - View view = widgetGuildProfileActionsBinding10.b; - view.setVisibility(canChangeNickname || z2 ? 0 : 8); - setOnClickAndDismissListener(view, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4(this, canChangeNickname, z2, j, actions)); + widgetGuildProfileActionsBinding10.f1861c.setText(z2 ? R.string.change_identity : R.string.change_nickname); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding11 = this.guildActionBinding; if (widgetGuildProfileActionsBinding11 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - TextView textView4 = widgetGuildProfileActionsBinding11.v; + View view = widgetGuildProfileActionsBinding11.b; + view.setVisibility(canChangeNickname || z2 ? 0 : 8); + setOnClickAndDismissListener(view, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$4(this, canChangeNickname, z2, j, actions)); + WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding12 = this.guildActionBinding; + if (widgetGuildProfileActionsBinding12 == null) { + m.throwUninitializedPropertyAccessException("guildActionBinding"); + } + TextView textView4 = widgetGuildProfileActionsBinding12.w; textView4.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8); if (nick == null) { nick = actions.getUsername(); } textView4.setText(nick); - WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding12 = this.guildActionBinding; - if (widgetGuildProfileActionsBinding12 == null) { - m.throwUninitializedPropertyAccessException("guildActionBinding"); - } - SimpleDraweeView simpleDraweeView = widgetGuildProfileActionsBinding12.p; - String guildAvatar = actions.getGuildAvatar(); - simpleDraweeView.setVisibility((guildAvatar == null || guildAvatar.length() == 0) ^ true ? 0 : 8); - simpleDraweeView.setImageURI(IconUtils.INSTANCE.getForGuildMember(actions.getGuildAvatar(), j, j2, Integer.valueOf(DimenUtils.dpToPixels(16)), false)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding13 = this.guildActionBinding; if (widgetGuildProfileActionsBinding13 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - LinearLayout linearLayout3 = widgetGuildProfileActionsBinding13.B; - m.checkNotNullExpressionValue(linearLayout3, "guildActionBinding.perGuildIdentityContainer"); - linearLayout3.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8); + SimpleDraweeView simpleDraweeView = widgetGuildProfileActionsBinding13.q; + String guildAvatar = actions.getGuildAvatar(); + simpleDraweeView.setVisibility((guildAvatar == null || guildAvatar.length() == 0) ^ true ? 0 : 8); + simpleDraweeView.setImageURI(IconUtils.INSTANCE.getForGuildMember(actions.getGuildAvatar(), j, j2, Integer.valueOf(DimenUtils.dpToPixels(16)), false)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding14 = this.guildActionBinding; if (widgetGuildProfileActionsBinding14 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CheckedSetting checkedSetting = widgetGuildProfileActionsBinding14.e; - checkedSetting.setChecked(actions.isAllowDMChecked()); - checkedSetting.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$5(this, actions, j)); + LinearLayout linearLayout3 = widgetGuildProfileActionsBinding14.C; + m.checkNotNullExpressionValue(linearLayout3, "guildActionBinding.perGuildIdentityContainer"); + linearLayout3.setVisibility(actions.getDisplayGuildIdentityRow() ? 0 : 8); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding15 = this.guildActionBinding; if (widgetGuildProfileActionsBinding15 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CheckedSetting checkedSetting2 = widgetGuildProfileActionsBinding15.q; - checkedSetting2.setChecked(actions.getHideMutedChannels()); - checkedSetting2.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$6(this, actions, j)); + CheckedSetting checkedSetting = widgetGuildProfileActionsBinding15.e; + checkedSetting.setChecked(actions.isAllowDMChecked()); + checkedSetting.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$5(this, actions, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding16 = this.guildActionBinding; if (widgetGuildProfileActionsBinding16 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - View view2 = widgetGuildProfileActionsBinding16.f1862s; - view2.setVisibility(actions.getCanLeaveGuild() ? 0 : 8); - setOnClickAndDismissListener(view2, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$7(this, actions, j)); + CheckedSetting checkedSetting2 = widgetGuildProfileActionsBinding16.r; + checkedSetting2.setChecked(actions.getHideMutedChannels()); + checkedSetting2.setOnCheckedListener(new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$6(this, actions, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding17 = this.guildActionBinding; if (widgetGuildProfileActionsBinding17 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView3 = widgetGuildProfileActionsBinding17.l; - m.checkNotNullExpressionValue(cardView3, "guildActionBinding.guild…fileSheetDeveloperActions"); - cardView3.setVisibility(actions.isDeveloper() ? 0 : 8); + View view2 = widgetGuildProfileActionsBinding17.t; + view2.setVisibility(actions.getCanLeaveGuild() ? 0 : 8); + setOnClickAndDismissListener(view2, new WidgetGuildProfileSheet$configureGuildActions$$inlined$apply$lambda$7(this, actions, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding18 = this.guildActionBinding; if (widgetGuildProfileActionsBinding18 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - widgetGuildProfileActionsBinding18.h.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$11(this, j)); + CardView cardView3 = widgetGuildProfileActionsBinding18.m; + m.checkNotNullExpressionValue(cardView3, "guildActionBinding.guild…fileSheetDeveloperActions"); + cardView3.setVisibility(actions.isDeveloper() ? 0 : 8); + WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding19 = this.guildActionBinding; + if (widgetGuildProfileActionsBinding19 == null) { + m.throwUninitializedPropertyAccessException("guildActionBinding"); + } + widgetGuildProfileActionsBinding19.h.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$11(this, j)); } private final void configureGuildBanner(WidgetGuildProfileSheetViewModel.Banner banner) { @@ -630,8 +639,8 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { m.checkNotNullExpressionValue(materialButton4, "binding.guildProfileShee…Invite(guildId) }\n }"); } - /* JADX WARNING: Removed duplicated region for block: B:116:0x0313 */ - /* JADX WARNING: Removed duplicated region for block: B:117:0x0324 */ + /* JADX WARNING: Removed duplicated region for block: B:122:0x0336 */ + /* JADX WARNING: Removed duplicated region for block: B:123:0x0347 */ private final void configureUI(WidgetGuildProfileSheetViewModel.ViewState.Loaded loaded) { WidgetGuildProfileSheetViewModel.Actions actions; WidgetGuildProfileSheetViewModel.TabItems tabItems; @@ -673,108 +682,118 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (textView3 != null) { TextView textView4 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_create_channel); if (textView4 != null) { - TextView textView5 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_create_event); - if (textView5 != null) { - CardView cardView = (CardView) inflate.findViewById(R.id.guild_profile_sheet_developer_actions); - if (cardView != null) { - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.guild_profile_sheet_emojis); - if (recyclerView != null) { - tabItems = component10; - i = R.id.guild_profile_sheet_emojis_card; - CardView cardView2 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_emojis_card); - if (cardView2 != null) { - TextView textView6 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_emojis_count); - if (textView6 != null) { - i = R.id.guild_profile_sheet_guild_avatar; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_profile_sheet_guild_avatar); - if (simpleDraweeView != null) { - i = R.id.guild_profile_sheet_hide_muted_channels; - CheckedSetting checkedSetting2 = (CheckedSetting) inflate.findViewById(R.id.guild_profile_sheet_hide_muted_channels); - if (checkedSetting2 != null) { - MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_join_server); - if (materialButton != null) { - i = R.id.guild_profile_sheet_leave_server; - TextView textView7 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_leave_server); - if (textView7 != null) { - i = R.id.guild_profile_sheet_mark_as_read; - TextView textView8 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_mark_as_read); - if (textView8 != null) { - CardView cardView3 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_mark_as_read_action); - if (cardView3 != null) { - i = R.id.guild_profile_sheet_nickname; - TextView textView9 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_nickname); + ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(R.id.guild_profile_sheet_create_event); + if (constraintLayout != null) { + TextView textView5 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_create_event_label); + if (textView5 != null) { + TextView textView6 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_create_event_new); + if (textView6 != null) { + CardView cardView = (CardView) inflate.findViewById(R.id.guild_profile_sheet_developer_actions); + if (cardView != null) { + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.guild_profile_sheet_emojis); + if (recyclerView != null) { + tabItems = component10; + i = R.id.guild_profile_sheet_emojis_card; + CardView cardView2 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_emojis_card); + if (cardView2 != null) { + TextView textView7 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_emojis_count); + if (textView7 != null) { + i = R.id.guild_profile_sheet_guild_avatar; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_profile_sheet_guild_avatar); + if (simpleDraweeView != null) { + i = R.id.guild_profile_sheet_hide_muted_channels; + CheckedSetting checkedSetting2 = (CheckedSetting) inflate.findViewById(R.id.guild_profile_sheet_hide_muted_channels); + if (checkedSetting2 != null) { + MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_join_server); + if (materialButton != null) { + i = R.id.guild_profile_sheet_leave_server; + TextView textView8 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_leave_server); + if (textView8 != null) { + i = R.id.guild_profile_sheet_mark_as_read; + TextView textView9 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_mark_as_read); if (textView9 != null) { - i = R.id.guild_profile_sheet_premium_upsell_dot_separator; - ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_profile_sheet_premium_upsell_dot_separator); - if (imageView != null) { - i = R.id.guild_profile_sheet_premium_upsell_text; - TextView textView10 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_premium_upsell_text); + CardView cardView3 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_mark_as_read_action); + if (cardView3 != null) { + i = R.id.guild_profile_sheet_nickname; + TextView textView10 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_nickname); if (textView10 != null) { - CardView cardView4 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_primary_actions); - if (cardView4 != null) { - i = R.id.guild_profile_sheet_secondary_actions; - CardView cardView5 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_secondary_actions); - if (cardView5 != null) { - i = R.id.guild_profile_sheet_upload_emoji; - MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_upload_emoji); - if (materialButton2 != null) { - MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_view_server); - if (materialButton3 != null) { - i = R.id.per_guild_identity_container; - LinearLayout linearLayout5 = (LinearLayout) inflate.findViewById(R.id.per_guild_identity_container); - if (linearLayout5 != null) { - WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding = new WidgetGuildProfileActionsBinding(linearLayout4, linearLayout, textView, linearLayout2, checkedSetting, linearLayout3, linearLayout4, textView2, textView3, textView4, textView5, cardView, recyclerView, cardView2, textView6, simpleDraweeView, checkedSetting2, materialButton, textView7, textView8, cardView3, textView9, imageView, textView10, cardView4, cardView5, materialButton2, materialButton3, linearLayout5); - m.checkNotNullExpressionValue(widgetGuildProfileActionsBinding, "WidgetGuildProfileActionsBinding.bind(view)"); - this.guildActionBinding = widgetGuildProfileActionsBinding; - if (widgetGuildProfileActionsBinding == null) { - m.throwUninitializedPropertyAccessException("guildActionBinding"); + i = R.id.guild_profile_sheet_premium_upsell_dot_separator; + ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_profile_sheet_premium_upsell_dot_separator); + if (imageView != null) { + i = R.id.guild_profile_sheet_premium_upsell_text; + TextView textView11 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_premium_upsell_text); + if (textView11 != null) { + CardView cardView4 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_primary_actions); + if (cardView4 != null) { + i = R.id.guild_profile_sheet_secondary_actions; + CardView cardView5 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_secondary_actions); + if (cardView5 != null) { + i = R.id.guild_profile_sheet_upload_emoji; + MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_upload_emoji); + if (materialButton2 != null) { + MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_view_server); + if (materialButton3 != null) { + i = R.id.per_guild_identity_container; + LinearLayout linearLayout5 = (LinearLayout) inflate.findViewById(R.id.per_guild_identity_container); + if (linearLayout5 != null) { + WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding = new WidgetGuildProfileActionsBinding(linearLayout4, linearLayout, textView, linearLayout2, checkedSetting, linearLayout3, linearLayout4, textView2, textView3, textView4, constraintLayout, textView5, textView6, cardView, recyclerView, cardView2, textView7, simpleDraweeView, checkedSetting2, materialButton, textView8, textView9, cardView3, textView10, imageView, textView11, cardView4, cardView5, materialButton2, materialButton3, linearLayout5); + m.checkNotNullExpressionValue(widgetGuildProfileActionsBinding, "WidgetGuildProfileActionsBinding.bind(view)"); + this.guildActionBinding = widgetGuildProfileActionsBinding; + if (widgetGuildProfileActionsBinding == null) { + m.throwUninitializedPropertyAccessException("guildActionBinding"); + } + m.checkNotNullExpressionValue(recyclerView, "guildActionBinding.guildProfileSheetEmojis"); + recyclerView.setAdapter(this.emojisAdapter); + configureGuildIcon(component1, component4, component3); + configureGuildBanner(component7); + configureGuildContent(component2, component5, component6); + configureMemberCount(component8, component9); + configureTabItems(component1, tabItems, component14); + if (!component14) { + configureGuildHubActions(component1, component16.getId(), actions, loaded.getInPerGuildAvatarExperiment()); + return; + } + configureGuildActions(component1, component16.getId(), actions, loaded.getInPerGuildAvatarExperiment()); + configureEmojis(component12); + configureBottomActions(component1, this.channelId, component13); + return; + } + } else { + i = R.id.guild_profile_sheet_view_server; } - m.checkNotNullExpressionValue(recyclerView, "guildActionBinding.guildProfileSheetEmojis"); - recyclerView.setAdapter(this.emojisAdapter); - configureGuildIcon(component1, component4, component3); - configureGuildBanner(component7); - configureGuildContent(component2, component5, component6); - configureMemberCount(component8, component9); - configureTabItems(component1, tabItems, component14); - if (!component14) { - configureGuildHubActions(component1, component16.getId(), actions, loaded.getInPerGuildAvatarExperiment()); - return; - } - configureGuildActions(component1, component16.getId(), actions, loaded.getInPerGuildAvatarExperiment()); - configureEmojis(component12); - configureBottomActions(component1, this.channelId, component13); - return; } - } else { - i = R.id.guild_profile_sheet_view_server; } + } else { + i = R.id.guild_profile_sheet_primary_actions; } } - } else { - i = R.id.guild_profile_sheet_primary_actions; } } + } else { + i = R.id.guild_profile_sheet_mark_as_read_action; } } - } else { - i = R.id.guild_profile_sheet_mark_as_read_action; } + } else { + i = R.id.guild_profile_sheet_join_server; } } - } else { - i = R.id.guild_profile_sheet_join_server; } + } else { + i = R.id.guild_profile_sheet_emojis_count; } } } else { - i = R.id.guild_profile_sheet_emojis_count; + i = R.id.guild_profile_sheet_emojis; } + } else { + i = R.id.guild_profile_sheet_developer_actions; } } else { - i = R.id.guild_profile_sheet_emojis; + i = R.id.guild_profile_sheet_create_event_new; } } else { - i = R.id.guild_profile_sheet_developer_actions; + i = R.id.guild_profile_sheet_create_event_label; } } else { i = R.id.guild_profile_sheet_create_event; @@ -816,19 +835,19 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate2.findViewById(R.id.guild_profile_sheet_guild_avatar); if (simpleDraweeView2 != null) { i2 = R.id.guild_profile_sheet_invite; - TextView textView11 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_invite); - if (textView11 != null) { + TextView textView12 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_invite); + if (textView12 != null) { CardView cardView6 = (CardView) inflate2.findViewById(R.id.guild_profile_sheet_invite_action); if (cardView6 != null) { - TextView textView12 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_leave_server); - if (textView12 != null) { - TextView textView13 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_nickname); - if (textView13 != null) { + TextView textView13 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_leave_server); + if (textView13 != null) { + TextView textView14 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_nickname); + if (textView14 != null) { CardView cardView7 = (CardView) inflate2.findViewById(R.id.guild_profile_sheet_secondary_actions); if (cardView7 != null) { LinearLayout linearLayout9 = (LinearLayout) inflate2.findViewById(R.id.per_guild_identity_container); if (linearLayout9 != null) { - WidgetGuildHubProfileActionsBinding widgetGuildHubProfileActionsBinding = new WidgetGuildHubProfileActionsBinding(linearLayout7, linearLayout6, linearLayout7, linearLayout8, simpleDraweeView2, textView11, cardView6, textView12, textView13, cardView7, linearLayout9); + WidgetGuildHubProfileActionsBinding widgetGuildHubProfileActionsBinding = new WidgetGuildHubProfileActionsBinding(linearLayout7, linearLayout6, linearLayout7, linearLayout8, simpleDraweeView2, textView12, cardView6, textView13, textView14, cardView7, linearLayout9); m.checkNotNullExpressionValue(widgetGuildHubProfileActionsBinding, "WidgetGuildHubProfileActionsBinding.bind(view)"); this.guildHubActionBinding = widgetGuildHubProfileActionsBinding; } else { @@ -932,6 +951,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { return (WidgetGuildProfileSheetBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]); } + private final boolean getFromGuildEventUpsell() { + return ((Boolean) this.fromGuildEventUpsell$delegate.getValue()).booleanValue(); + } + private final WidgetGuildProfileSheetViewModel getViewModel() { return (WidgetGuildProfileSheetViewModel) this.viewModel$delegate.getValue(); } @@ -978,14 +1001,14 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView = widgetGuildProfileActionsBinding.n; + CardView cardView = widgetGuildProfileActionsBinding.o; m.checkNotNullExpressionValue(cardView, "guildActionBinding.guildProfileSheetEmojisCard"); int contentPaddingLeft = cardView.getContentPaddingLeft(); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding2 = this.guildActionBinding; if (widgetGuildProfileActionsBinding2 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView2 = widgetGuildProfileActionsBinding2.n; + CardView cardView2 = widgetGuildProfileActionsBinding2.o; m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetEmojisCard"); int contentPaddingRight = cardView2.getContentPaddingRight() + contentPaddingLeft; WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding; @@ -1004,8 +1027,8 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { return ((i - contentPaddingRight) - (linearLayout2.getPaddingEnd() + paddingStart)) / getResources().getDimensionPixelSize(R.dimen.emoji_size); } - public static final void show(FragmentManager fragmentManager, boolean z2, long j, long j2) { - Companion.show(fragmentManager, z2, j, j2); + public static final void show(FragmentManager fragmentManager, boolean z2, long j, long j2, boolean z3) { + Companion.show(fragmentManager, z2, j, j2, z3); } private final void showChangeNicknameDialog(long j, String str, boolean z2) { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDetailsViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDetailsViewModel$Companion$observeStores$1.java index 3eb59e15d8..cc9df4953a 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDetailsViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDetailsViewModel$Companion$observeStores$1.java @@ -47,7 +47,7 @@ public final class GuildScheduledEventDetailsViewModel$Companion$observeStores$1 channel = null; } Guild guild = this.$guildsStore.getGuild(findEventFromStore$default.f()); - boolean isRsvpedToEvent = this.$guildScheduledEventsStore.isRsvpedToEvent(this.$guildScheduledEventId); + boolean isRsvpedToEvent = this.$guildScheduledEventsStore.isRsvpedToEvent(findEventFromStore$default.f(), this.$guildScheduledEventId); GuildScheduledEventUtilities.Companion companion = GuildScheduledEventUtilities.Companion; return new GuildScheduledEventDetailsViewModel.StoreState(findEventFromStore$default, channel, guild, isRsvpedToEvent, GuildScheduledEventUtilities.Companion.canShareEvent$default(companion, findEventFromStore$default.b(), this.$channelsStore, this.$guildsStore, null, 8, null), companion.canStartEvent(findEventFromStore$default.f(), findEventFromStore$default.b(), this.$channelsStore, this.$permissionsStore), this.$userSettingsStore.getIsDeveloperMode()); } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java index 8b08366e67..e9289eb9a9 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java @@ -52,7 +52,7 @@ public final class GuildScheduledEventListViewModel$Companion$observeStores$1 ex guildScheduledEvents$default = arrayList; } List sortedWith = u.sortedWith(guildScheduledEvents$default, GuildScheduledEventsComparator.INSTANCE); - Set userGuildScheduledEventIds = this.$guildScheduledEventsStore.getUserGuildScheduledEventIds(); + Set userGuildScheduledEventIds = this.$guildScheduledEventsStore.getUserGuildScheduledEventIds(this.$guildId); boolean canCreateAnyEvent = GuildScheduledEventUtilities.Companion.canCreateAnyEvent(this.$guildId, this.$channelStore, this.$permissionsStore); Long valueOf = Long.valueOf(this.$voiceChannelSelectedStore.getSelectedVoiceChannelId()); if (!(valueOf.longValue() != 0)) { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java index 5cede9837a..fc07a3a869 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java @@ -7,6 +7,7 @@ import com.discord.api.guildscheduledevent.GuildScheduledEventEntityMetadata; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.stageinstance.StageInstancePrivacyLevel; import com.discord.api.utcdatetime.UtcDateTime; +import com.discord.nullserializable.NullSerializable; import com.discord.restapi.RestAPIParams; import com.discord.utilities.time.TimeUtils; import d0.z.d.m; @@ -236,10 +237,13 @@ public final class GuildScheduledEventModel implements Serializable { GuildScheduledEventPickerDate guildScheduledEventPickerDate = this.endDate; Long valueOf = (guildScheduledEventPickerDate == null || (guildScheduledEventPickerTime = this.endTime) == null) ? null : Long.valueOf(guildScheduledEventPickerDateTime.toMillis(guildScheduledEventPickerDate, guildScheduledEventPickerTime)); Long l = this.channelId; + NullSerializable bVar = l != null ? new NullSerializable.b(l) : new NullSerializable.a(null, 1); + GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata = this.entityMetadata; + NullSerializable aVar = (guildScheduledEventEntityMetadata == null || guildScheduledEventEntityMetadata.c()) ? new NullSerializable.a(null, 1) : new NullSerializable.b(this.entityMetadata); String str2 = this.description; StageInstancePrivacyLevel stageInstancePrivacyLevel = StageInstancePrivacyLevel.GUILD_ONLY; String uTCDateTime$default = guildScheduledEvent.j().g() == millis ? null : TimeUtils.toUTCDateTime$default(Long.valueOf(millis), null, 2, null); UtcDateTime i = guildScheduledEvent.i(); - return new RestAPIParams.UpdateGuildScheduledEventBody(str, str2, stageInstancePrivacyLevel, uTCDateTime$default, m.areEqual(i != null ? Long.valueOf(i.g()) : null, valueOf) ? null : TimeUtils.toUTCDateTime$default(valueOf, null, 2, null), l, this.entityType, this.entityMetadata, null, 256, null); + return new RestAPIParams.UpdateGuildScheduledEventBody(str, str2, stageInstancePrivacyLevel, uTCDateTime$default, m.areEqual(i != null ? Long.valueOf(i.g()) : null, valueOf) ? null : TimeUtils.toUTCDateTime$default(valueOf, null, 2, null), bVar, this.entityType, aVar, null, 256, null); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java index 8826962d8b..35fd180bd6 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java @@ -28,7 +28,6 @@ import com.discord.widgets.guildscheduledevent.GuildScheduledEventListItem; import com.discord.widgets.guildscheduledevent.GuildScheduledEventListViewModel; import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventDetailsBottomSheet; import com.discord.widgets.guildscheduledevent.WidgetPreviewGuildScheduledEvent; -import com.discord.widgets.stage.start.StageEventsGuildsFeatureFlag; import com.discord.widgets.voice.VoiceUtils; import d0.g; import d0.z.d.a0; @@ -68,15 +67,13 @@ public final class WidgetGuildScheduledEventListBottomSheet extends AppBottomShe public final void show(FragmentManager fragmentManager, long j, Long l) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); - if (StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(j)) { - WidgetGuildScheduledEventListBottomSheet widgetGuildScheduledEventListBottomSheet = new WidgetGuildScheduledEventListBottomSheet(); - Bundle I = a.I("com.discord.intent.extra.EXTRA_GUILD_ID", j); - if (l != null) { - I.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", l.longValue()); - } - widgetGuildScheduledEventListBottomSheet.setArguments(I); - widgetGuildScheduledEventListBottomSheet.show(fragmentManager, WidgetGuildScheduledEventListBottomSheet.class.getName()); + WidgetGuildScheduledEventListBottomSheet widgetGuildScheduledEventListBottomSheet = new WidgetGuildScheduledEventListBottomSheet(); + Bundle I = a.I("com.discord.intent.extra.EXTRA_GUILD_ID", j); + if (l != null) { + I.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", l.longValue()); } + widgetGuildScheduledEventListBottomSheet.setArguments(I); + widgetGuildScheduledEventListBottomSheet.show(fragmentManager, WidgetGuildScheduledEventListBottomSheet.class.getName()); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1.java index 82816e45cd..999c0f0e8b 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1.java @@ -2,8 +2,13 @@ package com.discord.widgets.guildscheduledevent; import android.view.View; import androidx.fragment.app.FragmentManager; +import com.discord.api.guild.GuildFeature; +import com.discord.models.guild.Guild; +import com.discord.stores.StoreStream; +import com.discord.widgets.guilds.profile.WidgetGuildProfileSheet; import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventListBottomSheet; import d0.z.d.m; +import java.util.Set; /* compiled from: WidgetGuildScheduledEventUpsellBottomSheet.kt */ public final class WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1 implements View.OnClickListener { public final /* synthetic */ WidgetGuildScheduledEventUpsellBottomSheet this$0; @@ -14,10 +19,19 @@ public final class WidgetGuildScheduledEventUpsellBottomSheet$onViewCreated$1 im @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetGuildScheduledEventListBottomSheet.Companion companion = WidgetGuildScheduledEventListBottomSheet.Companion; - FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); - m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetGuildScheduledEventListBottomSheet.Companion.show$default(companion, parentFragmentManager, WidgetGuildScheduledEventUpsellBottomSheet.access$getGuildId$p(this.this$0), null, 4, null); + Set features; + Guild guild = StoreStream.Companion.getGuilds().getGuild(WidgetGuildScheduledEventUpsellBottomSheet.access$getGuildId$p(this.this$0)); + if (guild == null || (features = guild.getFeatures()) == null || !features.contains(GuildFeature.COMMUNITY)) { + WidgetGuildProfileSheet.Companion companion = WidgetGuildProfileSheet.Companion; + FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); + WidgetGuildProfileSheet.Companion.show$default(companion, parentFragmentManager, true, WidgetGuildScheduledEventUpsellBottomSheet.access$getGuildId$p(this.this$0), 0, true, 8, null); + } else { + WidgetGuildScheduledEventListBottomSheet.Companion companion2 = WidgetGuildScheduledEventListBottomSheet.Companion; + FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager"); + WidgetGuildScheduledEventListBottomSheet.Companion.show$default(companion2, parentFragmentManager2, WidgetGuildScheduledEventUpsellBottomSheet.access$getGuildId$p(this.this$0), null, 4, null); + } this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java index 3a91503ac4..5af294cd14 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java @@ -47,25 +47,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager"); PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager); switch (menuItem.getItemId()) { - case R.id.menu_chat_add_friend /* 2131364179 */: + case R.id.menu_chat_add_friend /* 2131364181 */: WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null); break; - case R.id.menu_chat_search /* 2131364180 */: + case R.id.menu_chat_search /* 2131364182 */: launchForSearch(context); break; - case R.id.menu_chat_side_panel /* 2131364181 */: + case R.id.menu_chat_side_panel /* 2131364183 */: this.$panelLayout.openEndPanel(); break; - case R.id.menu_chat_start_call /* 2131364182 */: + case R.id.menu_chat_start_call /* 2131364184 */: privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_start_group /* 2131364183 */: + case R.id.menu_chat_start_group /* 2131364185 */: ChannelInviteLaunchUtils.inviteToChannel$default(ChannelInviteLaunchUtils.INSTANCE, this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar", null, null, 24, null); break; - case R.id.menu_chat_start_video_call /* 2131364184 */: + case R.id.menu_chat_start_video_call /* 2131364186 */: privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_stop_call /* 2131364185 */: + case R.id.menu_chat_stop_call /* 2131364187 */: StoreStream.Companion.getVoiceChannelSelected().clear(); break; } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1.java index d0845c522f..b1f3f0c467 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1.java @@ -1,6 +1,8 @@ package com.discord.widgets.home; import com.discord.api.permission.Permission; +import com.discord.models.experiments.domain.Experiment; +import com.discord.stores.StoreExperiments; import com.discord.stores.StoreGuildWelcomeScreens; import com.discord.stores.StoreLurking; import com.discord.stores.StorePermissions; @@ -12,6 +14,7 @@ import rx.Observable; import rx.functions.Func3; /* compiled from: WidgetHomeViewModel.kt */ public final class WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1 implements b> { + public final /* synthetic */ StoreExperiments $storeExperiments; public final /* synthetic */ StoreGuildWelcomeScreens $storeGuildWelcomeScreens; public final /* synthetic */ StoreLurking $storeLurking; public final /* synthetic */ StorePermissions $storePermissions; @@ -20,8 +23,10 @@ public final class WidgetHomeViewModel$Companion$observeStoreState$guildInfoObse /* renamed from: com.discord.widgets.home.WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1$1 reason: invalid class name */ public static final class AnonymousClass1 implements Func3 { public final /* synthetic */ Long $selectedGuildId; + public final /* synthetic */ WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1 this$0; - public AnonymousClass1(Long l) { + public AnonymousClass1(WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1 widgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1, Long l) { + this.this$0 = widgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1; this.$selectedGuildId = l; } @@ -30,19 +35,26 @@ public final class WidgetHomeViewModel$Companion$observeStoreState$guildInfoObse m.checkNotNullExpressionValue(l2, "selectedGuildId"); long longValue = l2.longValue(); m.checkNotNullExpressionValue(bool, "isLurking"); - return new WidgetHomeViewModel.GuildInfo(longValue, bool.booleanValue(), state, l != null ? PermissionUtils.can(Permission.MANAGE_EVENTS, Long.valueOf(l.longValue())) : false); + boolean booleanValue = bool.booleanValue(); + boolean can = l != null ? PermissionUtils.can(Permission.MANAGE_EVENTS, Long.valueOf(l.longValue())) : false; + StoreExperiments storeExperiments = this.this$0.$storeExperiments; + Long l3 = this.$selectedGuildId; + m.checkNotNullExpressionValue(l3, "selectedGuildId"); + Experiment guildExperiment = storeExperiments.getGuildExperiment("2021-06_stage_events", l3.longValue(), false); + return new WidgetHomeViewModel.GuildInfo(longValue, booleanValue, state, can, guildExperiment != null && guildExperiment.getBucket() == 1); } } - public WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(StoreLurking storeLurking, StoreGuildWelcomeScreens storeGuildWelcomeScreens, StorePermissions storePermissions) { + public WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(StoreLurking storeLurking, StoreGuildWelcomeScreens storeGuildWelcomeScreens, StorePermissions storePermissions, StoreExperiments storeExperiments) { this.$storeLurking = storeLurking; this.$storeGuildWelcomeScreens = storeGuildWelcomeScreens; this.$storePermissions = storePermissions; + this.$storeExperiments = storeExperiments; } public final Observable call(Long l) { StoreLurking storeLurking = this.$storeLurking; m.checkNotNullExpressionValue(l, "selectedGuildId"); - return Observable.i(storeLurking.isLurkingObs(l.longValue()), this.$storeGuildWelcomeScreens.observeGuildWelcomeScreen(l.longValue()), this.$storePermissions.observePermissionsForGuild(l.longValue()), new AnonymousClass1(l)); + return Observable.i(storeLurking.isLurkingObs(l.longValue()), this.$storeGuildWelcomeScreens.observeGuildWelcomeScreen(l.longValue()), this.$storePermissions.observePermissionsForGuild(l.longValue()), new AnonymousClass1(this, l)); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java index 230f9d1515..4669d972cb 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java @@ -119,7 +119,7 @@ public final class WidgetHomeViewModel extends AppViewModel { } private final Observable observeStoreState(StoreGuildSelected storeGuildSelected, StoreNavigation storeNavigation, StoreLurking storeLurking, StoreUser storeUser, StoreGuildWelcomeScreens storeGuildWelcomeScreens, StoreChannelsSelected storeChannelsSelected, StoreExperiments storeExperiments, StorePermissions storePermissions) { - Observable e = Observable.e(storeNavigation.observeLeftPanelState(), storeNavigation.observeRightPanelState(), storeGuildSelected.observeSelectedGuildId().X(new WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(storeLurking, storeGuildWelcomeScreens, storePermissions)), StoreUser.observeMe$default(storeUser, false, 1, null), storeChannelsSelected.observeResolvedSelectedChannel(), storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false), storeExperiments.observeUserExperiment("2021-09_events_upsell", true), WidgetHomeViewModel$Companion$observeStoreState$1.INSTANCE); + Observable e = Observable.e(storeNavigation.observeLeftPanelState(), storeNavigation.observeRightPanelState(), storeGuildSelected.observeSelectedGuildId().X(new WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(storeLurking, storeGuildWelcomeScreens, storePermissions, storeExperiments)), StoreUser.observeMe$default(storeUser, false, 1, null), storeChannelsSelected.observeResolvedSelectedChannel(), storeExperiments.observeUserExperiment("2021-05_per_guild_avatars", false), storeExperiments.observeUserExperiment("2021-09_events_upsell", false), WidgetHomeViewModel$Companion$observeStoreState$1.INSTANCE); m.checkNotNullExpressionValue(e, "Observable.combineLatest…t == 1,\n )\n }"); return e; } @@ -324,19 +324,21 @@ public final class WidgetHomeViewModel extends AppViewModel { /* compiled from: WidgetHomeViewModel.kt */ public static final class GuildInfo { + private final boolean canGuildShowEvents; private final boolean canManageEvents; private final long guildId; private final boolean isLurking; private final StoreGuildWelcomeScreens.State welcomeScreenState; - public GuildInfo(long j, boolean z2, StoreGuildWelcomeScreens.State state, boolean z3) { + public GuildInfo(long j, boolean z2, StoreGuildWelcomeScreens.State state, boolean z3, boolean z4) { this.guildId = j; this.isLurking = z2; this.welcomeScreenState = state; this.canManageEvents = z3; + this.canGuildShowEvents = z4; } - public static /* synthetic */ GuildInfo copy$default(GuildInfo guildInfo, long j, boolean z2, StoreGuildWelcomeScreens.State state, boolean z3, int i, Object obj) { + public static /* synthetic */ GuildInfo copy$default(GuildInfo guildInfo, long j, boolean z2, StoreGuildWelcomeScreens.State state, boolean z3, boolean z4, int i, Object obj) { if ((i & 1) != 0) { j = guildInfo.guildId; } @@ -349,7 +351,10 @@ public final class WidgetHomeViewModel extends AppViewModel { if ((i & 8) != 0) { z3 = guildInfo.canManageEvents; } - return guildInfo.copy(j, z2, state, z3); + if ((i & 16) != 0) { + z4 = guildInfo.canGuildShowEvents; + } + return guildInfo.copy(j, z2, state, z3, z4); } public final long component1() { @@ -368,8 +373,12 @@ public final class WidgetHomeViewModel extends AppViewModel { return this.canManageEvents; } - public final GuildInfo copy(long j, boolean z2, StoreGuildWelcomeScreens.State state, boolean z3) { - return new GuildInfo(j, z2, state, z3); + public final boolean component5() { + return this.canGuildShowEvents; + } + + public final GuildInfo copy(long j, boolean z2, StoreGuildWelcomeScreens.State state, boolean z3, boolean z4) { + return new GuildInfo(j, z2, state, z3, z4); } public boolean equals(Object obj) { @@ -380,7 +389,11 @@ public final class WidgetHomeViewModel extends AppViewModel { return false; } GuildInfo guildInfo = (GuildInfo) obj; - return this.guildId == guildInfo.guildId && this.isLurking == guildInfo.isLurking && m.areEqual(this.welcomeScreenState, guildInfo.welcomeScreenState) && this.canManageEvents == guildInfo.canManageEvents; + return this.guildId == guildInfo.guildId && this.isLurking == guildInfo.isLurking && m.areEqual(this.welcomeScreenState, guildInfo.welcomeScreenState) && this.canManageEvents == guildInfo.canManageEvents && this.canGuildShowEvents == guildInfo.canGuildShowEvents; + } + + public final boolean getCanGuildShowEvents() { + return this.canGuildShowEvents; } public final boolean getCanManageEvents() { @@ -409,10 +422,18 @@ public final class WidgetHomeViewModel extends AppViewModel { StoreGuildWelcomeScreens.State state = this.welcomeScreenState; int hashCode = (i5 + (state != null ? state.hashCode() : 0)) * 31; boolean z3 = this.canManageEvents; - if (!z3) { - i = z3 ? 1 : 0; + if (z3) { + z3 = true; } - return hashCode + i; + int i6 = z3 ? 1 : 0; + int i7 = z3 ? 1 : 0; + int i8 = z3 ? 1 : 0; + int i9 = (hashCode + i6) * 31; + boolean z4 = this.canGuildShowEvents; + if (!z4) { + i = z4 ? 1 : 0; + } + return i9 + i; } public final boolean isLurking() { @@ -427,7 +448,9 @@ public final class WidgetHomeViewModel extends AppViewModel { P.append(", welcomeScreenState="); P.append(this.welcomeScreenState); P.append(", canManageEvents="); - return a.L(P, this.canManageEvents, ")"); + P.append(this.canManageEvents); + P.append(", canGuildShowEvents="); + return a.L(P, this.canGuildShowEvents, ")"); } } @@ -861,7 +884,7 @@ public final class WidgetHomeViewModel extends AppViewModel { emitShowChannelOnboardingSheet(); } else if (shouldShowGuildIdentityMarketingSheet(this.previousLeftPanelState, leftPanelState, storeState.getMe(), storeState.isInGuildIdentityExperiment())) { emitShowGuildIdentityMarketingSheet(guildId); - } else if (shouldShowGuildEventUpsell(storeState.getGuildInfo().getCanManageEvents(), storeState.isInEventsUpsellExperiment())) { + } else if (shouldShowGuildEventUpsell(storeState.getGuildInfo().getCanManageEvents(), storeState.getGuildInfo().getCanGuildShowEvents(), storeState.isInEventsUpsellExperiment())) { SharedPreferences.Editor edit = this.sharedPreferences.edit(); m.checkNotNullExpressionValue(edit, "editor"); edit.putBoolean(WidgetGuildScheduledEventUpsellBottomSheet.GUILD_EVENT_UPSELL_CACHE_KEY, true); @@ -882,8 +905,8 @@ public final class WidgetHomeViewModel extends AppViewModel { return ((panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c)) && ((j > 0 ? 1 : (j == 0 ? 0 : -1)) != 0) && z2 && !this.channelOnboardingManager.hasUserSeenChannelOnboarding(); } - private final boolean shouldShowGuildEventUpsell(boolean z2, boolean z3) { - return z2 && !this.sharedPreferences.getBoolean(WidgetGuildScheduledEventUpsellBottomSheet.GUILD_EVENT_UPSELL_CACHE_KEY, false) && z3; + private final boolean shouldShowGuildEventUpsell(boolean z2, boolean z3, boolean z4) { + return z2 && !this.sharedPreferences.getBoolean(WidgetGuildScheduledEventUpsellBottomSheet.GUILD_EVENT_UPSELL_CACHE_KEY, false) && z4 && z3; } private final boolean shouldShowGuildIdentityMarketingSheet(PanelState panelState, PanelState panelState2, MeUser meUser, boolean z2) { diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java index 784aee8fd2..c93d9def09 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java @@ -116,16 +116,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1 implements Action public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_media_browser /* 2131364202 */: + case R.id.menu_media_browser /* 2131364204 */: m.checkNotNullExpressionValue(context, "context"); String uri = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri, "sourceUri.toString()"); UriHandler.handleOrUntrusted$default(context, uri, null, 4, null); return; - case R.id.menu_media_download /* 2131364203 */: + case R.id.menu_media_download /* 2131364205 */: this.this$0.requestMediaDownload(new AnonymousClass1(this, context)); return; - case R.id.menu_media_share /* 2131364204 */: + case R.id.menu_media_share /* 2131364206 */: m.checkNotNullExpressionValue(context, "context"); String uri2 = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri2, "sourceUri.toString()"); diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java index 5b174b0667..e9c93e10b9 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java @@ -64,11 +64,11 @@ public final class WidgetNoticeDialog extends AppDialog { private static final String ARG_THEME_ID = "theme_id"; /* renamed from: CANCEL_BUTTON */ - public static final int notice_cancel = 2131364348; + public static final int notice_cancel = 2131364350; public static final Companion Companion = new Companion(null); /* renamed from: OK_BUTTON */ - public static final int notice_ok = 2131364353; + public static final int notice_ok = 2131364355; public static final int ON_SHOW = 0; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null); private Map> listenerMap; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java index 2716eac036..433be943cf 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java @@ -45,13 +45,13 @@ public final class WidgetServerSettingsChannels$configureUI$1 implements public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_sort_channel /* 2131364220 */: + case R.id.menu_sort_channel /* 2131364222 */: WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion; FragmentManager childFragmentManager = this.this$0.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager"); companion.show(childFragmentManager, new AnonymousClass1(this)); return; - case R.id.menu_sort_done /* 2131364221 */: + case R.id.menu_sort_done /* 2131364223 */: WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1); return; default: diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java index b1f2325b88..c714f4578d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java @@ -571,135 +571,135 @@ public final class WidgetServerSettingsEditRole extends AppFragment { for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().g, getBinding().h, getBinding().i, getBinding().j, getBinding().m, getBinding().r, getBinding().u, getBinding().v, getBinding().f1821y, getBinding().C, getBinding().f1822z, getBinding().w, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().H, getBinding().I, getBinding().N, getBinding().O, getBinding().o, getBinding().n, getBinding().P, getBinding().Q, getBinding().R, getBinding().S, getBinding().f, getBinding().T, getBinding().V, getBinding().Z, getBinding().f1817b0, getBinding().Y, getBinding().W, getBinding().X, getBinding().f1816a0, getBinding().G, getBinding().U, getBinding().J, getBinding().f1820x})) { m.checkNotNullExpressionValue(checkedSetting, "setting"); switch (checkedSetting.getId()) { - case R.id.role_settings_add_reactions /* 2131364793 */: + case R.id.role_settings_add_reactions /* 2131364795 */: j = 64; break; - case R.id.role_settings_administrator /* 2131364794 */: + case R.id.role_settings_administrator /* 2131364796 */: j = 8; break; - case R.id.role_settings_attach_files /* 2131364795 */: + case R.id.role_settings_attach_files /* 2131364797 */: j = Permission.ATTACH_FILES; break; - case R.id.role_settings_ban_members /* 2131364796 */: + case R.id.role_settings_ban_members /* 2131364798 */: j = 4; break; - case R.id.role_settings_change_nickname /* 2131364797 */: + case R.id.role_settings_change_nickname /* 2131364799 */: j = Permission.CHANGE_NICKNAME; break; - case R.id.role_settings_color_disabled_overlay /* 2131364798 */: - case R.id.role_settings_color_selector_container /* 2131364799 */: - case R.id.role_settings_current_color_display /* 2131364803 */: - case R.id.role_settings_edit_name_disabled_overlay /* 2131364804 */: - case R.id.role_settings_hoist_checkedsetting /* 2131364806 */: - case R.id.role_settings_icon_container /* 2131364807 */: - case R.id.role_settings_mentionable_checkedsetting /* 2131364819 */: - case R.id.role_settings_overview_scroll /* 2131364820 */: - case R.id.role_settings_role_icon /* 2131364825 */: - case R.id.role_settings_role_icon_divider /* 2131364826 */: - case R.id.role_settings_role_icon_header /* 2131364827 */: + case R.id.role_settings_color_disabled_overlay /* 2131364800 */: + case R.id.role_settings_color_selector_container /* 2131364801 */: + case R.id.role_settings_current_color_display /* 2131364805 */: + case R.id.role_settings_edit_name_disabled_overlay /* 2131364806 */: + case R.id.role_settings_hoist_checkedsetting /* 2131364808 */: + case R.id.role_settings_icon_container /* 2131364809 */: + case R.id.role_settings_mentionable_checkedsetting /* 2131364821 */: + case R.id.role_settings_overview_scroll /* 2131364822 */: + case R.id.role_settings_role_icon /* 2131364827 */: + case R.id.role_settings_role_icon_divider /* 2131364828 */: + case R.id.role_settings_role_icon_header /* 2131364829 */: default: j = 0; break; - case R.id.role_settings_create_instant_invite /* 2131364800 */: + case R.id.role_settings_create_instant_invite /* 2131364802 */: j = 1; break; - case R.id.role_settings_create_private_threads /* 2131364801 */: + case R.id.role_settings_create_private_threads /* 2131364803 */: j = Permission.CREATE_PRIVATE_THREADS; break; - case R.id.role_settings_create_public_threads /* 2131364802 */: + case R.id.role_settings_create_public_threads /* 2131364804 */: j = Permission.CREATE_PUBLIC_THREADS; break; - case R.id.role_settings_embed_links /* 2131364805 */: + case R.id.role_settings_embed_links /* 2131364807 */: j = Permission.EMBED_LINKS; break; - case R.id.role_settings_kick_members /* 2131364808 */: + case R.id.role_settings_kick_members /* 2131364810 */: j = 2; break; - case R.id.role_settings_manage_channels /* 2131364809 */: + case R.id.role_settings_manage_channels /* 2131364811 */: j = 16; break; - case R.id.role_settings_manage_emojis_and_stickers /* 2131364810 */: + case R.id.role_settings_manage_emojis_and_stickers /* 2131364812 */: j = Permission.MANAGE_EMOJIS_AND_STICKERS; break; - case R.id.role_settings_manage_events /* 2131364811 */: + case R.id.role_settings_manage_events /* 2131364813 */: j = Permission.MANAGE_EVENTS; break; - case R.id.role_settings_manage_messages /* 2131364812 */: + case R.id.role_settings_manage_messages /* 2131364814 */: j = Permission.MANAGE_MESSAGES; break; - case R.id.role_settings_manage_nicknames /* 2131364813 */: + case R.id.role_settings_manage_nicknames /* 2131364815 */: j = Permission.MANAGE_NICKNAMES; break; - case R.id.role_settings_manage_roles /* 2131364814 */: + case R.id.role_settings_manage_roles /* 2131364816 */: j = Permission.MANAGE_ROLES; break; - case R.id.role_settings_manage_server /* 2131364815 */: + case R.id.role_settings_manage_server /* 2131364817 */: j = 32; break; - case R.id.role_settings_manage_threads /* 2131364816 */: + case R.id.role_settings_manage_threads /* 2131364818 */: j = Permission.MANAGE_THREADS; break; - case R.id.role_settings_manage_webhooks /* 2131364817 */: + case R.id.role_settings_manage_webhooks /* 2131364819 */: j = Permission.MANAGE_WEBHOOKS; break; - case R.id.role_settings_mention_everyone /* 2131364818 */: + case R.id.role_settings_mention_everyone /* 2131364820 */: j = Permission.MENTION_EVERYONE; break; - case R.id.role_settings_priority_speaker /* 2131364821 */: + case R.id.role_settings_priority_speaker /* 2131364823 */: j = 256; break; - case R.id.role_settings_read_message_history /* 2131364822 */: + case R.id.role_settings_read_message_history /* 2131364824 */: j = Permission.READ_MESSAGE_HISTORY; break; - case R.id.role_settings_read_messages /* 2131364823 */: + case R.id.role_settings_read_messages /* 2131364825 */: j = Permission.VIEW_CHANNEL; break; - case R.id.role_settings_request_to_speak /* 2131364824 */: + case R.id.role_settings_request_to_speak /* 2131364826 */: j = Permission.REQUEST_TO_SPEAK; break; - case R.id.role_settings_send_messages /* 2131364828 */: + case R.id.role_settings_send_messages /* 2131364830 */: j = Permission.SEND_MESSAGES; break; - case R.id.role_settings_send_messages_in_threads /* 2131364829 */: + case R.id.role_settings_send_messages_in_threads /* 2131364831 */: j = Permission.SEND_MESSAGES_IN_THREADS; break; - case R.id.role_settings_send_tts_messages /* 2131364830 */: + case R.id.role_settings_send_tts_messages /* 2131364832 */: j = Permission.SEND_TTS_MESSAGES; break; - case R.id.role_settings_use_application_commands /* 2131364831 */: + case R.id.role_settings_use_application_commands /* 2131364833 */: j = Permission.USE_APPLICATION_COMMANDS; break; - case R.id.role_settings_use_external_emojis /* 2131364832 */: + case R.id.role_settings_use_external_emojis /* 2131364834 */: j = Permission.USE_EXTERNAL_EMOJIS; break; - case R.id.role_settings_use_external_stickers /* 2131364833 */: + case R.id.role_settings_use_external_stickers /* 2131364835 */: j = Permission.USE_EXTERNAL_STICKERS; break; - case R.id.role_settings_view_audit_log /* 2131364834 */: + case R.id.role_settings_view_audit_log /* 2131364836 */: j = 128; break; - case R.id.role_settings_view_guild_analytics /* 2131364835 */: + case R.id.role_settings_view_guild_analytics /* 2131364837 */: j = Permission.VIEW_GUILD_ANALYTICS; break; - case R.id.role_settings_voice_connect /* 2131364836 */: + case R.id.role_settings_voice_connect /* 2131364838 */: j = Permission.CONNECT; break; - case R.id.role_settings_voice_deafen_members /* 2131364837 */: + case R.id.role_settings_voice_deafen_members /* 2131364839 */: j = Permission.DEAFEN_MEMBERS; break; - case R.id.role_settings_voice_move_members /* 2131364838 */: + case R.id.role_settings_voice_move_members /* 2131364840 */: j = Permission.MOVE_MEMBERS; break; - case R.id.role_settings_voice_mute_members /* 2131364839 */: + case R.id.role_settings_voice_mute_members /* 2131364841 */: j = Permission.MUTE_MEMBERS; break; - case R.id.role_settings_voice_speak /* 2131364840 */: + case R.id.role_settings_voice_speak /* 2131364842 */: j = Permission.SPEAK; break; - case R.id.role_settings_voice_use_voice_activity /* 2131364841 */: + case R.id.role_settings_voice_use_voice_activity /* 2131364843 */: j = Permission.USE_VAD; break; - case R.id.role_settings_voice_video /* 2131364842 */: + case R.id.role_settings_voice_video /* 2131364844 */: j = 512; break; } diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java index fa302ddbed..7eb716d2a9 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java @@ -33,10 +33,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1 implements Acti public final boolean onMenuItemClick(MenuItem menuItem) { m.checkNotNullExpressionValue(menuItem, "it"); switch (menuItem.getItemId()) { - case R.id.menu_audit_log_sort_actions /* 2131364169 */: + case R.id.menu_audit_log_sort_actions /* 2131364171 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1); break; - case R.id.menu_audit_log_sort_users /* 2131364170 */: + case R.id.menu_audit_log_sort_users /* 2131364172 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0); break; } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java index f9d846201e..37505dd7da 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java @@ -17,12 +17,12 @@ public final class WidgetSettings$configureToolbar$1 implements Action2< public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_settings_debugging /* 2131364215 */: + case R.id.menu_settings_debugging /* 2131364217 */: WidgetDebugging.Companion companion = WidgetDebugging.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); return; - case R.id.menu_settings_log_out /* 2131364216 */: + case R.id.menu_settings_log_out /* 2131364218 */: WidgetSettings widgetSettings = this.this$0; m.checkNotNullExpressionValue(context, "context"); WidgetSettings.access$showLogoutDialog(widgetSettings, context); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 13d67a3b59..dae43486f5 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -314,7 +314,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 94.7 - Beta (94107)"); + textView.setText(string + " - 94.8 - Beta (94108)"); binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.java index b97ab8df72..8092403d74 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.java @@ -39,7 +39,7 @@ public final class WidgetGlobalSearch$configureUI$1 extends o implements Functio FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager"); Guild guild = item.getGuild(); - WidgetGuildProfileSheet.Companion.show$default(companion2, parentFragmentManager2, false, guild != null ? guild.getId() : 0, 0, 8, null); + WidgetGuildProfileSheet.Companion.show$default(companion2, parentFragmentManager2, false, guild != null ? guild.getId() : 0, 0, false, 24, null); } } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java index 3a575d8ddb..e5033b8ce9 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java @@ -52,21 +52,21 @@ public final class WidgetCallFullscreen$configureMenu$1 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_call_overlay_launcher /* 2131364173 */: + case R.id.menu_call_overlay_launcher /* 2131364175 */: DiscordOverlayService.Companion companion = DiscordOverlayService.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launchForConnect(context); return; - case R.id.menu_call_switch_camera /* 2131364174 */: + case R.id.menu_call_switch_camera /* 2131364176 */: WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed(); return; - case R.id.menu_call_video_list /* 2131364175 */: + case R.id.menu_call_video_list /* 2131364177 */: WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this)); return; - case R.id.menu_call_voice_settings /* 2131364176 */: + case R.id.menu_call_voice_settings /* 2131364178 */: WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion; Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h()); FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/res/layout-sw600dp/design_layout_snackbar.xml b/app/src/main/res/layout-sw600dp/design_layout_snackbar.xml index a9d4786b25..299eea734b 100644 --- a/app/src/main/res/layout-sw600dp/design_layout_snackbar.xml +++ b/app/src/main/res/layout-sw600dp/design_layout_snackbar.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/layout-v22/view_upload_progress.xml b/app/src/main/res/layout-v22/view_upload_progress.xml index 22e9c28862..da4d41d822 100644 --- a/app/src/main/res/layout-v22/view_upload_progress.xml +++ b/app/src/main/res/layout-v22/view_upload_progress.xml @@ -3,5 +3,5 @@ - + diff --git a/app/src/main/res/layout-v22/widget_bug_report.xml b/app/src/main/res/layout-v22/widget_bug_report.xml index 5fe31a1cd6..37dd116445 100644 --- a/app/src/main/res/layout-v22/widget_bug_report.xml +++ b/app/src/main/res/layout-v22/widget_bug_report.xml @@ -43,7 +43,7 @@ - + diff --git a/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml b/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml index c7b1574996..aca2a4fd0a 100644 --- a/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml +++ b/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml @@ -9,7 +9,7 @@ - + diff --git a/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscription_edit_tier.xml b/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscription_edit_tier.xml index 628074c722..4eeec58d90 100644 --- a/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscription_edit_tier.xml +++ b/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscription_edit_tier.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscriptions.xml b/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscriptions.xml index dd2428e4bc..bf7f79d02f 100644 --- a/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscriptions.xml +++ b/app/src/main/res/layout-v22/widget_server_settings_guild_role_subscriptions.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout-v22/widget_server_settings_role_members.xml b/app/src/main/res/layout-v22/widget_server_settings_role_members.xml index 9c11fae12d..7156fd4240 100644 --- a/app/src/main/res/layout-v22/widget_server_settings_role_members.xml +++ b/app/src/main/res/layout-v22/widget_server_settings_role_members.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/layout/abc_select_dialog_material.xml b/app/src/main/res/layout/abc_select_dialog_material.xml index 2efe77655d..30779bebc1 100644 --- a/app/src/main/res/layout/abc_select_dialog_material.xml +++ b/app/src/main/res/layout/abc_select_dialog_material.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/layout/design_layout_snackbar.xml b/app/src/main/res/layout/design_layout_snackbar.xml index 006e3ca6b6..0b3204fc54 100644 --- a/app/src/main/res/layout/design_layout_snackbar.xml +++ b/app/src/main/res/layout/design_layout_snackbar.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/layout/material_time_input.xml b/app/src/main/res/layout/material_time_input.xml index e453f59c42..a485408938 100644 --- a/app/src/main/res/layout/material_time_input.xml +++ b/app/src/main/res/layout/material_time_input.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/layout/notification_action.xml b/app/src/main/res/layout/notification_action.xml index 737ff6001c..d4e3a4d1bb 100644 --- a/app/src/main/res/layout/notification_action.xml +++ b/app/src/main/res/layout/notification_action.xml @@ -1,5 +1,5 @@ - + - + diff --git a/app/src/main/res/layout/notification_action_tombstone.xml b/app/src/main/res/layout/notification_action_tombstone.xml index ecc848bf03..3fd93b64d2 100644 --- a/app/src/main/res/layout/notification_action_tombstone.xml +++ b/app/src/main/res/layout/notification_action_tombstone.xml @@ -1,5 +1,5 @@ - + - + diff --git a/app/src/main/res/layout/test_action_chip.xml b/app/src/main/res/layout/test_action_chip.xml index 5379553887..1a9374fe95 100644 --- a/app/src/main/res/layout/test_action_chip.xml +++ b/app/src/main/res/layout/test_action_chip.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/layout/test_chip_zero_corner_radius.xml b/app/src/main/res/layout/test_chip_zero_corner_radius.xml index a87327d152..77815e8cf0 100644 --- a/app/src/main/res/layout/test_chip_zero_corner_radius.xml +++ b/app/src/main/res/layout/test_chip_zero_corner_radius.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/layout/test_reflow_chipgroup.xml b/app/src/main/res/layout/test_reflow_chipgroup.xml index de3bb58962..264439c595 100644 --- a/app/src/main/res/layout/test_reflow_chipgroup.xml +++ b/app/src/main/res/layout/test_reflow_chipgroup.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/layout/test_toolbar_surface.xml b/app/src/main/res/layout/test_toolbar_surface.xml index 6f4fcad20d..ffb0b93740 100644 --- a/app/src/main/res/layout/test_toolbar_surface.xml +++ b/app/src/main/res/layout/test_toolbar_surface.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/layout/thread_browser_item_loading.xml b/app/src/main/res/layout/thread_browser_item_loading.xml index 52b13d7230..0866532449 100644 --- a/app/src/main/res/layout/thread_browser_item_loading.xml +++ b/app/src/main/res/layout/thread_browser_item_loading.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/layout/view_experiment_override.xml b/app/src/main/res/layout/view_experiment_override.xml index 3c5ba70032..ba4015fecb 100644 --- a/app/src/main/res/layout/view_experiment_override.xml +++ b/app/src/main/res/layout/view_experiment_override.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/layout/view_upload_progress.xml b/app/src/main/res/layout/view_upload_progress.xml index 56d35c8c4b..2c19da2b12 100644 --- a/app/src/main/res/layout/view_upload_progress.xml +++ b/app/src/main/res/layout/view_upload_progress.xml @@ -3,5 +3,5 @@ - + diff --git a/app/src/main/res/layout/widget_bug_report.xml b/app/src/main/res/layout/widget_bug_report.xml index 819a53c334..6ce0ad21c1 100644 --- a/app/src/main/res/layout/widget_bug_report.xml +++ b/app/src/main/res/layout/widget_bug_report.xml @@ -43,7 +43,7 @@ - + diff --git a/app/src/main/res/layout/widget_channel_picker_sheet.xml b/app/src/main/res/layout/widget_channel_picker_sheet.xml index 9b62d04638..3c8431222e 100644 --- a/app/src/main/res/layout/widget_channel_picker_sheet.xml +++ b/app/src/main/res/layout/widget_channel_picker_sheet.xml @@ -9,7 +9,7 @@ - + diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_loading.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_loading.xml index af43fe63b4..9105eac4ad 100644 --- a/app/src/main/res/layout/widget_chat_list_adapter_item_loading.xml +++ b/app/src/main/res/layout/widget_chat_list_adapter_item_loading.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/layout/widget_guild_profile_actions.xml b/app/src/main/res/layout/widget_guild_profile_actions.xml index 527b0648b5..15b823e740 100644 --- a/app/src/main/res/layout/widget_guild_profile_actions.xml +++ b/app/src/main/res/layout/widget_guild_profile_actions.xml @@ -6,7 +6,10 @@ - + + + + diff --git a/app/src/main/res/layout/widget_oauth_authorize.xml b/app/src/main/res/layout/widget_oauth_authorize.xml index b40c6d6435..36739ab5e4 100644 --- a/app/src/main/res/layout/widget_oauth_authorize.xml +++ b/app/src/main/res/layout/widget_oauth_authorize.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout/widget_price_tier_picker_bottom_sheet.xml b/app/src/main/res/layout/widget_price_tier_picker_bottom_sheet.xml index 0d9947eea8..a6093c1078 100644 --- a/app/src/main/res/layout/widget_price_tier_picker_bottom_sheet.xml +++ b/app/src/main/res/layout/widget_price_tier_picker_bottom_sheet.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout/widget_server_settings_emojis.xml b/app/src/main/res/layout/widget_server_settings_emojis.xml index aed2e0ccbc..f385a43939 100644 --- a/app/src/main/res/layout/widget_server_settings_emojis.xml +++ b/app/src/main/res/layout/widget_server_settings_emojis.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout/widget_server_settings_guild_role_subscription_edit_tier.xml b/app/src/main/res/layout/widget_server_settings_guild_role_subscription_edit_tier.xml index 4d9c411595..02539f2ab7 100644 --- a/app/src/main/res/layout/widget_server_settings_guild_role_subscription_edit_tier.xml +++ b/app/src/main/res/layout/widget_server_settings_guild_role_subscription_edit_tier.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout/widget_server_settings_guild_role_subscriptions.xml b/app/src/main/res/layout/widget_server_settings_guild_role_subscriptions.xml index 40fbaefc3f..49b39cbfd4 100644 --- a/app/src/main/res/layout/widget_server_settings_guild_role_subscriptions.xml +++ b/app/src/main/res/layout/widget_server_settings_guild_role_subscriptions.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout/widget_server_settings_role_members.xml b/app/src/main/res/layout/widget_server_settings_role_members.xml index bbb317d22e..2e8b015a0e 100644 --- a/app/src/main/res/layout/widget_server_settings_role_members.xml +++ b/app/src/main/res/layout/widget_server_settings_role_members.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/layout/widget_settings_developer.xml b/app/src/main/res/layout/widget_settings_developer.xml index 9338387e7f..f81c7714a8 100644 --- a/app/src/main/res/layout/widget_settings_developer.xml +++ b/app/src/main/res/layout/widget_settings_developer.xml @@ -10,7 +10,7 @@ - + diff --git a/app/src/main/res/values-land/styles.xml b/app/src/main/res/values-land/styles.xml index 80da8ddd12..c3a6a5e8ae 100644 --- a/app/src/main/res/values-land/styles.xml +++ b/app/src/main/res/values-land/styles.xml @@ -38,11 +38,11 @@ - - - - - - - - diff --git a/app/src/main/res/values-sw600dp/styles.xml b/app/src/main/res/values-sw600dp/styles.xml index c845c2c92a..2acf73050b 100644 --- a/app/src/main/res/values-sw600dp/styles.xml +++ b/app/src/main/res/values-sw600dp/styles.xml @@ -1,6 +1,6 @@ - diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml index 2221cdc2fb..a030a9f190 100644 --- a/app/src/main/res/values-v23/styles.xml +++ b/app/src/main/res/values-v23/styles.xml @@ -130,11 +130,11 @@ - - diff --git a/app/src/main/res/values-v24/styles.xml b/app/src/main/res/values-v24/styles.xml index 11d9ebfbd7..8d17e3f720 100644 --- a/app/src/main/res/values-v24/styles.xml +++ b/app/src/main/res/values-v24/styles.xml @@ -9,78 +9,78 @@ ?attr/buttonBarButtonStyle @style/res_2131952348_themeoverlay_materialcomponents_dialog @style/res_2131952348_themeoverlay_materialcomponents_dialog - @style/res_2131952788_widget_materialcomponents_popupmenu_contextmenu + @style/res_2131952789_widget_materialcomponents_popupmenu_contextmenu @style/res_2131952345_themeoverlay_materialcomponents_dark @dimen/mtrl_toolbar_default_height - @style/res_2131952714_widget_materialcomponents_actionbar_surface + @style/res_2131952715_widget_materialcomponents_actionbar_surface @style/res_2131952336_themeoverlay_materialcomponents_actionbar_surface - @style/res_2131952790_widget_materialcomponents_popupmenu_overflow + @style/res_2131952791_widget_materialcomponents_popupmenu_overflow @style/res_2131952349_themeoverlay_materialcomponents_dialog_alert - @style/res_2131952717_widget_materialcomponents_appbarlayout_surface - @style/res_2131952735_widget_materialcomponents_button_textbutton - @style/res_2131952726_widget_materialcomponents_bottomnavigationview + @style/res_2131952718_widget_materialcomponents_appbarlayout_surface + @style/res_2131952736_widget_materialcomponents_button_textbutton + @style/res_2131952727_widget_materialcomponents_bottomnavigationview @style/res_2131952344_themeoverlay_materialcomponents_bottomsheetdialog - @style/res_2131952735_widget_materialcomponents_button_textbutton - @style/res_2131952755_widget_materialcomponents_compoundbutton_checkbox + @style/res_2131952736_widget_materialcomponents_button_textbutton + @style/res_2131952756_widget_materialcomponents_compoundbutton_checkbox ?attr/colorSecondary @color/design_dark_default_color_error @color/design_dark_default_color_primary @color/design_dark_default_color_primary_dark - @style/res_2131952760_widget_materialcomponents_floatingactionbutton - @style/res_2131952789_widget_materialcomponents_popupmenu_listpopupwindow + @style/res_2131952761_widget_materialcomponents_floatingactionbutton + @style/res_2131952790_widget_materialcomponents_popupmenu_listpopupwindow @style/res_2131952354_themeoverlay_materialcomponents_materialalertdialog @style/res_2131952362_themeoverlay_materialcomponents_materialcalendar_fullscreen - @style/res_2131952764_widget_materialcomponents_materialcalendar + @style/res_2131952765_widget_materialcomponents_materialcalendar @style/res_2131952361_themeoverlay_materialcomponents_materialcalendar @style/res_2131952368_themeoverlay_materialcomponents_timepicker - @style/res_2131952786_widget_materialcomponents_navigationview - @style/res_2131952787_widget_materialcomponents_popupmenu - @style/res_2131952756_widget_materialcomponents_compoundbutton_radiobutton - @style/res_2131952740_widget_materialcomponents_button_textbutton_snackbar - @style/res_2131952794_widget_materialcomponents_snackbar - @style/res_2131952796_widget_materialcomponents_snackbar_textview - @style/res_2131952757_widget_materialcomponents_compoundbutton_switch - @style/res_2131952797_widget_materialcomponents_tablayout + @style/res_2131952787_widget_materialcomponents_navigationview + @style/res_2131952788_widget_materialcomponents_popupmenu + @style/res_2131952757_widget_materialcomponents_compoundbutton_radiobutton + @style/res_2131952741_widget_materialcomponents_button_textbutton_snackbar + @style/res_2131952795_widget_materialcomponents_snackbar + @style/res_2131952797_widget_materialcomponents_snackbar_textview + @style/res_2131952758_widget_materialcomponents_compoundbutton_switch + @style/res_2131952798_widget_materialcomponents_tablayout ?attr/textAppearanceSubtitle1 ?attr/textAppearanceSubtitle1 - @style/res_2131952804_widget_materialcomponents_textinputlayout_filledbox - @style/res_2131952820_widget_materialcomponents_toolbar + @style/res_2131952805_widget_materialcomponents_textinputlayout_filledbox + @style/res_2131952821_widget_materialcomponents_toolbar com.google.android.material.theme.MaterialComponentsViewInflater - @@ -1086,7 +1086,7 @@ false true - - - @@ -1461,7 +1461,7 @@ @@ -1522,7 +1522,7 @@ @@ -1587,10 +1587,10 @@ @@ -1601,48 +1601,48 @@ @style/res_2131952348_themeoverlay_materialcomponents_dialog @style/res_2131952345_themeoverlay_materialcomponents_dark @dimen/mtrl_toolbar_default_height - @style/res_2131952714_widget_materialcomponents_actionbar_surface + @style/res_2131952715_widget_materialcomponents_actionbar_surface @style/res_2131952336_themeoverlay_materialcomponents_actionbar_surface - @style/res_2131952790_widget_materialcomponents_popupmenu_overflow + @style/res_2131952791_widget_materialcomponents_popupmenu_overflow @style/res_2131952349_themeoverlay_materialcomponents_dialog_alert - @style/res_2131952717_widget_materialcomponents_appbarlayout_surface - @style/res_2131952735_widget_materialcomponents_button_textbutton - @style/res_2131952726_widget_materialcomponents_bottomnavigationview + @style/res_2131952718_widget_materialcomponents_appbarlayout_surface + @style/res_2131952736_widget_materialcomponents_button_textbutton + @style/res_2131952727_widget_materialcomponents_bottomnavigationview @style/res_2131952344_themeoverlay_materialcomponents_bottomsheetdialog - @style/res_2131952735_widget_materialcomponents_button_textbutton - @style/res_2131952755_widget_materialcomponents_compoundbutton_checkbox + @style/res_2131952736_widget_materialcomponents_button_textbutton + @style/res_2131952756_widget_materialcomponents_compoundbutton_checkbox ?attr/colorSecondary @color/design_dark_default_color_error @color/design_dark_default_color_primary @color/design_dark_default_color_primary_dark - @style/res_2131952760_widget_materialcomponents_floatingactionbutton - @style/res_2131952789_widget_materialcomponents_popupmenu_listpopupwindow + @style/res_2131952761_widget_materialcomponents_floatingactionbutton + @style/res_2131952790_widget_materialcomponents_popupmenu_listpopupwindow @style/res_2131952354_themeoverlay_materialcomponents_materialalertdialog @style/res_2131952362_themeoverlay_materialcomponents_materialcalendar_fullscreen - @style/res_2131952764_widget_materialcomponents_materialcalendar + @style/res_2131952765_widget_materialcomponents_materialcalendar @style/res_2131952361_themeoverlay_materialcomponents_materialcalendar @style/res_2131952368_themeoverlay_materialcomponents_timepicker - @style/res_2131952786_widget_materialcomponents_navigationview - @style/res_2131952787_widget_materialcomponents_popupmenu - @style/res_2131952756_widget_materialcomponents_compoundbutton_radiobutton - @style/res_2131952740_widget_materialcomponents_button_textbutton_snackbar - @style/res_2131952794_widget_materialcomponents_snackbar - @style/res_2131952796_widget_materialcomponents_snackbar_textview - @style/res_2131952757_widget_materialcomponents_compoundbutton_switch - @style/res_2131952797_widget_materialcomponents_tablayout + @style/res_2131952787_widget_materialcomponents_navigationview + @style/res_2131952788_widget_materialcomponents_popupmenu + @style/res_2131952757_widget_materialcomponents_compoundbutton_radiobutton + @style/res_2131952741_widget_materialcomponents_button_textbutton_snackbar + @style/res_2131952795_widget_materialcomponents_snackbar + @style/res_2131952797_widget_materialcomponents_snackbar_textview + @style/res_2131952758_widget_materialcomponents_compoundbutton_switch + @style/res_2131952798_widget_materialcomponents_tablayout ?attr/textAppearanceSubtitle1 ?attr/textAppearanceSubtitle1 - @style/res_2131952804_widget_materialcomponents_textinputlayout_filledbox - @style/res_2131952820_widget_materialcomponents_toolbar + @style/res_2131952805_widget_materialcomponents_textinputlayout_filledbox + @style/res_2131952821_widget_materialcomponents_toolbar com.google.android.material.theme.MaterialComponentsViewInflater - @@ -2526,8 +2526,8 @@ - - - - - - - - - - @@ -3284,7 +3284,7 @@ 12dp 1 - - @@ -4491,7 +4491,7 @@ @@ -4556,7 +4556,7 @@ @@ -4588,16 +4588,16 @@ ?attr/colorPrimary @@ -4660,8 +4660,8 @@ @style/res_2131952041_materialalertdialog_materialcomponents_title_text_centerstacked - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -