From e2d99ead53bbdbbaec04cc30c9f45cc2a62a1f85 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Mon, 17 Jan 2022 16:24:26 +0000 Subject: [PATCH] 112.0 - Alpha (112200) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/b/a/a/d/a.java | 2 +- .../ApplicationStatusTypeAdapter.java | 14 +- .../VoiceUserListItemInviteBinding.java | 20 + .../com/discord/restapi/RestAPIParams.java | 8 +- .../com/discord/utilities/rest/RestAPI.java | 12 +- ...istViewModel$acceptFriendSuggestion$2.java | 60 + .../widgets/friends/FriendsListViewModel.java | 113 +- ...idgetFriendsAddById$captchaLauncher$1.java | 29 + .../WidgetFriendsAddById$onViewBound$1.java | 2 +- .../WidgetFriendsAddById$onViewBound$3.java | 2 +- ...getFriendsAddById$sendFriendRequest$2.java | 16 +- .../widgets/friends/WidgetFriendsAddById.java | 40 +- ...y$appViewModels$$inlined$viewModels$1.java | 25 + ...etFriendsFindNearby$captchaLauncher$1.java | 33 + ...WidgetFriendsFindNearby$onViewBound$1.java | 2 +- ...FriendsFindNearby$sendFriendRequest$1.java | 18 +- ...FriendsFindNearby$sendFriendRequest$2.java | 24 +- .../WidgetFriendsFindNearby$viewModel$2.java | 20 + .../friends/WidgetFriendsFindNearby.java | 54 +- .../WidgetFriendsFindNearbyViewModel.java | 29 + ...idgetFriendsList$handleCaptchaError$1.java | 34 + .../WidgetFriendsList$onViewBound$10.java | 2 +- .../widgets/friends/WidgetFriendsList.java | 8 + ...n$configureUI$$inlined$apply$lambda$1.java | 25 + .../WidgetDisableGuildCommunication.java | 8 + .../guilds/invite/InviteJoinHelper.java | 2 +- .../GuildScheduledEventItemView.java | 4 +- .../com/discord/widgets/home/WidgetHome.java | 2 +- .../MobileReportsViewModel.java | 2 +- .../widgets/settings/WidgetSettings.java | 2 +- .../user/usersheet/WidgetUserSheet.java | 4 +- ...tUserSheetViewModel$addRelationship$2.java | 42 +- .../usersheet/WidgetUserSheetViewModel.java | 11 +- .../voice/VoiceUtils$handleCallChannel$1.java | 3 +- ...led$configureUI$$inlined$let$lambda$1.java | 22 +- .../WidgetCallFailed$sendFriendRequest$1.java | 19 +- .../WidgetCallFailed$sendFriendRequest$2.java | 61 +- .../widgets/voice/call/WidgetCallFailed.java | 19 +- .../controls/WidgetScreenShareNfxSheet.java | 3 +- ...etCallFullscreen$configureActionBar$1.java | 7 +- ...lFullscreen$configureBottomControls$1.java | 2 +- ...idgetCallFullscreen$configureGridUi$5.java | 7 +- ...dgetCallFullscreen$configureStageUi$4.java | 7 +- .../WidgetCallFullscreen$onViewBound$3.java | 11 +- .../fullscreen/WidgetCallFullscreen.java | 147 +- ...reviewFullscreen$configureActionBar$1.java | 2 +- .../WidgetCallPreviewFullscreen.java | 43 +- .../WidgetGuildCallOnboardingSheet.java | 3 +- .../voice/sheet/CallParticipantsAdapter.java | 62 +- .../voice/sheet/WidgetVoiceBottomSheet.java | 2 +- ...heduled_event_list_item_connected_dark.xml | 6 + ...g_guild_scheduled_event_list_item_dark.xml | 6 + ...voice_user_list_item_embedded_activity.xml | 2 +- .../res/layout-v22/widget_call_fullscreen.xml | 4 +- .../widget_disable_guild_communication.xml | 7 +- ...voice_user_list_item_embedded_activity.xml | 2 +- .../layout/voice_user_list_item_invite.xml | 2 +- .../res/layout/voice_user_list_item_user.xml | 2 +- .../res/layout/widget_call_fullscreen.xml | 4 +- .../layout/widget_call_preview_fullscreen.xml | 2 +- .../widget_disable_guild_communication.xml | 7 +- app/src/main/res/values-ar-rXB/strings.xml | 11 +- app/src/main/res/values-en-rXA/strings.xml | 11 +- app/src/main/res/values/attrs.xml | 4 + app/src/main/res/values/public.xml | 18673 ++++++++-------- app/src/main/res/values/strings.xml | 13 +- app/src/main/res/values/styles.xml | 4 + 69 files changed, 10276 insertions(+), 9579 deletions(-) create mode 100644 app/src/main/java/com/discord/databinding/VoiceUserListItemInviteBinding.java create mode 100644 app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendSuggestion$2.java create mode 100644 app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$captchaLauncher$1.java create mode 100644 app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1.java create mode 100644 app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$captchaLauncher$1.java create mode 100644 app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$viewModel$2.java create mode 100644 app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearbyViewModel.java create mode 100644 app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$handleCaptchaError$1.java create mode 100644 app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1.java create mode 100644 app/src/main/res/drawable/bg_guild_scheduled_event_list_item_connected_dark.xml create mode 100644 app/src/main/res/drawable/bg_guild_scheduled_event_list_item_dark.xml diff --git a/app/build.gradle b/app/build.gradle index ee8e17f0d8..33653d06e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 111203 - versionName "111.3 - Alpha" + versionCode 112200 + versionName "112.0 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bcc9494766..55398c8c62 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/b/a/a/d/a.java b/app/src/main/java/b/a/a/d/a.java index 3dcd5f0378..59804b6336 100644 --- a/app/src/main/java/b/a/a/d/a.java +++ b/app/src/main/java/b/a/a/d/a.java @@ -60,7 +60,7 @@ public final class a extends AppDialog { if (i == 0) { KProperty[] kPropertyArr = a.j; f h = ((a) this.k).h(); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(h.m, "User Profile", h.l, 2, null, 8, null), false, 1, null), h, null, 2, null), f.class, (Context) null, (Function1) null, new h(h), (Function0) null, (Function0) null, new g(h), 54, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(h.m, "User Profile", h.l, 2, null, null, 24, null), false, 1, null), h, null, 2, null), f.class, (Context) null, (Function1) null, new h(h), (Function0) null, (Function0) null, new g(h), 54, (Object) null); } else if (i == 1) { KProperty[] kPropertyArr2 = a.j; ((a) this.k).h().removeRelationship(R.string.user_has_been_unblocked); diff --git a/app/src/main/java/com/discord/api/guildjoinrequest/ApplicationStatusTypeAdapter.java b/app/src/main/java/com/discord/api/guildjoinrequest/ApplicationStatusTypeAdapter.java index 01be6d47a8..cd0e921dae 100644 --- a/app/src/main/java/com/discord/api/guildjoinrequest/ApplicationStatusTypeAdapter.java +++ b/app/src/main/java/com/discord/api/guildjoinrequest/ApplicationStatusTypeAdapter.java @@ -9,6 +9,15 @@ import java.util.Objects; /* compiled from: ApplicationStatus.kt */ public final class ApplicationStatusTypeAdapter extends TypeAdapter { /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX WARNING: Code restructure failed: missing block: B:11:0x0030, code lost: + if (r2.equals("PENDING") != false) goto L_0x003b; + */ + /* JADX WARNING: Code restructure failed: missing block: B:13:0x0039, code lost: + if (r2.equals("SUBMITTED") != false) goto L_0x003b; + */ + /* JADX WARNING: Code restructure failed: missing block: B:22:?, code lost: + return com.discord.api.guildjoinrequest.ApplicationStatus.PENDING; + */ @Override // com.google.gson.TypeAdapter public ApplicationStatus read(JsonReader jsonReader) { m.checkNotNullParameter(jsonReader, "in"); @@ -20,10 +29,9 @@ public final class ApplicationStatusTypeAdapter extends TypeAdapter addRelationship(String str, long j, Integer num, String str2) { + public final Observable addRelationship(String str, long j, Integer num, String str2, String str3) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_LOCATION); - return ObservableExtensionsKt.restSubscribeOn$default(this._api.addRelationship(j, new RestAPIParams.UserRelationship(num, str2), jsonObjectOf(d0.o.to(ModelAuditLogEntry.CHANGE_KEY_LOCATION, str))), false, 1, null); + return ObservableExtensionsKt.restSubscribeOn$default(this._api.addRelationship(j, new RestAPIParams.UserRelationship(num, str2, str3), jsonObjectOf(d0.o.to(ModelAuditLogEntry.CHANGE_KEY_LOCATION, str))), false, 1, null); } @Override // com.discord.restapi.RestAPIInterface @@ -2108,10 +2108,10 @@ public final class RestAPI implements RestAPIInterface { return this._api.sendRelationshipRequest(add, str); } - public final Observable sendRelationshipRequest(String str, String str2, int i) { + public final Observable sendRelationshipRequest(String str, String str2, int i, String str3) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_LOCATION); m.checkNotNullParameter(str2, "username"); - return ObservableExtensionsKt.restSubscribeOn$default(this._api.sendRelationshipRequest(new RestAPIParams.UserRelationship.Add(str2, i), jsonObjectOf(d0.o.to(ModelAuditLogEntry.CHANGE_KEY_LOCATION, str))), false, 1, null); + return ObservableExtensionsKt.restSubscribeOn$default(this._api.sendRelationshipRequest(new RestAPIParams.UserRelationship.Add(str2, i, str3), jsonObjectOf(d0.o.to(ModelAuditLogEntry.CHANGE_KEY_LOCATION, str))), false, 1, null); } public final Observable setConsent(boolean z2, String str) { diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendSuggestion$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendSuggestion$2.java new file mode 100644 index 0000000000..bf6b2a6eb9 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendSuggestion$2.java @@ -0,0 +1,60 @@ +package com.discord.widgets.friends; + +import com.discord.utilities.error.Error; +import com.discord.utilities.rest.RestAPIAbortMessages; +import com.discord.widgets.captcha.WidgetCaptchaKt; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: FriendsListViewModel.kt */ +public final class FriendsListViewModel$acceptFriendSuggestion$2 extends o implements Function1 { + public final /* synthetic */ int $discriminator; + public final /* synthetic */ String $username; + public final /* synthetic */ FriendsListViewModel this$0; + + /* compiled from: FriendsListViewModel.kt */ + /* renamed from: com.discord.widgets.friends.FriendsListViewModel$acceptFriendSuggestion$2$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ Error $error; + public final /* synthetic */ FriendsListViewModel$acceptFriendSuggestion$2 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(FriendsListViewModel$acceptFriendSuggestion$2 friendsListViewModel$acceptFriendSuggestion$2, Error error) { + super(0); + this.this$0 = friendsListViewModel$acceptFriendSuggestion$2; + this.$error = error; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + if (WidgetCaptchaKt.isCaptchaError(this.$error)) { + FriendsListViewModel$acceptFriendSuggestion$2 friendsListViewModel$acceptFriendSuggestion$2 = this.this$0; + FriendsListViewModel.access$emitCaptchaErrorEvent(friendsListViewModel$acceptFriendSuggestion$2.this$0, this.$error, friendsListViewModel$acceptFriendSuggestion$2.$username, friendsListViewModel$acceptFriendSuggestion$2.$discriminator); + } + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public FriendsListViewModel$acceptFriendSuggestion$2(FriendsListViewModel friendsListViewModel, String str, int i) { + super(1); + this.this$0 = friendsListViewModel; + this.$username = str; + this.$discriminator = i; + } + + /* 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(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "error"); + RestAPIAbortMessages.handleAbortCodeOrDefault$default(RestAPIAbortMessages.INSTANCE, error, new AnonymousClass1(this, error), null, 4, null); + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java index 90df299bc3..1df7a49646 100644 --- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java +++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java @@ -110,6 +110,97 @@ public final class FriendsListViewModel extends AppViewModel { /* compiled from: FriendsListViewModel.kt */ public static abstract class Event { + /* compiled from: FriendsListViewModel.kt */ + public static final class CaptchaError extends Event { + private final int discriminator; + private final Error error; + private final String username; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public CaptchaError(Error error, String str, int i) { + super(null); + m.checkNotNullParameter(error, "error"); + m.checkNotNullParameter(str, "username"); + this.error = error; + this.username = str; + this.discriminator = i; + } + + public static /* synthetic */ CaptchaError copy$default(CaptchaError captchaError, Error error, String str, int i, int i2, Object obj) { + if ((i2 & 1) != 0) { + error = captchaError.error; + } + if ((i2 & 2) != 0) { + str = captchaError.username; + } + if ((i2 & 4) != 0) { + i = captchaError.discriminator; + } + return captchaError.copy(error, str, i); + } + + public final Error component1() { + return this.error; + } + + public final String component2() { + return this.username; + } + + public final int component3() { + return this.discriminator; + } + + public final CaptchaError copy(Error error, String str, int i) { + m.checkNotNullParameter(error, "error"); + m.checkNotNullParameter(str, "username"); + return new CaptchaError(error, str, i); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof CaptchaError)) { + return false; + } + CaptchaError captchaError = (CaptchaError) obj; + return m.areEqual(this.error, captchaError.error) && m.areEqual(this.username, captchaError.username) && this.discriminator == captchaError.discriminator; + } + + public final int getDiscriminator() { + return this.discriminator; + } + + public final Error getError() { + return this.error; + } + + public final String getUsername() { + return this.username; + } + + public int hashCode() { + Error error = this.error; + int i = 0; + int hashCode = (error != null ? error.hashCode() : 0) * 31; + String str = this.username; + if (str != null) { + i = str.hashCode(); + } + return ((hashCode + i) * 31) + this.discriminator; + } + + public String toString() { + StringBuilder R = a.R("CaptchaError(error="); + R.append(this.error); + R.append(", username="); + R.append(this.username); + R.append(", discriminator="); + return a.A(R, this.discriminator, ")"); + } + } + /* compiled from: FriendsListViewModel.kt */ public static final class LaunchVoiceCall extends Event { private final long channelId; @@ -1417,6 +1508,17 @@ public final class FriendsListViewModel extends AppViewModel { this((i & 1) != 0 ? Companion.observeStores() : observable, (i & 2) != 0 ? StoreStream.Companion.getChannels() : storeChannels, (i & 4) != 0 ? RestAPI.Companion.getApi() : restAPI); } + public static /* synthetic */ void acceptFriendSuggestion$default(FriendsListViewModel friendsListViewModel, String str, int i, String str2, int i2, Object obj) { + if ((i2 & 4) != 0) { + str2 = null; + } + friendsListViewModel.acceptFriendSuggestion(str, i, str2); + } + + public static final /* synthetic */ void access$emitCaptchaErrorEvent(FriendsListViewModel friendsListViewModel, Error error, String str, int i) { + friendsListViewModel.emitCaptchaErrorEvent(error, str, i); + } + public static final /* synthetic */ void access$emitLaunchVoiceCallEvent(FriendsListViewModel friendsListViewModel, long j) { friendsListViewModel.emitLaunchVoiceCallEvent(j); } @@ -1461,6 +1563,11 @@ public final class FriendsListViewModel extends AppViewModel { return friendsListViewModel.asyncComputeAndHandleOnUiThread(function0, function1, function12); } + private final void emitCaptchaErrorEvent(Error error, String str, int i) { + PublishSubject publishSubject = this.eventSubject; + publishSubject.k.onNext(new Event.CaptchaError(error, str, i)); + } + private final void emitLaunchVoiceCallEvent(long j) { PublishSubject publishSubject = this.eventSubject; publishSubject.k.onNext(new Event.LaunchVoiceCall(j)); @@ -1608,12 +1715,12 @@ public final class FriendsListViewModel extends AppViewModel { public final void acceptFriendRequest(long j, String str) { m.checkNotNullParameter(str, "username"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(this.restAPI, LOCATION, j, null, null, 12, null), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$acceptFriendRequest$2(this, str), (Function0) null, (Function0) null, new FriendsListViewModel$acceptFriendRequest$1(this), 54, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(this.restAPI, LOCATION, j, null, null, null, 28, null), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$acceptFriendRequest$2(this, str), (Function0) null, (Function0) null, new FriendsListViewModel$acceptFriendRequest$1(this), 54, (Object) null); } - public final void acceptFriendSuggestion(String str, int i) { + public final void acceptFriendSuggestion(String str, int i, String str2) { m.checkNotNullParameter(str, "username"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.sendRelationshipRequest("Friends List - Friend Suggestion", str, i), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, FriendsListViewModel$acceptFriendSuggestion$1.INSTANCE, 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().sendRelationshipRequest("Friends List - Friend Suggestion", str, i, str2), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$acceptFriendSuggestion$2(this, str, i), (Function0) null, (Function0) null, FriendsListViewModel$acceptFriendSuggestion$1.INSTANCE, 54, (Object) null); } @MainThread diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$captchaLauncher$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$captchaLauncher$1.java new file mode 100644 index 0000000000..874a6e0cd1 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$captchaLauncher$1.java @@ -0,0 +1,29 @@ +package com.discord.widgets.friends; + +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetFriendsAddById.kt */ +public final class WidgetFriendsAddById$captchaLauncher$1 extends o implements Function1 { + public final /* synthetic */ WidgetFriendsAddById this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetFriendsAddById$captchaLauncher$1(WidgetFriendsAddById widgetFriendsAddById) { + super(1); + this.this$0 = widgetFriendsAddById; + } + + /* 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(String str) { + invoke(str); + return Unit.a; + } + + public final void invoke(String str) { + m.checkNotNullParameter(str, "token"); + WidgetFriendsAddById.access$extractTargetAndSendFriendRequest(this.this$0, str); + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1.java index e0884d1b69..bfdcb87214 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1.java @@ -11,6 +11,6 @@ public final class WidgetFriendsAddById$onViewBound$1 implements View.OnClickLis @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetFriendsAddById.access$extractTargetAndSendFriendRequest(this.this$0); + WidgetFriendsAddById.extractTargetAndSendFriendRequest$default(this.this$0, null, 1, null); } } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.java index b55f02cfa7..fee06f392a 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.java @@ -26,7 +26,7 @@ public final class WidgetFriendsAddById$onViewBound$3 extends o implements Funct public final void invoke(TextView textView) { m.checkNotNullParameter(textView, "it"); - WidgetFriendsAddById.access$extractTargetAndSendFriendRequest(this.this$0); + WidgetFriendsAddById.extractTargetAndSendFriendRequest$default(this.this$0, null, 1, null); AppFragment.hideKeyboard$default(this.this$0, null, 1, null); } } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java index b501c8ea75..125589d5ac 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java @@ -5,6 +5,7 @@ import com.discord.R; import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPIAbortMessages; import com.discord.utilities.user.UserUtils; +import com.discord.widgets.captcha.WidgetCaptchaKt; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; @@ -32,12 +33,21 @@ public final class WidgetFriendsAddById$sendFriendRequest$2 implements Action @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { + Error error = this.$error; + m.checkNotNullExpressionValue(error, "error"); + if (WidgetCaptchaKt.isCaptchaError(error)) { + WidgetFriendsAddById widgetFriendsAddById = this.this$0.this$0; + Error error2 = this.$error; + m.checkNotNullExpressionValue(error2, "error"); + WidgetFriendsAddById.access$launchCaptchaFlow(widgetFriendsAddById, error2); + return; + } WidgetFriendsAddById.access$getBinding$p(this.this$0.this$0).e.setErrorTextAppearance(R.style.TextAppearance_Error); RestAPIAbortMessages.ResponseResolver responseResolver = RestAPIAbortMessages.ResponseResolver.INSTANCE; Context context = this.this$0.this$0.getContext(); - Error error = this.$error; - m.checkNotNullExpressionValue(error, "error"); - Error.Response response = error.getResponse(); + Error error3 = this.$error; + m.checkNotNullExpressionValue(error3, "error"); + Error.Response response = error3.getResponse(); m.checkNotNullExpressionValue(response, "error.response"); int code = response.getCode(); WidgetFriendsAddById.access$setInputEditError(this.this$0.this$0, String.valueOf(responseResolver.getRelationshipResponse(context, code, this.this$0.$username + UserUtils.INSTANCE.padDiscriminator(this.this$0.$discriminator)))); diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java index 45d0d59690..f843a894c3 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java @@ -1,12 +1,14 @@ package com.discord.widgets.friends; import android.content.Context; +import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.view.View; import android.widget.TextView; +import androidx.activity.result.ActivityResultLauncher; import androidx.fragment.app.Fragment; import b.a.d.o; import b.a.k.b; @@ -18,13 +20,16 @@ import com.discord.models.user.MeUser; import com.discord.models.user.User; import com.discord.stores.StoreStream; import com.discord.utilities.analytics.AnalyticsTracker; +import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.utilities.color.ColorCompat; +import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.user.UserUtils; import com.discord.utilities.view.extensions.ViewExtensions; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; +import com.discord.widgets.captcha.WidgetCaptcha; import com.google.android.material.textfield.TextInputLayout; import d0.g0.s; import d0.g0.t; @@ -40,6 +45,7 @@ public final class WidgetFriendsAddById extends AppFragment { public static final Companion Companion = new Companion(null); private static final Regex PATTERN_USERNAME = new Regex("^(.*)#(\\d{4})$"); private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetFriendsAddById$binding$2.INSTANCE, null, 2, null); + private final ActivityResultLauncher captchaLauncher = WidgetCaptcha.Companion.registerForResult(this, new WidgetFriendsAddById$captchaLauncher$1(this)); /* compiled from: WidgetFriendsAddById.kt */ public static final class Companion { @@ -138,8 +144,8 @@ public final class WidgetFriendsAddById extends AppFragment { super(R.layout.widget_friends_add_by_id); } - public static final /* synthetic */ void access$extractTargetAndSendFriendRequest(WidgetFriendsAddById widgetFriendsAddById) { - widgetFriendsAddById.extractTargetAndSendFriendRequest(); + public static final /* synthetic */ void access$extractTargetAndSendFriendRequest(WidgetFriendsAddById widgetFriendsAddById, String str) { + widgetFriendsAddById.extractTargetAndSendFriendRequest(str); } public static final /* synthetic */ WidgetFriendsAddByIdBinding access$getBinding$p(WidgetFriendsAddById widgetFriendsAddById) { @@ -150,17 +156,21 @@ public final class WidgetFriendsAddById extends AppFragment { return PATTERN_USERNAME; } + public static final /* synthetic */ void access$launchCaptchaFlow(WidgetFriendsAddById widgetFriendsAddById, Error error) { + widgetFriendsAddById.launchCaptchaFlow(error); + } + public static final /* synthetic */ void access$setInputEditError(WidgetFriendsAddById widgetFriendsAddById, CharSequence charSequence) { widgetFriendsAddById.setInputEditError(charSequence); } - private final void extractTargetAndSendFriendRequest() { + private final void extractTargetAndSendFriendRequest(String str) { TextInputLayout textInputLayout = getBinding().e; m.checkNotNullExpressionValue(textInputLayout, "binding.friendsAddTextEditWrap"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); Companion.UserNameDiscriminator access$extractUsernameAndDiscriminator = Companion.access$extractUsernameAndDiscriminator(Companion, textOrEmpty); if (access$extractUsernameAndDiscriminator.getDiscriminator() != null) { - sendFriendRequest(access$extractUsernameAndDiscriminator.getUsername(), access$extractUsernameAndDiscriminator.getDiscriminator().intValue()); + sendFriendRequest(access$extractUsernameAndDiscriminator.getUsername(), access$extractUsernameAndDiscriminator.getDiscriminator().intValue(), str); return; } Context context = getContext(); @@ -172,6 +182,13 @@ public final class WidgetFriendsAddById extends AppFragment { AnalyticsTracker.INSTANCE.friendRequestFailed(textOrEmpty, access$extractUsernameAndDiscriminator.getUsername(), access$extractUsernameAndDiscriminator.getDiscriminator(), "Invalid Username"); } + public static /* synthetic */ void extractTargetAndSendFriendRequest$default(WidgetFriendsAddById widgetFriendsAddById, String str, int i, Object obj) { + if ((i & 1) != 0) { + str = null; + } + widgetFriendsAddById.extractTargetAndSendFriendRequest(str); + } + private final WidgetFriendsAddByIdBinding getBinding() { return (WidgetFriendsAddByIdBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]); } @@ -187,8 +204,19 @@ public final class WidgetFriendsAddById extends AppFragment { return spannableStringBuilder; } - private final void sendFriendRequest(String str, int i) { - ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().sendRelationshipRequest("Search - Add Friend Search", str, i), this, null, 2, null).k(o.h(new WidgetFriendsAddById$sendFriendRequest$1(this, str), getAppActivity(), new WidgetFriendsAddById$sendFriendRequest$2(this, str, i))); + private final void launchCaptchaFlow(Error error) { + WidgetCaptcha.Companion.launch(requireContext(), this.captchaLauncher, CaptchaErrorBody.Companion.createFromError(error)); + } + + private final void sendFriendRequest(String str, int i, String str2) { + ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().sendRelationshipRequest("Search - Add Friend Search", str, i, str2), this, null, 2, null).k(o.h(new WidgetFriendsAddById$sendFriendRequest$1(this, str), getAppActivity(), new WidgetFriendsAddById$sendFriendRequest$2(this, str, i))); + } + + public static /* synthetic */ void sendFriendRequest$default(WidgetFriendsAddById widgetFriendsAddById, String str, int i, String str2, int i2, Object obj) { + if ((i2 & 4) != 0) { + str2 = null; + } + widgetFriendsAddById.sendFriendRequest(str, i, str2); } private final void setInputEditError(CharSequence charSequence) { diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1.java new file mode 100644 index 0000000000..d466f6ebb9 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1.java @@ -0,0 +1,25 @@ +package com.discord.widgets.friends; + +import androidx.lifecycle.ViewModelStore; +import androidx.lifecycle.ViewModelStoreOwner; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.jvm.functions.Function0; +/* compiled from: FragmentViewModelLazy.kt */ +public final class WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1 extends o implements Function0 { + public final /* synthetic */ Function0 $ownerProducer; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1(Function0 function0) { + super(0); + this.$ownerProducer = function0; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final ViewModelStore mo1invoke() { + ViewModelStore viewModelStore = ((ViewModelStoreOwner) this.$ownerProducer.mo1invoke()).getViewModelStore(); + m.checkNotNullExpressionValue(viewModelStore, "ownerProducer().viewModelStore"); + return viewModelStore; + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$captchaLauncher$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$captchaLauncher$1.java new file mode 100644 index 0000000000..b7c0fa86e2 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$captchaLauncher$1.java @@ -0,0 +1,33 @@ +package com.discord.widgets.friends; + +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetFriendsFindNearby.kt */ +public final class WidgetFriendsFindNearby$captchaLauncher$1 extends o implements Function1 { + public final /* synthetic */ WidgetFriendsFindNearby this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetFriendsFindNearby$captchaLauncher$1(WidgetFriendsFindNearby widgetFriendsFindNearby) { + super(1); + this.this$0 = widgetFriendsFindNearby; + } + + /* 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(String str) { + invoke(str); + return Unit.a; + } + + public final void invoke(String str) { + Integer discriminator; + m.checkNotNullParameter(str, "token"); + String username = WidgetFriendsFindNearby.access$getViewModel$p(this.this$0).getUsername(); + if (username != null && (discriminator = WidgetFriendsFindNearby.access$getViewModel$p(this.this$0).getDiscriminator()) != null) { + WidgetFriendsFindNearby.access$sendFriendRequest(this.this$0, username, discriminator.intValue(), str); + } + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.java index 8f44ac6308..6923f57770 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.java @@ -24,6 +24,6 @@ public final class WidgetFriendsFindNearby$onViewBound$1 extends o implements Fu public final void invoke(String str, int i) { m.checkNotNullParameter(str, "username"); - WidgetFriendsFindNearby.access$sendFriendRequest(this.this$0, str, i); + WidgetFriendsFindNearby.sendFriendRequest$default(this.this$0, str, i, null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java index bacdb248ee..0f79387ab2 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java @@ -4,30 +4,18 @@ import android.content.Context; import b.a.d.m; import b.a.k.b; import com.discord.R; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import rx.functions.Action1; /* compiled from: WidgetFriendsFindNearby.kt */ -public final class WidgetFriendsFindNearby$sendFriendRequest$1 extends o implements Function1 { +public final class WidgetFriendsFindNearby$sendFriendRequest$1 implements Action1 { public final /* synthetic */ String $username; public final /* synthetic */ WidgetFriendsFindNearby this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetFriendsFindNearby$sendFriendRequest$1(WidgetFriendsFindNearby widgetFriendsFindNearby, String str) { - super(1); this.this$0 = widgetFriendsFindNearby; this.$username = str; } - /* 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(Void r1) { - invoke(r1); - return Unit.a; - } - - public final void invoke(Void r7) { + public final void call(Void r7) { Context context = this.this$0.getContext(); Context context2 = this.this$0.getContext(); m.h(context, context2 != null ? b.h(context2, R.string.add_friend_confirmation, new Object[]{this.$username}, null, 4) : null, 0, null, 12); diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java index 716ef1f521..bdba362ebf 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java @@ -4,6 +4,7 @@ import android.content.Context; import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPIAbortMessages; import com.discord.utilities.user.UserUtils; +import com.discord.widgets.captcha.WidgetCaptchaKt; import com.discord.widgets.chat.input.MentionUtilsKt; import d0.z.d.m; import d0.z.d.o; @@ -19,25 +20,34 @@ public final class WidgetFriendsFindNearby$sendFriendRequest$2 implements Act /* compiled from: WidgetFriendsFindNearby.kt */ /* renamed from: com.discord.widgets.friends.WidgetFriendsFindNearby$sendFriendRequest$2$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ Error $it; + public final /* synthetic */ Error $error; public final /* synthetic */ WidgetFriendsFindNearby$sendFriendRequest$2 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AnonymousClass1(WidgetFriendsFindNearby$sendFriendRequest$2 widgetFriendsFindNearby$sendFriendRequest$2, Error error) { super(0); this.this$0 = widgetFriendsFindNearby$sendFriendRequest$2; - this.$it = error; + this.$error = error; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { + Error error = this.$error; + m.checkNotNullExpressionValue(error, "error"); + if (WidgetCaptchaKt.isCaptchaError(error)) { + WidgetFriendsFindNearby widgetFriendsFindNearby = this.this$0.this$0; + Error error2 = this.$error; + m.checkNotNullExpressionValue(error2, "error"); + WidgetFriendsFindNearby.access$launchCaptchaFlow(widgetFriendsFindNearby, error2); + return; + } RestAPIAbortMessages.ResponseResolver responseResolver = RestAPIAbortMessages.ResponseResolver.INSTANCE; Context context = this.this$0.this$0.getContext(); - Error error = this.$it; - m.checkNotNullExpressionValue(error, "it"); - Error.Response response = error.getResponse(); - m.checkNotNullExpressionValue(response, "it.response"); + Error error3 = this.$error; + m.checkNotNullExpressionValue(error3, "error"); + Error.Response response = error3.getResponse(); + m.checkNotNullExpressionValue(response, "error.response"); int code = response.getCode(); b.a.d.m.h(this.this$0.this$0.getContext(), responseResolver.getRelationshipResponse(context, code, this.this$0.$username + MentionUtilsKt.CHANNELS_CHAR + UserUtils.INSTANCE.padDiscriminator(this.this$0.$discriminator)), 0, null, 12); } @@ -51,7 +61,7 @@ public final class WidgetFriendsFindNearby$sendFriendRequest$2 implements Act public final void call(Error error) { RestAPIAbortMessages restAPIAbortMessages = RestAPIAbortMessages.INSTANCE; - m.checkNotNullExpressionValue(error, "it"); + m.checkNotNullExpressionValue(error, "error"); RestAPIAbortMessages.handleAbortCodeOrDefault$default(restAPIAbortMessages, error, new AnonymousClass1(this, error), null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$viewModel$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$viewModel$2.java new file mode 100644 index 0000000000..2efcf904b6 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$viewModel$2.java @@ -0,0 +1,20 @@ +package com.discord.widgets.friends; + +import com.discord.app.AppViewModel; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: WidgetFriendsFindNearby.kt */ +public final class WidgetFriendsFindNearby$viewModel$2 extends o implements Function0> { + public static final WidgetFriendsFindNearby$viewModel$2 INSTANCE = new WidgetFriendsFindNearby$viewModel$2(); + + public WidgetFriendsFindNearby$viewModel$2() { + super(0); + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final AppViewModel mo1invoke() { + return new WidgetFriendsFindNearbyViewModel(); + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java index 71f974e936..1c8ff2d9fb 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java @@ -1,11 +1,16 @@ package com.discord.widgets.friends; import android.content.Context; +import android.content.Intent; import android.view.View; import android.widget.TextView; +import androidx.activity.result.ActivityResultLauncher; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentViewModelLazyKt; import androidx.recyclerview.widget.RecyclerView; +import b.a.d.f0; +import b.a.d.h0; import b.a.d.o; import b.d.b.a.a; import com.discord.R; @@ -16,20 +21,25 @@ import com.discord.rlottie.RLottieImageView; import com.discord.stores.StoreStream; import com.discord.utilities.accessibility.AccessibilityUtils; import com.discord.utilities.analytics.AnalyticsTracker; +import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.dimen.DimenUtils; +import com.discord.utilities.error.Error; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; +import com.discord.widgets.captcha.WidgetCaptcha; import com.discord.widgets.friends.NearbyManager; import com.discord.widgets.friends.WidgetFriendsAddUserAdapter; import com.google.android.material.button.MaterialButton; +import d0.z.d.a0; import d0.z.d.m; import java.util.Collection; import java.util.List; import java.util.Objects; +import kotlin.Lazy; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -40,9 +50,11 @@ import rx.functions.Func2; public final class WidgetFriendsFindNearby extends AppFragment { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.b0(WidgetFriendsFindNearby.class, "binding", "getBinding()Lcom/discord/databinding/WidgetFriendsNearbyBinding;", 0)}; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetFriendsFindNearby$binding$2.INSTANCE, null, 2, null); + private final ActivityResultLauncher captchaLauncher; private Long meUserId; - private final NearbyManager nearbyManager = new NearbyManager(); + private final NearbyManager nearbyManager; private WidgetFriendsAddUserAdapter resultsAdapter; + private final Lazy viewModel$delegate; /* compiled from: WidgetFriendsFindNearby.kt */ public static abstract class Model { @@ -202,10 +214,15 @@ public final class WidgetFriendsFindNearby extends AppFragment { public WidgetFriendsFindNearby() { super(R.layout.widget_friends_nearby); + WidgetFriendsFindNearby$viewModel$2 widgetFriendsFindNearby$viewModel$2 = WidgetFriendsFindNearby$viewModel$2.INSTANCE; + f0 f0Var = new f0(this); + this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetFriendsFindNearbyViewModel.class), new WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1(f0Var), new h0(widgetFriendsFindNearby$viewModel$2)); + this.nearbyManager = new NearbyManager(); + this.captchaLauncher = WidgetCaptcha.Companion.registerForResult(this, new WidgetFriendsFindNearby$captchaLauncher$1(this)); } private final void acceptFriendRequest(long j) { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(RestAPI.Companion.getApi(), "Nearby - Accept Friend Request", j, null, null, 12, null), false, 1, null), this, null, 2, null), WidgetFriendsFindNearby.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFriendsFindNearby$acceptFriendRequest$1(this), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(RestAPI.Companion.getApi(), "Nearby - Accept Friend Request", j, null, null, null, 28, null), false, 1, null), this, null, 2, null), WidgetFriendsFindNearby.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFriendsFindNearby$acceptFriendRequest$1(this), 62, (Object) null); } public static final /* synthetic */ void access$acceptFriendRequest(WidgetFriendsFindNearby widgetFriendsFindNearby, long j) { @@ -232,8 +249,16 @@ public final class WidgetFriendsFindNearby extends AppFragment { return widgetFriendsAddUserAdapter; } - public static final /* synthetic */ void access$sendFriendRequest(WidgetFriendsFindNearby widgetFriendsFindNearby, String str, int i) { - widgetFriendsFindNearby.sendFriendRequest(str, i); + public static final /* synthetic */ WidgetFriendsFindNearbyViewModel access$getViewModel$p(WidgetFriendsFindNearby widgetFriendsFindNearby) { + return widgetFriendsFindNearby.getViewModel(); + } + + public static final /* synthetic */ void access$launchCaptchaFlow(WidgetFriendsFindNearby widgetFriendsFindNearby, Error error) { + widgetFriendsFindNearby.launchCaptchaFlow(error); + } + + public static final /* synthetic */ void access$sendFriendRequest(WidgetFriendsFindNearby widgetFriendsFindNearby, String str, int i, String str2) { + widgetFriendsFindNearby.sendFriendRequest(str, i, str2); } public static final /* synthetic */ void access$setResultsAdapter$p(WidgetFriendsFindNearby widgetFriendsFindNearby, WidgetFriendsAddUserAdapter widgetFriendsAddUserAdapter) { @@ -378,8 +403,25 @@ public final class WidgetFriendsFindNearby extends AppFragment { } } - private final void sendFriendRequest(String str, int i) { - ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().sendRelationshipRequest("Nearby - Add Friend Suggestion", str, i), this, null, 2, null).k(o.a.g(getContext(), new WidgetFriendsFindNearby$sendFriendRequest$1(this, str), new WidgetFriendsFindNearby$sendFriendRequest$2(this, str, i))); + private final WidgetFriendsFindNearbyViewModel getViewModel() { + return (WidgetFriendsFindNearbyViewModel) this.viewModel$delegate.getValue(); + } + + private final void launchCaptchaFlow(Error error) { + WidgetCaptcha.Companion.launch(requireContext(), this.captchaLauncher, CaptchaErrorBody.Companion.createFromError(error)); + } + + private final void sendFriendRequest(String str, int i, String str2) { + getViewModel().setUsername(str); + getViewModel().setDiscriminator(Integer.valueOf(i)); + ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().sendRelationshipRequest("Nearby - Add Friend Suggestion", str, i, str2), this, null, 2, null).k(o.h(new WidgetFriendsFindNearby$sendFriendRequest$1(this, str), getAppActivity(), new WidgetFriendsFindNearby$sendFriendRequest$2(this, str, i))); + } + + public static /* synthetic */ void sendFriendRequest$default(WidgetFriendsFindNearby widgetFriendsFindNearby, String str, int i, String str2, int i2, Object obj) { + if ((i2 & 4) != 0) { + str2 = null; + } + widgetFriendsFindNearby.sendFriendRequest(str, i, str2); } private final void updateMeUserIdAndInitNearbyManager() { diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearbyViewModel.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearbyViewModel.java new file mode 100644 index 0000000000..e4513fca6b --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearbyViewModel.java @@ -0,0 +1,29 @@ +package com.discord.widgets.friends; + +import com.discord.app.AppViewModel; +import kotlin.Unit; +/* compiled from: WidgetFriendsFindNearbyViewModel.kt */ +public final class WidgetFriendsFindNearbyViewModel extends AppViewModel { + private Integer discriminator; + private String username; + + public WidgetFriendsFindNearbyViewModel() { + super(null, 1, null); + } + + public final Integer getDiscriminator() { + return this.discriminator; + } + + public final String getUsername() { + return this.username; + } + + public final void setDiscriminator(Integer num) { + this.discriminator = num; + } + + public final void setUsername(String str) { + this.username = str; + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$handleCaptchaError$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$handleCaptchaError$1.java new file mode 100644 index 0000000000..d5e5397594 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$handleCaptchaError$1.java @@ -0,0 +1,34 @@ +package com.discord.widgets.friends; + +import com.discord.app.AppFragment; +import com.discord.widgets.friends.FriendsListViewModel; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function2; +/* compiled from: WidgetFriendsList.kt */ +public final class WidgetFriendsList$handleCaptchaError$1 extends o implements Function2 { + public final /* synthetic */ FriendsListViewModel.Event.CaptchaError $event; + public final /* synthetic */ WidgetFriendsList this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetFriendsList$handleCaptchaError$1(WidgetFriendsList widgetFriendsList, FriendsListViewModel.Event.CaptchaError captchaError) { + super(2); + this.this$0 = widgetFriendsList; + this.$event = captchaError; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(AppFragment appFragment, String str) { + invoke(appFragment, str); + return Unit.a; + } + + public final void invoke(AppFragment appFragment, String str) { + m.checkNotNullParameter(appFragment, ""); + m.checkNotNullParameter(str, "captchaToken"); + WidgetFriendsList.access$getViewModel$p(this.this$0).acceptFriendSuggestion(this.$event.getUsername(), this.$event.getDiscriminator(), str); + } +} diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$10.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$10.java index 5c856b52fa..877c037cfa 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$10.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$10.java @@ -25,6 +25,6 @@ public final class WidgetFriendsList$onViewBound$10 extends o implements Functio public final void invoke(User user) { m.checkNotNullParameter(user, "user"); - WidgetFriendsList.access$getViewModel$p(this.this$0).acceptFriendSuggestion(user.getUsername(), user.getDiscriminator()); + FriendsListViewModel.acceptFriendSuggestion$default(WidgetFriendsList.access$getViewModel$p(this.this$0), user.getUsername(), user.getDiscriminator(), null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java index 76beb78216..294753dd47 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java @@ -15,11 +15,13 @@ import com.discord.app.AppFragment; import com.discord.app.AppViewFlipper; import com.discord.databinding.WidgetFriendsListBinding; import com.discord.utilities.analytics.AnalyticsTracker; +import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; import com.discord.utilities.rest.RestAPIAbortMessages; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; +import com.discord.widgets.captcha.WidgetCaptchaBottomSheet; import com.discord.widgets.friends.FriendsListViewModel; import com.discord.widgets.tabs.NavigationTab; import com.discord.widgets.tabs.OnTabSelectedListener; @@ -121,6 +123,10 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte return (FriendsListViewModel) this.viewModel$delegate.getValue(); } + private final void handleCaptchaError(FriendsListViewModel.Event.CaptchaError captchaError) { + WidgetCaptchaBottomSheet.Companion.enqueue$default(WidgetCaptchaBottomSheet.Companion, "Add Friend Captcha", new WidgetFriendsList$handleCaptchaError$1(this, captchaError), null, CaptchaErrorBody.Companion.createFromError(captchaError.getError()), 4, null); + } + private final void handleEvent(FriendsListViewModel.Event event) { if (event instanceof FriendsListViewModel.Event.ShowToast) { handleShowToast((FriendsListViewModel.Event.ShowToast) event); @@ -128,6 +134,8 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte handleShowFriendRequestErrorToast((FriendsListViewModel.Event.ShowFriendRequestErrorToast) event); } else if (event instanceof FriendsListViewModel.Event.LaunchVoiceCall) { handleLaunchVoiceCall((FriendsListViewModel.Event.LaunchVoiceCall) event); + } else if (event instanceof FriendsListViewModel.Event.CaptchaError) { + handleCaptchaError((FriendsListViewModel.Event.CaptchaError) event); } else { throw new NoWhenBranchMatchedException(); } diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1.java new file mode 100644 index 0000000000..0a4dcaf2f5 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1.java @@ -0,0 +1,25 @@ +package com.discord.widgets.guildcommunicationdisabled.start; + +import android.view.View; +import com.discord.R; +import com.google.android.material.textfield.TextInputLayout; +import d0.z.d.m; +/* compiled from: WidgetDisableGuildCommunication.kt */ +public final class WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1 implements View.OnFocusChangeListener { + public final /* synthetic */ WidgetDisableGuildCommunication this$0; + + public WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1(WidgetDisableGuildCommunication widgetDisableGuildCommunication) { + this.this$0 = widgetDisableGuildCommunication; + } + + @Override // android.view.View.OnFocusChangeListener + public final void onFocusChange(View view, boolean z2) { + if (z2) { + TextInputLayout textInputLayout = WidgetDisableGuildCommunication.access$getBinding$p(this.this$0).d; + m.checkNotNullExpressionValue(textInputLayout, "binding.disableGuildCommunicationReason"); + textInputLayout.setHint(""); + return; + } + WidgetDisableGuildCommunication.access$getBinding$p(this.this$0).d.setHint(R.string.guild_communication_disabled_reason_hint_android); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java index 290c7572c0..682f264a92 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java @@ -2,6 +2,7 @@ package com.discord.widgets.guildcommunicationdisabled.start; import android.content.Context; import android.content.Intent; +import android.widget.EditText; import android.widget.TextView; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentViewModelLazyKt; @@ -22,6 +23,7 @@ import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; import com.discord.views.CheckedSetting; import com.discord.widgets.guildcommunicationdisabled.start.DisableGuildCommunicationViewModel; +import com.google.android.material.textfield.TextInputLayout; import d0.g; import d0.z.d.a0; import d0.z.d.m; @@ -125,6 +127,12 @@ public final class WidgetDisableGuildCommunication extends AppFragment { User user = valid.getUser(); b.o(textView2, user != null ? UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user, null, null, 3, null) : null, new Object[0], null, 4); getBinding().f2340b.setOnClickListener(new WidgetDisableGuildCommunication$configureUI$2(this, viewState)); + TextInputLayout textInputLayout = getBinding().d; + m.checkNotNullExpressionValue(textInputLayout, "binding.disableGuildCommunicationReason"); + EditText editText = textInputLayout.getEditText(); + if (editText != null) { + editText.setOnFocusChangeListener(new WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1(this)); + } } } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java index bf6a9635e4..9e387243e9 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java @@ -54,7 +54,7 @@ public final class InviteJoinHelper { m.checkNotNullExpressionValue(channel, "channel"); if (ChannelUtils.E(channel)) { if (TextInVoiceFeatureFlag.Companion.getINSTANCE().isEnabled(Long.valueOf(channel.f()))) { - WidgetCallPreviewFullscreen.Companion.launch(context, channel.h()); + WidgetCallPreviewFullscreen.Companion.launch$default(WidgetCallPreviewFullscreen.Companion, context, channel.h(), null, 4, null); return; } WidgetVoiceBottomSheet.Companion companion = WidgetVoiceBottomSheet.Companion; diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java index 65e15a8ffc..4e088f91fd 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java @@ -375,14 +375,14 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { constraintLayout.setBackground((!event.isConnected() || event.getEvent().m() != GuildScheduledEventStatus.ACTIVE) ? ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_primary) : ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_connected_primary)); } - public final void configureInVoiceChannel(GuildScheduledEvent guildScheduledEvent, UserGuildMember userGuildMember, boolean z2, boolean z3, boolean z4, View.OnClickListener onClickListener, View.OnClickListener onClickListener2) { + public final void configureInVoiceChannel(GuildScheduledEvent guildScheduledEvent, UserGuildMember userGuildMember, boolean z2, boolean z3, boolean z4, boolean z5, View.OnClickListener onClickListener, View.OnClickListener onClickListener2) { m.checkNotNullParameter(guildScheduledEvent, "guildScheduledEvent"); m.checkNotNullParameter(onClickListener, "onCardClicked"); m.checkNotNullParameter(onClickListener2, "onStartEventButtonClicked"); configureInternal(guildScheduledEvent, null, new GuildButtonConfiguration(guildScheduledEvent, false, z2, z4, false, true, false, false, null, null, null, onClickListener2, null, null, 14208, null), null, userGuildMember, onClickListener); ConstraintLayout constraintLayout = this.binding.a; m.checkNotNullExpressionValue(constraintLayout, "binding.root"); - constraintLayout.setBackground((!z4 || guildScheduledEvent.m() != GuildScheduledEventStatus.ACTIVE) ? ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_secondary) : ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_connected_secondary)); + constraintLayout.setBackground((!z4 || guildScheduledEvent.m() != GuildScheduledEventStatus.ACTIVE) ? z5 ? ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_dark) : ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_secondary) : z5 ? ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_connected_dark) : ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_connected_secondary)); TextView textView = this.binding.k; m.checkNotNullExpressionValue(textView, "binding.guildScheduledEventListItemRsvpText"); int i = 8; diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome.java b/app/src/main/java/com/discord/widgets/home/WidgetHome.java index b048968f26..a4bac3f87e 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHome.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHome.java @@ -554,7 +554,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen StoreChannelsSelected.ResolvedSelectedChannel.Channel channel3 = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) selectedChannel; if (ChannelUtils.E(channel3.getChannel())) { if (channel == null || channel.h() == 0 || ChannelUtils.x(channel)) { - WidgetCallPreviewFullscreen.Companion.launch(requireContext(), channel3.getChannel().h()); + WidgetCallPreviewFullscreen.Companion.launch$default(WidgetCallPreviewFullscreen.Companion, requireContext(), channel3.getChannel().h(), null, 4, null); requireAppActivity().overridePendingTransition(R.anim.activity_slide_horizontal_close_in, R.anim.activity_slide_horizontal_close_out); return; } diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java index 8768e885f1..5820ea7dbb 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java @@ -1838,7 +1838,7 @@ public final class MobileReportsViewModel extends AppViewModel { BlockUserElement blockUserElement = menu.getBlockUserElement(); if (blockUserElement != null) { updateViewState(ViewState.Menu.copy$default(menu, null, null, null, null, null, null, null, null, BlockUserElement.copy$default(blockUserElement, true, null, 2, null), 255, null)); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(this.restAPI, Companion.access$getLocation(Companion, node), blockUserElement.getUser().getId(), 2, null, 8, null), false, 1, null), this, null, 2, null), MobileReportsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, MobileReportsViewModel$handleBlockUser$1.INSTANCE, 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(this.restAPI, Companion.access$getLocation(Companion, node), blockUserElement.getUser().getId(), 2, null, null, 24, null), false, 1, null), this, null, 2, null), MobileReportsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, MobileReportsViewModel$handleBlockUser$1.INSTANCE, 62, (Object) null); } } } 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 928274b148..e1b49258be 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,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 + " - 111.3 - Alpha (111203)"); + textView.setText(string + " - 112.0 - Alpha (112200)"); binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java index 22a2fc6ff1..f79ccff08f 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java @@ -193,7 +193,7 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void acceptFriendRequest(String str) { - getViewModel().addRelationship(null, str, R.string.accept_request_button_after); + WidgetUserSheetViewModel.addRelationship$default(getViewModel(), null, str, R.string.accept_request_button_after, null, 8, null); } public static final /* synthetic */ void access$acceptFriendRequest(WidgetUserSheet widgetUserSheet, String str) { @@ -237,7 +237,7 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void addFriend(String str) { - getViewModel().addRelationship(null, str, R.string.friend_request_sent); + WidgetUserSheetViewModel.addRelationship$default(getViewModel(), null, str, R.string.friend_request_sent, null, 8, null); } private final void configureAboutMe(WidgetUserSheetViewModel.ViewState.Loaded loaded) { diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java index 87f571de25..e0b6ecdd3d 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java @@ -1,15 +1,22 @@ package com.discord.widgets.user.usersheet; import com.discord.R; +import com.discord.app.AppFragment; +import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPIAbortMessages; +import com.discord.widgets.captcha.WidgetCaptchaBottomSheet; +import com.discord.widgets.captcha.WidgetCaptchaKt; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function2; /* compiled from: WidgetUserSheetViewModel.kt */ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implements Function1 { + public final /* synthetic */ int $successMessageStringRes; + public final /* synthetic */ Integer $type; public final /* synthetic */ String $username; public final /* synthetic */ WidgetUserSheetViewModel this$0; @@ -19,6 +26,33 @@ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implemen public final /* synthetic */ Error $error; public final /* synthetic */ WidgetUserSheetViewModel$addRelationship$2 this$0; + /* compiled from: WidgetUserSheetViewModel.kt */ + /* renamed from: com.discord.widgets.user.usersheet.WidgetUserSheetViewModel$addRelationship$2$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function2 { + public final /* synthetic */ AnonymousClass1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(AnonymousClass1 r1) { + super(2); + this.this$0 = r1; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(AppFragment appFragment, String str) { + invoke(appFragment, str); + return Unit.a; + } + + public final void invoke(AppFragment appFragment, String str) { + m.checkNotNullParameter(appFragment, ""); + m.checkNotNullParameter(str, "captchaToken"); + WidgetUserSheetViewModel$addRelationship$2 widgetUserSheetViewModel$addRelationship$2 = this.this$0.this$0; + widgetUserSheetViewModel$addRelationship$2.this$0.addRelationship(widgetUserSheetViewModel$addRelationship$2.$type, widgetUserSheetViewModel$addRelationship$2.$username, widgetUserSheetViewModel$addRelationship$2.$successMessageStringRes, str); + } + } + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AnonymousClass1(WidgetUserSheetViewModel$addRelationship$2 widgetUserSheetViewModel$addRelationship$2, Error error) { super(0); @@ -29,6 +63,10 @@ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { + if (WidgetCaptchaKt.isCaptchaError(this.$error)) { + WidgetCaptchaBottomSheet.Companion.enqueue$default(WidgetCaptchaBottomSheet.Companion, "Add Friend Captcha", new AnonymousClass1(this), null, CaptchaErrorBody.Companion.createFromError(this.$error), 4, null); + return; + } WidgetUserSheetViewModel widgetUserSheetViewModel = this.this$0.this$0; Error.Response response = this.$error.getResponse(); m.checkNotNullExpressionValue(response, "error.response"); @@ -57,10 +95,12 @@ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implemen } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetUserSheetViewModel$addRelationship$2(WidgetUserSheetViewModel widgetUserSheetViewModel, String str) { + public WidgetUserSheetViewModel$addRelationship$2(WidgetUserSheetViewModel widgetUserSheetViewModel, Integer num, String str, int i) { super(1); this.this$0 = widgetUserSheetViewModel; + this.$type = num; this.$username = str; + this.$successMessageStringRes = i; } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java index 553c501346..fec016d157 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java @@ -1829,6 +1829,13 @@ public final class WidgetUserSheetViewModel extends AppViewModel { widgetUserSheetViewModel.updateViewState(viewState); } + public static /* synthetic */ void addRelationship$default(WidgetUserSheetViewModel widgetUserSheetViewModel, Integer num, String str, int i, String str2, int i2, Object obj) { + if ((i2 & 8) != 0) { + str2 = null; + } + widgetUserSheetViewModel.addRelationship(num, str, i, str2); + } + private final UserProfileAdminView.ViewState createAdminViewState(Channel channel, boolean z2, boolean z3, ManageUserContext manageUserContext, VoiceState voiceState, boolean z4, boolean z5) { boolean z6; if (channel == null) { @@ -2152,9 +2159,9 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return m.areEqual(a, l); } - public final void addRelationship(Integer num, String str, @StringRes int i) { + public final void addRelationship(Integer num, String str, @StringRes int i, String str2) { m.checkNotNullParameter(str, "username"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.addRelationship("User Profile", this.userId, num, this.friendToken), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$addRelationship$2(this, str), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$addRelationship$1(this, i), 54, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.addRelationship("User Profile", this.userId, num, this.friendToken, str2), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$addRelationship$2(this, num, str, i), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$addRelationship$1(this, i), 54, (Object) null); } public final void banUser() { diff --git a/app/src/main/java/com/discord/widgets/voice/VoiceUtils$handleCallChannel$1.java b/app/src/main/java/com/discord/widgets/voice/VoiceUtils$handleCallChannel$1.java index 5cca385f3f..86bb85a131 100644 --- a/app/src/main/java/com/discord/widgets/voice/VoiceUtils$handleCallChannel$1.java +++ b/app/src/main/java/com/discord/widgets/voice/VoiceUtils$handleCallChannel$1.java @@ -6,6 +6,7 @@ import com.discord.api.channel.Channel; import com.discord.api.channel.ChannelUtils; import com.discord.app.AppComponent; import com.discord.app.AppPermissionsRequests; +import com.discord.app.AppTransitionActivity; import com.discord.utilities.stage.StageChannelUtils; import com.discord.widgets.chat.list.TextInVoiceFeatureFlag; import com.discord.widgets.user.calls.PrivateCallLauncher; @@ -52,7 +53,7 @@ public final class VoiceUtils$handleCallChannel$1 extends o implements Function0 } else if (TextInVoiceFeatureFlag.Companion.getINSTANCE().isEnabled(Long.valueOf(this.$channel.f()))) { Channel channel = this.$selectedVoiceChannel; if (channel == null || channel.h() == 0 || ChannelUtils.x(this.$selectedVoiceChannel)) { - WidgetCallPreviewFullscreen.Companion.launch(this.$context, this.$channel.h()); + WidgetCallPreviewFullscreen.Companion.launch(this.$context, this.$channel.h(), AppTransitionActivity.Transition.TYPE_SLIDE_VERTICAL_WITH_FADE); } else { WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.$context, this.$channel.h(), false, null, null, 28, null); } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.java index 4a4a85ffae..bf2ba78b03 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.java @@ -2,32 +2,18 @@ package com.discord.widgets.voice.call; import android.view.View; import com.discord.models.user.User; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; /* compiled from: WidgetCallFailed.kt */ -public final class WidgetCallFailed$configureUI$$inlined$let$lambda$1 extends o implements Function1 { +public final class WidgetCallFailed$configureUI$$inlined$let$lambda$1 implements View.OnClickListener { public final /* synthetic */ User $this_configureUI$inlined; public final /* synthetic */ WidgetCallFailed this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetCallFailed$configureUI$$inlined$let$lambda$1(WidgetCallFailed widgetCallFailed, User user) { - super(1); this.this$0 = widgetCallFailed; this.$this_configureUI$inlined = user; } - /* 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"); - WidgetCallFailed.access$sendFriendRequest(this.this$0, this.$this_configureUI$inlined.getId(), this.$this_configureUI$inlined.getUsername()); + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + WidgetCallFailed.sendFriendRequest$default(this.this$0, this.$this_configureUI$inlined.getId(), this.$this_configureUI$inlined.getUsername(), null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java index 4334b87585..769ef228ee 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java @@ -2,28 +2,17 @@ package com.discord.widgets.voice.call; import b.a.d.m; import com.discord.R; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import rx.functions.Action1; /* compiled from: WidgetCallFailed.kt */ -public final class WidgetCallFailed$sendFriendRequest$1 extends o implements Function1 { +public final class WidgetCallFailed$sendFriendRequest$1 implements Action1 { public final /* synthetic */ WidgetCallFailed this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetCallFailed$sendFriendRequest$1(WidgetCallFailed widgetCallFailed) { - super(1); this.this$0 = widgetCallFailed; } - /* 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(Void r1) { - invoke(r1); - return Unit.a; - } - - public final void invoke(Void r4) { + public final void call(Void r4) { m.i(this.this$0, R.string.friend_request_sent, 0, 4); + this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.java index 354d1d7011..be9860c150 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.java @@ -1,52 +1,97 @@ package com.discord.widgets.voice.call; import android.content.Context; +import com.discord.app.AppFragment; +import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPIAbortMessages; +import com.discord.widgets.captcha.WidgetCaptchaBottomSheet; +import com.discord.widgets.captcha.WidgetCaptchaKt; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function2; import rx.functions.Action1; /* compiled from: WidgetCallFailed.kt */ public final class WidgetCallFailed$sendFriendRequest$2 implements Action1 { + public final /* synthetic */ long $userId; public final /* synthetic */ String $username; public final /* synthetic */ WidgetCallFailed this$0; /* compiled from: WidgetCallFailed.kt */ /* renamed from: com.discord.widgets.voice.call.WidgetCallFailed$sendFriendRequest$2$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ Error $it; + public final /* synthetic */ Error $error; public final /* synthetic */ WidgetCallFailed$sendFriendRequest$2 this$0; + /* compiled from: WidgetCallFailed.kt */ + /* renamed from: com.discord.widgets.voice.call.WidgetCallFailed$sendFriendRequest$2$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function2 { + public final /* synthetic */ AnonymousClass1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(AnonymousClass1 r1) { + super(2); + this.this$0 = r1; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(AppFragment appFragment, String str) { + invoke(appFragment, str); + return Unit.a; + } + + public final void invoke(AppFragment appFragment, String str) { + m.checkNotNullParameter(appFragment, ""); + m.checkNotNullParameter(str, "captchaToken"); + WidgetCallFailed$sendFriendRequest$2 widgetCallFailed$sendFriendRequest$2 = this.this$0.this$0; + WidgetCallFailed.access$sendFriendRequest(widgetCallFailed$sendFriendRequest$2.this$0, widgetCallFailed$sendFriendRequest$2.$userId, widgetCallFailed$sendFriendRequest$2.$username, str); + } + } + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AnonymousClass1(WidgetCallFailed$sendFriendRequest$2 widgetCallFailed$sendFriendRequest$2, Error error) { super(0); this.this$0 = widgetCallFailed$sendFriendRequest$2; - this.$it = error; + this.$error = error; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { + Error error = this.$error; + m.checkNotNullExpressionValue(error, "error"); + if (WidgetCaptchaKt.isCaptchaError(error)) { + WidgetCaptchaBottomSheet.Companion companion = WidgetCaptchaBottomSheet.Companion; + AnonymousClass1 r4 = new AnonymousClass1(this); + CaptchaErrorBody.Companion companion2 = CaptchaErrorBody.Companion; + Error error2 = this.$error; + m.checkNotNullExpressionValue(error2, "error"); + WidgetCaptchaBottomSheet.Companion.enqueue$default(companion, "Add Friend Captcha", r4, null, companion2.createFromError(error2), 4, null); + return; + } RestAPIAbortMessages.ResponseResolver responseResolver = RestAPIAbortMessages.ResponseResolver.INSTANCE; Context context = this.this$0.this$0.getContext(); - Error error = this.$it; - m.checkNotNullExpressionValue(error, "it"); - Error.Response response = error.getResponse(); - m.checkNotNullExpressionValue(response, "it.response"); + Error error3 = this.$error; + m.checkNotNullExpressionValue(error3, "error"); + Error.Response response = error3.getResponse(); + m.checkNotNullExpressionValue(response, "error.response"); b.a.d.m.h(this.this$0.this$0.getContext(), responseResolver.getRelationshipResponse(context, response.getCode(), this.this$0.$username), 0, null, 12); } } - public WidgetCallFailed$sendFriendRequest$2(WidgetCallFailed widgetCallFailed, String str) { + public WidgetCallFailed$sendFriendRequest$2(WidgetCallFailed widgetCallFailed, long j, String str) { this.this$0 = widgetCallFailed; + this.$userId = j; this.$username = str; } public final void call(Error error) { RestAPIAbortMessages restAPIAbortMessages = RestAPIAbortMessages.INSTANCE; - m.checkNotNullExpressionValue(error, "it"); + m.checkNotNullExpressionValue(error, "error"); RestAPIAbortMessages.handleAbortCodeOrDefault$default(restAPIAbortMessages, error, new AnonymousClass1(this, error), null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java index a43c9ae5ba..cdfc564cd4 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java @@ -58,8 +58,8 @@ public final class WidgetCallFailed extends AppDialog { widgetCallFailed.configureUI(user); } - public static final /* synthetic */ void access$sendFriendRequest(WidgetCallFailed widgetCallFailed, long j, String str) { - widgetCallFailed.sendFriendRequest(j, str); + public static final /* synthetic */ void access$sendFriendRequest(WidgetCallFailed widgetCallFailed, long j, String str, String str2) { + widgetCallFailed.sendFriendRequest(j, str, str2); } private final void configureUI(User user) { @@ -67,9 +67,7 @@ public final class WidgetCallFailed extends AppDialog { TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationText"); b.n(textView, R.string.call_invite_not_friends, new Object[]{user.getUsername()}, null, 4); - MaterialButton materialButton = getBinding().c; - m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm"); - setOnClickAndDismissListener(materialButton, new WidgetCallFailed$configureUI$$inlined$let$lambda$1(this, user)); + getBinding().c.setOnClickListener(new WidgetCallFailed$configureUI$$inlined$let$lambda$1(this, user)); return; } dismiss(); @@ -79,8 +77,15 @@ public final class WidgetCallFailed extends AppDialog { return (ViewDialogConfirmationBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]); } - private final void sendFriendRequest(long j, String str) { - ObservableExtensionsKt.ui$default(RestAPI.addRelationship$default(RestAPI.Companion.getApi(), "Call", j, null, null, 8, null), this, null, 2, null).k(o.a.g(getContext(), new WidgetCallFailed$sendFriendRequest$1(this), new WidgetCallFailed$sendFriendRequest$2(this, str))); + private final void sendFriendRequest(long j, String str, String str2) { + ObservableExtensionsKt.ui$default(RestAPI.addRelationship$default(RestAPI.Companion.getApi(), "Call", j, null, null, str2, 8, null), this, null, 2, null).k(o.h(new WidgetCallFailed$sendFriendRequest$1(this), getAppActivity(), new WidgetCallFailed$sendFriendRequest$2(this, j, str))); + } + + public static /* synthetic */ void sendFriendRequest$default(WidgetCallFailed widgetCallFailed, long j, String str, String str2, int i, Object obj) { + if ((i & 4) != 0) { + str2 = null; + } + widgetCallFailed.sendFriendRequest(j, str, str2); } @Override // com.discord.app.AppDialog diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java index 54c4803efa..200aef08b6 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java @@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager; import b.d.b.a.a; import com.discord.R; import com.discord.app.AppBottomSheet; +import com.discord.app.AppTransitionActivity; import com.discord.databinding.WidgetScreenShareNfxSheetBinding; import com.discord.utilities.cache.SharedPreferencesProvider; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; @@ -177,7 +178,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet { WidgetCallPreviewFullscreen.Companion companion = WidgetCallPreviewFullscreen.Companion; Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - companion.launch(requireContext, getChannelId()); + companion.launch(requireContext, getChannelId(), AppTransitionActivity.Transition.TYPE_SLIDE_VERTICAL_WITH_FADE); return; } WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion; diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureActionBar$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureActionBar$1.java index 1cc4e8daef..3536dbeae0 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureActionBar$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureActionBar$1.java @@ -1,16 +1,19 @@ package com.discord.widgets.voice.fullscreen; import android.view.View; +import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; /* compiled from: WidgetCallFullscreen.kt */ public final class WidgetCallFullscreen$configureActionBar$1 implements View.OnClickListener { + public final /* synthetic */ WidgetCallFullscreenViewModel.ViewState.Valid $viewState; public final /* synthetic */ WidgetCallFullscreen this$0; - public WidgetCallFullscreen$configureActionBar$1(WidgetCallFullscreen widgetCallFullscreen) { + public WidgetCallFullscreen$configureActionBar$1(WidgetCallFullscreen widgetCallFullscreen, WidgetCallFullscreenViewModel.ViewState.Valid valid) { this.this$0 = widgetCallFullscreen; + this.$viewState = valid; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetCallFullscreen.access$finishActivity(this.this$0, false); + WidgetCallFullscreen.access$finishActivity(this.this$0, false, this.$viewState.isTextInVoiceEnabled()); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1.java index ede42e2b36..0b6e5b754c 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1.java @@ -35,7 +35,7 @@ public final class WidgetCallFullscreen$configureBottomControls$1 extends o impl m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion.show(parentFragmentManager, "END_STAGE_REQUEST_KEY", access$getChannelId); } else if (!ChannelUtils.E(this.$viewState.getCallModel().getChannel()) || (guildScheduledEventToEndForCall$default = GuildScheduledEventUtilities.Companion.getGuildScheduledEventToEndForCall$default(GuildScheduledEventUtilities.Companion, this.$viewState.getCallModel(), this.$viewState.getChannelPermissions(), null, 4, null)) == null) { - WidgetCallFullscreen.finishActivity$default(this.this$0, false, 1, null); + WidgetCallFullscreen.finishActivity$default(this.this$0, false, this.$viewState.isTextInVoiceEnabled(), 1, null); } else { WidgetEndGuildScheduledEventBottomSheet.Companion companion2 = WidgetEndGuildScheduledEventBottomSheet.Companion; FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.java index 666bfceb8e..24b0420331 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.java @@ -1,21 +1,24 @@ package com.discord.widgets.voice.fullscreen; +import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetCallFullscreen.kt */ public final class WidgetCallFullscreen$configureGridUi$5 extends o implements Function0 { + public final /* synthetic */ WidgetCallFullscreenViewModel.ViewState.Valid $viewState; public final /* synthetic */ WidgetCallFullscreen this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetCallFullscreen$configureGridUi$5(WidgetCallFullscreen widgetCallFullscreen) { + public WidgetCallFullscreen$configureGridUi$5(WidgetCallFullscreen widgetCallFullscreen, WidgetCallFullscreenViewModel.ViewState.Valid valid) { super(0); this.this$0 = widgetCallFullscreen; + this.$viewState = valid; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - WidgetCallFullscreen.finishActivity$default(this.this$0, false, 1, null); + WidgetCallFullscreen.finishActivity$default(this.this$0, false, this.$viewState.isTextInVoiceEnabled(), 1, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java index 2f2e3dee6f..b4db1fc4d2 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java @@ -1,21 +1,24 @@ package com.discord.widgets.voice.fullscreen; +import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetCallFullscreen.kt */ public final class WidgetCallFullscreen$configureStageUi$4 extends o implements Function0 { + public final /* synthetic */ WidgetCallFullscreenViewModel.ViewState.Valid $viewState; public final /* synthetic */ WidgetCallFullscreen this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetCallFullscreen$configureStageUi$4(WidgetCallFullscreen widgetCallFullscreen) { + public WidgetCallFullscreen$configureStageUi$4(WidgetCallFullscreen widgetCallFullscreen, WidgetCallFullscreenViewModel.ViewState.Valid valid) { super(0); this.this$0 = widgetCallFullscreen; + this.$viewState = valid; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - WidgetCallFullscreen.finishActivity$default(this.this$0, false, 1, null); + WidgetCallFullscreen.finishActivity$default(this.this$0, false, this.$viewState.isTextInVoiceEnabled(), 1, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java index 10e9ce8cb4..06aa06892f 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java @@ -2,23 +2,30 @@ package com.discord.widgets.voice.fullscreen; import b.a.d.m; import com.discord.R; +import com.discord.api.channel.Channel; +import com.discord.widgets.chat.list.TextInVoiceFeatureFlag; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetCallFullscreen.kt */ public final class WidgetCallFullscreen$onViewBound$3 extends o implements Function0 { + public final /* synthetic */ Channel $channel; public final /* synthetic */ WidgetCallFullscreen this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetCallFullscreen$onViewBound$3(WidgetCallFullscreen widgetCallFullscreen) { + public WidgetCallFullscreen$onViewBound$3(WidgetCallFullscreen widgetCallFullscreen, Channel channel) { super(0); this.this$0 = widgetCallFullscreen; + this.$channel = channel; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { m.g(this.this$0.getContext(), R.string.permission_microphone_denied, 0, null, 12); - WidgetCallFullscreen.finishActivity$default(this.this$0, false, 1, null); + WidgetCallFullscreen widgetCallFullscreen = this.this$0; + TextInVoiceFeatureFlag instance = TextInVoiceFeatureFlag.Companion.getINSTANCE(); + Channel channel = this.$channel; + WidgetCallFullscreen.finishActivity$default(widgetCallFullscreen, false, instance.isEnabled(channel != null ? Long.valueOf(channel.f()) : null), 1, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java index 875ecd55ea..659f32337a 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java @@ -252,8 +252,8 @@ public final class WidgetCallFullscreen extends AppFragment { widgetCallFullscreen.configureUI(viewState); } - public static final /* synthetic */ void access$finishActivity(WidgetCallFullscreen widgetCallFullscreen, boolean z2) { - widgetCallFullscreen.finishActivity(z2); + public static final /* synthetic */ void access$finishActivity(WidgetCallFullscreen widgetCallFullscreen, boolean z2, boolean z3) { + widgetCallFullscreen.finishActivity(z2, z3); } public static final /* synthetic */ WidgetCallFullscreenBinding access$getBinding$p(WidgetCallFullscreen widgetCallFullscreen) { @@ -336,21 +336,21 @@ public final class WidgetCallFullscreen extends AppFragment { bottomSheetBehavior.setState(4); } - /* JADX WARNING: Removed duplicated region for block: B:35:0x00e9 */ - /* JADX WARNING: Removed duplicated region for block: B:36:0x00eb */ - /* JADX WARNING: Removed duplicated region for block: B:39:0x00fb */ - /* JADX WARNING: Removed duplicated region for block: B:40:0x00fd */ - /* JADX WARNING: Removed duplicated region for block: B:47:0x0133 */ - /* JADX WARNING: Removed duplicated region for block: B:53:0x0187 */ - /* JADX WARNING: Removed duplicated region for block: B:56:0x018c */ - /* JADX WARNING: Removed duplicated region for block: B:57:0x018e */ - /* JADX WARNING: Removed duplicated region for block: B:64:0x01b4 */ - /* JADX WARNING: Removed duplicated region for block: B:75:0x0220 */ - /* JADX WARNING: Removed duplicated region for block: B:76:0x0222 */ - /* JADX WARNING: Removed duplicated region for block: B:78:0x0233 */ - /* JADX WARNING: Removed duplicated region for block: B:80:0x0236 */ - /* JADX WARNING: Removed duplicated region for block: B:83:0x023c */ - /* JADX WARNING: Removed duplicated region for block: B:86:0x024f */ + /* JADX WARNING: Removed duplicated region for block: B:31:0x00cc */ + /* JADX WARNING: Removed duplicated region for block: B:39:0x00f9 */ + /* JADX WARNING: Removed duplicated region for block: B:40:0x00fb */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x010b */ + /* JADX WARNING: Removed duplicated region for block: B:44:0x010d */ + /* JADX WARNING: Removed duplicated region for block: B:51:0x0143 */ + /* JADX WARNING: Removed duplicated region for block: B:59:0x0196 */ + /* JADX WARNING: Removed duplicated region for block: B:60:0x0198 */ + /* JADX WARNING: Removed duplicated region for block: B:67:0x01be */ + /* JADX WARNING: Removed duplicated region for block: B:78:0x022c */ + /* JADX WARNING: Removed duplicated region for block: B:79:0x022e */ + /* JADX WARNING: Removed duplicated region for block: B:81:0x023f */ + /* JADX WARNING: Removed duplicated region for block: B:83:0x0242 */ + /* JADX WARNING: Removed duplicated region for block: B:86:0x0248 */ + /* JADX WARNING: Removed duplicated region for block: B:89:0x025b */ private final void configureActionBar(WidgetCallFullscreenViewModel.ViewState.Valid valid) { int i; Guild guild; @@ -370,19 +370,17 @@ public final class WidgetCallFullscreen extends AppFragment { Toolbar toolbar = getBinding().f2221b; m.checkNotNullExpressionValue(toolbar, "binding.actionBarToolbar"); Context requireContext = requireContext(); - WidgetCallFullscreenViewModel.DisplayMode displayMode = valid.getDisplayMode(); - WidgetCallFullscreenViewModel.DisplayMode displayMode2 = WidgetCallFullscreenViewModel.DisplayMode.STAGE; - if (displayMode == displayMode2) { + if (!valid.isTextInVoiceEnabled() && valid.getDisplayMode() != WidgetCallFullscreenViewModel.DisplayMode.STAGE) { TextView textView2 = getBinding().h; m.checkNotNullExpressionValue(textView2, "binding.callFullscreenMentions"); if (textView2.getVisibility() == 0) { - i = R.drawable.ic_call_toolbar_stage_minimize_cutout; + i = R.drawable.ic_call_toolbar_icon_minimize_cutout; toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i)); - getBinding().f2221b.setNavigationOnClickListener(new WidgetCallFullscreen$configureActionBar$1(this)); + getBinding().f2221b.setNavigationOnClickListener(new WidgetCallFullscreen$configureActionBar$1(this, valid)); CallEventsButtonView callEventsButtonView = getBinding().w; guild = valid.getCallModel().getGuild(); boolean hasLiveEvent = (guild != null && valid.getStageCallModel() != null && !valid.getStageCallModel().isLurking() && StageEventsGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStageEvents(guild.getId())) ? !valid.getCallModel().canManageEvent() ? true : GuildScheduledEventUtilitiesKt.hasLiveEvent(valid.getCallModel().getGuildScheduledEvents()) : false; - callEventsButtonView.setVisibility(hasLiveEvent ? 0 : 8); + callEventsButtonView.setVisibility(!hasLiveEvent ? 0 : 8); if (guild != null && hasLiveEvent) { FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); @@ -411,13 +409,13 @@ public final class WidgetCallFullscreen extends AppFragment { } if (z6) { z2 = true; - voiceCallActiveEventView.setVisibility(!z2 ? 0 : 8); + voiceCallActiveEventView.setVisibility(z2 ? 0 : 8); StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q; m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity"); StageCallModel stageCallModel = valid.getStageCallModel(); if (stageCallModel != null && stageCallModel.isLurking()) { guild2 = valid.getStageCallModel().getGuild(); - if (guild2 == null) { + if (guild2 != null) { StageCallVisitCommunityView stageCallVisitCommunityView2 = getBinding().q; Objects.requireNonNull(stageCallVisitCommunityView2); m.checkNotNullParameter(guild2, "guild"); @@ -481,12 +479,12 @@ public final class WidgetCallFullscreen extends AppFragment { } } z2 = false; - voiceCallActiveEventView.setVisibility(!z2 ? 0 : 8); + voiceCallActiveEventView.setVisibility(z2 ? 0 : 8); StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q; m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity"); StageCallModel stageCallModel = valid.getStageCallModel(); guild2 = valid.getStageCallModel().getGuild(); - if (guild2 == null) { + if (guild2 != null) { } if (z4) { } @@ -505,19 +503,48 @@ public final class WidgetCallFullscreen extends AppFragment { ColorCompat.setStatusBarColor((Fragment) this, color, true); } } - if (valid.getDisplayMode() == displayMode2) { - i = R.drawable.ic_call_toolbar_stage_minimize; - } else { + if (valid.isTextInVoiceEnabled() || valid.getDisplayMode() == WidgetCallFullscreenViewModel.DisplayMode.STAGE) { TextView textView6 = getBinding().h; m.checkNotNullExpressionValue(textView6, "binding.callFullscreenMentions"); - i = textView6.getVisibility() == 0 ? R.drawable.ic_call_toolbar_icon_minimize_cutout : R.drawable.ic_call_toolbar_icon_minimize; - } - toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i)); - getBinding().f2221b.setNavigationOnClickListener(new WidgetCallFullscreen$configureActionBar$1(this)); - CallEventsButtonView callEventsButtonView = getBinding().w; - guild = valid.getCallModel().getGuild(); - if (guild != null) { - callEventsButtonView.setVisibility(hasLiveEvent ? 0 : 8); + i = textView6.getVisibility() == 0 ? R.drawable.ic_call_toolbar_stage_minimize_cutout : R.drawable.ic_call_toolbar_stage_minimize; + toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i)); + getBinding().f2221b.setNavigationOnClickListener(new WidgetCallFullscreen$configureActionBar$1(this, valid)); + CallEventsButtonView callEventsButtonView = getBinding().w; + guild = valid.getCallModel().getGuild(); + if (guild != null) { + callEventsButtonView.setVisibility(!hasLiveEvent ? 0 : 8); + FragmentManager parentFragmentManager = getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); + callEventsButtonView.a(parentFragmentManager, guild.getId(), getChannelId(), valid.getCallModel().getGuildScheduledEvents()); + VoiceCallActiveEventView voiceCallActiveEventView = getBinding().f2223x; + m.checkNotNullExpressionValue(voiceCallActiveEventView, "binding.toolbarVoiceActiveEvent"); + if (valid.getStageCallModel() == null) { + } + z2 = false; + voiceCallActiveEventView.setVisibility(z2 ? 0 : 8); + StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q; + m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity"); + StageCallModel stageCallModel = valid.getStageCallModel(); + guild2 = valid.getStageCallModel().getGuild(); + if (guild2 != null) { + } + if (z4) { + } + z3 = false; + if (!z3) { + } + stageCallVisitCommunityView.setVisibility(i2); + int color = ColorCompat.getColor(this, (int) R.color.transparent); + titleText = valid.getTitleText(); + if (titleText == null) { + } + setActionBarTitle(titleText); + setActionBarTitleColor(-1); + ViewExtensions.fadeBy(getBinding().c, valid.getShowControls(), 200); + ColorCompat.setStatusBarTranslucent(this); + ColorCompat.setStatusBarColor((Fragment) this, color, true); + } + callEventsButtonView.setVisibility(!hasLiveEvent ? 0 : 8); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); callEventsButtonView.a(parentFragmentManager, guild.getId(), getChannelId(), valid.getCallModel().getGuildScheduledEvents()); @@ -526,12 +553,12 @@ public final class WidgetCallFullscreen extends AppFragment { if (valid.getStageCallModel() == null) { } z2 = false; - voiceCallActiveEventView.setVisibility(!z2 ? 0 : 8); + voiceCallActiveEventView.setVisibility(z2 ? 0 : 8); StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q; m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity"); StageCallModel stageCallModel = valid.getStageCallModel(); guild2 = valid.getStageCallModel().getGuild(); - if (guild2 == null) { + if (guild2 != null) { } if (z4) { } @@ -549,7 +576,14 @@ public final class WidgetCallFullscreen extends AppFragment { ColorCompat.setStatusBarTranslucent(this); ColorCompat.setStatusBarColor((Fragment) this, color, true); } - callEventsButtonView.setVisibility(hasLiveEvent ? 0 : 8); + i = R.drawable.ic_call_toolbar_icon_minimize; + toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i)); + getBinding().f2221b.setNavigationOnClickListener(new WidgetCallFullscreen$configureActionBar$1(this, valid)); + CallEventsButtonView callEventsButtonView = getBinding().w; + guild = valid.getCallModel().getGuild(); + if (guild != null) { + } + callEventsButtonView.setVisibility(!hasLiveEvent ? 0 : 8); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); callEventsButtonView.a(parentFragmentManager, guild.getId(), getChannelId(), valid.getCallModel().getGuildScheduledEvents()); @@ -558,12 +592,12 @@ public final class WidgetCallFullscreen extends AppFragment { if (valid.getStageCallModel() == null) { } z2 = false; - voiceCallActiveEventView.setVisibility(!z2 ? 0 : 8); + voiceCallActiveEventView.setVisibility(z2 ? 0 : 8); StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q; m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity"); StageCallModel stageCallModel = valid.getStageCallModel(); guild2 = valid.getStageCallModel().getGuild(); - if (guild2 == null) { + if (guild2 != null) { } if (z4) { } @@ -748,7 +782,7 @@ public final class WidgetCallFullscreen extends AppFragment { } else { getEventPromptOverlay().setVisible(false); } - WidgetEndGuildScheduledEventBottomSheet.Companion.registerForResult(this, END_EVENT_REQUEST_KEY, new WidgetCallFullscreen$configureGridUi$5(this)); + WidgetEndGuildScheduledEventBottomSheet.Companion.registerForResult(this, END_EVENT_REQUEST_KEY, new WidgetCallFullscreen$configureGridUi$5(this, valid)); enableWakeLock(); } } @@ -773,7 +807,7 @@ public final class WidgetCallFullscreen extends AppFragment { z3 = false; if (!z3) { } - WidgetEndGuildScheduledEventBottomSheet.Companion.registerForResult(this, END_EVENT_REQUEST_KEY, new WidgetCallFullscreen$configureGridUi$5(this)); + WidgetEndGuildScheduledEventBottomSheet.Companion.registerForResult(this, END_EVENT_REQUEST_KEY, new WidgetCallFullscreen$configureGridUi$5(this, valid)); enableWakeLock(); } @@ -964,7 +998,7 @@ public final class WidgetCallFullscreen extends AppFragment { configureMenu(valid); configureActionBar(valid); enableWakeLock(); - WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$4(this)); + WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$4(this, valid)); } } z3 = false; @@ -999,7 +1033,7 @@ public final class WidgetCallFullscreen extends AppFragment { configureMenu(valid); configureActionBar(valid); enableWakeLock(); - WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$4(this)); + WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$4(this, valid)); } } @@ -1072,13 +1106,15 @@ public final class WidgetCallFullscreen extends AppFragment { } private final void configureValidUI(WidgetCallFullscreenViewModel.ViewState.Valid valid) { - int i; configureBottomControls(valid); ConstraintLayout constraintLayout = getBinding().a; int ordinal = valid.getDisplayMode().ordinal(); + int i = R.color.primary_dark_800; if (ordinal != 0) { - i = ordinal != 1 ? R.color.black : R.color.primary_dark_800; - } else { + if (ordinal != 1) { + i = R.color.black; + } + } else if (!valid.isTextInVoiceEnabled()) { ConstraintLayout constraintLayout2 = getBinding().a; m.checkNotNullExpressionValue(constraintLayout2, "binding.root"); i = DrawableCompat.getThemedDrawableRes(constraintLayout2, (int) R.attr.colorBackgroundPrimary, 0); @@ -1113,19 +1149,22 @@ public final class WidgetCallFullscreen extends AppFragment { requireActivity.getWindow().addFlags(128); } - private final void finishActivity(boolean z2) { + private final void finishActivity(boolean z2, boolean z3) { getViewModel().selectTextChannelAfterFinish(); if (z2) { getViewModel().disconnect(); } requireActivity().finish(); + if (z3) { + requireAppActivity().overridePendingTransition(0, R.anim.anim_slide_out_down); + } } - public static /* synthetic */ void finishActivity$default(WidgetCallFullscreen widgetCallFullscreen, boolean z2, int i, Object obj) { + public static /* synthetic */ void finishActivity$default(WidgetCallFullscreen widgetCallFullscreen, boolean z2, boolean z3, int i, Object obj) { if ((i & 1) != 0) { z2 = true; } - widgetCallFullscreen.finishActivity(z2); + widgetCallFullscreen.finishActivity(z2, z3); } private final WidgetCallFullscreenBinding getBinding() { @@ -1622,7 +1661,7 @@ public final class WidgetCallFullscreen extends AppFragment { return; } if (channel == null || !ChannelUtils.z(channel)) { - requestMicrophone(new WidgetCallFullscreen$onViewBound$3(this), new WidgetCallFullscreen$onViewBound$4(this)); + requestMicrophone(new WidgetCallFullscreen$onViewBound$3(this, channel), new WidgetCallFullscreen$onViewBound$4(this)); } else { getViewModel().tryConnectToVoice(); } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen$configureActionBar$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen$configureActionBar$1.java index 0e4e57110a..65e17a7fe2 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen$configureActionBar$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen$configureActionBar$1.java @@ -11,6 +11,6 @@ public final class WidgetCallPreviewFullscreen$configureActionBar$1 implements V @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetCallPreviewFullscreen.access$finishActivity(this.this$0, true); + WidgetCallPreviewFullscreen.finishActivity$default(this.this$0, true, false, 2, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen.java index a67c7d1f15..10e252b2a4 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen.java @@ -22,6 +22,7 @@ import b.d.b.a.a; import com.discord.R; import com.discord.api.channel.Channel; import com.discord.app.AppFragment; +import com.discord.app.AppTransitionActivity; import com.discord.databinding.WidgetCallPreviewFullscreenBinding; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; @@ -65,10 +66,18 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { this(); } - public final void launch(Context context, long j) { + public static /* synthetic */ void launch$default(Companion companion, Context context, long j, AppTransitionActivity.Transition transition, int i, Object obj) { + if ((i & 4) != 0) { + transition = null; + } + companion.launch(context, j, transition); + } + + public final void launch(Context context, long j, AppTransitionActivity.Transition transition) { m.checkNotNullParameter(context, "context"); - Intent intent = new Intent(); + Intent intent = new Intent(context, WidgetCallFullscreen.class); intent.putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j); + intent.putExtra("transition", transition); j.d(context, WidgetCallPreviewFullscreen.class, intent); } } @@ -84,10 +93,6 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { widgetCallPreviewFullscreen.configureUI(viewState); } - public static final /* synthetic */ void access$finishActivity(WidgetCallPreviewFullscreen widgetCallPreviewFullscreen, boolean z2) { - widgetCallPreviewFullscreen.finishActivity(z2); - } - public static final /* synthetic */ WidgetCallPreviewFullscreenBinding access$getBinding$p(WidgetCallPreviewFullscreen widgetCallPreviewFullscreen) { return widgetCallPreviewFullscreen.getBinding(); } @@ -142,7 +147,7 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { textView2.setVisibility(i); Toolbar toolbar = getBinding().f2225b; m.checkNotNullExpressionValue(toolbar, "binding.actionBarToolbar"); - toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext(), z2 ? R.drawable.ic_call_toolbar_icon_minimize_cutout : R.drawable.ic_call_toolbar_icon_minimize)); + toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext(), z2 ? R.drawable.ic_call_toolbar_stage_minimize_cutout : R.drawable.ic_call_toolbar_stage_minimize)); getBinding().f2225b.setNavigationOnClickListener(new WidgetCallPreviewFullscreen$configureActionBar$1(this)); setActionBarOptionsMenu(R.menu.menu_call_preview_fullscreen, null, new WidgetCallPreviewFullscreen$configureActionBar$2(this, viewState)); int color = ColorCompat.getColor(this, (int) R.color.transparent); @@ -245,7 +250,7 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { } } - private final void finishActivity(boolean z2) { + private final void finishActivity(boolean z2, boolean z3) { if (z2) { getViewModel().selectTextChannelAfterFinish(); } @@ -254,13 +259,19 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { subscription.unsubscribe(); } requireAppActivity().finish(); + if (z3) { + requireAppActivity().overridePendingTransition(0, R.anim.anim_slide_out_down); + } } - public static /* synthetic */ void finishActivity$default(WidgetCallPreviewFullscreen widgetCallPreviewFullscreen, boolean z2, int i, Object obj) { + public static /* synthetic */ void finishActivity$default(WidgetCallPreviewFullscreen widgetCallPreviewFullscreen, boolean z2, boolean z3, int i, Object obj) { if ((i & 1) != 0) { z2 = false; } - widgetCallPreviewFullscreen.finishActivity(z2); + if ((i & 2) != 0) { + z3 = true; + } + widgetCallPreviewFullscreen.finishActivity(z2, z3); } private final WidgetCallPreviewFullscreenBinding getBinding() { @@ -284,7 +295,7 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { } else if (d0.z.d.m.areEqual(event, WidgetCallPreviewFullscreenViewModel.Event.ShowOverlayNux.INSTANCE)) { WidgetNoticeNuxOverlay.Companion.enqueue(); } else if (event instanceof WidgetCallPreviewFullscreenViewModel.Event.LaunchVideoCall) { - finishActivity$default(this, false, 1, null); + finishActivity$default(this, false, false, 1, null); WidgetCallPreviewFullscreenViewModel.Event.LaunchVideoCall launchVideoCall = (WidgetCallPreviewFullscreenViewModel.Event.LaunchVideoCall) event; WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, requireContext(), launchVideoCall.getChannelId(), false, launchVideoCall.getAutoTargetStreamKey(), null, 20, null); } else { @@ -292,12 +303,12 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { } } - public static final void launch(Context context, long j) { - Companion.launch(context, j); + public static final void launch(Context context, long j, AppTransitionActivity.Transition transition) { + Companion.launch(context, j, transition); } private final void onDenyNsfw() { - finishActivity(true); + finishActivity$default(this, true, false, 2, null); } private final void onNsfwToggle(boolean z2) { @@ -311,7 +322,7 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { } private final void transitionActivity() { - finishActivity$default(this, false, 1, null); + finishActivity$default(this, false, false, 3, null); requireAppActivity().overridePendingTransition(R.anim.activity_slide_horizontal_open_in, R.anim.activity_slide_horizontal_open_out); } @@ -328,7 +339,7 @@ public final class WidgetCallPreviewFullscreen extends AppFragment { MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; RecyclerView recyclerView = getBinding().j; d0.z.d.m.checkNotNullExpressionValue(recyclerView, "binding.callPreviewVoiceSheetRecycler"); - CallParticipantsAdapter callParticipantsAdapter = (CallParticipantsAdapter) companion.configure(new CallParticipantsAdapter(recyclerView, true)); + CallParticipantsAdapter callParticipantsAdapter = (CallParticipantsAdapter) companion.configure(new CallParticipantsAdapter(recyclerView, true, true)); this.participantsAdapter = callParticipantsAdapter; if (callParticipantsAdapter == null) { d0.z.d.m.throwUninitializedPropertyAccessException("participantsAdapter"); diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java index 3943443cef..601e897ec3 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java @@ -13,6 +13,7 @@ import b.a.y.g; import b.d.b.a.a; import com.discord.R; import com.discord.app.AppBottomSheet; +import com.discord.app.AppTransitionActivity; import com.discord.databinding.WidgetGuildCallOnboardingBinding; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; @@ -144,7 +145,7 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet { WidgetCallPreviewFullscreen.Companion companion = WidgetCallPreviewFullscreen.Companion; Context requireContext = requireContext(); d0.z.d.m.checkNotNullExpressionValue(requireContext, "requireContext()"); - companion.launch(requireContext, launchGuildCallScreen.getChannelId()); + companion.launch(requireContext, launchGuildCallScreen.getChannelId(), AppTransitionActivity.Transition.TYPE_SLIDE_VERTICAL_WITH_FADE); } else { WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion; FragmentManager parentFragmentManager2 = getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java index b8af1d5a12..110eac265c 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java @@ -20,12 +20,14 @@ import com.discord.api.voice.state.VoiceState; import com.discord.databinding.VoiceUserListItemEmbeddedActivityBinding; import com.discord.databinding.VoiceUserListItemEventBinding; import com.discord.databinding.VoiceUserListItemHeaderBinding; +import com.discord.databinding.VoiceUserListItemInviteBinding; import com.discord.databinding.VoiceUserListItemUserBinding; import com.discord.models.commands.Application; import com.discord.models.embeddedactivities.EmbeddedActivity; import com.discord.models.guild.UserGuildMember; import com.discord.stores.StoreApplicationStreamPreviews; import com.discord.stores.StoreVoiceParticipants; +import com.discord.utilities.color.ColorCompat; import com.discord.utilities.colors.RepresentativeColorsKt; import com.discord.utilities.dimen.DimenUtils; import com.discord.utilities.icon.IconUtils; @@ -59,6 +61,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple onEmbeddedActivityClicked; private Function1 onEventClicked; private Function1 onInviteFriendsClicked; @@ -595,11 +598,13 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple { private final VoiceUserListItemEmbeddedActivityBinding binding; private final MGImages.DistinctChangeDetector distinctChangeDetector; + private final boolean isCallPreview; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ViewHolderEmbeddedActivity(CallParticipantsAdapter callParticipantsAdapter) { + public ViewHolderEmbeddedActivity(CallParticipantsAdapter callParticipantsAdapter, boolean z2) { super((int) R.layout.voice_user_list_item_embedded_activity, callParticipantsAdapter); m.checkNotNullParameter(callParticipantsAdapter, "adapter"); + this.isCallPreview = z2; View view = this.itemView; int i = R.id.app_icon; SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.app_icon); @@ -635,6 +640,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple { private final VoiceUserListItemEventBinding binding; + private final boolean isCallPreview; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ViewHolderEvent(CallParticipantsAdapter callParticipantsAdapter) { + public ViewHolderEvent(CallParticipantsAdapter callParticipantsAdapter, boolean z2) { super((int) R.layout.voice_user_list_item_event, callParticipantsAdapter); m.checkNotNullParameter(callParticipantsAdapter, "adapter"); + this.isCallPreview = z2; View view = this.itemView; GuildScheduledEventItemView guildScheduledEventItemView = (GuildScheduledEventItemView) view.findViewById(R.id.event_card); if (guildScheduledEventItemView != null) { @@ -697,7 +709,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple { + private final VoiceUserListItemInviteBinding binding; + private final boolean isCallPreview; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ViewHolderInvite(CallParticipantsAdapter callParticipantsAdapter) { + public ViewHolderInvite(CallParticipantsAdapter callParticipantsAdapter, boolean z2) { super((int) R.layout.voice_user_list_item_invite, callParticipantsAdapter); m.checkNotNullParameter(callParticipantsAdapter, "adapter"); + this.isCallPreview = z2; + View view = this.itemView; + Objects.requireNonNull(view, "rootView"); + VoiceUserListItemInviteBinding voiceUserListItemInviteBinding = new VoiceUserListItemInviteBinding((LinearLayout) view); + m.checkNotNullExpressionValue(voiceUserListItemInviteBinding, "VoiceUserListItemInviteBinding.bind(itemView)"); + this.binding = voiceUserListItemInviteBinding; } public static final /* synthetic */ CallParticipantsAdapter access$getAdapter$p(ViewHolderInvite viewHolderInvite) { @@ -750,6 +771,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple { private final VoiceUserListItemUserBinding binding; + private final boolean isCallPreview; private final boolean quantizeUserAvatar; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ViewHolderUser(CallParticipantsAdapter callParticipantsAdapter, boolean z2) { + public ViewHolderUser(CallParticipantsAdapter callParticipantsAdapter, boolean z2, boolean z3) { super((int) R.layout.voice_user_list_item_user, callParticipantsAdapter); m.checkNotNullParameter(callParticipantsAdapter, "adapter"); - this.quantizeUserAvatar = z2; + this.isCallPreview = z2; + this.quantizeUserAvatar = z3; View view = this.itemView; int i = R.id.voice_user_list_item_deafen_indicator; ImageView imageView = (ImageView) view.findViewById(R.id.voice_user_list_item_deafen_indicator); @@ -824,6 +852,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple getOnEmbeddedActivityClicked() { @@ -982,7 +1016,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple + + + + + diff --git a/app/src/main/res/drawable/bg_guild_scheduled_event_list_item_dark.xml b/app/src/main/res/drawable/bg_guild_scheduled_event_list_item_dark.xml new file mode 100644 index 0000000000..f5de5cce74 --- /dev/null +++ b/app/src/main/res/drawable/bg_guild_scheduled_event_list_item_dark.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/layout-v22/voice_user_list_item_embedded_activity.xml b/app/src/main/res/layout-v22/voice_user_list_item_embedded_activity.xml index c1d911500b..4ab9a37e60 100644 --- a/app/src/main/res/layout-v22/voice_user_list_item_embedded_activity.xml +++ b/app/src/main/res/layout-v22/voice_user_list_item_embedded_activity.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout-v22/widget_call_fullscreen.xml b/app/src/main/res/layout-v22/widget_call_fullscreen.xml index 5dbee59958..1b36d544d2 100644 --- a/app/src/main/res/layout-v22/widget_call_fullscreen.xml +++ b/app/src/main/res/layout-v22/widget_call_fullscreen.xml @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/app/src/main/res/layout-v22/widget_disable_guild_communication.xml b/app/src/main/res/layout-v22/widget_disable_guild_communication.xml index 5c1a95c1e6..7684e73ef8 100644 --- a/app/src/main/res/layout-v22/widget_disable_guild_communication.xml +++ b/app/src/main/res/layout-v22/widget_disable_guild_communication.xml @@ -20,11 +20,10 @@ - - - + + + - diff --git a/app/src/main/res/layout/voice_user_list_item_embedded_activity.xml b/app/src/main/res/layout/voice_user_list_item_embedded_activity.xml index f725c932bf..6d39f5298b 100644 --- a/app/src/main/res/layout/voice_user_list_item_embedded_activity.xml +++ b/app/src/main/res/layout/voice_user_list_item_embedded_activity.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/voice_user_list_item_invite.xml b/app/src/main/res/layout/voice_user_list_item_invite.xml index 865fbf3c4f..c931bdd47f 100644 --- a/app/src/main/res/layout/voice_user_list_item_invite.xml +++ b/app/src/main/res/layout/voice_user_list_item_invite.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/voice_user_list_item_user.xml b/app/src/main/res/layout/voice_user_list_item_user.xml index 85f84949cf..eb93d98dcd 100644 --- a/app/src/main/res/layout/voice_user_list_item_user.xml +++ b/app/src/main/res/layout/voice_user_list_item_user.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/widget_call_fullscreen.xml b/app/src/main/res/layout/widget_call_fullscreen.xml index 43a786699e..de7ee36cc4 100644 --- a/app/src/main/res/layout/widget_call_fullscreen.xml +++ b/app/src/main/res/layout/widget_call_fullscreen.xml @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/app/src/main/res/layout/widget_call_preview_fullscreen.xml b/app/src/main/res/layout/widget_call_preview_fullscreen.xml index 44ecd4493a..ed8d2b5ed7 100644 --- a/app/src/main/res/layout/widget_call_preview_fullscreen.xml +++ b/app/src/main/res/layout/widget_call_preview_fullscreen.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/widget_disable_guild_communication.xml b/app/src/main/res/layout/widget_disable_guild_communication.xml index 25c41fc308..68a6cf55a0 100644 --- a/app/src/main/res/layout/widget_disable_guild_communication.xml +++ b/app/src/main/res/layout/widget_disable_guild_communication.xml @@ -20,11 +20,10 @@ - - - + + + - diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 0fa464a14e..7797d3bc1c 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -104,7 +104,7 @@ ‏‮More‬‏ ‏‮Active‬‏ ‏‮Threads‬‏ ‏‮See‬‏ ‏‮All‬‏ ‏‮Learn‬‏ ‏‮more‬‏ ‏‮here‬‏ - ‏‮In‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮few‬‏ ‏‮weeks‬‏ ‏‮Activities‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮temporarily‬‏ ‏‮unavailable‬‏ ‏‮as‬‏ ‏‮we‬‏ ‏‮make‬‏ ‏‮some‬‏ ‏‮improvements.‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮patience!‬‏ + ‏‮In‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮few‬‏ ‏‮weeks,‬‏ ‏‮Activities‬‏ ‏‮will‬‏ ‏‮become‬‏ ‏‮unavailable‬‏ ‏‮as‬‏ ‏‮we‬‏ ‏‮make‬‏ ‏‮some‬‏ ‏‮improvements.‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮patience!‬‏ ‏‮Hang‬‏ ‏‮tight,‬‏ ‏‮Activities‬‏ ‏‮fans‬‏ ‏‮Activity‬‏ ‏‮Yes,‬‏ ‏‮count‬‏ ‏‮me‬‏ ‏‮in!‬‏ @@ -3269,7 +3269,8 @@ ‏‮Timed‬‏ ‏‮Out‬‏ ‏‮You‬‏ ‏‮received‬‏ ‏‮a‬‏ ‏‮timeout‬‏ ‏‮in‬‏ ‏‮{guildName}‬‏‏‮.‬‏ ‏‮REASON‬‏ - ‏‮Enter‬‏ ‏‮a‬‏ ‏‮reason.‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮only‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮to‬‏ ‏‮other‬‏ ‏‮mods‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Audit‬‏ ‏‮log.‬‏ + ‏‮Enter‬‏ ‏‮a‬‏ ‏‮reason.‬‏ + ‏‮Enter‬‏ ‏‮a‬‏ ‏‮reason.‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮only‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Audit‬‏ ‏‮Log‬‏ ‏‮and‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮shown‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮member.‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Timed‬‏ ‏‮Out‬‏ ‏‮You’ll‬‏ ‏‮need‬‏ ‏‮a‬‏ ‏‮few‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮the‬‏ ‏‮most‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮See‬‏ ‏‮more‬‏ ‏‮friends‬‏ @@ -3786,6 +3787,7 @@ ‏‮Enable‬‏ ‏‮2FA‬‏ ‏‮Requirement‬‏ ‏‮Only‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮owner‬‏ ‏‮is‬‏ ‏‮allowed‬‏ ‏‮to‬‏ ‏‮do‬‏ ‏‮this‬‏ ‏‮Select‬‏ ‏‮a‬‏ ‏‮Server‬‏ + ‏‮Update‬‏ ‏‮Command‬‏ ‏‮Permissions‬‏ ‏‮Add‬‏ ‏‮Bot‬‏ ‏‮Create‬‏ ‏‮Channel‬‏ ‏‮Delete‬‏ ‏‮Channel‬‏ @@ -5893,8 +5895,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‬‏ @@ -6573,6 +6575,7 @@ ‏‮Remove‬‏ ‏‮From‬‏ ‏‮Top‬‏ ‏‮Return‬‏ ‏‮to‬‏ ‏‮App‬‏ ‏‮Stay‬‏ ‏‮On‬‏ ‏‮Top‬‏ + ‏‮Posted‬‏ ‏‮{time}‬‏ ‏‮\"‬‏%1$s‏‮\"‬‏ ‏‮copied‬‏ ‏‮to‬‏ ‏‮clipboard.‬‏ ‏‮Nitro‬‏ ‏‮They‬‏ ‏‮grow‬‏ ‏‮up‬‏ ‏‮so‬‏ ‏‮fast‬‏ ‏‮:\')‬‏ ‏‮and‬‏ ‏‮we‬‏ ‏‮couldn\'t‬‏ ‏‮have‬‏ ‏‮done‬‏ ‏‮it‬‏ ‏‮without‬‏ ‏‮subscribers‬‏ ‏‮like‬‏ ‏‮you.‬‏ ‏‮Watch‬‏ ‏‮out‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮Nitro‬‏ ‏‮goodies‬‏ ‏‮this‬‏ ‏‮year,‬‏ ‏‮and‬‏ ‏‮thanks‬‏ ‏‮for‬‏ ‏‮being‬‏ ‏‮awesome.‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 6b29925158..bd11825ec0 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -104,7 +104,7 @@ [Ḿöŕé ÅçţîVé Ţĥŕéåðš one two three] [Šéé Åļļ one two] [Ļéåŕñ ḿöŕé ĥéŕé one two three] - [Îñ ţĥé ñéхţ ƒéŵ ŵééķš ÅçţîVîţîéš ŵîļļ ɓé ţéḿþöŕåŕîļý ûñåVåîļåɓļé åš ŵé ḿåķé šöḿé îḿþŕöVéḿéñţš. Ţĥåñķš ƒöŕ ýöûŕ þåţîéñçé¡ one two three four five six seven eight nine ten eleven twelve] + [Îñ ţĥé ñéхţ ƒéŵ ŵééķš, ÅçţîVîţîéš ŵîļļ ɓéçöḿé ûñåVåîļåɓļé åš ŵé ḿåķé šöḿé îḿþŕöVéḿéñţš. Ţĥåñķš ƒöŕ ýöûŕ þåţîéñçé¡ one two three four five six seven eight nine ten eleven twelve] [Ĥåñĝ ţîĝĥţ, ÅçţîVîţîéš ƒåñš one two three four] [ÅçţîVîţý one two] [Ýéš, çöûñţ ḿé îñ¡ one two three] @@ -3269,7 +3269,8 @@ [Ţîḿéð Öûţ one two] [Ýöû ŕéçéîVéð å ţîḿéöûţ îñ »{guildName}«. one two three four] [ŔÉÅŠÖÑ one two] - [Éñţéŕ å ŕéåšöñ. Ţĥîš ŵîļļ öñļý ɓé Vîšîɓļé ţö öţĥéŕ ḿöðš îñ ţĥé Åûðîţ ļöĝ. one two three four five six seven eight] + [Éñţéŕ å ŕéåšöñ. one two three] + [Éñţéŕ å ŕéåšöñ. Ţĥîš ŵîļļ öñļý ɓé Vîšîɓļé îñ ţĥé Åûðîţ Ļöĝ åñð ŵîļļ ñöţ šĥöŵñ ţö ţĥé ḿéḿɓéŕ. one two three four five six seven eight nine ten] [¡¡»{user}«¡¡ Ţîḿéð Öûţ one two three] [Ýöû’ļļ ñééð å ƒéŵ ƒŕîéñðš ţö ĝéţ ţĥé ḿöšţ öûţ öƒ ýöûŕ šéŕVéŕ. one two three four five six seven] [Šéé ḿöŕé ƒŕîéñðš one two three] @@ -3786,6 +3787,7 @@ [Éñåɓļé 2FÅ ŔéQûîŕéḿéñţ one two three] [Öñļý ţĥé šéŕVéŕ öŵñéŕ îš åļļöŵéð ţö ðö ţĥîš one two three four five] [Šéļéçţ å ŠéŕVéŕ one two three] + [Ûþðåţé Çöḿḿåñð Þéŕḿîššîöñš one two three four] [Åðð βöţ one two] [Çŕéåţé Çĥåññéļ one two three] [Ðéļéţé Çĥåññéļ one two three] @@ -5893,8 +5895,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] @@ -6573,6 +6575,7 @@ [ŔéḿöVé Fŕöḿ Ţöþ one two three] [Ŕéţûŕñ ţö Åþþ one two] [Šţåý Öñ Ţöþ one two] + [Þöšţéð »{time}« one two] [\"%1$s\" çöþîéð ţö çļîþɓöåŕð. one two three] [Ñîţŕö one] [Ţĥéý ĝŕöŵ ûþ šö ƒåšţ :\') åñð ŵé çöûļðñ\'ţ ĥåVé ðöñé îţ ŵîţĥöûţ šûɓšçŕîɓéŕš ļîķé ýöû. Ŵåţçĥ öûţ ƒöŕ ḿöŕé Ñîţŕö ĝööðîéš ţĥîš ýéåŕ, åñð ţĥåñķš ƒöŕ ɓéîñĝ åŵéšöḿé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight] diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index b30990aecd..a468500513 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -968,6 +968,10 @@ + + + + diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 4d3f8cf4f8..31cc2749d4 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -531,1407 +531,1409 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3648,1535 +3650,1537 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17906,6409 +17910,6412 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 231f414268..54e6184075 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -104,7 +104,7 @@ More Active Threads See All Learn more here - In the next few weeks Activities will be temporarily unavailable as we make some improvements. Thanks for your patience! + In the next few weeks, Activities will become unavailable as we make some improvements. Thanks for your patience! Hang tight, Activities fans Activity Yes, count me in! @@ -1451,7 +1451,7 @@ Custom Presets Use Default - c11fef90b73544f1b93b473189780048 + ff1965ba055f432b843f088433358584 Slash command application {applicationName} {applicationName} application {applicationName} application selected @@ -3285,7 +3285,8 @@ Timed Out You received a timeout in {guildName}. REASON - Enter a reason. This will only be visible to other mods in the Audit log. + Enter a reason. + Enter a reason. This will only be visible in the Audit Log and will not shown to the member. !!{user}!! Timed Out You’ll need a few friends to get the most out of your server. See more friends @@ -3802,6 +3803,7 @@ Enable 2FA Requirement Only the server owner is allowed to do this Select a Server + Update Command Permissions Add Bot Create Channel Delete Channel @@ -5912,8 +5914,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 @@ -6599,6 +6601,7 @@ Remove From Top Return to App Stay On Top + Posted {time} \"%1$s\" copied to clipboard. Nitro They grow up so fast :\') and we couldn\'t have done it without subscribers like you. Watch out for more Nitro goodies this year, and thanks for being awesome. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index aadde2c865..b92d4d6668 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -168,6 +168,8 @@ @color/status_grey_700 @color/primary_dark_700 #00000000 + @color/primary_dark_700 + @color/primary_dark_660 @color/status_red_500 @color/white @color/status_green_600 @@ -242,6 +244,8 @@ @color/black_100 #4d4f545c #00000000 + @color/primary_light_200 + @color/primary_light_160 @color/status_red_500 @color/white @color/status_green_600