Juby210
/
discord-jadx
1
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

112.0 - Alpha (112200)

This commit is contained in:
Juby210 2022-01-17 16:24:26 +00:00
parent cb221b7463
commit e2d99ead53
69 changed files with 10276 additions and 9579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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"
}

2
app/src/main/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="111203" android:versionName="111.3 - Alpha" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="112200" android:versionName="112.0 - Alpha" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>

2
app/src/main/java/b/a/a/d/a.java
View File

@ -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);

14
app/src/main/java/com/discord/api/guildjoinrequest/ApplicationStatusTypeAdapter.java
View File

@ -9,6 +9,15 @@ import java.util.Objects;
/* compiled from: ApplicationStatus.kt */
public final class ApplicationStatusTypeAdapter extends TypeAdapter<ApplicationStatus> {
/* 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<ApplicationS
return ApplicationStatus.STARTED;
}
break;
case -1159694117:
break;
case 35394935:
if (J.equals("PENDING")) {
return ApplicationStatus.PENDING;
}
break;
case 174130302:
if (J.equals("REJECTED")) {

20
app/src/main/java/com/discord/databinding/VoiceUserListItemInviteBinding.java Normal file
View File

@ -0,0 +1,20 @@
package com.discord.databinding;
import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.viewbinding.ViewBinding;
public final class VoiceUserListItemInviteBinding implements ViewBinding {
@NonNull
public final LinearLayout a;
public VoiceUserListItemInviteBinding(@NonNull LinearLayout linearLayout) {
this.a = linearLayout;
}
@Override // androidx.viewbinding.ViewBinding
@NonNull
public View getRoot() {
return this.a;
}
}

8
app/src/main/java/com/discord/restapi/RestAPIParams.java
View File

@ -4353,24 +4353,28 @@ public final class RestAPIParams {
/* compiled from: RestAPIParams.kt */
public static final class UserRelationship {
private final String captchaKey;
private final String friendToken;
private final Integer type;
/* compiled from: RestAPIParams.kt */
public static final class Add {
private final String captchaKey;
private final int discriminator;
private final String username;
public Add(String str, int i) {
public Add(String str, int i, String str2) {
m.checkNotNullParameter(str, "username");
this.username = str;
this.discriminator = i;
this.captchaKey = str2;
}
}
public UserRelationship(Integer num, String str) {
public UserRelationship(Integer num, String str, String str2) {
this.type = num;
this.friendToken = str;
this.captchaKey = str2;
}
}

12
app/src/main/java/com/discord/utilities/rest/RestAPI.java
View File

@ -432,8 +432,8 @@ public final class RestAPI implements RestAPIInterface {
apiSpotify = restAPI;
}
public static /* synthetic */ Observable addRelationship$default(RestAPI restAPI, String str, long j, Integer num, String str2, int i, Object obj) {
return restAPI.addRelationship(str, j, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : str2);
public static /* synthetic */ Observable addRelationship$default(RestAPI restAPI, String str, long j, Integer num, String str2, String str3, int i, Object obj) {
return restAPI.addRelationship(str, j, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : str2, (i & 16) != 0 ? null : str3);
}
public static final Interceptor buildAnalyticsInterceptor() {
@ -594,9 +594,9 @@ public final class RestAPI implements RestAPIInterface {
return this._api.addRelationship(j, userRelationship, str);
}
public final Observable<Void> addRelationship(String str, long j, Integer num, String str2) {
public final Observable<Void> 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<Void> sendRelationshipRequest(String str, String str2, int i) {
public final Observable<Void> 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<Void> setConsent(boolean z2, String str) {

60
app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendSuggestion$2.java Normal file
View File

@ -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<Error, Unit> {
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<Unit> {
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);
}
}

113
app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
View File

@ -110,6 +110,97 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
/* 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<ViewState> {
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<ViewState> {
return friendsListViewModel.asyncComputeAndHandleOnUiThread(function0, function1, function12);
}
private final void emitCaptchaErrorEvent(Error error, String str, int i) {
PublishSubject<Event> publishSubject = this.eventSubject;
publishSubject.k.onNext(new Event.CaptchaError(error, str, i));
}
private final void emitLaunchVoiceCallEvent(long j) {
PublishSubject<Event> publishSubject = this.eventSubject;
publishSubject.k.onNext(new Event.LaunchVoiceCall(j));
@ -1608,12 +1715,12 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
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

29
app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$captchaLauncher$1.java Normal file
View File

@ -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<String, Unit> {
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);
}
}

2
app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1.java
View File

@ -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);
}
}

2
app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.java
View File

@ -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);
}
}

16
app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java
View File

@ -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<T> 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))));

40
app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
View File

@ -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<Intent> 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) {

25
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$appViewModels$$inlined$viewModels$1.java Normal file
View File

@ -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<ViewModelStore> {
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;
}
}

33
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$captchaLauncher$1.java Normal file
View File

@ -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<String, Unit> {
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);
}
}
}

2
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.java
View File

@ -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);
}
}

18
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java
View File

@ -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<Void, Unit> {
public final class WidgetFriendsFindNearby$sendFriendRequest$1<T> implements Action1<Void> {
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);

24
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java
View File

@ -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<T> 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<Unit> {
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<T> 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);
}
}

20
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$viewModel$2.java Normal file
View File

@ -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<AppViewModel<Unit>> {
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<Unit> mo1invoke() {
return new WidgetFriendsFindNearbyViewModel();
}
}

54
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
View File

@ -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<Intent> 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() {

29
app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearbyViewModel.java Normal file
View File

@ -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<Unit> {
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;
}
}

34
app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$handleCaptchaError$1.java Normal file
View File

@ -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<AppFragment, String, Unit> {
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, "<anonymous parameter 0>");
m.checkNotNullParameter(str, "captchaToken");
WidgetFriendsList.access$getViewModel$p(this.this$0).acceptFriendSuggestion(this.$event.getUsername(), this.$event.getDiscriminator(), str);
}
}

2
app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$10.java
View File

@ -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);
}
}

8
app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
View File

@ -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();
}

25
app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$$inlined$apply$lambda$1.java Normal file
View File

@ -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);
}
}

8
app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java
View File

@ -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));
}
}
}

2
app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java
View File

@ -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;

4
app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java
View File

@ -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;

2
app/src/main/java/com/discord/widgets/home/WidgetHome.java
View File

@ -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;
}

2
app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
View File

@ -1838,7 +1838,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
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);
}
}
}

2
app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
View File

@ -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);

4
app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
View File

@ -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) {

42
app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
View File

@ -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<Error, Unit> {
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<AppFragment, String, Unit> {
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, "<anonymous parameter 0>");
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 */

11
app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
View File

@ -1829,6 +1829,13 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
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<ViewState> {
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() {

3
app/src/main/java/com/discord/widgets/voice/VoiceUtils$handleCallChannel$1.java
View File

@ -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);
}

22
app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.java
View File

@ -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<View, Unit> {
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);
}
}

19
app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
View File

@ -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<Void, Unit> {
public final class WidgetCallFailed$sendFriendRequest$1<T> implements Action1<Void> {
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();
}
}

61
app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.java
View File

@ -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<T> implements Action1<Error> {
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<Unit> {
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<AppFragment, String, Unit> {
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, "<anonymous parameter 0>");
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);
}
}

19
app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
View File

@ -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

3
app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
View File

@ -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;

7
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureActionBar$1.java
View File

@ -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());
}
}

2
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1.java
View File

@ -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();

7
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.java
View File

@ -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<Unit> {
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);
}
}

7
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java
View File

@ -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<Unit> {
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);
}
}

11
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
View File

@ -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<Unit> {
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);
}
}

147
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
View File

@ -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();
}

2
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen$configureActionBar$1.java
View File

@ -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);
}
}

43
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen.java
View File

@ -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");

3
app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
View File

@ -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();

62
app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
View File

@ -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<MGRec
private static final int VIEW_TYPE_INVITE = 4;
private static final int VIEW_TYPE_SPECTATORS_HEADER = 2;
private static final int VIEW_TYPE_VOICE_USER = 0;
private final boolean isCallPreview;
private Function0<Unit> onEmbeddedActivityClicked;
private Function1<? super GuildScheduledEvent, Unit> onEventClicked;
private Function1<? super View, Unit> onInviteFriendsClicked;
@ -595,11 +598,13 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
public static final class ViewHolderEmbeddedActivity extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
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<MGRec
super.onConfigure(i, (int) mGRecyclerDataPayload);
ListItem.EmbeddedActivityItem embeddedActivityItem = (ListItem.EmbeddedActivityItem) mGRecyclerDataPayload;
Application application = embeddedActivityItem.getApplication();
if (!this.isCallPreview) {
FrameLayout frameLayout = this.binding.a;
m.checkNotNullExpressionValue(frameLayout, "binding.root");
this.binding.a.setBackgroundColor(ColorCompat.getThemedColor(frameLayout.getContext(), (int) R.attr.colorBackgroundPrimary));
}
TextView textView = this.binding.c;
m.checkNotNullExpressionValue(textView, "binding.appName");
textView.setText(application.getName());
@ -672,11 +682,13 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
/* compiled from: CallParticipantsAdapter.kt */
public static final class ViewHolderEvent extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
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<MGRec
super.onConfigure(i, (int) mGRecyclerDataPayload);
if (mGRecyclerDataPayload instanceof ListItem.Event) {
ListItem.Event event = (ListItem.Event) mGRecyclerDataPayload;
this.binding.f2196b.configureInVoiceChannel(event.getEvent(), null, event.getCanStartEvent() && event.isCurrentUserInCall(), event.isCurrentUserInCall(), event.isCurrentUserInCall(), new CallParticipantsAdapter$ViewHolderEvent$onConfigure$1(this, mGRecyclerDataPayload), new CallParticipantsAdapter$ViewHolderEvent$onConfigure$2(this, mGRecyclerDataPayload));
this.binding.f2196b.configureInVoiceChannel(event.getEvent(), null, event.getCanStartEvent() && event.isCurrentUserInCall(), event.isCurrentUserInCall(), event.isCurrentUserInCall(), this.isCallPreview, new CallParticipantsAdapter$ViewHolderEvent$onConfigure$1(this, mGRecyclerDataPayload), new CallParticipantsAdapter$ViewHolderEvent$onConfigure$2(this, mGRecyclerDataPayload));
}
}
}
@ -735,10 +747,19 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
/* compiled from: CallParticipantsAdapter.kt */
public static final class ViewHolderInvite extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
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<MGRec
super.onConfigure(i, (int) mGRecyclerDataPayload);
if (mGRecyclerDataPayload instanceof ListItem.Invite) {
this.itemView.setOnClickListener(new CallParticipantsAdapter$ViewHolderInvite$onConfigure$1(this));
if (!this.isCallPreview) {
LinearLayout linearLayout = this.binding.a;
m.checkNotNullExpressionValue(linearLayout, "binding.root");
this.binding.a.setBackgroundColor(ColorCompat.getThemedColor(linearLayout.getContext(), (int) R.attr.colorBackgroundPrimary));
}
}
}
}
@ -757,13 +783,15 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
/* compiled from: CallParticipantsAdapter.kt */
public static final class ViewHolderUser extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
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<MGRec
if (this.quantizeUserAvatar) {
this.binding.g.setOnBitmapLoadedListener(new CallParticipantsAdapter$ViewHolderUser$onConfigure$1(colorId));
}
if (!this.isCallPreview) {
LinearLayout linearLayout = this.binding.a;
m.checkNotNullExpressionValue(linearLayout, "binding.root");
this.binding.a.setBackgroundColor(ColorCompat.getThemedColor(linearLayout.getContext(), (int) R.attr.colorBackgroundPrimary));
}
this.binding.g.a(participant, R.dimen.avatar_size_standard);
TextView textView = this.binding.h;
m.checkNotNullExpressionValue(textView, "binding.voiceUserListItemUserName");
@ -925,10 +958,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
}
/* JADX INFO: super call moved to the top of the method (can break code semantics) */
public CallParticipantsAdapter(RecyclerView recyclerView, boolean z2) {
public CallParticipantsAdapter(RecyclerView recyclerView, boolean z2, boolean z3) {
super(recyclerView, false, 2, null);
m.checkNotNullParameter(recyclerView, "recycler");
this.quantizeUserAvatars = z2;
this.isCallPreview = z2;
this.quantizeUserAvatars = z3;
this.onVoiceUserClicked = CallParticipantsAdapter$onVoiceUserClicked$1.INSTANCE;
this.onStreamPreviewClicked = CallParticipantsAdapter$onStreamPreviewClicked$1.INSTANCE;
this.onToggleRingingClicked = CallParticipantsAdapter$onToggleRingingClicked$1.INSTANCE;
@ -939,8 +973,8 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
}
/* JADX INFO: this call moved to the top of the method (can break code semantics) */
public /* synthetic */ CallParticipantsAdapter(RecyclerView recyclerView, boolean z2, int i, DefaultConstructorMarker defaultConstructorMarker) {
this(recyclerView, (i & 2) != 0 ? false : z2);
public /* synthetic */ CallParticipantsAdapter(RecyclerView recyclerView, boolean z2, boolean z3, int i, DefaultConstructorMarker defaultConstructorMarker) {
this(recyclerView, (i & 2) != 0 ? false : z2, (i & 4) != 0 ? false : z3);
}
public final Function0<Unit> getOnEmbeddedActivityClicked() {
@ -982,7 +1016,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
m.checkNotNullParameter(viewGroup, "parent");
switch (i) {
case 0:
return new ViewHolderUser(this, this.quantizeUserAvatars);
return new ViewHolderUser(this, this.isCallPreview, this.quantizeUserAvatars);
case 1:
return new ViewHolderHeader(this);
case 2:
@ -990,11 +1024,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
case 3:
return new ViewHolderDivider(this);
case 4:
return new ViewHolderInvite(this);
return new ViewHolderInvite(this, this.isCallPreview);
case 5:
return new ViewHolderEvent(this);
return new ViewHolderEvent(this, this.isCallPreview);
case 6:
return new ViewHolderEmbeddedActivity(this);
return new ViewHolderEmbeddedActivity(this, this.isCallPreview);
default:
throw invalidViewTypeException(i);
}

2
app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
View File

@ -906,7 +906,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
RecyclerView recyclerView = getBinding().h;
d0.z.d.m.checkNotNullExpressionValue(recyclerView, "binding.voiceBottomSheetRecycler");
CallParticipantsAdapter callParticipantsAdapter = (CallParticipantsAdapter) companion.configure(new CallParticipantsAdapter(recyclerView, true));
CallParticipantsAdapter callParticipantsAdapter = (CallParticipantsAdapter) companion.configure(new CallParticipantsAdapter(recyclerView, false, true, 2, null));
this.participantsAdapter = callParticipantsAdapter;
if (callParticipantsAdapter == null) {
d0.z.d.m.throwUninitializedPropertyAccessException("participantsAdapter");

6
app/src/main/res/drawable/bg_guild_scheduled_event_list_item_connected_dark.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/primary_dark_800"/>
<stroke android:width="1dp" android:color="@color/status_green_600"/>
<corners android:radius="8dp"/>
</shape>

6
app/src/main/res/drawable/bg_guild_scheduled_event_list_item_dark.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/primary_dark_800"/>
<stroke android:width="1dp" android:color="?attr/colorBackgroundModifierAccent"/>
<corners android:radius="8dp"/>
</shape>

2
app/src/main/res/layout-v22/voice_user_list_item_embedded_activity.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/primary_dark_800" android:layout_width="match_parent" android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/clickable_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" android:paddingVertical="8dp">
<com.facebook.drawee.view.SimpleDraweeView android:id="@+id/app_icon" android:background="@drawable/ic_activity_24dp" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="4dp" android:scaleType="center" android:backgroundTint="?attr/colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:roundedCornerRadius="4dp"/>
<TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/app_name" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/participant_avatars" app:layout_constraintStart_toEndOf="@+id/app_icon" app:layout_constraintTop_toTopOf="@+id/app_icon" style="@style/UiKit_TextView"/>

4
app/src/main/res/layout-v22/widget_call_fullscreen.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:background="@color/primary_dark_800" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
<androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_global_status" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup"/>
<androidx.constraintlayout.widget.Barrier android:id="@+id/top_of_ui" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="widget_global_status"/>
<androidx.recyclerview.widget.RecyclerView android:id="@+id/call_video_recycler" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui"/>
@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/call_non_video_container" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
<include android:id="@+id/private_call" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" layout="@layout/widget_call_fullscreen_private_call"/>
<RelativeLayout android:id="@+id/action_bar_underlay" android:background="@drawable/drawable_black_underlay_gradient" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0">
<View android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"/>
<View android:layout_width="match_parent" android:layout_height="100dp"/>
</RelativeLayout>
<com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
<androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/AppTheme_Toolbar_Transparent">

7
app/src/main/res/layout-v22/widget_disable_guild_communication.xml
View File

@ -20,11 +20,10 @@
<View style="@style/UiKit_Divider"/>
<com.discord.views.CheckedSetting android:id="@+id/time_unit_1_week" android:layout_width="match_parent" android:layout_height="48dp" app:cs_padding_vertical="14dp" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
</LinearLayout>
<TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/disable_guild_communication_reason_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/disable_guild_communication_reason_header" android:textAllCaps="true" android:fontFamily="?attr/font_display_bold" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_options"/>
<com.google.android.material.textfield.TextInputLayout android:textColorHint="?attr/colorTextMuted" android:id="@+id/disable_guild_communication_reason" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:backgroundTint="?attr/colorBackgroundPrimary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxStrokeWidthFocused="0dp" app:errorTextAppearance="@style/UiKit_TextAppearance" app:hintTextColor="?attr/colorHeaderSecondary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_reason_header">
<com.google.android.material.textfield.TextInputEditText android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:scrollHorizontally="false" android:inputType="textMultiLine" android:layout_marginHorizontal="8dp" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
<TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/disable_guild_communication_reason_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/reason" android:textAllCaps="true" android:fontFamily="?attr/font_display_bold" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_options"/>
<com.google.android.material.textfield.TextInputLayout android:textColorHint="?attr/colorTextMuted" android:id="@+id/disable_guild_communication_reason" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:hint="@string/guild_communication_disabled_reason_hint_android" android:backgroundTint="?attr/colorBackgroundPrimary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxStrokeWidthFocused="0dp" app:errorTextAppearance="@style/UiKit_TextAppearance" app:hintTextAppearance="@style/UiKit_TextAppearance" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_reason_header">
<com.google.android.material.textfield.TextInputEditText android:layout_height="match_parent" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:scrollHorizontally="false" android:inputType="textMultiLine" android:layout_marginHorizontal="8dp" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
</com.google.android.material.textfield.TextInputLayout>
<TextView android:textSize="14sp" android:textColor="?attr/colorInteractiveNormal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/disable_guild_communication_footer" android:fontFamily="?attr/font_primary_normal" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_reason"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<com.google.android.material.button.MaterialButton android:id="@+id/disable_confirm" android:layout_margin="16dp" android:text="@string/timeout_submit" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>

2
app/src/main/res/layout/voice_user_list_item_embedded_activity.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/primary_dark_800" android:layout_width="match_parent" android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/clickable_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView android:id="@+id/app_icon" android:background="@drawable/ic_activity_24dp" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="4dp" android:scaleType="center" android:backgroundTint="?attr/colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:roundedCornerRadius="4dp"/>
<TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/app_name" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/participant_avatars" app:layout_constraintStart_toEndOf="@+id/app_icon" app:layout_constraintTop_toTopOf="@+id/app_icon" style="@style/UiKit_TextView"/>

2
app/src/main/res/layout/voice_user_list_item_invite.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="@color/primary_dark_800" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
<ImageView android:background="?attr/colorPrimaryCircle" android:padding="8dp" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="4dp" android:src="@drawable/ic_header_members_add_white_24dp" android:importantForAccessibility="no" android:backgroundTint="?attr/colorBackgroundTertiary" app:tint="?attr/colorInteractiveNormal"/>
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" android:singleLine="true" android:layout_weight="1" style="@style/UiKit_TextView"/>
</LinearLayout>

2
app/src/main/res/layout/voice_user_list_item_user.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/primary_dark_800" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
<LinearLayout android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
<com.discord.views.VoiceUserView android:id="@+id/voice_user_list_item_user_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" app:vuv_animate_avatar_when_ringing="false" app:vuv_avatar_size="32dp" app:vuv_fade_when_disconnected="false"/>
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/voice_user_list_item_user_name" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:singleLine="true" android:layout_weight="1" style="@style/UiKit_TextView"/>

4
app/src/main/res/layout/widget_call_fullscreen.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:background="@color/primary_dark_800" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
<androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_global_status" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup"/>
<androidx.constraintlayout.widget.Barrier android:id="@+id/top_of_ui" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="widget_global_status"/>
<androidx.recyclerview.widget.RecyclerView android:id="@+id/call_video_recycler" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui"/>
@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/call_non_video_container" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
<include android:id="@+id/private_call" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" layout="@layout/widget_call_fullscreen_private_call"/>
<RelativeLayout android:id="@+id/action_bar_underlay" android:background="@drawable/drawable_black_underlay_gradient" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0">
<View android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"/>
<View android:layout_width="match_parent" android:layout_height="100dp"/>
</RelativeLayout>
<com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
<androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/AppTheme_Toolbar_Transparent">

2
app/src/main/res/layout/widget_call_preview_fullscreen.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_fullscreen_parent" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/AppTheme_Dark" android:id="@+id/call_fullscreen_parent" android:background="@color/primary_dark_800" android:layout_width="match_parent" android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
<androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/AppTheme_Toolbar_Transparent"/>
</com.google.android.material.appbar.AppBarLayout>

7
app/src/main/res/layout/widget_disable_guild_communication.xml
View File

@ -20,11 +20,10 @@
<View style="@style/UiKit_Divider"/>
<com.discord.views.CheckedSetting android:id="@+id/time_unit_1_week" android:layout_width="match_parent" android:layout_height="48dp" app:cs_padding_vertical="14dp" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
</LinearLayout>
<TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/disable_guild_communication_reason_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/disable_guild_communication_reason_header" android:textAllCaps="true" android:fontFamily="?attr/font_display_bold" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_options"/>
<com.google.android.material.textfield.TextInputLayout android:textColorHint="?attr/colorTextMuted" android:id="@+id/disable_guild_communication_reason" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:backgroundTint="?attr/colorBackgroundPrimary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxStrokeWidthFocused="0dp" app:errorTextAppearance="@style/UiKit_TextAppearance" app:hintTextColor="?attr/colorHeaderSecondary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_reason_header">
<com.google.android.material.textfield.TextInputEditText android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:scrollHorizontally="false" android:inputType="textMultiLine" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
<TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/disable_guild_communication_reason_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/reason" android:textAllCaps="true" android:fontFamily="?attr/font_display_bold" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_options"/>
<com.google.android.material.textfield.TextInputLayout android:textColorHint="?attr/colorTextMuted" android:id="@+id/disable_guild_communication_reason" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:hint="@string/guild_communication_disabled_reason_hint_android" android:backgroundTint="?attr/colorBackgroundPrimary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxStrokeWidthFocused="0dp" app:errorTextAppearance="@style/UiKit_TextAppearance" app:hintTextAppearance="@style/UiKit_TextAppearance" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_reason_header">
<com.google.android.material.textfield.TextInputEditText android:layout_height="match_parent" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:scrollHorizontally="false" android:inputType="textMultiLine" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
</com.google.android.material.textfield.TextInputLayout>
<TextView android:textSize="14sp" android:textColor="?attr/colorInteractiveNormal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/disable_guild_communication_footer" android:fontFamily="?attr/font_primary_normal" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/disable_guild_communication_reason"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<com.google.android.material.button.MaterialButton android:id="@+id/disable_confirm" android:layout_margin="16dp" android:text="@string/timeout_submit" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>

11
app/src/main/res/values-ar-rXB/strings.xml
View File

@ -104,7 +104,7 @@
<string name="active_threads_popout_header">‏‮More‬‏ ‏‮Active‬‏ ‏‮Threads‬‏</string>
<string name="active_threads_popout_link">‏‮See‬‏ ‏‮All‬‏</string>
<string name="activities_experiment_sunset_anchor">‏‮Learn‬‏ ‏‮more‬‏ ‏‮here‬‏</string>
<string name="activities_experiment_sunset_body">‏‮In‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮few‬‏ ‏‮weeks‬‏ ‏‮Activities‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮temporarily‬‏ ‏‮unavailable‬‏ ‏‮as‬‏ ‏‮we‬‏ ‏‮make‬‏ ‏‮some‬‏ ‏‮improvements.‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮patience!‬‏</string>
<string name="activities_experiment_sunset_body">‏‮In‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮few‬‏ ‏‮weeks,‬‏ ‏‮Activities‬‏ ‏‮will‬‏ ‏‮become‬‏ ‏‮unavailable‬‏ ‏‮as‬‏ ‏‮we‬‏ ‏‮make‬‏ ‏‮some‬‏ ‏‮improvements.‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮patience!‬‏</string>
<string name="activities_experiment_sunset_header">‏‮Hang‬‏ ‏‮tight,‬‏ ‏‮Activities‬‏ ‏‮fans‬‏</string>
<string name="activity">‏‮Activity‬‏</string>
<string name="activity_feed_card_gdpr_button_yes">‏‮Yes,‬‏ ‏‮count‬‏ ‏‮me‬‏ ‏‮in!‬‏</string>
@ -3269,7 +3269,8 @@
<string name="guild_communication_disabled_popout_header">‏‮Timed‬‏ ‏‮Out‬‏</string>
<string name="guild_communication_disabled_popout_subheader">‏‮You‬‏ ‏‮received‬‏ ‏‮a‬‏ ‏‮timeout‬‏ ‏‮in‬‏ ‏‮{guildName}‬‏‏‮.‬‏</string>
<string name="guild_communication_disabled_reason">‏‮REASON‬‏</string>
<string name="guild_communication_disabled_reason_placeholder">‏‮Enter‬‏ ‏‮a‬‏ ‏‮reason.‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮only‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮to‬‏ ‏‮other‬‏ ‏‮mods‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Audit‬‏ ‏‮log.‬‏</string>
<string name="guild_communication_disabled_reason_hint_android">‏‮Enter‬‏ ‏‮a‬‏ ‏‮reason.‬‏</string>
<string name="guild_communication_disabled_reason_placeholder">‏‮Enter‬‏ ‏‮a‬‏ ‏‮reason.‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮only‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Audit‬‏ ‏‮Log‬‏ ‏‮and‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮shown‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮member.‬‏</string>
<string name="guild_communication_disabled_success">‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Timed‬‏ ‏‮Out‬‏</string>
<string name="guild_create_invite_description">‏‮You’ll‬‏ ‏‮need‬‏ ‏‮a‬‏ ‏‮few‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮the‬‏ ‏‮most‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮server.‬‏</string>
<string name="guild_create_invite_see_more_suggestions">‏‮See‬‏ ‏‮more‬‏ ‏‮friends‬‏</string>
@ -3786,6 +3787,7 @@
<string name="guild_security_req_mfa_turn_on">‏‮Enable‬‏ ‏‮2FA‬‏ ‏‮Requirement‬‏</string>
<string name="guild_security_req_owner_only">‏‮Only‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮owner‬‏ ‏‮is‬‏ ‏‮allowed‬‏ ‏‮to‬‏ ‏‮do‬‏ ‏‮this‬‏</string>
<string name="guild_select">‏‮Select‬‏ ‏‮a‬‏ ‏‮Server‬‏</string>
<string name="guild_settings_action_filter_application_command_permission_update">‏‮Update‬‏ ‏‮Command‬‏ ‏‮Permissions‬‏</string>
<string name="guild_settings_action_filter_bot_add">‏‮Add‬‏ ‏‮Bot‬‏</string>
<string name="guild_settings_action_filter_channel_create">‏‮Create‬‏ ‏‮Channel‬‏</string>
<string name="guild_settings_action_filter_channel_delete">‏‮Delete‬‏ ‏‮Channel‬‏</string>
@ -5893,8 +5895,8 @@
<string name="move_members_description">‏‮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.‬‏</string>
<string name="move_to">‏‮Move‬‏ ‏‮To‬‏</string>
<string name="move_to_success">‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏</string>
<string name="res_2131891992_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
<string name="res_2131891993_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
<string name="res_2131891994_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
<string name="res_2131891995_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
<string name="mtrl_badge_numberless_content_description">‏‮New‬‏ ‏‮notification‬‏</string>
<string name="mtrl_chip_close_icon_content_description">‏‮Remove‬‏ ‏‮%1$s‬‏</string>
<string name="mtrl_exceed_max_badge_number_content_description">‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏</string>
@ -6573,6 +6575,7 @@
<string name="popout_remove_from_top">‏‮Remove‬‏ ‏‮From‬‏ ‏‮Top‬‏</string>
<string name="popout_return">‏‮Return‬‏ ‏‮to‬‏ ‏‮App‬‏</string>
<string name="popout_stay_on_top">‏‮Stay‬‏ ‏‮On‬‏ ‏‮Top‬‏</string>
<string name="post_content_timestamp">‏‮Posted‬‏ ‏‮{time}‬‏</string>
<string name="preference_copied">‏‮\"‬‏%1$s‏‮\"‬‏ ‏‮copied‬‏ ‏‮to‬‏ ‏‮clipboard.‬‏</string>
<string name="premium">‏‮Nitro‬‏</string>
<string name="premium_5th_anniversary_body">‏‮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.‬‏</string>

11
app/src/main/res/values-en-rXA/strings.xml
View File

@ -104,7 +104,7 @@
<string name="active_threads_popout_header">[Ḿöŕé ÅçţîVé Ţĥŕéåðš one two three]</string>
<string name="active_threads_popout_link">[Šéé Åļļ one two]</string>
<string name="activities_experiment_sunset_anchor">[Ļéåŕñ ḿöŕé ĥéŕé one two three]</string>
<string name="activities_experiment_sunset_body">[Îñ ţĥé ñéхţ ƒéŵ ŵééķš ÅçţîVîţîéš ŵîļļ ɓé ţéḿþöŕåŕîļý ûñåVåîļåɓļé åš ŵé ḿåķé šöḿé îḿþŕöVéḿéñţš. Ţĥåñķš ƒöŕ ýöûŕ þåţîéñçé¡ one two three four five six seven eight nine ten eleven twelve]</string>
<string name="activities_experiment_sunset_body">[Îñ ţĥé ñéхţ ƒéŵ ŵééķš, ÅçţîVîţîéš ŵîļļ ɓéçöḿé ûñåVåîļåɓļé åš ŵé ḿåķé šöḿé îḿþŕöVéḿéñţš. Ţĥåñķš ƒöŕ ýöûŕ þåţîéñçé¡ one two three four five six seven eight nine ten eleven twelve]</string>
<string name="activities_experiment_sunset_header">[Ĥåñĝ ţîĝĥţ, ÅçţîVîţîéš ƒåñš one two three four]</string>
<string name="activity">[ÅçţîVîţý one two]</string>
<string name="activity_feed_card_gdpr_button_yes">[Ýéš, çöûñţ ḿé îñ¡ one two three]</string>
@ -3269,7 +3269,8 @@
<string name="guild_communication_disabled_popout_header">[Ţîḿéð Öûţ one two]</string>
<string name="guild_communication_disabled_popout_subheader">[Ýöû ŕéçéîVéð å ţîḿéöûţ îñ »{guildName}«. one two three four]</string>
<string name="guild_communication_disabled_reason">[ŔÉÅŠÖÑ one two]</string>
<string name="guild_communication_disabled_reason_placeholder">[Éñţéŕ å ŕéåšöñ. Ţĥîš ŵîļļ öñļý ɓé Vîšîɓļé ţö öţĥéŕ ḿöðš îñ ţĥé Åûðîţ ļöĝ. one two three four five six seven eight]</string>
<string name="guild_communication_disabled_reason_hint_android">[Éñţéŕ å ŕéåšöñ. one two three]</string>
<string name="guild_communication_disabled_reason_placeholder">[Éñţéŕ å ŕéåšöñ. Ţĥîš ŵîļļ öñļý ɓé Vîšîɓļé îñ ţĥé Åûðîţ Ļöĝ åñð ŵîļļ ñöţ šĥöŵñ ţö ţĥé ḿéḿɓéŕ. one two three four five six seven eight nine ten]</string>
<string name="guild_communication_disabled_success">[¡¡»{user}«¡¡ Ţîḿéð Öûţ one two three]</string>
<string name="guild_create_invite_description">[Ýöû’ļļ ñééð å ƒéŵ ƒŕîéñðš ţö ĝéţ ţĥé ḿöšţ öûţ öƒ ýöûŕ šéŕVéŕ. one two three four five six seven]</string>
<string name="guild_create_invite_see_more_suggestions">[Šéé ḿöŕé ƒŕîéñðš one two three]</string>
@ -3786,6 +3787,7 @@
<string name="guild_security_req_mfa_turn_on">[Éñåɓļé 2FÅ ŔéQûîŕéḿéñţ one two three]</string>
<string name="guild_security_req_owner_only">[Öñļý ţĥé šéŕVéŕ öŵñéŕ îš åļļöŵéð ţö ðö ţĥîš one two three four five]</string>
<string name="guild_select">[Šéļéçţ å ŠéŕVéŕ one two three]</string>
<string name="guild_settings_action_filter_application_command_permission_update">[Ûþðåţé Çöḿḿåñð Þéŕḿîššîöñš one two three four]</string>
<string name="guild_settings_action_filter_bot_add">[Åðð βöţ one two]</string>
<string name="guild_settings_action_filter_channel_create">[Çŕéåţé Çĥåññéļ one two three]</string>
<string name="guild_settings_action_filter_channel_delete">[Ðéļéţé Çĥåññéļ one two three]</string>
@ -5893,8 +5895,8 @@
<string name="move_members_description">[Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
<string name="move_to">[ḾöVé Ţö one two]</string>
<string name="move_to_success">[Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five]</string>
<string name="res_2131891992_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
<string name="res_2131891993_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
<string name="res_2131891994_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
<string name="res_2131891995_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
<string name="mtrl_badge_numberless_content_description">[Ñéŵ ñöţîƒîçåţîöñ one two three]</string>
<string name="mtrl_chip_close_icon_content_description">[ŔéḿöVé »%1$s« one two]</string>
<string name="mtrl_exceed_max_badge_number_content_description">[Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four]</string>
@ -6573,6 +6575,7 @@
<string name="popout_remove_from_top">[ŔéḿöVé Fŕöḿ Ţöþ one two three]</string>
<string name="popout_return">[Ŕéţûŕñ ţö Åþþ one two]</string>
<string name="popout_stay_on_top">[Šţåý Öñ Ţöþ one two]</string>
<string name="post_content_timestamp">[Þöšţéð »{time}« one two]</string>
<string name="preference_copied">[\"%1$s\" çöþîéð ţö çļîþɓöåŕð. one two three]</string>
<string name="premium">[Ñîţŕö one]</string>
<string name="premium_5th_anniversary_body">[Ţĥéý ĝŕöŵ ûþ šö ƒåšţ :\') åñð ŵé çöûļðñ\'ţ ĥå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]</string>

4
app/src/main/res/values/attrs.xml
View File

@ -968,6 +968,10 @@
</attr>
<attr name="colorSecondaryVariant" format="color">
</attr>
<attr name="colorSpoilerHiddenBackground" format="reference|color">
</attr>
<attr name="colorSpoilerRevealedBackground" format="reference|color">
</attr>
<attr name="colorStatusDangerBackground" format="reference|color">
</attr>
<attr name="colorStatusDangerText" format="reference|color">

18673
app/src/main/res/values/public.xml
View File

File diff suppressed because it is too large Load Diff

13
app/src/main/res/values/strings.xml
View File

@ -104,7 +104,7 @@
<string name="active_threads_popout_header">More Active Threads</string>
<string name="active_threads_popout_link">See All</string>
<string name="activities_experiment_sunset_anchor">Learn more here</string>
<string name="activities_experiment_sunset_body">In the next few weeks Activities will be temporarily unavailable as we make some improvements. Thanks for your patience!</string>
<string name="activities_experiment_sunset_body">In the next few weeks, Activities will become unavailable as we make some improvements. Thanks for your patience!</string>
<string name="activities_experiment_sunset_header">Hang tight, Activities fans</string>
<string name="activity">Activity</string>
<string name="activity_feed_card_gdpr_button_yes">Yes, count me in!</string>
@ -1451,7 +1451,7 @@
<string name="color_picker_custom">Custom</string>
<string name="color_picker_presets">Presets</string>
<string name="color_picker_use_default">Use Default</string>
<string name="res_2131887531_com_crashlytics_android_build_id">c11fef90b73544f1b93b473189780048</string>
<string name="res_2131887531_com_crashlytics_android_build_id">ff1965ba055f432b843f088433358584</string>
<string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
<string name="command_accessibility_desc_app_item">{applicationName} application</string>
<string name="command_accessibility_desc_app_item_selected">{applicationName} application selected</string>
@ -3285,7 +3285,8 @@
<string name="guild_communication_disabled_popout_header">Timed Out</string>
<string name="guild_communication_disabled_popout_subheader">You received a timeout in {guildName}.</string>
<string name="guild_communication_disabled_reason">REASON</string>
<string name="guild_communication_disabled_reason_placeholder">Enter a reason. This will only be visible to other mods in the Audit log.</string>
<string name="guild_communication_disabled_reason_hint_android">Enter a reason.</string>
<string name="guild_communication_disabled_reason_placeholder">Enter a reason. This will only be visible in the Audit Log and will not shown to the member.</string>
<string name="guild_communication_disabled_success">!!{user}!! Timed Out</string>
<string name="guild_create_invite_description">You’ll need a few friends to get the most out of your server.</string>
<string name="guild_create_invite_see_more_suggestions">See more friends</string>
@ -3802,6 +3803,7 @@
<string name="guild_security_req_mfa_turn_on">Enable 2FA Requirement</string>
<string name="guild_security_req_owner_only">Only the server owner is allowed to do this</string>
<string name="guild_select">Select a Server</string>
<string name="guild_settings_action_filter_application_command_permission_update">Update Command Permissions</string>
<string name="guild_settings_action_filter_bot_add">Add Bot</string>
<string name="guild_settings_action_filter_channel_create">Create Channel</string>
<string name="guild_settings_action_filter_channel_delete">Delete Channel</string>
@ -5912,8 +5914,8 @@
<string name="move_members_description">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.</string>
<string name="move_to">Move To</string>
<string name="move_to_success">User has been moved to the selected channel.</string>
<string name="res_2131891992_msg_alert_cleared">Alert Cleared</string>
<string name="res_2131891993_msg_no_alert_showing">No Alert Showing</string>
<string name="res_2131891994_msg_alert_cleared">Alert Cleared</string>
<string name="res_2131891995_msg_no_alert_showing">No Alert Showing</string>
<string name="mtrl_badge_numberless_content_description">New notification</string>
<string name="mtrl_chip_close_icon_content_description">Remove %1$s</string>
<string name="mtrl_exceed_max_badge_number_content_description">More than %1$d new notifications</string>
@ -6599,6 +6601,7 @@
<string name="popout_remove_from_top">Remove From Top</string>
<string name="popout_return">Return to App</string>
<string name="popout_stay_on_top">Stay On Top</string>
<string name="post_content_timestamp">Posted {time}</string>
<string name="preference_copied">\"%1$s\" copied to clipboard.</string>
<string name="premium">Nitro</string>
<string name="premium_5th_anniversary_body">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.</string>

4
app/src/main/res/values/styles.xml
View File

@ -168,6 +168,8 @@
<item name="colorScrollbarAutoTrack">@color/status_grey_700</item>
<item name="colorScrollbarThinThumb">@color/primary_dark_700</item>
<item name="colorScrollbarThinTrack">#00000000</item>
<item name="colorSpoilerHiddenBackground">@color/primary_dark_700</item>
<item name="colorSpoilerRevealedBackground">@color/primary_dark_660</item>
<item name="colorStatusDangerBackground">@color/status_red_500</item>
<item name="colorStatusDangerText">@color/white</item>
<item name="colorStatusPositiveBackground">@color/status_green_600</item>
@ -242,6 +244,8 @@
<item name="colorScrollbarAutoTrack">@color/black_100</item>
<item name="colorScrollbarThinThumb">#4d4f545c</item>
<item name="colorScrollbarThinTrack">#00000000</item>
<item name="colorSpoilerHiddenBackground">@color/primary_light_200</item>
<item name="colorSpoilerRevealedBackground">@color/primary_light_160</item>
<item name="colorStatusDangerBackground">@color/status_red_500</item>
<item name="colorStatusDangerText">@color/white</item>
<item name="colorStatusPositiveBackground">@color/status_green_600</item>