diff --git a/app/build.gradle b/app/build.gradle index 21c25a9dfc..3f9db93735 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 98200 - versionName "98.0 - Alpha" + versionCode 98201 + versionName "98.1 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7484f16cf2..ca19b930d8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/i/w3.java b/app/src/main/java/c/a/i/w3.java index cf180e39bc..61f861c051 100644 --- a/app/src/main/java/c/a/i/w3.java +++ b/app/src/main/java/c/a/i/w3.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.viewbinding.ViewBinding; import androidx.viewpager2.widget.ViewPager2; import com.discord.views.LoadingButton; +import com.discord.views.steps.StepsProgressIndicatorView; import com.google.android.material.button.MaterialButton; /* compiled from: ViewStepsBinding */ public final class w3 implements ViewBinding { @@ -27,19 +28,22 @@ public final class w3 implements ViewBinding { @NonNull public final MaterialButton f; @NonNull - public final TextView g; + public final StepsProgressIndicatorView g; @NonNull - public final ViewPager2 h; + public final TextView h; + @NonNull + public final ViewPager2 i; - public w3(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull ViewPager2 viewPager2) { + public w3(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull StepsProgressIndicatorView stepsProgressIndicatorView, @NonNull TextView textView2, @NonNull ViewPager2 viewPager2) { this.a = relativeLayout; this.b = linearLayout; this.f181c = textView; this.d = imageView; this.e = loadingButton; this.f = materialButton; - this.g = textView2; - this.h = viewPager2; + this.g = stepsProgressIndicatorView; + this.h = textView2; + this.i = viewPager2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventDeleted.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventDeleted.java new file mode 100644 index 0000000000..837fe7761e --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventDeleted.java @@ -0,0 +1,96 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackChannel; +import com.discord.analytics.generated.traits.TrackChannelReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import com.discord.api.utcdatetime.UtcDateTime; +import d0.z.d.m; +import java.util.List; +/* compiled from: TrackGuildScheduledEventDeleted.kt */ +public final class TrackGuildScheduledEventDeleted implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver { + private final transient String analyticsSchemaTypeName = "guild_scheduled_event_deleted"; + private final UtcDateTime endTime = null; + private final Long guildScheduledEventEntityType = null; + private final CharSequence guildScheduledEventExternalLocation = null; + private final Long guildScheduledEventId = null; + private final Long guildScheduledEventInterestedCount = null; + private final Long guildScheduledEventStatus = null; + private final CharSequence name = null; + private final Long privacyLevel = null; + private final List skuIds = null; + private final UtcDateTime startTime = null; + private TrackBase trackBase; + private TrackChannel trackChannel; + private TrackGuild trackGuild; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackGuildScheduledEventDeleted)) { + return false; + } + TrackGuildScheduledEventDeleted trackGuildScheduledEventDeleted = (TrackGuildScheduledEventDeleted) obj; + return m.areEqual(this.guildScheduledEventId, trackGuildScheduledEventDeleted.guildScheduledEventId) && m.areEqual(this.name, trackGuildScheduledEventDeleted.name) && m.areEqual(this.startTime, trackGuildScheduledEventDeleted.startTime) && m.areEqual(this.endTime, trackGuildScheduledEventDeleted.endTime) && m.areEqual(this.skuIds, trackGuildScheduledEventDeleted.skuIds) && m.areEqual(this.guildScheduledEventStatus, trackGuildScheduledEventDeleted.guildScheduledEventStatus) && m.areEqual(this.privacyLevel, trackGuildScheduledEventDeleted.privacyLevel) && m.areEqual(this.guildScheduledEventEntityType, trackGuildScheduledEventDeleted.guildScheduledEventEntityType) && m.areEqual(this.guildScheduledEventExternalLocation, trackGuildScheduledEventDeleted.guildScheduledEventExternalLocation) && m.areEqual(this.guildScheduledEventInterestedCount, trackGuildScheduledEventDeleted.guildScheduledEventInterestedCount); + } + + public int hashCode() { + Long l = this.guildScheduledEventId; + int i = 0; + int hashCode = (l != null ? l.hashCode() : 0) * 31; + CharSequence charSequence = this.name; + int hashCode2 = (hashCode + (charSequence != null ? charSequence.hashCode() : 0)) * 31; + UtcDateTime utcDateTime = this.startTime; + int hashCode3 = (hashCode2 + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31; + UtcDateTime utcDateTime2 = this.endTime; + int hashCode4 = (hashCode3 + (utcDateTime2 != null ? utcDateTime2.hashCode() : 0)) * 31; + List list = this.skuIds; + int hashCode5 = (hashCode4 + (list != null ? list.hashCode() : 0)) * 31; + Long l2 = this.guildScheduledEventStatus; + int hashCode6 = (hashCode5 + (l2 != null ? l2.hashCode() : 0)) * 31; + Long l3 = this.privacyLevel; + int hashCode7 = (hashCode6 + (l3 != null ? l3.hashCode() : 0)) * 31; + Long l4 = this.guildScheduledEventEntityType; + int hashCode8 = (hashCode7 + (l4 != null ? l4.hashCode() : 0)) * 31; + CharSequence charSequence2 = this.guildScheduledEventExternalLocation; + int hashCode9 = (hashCode8 + (charSequence2 != null ? charSequence2.hashCode() : 0)) * 31; + Long l5 = this.guildScheduledEventInterestedCount; + if (l5 != null) { + i = l5.hashCode(); + } + return hashCode9 + i; + } + + public String toString() { + StringBuilder O = a.O("TrackGuildScheduledEventDeleted(guildScheduledEventId="); + O.append(this.guildScheduledEventId); + O.append(", name="); + O.append(this.name); + O.append(", startTime="); + O.append(this.startTime); + O.append(", endTime="); + O.append(this.endTime); + O.append(", skuIds="); + O.append(this.skuIds); + O.append(", guildScheduledEventStatus="); + O.append(this.guildScheduledEventStatus); + O.append(", privacyLevel="); + O.append(this.privacyLevel); + O.append(", guildScheduledEventEntityType="); + O.append(this.guildScheduledEventEntityType); + O.append(", guildScheduledEventExternalLocation="); + O.append(this.guildScheduledEventExternalLocation); + O.append(", guildScheduledEventInterestedCount="); + return a.E(O, this.guildScheduledEventInterestedCount, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventDeletedReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventDeletedReceiver.java new file mode 100644 index 0000000000..ba1fee61b1 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventDeletedReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackGuildScheduledEventDeleted.kt */ +public interface TrackGuildScheduledEventDeletedReceiver extends AnalyticsSchema { +} 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 dfc7344179..89a3e0fa57 100644 --- a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventEntityMetadata.java +++ b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventEntityMetadata.java @@ -3,13 +3,11 @@ package com.discord.api.guildscheduledevent; import c.d.b.a.a; import d0.z.d.m; import java.io.Serializable; -import java.util.List; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: GuildScheduledEventEntityMetadata.kt */ public final class GuildScheduledEventEntityMetadata implements Serializable { public static final Companion Companion = new Companion(null); private final String location; - private final List speakerIds; /* compiled from: GuildScheduledEventEntityMetadata.kt */ public static final class Companion { @@ -21,8 +19,7 @@ public final class GuildScheduledEventEntityMetadata implements Serializable { GuildScheduledEventEntityType.values(); int[] iArr = new int[5]; $EnumSwitchMapping$0 = iArr; - iArr[GuildScheduledEventEntityType.STAGE_INSTANCE.ordinal()] = 1; - iArr[GuildScheduledEventEntityType.EXTERNAL.ordinal()] = 2; + iArr[GuildScheduledEventEntityType.EXTERNAL.ordinal()] = 1; } } @@ -32,65 +29,52 @@ public final class GuildScheduledEventEntityMetadata implements Serializable { public Companion(DefaultConstructorMarker defaultConstructorMarker) { } - public final GuildScheduledEventEntityMetadata a(GuildScheduledEventEntityType guildScheduledEventEntityType, List list, String str) { + public final GuildScheduledEventEntityMetadata a(GuildScheduledEventEntityType guildScheduledEventEntityType, String str) { m.checkNotNullParameter(guildScheduledEventEntityType, "entityType"); - int ordinal = guildScheduledEventEntityType.ordinal(); - return ordinal != 1 ? ordinal != 3 ? new GuildScheduledEventEntityMetadata(null, null, 3) : new GuildScheduledEventEntityMetadata(null, str, 1) : new GuildScheduledEventEntityMetadata(list, null, 2); + return guildScheduledEventEntityType.ordinal() != 3 ? new GuildScheduledEventEntityMetadata(null, 1) : new GuildScheduledEventEntityMetadata(str); } } public GuildScheduledEventEntityMetadata() { - this(null, null, 3); + this.location = null; } - public GuildScheduledEventEntityMetadata(List list, String str, int i) { - list = (i & 1) != 0 ? null : list; - str = (i & 2) != 0 ? null : str; - this.speakerIds = list; + public GuildScheduledEventEntityMetadata(String str) { this.location = str; } + public GuildScheduledEventEntityMetadata(String str, int i) { + int i2 = i & 1; + this.location = null; + } + public final String a() { return this.location; } - public final List b() { - return this.speakerIds; - } - - public final boolean c() { - return this.speakerIds == null && this.location == null; + public final boolean b() { + return this.location == null; } @Override // java.lang.Object public boolean equals(Object obj) { - if (this == obj) { - return true; + if (this != obj) { + return (obj instanceof GuildScheduledEventEntityMetadata) && m.areEqual(this.location, ((GuildScheduledEventEntityMetadata) obj).location); } - if (!(obj instanceof GuildScheduledEventEntityMetadata)) { - return false; - } - GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata = (GuildScheduledEventEntityMetadata) obj; - return m.areEqual(this.speakerIds, guildScheduledEventEntityMetadata.speakerIds) && m.areEqual(this.location, guildScheduledEventEntityMetadata.location); + return true; } @Override // java.lang.Object public int hashCode() { - List list = this.speakerIds; - int i = 0; - int hashCode = (list != null ? list.hashCode() : 0) * 31; String str = this.location; if (str != null) { - i = str.hashCode(); + return str.hashCode(); } - return hashCode + i; + return 0; } @Override // java.lang.Object public String toString() { - StringBuilder O = a.O("GuildScheduledEventEntityMetadata(speakerIds="); - O.append(this.speakerIds); - O.append(", location="); - return a.G(O, this.location, ")"); + return a.G(a.O("GuildScheduledEventEntityMetadata(location="), this.location, ")"); } } diff --git a/app/src/main/java/com/discord/databinding/ViewServerSettingsGuildRoleSubscriptionTierItemBinding.java b/app/src/main/java/com/discord/databinding/ViewServerSettingsGuildRoleSubscriptionTierItemBinding.java index 8532c9b65b..11ff4c0d54 100644 --- a/app/src/main/java/com/discord/databinding/ViewServerSettingsGuildRoleSubscriptionTierItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewServerSettingsGuildRoleSubscriptionTierItemBinding.java @@ -4,28 +4,29 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.constraintlayout.widget.Barrier; import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.constraintlayout.widget.Group; import androidx.viewbinding.ViewBinding; import com.facebook.drawee.view.SimpleDraweeView; public final class ViewServerSettingsGuildRoleSubscriptionTierItemBinding implements ViewBinding { @NonNull public final ConstraintLayout a; @NonNull - public final Group b; + public final TextView b; @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1694c; + public final SimpleDraweeView f1694c; @NonNull public final TextView d; + @NonNull + public final TextView e; - public ViewServerSettingsGuildRoleSubscriptionTierItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull Group group, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) { + public ViewServerSettingsGuildRoleSubscriptionTierItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = constraintLayout; - this.b = group; - this.f1694c = textView2; - this.d = textView3; + this.b = textView; + this.f1694c = simpleDraweeView; + this.d = textView2; + this.e = textView3; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEditTierBenefitsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEditTierBenefitsBinding.java index 01a00280e8..ad49f002a2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEditTierBenefitsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionEditTierBenefitsBinding.java @@ -1,20 +1,16 @@ package com.discord.databinding; import android.view.View; +import android.widget.FrameLayout; import androidx.annotation.NonNull; -import androidx.core.widget.NestedScrollView; import androidx.fragment.app.FragmentContainerView; import androidx.viewbinding.ViewBinding; -import com.google.android.material.button.MaterialButton; public final class WidgetGuildRoleSubscriptionEditTierBenefitsBinding implements ViewBinding { @NonNull - public final NestedScrollView a; - @NonNull - public final MaterialButton b; + public final FrameLayout a; - public WidgetGuildRoleSubscriptionEditTierBenefitsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull FragmentContainerView fragmentContainerView) { - this.a = nestedScrollView; - this.b = materialButton; + public WidgetGuildRoleSubscriptionEditTierBenefitsBinding(@NonNull FrameLayout frameLayout, @NonNull FragmentContainerView fragmentContainerView) { + this.a = frameLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java index 6f2a6b47b3..5d609b6ccd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java @@ -8,8 +8,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.viewbinding.ViewBinding; import com.facebook.drawee.view.SimpleDraweeView; public final class WidgetServerSettingsBinding implements ViewBinding { - @NonNull - public final TextView A; @NonNull public final CoordinatorLayout a; @NonNull @@ -51,7 +49,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f1953s; + public final LinearLayout f1953s; @NonNull public final LinearLayout t; @NonNull @@ -59,21 +57,21 @@ public final class WidgetServerSettingsBinding implements ViewBinding { @NonNull public final LinearLayout v; @NonNull - public final LinearLayout w; + public final View w; @NonNull /* renamed from: x reason: collision with root package name */ - public final View f1954x; + public final SimpleDraweeView f1954x; @NonNull /* renamed from: y reason: collision with root package name */ - public final SimpleDraweeView f1955y; + public final TextView f1955y; @NonNull /* renamed from: z reason: collision with root package name */ public final TextView f1956z; - public WidgetServerSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull TextView textView18, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull View view2, @NonNull LinearLayout linearLayout4, @NonNull View view3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView19, @NonNull TextView textView20) { + public WidgetServerSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull View view2, @NonNull LinearLayout linearLayout4, @NonNull View view3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView18, @NonNull TextView textView19) { this.a = coordinatorLayout; this.b = textView; this.f1952c = textView2; @@ -92,15 +90,14 @@ public final class WidgetServerSettingsBinding implements ViewBinding { this.p = textView15; this.q = textView16; this.r = textView17; - this.f1953s = textView18; - this.t = linearLayout; - this.u = linearLayout2; - this.v = linearLayout3; - this.w = linearLayout4; - this.f1954x = view3; - this.f1955y = simpleDraweeView; + this.f1953s = linearLayout; + this.t = linearLayout2; + this.u = linearLayout3; + this.v = linearLayout4; + this.w = view3; + this.f1954x = simpleDraweeView; + this.f1955y = textView18; this.f1956z = textView19; - this.A = textView20; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/views/steps/StepsProgressIndicatorView.java b/app/src/main/java/com/discord/views/steps/StepsProgressIndicatorView.java new file mode 100644 index 0000000000..38eba743e2 --- /dev/null +++ b/app/src/main/java/com/discord/views/steps/StepsProgressIndicatorView.java @@ -0,0 +1,75 @@ +package com.discord.views.steps; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; +import com.discord.R; +import com.discord.app.AppLog; +import com.discord.utilities.logging.Logger; +import d0.z.d.m; +import java.util.Objects; +/* compiled from: StepsProgressIndicatorView.kt */ +public final class StepsProgressIndicatorView extends LinearLayout { + public int i; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StepsProgressIndicatorView(Context context, AttributeSet attributeSet) { + super(context, attributeSet); + m.checkNotNullParameter(context, "context"); + setOrientation(0); + } + + public final void a() { + removeAllViews(); + LayoutInflater from = LayoutInflater.from(getContext()); + int i = this.i; + for (int i2 = 0; i2 < i; i2++) { + View inflate = from.inflate(R.layout.steps_progress_indicator_dot_view, (ViewGroup) this, false); + addView(inflate); + Objects.requireNonNull(inflate, "rootView"); + TextView textView = (TextView) inflate; + } + } + + public final void setCurrentStepIndex(int i) { + if (i >= this.i) { + Logger.d$default(AppLog.g, "Current step cannot be greater than the total step count", null, 2, null); + return; + } + if (getChildCount() != this.i) { + a(); + } + int i2 = this.i; + int i3 = 0; + while (i3 < i2) { + View childAt = getChildAt(i3); + if (!(childAt instanceof TextView)) { + childAt = null; + } + TextView textView = (TextView) childAt; + if (textView != null) { + textView.setEnabled(i3 <= i); + if (i3 == i) { + textView.setTextSize(12.0f); + textView.setText(String.valueOf(i + 1)); + textView.setSelected(true); + } else { + textView.setTextSize(0.0f); + textView.setText((CharSequence) null); + textView.setSelected(false); + } + } + i3++; + } + } + + public final void setTotalStepCount(int i) { + this.i = i; + a(); + setCurrentStepIndex(0); + } +} diff --git a/app/src/main/java/com/discord/views/steps/StepsView.java b/app/src/main/java/com/discord/views/steps/StepsView.java index d6e6f5028d..7a3c8386a2 100644 --- a/app/src/main/java/com/discord/views/steps/StepsView.java +++ b/app/src/main/java/com/discord/views/steps/StepsView.java @@ -57,14 +57,14 @@ public final class StepsView extends RelativeLayout { function1.invoke(view); return; } - ViewPager2 viewPager2 = ((StepsView) this.k).j.h; + ViewPager2 viewPager2 = ((StepsView) this.k).j.i; m.checkNotNullExpressionValue(viewPager2, "binding.stepsViewpager"); int currentItem = viewPager2.getCurrentItem(); d dVar = ((StepsView) this.k).k; if (dVar == null || currentItem != dVar.getItemCount() - 1) { - ViewPager2 viewPager22 = ((StepsView) this.k).j.h; + ViewPager2 viewPager22 = ((StepsView) this.k).j.i; m.checkNotNullExpressionValue(viewPager22, "binding.stepsViewpager"); - ViewPager2 viewPager23 = ((StepsView) this.k).j.h; + ViewPager2 viewPager23 = ((StepsView) this.k).j.i; m.checkNotNullExpressionValue(viewPager23, "binding.stepsViewpager"); viewPager22.setCurrentItem(viewPager23.getCurrentItem() + 1); } @@ -317,6 +317,7 @@ public final class StepsView extends RelativeLayout { Function0 function0 = this.f2214c; int i2 = StepsView.i; stepsView.c(i, function0); + this.a.j.g.setCurrentStepIndex(i); } } @@ -356,15 +357,15 @@ public final class StepsView extends RelativeLayout { function1.invoke(view); return; } - ViewPager2 viewPager2 = this.i.j.h; + ViewPager2 viewPager2 = this.i.j.i; m.checkNotNullExpressionValue(viewPager2, "binding.stepsViewpager"); if (viewPager2.getCurrentItem() == 0) { this.l.mo1invoke(); return; } - ViewPager2 viewPager22 = this.i.j.h; + ViewPager2 viewPager22 = this.i.j.i; m.checkNotNullExpressionValue(viewPager22, "binding.stepsViewpager"); - ViewPager2 viewPager23 = this.i.j.h; + ViewPager2 viewPager23 = this.i.j.i; m.checkNotNullExpressionValue(viewPager23, "binding.stepsViewpager"); viewPager22.setCurrentItem(viewPager23.getCurrentItem() - 1); } @@ -392,17 +393,21 @@ public final class StepsView extends RelativeLayout { i2 = R.id.steps_next; MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.steps_next); if (materialButton != null) { - i2 = R.id.steps_title; - TextView textView2 = (TextView) inflate.findViewById(R.id.steps_title); - if (textView2 != null) { - i2 = R.id.steps_viewpager; - ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(R.id.steps_viewpager); - if (viewPager2 != null) { - w3 w3Var = new w3((RelativeLayout) inflate, linearLayout, textView, imageView, loadingButton, materialButton, textView2, viewPager2); - m.checkNotNullExpressionValue(w3Var, "ViewStepsBinding.inflate…rom(context), this, true)"); - this.j = w3Var; - setIsLoading(false); - return; + i2 = R.id.steps_progress_indicator; + StepsProgressIndicatorView stepsProgressIndicatorView = (StepsProgressIndicatorView) inflate.findViewById(R.id.steps_progress_indicator); + if (stepsProgressIndicatorView != null) { + i2 = R.id.steps_title; + TextView textView2 = (TextView) inflate.findViewById(R.id.steps_title); + if (textView2 != null) { + i2 = R.id.steps_viewpager; + ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(R.id.steps_viewpager); + if (viewPager2 != null) { + w3 w3Var = new w3((RelativeLayout) inflate, linearLayout, textView, imageView, loadingButton, materialButton, stepsProgressIndicatorView, textView2, viewPager2); + m.checkNotNullExpressionValue(w3Var, "ViewStepsBinding.inflate…rom(context), this, true)"); + this.j = w3Var; + setIsLoading(false); + return; + } } } } @@ -418,25 +423,26 @@ public final class StepsView extends RelativeLayout { m.checkNotNullParameter(function0, "onClose"); m.checkNotNullParameter(function1, "onPageSelected"); this.k = dVar; - ViewPager2 viewPager2 = this.j.h; + ViewPager2 viewPager2 = this.j.i; m.checkNotNullExpressionValue(viewPager2, "binding.stepsViewpager"); viewPager2.setAdapter(this.k); ViewPager2.OnPageChangeCallback onPageChangeCallback = this.l; if (onPageChangeCallback != null) { - this.j.h.unregisterOnPageChangeCallback(onPageChangeCallback); + this.j.i.unregisterOnPageChangeCallback(onPageChangeCallback); } - ViewPager2 viewPager22 = this.j.h; + ViewPager2 viewPager22 = this.j.i; e eVar = new e(this, function1, function0); this.l = eVar; viewPager22.registerOnPageChangeCallback(eVar); c(0, function0); + this.j.g.setTotalStepCount(dVar.a.size()); } public final void b(int i2) { if (i2 >= 0) { d dVar = this.k; if (i2 < (dVar != null ? dVar.getItemCount() : 0)) { - ViewPager2 viewPager2 = this.j.h; + ViewPager2 viewPager2 = this.j.i; m.checkNotNullExpressionValue(viewPager2, "binding.stepsViewpager"); viewPager2.setCurrentItem(i2); } @@ -448,7 +454,7 @@ public final class StepsView extends RelativeLayout { this.j.d.setOnClickListener(new f(function0)); d dVar = this.k; if (dVar != null && (list = dVar.a) != null) { - ViewPager2 viewPager2 = this.j.h; + ViewPager2 viewPager2 = this.j.i; m.checkNotNullExpressionValue(viewPager2, "binding.stepsViewpager"); viewPager2.setUserInputEnabled(((b) list.get(i2)).i); TextView textView = this.j.f181c; @@ -513,14 +519,30 @@ public final class StepsView extends RelativeLayout { } public final void setIsTitleVisible(boolean z2) { - TextView textView = this.j.g; + TextView textView = this.j.h; m.checkNotNullExpressionValue(textView, "binding.stepsTitle"); textView.setVisibility(z2 ? 0 : 8); + if (z2) { + StepsProgressIndicatorView stepsProgressIndicatorView = this.j.g; + m.checkNotNullExpressionValue(stepsProgressIndicatorView, "binding.stepsProgressIndicator"); + stepsProgressIndicatorView.setVisibility(8); + } + } + + public final void setStepProgressIndicatorVisible(boolean z2) { + StepsProgressIndicatorView stepsProgressIndicatorView = this.j.g; + m.checkNotNullExpressionValue(stepsProgressIndicatorView, "binding.stepsProgressIndicator"); + stepsProgressIndicatorView.setVisibility(z2 ? 0 : 8); + if (z2) { + TextView textView = this.j.h; + m.checkNotNullExpressionValue(textView, "binding.stepsTitle"); + textView.setVisibility(8); + } } public final void setTitle(String str) { m.checkNotNullParameter(str, "title"); - TextView textView = this.j.g; + TextView textView = this.j.h; m.checkNotNullExpressionValue(textView, "binding.stepsTitle"); textView.setText(str); } 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 6a67ce5186..2458fe73f9 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 /* 2131364181 */: + case R.id.menu_channel_settings_delete /* 2131364177 */: 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 /* 2131364182 */: + case R.id.menu_channel_settings_reset /* 2131364178 */: 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 465eedbe0f..84d826e78e 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 /* 2131364201 */: + case R.id.menu_friends_add_friend /* 2131364197 */: 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 /* 2131364202 */: + case R.id.menu_friends_contact_sync /* 2131364198 */: ContactSyncFlowAnalytics.Companion.trackStart$default(ContactSyncFlowAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null); AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null)); WidgetContactSync.Companion companion2 = WidgetContactSync.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null); return; - case R.id.menu_friends_start_group /* 2131364203 */: + case R.id.menu_friends_start_group /* 2131364199 */: 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/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java new file mode 100644 index 0000000000..e26c61d52a --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java @@ -0,0 +1,17 @@ +package com.discord.widgets.guild_role_subscriptions; + +import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; +import com.discord.api.premium.SubscriptionPlan; +import d0.t.u; +import d0.z.d.m; +/* compiled from: GuildRoleSubscriptionUtils.kt */ +public final class GuildRoleSubscriptionUtilsKt { + public static final int getPriceTier(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { + m.checkNotNullParameter(guildRoleSubscriptionTierListing, "$this$getPriceTier"); + SubscriptionPlan subscriptionPlan = (SubscriptionPlan) u.getOrNull(guildRoleSubscriptionTierListing.i(), 0); + if (subscriptionPlan != null) { + return subscriptionPlan.d(); + } + return 0; + } +} diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$1.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$1.java index c2a47e6808..74f3a02caa 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$1.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$1.java @@ -27,7 +27,7 @@ public final class GuildRoleSubscriptionPlanSetupViewModel$submit$1 extends o im public final void invoke(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { m.checkNotNullParameter(guildRoleSubscriptionTierListing, "it"); GuildRoleSubscriptionPlanSetupViewModel guildRoleSubscriptionPlanSetupViewModel = this.this$0; - guildRoleSubscriptionPlanSetupViewModel.updateViewState(GuildRoleSubscriptionPlanSetupViewModel.ViewState.copy$default(GuildRoleSubscriptionPlanSetupViewModel.access$requireViewState(guildRoleSubscriptionPlanSetupViewModel), 0, 0, false, false, null, null, null, 123, null)); + guildRoleSubscriptionPlanSetupViewModel.updateViewState(GuildRoleSubscriptionPlanSetupViewModel.ViewState.copy$default(GuildRoleSubscriptionPlanSetupViewModel.access$requireViewState(guildRoleSubscriptionPlanSetupViewModel), 0, false, false, null, null, null, 61, null)); GuildRoleSubscriptionPlanSetupViewModel.access$emitEvent(this.this$0, GuildRoleSubscriptionPlanSetupViewModel.Event.SubmitSuccess.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$2.java index a55ed41e21..d86753f90e 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$2.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel$submit$2.java @@ -27,7 +27,7 @@ public final class GuildRoleSubscriptionPlanSetupViewModel$submit$2 extends o im public final void invoke(Error error) { m.checkNotNullParameter(error, "error"); GuildRoleSubscriptionPlanSetupViewModel guildRoleSubscriptionPlanSetupViewModel = this.this$0; - guildRoleSubscriptionPlanSetupViewModel.updateViewState(GuildRoleSubscriptionPlanSetupViewModel.ViewState.copy$default(GuildRoleSubscriptionPlanSetupViewModel.access$requireViewState(guildRoleSubscriptionPlanSetupViewModel), 0, 0, false, false, null, null, null, 123, null)); + guildRoleSubscriptionPlanSetupViewModel.updateViewState(GuildRoleSubscriptionPlanSetupViewModel.ViewState.copy$default(GuildRoleSubscriptionPlanSetupViewModel.access$requireViewState(guildRoleSubscriptionPlanSetupViewModel), 0, false, false, null, null, null, 61, null)); GuildRoleSubscriptionPlanSetupViewModel.access$emitEvent(this.this$0, new GuildRoleSubscriptionPlanSetupViewModel.Event.SubmitFailure(error)); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java index 7e3be88d20..1dcc9aedc7 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/GuildRoleSubscriptionPlanSetupViewModel.java @@ -22,9 +22,10 @@ import rx.subjects.PublishSubject; public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel { public static final Companion Companion = new Companion(null); private static final int DETAILS_STEP = 0; - private static final int TIER_BENEFITS_STEP = 2; - private static final int TIER_DESIGN_STEP = 3; + private static final int TIER_CHANNEL_BENEFITS_STEP = 2; + private static final int TIER_DESIGN_STEP = 4; private static final int TIER_DETAILS_STEP = 1; + private static final int TIER_INTANGIBLE_BENEFITS_STEP = 3; private final PublishSubject eventSubject; private final long guildId; private final RestAPI restApi; @@ -119,19 +120,17 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< private final boolean canProceedToNextStep; private final String coverImage; private final int currentStep; - private final int currentVisibleStep; private final GuildRoleSubscriptionTier guildRoleSubscriptionTier; private final boolean isSubmitting; private final String planDescription; public ViewState() { - this(0, 0, false, false, null, null, null, 127, null); + this(0, false, false, null, null, null, 63, null); } - public ViewState(int i, int i2, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier) { + public ViewState(int i, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier) { m.checkNotNullParameter(guildRoleSubscriptionTier, "guildRoleSubscriptionTier"); this.currentStep = i; - this.currentVisibleStep = i2; this.isSubmitting = z2; this.canProceedToNextStep = z3; this.coverImage = str; @@ -140,66 +139,59 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ ViewState(int i, int i2, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier, int i3, DefaultConstructorMarker defaultConstructorMarker) { - this((i3 & 1) != 0 ? 0 : i, (i3 & 2) != 0 ? 1 : i2, (i3 & 4) != 0 ? false : z2, (i3 & 8) == 0 ? z3 : false, (i3 & 16) != 0 ? null : str, (i3 & 32) == 0 ? str2 : null, (i3 & 64) != 0 ? new GuildRoleSubscriptionTier(null, null, null, null, null, null, null, null, null, null, null, null, null, 8191, null) : guildRoleSubscriptionTier); + public /* synthetic */ ViewState(int i, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier, int i2, DefaultConstructorMarker defaultConstructorMarker) { + this((i2 & 1) != 0 ? 0 : i, (i2 & 2) != 0 ? false : z2, (i2 & 4) == 0 ? z3 : false, (i2 & 8) != 0 ? null : str, (i2 & 16) == 0 ? str2 : null, (i2 & 32) != 0 ? new GuildRoleSubscriptionTier(null, null, null, null, null, null, null, null, null, null, null, null, null, 8191, null) : guildRoleSubscriptionTier); } - public static /* synthetic */ ViewState copy$default(ViewState viewState, int i, int i2, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier, int i3, Object obj) { - if ((i3 & 1) != 0) { + public static /* synthetic */ ViewState copy$default(ViewState viewState, int i, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier, int i2, Object obj) { + if ((i2 & 1) != 0) { i = viewState.currentStep; } - if ((i3 & 2) != 0) { - i2 = viewState.currentVisibleStep; - } - if ((i3 & 4) != 0) { + if ((i2 & 2) != 0) { z2 = viewState.isSubmitting; } - if ((i3 & 8) != 0) { + if ((i2 & 4) != 0) { z3 = viewState.canProceedToNextStep; } - if ((i3 & 16) != 0) { + if ((i2 & 8) != 0) { str = viewState.coverImage; } - if ((i3 & 32) != 0) { + if ((i2 & 16) != 0) { str2 = viewState.planDescription; } - if ((i3 & 64) != 0) { + if ((i2 & 32) != 0) { guildRoleSubscriptionTier = viewState.guildRoleSubscriptionTier; } - return viewState.copy(i, i2, z2, z3, str, str2, guildRoleSubscriptionTier); + return viewState.copy(i, z2, z3, str, str2, guildRoleSubscriptionTier); } public final int component1() { return this.currentStep; } - public final int component2() { - return this.currentVisibleStep; - } - - public final boolean component3() { + public final boolean component2() { return this.isSubmitting; } - public final boolean component4() { + public final boolean component3() { return this.canProceedToNextStep; } - public final String component5() { + public final String component4() { return this.coverImage; } - public final String component6() { + public final String component5() { return this.planDescription; } - public final GuildRoleSubscriptionTier component7() { + public final GuildRoleSubscriptionTier component6() { return this.guildRoleSubscriptionTier; } - public final ViewState copy(int i, int i2, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier) { + public final ViewState copy(int i, boolean z2, boolean z3, String str, String str2, GuildRoleSubscriptionTier guildRoleSubscriptionTier) { m.checkNotNullParameter(guildRoleSubscriptionTier, "guildRoleSubscriptionTier"); - return new ViewState(i, i2, z2, z3, str, str2, guildRoleSubscriptionTier); + return new ViewState(i, z2, z3, str, str2, guildRoleSubscriptionTier); } public boolean equals(Object obj) { @@ -210,7 +202,7 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< return false; } ViewState viewState = (ViewState) obj; - return this.currentStep == viewState.currentStep && this.currentVisibleStep == viewState.currentVisibleStep && this.isSubmitting == viewState.isSubmitting && this.canProceedToNextStep == viewState.canProceedToNextStep && m.areEqual(this.coverImage, viewState.coverImage) && m.areEqual(this.planDescription, viewState.planDescription) && m.areEqual(this.guildRoleSubscriptionTier, viewState.guildRoleSubscriptionTier); + return this.currentStep == viewState.currentStep && this.isSubmitting == viewState.isSubmitting && this.canProceedToNextStep == viewState.canProceedToNextStep && m.areEqual(this.coverImage, viewState.coverImage) && m.areEqual(this.planDescription, viewState.planDescription) && m.areEqual(this.guildRoleSubscriptionTier, viewState.guildRoleSubscriptionTier); } public final boolean getCanProceedToNextStep() { @@ -225,10 +217,6 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< return this.currentStep; } - public final int getCurrentVisibleStep() { - return this.currentVisibleStep; - } - public final GuildRoleSubscriptionTier getGuildRoleSubscriptionTier() { return this.guildRoleSubscriptionTier; } @@ -238,7 +226,7 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< } public int hashCode() { - int i = ((this.currentStep * 31) + this.currentVisibleStep) * 31; + int i = this.currentStep * 31; boolean z2 = this.isSubmitting; int i2 = 1; if (z2) { @@ -272,8 +260,6 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< public String toString() { StringBuilder O = a.O("ViewState(currentStep="); O.append(this.currentStep); - O.append(", currentVisibleStep="); - O.append(this.currentVisibleStep); O.append(", isSubmitting="); O.append(this.isSubmitting); O.append(", canProceedToNextStep="); @@ -291,7 +277,7 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public GuildRoleSubscriptionPlanSetupViewModel(long j, RestAPI restAPI, StoreGuildRoleSubscriptions storeGuildRoleSubscriptions) { - super(new ViewState(0, 0, false, false, null, null, null, 127, null)); + super(new ViewState(0, false, false, null, null, null, 63, null)); m.checkNotNullParameter(restAPI, "restApi"); m.checkNotNullParameter(storeGuildRoleSubscriptions, "storeGuildRoleSubscriptions"); this.guildId = j; @@ -316,30 +302,30 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< private final boolean computeCanProceedToNextStep(ViewState viewState) { GuildRoleSubscriptionTier guildRoleSubscriptionTier = viewState.getGuildRoleSubscriptionTier(); int currentStep = viewState.getCurrentStep(); - if (currentStep != 0) { - if (currentStep == 1) { - String name = guildRoleSubscriptionTier.getName(); - if ((name == null || t.isBlank(name)) || guildRoleSubscriptionTier.getPriceTier() == null) { - return false; - } - } else if (currentStep == 2) { - if (guildRoleSubscriptionTier.getIntangibleBenefits().size() + guildRoleSubscriptionTier.getChannelBenefits().size() <= 0) { - return false; - } - } else if (currentStep != 3 || guildRoleSubscriptionTier.getMemberColor() == null) { + if (currentStep == 0) { + String coverImage = viewState.getCoverImage(); + if (coverImage == null || t.isBlank(coverImage)) { return false; } + String planDescription = viewState.getPlanDescription(); + if (planDescription == null || t.isBlank(planDescription)) { + return false; + } + } else if (currentStep == 1) { + String name = guildRoleSubscriptionTier.getName(); + if ((name == null || t.isBlank(name)) || guildRoleSubscriptionTier.getPriceTier() == null) { + return false; + } + String image = guildRoleSubscriptionTier.getImage(); + if (image == null || t.isBlank(image)) { + return false; + } + } else if (currentStep != 2 && currentStep != 3 && (currentStep != 4 || guildRoleSubscriptionTier.getMemberColor() == null)) { + return false; } return true; } - private final int computeVisibleStep(int i) { - if (i != 0) { - return (i == 1 || i == 2 || i == 3) ? 2 : 3; - } - return 1; - } - @MainThread private final void emitEvent(Event event) { this.eventSubject.j.onNext(event); @@ -347,12 +333,12 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< public final void goToNextStep() { ViewState requireViewState = requireViewState(); - updateViewState(ViewState.copy$default(requireViewState, requireViewState.getCurrentStep() + 1, computeVisibleStep(requireViewState.getCurrentStep() + 1), false, false, null, null, null, 124, null)); + updateViewState(ViewState.copy$default(requireViewState, requireViewState.getCurrentStep() + 1, false, false, null, null, null, 62, null)); } public final void goToPreviousStep() { ViewState requireViewState = requireViewState(); - updateViewState(ViewState.copy$default(requireViewState, requireViewState.getCurrentStep() - 1, computeVisibleStep(requireViewState.getCurrentStep() - 1), false, false, null, null, null, 124, null)); + updateViewState(ViewState.copy$default(requireViewState, requireViewState.getCurrentStep() - 1, false, false, null, null, null, 62, null)); } public final Observable observeEvents() { @@ -362,12 +348,12 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< } public final void onSubscriptionPlanUpdated(String str, String str2) { - updateViewState(ViewState.copy$default(requireViewState(), 0, 0, false, false, str, str2, null, 79, null)); + updateViewState(ViewState.copy$default(requireViewState(), 0, false, false, str, str2, null, 39, null)); } public final void onTierUpdated(GuildRoleSubscriptionTier guildRoleSubscriptionTier) { m.checkNotNullParameter(guildRoleSubscriptionTier, "guildRoleSubscriptionTier"); - updateViewState(ViewState.copy$default(requireViewState(), 0, 0, false, false, null, null, guildRoleSubscriptionTier, 63, null)); + updateViewState(ViewState.copy$default(requireViewState(), 0, false, false, null, null, guildRoleSubscriptionTier, 31, null)); } public final void submit() { @@ -375,15 +361,13 @@ public final class GuildRoleSubscriptionPlanSetupViewModel extends AppViewModel< GuildRoleSubscriptionTier guildRoleSubscriptionTier = requireViewState.getGuildRoleSubscriptionTier(); String name = guildRoleSubscriptionTier.getName(); if (!(name == null || t.isBlank(name)) && guildRoleSubscriptionTier.getPriceTier() != null && guildRoleSubscriptionTier.getMemberColor() != null) { - if (!guildRoleSubscriptionTier.getChannelBenefits().isEmpty() || !guildRoleSubscriptionTier.getIntangibleBenefits().isEmpty()) { - updateViewState(ViewState.copy$default(requireViewState, 0, 0, true, false, null, null, null, 123, null)); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.INSTANCE.createGuildRoleSubscriptionGroupListing(this.restApi, this.storeGuildRoleSubscriptions, this.guildId, requireViewState.getCoverImage(), requireViewState.getPlanDescription(), guildRoleSubscriptionTier.getName(), guildRoleSubscriptionTier.getDescription(), guildRoleSubscriptionTier.getPriceTier().intValue(), guildRoleSubscriptionTier.getImage(), guildRoleSubscriptionTier.getMemberColor().intValue(), guildRoleSubscriptionTier.getMemberIcon(), guildRoleSubscriptionTier.getChannelBenefits(), guildRoleSubscriptionTier.getIntangibleBenefits()), this, null, 2, null), GuildRoleSubscriptionPlanSetupViewModel.class, (Context) null, (Function1) null, new GuildRoleSubscriptionPlanSetupViewModel$submit$2(this), (Function0) null, (Function0) null, new GuildRoleSubscriptionPlanSetupViewModel$submit$1(this), 54, (Object) null); - } + updateViewState(ViewState.copy$default(requireViewState, 0, true, false, null, null, null, 61, null)); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.INSTANCE.createGuildRoleSubscriptionGroupListing(this.restApi, this.storeGuildRoleSubscriptions, this.guildId, requireViewState.getCoverImage(), requireViewState.getPlanDescription(), guildRoleSubscriptionTier.getName(), guildRoleSubscriptionTier.getDescription(), guildRoleSubscriptionTier.getPriceTier().intValue(), guildRoleSubscriptionTier.getImage(), guildRoleSubscriptionTier.getMemberColor().intValue(), guildRoleSubscriptionTier.getMemberIcon(), guildRoleSubscriptionTier.getChannelBenefits(), guildRoleSubscriptionTier.getIntangibleBenefits()), this, null, 2, null), GuildRoleSubscriptionPlanSetupViewModel.class, (Context) null, (Function1) null, new GuildRoleSubscriptionPlanSetupViewModel$submit$2(this), (Function0) null, (Function0) null, new GuildRoleSubscriptionPlanSetupViewModel$submit$1(this), 54, (Object) null); } } public void updateViewState(ViewState viewState) { m.checkNotNullParameter(viewState, "viewState"); - super.updateViewState((GuildRoleSubscriptionPlanSetupViewModel) ViewState.copy$default(viewState, 0, 0, false, computeCanProceedToNextStep(viewState), null, null, null, 119, null)); + super.updateViewState((GuildRoleSubscriptionPlanSetupViewModel) ViewState.copy$default(viewState, 0, false, computeCanProceedToNextStep(viewState), null, null, null, 59, null)); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5.java index 38cc6ded5c..252e6882f9 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5.java @@ -25,6 +25,6 @@ public final class WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5 exte public final void invoke(View view) { m.checkNotNullParameter(view, "it"); - WidgetGuildRoleSubscriptionPlanSetup.access$getSetupViewModel$p(this.this$0).submit(); + WidgetGuildRoleSubscriptionPlanSetup.access$getSetupViewModel$p(this.this$0).goToNextStep(); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$6.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$6.java new file mode 100644 index 0000000000..18b1afc052 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$6.java @@ -0,0 +1,30 @@ +package com.discord.widgets.guild_role_subscriptions.setup; + +import android.view.View; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetGuildRoleSubscriptionPlanSetup.kt */ +public final class WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$6 extends o implements Function1 { + public final /* synthetic */ WidgetGuildRoleSubscriptionPlanSetup this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$6(WidgetGuildRoleSubscriptionPlanSetup widgetGuildRoleSubscriptionPlanSetup) { + super(1); + this.this$0 = widgetGuildRoleSubscriptionPlanSetup; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(View view) { + invoke(view); + return Unit.a; + } + + public final void invoke(View view) { + m.checkNotNullParameter(view, "it"); + WidgetGuildRoleSubscriptionPlanSetup.access$getSetupViewModel$p(this.this$0).submit(); + } +} diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java index e7a9e4d234..1d8caabed6 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java @@ -9,7 +9,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentViewModelLazyKt; import c.a.d.e0; import c.a.d.j; -import c.a.k.b; import c.d.b.a.a; import com.discord.R; import com.discord.app.AppFragment; @@ -24,6 +23,7 @@ import com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscri import com.discord.widgets.guild_role_subscriptions.tier.create.WidgetGuildRoleSubscriptionTierDesign; import com.discord.widgets.guild_role_subscriptions.tier.create.WidgetGuildRoleSubscriptionTierDetails; import com.discord.widgets.guild_role_subscriptions.tier.create.WidgetGuildRoleSubscriptionTierReview; +import com.discord.widgets.guild_role_subscriptions.tier.create.benefits.GuildRoleSubscriptionTierBenefitListType; import com.discord.widgets.guild_role_subscriptions.tier.create.benefits.WidgetGuildRoleSubscriptionTierBenefits; import d0.g; import d0.o; @@ -42,7 +42,6 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.Z(WidgetGuildRoleSubscriptionPlanSetup.class, "binding", "getBinding()Lcom/discord/databinding/WidgetGuildSubscriptionPlanSetupBinding;", 0)}; public static final Companion Companion = new Companion(null); private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; - private static final int TOTAL_STEP_COUNT = 3; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGuildRoleSubscriptionPlanSetup$binding$2.INSTANCE, null, 2, null); private final Lazy createTierViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierViewModel.class), new WidgetGuildRoleSubscriptionPlanSetup$appActivityViewModels$$inlined$activityViewModels$3(this), new e0(WidgetGuildRoleSubscriptionPlanSetup$createTierViewModel$2.INSTANCE)); private final Lazy guildId$delegate = g.lazy(new WidgetGuildRoleSubscriptionPlanSetup$guildId$2(this)); @@ -92,7 +91,6 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment { stepsView.setIsDoneButtonEnabled(!viewState.isSubmitting()); stepsView.setIsLoading(viewState.isSubmitting()); stepsView.b(viewState.getCurrentStep()); - stepsView.setTitle(b.j(stepsView, R.string.guild_role_subscription_create_tier_step_header, new Object[]{Integer.valueOf(viewState.getCurrentVisibleStep()), 3}, null, 4).toString()); } private final WidgetGuildSubscriptionPlanSetupBinding getBinding() { @@ -134,13 +132,13 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionPlanDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$2(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(getGuildId()))), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5(this), false, false, false, 374)}); + List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionPlanDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$2(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(getGuildId())), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, GuildRoleSubscriptionTierBenefitListType.CHANNEL)), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(getGuildId())), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, GuildRoleSubscriptionTierBenefitListType.INTANGIBLE)), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$4(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$6(this), false, false, false, 374)}); StepsView stepsView = getBinding().b; StepsView.d dVar = new StepsView.d(this, listOf); WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1 widgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1 = new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1(this, listOf); int i = StepsView.i; stepsView.a(dVar, widgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1, c.a.y.p0.a.i); - stepsView.setIsTitleVisible(true); + stepsView.setStepProgressIndicatorVisible(true); AppFragment.setOnBackPressed$default(this, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$2(this), 0, 2, null); } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java index 444d716215..10ed927e2d 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java @@ -230,6 +230,14 @@ public final class CreateGuildRoleSubscriptionTierViewModel extends AppViewModel if (num == null) { return false; } + String description = guildRoleSubscriptionTier.getDescription(); + if (description == null || t.isBlank(description)) { + return false; + } + String image = guildRoleSubscriptionTier.getImage(); + if (image == null || t.isBlank(image)) { + return false; + } } else if (!(currentStep == 1 || currentStep == 2)) { if (currentStep != 3) { return false; @@ -274,10 +282,8 @@ public final class CreateGuildRoleSubscriptionTierViewModel extends AppViewModel GuildRoleSubscriptionTier guildRoleSubscriptionTier = requireViewState().getGuildRoleSubscriptionTier(); if (guildRoleSubscriptionTier != null) { String name = guildRoleSubscriptionTier.getName(); - if (!(name == null || t.isBlank(name)) && guildRoleSubscriptionTier.getPriceTier() != null) { - if ((!guildRoleSubscriptionTier.getChannelBenefits().isEmpty() || !guildRoleSubscriptionTier.getIntangibleBenefits().isEmpty()) && guildRoleSubscriptionTier.getMemberColor() != null) { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.INSTANCE.createGuildRoleSubscriptionTierListing(this.restApi, this.storeGuildRoleSubscriptions, this.guildId, this.groupListingId, guildRoleSubscriptionTier.getName(), guildRoleSubscriptionTier.getDescription(), guildRoleSubscriptionTier.getPriceTier().intValue(), guildRoleSubscriptionTier.getImage(), ColorCompat.INSTANCE.removeAlphaComponent(guildRoleSubscriptionTier.getMemberColor().intValue()), guildRoleSubscriptionTier.getMemberIcon(), guildRoleSubscriptionTier.getChannelBenefits(), guildRoleSubscriptionTier.getIntangibleBenefits()), this, null, 2, null), CreateGuildRoleSubscriptionTierViewModel.class, (Context) null, (Function1) null, new CreateGuildRoleSubscriptionTierViewModel$submit$2(this), (Function0) null, (Function0) null, new CreateGuildRoleSubscriptionTierViewModel$submit$1(this), 54, (Object) null); - } + if (!(name == null || t.isBlank(name)) && guildRoleSubscriptionTier.getPriceTier() != null && guildRoleSubscriptionTier.getMemberColor() != null) { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.INSTANCE.createGuildRoleSubscriptionTierListing(this.restApi, this.storeGuildRoleSubscriptions, this.guildId, this.groupListingId, guildRoleSubscriptionTier.getName(), guildRoleSubscriptionTier.getDescription(), guildRoleSubscriptionTier.getPriceTier().intValue(), guildRoleSubscriptionTier.getImage(), ColorCompat.INSTANCE.removeAlphaComponent(guildRoleSubscriptionTier.getMemberColor().intValue()), guildRoleSubscriptionTier.getMemberIcon(), guildRoleSubscriptionTier.getChannelBenefits(), guildRoleSubscriptionTier.getIntangibleBenefits()), this, null, 2, null), CreateGuildRoleSubscriptionTierViewModel.class, (Context) null, (Function1) null, new CreateGuildRoleSubscriptionTierViewModel$submit$2(this), (Function0) null, (Function0) null, new CreateGuildRoleSubscriptionTierViewModel$submit$1(this), 54, (Object) null); } } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java index 33700e021d..5e12f44f98 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java @@ -9,7 +9,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentViewModelLazyKt; import c.a.d.e0; import c.a.d.j; -import c.a.k.b; import c.d.b.a.a; import com.discord.R; import com.discord.app.AppFragment; @@ -40,7 +39,6 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment { public static final Companion Companion = new Companion(null); private static final String INTENT_EXTRA_GROUP_LISTING_ID = "INTENT_EXTRA_GROUP_LISTING_ID"; private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; - private static final int TOTAL_STEP_COUNT = 4; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetCreateGuildRoleSubscriptionTier$binding$2.INSTANCE, null, 2, null); private final Lazy createTierViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(CreateGuildRoleSubscriptionTierViewModel.class), new WidgetCreateGuildRoleSubscriptionTier$appActivityViewModels$$inlined$activityViewModels$3(this), new e0(new WidgetCreateGuildRoleSubscriptionTier$createTierViewModel$2(this))); private final Lazy groupListingId$delegate = g.lazy(new WidgetCreateGuildRoleSubscriptionTier$groupListingId$2(this)); @@ -100,7 +98,6 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment { return; } getBinding().b.b(currentStep); - getBinding().b.setTitle(b.k(this, R.string.guild_role_subscription_create_tier_step_header, new Object[]{Integer.valueOf(viewState.getCurrentStep() + 1), 4}, null, 4).toString()); getBinding().b.setIsNextButtonEnabled(viewState.getCanProceed()); getBinding().b.setIsDoneButtonEnabled(!viewState.isSubmitting()); getBinding().b.setIsLoading(viewState.isSubmitting()); @@ -155,7 +152,7 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment { WidgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1 widgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1 = new WidgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1(this, listOf); int i = StepsView.i; stepsView.a(dVar, widgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1, c.a.y.p0.a.i); - stepsView.setIsTitleVisible(true); + stepsView.setStepProgressIndicatorVisible(true); AppFragment.setOnBackPressed$default(this, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$2(this), 0, 2, null); } 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 510f59fa41..4d65785914 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java @@ -239,7 +239,7 @@ public final class GuildScheduledEventModel implements Serializable { 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); + NullSerializable aVar = (guildScheduledEventEntityMetadata == null || guildScheduledEventEntityMetadata.b()) ? 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); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java index 4ac6a6167c..1ef08da929 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java @@ -10,9 +10,7 @@ import com.discord.models.domain.ModelAuditLogEntry; import com.discord.stores.StoreGuildScheduledEvents; import com.discord.stores.StoreStream; import com.discord.utilities.time.ClockFactory; -import d0.t.n; import d0.z.d.m; -import java.util.List; import kotlin.Pair; import kotlin.Unit; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -145,23 +143,19 @@ public final class GuildScheduledEventSettingsViewModel extends AppViewModel b = null; GuildScheduledEvent findEventFromStore = l != null ? storeGuildScheduledEvents.findEventFromStore(l.longValue(), Long.valueOf(j)) : null; if (findEventFromStore == null || (model = GuildScheduledEventModelKt.toModel(findEventFromStore)) == null) { guildScheduledEvent = findEventFromStore; guildScheduledEventEntityType2 = guildScheduledEventEntityType; i = 1; } else { - GuildScheduledEventEntityMetadata.Companion companion = GuildScheduledEventEntityMetadata.Companion; - GuildScheduledEventEntityMetadata d = findEventFromStore.d(); - b = d != null ? d.b() : b; guildScheduledEvent = findEventFromStore; i = 1; guildScheduledEventEntityType2 = guildScheduledEventEntityType; - guildScheduledEventModel = GuildScheduledEventModel.copy$default(model, 0, null, l2, null, null, null, null, null, guildScheduledEventEntityType, companion.a(guildScheduledEventEntityType, b, str), null, 1275, null); + guildScheduledEventModel = GuildScheduledEventModel.copy$default(model, 0, null, l2, null, null, null, null, null, guildScheduledEventEntityType, GuildScheduledEventEntityMetadata.Companion.a(guildScheduledEventEntityType, str), null, 1275, null); } Pair generateAppropriateStartDateTime = GuildScheduledEventPickerDateTime.INSTANCE.generateAppropriateStartDateTime(); - updateViewState(new ViewState.Initialized(guildScheduledEventModel == null ? new GuildScheduledEventModel(j, null, l2, generateAppropriateStartDateTime.getFirst(), generateAppropriateStartDateTime.getSecond(), null, null, null, guildScheduledEventEntityType, GuildScheduledEventEntityMetadata.Companion.a(guildScheduledEventEntityType2, n.emptyList(), str), Integer.valueOf(i)) : guildScheduledEventModel, guildScheduledEvent)); + updateViewState(new ViewState.Initialized(guildScheduledEventModel == null ? new GuildScheduledEventModel(j, null, l2, generateAppropriateStartDateTime.getFirst(), generateAppropriateStartDateTime.getSecond(), null, null, null, guildScheduledEventEntityType, GuildScheduledEventEntityMetadata.Companion.a(guildScheduledEventEntityType2, str), Integer.valueOf(i)) : guildScheduledEventModel, guildScheduledEvent)); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java index 6d320ac9e7..5db4c04b23 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 /* 2131364183 */: + case R.id.menu_chat_add_friend /* 2131364179 */: WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null); break; - case R.id.menu_chat_search /* 2131364184 */: + case R.id.menu_chat_search /* 2131364180 */: launchForSearch(context); break; - case R.id.menu_chat_side_panel /* 2131364185 */: + case R.id.menu_chat_side_panel /* 2131364181 */: this.$panelLayout.openEndPanel(); break; - case R.id.menu_chat_start_call /* 2131364186 */: + case R.id.menu_chat_start_call /* 2131364182 */: privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_start_group /* 2131364187 */: + case R.id.menu_chat_start_group /* 2131364183 */: 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 /* 2131364188 */: + case R.id.menu_chat_start_video_call /* 2131364184 */: privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_stop_call /* 2131364189 */: + case R.id.menu_chat_stop_call /* 2131364185 */: StoreStream.Companion.getVoiceChannelSelected().clear(); break; } 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 081ca69496..784aee8fd2 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 /* 2131364206 */: + case R.id.menu_media_browser /* 2131364202 */: 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 /* 2131364207 */: + case R.id.menu_media_download /* 2131364203 */: this.this$0.requestMediaDownload(new AnonymousClass1(this, context)); return; - case R.id.menu_media_share /* 2131364208 */: + case R.id.menu_media_share /* 2131364204 */: 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 3ead74289b..d45e3f535c 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 = 2131364352; + public static final int notice_cancel = 2131364348; public static final Companion Companion = new Companion(null); /* renamed from: OK_BUTTON */ - public static final int notice_ok = 2131364357; + public static final int notice_ok = 2131364353; 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/WidgetServerSettings$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java index 334d427a14..db6e9fed12 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java @@ -38,74 +38,70 @@ public final /* synthetic */ class WidgetServerSettings$binding$2 extends k impl i = R.id.server_settings_guild_role_subscription_get_started; TextView textView6 = (TextView) view.findViewById(R.id.server_settings_guild_role_subscription_get_started); if (textView6 != null) { - i = R.id.server_settings_guild_role_subscription_members; - TextView textView7 = (TextView) view.findViewById(R.id.server_settings_guild_role_subscription_members); + i = R.id.server_settings_guild_role_subscription_tiers; + TextView textView7 = (TextView) view.findViewById(R.id.server_settings_guild_role_subscription_tiers); if (textView7 != null) { - i = R.id.server_settings_guild_role_subscription_tiers; - TextView textView8 = (TextView) view.findViewById(R.id.server_settings_guild_role_subscription_tiers); + i = R.id.server_settings_instant_invites_option; + TextView textView8 = (TextView) view.findViewById(R.id.server_settings_instant_invites_option); if (textView8 != null) { - i = R.id.server_settings_instant_invites_option; - TextView textView9 = (TextView) view.findViewById(R.id.server_settings_instant_invites_option); + i = R.id.server_settings_members_option; + TextView textView9 = (TextView) view.findViewById(R.id.server_settings_members_option); if (textView9 != null) { - i = R.id.server_settings_members_option; - TextView textView10 = (TextView) view.findViewById(R.id.server_settings_members_option); + i = R.id.server_settings_option_audit_log; + TextView textView10 = (TextView) view.findViewById(R.id.server_settings_option_audit_log); if (textView10 != null) { - i = R.id.server_settings_option_audit_log; - TextView textView11 = (TextView) view.findViewById(R.id.server_settings_option_audit_log); + i = R.id.server_settings_option_channels; + TextView textView11 = (TextView) view.findViewById(R.id.server_settings_option_channels); if (textView11 != null) { - i = R.id.server_settings_option_channels; - TextView textView12 = (TextView) view.findViewById(R.id.server_settings_option_channels); + i = R.id.server_settings_option_integrations; + TextView textView12 = (TextView) view.findViewById(R.id.server_settings_option_integrations); if (textView12 != null) { - i = R.id.server_settings_option_integrations; - TextView textView13 = (TextView) view.findViewById(R.id.server_settings_option_integrations); + i = R.id.server_settings_option_moderation; + TextView textView13 = (TextView) view.findViewById(R.id.server_settings_option_moderation); if (textView13 != null) { - i = R.id.server_settings_option_moderation; - TextView textView14 = (TextView) view.findViewById(R.id.server_settings_option_moderation); + i = R.id.server_settings_option_overview; + TextView textView14 = (TextView) view.findViewById(R.id.server_settings_option_overview); if (textView14 != null) { - i = R.id.server_settings_option_overview; - TextView textView15 = (TextView) view.findViewById(R.id.server_settings_option_overview); + i = R.id.server_settings_option_security; + TextView textView15 = (TextView) view.findViewById(R.id.server_settings_option_security); if (textView15 != null) { - i = R.id.server_settings_option_security; - TextView textView16 = (TextView) view.findViewById(R.id.server_settings_option_security); + i = R.id.server_settings_option_vanity_url; + TextView textView16 = (TextView) view.findViewById(R.id.server_settings_option_vanity_url); if (textView16 != null) { - i = R.id.server_settings_option_vanity_url; - TextView textView17 = (TextView) view.findViewById(R.id.server_settings_option_vanity_url); + i = R.id.server_settings_roles_option; + TextView textView17 = (TextView) view.findViewById(R.id.server_settings_roles_option); if (textView17 != null) { - i = R.id.server_settings_roles_option; - TextView textView18 = (TextView) view.findViewById(R.id.server_settings_roles_option); - if (textView18 != null) { - i = R.id.server_settings_section_community; - LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_settings_section_community); - if (linearLayout != null) { - i = R.id.server_settings_section_community_divider; - View findViewById = view.findViewById(R.id.server_settings_section_community_divider); - if (findViewById != null) { - i = R.id.server_settings_section_general_settings; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.server_settings_section_general_settings); - if (linearLayout2 != null) { - i = R.id.server_settings_section_server_monetization; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.server_settings_section_server_monetization); - if (linearLayout3 != null) { - i = R.id.server_settings_section_server_monetization_divider; - View findViewById2 = view.findViewById(R.id.server_settings_section_server_monetization_divider); - if (findViewById2 != null) { - i = R.id.server_settings_section_user_management; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.server_settings_section_user_management); - if (linearLayout4 != null) { - i = R.id.server_settings_section_user_management_divider; - View findViewById3 = view.findViewById(R.id.server_settings_section_user_management_divider); - if (findViewById3 != null) { - i = R.id.server_settings_server_icon; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.server_settings_server_icon); - if (simpleDraweeView != null) { - i = R.id.server_settings_server_icon_text; - TextView textView19 = (TextView) view.findViewById(R.id.server_settings_server_icon_text); + i = R.id.server_settings_section_community; + LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_settings_section_community); + if (linearLayout != null) { + i = R.id.server_settings_section_community_divider; + View findViewById = view.findViewById(R.id.server_settings_section_community_divider); + if (findViewById != null) { + i = R.id.server_settings_section_general_settings; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.server_settings_section_general_settings); + if (linearLayout2 != null) { + i = R.id.server_settings_section_server_monetization; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.server_settings_section_server_monetization); + if (linearLayout3 != null) { + i = R.id.server_settings_section_server_monetization_divider; + View findViewById2 = view.findViewById(R.id.server_settings_section_server_monetization_divider); + if (findViewById2 != null) { + i = R.id.server_settings_section_user_management; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.server_settings_section_user_management); + if (linearLayout4 != null) { + i = R.id.server_settings_section_user_management_divider; + View findViewById3 = view.findViewById(R.id.server_settings_section_user_management_divider); + if (findViewById3 != null) { + i = R.id.server_settings_server_icon; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.server_settings_server_icon); + if (simpleDraweeView != null) { + i = R.id.server_settings_server_icon_text; + TextView textView18 = (TextView) view.findViewById(R.id.server_settings_server_icon_text); + if (textView18 != null) { + i = R.id.server_settings_server_name; + TextView textView19 = (TextView) view.findViewById(R.id.server_settings_server_name); if (textView19 != null) { - i = R.id.server_settings_server_name; - TextView textView20 = (TextView) view.findViewById(R.id.server_settings_server_name); - if (textView20 != null) { - return new WidgetServerSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, textView13, textView14, textView15, textView16, textView17, textView18, linearLayout, findViewById, linearLayout2, linearLayout3, findViewById2, linearLayout4, findViewById3, simpleDraweeView, textView19, textView20); - } + return new WidgetServerSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, textView13, textView14, textView15, textView16, textView17, linearLayout, findViewById, linearLayout2, linearLayout3, findViewById2, linearLayout4, findViewById3, simpleDraweeView, textView18, textView19); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureUI$18.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureUI$18.java deleted file mode 100644 index 60ebb136a2..0000000000 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureUI$18.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.discord.widgets.servers; - -import android.view.View; -/* compiled from: WidgetServerSettings.kt */ -public final class WidgetServerSettings$configureUI$18 implements View.OnClickListener { - public static final WidgetServerSettings$configureUI$18 INSTANCE = new WidgetServerSettings$configureUI$18(); - - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - } -} diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java index 605ff381fe..cead6e7522 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java @@ -249,22 +249,22 @@ public final class WidgetServerSettings extends AppFragment { at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395) at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258) */ - /* JADX WARNING: Removed duplicated region for block: B:16:0x00ce */ - /* JADX WARNING: Removed duplicated region for block: B:17:0x00d0 */ - /* JADX WARNING: Removed duplicated region for block: B:26:0x00f4 */ - /* JADX WARNING: Removed duplicated region for block: B:33:0x010b */ - /* JADX WARNING: Removed duplicated region for block: B:34:0x010d */ - /* JADX WARNING: Removed duplicated region for block: B:43:0x0133 */ - /* JADX WARNING: Removed duplicated region for block: B:50:0x014a */ - /* JADX WARNING: Removed duplicated region for block: B:51:0x014c */ - /* JADX WARNING: Removed duplicated region for block: B:60:0x0172 */ - /* JADX WARNING: Removed duplicated region for block: B:66:0x0189 */ - /* JADX WARNING: Removed duplicated region for block: B:73:0x00e8 A[EDGE_INSN: B:73:0x00e8->B:22:0x00e8 ?: BREAK , SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:77:0x0127 A[EDGE_INSN: B:77:0x0127->B:39:0x0127 ?: BREAK , SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:81:0x0166 A[EDGE_INSN: B:81:0x0166->B:56:0x0166 ?: BREAK , SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:16:0x00c6 */ + /* JADX WARNING: Removed duplicated region for block: B:17:0x00c8 */ + /* JADX WARNING: Removed duplicated region for block: B:26:0x00ec */ + /* JADX WARNING: Removed duplicated region for block: B:33:0x0103 */ + /* JADX WARNING: Removed duplicated region for block: B:34:0x0105 */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x012b */ + /* JADX WARNING: Removed duplicated region for block: B:50:0x0142 */ + /* JADX WARNING: Removed duplicated region for block: B:51:0x0144 */ + /* JADX WARNING: Removed duplicated region for block: B:60:0x016a */ + /* JADX WARNING: Removed duplicated region for block: B:66:0x0181 */ + /* JADX WARNING: Removed duplicated region for block: B:73:0x00e0 A[EDGE_INSN: B:73:0x00e0->B:22:0x00e0 ?: BREAK , SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:77:0x011f A[EDGE_INSN: B:77:0x011f->B:39:0x011f ?: BREAK , SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:81:0x015e A[EDGE_INSN: B:81:0x015e->B:56:0x015e ?: BREAK , SYNTHETIC] */ private final void configureSectionsVisibility() { /* - // Method dump skipped, instructions count: 399 + // Method dump skipped, instructions count: 391 */ throw new UnsupportedOperationException("Method not decompiled: com.discord.widgets.servers.WidgetServerSettings.configureSectionsVisibility():void"); } @@ -272,20 +272,20 @@ public final class WidgetServerSettings extends AppFragment { private final void configureToolbar(Model model) { Guild guild = model.getGuild(); String forGuild$default = IconUtils.getForGuild$default(guild, null, true, null, 10, null); - TextView textView = getBinding().A; + TextView textView = getBinding().f1956z; m.checkNotNullExpressionValue(textView, "binding.serverSettingsServerName"); textView.setText(guild.getName()); - SimpleDraweeView simpleDraweeView = getBinding().f1955y; + SimpleDraweeView simpleDraweeView = getBinding().f1954x; m.checkNotNullExpressionValue(simpleDraweeView, "binding.serverSettingsServerIcon"); IconUtils.setIcon$default(simpleDraweeView, forGuild$default, (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); - TextView textView2 = getBinding().f1956z; + TextView textView2 = getBinding().f1955y; m.checkNotNullExpressionValue(textView2, "binding.serverSettingsServerIconText"); int i = 0; if (!(forGuild$default == null)) { i = 8; } textView2.setVisibility(i); - TextView textView3 = getBinding().f1956z; + TextView textView3 = getBinding().f1955y; m.checkNotNullExpressionValue(textView3, "binding.serverSettingsServerIconText"); textView3.setText(guild.getShortName()); AppFragment.setActionBarOptionsMenu$default(this, model.getManageGuildContext().isOwnerWithRequiredMFALevel() ? R.menu.menu_server_settings : R.menu.menu_empty, new WidgetServerSettings$configureToolbar$1(this, guild), null, 4, null); @@ -302,37 +302,37 @@ public final class WidgetServerSettings extends AppFragment { } configureToolbar(model); ManageGuildContext manageGuildContext = model.getManageGuildContext(); - TextView textView = getBinding().p; + TextView textView = getBinding().o; m.checkNotNullExpressionValue(textView, "binding.serverSettingsOptionOverview"); int i = 8; textView.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8); - getBinding().p.setOnClickListener(new WidgetServerSettings$configureUI$1(model)); - TextView textView2 = getBinding().o; + getBinding().o.setOnClickListener(new WidgetServerSettings$configureUI$1(model)); + TextView textView2 = getBinding().n; m.checkNotNullExpressionValue(textView2, "binding.serverSettingsOptionModeration"); textView2.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8); - getBinding().o.setOnClickListener(new WidgetServerSettings$configureUI$2(model)); - TextView textView3 = getBinding().l; + getBinding().n.setOnClickListener(new WidgetServerSettings$configureUI$2(model)); + TextView textView3 = getBinding().k; m.checkNotNullExpressionValue(textView3, "binding.serverSettingsOptionAuditLog"); textView3.setVisibility(manageGuildContext.getCanViewAuditLogs() ? 0 : 8); - getBinding().l.setOnClickListener(new WidgetServerSettings$configureUI$3(model)); - TextView textView4 = getBinding().m; + getBinding().k.setOnClickListener(new WidgetServerSettings$configureUI$3(model)); + TextView textView4 = getBinding().l; m.checkNotNullExpressionValue(textView4, "binding.serverSettingsOptionChannels"); textView4.setVisibility(manageGuildContext.getCanManageChannels() ? 0 : 8); - getBinding().m.setOnClickListener(new WidgetServerSettings$configureUI$4(model)); - TextView textView5 = getBinding().q; + getBinding().l.setOnClickListener(new WidgetServerSettings$configureUI$4(model)); + TextView textView5 = getBinding().p; m.checkNotNullExpressionValue(textView5, "binding.serverSettingsOptionSecurity"); textView5.setVisibility(manageGuildContext.isOwnerWithRequiredMFALevel() ? 0 : 8); - getBinding().q.setOnClickListener(new WidgetServerSettings$configureUI$5(model)); - TextView textView6 = getBinding().n; + getBinding().p.setOnClickListener(new WidgetServerSettings$configureUI$5(model)); + TextView textView6 = getBinding().m; m.checkNotNullExpressionValue(textView6, "binding.serverSettingsOptionIntegrations"); textView6.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8); - getBinding().n.setOnClickListener(new WidgetServerSettings$configureUI$6(model)); - TextView textView7 = getBinding().r; + getBinding().m.setOnClickListener(new WidgetServerSettings$configureUI$6(model)); + TextView textView7 = getBinding().q; m.checkNotNullExpressionValue(textView7, "binding.serverSettingsOptionVanityUrl"); boolean z2 = true; textView7.setVisibility(manageGuildContext.getCanManageServer() && model.getGuild().getFeatures().contains(GuildFeature.VANITY_URL) ? 0 : 8); - getBinding().r.setOnClickListener(new WidgetServerSettings$configureUI$7(model)); - LinearLayout linearLayout = getBinding().t; + getBinding().q.setOnClickListener(new WidgetServerSettings$configureUI$7(model)); + LinearLayout linearLayout = getBinding().f1953s; m.checkNotNullExpressionValue(linearLayout, "binding.serverSettingsSectionCommunity"); linearLayout.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8); TextView textView8 = getBinding().f1952c; @@ -345,15 +345,15 @@ public final class WidgetServerSettings extends AppFragment { m.checkNotNullExpressionValue(textView9, "binding.serverSettingsEnableCommunityOption"); textView9.setVisibility(model.getGuild().getFeatures().contains(guildFeature) ^ true ? 0 : 8); getBinding().e.setOnClickListener(new WidgetServerSettings$configureUI$9(model)); - getBinding().k.setOnClickListener(new WidgetServerSettings$configureUI$10(model)); - TextView textView10 = getBinding().f1953s; + getBinding().j.setOnClickListener(new WidgetServerSettings$configureUI$10(model)); + TextView textView10 = getBinding().r; m.checkNotNullExpressionValue(textView10, "binding.serverSettingsRolesOption"); textView10.setVisibility(manageGuildContext.getCanManageRoles() ? 0 : 8); - getBinding().f1953s.setOnClickListener(new WidgetServerSettings$configureUI$11(model)); - TextView textView11 = getBinding().j; + getBinding().r.setOnClickListener(new WidgetServerSettings$configureUI$11(model)); + TextView textView11 = getBinding().i; m.checkNotNullExpressionValue(textView11, "binding.serverSettingsInstantInvitesOption"); textView11.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8); - getBinding().j.setOnClickListener(new WidgetServerSettings$configureUI$12(model)); + getBinding().i.setOnClickListener(new WidgetServerSettings$configureUI$12(model)); TextView textView12 = getBinding().b; m.checkNotNullExpressionValue(textView12, "binding.serverSettingsBansOption"); textView12.setVisibility(manageGuildContext.getCanManageBans() ? 0 : 8); @@ -373,17 +373,13 @@ public final class WidgetServerSettings extends AppFragment { m.checkNotNullExpressionValue(textView15, "binding.serverSettingsGu…RoleSubscriptionBasicInfo"); textView15.setVisibility(z2 ? 0 : 8); getBinding().f.setOnClickListener(new WidgetServerSettings$configureUI$16(this, model)); - TextView textView16 = getBinding().i; + TextView textView16 = getBinding().h; m.checkNotNullExpressionValue(textView16, "binding.serverSettingsGuildRoleSubscriptionTiers"); - textView16.setVisibility(z2 ? 0 : 8); - getBinding().i.setOnClickListener(new WidgetServerSettings$configureUI$17(this, model)); - TextView textView17 = getBinding().h; - m.checkNotNullExpressionValue(textView17, "binding.serverSettingsGuildRoleSubscriptionMembers"); if (z2) { i = 0; } - textView17.setVisibility(i); - getBinding().h.setOnClickListener(WidgetServerSettings$configureUI$18.INSTANCE); + textView16.setVisibility(i); + getBinding().h.setOnClickListener(new WidgetServerSettings$configureUI$17(this, model)); configureSectionsVisibility(); } 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 2d686dfe27..2716eac036 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 /* 2131364224 */: + case R.id.menu_sort_channel /* 2131364220 */: 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 /* 2131364225 */: + case R.id.menu_sort_done /* 2131364221 */: 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 9d434a31d0..c27e8e9d3b 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 /* 2131364796 */: + case R.id.role_settings_add_reactions /* 2131364792 */: j = 64; break; - case R.id.role_settings_administrator /* 2131364797 */: + case R.id.role_settings_administrator /* 2131364793 */: j = 8; break; - case R.id.role_settings_attach_files /* 2131364798 */: + case R.id.role_settings_attach_files /* 2131364794 */: j = Permission.ATTACH_FILES; break; - case R.id.role_settings_ban_members /* 2131364799 */: + case R.id.role_settings_ban_members /* 2131364795 */: j = 4; break; - case R.id.role_settings_change_nickname /* 2131364800 */: + case R.id.role_settings_change_nickname /* 2131364796 */: j = Permission.CHANGE_NICKNAME; break; - case R.id.role_settings_color_disabled_overlay /* 2131364801 */: - case R.id.role_settings_color_selector_container /* 2131364802 */: - case R.id.role_settings_current_color_display /* 2131364806 */: - case R.id.role_settings_edit_name_disabled_overlay /* 2131364807 */: - case R.id.role_settings_hoist_checkedsetting /* 2131364809 */: - case R.id.role_settings_icon_container /* 2131364810 */: - case R.id.role_settings_mentionable_checkedsetting /* 2131364822 */: - case R.id.role_settings_overview_scroll /* 2131364823 */: - case R.id.role_settings_role_icon /* 2131364828 */: - case R.id.role_settings_role_icon_divider /* 2131364829 */: - case R.id.role_settings_role_icon_header /* 2131364830 */: + case R.id.role_settings_color_disabled_overlay /* 2131364797 */: + case R.id.role_settings_color_selector_container /* 2131364798 */: + case R.id.role_settings_current_color_display /* 2131364802 */: + case R.id.role_settings_edit_name_disabled_overlay /* 2131364803 */: + case R.id.role_settings_hoist_checkedsetting /* 2131364805 */: + case R.id.role_settings_icon_container /* 2131364806 */: + case R.id.role_settings_mentionable_checkedsetting /* 2131364818 */: + case R.id.role_settings_overview_scroll /* 2131364819 */: + case R.id.role_settings_role_icon /* 2131364824 */: + case R.id.role_settings_role_icon_divider /* 2131364825 */: + case R.id.role_settings_role_icon_header /* 2131364826 */: default: j = 0; break; - case R.id.role_settings_create_instant_invite /* 2131364803 */: + case R.id.role_settings_create_instant_invite /* 2131364799 */: j = 1; break; - case R.id.role_settings_create_private_threads /* 2131364804 */: + case R.id.role_settings_create_private_threads /* 2131364800 */: j = Permission.CREATE_PRIVATE_THREADS; break; - case R.id.role_settings_create_public_threads /* 2131364805 */: + case R.id.role_settings_create_public_threads /* 2131364801 */: j = Permission.CREATE_PUBLIC_THREADS; break; - case R.id.role_settings_embed_links /* 2131364808 */: + case R.id.role_settings_embed_links /* 2131364804 */: j = Permission.EMBED_LINKS; break; - case R.id.role_settings_kick_members /* 2131364811 */: + case R.id.role_settings_kick_members /* 2131364807 */: j = 2; break; - case R.id.role_settings_manage_channels /* 2131364812 */: + case R.id.role_settings_manage_channels /* 2131364808 */: j = 16; break; - case R.id.role_settings_manage_emojis_and_stickers /* 2131364813 */: + case R.id.role_settings_manage_emojis_and_stickers /* 2131364809 */: j = Permission.MANAGE_EMOJIS_AND_STICKERS; break; - case R.id.role_settings_manage_events /* 2131364814 */: + case R.id.role_settings_manage_events /* 2131364810 */: j = Permission.MANAGE_EVENTS; break; - case R.id.role_settings_manage_messages /* 2131364815 */: + case R.id.role_settings_manage_messages /* 2131364811 */: j = Permission.MANAGE_MESSAGES; break; - case R.id.role_settings_manage_nicknames /* 2131364816 */: + case R.id.role_settings_manage_nicknames /* 2131364812 */: j = Permission.MANAGE_NICKNAMES; break; - case R.id.role_settings_manage_roles /* 2131364817 */: + case R.id.role_settings_manage_roles /* 2131364813 */: j = Permission.MANAGE_ROLES; break; - case R.id.role_settings_manage_server /* 2131364818 */: + case R.id.role_settings_manage_server /* 2131364814 */: j = 32; break; - case R.id.role_settings_manage_threads /* 2131364819 */: + case R.id.role_settings_manage_threads /* 2131364815 */: j = Permission.MANAGE_THREADS; break; - case R.id.role_settings_manage_webhooks /* 2131364820 */: + case R.id.role_settings_manage_webhooks /* 2131364816 */: j = Permission.MANAGE_WEBHOOKS; break; - case R.id.role_settings_mention_everyone /* 2131364821 */: + case R.id.role_settings_mention_everyone /* 2131364817 */: j = Permission.MENTION_EVERYONE; break; - case R.id.role_settings_priority_speaker /* 2131364824 */: + case R.id.role_settings_priority_speaker /* 2131364820 */: j = 256; break; - case R.id.role_settings_read_message_history /* 2131364825 */: + case R.id.role_settings_read_message_history /* 2131364821 */: j = Permission.READ_MESSAGE_HISTORY; break; - case R.id.role_settings_read_messages /* 2131364826 */: + case R.id.role_settings_read_messages /* 2131364822 */: j = Permission.VIEW_CHANNEL; break; - case R.id.role_settings_request_to_speak /* 2131364827 */: + case R.id.role_settings_request_to_speak /* 2131364823 */: j = Permission.REQUEST_TO_SPEAK; break; - case R.id.role_settings_send_messages /* 2131364831 */: + case R.id.role_settings_send_messages /* 2131364827 */: j = Permission.SEND_MESSAGES; break; - case R.id.role_settings_send_messages_in_threads /* 2131364832 */: + case R.id.role_settings_send_messages_in_threads /* 2131364828 */: j = Permission.SEND_MESSAGES_IN_THREADS; break; - case R.id.role_settings_send_tts_messages /* 2131364833 */: + case R.id.role_settings_send_tts_messages /* 2131364829 */: j = Permission.SEND_TTS_MESSAGES; break; - case R.id.role_settings_use_application_commands /* 2131364834 */: + case R.id.role_settings_use_application_commands /* 2131364830 */: j = Permission.USE_APPLICATION_COMMANDS; break; - case R.id.role_settings_use_external_emojis /* 2131364835 */: + case R.id.role_settings_use_external_emojis /* 2131364831 */: j = Permission.USE_EXTERNAL_EMOJIS; break; - case R.id.role_settings_use_external_stickers /* 2131364836 */: + case R.id.role_settings_use_external_stickers /* 2131364832 */: j = Permission.USE_EXTERNAL_STICKERS; break; - case R.id.role_settings_view_audit_log /* 2131364837 */: + case R.id.role_settings_view_audit_log /* 2131364833 */: j = 128; break; - case R.id.role_settings_view_guild_analytics /* 2131364838 */: + case R.id.role_settings_view_guild_analytics /* 2131364834 */: j = Permission.VIEW_GUILD_ANALYTICS; break; - case R.id.role_settings_voice_connect /* 2131364839 */: + case R.id.role_settings_voice_connect /* 2131364835 */: j = Permission.CONNECT; break; - case R.id.role_settings_voice_deafen_members /* 2131364840 */: + case R.id.role_settings_voice_deafen_members /* 2131364836 */: j = Permission.DEAFEN_MEMBERS; break; - case R.id.role_settings_voice_move_members /* 2131364841 */: + case R.id.role_settings_voice_move_members /* 2131364837 */: j = Permission.MOVE_MEMBERS; break; - case R.id.role_settings_voice_mute_members /* 2131364842 */: + case R.id.role_settings_voice_mute_members /* 2131364838 */: j = Permission.MUTE_MEMBERS; break; - case R.id.role_settings_voice_speak /* 2131364843 */: + case R.id.role_settings_voice_speak /* 2131364839 */: j = Permission.SPEAK; break; - case R.id.role_settings_voice_use_voice_activity /* 2131364844 */: + case R.id.role_settings_voice_use_voice_activity /* 2131364840 */: j = Permission.USE_VAD; break; - case R.id.role_settings_voice_video /* 2131364845 */: + case R.id.role_settings_voice_video /* 2131364841 */: 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 02205f6ced..fa302ddbed 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 /* 2131364173 */: + case R.id.menu_audit_log_sort_actions /* 2131364169 */: 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 /* 2131364174 */: + case R.id.menu_audit_log_sort_users /* 2131364170 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0); break; } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapter.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapter.java index 59197f2360..c32bb0e5c8 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapter.java @@ -6,13 +6,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.constraintlayout.widget.Barrier; import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.constraintlayout.widget.Group; import androidx.recyclerview.widget.RecyclerView; import c.a.k.b; import com.discord.R; -import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; import com.discord.app.AppComponent; import com.discord.databinding.ViewServerSettingsGuildRoleSubscriptionAddTierItemBinding; import com.discord.databinding.ViewServerSettingsGuildRoleSubscriptionTierItemBinding; @@ -48,7 +45,7 @@ public final class ServerSettingsGuildRoleSubscriptionTierAdapter extends Recycl public interface ItemClickListener { void onAddTierItemClick(); - void onTierItemClick(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing); + void onTierItemClick(long j); } public ServerSettingsGuildRoleSubscriptionTierAdapter(AppComponent appComponent, DiffCreator, TierViewHolder> diffCreator) { @@ -109,36 +106,24 @@ public final class ServerSettingsGuildRoleSubscriptionTierAdapter extends Recycl LayoutInflater from = LayoutInflater.from(viewGroup.getContext()); if (i == 0) { View inflate = from.inflate(R.layout.view_server_settings_guild_role_subscription_tier_item, viewGroup, false); - int i2 = R.id.guild_role_subscription_tier_detail_top_barrier; - Barrier barrier = (Barrier) inflate.findViewById(R.id.guild_role_subscription_tier_detail_top_barrier); - if (barrier != null) { - i2 = R.id.guild_role_subscription_tier_draft_group; - Group group = (Group) inflate.findViewById(R.id.guild_role_subscription_tier_draft_group); - if (group != null) { - i2 = R.id.guild_role_subscription_tier_draft_tag; - TextView textView = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_draft_tag); - if (textView != null) { - i2 = R.id.guild_role_subscription_tier_edit; - ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_role_subscription_tier_edit); - if (imageView != null) { - i2 = R.id.guild_role_subscription_tier_icon; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_role_subscription_tier_icon); - if (simpleDraweeView != null) { - i2 = R.id.guild_role_subscription_tier_member_count; - TextView textView2 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_member_count); - if (textView2 != null) { - i2 = R.id.guild_role_subscription_tier_name; - TextView textView3 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_name); - if (textView3 != null) { - i2 = R.id.guild_role_subscription_tier_price; - TextView textView4 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_price); - if (textView4 != null) { - ViewServerSettingsGuildRoleSubscriptionTierItemBinding viewServerSettingsGuildRoleSubscriptionTierItemBinding = new ViewServerSettingsGuildRoleSubscriptionTierItemBinding((ConstraintLayout) inflate, barrier, group, textView, imageView, simpleDraweeView, textView2, textView3, textView4); - m.checkNotNullExpressionValue(viewServerSettingsGuildRoleSubscriptionTierItemBinding, "ViewServerSettingsGuildR…(inflater, parent, false)"); - tierViewHolder = new TierViewHolder.TierItemViewHolder(viewServerSettingsGuildRoleSubscriptionTierItemBinding); - } - } - } + int i2 = R.id.guild_role_subscription_tier_draft_tag; + TextView textView = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_draft_tag); + if (textView != null) { + i2 = R.id.guild_role_subscription_tier_edit; + ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_role_subscription_tier_edit); + if (imageView != null) { + i2 = R.id.guild_role_subscription_tier_icon; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_role_subscription_tier_icon); + if (simpleDraweeView != null) { + i2 = R.id.guild_role_subscription_tier_name; + TextView textView2 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_name); + if (textView2 != null) { + i2 = R.id.guild_role_subscription_tier_price; + TextView textView3 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_price); + if (textView3 != null) { + ViewServerSettingsGuildRoleSubscriptionTierItemBinding viewServerSettingsGuildRoleSubscriptionTierItemBinding = new ViewServerSettingsGuildRoleSubscriptionTierItemBinding((ConstraintLayout) inflate, textView, imageView, simpleDraweeView, textView2, textView3); + m.checkNotNullExpressionValue(viewServerSettingsGuildRoleSubscriptionTierItemBinding, "ViewServerSettingsGuildR…(inflater, parent, false)"); + tierViewHolder = new TierViewHolder.TierItemViewHolder(viewServerSettingsGuildRoleSubscriptionTierItemBinding); } } } @@ -151,9 +136,9 @@ public final class ServerSettingsGuildRoleSubscriptionTierAdapter extends Recycl ImageView imageView2 = (ImageView) inflate2.findViewById(R.id.guild_role_subscription_add_tier_image); if (imageView2 != null) { i3 = R.id.guild_role_subscription_add_tier_text; - TextView textView5 = (TextView) inflate2.findViewById(R.id.guild_role_subscription_add_tier_text); - if (textView5 != null) { - ViewServerSettingsGuildRoleSubscriptionAddTierItemBinding viewServerSettingsGuildRoleSubscriptionAddTierItemBinding = new ViewServerSettingsGuildRoleSubscriptionAddTierItemBinding((ConstraintLayout) inflate2, imageView2, textView5); + TextView textView4 = (TextView) inflate2.findViewById(R.id.guild_role_subscription_add_tier_text); + if (textView4 != null) { + ViewServerSettingsGuildRoleSubscriptionAddTierItemBinding viewServerSettingsGuildRoleSubscriptionAddTierItemBinding = new ViewServerSettingsGuildRoleSubscriptionAddTierItemBinding((ConstraintLayout) inflate2, imageView2, textView4); m.checkNotNullExpressionValue(viewServerSettingsGuildRoleSubscriptionAddTierItemBinding, "ViewServerSettingsGuildR…rent, false\n )"); ItemClickListener itemClickListener = this.itemClickListener; if (itemClickListener == null) { diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapterItem.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapterItem.java index 365263d2dd..a954ac9d2c 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapterItem.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierAdapterItem.java @@ -1,7 +1,7 @@ package com.discord.widgets.servers.guild_role_subscription; +import a0.a.a.b; import c.d.b.a.a; -import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; import com.discord.utilities.recycler.DiffKeyProvider; import d0.z.d.m; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -25,38 +25,73 @@ public abstract class ServerSettingsGuildRoleSubscriptionTierAdapterItem impleme /* compiled from: ServerSettingsGuildRoleSubscriptionTierAdapter.kt */ public static final class Tier extends ServerSettingsGuildRoleSubscriptionTierAdapterItem { + private final long applicationId; + private final boolean isPublished; private final String key; - private final GuildRoleSubscriptionTierListing tierListing; + private final Long tierImageAssetId; + private final long tierListingId; + private final String tierName; + private final int tierPrice; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Tier(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { + public Tier(long j, String str, int i, long j2, boolean z2, Long l) { super(null); - m.checkNotNullParameter(guildRoleSubscriptionTierListing, "tierListing"); - this.tierListing = guildRoleSubscriptionTierListing; - this.key = String.valueOf(guildRoleSubscriptionTierListing.c()); + m.checkNotNullParameter(str, "tierName"); + this.tierListingId = j; + this.tierName = str; + this.tierPrice = i; + this.applicationId = j2; + this.isPublished = z2; + this.tierImageAssetId = l; + this.key = String.valueOf(j); } - public static /* synthetic */ Tier copy$default(Tier tier, GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing, int i, Object obj) { - if ((i & 1) != 0) { - guildRoleSubscriptionTierListing = tier.tierListing; - } - return tier.copy(guildRoleSubscriptionTierListing); + public static /* synthetic */ Tier copy$default(Tier tier, long j, String str, int i, long j2, boolean z2, Long l, int i2, Object obj) { + return tier.copy((i2 & 1) != 0 ? tier.tierListingId : j, (i2 & 2) != 0 ? tier.tierName : str, (i2 & 4) != 0 ? tier.tierPrice : i, (i2 & 8) != 0 ? tier.applicationId : j2, (i2 & 16) != 0 ? tier.isPublished : z2, (i2 & 32) != 0 ? tier.tierImageAssetId : l); } - public final GuildRoleSubscriptionTierListing component1() { - return this.tierListing; + public final long component1() { + return this.tierListingId; } - public final Tier copy(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { - m.checkNotNullParameter(guildRoleSubscriptionTierListing, "tierListing"); - return new Tier(guildRoleSubscriptionTierListing); + public final String component2() { + return this.tierName; + } + + public final int component3() { + return this.tierPrice; + } + + public final long component4() { + return this.applicationId; + } + + public final boolean component5() { + return this.isPublished; + } + + public final Long component6() { + return this.tierImageAssetId; + } + + public final Tier copy(long j, String str, int i, long j2, boolean z2, Long l) { + m.checkNotNullParameter(str, "tierName"); + return new Tier(j, str, i, j2, z2, l); } public boolean equals(Object obj) { - if (this != obj) { - return (obj instanceof Tier) && m.areEqual(this.tierListing, ((Tier) obj).tierListing); + if (this == obj) { + return true; } - return true; + if (!(obj instanceof Tier)) { + return false; + } + Tier tier = (Tier) obj; + return this.tierListingId == tier.tierListingId && m.areEqual(this.tierName, tier.tierName) && this.tierPrice == tier.tierPrice && this.applicationId == tier.applicationId && this.isPublished == tier.isPublished && m.areEqual(this.tierImageAssetId, tier.tierImageAssetId); + } + + public final long getApplicationId() { + return this.applicationId; } @Override // com.discord.utilities.recycler.DiffKeyProvider @@ -64,23 +99,59 @@ public abstract class ServerSettingsGuildRoleSubscriptionTierAdapterItem impleme return this.key; } - public final GuildRoleSubscriptionTierListing getTierListing() { - return this.tierListing; + public final Long getTierImageAssetId() { + return this.tierImageAssetId; + } + + public final long getTierListingId() { + return this.tierListingId; + } + + public final String getTierName() { + return this.tierName; + } + + public final int getTierPrice() { + return this.tierPrice; } public int hashCode() { - GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing = this.tierListing; - if (guildRoleSubscriptionTierListing != null) { - return guildRoleSubscriptionTierListing.hashCode(); + int a = b.a(this.tierListingId) * 31; + String str = this.tierName; + int i = 0; + int a2 = (b.a(this.applicationId) + ((((a + (str != null ? str.hashCode() : 0)) * 31) + this.tierPrice) * 31)) * 31; + boolean z2 = this.isPublished; + if (z2) { + z2 = true; } - return 0; + int i2 = z2 ? 1 : 0; + int i3 = z2 ? 1 : 0; + int i4 = z2 ? 1 : 0; + int i5 = (a2 + i2) * 31; + Long l = this.tierImageAssetId; + if (l != null) { + i = l.hashCode(); + } + return i5 + i; + } + + public final boolean isPublished() { + return this.isPublished; } public String toString() { - StringBuilder O = a.O("Tier(tierListing="); - O.append(this.tierListing); - O.append(")"); - return O.toString(); + StringBuilder O = a.O("Tier(tierListingId="); + O.append(this.tierListingId); + O.append(", tierName="); + O.append(this.tierName); + O.append(", tierPrice="); + O.append(this.tierPrice); + O.append(", applicationId="); + O.append(this.applicationId); + O.append(", isPublished="); + O.append(this.isPublished); + O.append(", tierImageAssetId="); + return a.E(O, this.tierImageAssetId, ")"); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java index b6ac13bf78..fd7345e921 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java @@ -1,6 +1,8 @@ package com.discord.widgets.servers.guild_role_subscription; import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; +import com.discord.api.guildrolesubscription.ImageAsset; +import com.discord.widgets.guild_role_subscriptions.GuildRoleSubscriptionUtilsKt; import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapterItem; import java.util.ArrayList; import java.util.List; @@ -10,7 +12,11 @@ public final class ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt { ArrayList arrayList = new ArrayList(); if (list != null) { for (GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing : list) { - arrayList.add(new ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier(guildRoleSubscriptionTierListing)); + long c2 = guildRoleSubscriptionTierListing.c(); + String e = guildRoleSubscriptionTierListing.e(); + int priceTier = GuildRoleSubscriptionUtilsKt.getPriceTier(guildRoleSubscriptionTierListing); + ImageAsset d = guildRoleSubscriptionTierListing.d(); + arrayList.add(new ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier(c2, e, priceTier, guildRoleSubscriptionTierListing.a(), guildRoleSubscriptionTierListing.f(), d != null ? Long.valueOf(d.a()) : null)); } } if ((list != null ? list.size() : 0) < i) { diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder$TierItemViewHolder$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder$TierItemViewHolder$configureUI$1.java index 7643ca26fb..3bf79a9c53 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder$TierItemViewHolder$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder$TierItemViewHolder$configureUI$1.java @@ -1,20 +1,20 @@ package com.discord.widgets.servers.guild_role_subscription; import android.view.View; -import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapter; +import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapterItem; /* compiled from: ServerSettingsGuildRoleSubscriptionTierAdapter.kt */ public final class TierViewHolder$TierItemViewHolder$configureUI$1 implements View.OnClickListener { public final /* synthetic */ ServerSettingsGuildRoleSubscriptionTierAdapter.ItemClickListener $itemClickListener; - public final /* synthetic */ GuildRoleSubscriptionTierListing $tierListing; + public final /* synthetic */ ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier $tierAdapterItem; - public TierViewHolder$TierItemViewHolder$configureUI$1(ServerSettingsGuildRoleSubscriptionTierAdapter.ItemClickListener itemClickListener, GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { + public TierViewHolder$TierItemViewHolder$configureUI$1(ServerSettingsGuildRoleSubscriptionTierAdapter.ItemClickListener itemClickListener, ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier tier) { this.$itemClickListener = itemClickListener; - this.$tierListing = guildRoleSubscriptionTierListing; + this.$tierAdapterItem = tier; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - this.$itemClickListener.onTierItemClick(this.$tierListing); + this.$itemClickListener.onTierItemClick(this.$tierAdapterItem.getTierListingId()); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder.java index baac2fce1e..2574ae6418 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/TierViewHolder.java @@ -1,18 +1,20 @@ package com.discord.widgets.servers.guild_role_subscription; +import android.content.Context; import android.view.View; import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.constraintlayout.widget.Group; import androidx.recyclerview.widget.RecyclerView; +import c.a.k.b; import com.discord.R; -import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; import com.discord.databinding.ViewServerSettingsGuildRoleSubscriptionAddTierItemBinding; import com.discord.databinding.ViewServerSettingsGuildRoleSubscriptionTierItemBinding; +import com.discord.utilities.billing.PremiumUtilsKt; import com.discord.utilities.icon.IconUtils; +import com.discord.utilities.images.MGImages; import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapter; import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapterItem; -import d0.d0.f; +import com.facebook.drawee.view.SimpleDraweeView; import d0.z.d.m; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: ServerSettingsGuildRoleSubscriptionTierAdapter.kt */ @@ -80,22 +82,36 @@ public abstract class TierViewHolder extends RecyclerView.ViewHolder { public final void configureUI(ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier tier, ServerSettingsGuildRoleSubscriptionTierAdapter.ItemClickListener itemClickListener) { m.checkNotNullParameter(tier, "tierAdapterItem"); m.checkNotNullParameter(itemClickListener, "itemClickListener"); - GuildRoleSubscriptionTierListing tierListing = tier.getTierListing(); - this.itemView.setOnClickListener(new TierViewHolder$TierItemViewHolder$configureUI$1(itemClickListener, tierListing)); + this.itemView.setOnClickListener(new TierViewHolder$TierItemViewHolder$configureUI$1(itemClickListener, tier)); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscriptionTierName"); - textView.setText(tierListing.e()); - f.coerceAtMost(IconUtils.getMediaProxySize(this.tierImageSizePx), 64); - Group group = this.binding.b; - m.checkNotNullExpressionValue(group, "binding.guildRoleSubscriptionTierDraftGroup"); + textView.setText(tier.getTierName()); + TextView textView2 = this.binding.e; + m.checkNotNullExpressionValue(textView2, "binding.guildRoleSubscriptionTierPrice"); + View view = this.itemView; + m.checkNotNullExpressionValue(view, "itemView"); + int tierPrice = tier.getTierPrice(); + View view2 = this.itemView; + m.checkNotNullExpressionValue(view2, "itemView"); + Context context = view2.getContext(); + m.checkNotNullExpressionValue(context, "itemView.context"); + CharSequence formattedPriceUsd = PremiumUtilsKt.getFormattedPriceUsd(tierPrice, context); int i = 0; - group.setVisibility(tierListing.f() ^ true ? 0 : 8); - TextView textView2 = this.binding.f1694c; - m.checkNotNullExpressionValue(textView2, "binding.guildRoleSubscriptionTierMemberCount"); - if (!tierListing.f()) { - i = 4; + String str = null; + textView2.setText(b.j(view, R.string.billing_price_per_month, new Object[]{formattedPriceUsd}, null, 4)); + if (tier.getTierImageAssetId() != null) { + str = IconUtils.INSTANCE.getStoreAssetImage(Long.valueOf(tier.getApplicationId()), String.valueOf(tier.getTierImageAssetId().longValue()), 64); } - textView2.setVisibility(i); + SimpleDraweeView simpleDraweeView = this.binding.f1694c; + m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildRoleSubscriptionTierIcon"); + int i2 = this.tierImageSizePx; + MGImages.setImage$default(simpleDraweeView, str, i2, i2, false, null, null, 112, null); + TextView textView3 = this.binding.b; + m.checkNotNullExpressionValue(textView3, "binding.guildRoleSubscriptionTierDraftTag"); + if (!(!tier.isPublished())) { + i = 8; + } + textView3.setVisibility(i); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList$configureUI$1.java index 55776505e3..db18d8e6b7 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsGuildRoleSubscriptionTierList$configureUI$1.java @@ -1,11 +1,9 @@ package com.discord.widgets.servers.guild_role_subscription; -import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; import com.discord.widgets.guild_role_subscriptions.tier.create.WidgetCreateGuildRoleSubscriptionTier; import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapter; import com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierListViewModel; import com.discord.widgets.servers.guild_role_subscription.edit_tier.WidgetServerSettingsGuildRoleSubscriptionEditTier; -import d0.z.d.m; /* compiled from: WidgetServerSettingsGuildRoleSubscriptionTierList.kt */ public final class WidgetServerSettingsGuildRoleSubscriptionTierList$configureUI$1 implements ServerSettingsGuildRoleSubscriptionTierAdapter.ItemClickListener { public final /* synthetic */ ServerSettingsGuildRoleSubscriptionTierListViewModel.ViewState.Loaded $loadedViewState; @@ -22,8 +20,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionTierList$configureUI } @Override // com.discord.widgets.servers.guild_role_subscription.ServerSettingsGuildRoleSubscriptionTierAdapter.ItemClickListener - public void onTierItemClick(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { - m.checkNotNullParameter(guildRoleSubscriptionTierListing, "tierListing"); - WidgetServerSettingsGuildRoleSubscriptionEditTier.Companion.launch(this.this$0.requireContext(), WidgetServerSettingsGuildRoleSubscriptionTierList.access$getGuildId$p(this.this$0), this.$loadedViewState.getGroupListingId(), guildRoleSubscriptionTierListing.c()); + public void onTierItemClick(long j) { + WidgetServerSettingsGuildRoleSubscriptionEditTier.Companion.launch(this.this$0.requireContext(), WidgetServerSettingsGuildRoleSubscriptionTierList.access$getGuildId$p(this.this$0), this.$loadedViewState.getGroupListingId(), j); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$1.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$1.java index 26bebb73ee..07f9ae30d7 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$1.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$1.java @@ -28,7 +28,7 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishT public final void invoke(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { m.checkNotNullParameter(guildRoleSubscriptionTierListing, "it"); - ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, false, 3, null)); + ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null)); ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitSuccess.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$2.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$2.java index bfc974a332..90843f37ae 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$2.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$2.java @@ -28,7 +28,7 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishT public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, false, 3, null)); + ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null)); ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2.java index 877197769b..30e3ec01aa 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2.java @@ -28,7 +28,7 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitCh public final void invoke(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { m.checkNotNullParameter(guildRoleSubscriptionTierListing, "it"); - ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, false, 3, null)); + ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null)); ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitSuccess.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3.java index 6756c4547d..70a506c6a3 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3.java @@ -28,7 +28,7 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitCh public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, false, 3, null)); + ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null)); ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java index dcb1cce2c3..342a43bd56 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java @@ -317,24 +317,26 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends private final boolean hasChanges; private final boolean isPublished; private final boolean isSubmitting; + private final String tierName; public Loaded() { - this(false, false, false, 7, null); + this(false, false, null, false, 15, null); } - public Loaded(boolean z2, boolean z3, boolean z4) { + public Loaded(boolean z2, boolean z3, String str, boolean z4) { super(null); this.hasChanges = z2; this.isPublished = z3; + this.tierName = str; this.isSubmitting = z4; } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ Loaded(boolean z2, boolean z3, boolean z4, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? false : z2, (i & 2) != 0 ? false : z3, (i & 4) != 0 ? false : z4); + public /* synthetic */ Loaded(boolean z2, boolean z3, String str, boolean z4, int i, DefaultConstructorMarker defaultConstructorMarker) { + this((i & 1) != 0 ? false : z2, (i & 2) != 0 ? false : z3, (i & 4) != 0 ? null : str, (i & 8) != 0 ? false : z4); } - public static /* synthetic */ Loaded copy$default(Loaded loaded, boolean z2, boolean z3, boolean z4, int i, Object obj) { + public static /* synthetic */ Loaded copy$default(Loaded loaded, boolean z2, boolean z3, String str, boolean z4, int i, Object obj) { if ((i & 1) != 0) { z2 = loaded.hasChanges; } @@ -342,9 +344,12 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends z3 = loaded.isPublished; } if ((i & 4) != 0) { + str = loaded.tierName; + } + if ((i & 8) != 0) { z4 = loaded.isSubmitting; } - return loaded.copy(z2, z3, z4); + return loaded.copy(z2, z3, str, z4); } public final boolean component1() { @@ -355,12 +360,16 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends return this.isPublished; } - public final boolean component3() { + public final String component3() { + return this.tierName; + } + + public final boolean component4() { return this.isSubmitting; } - public final Loaded copy(boolean z2, boolean z3, boolean z4) { - return new Loaded(z2, z3, z4); + public final Loaded copy(boolean z2, boolean z3, String str, boolean z4) { + return new Loaded(z2, z3, str, z4); } public boolean equals(Object obj) { @@ -371,13 +380,17 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends return false; } Loaded loaded = (Loaded) obj; - return this.hasChanges == loaded.hasChanges && this.isPublished == loaded.isPublished && this.isSubmitting == loaded.isSubmitting; + return this.hasChanges == loaded.hasChanges && this.isPublished == loaded.isPublished && m.areEqual(this.tierName, loaded.tierName) && this.isSubmitting == loaded.isSubmitting; } public final boolean getHasChanges() { return this.hasChanges; } + public final String getTierName() { + return this.tierName; + } + public int hashCode() { boolean z2 = this.hasChanges; int i = 1; @@ -396,11 +409,13 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends int i7 = z3 ? 1 : 0; int i8 = z3 ? 1 : 0; int i9 = (i5 + i6) * 31; + String str = this.tierName; + int hashCode = (i9 + (str != null ? str.hashCode() : 0)) * 31; boolean z4 = this.isSubmitting; if (!z4) { i = z4 ? 1 : 0; } - return i9 + i; + return hashCode + i; } public final boolean isPublished() { @@ -416,6 +431,8 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends O.append(this.hasChanges); O.append(", isPublished="); O.append(this.isPublished); + O.append(", tierName="); + O.append(this.tierName); O.append(", isSubmitting="); return a.K(O, this.isSubmitting, ")"); } @@ -571,10 +588,10 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends GuildRoleSubscriptionTier guildRoleSubscriptionTier = new GuildRoleSubscriptionTier(e, valueOf, Integer.valueOf(i), Integer.valueOf(RoleUtils.getOpaqueColor(guildRole)), null, guildRole, null, l, b2, Boolean.valueOf(guildRoleSubscriptionTierListing.f()), null, arrayList, arrayList2, 1104, null); this.storedGuildRoleSubscriptionTier = guildRoleSubscriptionTier; this.eventSubject.j.onNext(new Event.StoredStateUpdate(guildRoleSubscriptionTier)); - updateViewState(new ViewState.Loaded(false, guildRoleSubscriptionTierListing.f(), false, 5, null)); + updateViewState(new ViewState.Loaded(false, guildRoleSubscriptionTierListing.f(), guildRoleSubscriptionTierListing.e(), false, 9, null)); return; } - updateViewState(new ViewState.Loaded(hasChanges, guildRoleSubscriptionTierListing.f(), false, 4, null)); + updateViewState(new ViewState.Loaded(hasChanges, guildRoleSubscriptionTierListing.f(), null, false, 12, null)); } } } @@ -599,8 +616,10 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends } public final void onTierUpdated(GuildRoleSubscriptionTier guildRoleSubscriptionTier) { + String str; m.checkNotNullParameter(guildRoleSubscriptionTier, "guildRoleSubscriptionTier"); ViewState requireViewState = requireViewState(); + String str2 = null; if (!(requireViewState instanceof ViewState.Loaded)) { requireViewState = null; } @@ -661,7 +680,17 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends this.editedIntangibleBenefits = null; z3 = z2; } - updateViewState(ViewState.Loaded.copy$default(loaded, z3, false, false, 6, null)); + String str3 = this.editedTierName; + if (str3 != null) { + str = str3; + } else { + GuildRoleSubscriptionTier guildRoleSubscriptionTier7 = this.storedGuildRoleSubscriptionTier; + if (guildRoleSubscriptionTier7 != null) { + str2 = guildRoleSubscriptionTier7.getName(); + } + str = str2; + } + updateViewState(ViewState.Loaded.copy$default(loaded, z3, false, str, false, 10, null)); } } @@ -676,8 +705,12 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends } } + /* JADX WARNING: Removed duplicated region for block: B:19:0x0053 */ public final void submitChanges() { Integer num; + List list; + List list2; + List list3; ViewState requireViewState = requireViewState(); if (!(requireViewState instanceof ViewState.Loaded)) { requireViewState = null; @@ -690,7 +723,43 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends } else { num = null; } - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.updateGuildRoleSubscriptionTierListing$default(GuildRoleSubscriptionUtils.INSTANCE, this.restApi, this.storeGuildRoleSubscriptions, this.guildId, this.guildRoleSubscriptionGroupListingId, this.guildRoleSubscriptionTierListingId, this.editedTierName, this.editedTierDescription, this.editedTierImage, num, this.editedMemberIcon, this.editedChannelBenefits, this.editedIntangibleBenefits, null, 4096, null), this, null, 2, null), ServerSettingsGuildRoleSubscriptionEditTierViewModel.class, (Context) null, (Function1) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3(this, loaded), (Function0) null, (Function0) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2(this, loaded), 54, (Object) null); + GuildRoleSubscriptionUtils guildRoleSubscriptionUtils = GuildRoleSubscriptionUtils.INSTANCE; + RestAPI restAPI = this.restApi; + StoreGuildRoleSubscriptions storeGuildRoleSubscriptions = this.storeGuildRoleSubscriptions; + long j = this.guildId; + long j2 = this.guildRoleSubscriptionGroupListingId; + long j3 = this.guildRoleSubscriptionTierListingId; + String str = this.editedTierName; + String str2 = this.editedTierDescription; + String str3 = this.editedTierImage; + String str4 = this.editedMemberIcon; + List list4 = this.editedChannelBenefits; + if (list4 == null) { + GuildRoleSubscriptionTier guildRoleSubscriptionTier = this.storedGuildRoleSubscriptionTier; + if (guildRoleSubscriptionTier != null) { + list4 = guildRoleSubscriptionTier.getChannelBenefits(); + } else { + list = null; + list2 = this.editedIntangibleBenefits; + if (list2 == null) { + GuildRoleSubscriptionTier guildRoleSubscriptionTier2 = this.storedGuildRoleSubscriptionTier; + if (guildRoleSubscriptionTier2 != null) { + list2 = guildRoleSubscriptionTier2.getIntangibleBenefits(); + } else { + list3 = null; + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.updateGuildRoleSubscriptionTierListing$default(guildRoleSubscriptionUtils, restAPI, storeGuildRoleSubscriptions, j, j2, j3, str, str2, str3, num, str4, list, list3, null, 4096, null), this, null, 2, null), ServerSettingsGuildRoleSubscriptionEditTierViewModel.class, (Context) null, (Function1) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3(this, loaded), (Function0) null, (Function0) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2(this, loaded), 54, (Object) null); + } + } + list3 = list2; + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.updateGuildRoleSubscriptionTierListing$default(guildRoleSubscriptionUtils, restAPI, storeGuildRoleSubscriptions, j, j2, j3, str, str2, str3, num, str4, list, list3, null, 4096, null), this, null, 2, null), ServerSettingsGuildRoleSubscriptionEditTierViewModel.class, (Context) null, (Function1) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3(this, loaded), (Function0) null, (Function0) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2(this, loaded), 54, (Object) null); + } + } + list = list4; + list2 = this.editedIntangibleBenefits; + if (list2 == null) { + } + list3 = list2; + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(GuildRoleSubscriptionUtils.updateGuildRoleSubscriptionTierListing$default(guildRoleSubscriptionUtils, restAPI, storeGuildRoleSubscriptions, j, j2, j3, str, str2, str3, num, str4, list, list3, null, 4096, null), this, null, 2, null), ServerSettingsGuildRoleSubscriptionEditTierViewModel.class, (Context) null, (Function1) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3(this, loaded), (Function0) null, (Function0) null, new ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$2(this, loaded), 54, (Object) null); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$binding$2.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$binding$2.java index 89387dc840..660639f680 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$binding$2.java @@ -1,11 +1,10 @@ package com.discord.widgets.servers.guild_role_subscription.edit_tier; import android.view.View; -import androidx.core.widget.NestedScrollView; +import android.widget.FrameLayout; import androidx.fragment.app.FragmentContainerView; import com.discord.R; import com.discord.databinding.WidgetGuildRoleSubscriptionEditTierBenefitsBinding; -import com.google.android.material.button.MaterialButton; import d0.z.d.k; import d0.z.d.m; import kotlin.jvm.functions.Function1; @@ -19,15 +18,10 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionEditTierBenefits$b public final WidgetGuildRoleSubscriptionEditTierBenefitsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = R.id.guild_role_subscription_edit_role_permissions; - MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_role_subscription_edit_role_permissions); - if (materialButton != null) { - i = R.id.guild_role_subscription_tier_benefits_content; - FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.guild_role_subscription_tier_benefits_content); - if (fragmentContainerView != null) { - return new WidgetGuildRoleSubscriptionEditTierBenefitsBinding((NestedScrollView) view, materialButton, fragmentContainerView); - } + FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.guild_role_subscription_tier_benefits_content); + if (fragmentContainerView != null) { + return new WidgetGuildRoleSubscriptionEditTierBenefitsBinding((FrameLayout) view, fragmentContainerView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.guild_role_subscription_tier_benefits_content))); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1.java deleted file mode 100644 index 5f769fe52a..0000000000 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.discord.widgets.servers.guild_role_subscription.edit_tier; - -import android.view.View; -/* compiled from: WidgetGuildRoleSubscriptionEditTierBenefits.kt */ -public final class WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1 implements View.OnClickListener { - public static final WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1 INSTANCE = new WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1(); - - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - } -} diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java index 19ddcaa3ec..f15db009c6 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java @@ -58,6 +58,5 @@ public final class WidgetGuildRoleSubscriptionEditTierBenefits extends AppFragme m.checkNotNullParameter(view, "view"); super.onViewBound(view); getChildFragmentManager().beginTransaction().replace(R.id.guild_role_subscription_tier_benefits_content, WidgetGuildRoleSubscriptionTierBenefits.Companion.newInstance(getGuildId(), GuildRoleSubscriptionTierBenefitListType.ALL, true)).commit(); - getBinding().b.setOnClickListener(WidgetGuildRoleSubscriptionEditTierBenefits$onViewBound$1.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java index ea8f856b6b..9816e46609 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java @@ -129,10 +129,11 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier extends App appViewFlipper2.setDisplayedChild(1); Group group = getBinding().f1970c; m.checkNotNullExpressionValue(group, "binding.guildRoleSubscriptionEditTierPublishGroup"); - if (!(!loaded.isPublished())) { + if (!(true ^ loaded.isPublished())) { i = 8; } group.setVisibility(i); + setActionBarTitle(loaded.getTierName()); } else if (m.areEqual(viewState, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Failed.INSTANCE)) { c.a.d.m.i(this, R.string.default_failure_to_perform_action_message, 0, 4); requireActivity().finish(); @@ -167,6 +168,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier extends App if (event instanceof ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.StoredStateUpdate) { getTierViewModel().setTier(((ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.StoredStateUpdate) event).getGuildRoleSubscriptionTier()); } else if (event instanceof ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitSuccess) { + AppFragment.hideKeyboard$default(this, null, 1, null); requireActivity().finish(); } } 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 e7ab8adcea..f9d846201e 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 /* 2131364219 */: + case R.id.menu_settings_debugging /* 2131364215 */: WidgetDebugging.Companion companion = WidgetDebugging.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); return; - case R.id.menu_settings_log_out /* 2131364220 */: + case R.id.menu_settings_log_out /* 2131364216 */: 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 23c2b5506a..457e680107 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 + " - 98.0 - Alpha (98200)"); + textView.setText(string + " - 98.1 - Alpha (98201)"); 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/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java index 2dfd9ae63f..3a575d8ddb 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 /* 2131364177 */: + case R.id.menu_call_overlay_launcher /* 2131364173 */: DiscordOverlayService.Companion companion = DiscordOverlayService.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launchForConnect(context); return; - case R.id.menu_call_switch_camera /* 2131364178 */: + case R.id.menu_call_switch_camera /* 2131364174 */: WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed(); return; - case R.id.menu_call_video_list /* 2131364179 */: + case R.id.menu_call_video_list /* 2131364175 */: 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 /* 2131364180 */: + case R.id.menu_call_voice_settings /* 2131364176 */: 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/drawable/bg_steps_progress_indicator_dot.xml b/app/src/main/res/drawable/bg_steps_progress_indicator_dot.xml new file mode 100644 index 0000000000..89bf91baa3 --- /dev/null +++ b/app/src/main/res/drawable/bg_steps_progress_indicator_dot.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-v22/steps_progress_indicator_dot_view.xml b/app/src/main/res/layout-v22/steps_progress_indicator_dot_view.xml new file mode 100644 index 0000000000..e1ff7f135b --- /dev/null +++ b/app/src/main/res/layout-v22/steps_progress_indicator_dot_view.xml @@ -0,0 +1,2 @@ + + diff --git a/app/src/main/res/layout-v22/view_server_settings_guild_role_subscription_tier_item.xml b/app/src/main/res/layout-v22/view_server_settings_guild_role_subscription_tier_item.xml index ea9aed559b..638f0fc443 100644 --- a/app/src/main/res/layout-v22/view_server_settings_guild_role_subscription_tier_item.xml +++ b/app/src/main/res/layout-v22/view_server_settings_guild_role_subscription_tier_item.xml @@ -1,11 +1,8 @@ - - - - - - + + + diff --git a/app/src/main/res/layout-v22/view_steps.xml b/app/src/main/res/layout-v22/view_steps.xml index 5b004d6c4c..e210cab39a 100644 --- a/app/src/main/res/layout-v22/view_steps.xml +++ b/app/src/main/res/layout-v22/view_steps.xml @@ -2,6 +2,7 @@ + diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_edit_tier_benefits.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_edit_tier_benefits.xml deleted file mode 100644 index ab4fd7d545..0000000000 --- a/app/src/main/res/layout-v22/widget_guild_role_subscription_edit_tier_benefits.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - 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 d6a0bb2898..0a0e8840bd 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 @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/res/layout/steps_progress_indicator_dot_view.xml b/app/src/main/res/layout/steps_progress_indicator_dot_view.xml new file mode 100644 index 0000000000..c1702650dd --- /dev/null +++ b/app/src/main/res/layout/steps_progress_indicator_dot_view.xml @@ -0,0 +1,2 @@ + + diff --git a/app/src/main/res/layout/view_server_settings_guild_role_subscription_tier_item.xml b/app/src/main/res/layout/view_server_settings_guild_role_subscription_tier_item.xml index d5f6026d67..c59924c58a 100644 --- a/app/src/main/res/layout/view_server_settings_guild_role_subscription_tier_item.xml +++ b/app/src/main/res/layout/view_server_settings_guild_role_subscription_tier_item.xml @@ -1,11 +1,8 @@ - - - - - - + + + diff --git a/app/src/main/res/layout/view_steps.xml b/app/src/main/res/layout/view_steps.xml index 3af51020a5..5956665ac6 100644 --- a/app/src/main/res/layout/view_steps.xml +++ b/app/src/main/res/layout/view_steps.xml @@ -2,6 +2,7 @@ + diff --git a/app/src/main/res/layout/widget_guild_role_subscription_edit_tier_benefits.xml b/app/src/main/res/layout/widget_guild_role_subscription_edit_tier_benefits.xml index 4d4eab8e67..af827e37c4 100644 --- a/app/src/main/res/layout/widget_guild_role_subscription_edit_tier_benefits.xml +++ b/app/src/main/res/layout/widget_guild_role_subscription_edit_tier_benefits.xml @@ -1,9 +1,4 @@ - - - - - - - - + + + diff --git a/app/src/main/res/layout/widget_server_settings.xml b/app/src/main/res/layout/widget_server_settings.xml index 4181f316bf..5ac03e15fc 100644 --- a/app/src/main/res/layout/widget_server_settings.xml +++ b/app/src/main/res/layout/widget_server_settings.xml @@ -37,7 +37,6 @@ - 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 ba01145743..03e5a190ac 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 @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml index 0afc4cf1dd..96d44d7518 100644 --- a/app/src/main/res/values-ar-rXB/plurals.xml +++ b/app/src/main/res/values-ar-rXB/plurals.xml @@ -528,6 +528,10 @@ ‏‮1‬‏ ‏‮community‬‏ ‏‮{count}‬‏ ‏‮communities‬‏ + + ‏‮{#}‬‏ ‏‮more‬‏ ‏‮person‬‏ ‏‮is‬‏ + ‏‮{#}‬‏ ‏‮more‬‏ ‏‮people‬‏ ‏‮are‬‏ + ‏‮{#}‬‏ ‏‮person‬‏ ‏‮is‬‏ ‏‮{#}‬‏ ‏‮people‬‏ ‏‮are‬‏ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 2c931a0ec7..757f68dd36 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -2214,6 +2214,8 @@ ‏‮Allow‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮find‬‏ ‏‮me‬‏ ‏‮$[Learn‬‏ ‏‮More](learnMoreHook)‬‏ ‏‮Discovery‬‏ + ‏‮Explore‬‏ ‏‮and‬‏ ‏‮search‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮variety‬‏ ‏‮of‬‏ ‏‮public‬‏ ‏‮communities.‬‏ ‏‮From‬‏ ‏‮gaming,‬‏ ‏‮to‬‏ ‏‮music,‬‏ ‏‮to‬‏ ‏‮study‬‏ ‏‮groups‬‏ ‏‮—‬‏ ‏‮there’s‬‏ ‏‮a‬‏ ‏‮place‬‏ ‏‮for‬‏ ‏‮you.‬‏ + ‏‮Check‬‏ ‏‮out‬‏ ‏‮Server‬‏ ‏‮Discovery‬‏ ‏‮{speakersCount}‬‏ ‏‮Dismiss‬‏ ‏‮If‬‏ ‏‮the‬‏ ‏‮problem‬‏ ‏‮persists,‬‏ ‏‮create‬‏ ‏‮a‬‏ ‏‮support‬‏ ‏‮ticket‬‏ ‏‮and‬‏ ‏‮copy‬‏ ‏‮the‬‏ ‏‮message‬‏ ‏‮content‬‏ ‏‮below.‬‏ @@ -3364,6 +3366,9 @@ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮delete‬‏ ‏‮this‬‏ ‏‮event?‬‏ ‏‮Delete‬‏ ‏‮Event?‬‏ ‏‮Event‬‏ ‏‮Info‬‏ + ‏‮No‬‏ ‏‮one\'s‬‏ ‏‮interested‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮event‬‏ ‏‮yet.‬‏ + ‏‮We‬‏ ‏‮are‬‏ ‏‮having‬‏ ‏‮problems‬‏ ‏‮looking‬‏ ‏‮up‬‏ ‏‮who‬‏ ‏‮is‬‏ ‏‮interested‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮event.‬‏ ‏‮Please‬‏ ‏‮try‬‏ ‏‮again‬‏ ‏‮later.‬‏ + ‏‮{userRemainCount}‬‏ ‏‮interested.‬‏ ‏‮{userCount}‬‏ ‏‮Interested‬‏ ‏‮The‬‏ ‏‮end‬‏ ‏‮time‬‏ ‏‮must‬‏ ‏‮be‬‏ ‏‮after‬‏ ‏‮the‬‏ ‏‮start‬‏ ‏‮time.‬‏ ‏‮End‬‏ ‏‮date‬‏ ‏‮and‬‏ ‏‮time‬‏ ‏‮are‬‏ ‏‮required.‬‏ @@ -5911,8 +5916,8 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml index 0f37ba7733..c77657eaef 100644 --- a/app/src/main/res/values-en-rXA/plurals.xml +++ b/app/src/main/res/values-en-rXA/plurals.xml @@ -528,6 +528,10 @@ [1 çöḿḿûñîţý one two] [»{count}« çöḿḿûñîţîéš one two] + + [»{#}« ḿöŕé þéŕšöñ îš one two three] + [»{#}« ḿöŕé þéöþļé åŕé one two three] + [»{#}« þéŕšöñ îš one two] [»{#}« þéöþļé åŕé one two] diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 8bd1d0875d..3521a077d2 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -2214,6 +2214,8 @@ [Åļļöŵ ƒŕîéñðš ţö ƒîñð ḿé one two three] [€[Ļéåŕñ Ḿöŕé](ļéåŕñḾöŕéĤööķ) one two three four] [ÐîšçöVéŕý one two] + [Éхþļöŕé åñð šéåŕçĥ ƒöŕ å Våŕîéţý öƒ þûɓļîç çöḿḿûñîţîéš. Fŕöḿ ĝåḿîñĝ, ţö ḿûšîç, ţö šţûðý ĝŕöûþš — ţĥéŕé’š å þļåçé ƒöŕ ýöû. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] + [Çĥéçķ öûţ ŠéŕVéŕ ÐîšçöVéŕý one two three four] [»{speakersCount}«] [Ðîšḿîšš one two] [΃ ţĥé þŕöɓļéḿ þéŕšîšţš, çŕéåţé å šûþþöŕţ ţîçķéţ åñð çöþý ţĥé ḿéššåĝé çöñţéñţ ɓéļöŵ. one two three four five six seven eight nine] @@ -3364,6 +3366,9 @@ [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ðéļéţé ţĥîš éVéñţ¿ one two three four five] [Ðéļéţé ÉVéñţ¿ one two] [ÉVéñţ Îñƒö one two] + [Ñö öñé\'š îñţéŕéšţéð îñ ţĥîš éVéñţ ýéţ. one two three four five] + [Ŵé åŕé ĥåVîñĝ þŕöɓļéḿš ļööķîñĝ ûþ ŵĥö îš îñţéŕéšţéð îñ ţĥîš éVéñţ. Þļéåšé ţŕý åĝåîñ ļåţéŕ. one two three four five six seven eight nine ten] + [»{userRemainCount}« îñţéŕéšţéð. one two] [»{userCount}« Îñţéŕéšţéð one two] [Ţĥé éñð ţîḿé ḿûšţ ɓé åƒţéŕ ţĥé šţåŕţ ţîḿé. one two three four five] [Éñð ðåţé åñð ţîḿé åŕé ŕéQûîŕéð. one two three four] @@ -5911,8 +5916,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index 6e8ec99f8c..dad99749d9 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -528,6 +528,10 @@ 1 community {count} communities + + {#} more person is + {#} more people are + {#} person is {#} people are diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index a24f5733ed..44c53668e3 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -3633,1485 +3633,1486 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6941,2486 +6942,2482 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9761,698 +9758,699 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10632,258 +10630,259 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16657,7805 +16656,7810 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9634fc558a..8943fa053d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1436,7 +1436,7 @@ Select a color Transparency Use Default - 258b4f07cc2d42448be4a72dd589e6fc + dac86617215746249fc2a0b8de49939c Coming Soon Slash command application {applicationName} {applicationName} application @@ -2220,6 +2220,8 @@ Allow friends to find me $[Learn More](learnMoreHook) Discovery + Explore and search for a variety of public communities. From gaming, to music, to study groups — there’s a place for you. + Check out Server Discovery {speakersCount} Dismiss If the problem persists, create a support ticket and copy the message content below. @@ -3380,6 +3382,9 @@ Are you sure you want to delete this event? Delete Event? Event Info + No one\'s interested in this event yet. + We are having problems looking up who is interested in this event. Please try again later. + {userRemainCount} interested. {userCount} Interested The end time must be after the start time. End date and time are required. @@ -5930,8 +5935,8 @@ Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications