From 8e8c9e9c981909b0f7155c261606181c39a90fff Mon Sep 17 00:00:00 2001 From: Juby210 Date: Tue, 23 Nov 2021 08:18:28 +0100 Subject: [PATCH] 104.1 - Alpha (104201) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/c/i/e/r/a.java | 3 +- .../TrackMultiAccountAccountRemove.java | 18 + ...rackMultiAccountAccountRemoveReceiver.java | 6 + .../TrackMultiAccountSwitchAttempt.java | 18 + ...rackMultiAccountSwitchAttemptReceiver.java | 6 + .../TrackMultiAccountSwitchFailure.java | 15 + ...rackMultiAccountSwitchFailureReceiver.java | 6 + .../TrackMultiAccountSwitchSuccess.java | 49 + ...rackMultiAccountSwitchSuccessReceiver.java | 6 + ...TrackRoleSubscriptionListingDeletedV2.java | 51 + ...eSubscriptionListingDeletedV2Receiver.java | 6 + ...ackRoleSubscriptionListingPublishedV2.java | 51 + ...ubscriptionListingPublishedV2Receiver.java | 6 + ...TrackRoleSubscriptionListingUpdatedV2.java | 51 + ...eSubscriptionListingUpdatedV2Receiver.java | 6 + ...leSubscriptionListingUpsellPageViewed.java | 26 +- ...SubscriptionListingUpsellPageViewedV2.java | 78 + ...tionListingUpsellPageViewedV2Receiver.java | 6 + .../generated/events/TrackUserReauth.java | 37 + .../events/TrackUserReauthCheck.java | 37 + .../events/TrackUserReauthCheckReceiver.java | 6 + .../events/TrackUserReauthReceiver.java | 6 + ...ckImpressionMultiAccountSwitchLanding.java | 27 + ...sionMultiAccountSwitchLandingReceiver.java | 6 + .../TrackNetworkActionUserLogin.java | 34 +- .../com/discord/api/guild/GuildFeature.java | 1 + .../discord/api/premium/SubscriptionPlan.java | 12 +- .../databinding/WidgetUserSheetBinding.java | 154 +- .../stores/StoreAuthentication$login$1.java | 2 +- .../utilities/analytics/AnalyticsTracker.java | 8 +- .../experiments/ExperimentRegistry.java | 2 +- .../com/discord/utilities/icon/IconUtils.java | 47 +- .../auth/WidgetAuthMfa$onViewBound$1.java | 4 +- .../channels/list/WidgetChannelsList.java | 17 +- .../WidgetChannelSettingsEditPermissions.java | 62 +- ...dgetTextChannelSettings$configureUI$1.java | 4 +- .../WidgetThreadBrowser$updateMenu$1.java | 4 +- .../WidgetFriendsList$configureToolbar$1.java | 6 +- .../GuildRoleSubscriptionUtilsKt.java | 4 +- .../profile/WidgetGuildProfileSheet.java | 2 +- ...meHeaderManager$getOnSelectedAction$1.java | 14 +- .../WidgetMedia$onViewBoundOrOnResume$1.java | 6 +- .../widgets/notice/WidgetNoticeDialog.java | 4 +- ...tServerSettingsChannels$configureUI$1.java | 4 +- .../WidgetServerSettingsEditIntegration.java | 6 +- .../servers/WidgetServerSettingsEditRole.java | 100 +- .../servers/WidgetServerSettingsOverview.java | 2 +- ...tServerSettingsAuditLog$onViewBound$1.java | 4 +- ...leSubscriptionTierListItemGeneratorKt.java | 4 +- ...uildRoleSubscriptionEditTierViewModel.java | 10 +- .../WidgetSettings$configureToolbar$1.java | 4 +- .../widgets/settings/WidgetSettings.java | 2 +- ...ttingsPremiumGuildSubscriptionAdapter.java | 2 +- .../user/WidgetBanUser$onViewBound$3.java | 6 +- .../user/profile/UserProfileHeaderView.java | 2 +- .../usersheet/WidgetUserSheet$binding$2.java | 247 +- .../WidgetUserSheet$configureAboutMe$1.java | 25 + .../WidgetUserSheet$onViewCreated$14.java | 2 +- .../WidgetUserSheet$onViewCreated$15.java | 4 +- .../WidgetUserSheet$onViewCreated$16.java | 2 +- .../user/usersheet/WidgetUserSheet.java | 200 +- ...serSheetViewModel$inviteUserToSpeak$1.java | 4 +- ...iewModel$setUserSuppressedInChannel$1.java | 4 +- .../usersheet/WidgetUserSheetViewModel.java | 110 +- .../WidgetCallFullscreen$configureMenu$1.java | 8 +- .../main/res/layout-v22/widget_user_sheet.xml | 8 +- app/src/main/res/layout/widget_user_sheet.xml | 8 +- app/src/main/res/values-ar-rXB/strings.xml | 24 +- app/src/main/res/values-en-rXA/strings.xml | 24 +- app/src/main/res/values/public.xml | 28737 ++++++++-------- app/src/main/res/values/strings.xml | 26 +- 73 files changed, 15571 insertions(+), 14928 deletions(-) create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemove.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemoveReceiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttempt.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttemptReceiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailure.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailureReceiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccess.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccessReceiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2Receiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2Receiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2Receiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2Receiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackUserReauth.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheck.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheckReceiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthReceiver.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLanding.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLandingReceiver.java create mode 100644 app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAboutMe$1.java diff --git a/app/build.gradle b/app/build.gradle index eaf35eedce..ab032c87fe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 104200 - versionName "104.0 - Alpha" + versionCode 104201 + versionName "104.1 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ada48d614d..a5dbcfa8bf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/i/e/r/a.java b/app/src/main/java/c/i/e/r/a.java index 78329c2cfc..64e8331b46 100644 --- a/app/src/main/java/c/i/e/r/a.java +++ b/app/src/main/java/c/i/e/r/a.java @@ -5,7 +5,6 @@ import androidx.core.view.InputDeviceCompat; import androidx.core.view.PointerIconCompat; import androidx.media.AudioAttributesCompat; import androidx.room.RoomDatabase; -import com.discord.BuildConfig; import com.discord.models.domain.ModelInvite; import com.discord.restapi.RestAPIAbortCodes; import com.discord.utilities.font.FontUtils; @@ -19,7 +18,7 @@ import java.util.Collection; /* compiled from: PDF417Common */ public final class a { public static final int[] a = new int[0]; - public static final int[] b = {66142, 66170, 66206, 66236, 66290, 66292, 66350, 66382, 66396, 66454, 66470, 66476, 66594, 66600, 66614, 66626, 66628, 66632, 66640, 66654, 66662, 66668, 66682, 66690, 66718, 66720, 66748, 66758, 66776, 66798, 66802, 66804, 66820, 66824, 66832, 66846, 66848, 66876, 66880, 66936, 66950, 66956, 66968, 66992, 67006, 67022, 67036, 67042, 67044, 67048, 67062, 67118, 67150, 67164, 67214, 67228, 67256, 67294, 67322, 67350, 67366, 67372, 67398, 67404, 67416, 67438, 67474, 67476, 67490, 67492, 67496, 67510, 67618, 67624, 67650, 67656, 67664, 67678, 67686, 67692, 67706, 67714, 67716, 67728, 67742, 67744, 67772, 67782, 67788, 67800, 67822, 67826, 67828, 67842, 67848, 67870, 67872, 67900, 67904, 67960, 67974, 67992, 68016, 68030, 68046, 68060, 68066, 68068, 68072, 68086, 68104, 68112, 68126, 68128, 68156, 68160, 68216, 68336, 68358, 68364, 68376, 68400, 68414, 68448, 68476, 68494, 68508, 68536, 68546, 68548, 68552, 68560, 68574, 68582, 68588, 68654, 68686, 68700, 68706, 68708, 68712, 68726, 68750, 68764, 68792, 68802, 68804, 68808, 68816, 68830, 68838, 68844, 68858, 68878, 68892, 68920, 68976, 68990, 68994, 68996, 69000, 69008, 69022, 69024, 69052, 69062, 69068, 69080, 69102, 69106, 69108, 69142, 69158, 69164, 69190, 69208, 69230, 69254, 69260, 69272, 69296, 69310, 69326, 69340, 69386, 69394, 69396, 69410, 69416, 69430, 69442, 69444, 69448, 69456, 69470, 69478, 69484, 69554, 69556, 69666, 69672, 69698, 69704, 69712, 69726, 69754, 69762, 69764, 69776, 69790, 69792, 69820, 69830, 69836, 69848, 69870, 69874, 69876, 69890, 69918, 69920, 69948, 69952, 70008, 70022, 70040, 70064, 70078, 70094, 70108, 70114, 70116, 70120, 70134, 70152, 70174, 70176, 70264, 70384, 70412, 70448, 70462, 70496, 70524, 70542, 70556, 70584, 70594, 70600, 70608, 70622, 70630, 70636, 70664, 70672, 70686, 70688, 70716, 70720, 70776, 70896, 71136, 71180, 71192, 71216, 71230, 71264, 71292, 71360, 71416, 71452, 71480, 71536, 71550, 71554, 71556, 71560, 71568, 71582, 71584, 71612, 71622, 71628, 71640, 71662, 71726, 71732, 71758, 71772, 71778, 71780, 71784, 71798, 71822, 71836, 71864, 71874, 71880, 71888, 71902, 71910, 71916, 71930, 71950, 71964, 71992, 72048, 72062, 72066, 72068, 72080, 72094, 72096, 72124, 72134, 72140, 72152, 72174, 72178, 72180, 72206, 72220, 72248, 72304, 72318, 72416, 72444, 72456, 72464, 72478, 72480, 72508, 72512, 72568, 72588, 72600, 72624, 72638, 72654, 72668, 72674, 72676, 72680, 72694, 72726, 72742, 72748, 72774, 72780, 72792, 72814, 72838, 72856, 72880, 72894, 72910, 72924, 72930, 72932, 72936, 72950, 72966, 72972, 72984, 73008, 73022, 73056, 73084, 73102, 73116, 73144, 73156, 73160, 73168, 73182, 73190, 73196, 73210, 73226, 73234, 73236, 73250, 73252, 73256, 73270, 73282, 73284, 73296, 73310, 73318, 73324, 73346, 73348, 73352, 73360, 73374, 73376, 73404, 73414, 73420, 73432, 73454, 73498, 73518, 73522, 73524, 73550, 73564, 73570, 73572, 73576, 73590, 73800, 73822, 73858, 73860, 73872, 73886, 73888, 73916, 73944, 73970, 73972, 73992, 74014, 74016, 74044, 74048, 74104, 74118, 74136, 74160, 74174, 74210, 74212, 74216, 74230, 74244, 74256, 74270, 74272, 74360, 74480, 74502, 74508, 74544, 74558, 74592, 74620, 74638, 74652, 74680, 74690, 74696, 74704, 74726, 74732, 74782, 74784, 74812, 74992, 75232, 75288, 75326, 75360, 75388, 75456, 75512, 75576, 75632, 75646, 75650, 75652, 75664, 75678, 75680, 75708, 75718, 75724, 75736, 75758, 75808, 75836, 75840, 75896, 76016, 76256, 76736, 76824, 76848, 76862, 76896, 76924, 76992, 77048, 77296, 77340, 77368, 77424, 77438, 77536, 77564, 77572, 77576, 77584, 77600, 77628, 77632, 77688, 77702, 77708, 77720, 77744, 77758, 77774, 77788, 77870, 77902, 77916, 77922, 77928, 77966, 77980, 78008, 78018, 78024, 78032, 78046, 78060, 78074, 78094, 78136, 78192, 78206, 78210, 78212, 78224, 78238, 78240, 78268, 78278, 78284, 78296, 78322, 78324, 78350, 78364, 78448, 78462, 78560, 78588, 78600, 78622, 78624, 78652, 78656, 78712, 78726, 78744, 78768, 78782, 78798, 78812, 78818, 78820, 78824, 78838, 78862, 78876, 78904, 78960, 78974, 79072, 79100, 79296, 79352, 79368, 79376, 79390, 79392, 79420, 79424, 79480, 79600, 79628, 79640, 79664, 79678, 79712, 79740, 79772, 79800, 79810, 79812, 79816, 79824, 79838, 79846, 79852, 79894, 79910, 79916, 79942, 79948, 79960, 79982, 79988, 80006, 80024, 80048, 80062, 80078, 80092, 80098, 80100, 80104, 80134, 80140, 80176, 80190, 80224, 80252, 80270, 80284, 80312, 80328, 80336, 80350, 80358, 80364, 80378, 80390, 80396, 80408, 80432, 80446, 80480, 80508, 80576, 80632, 80654, 80668, 80696, 80752, 80766, 80776, 80784, 80798, 80800, 80828, 80844, 80856, 80878, 80882, 80884, 80914, 80916, 80930, 80932, 80936, 80950, 80962, 80968, 80976, 80990, 80998, 81004, 81026, 81028, 81040, 81054, 81056, 81084, 81094, 81100, 81112, 81134, 81154, 81156, 81160, 81168, 81182, 81184, 81212, 81216, 81272, 81286, 81292, 81304, 81328, 81342, 81358, 81372, 81380, 81384, 81398, 81434, 81454, 81458, 81460, 81486, 81500, 81506, 81508, 81512, 81526, 81550, 81564, 81592, 81602, 81604, 81608, 81616, 81630, 81638, 81644, 81702, 81708, 81722, 81734, 81740, 81752, 81774, 81778, 81780, 82050, 82078, 82080, 82108, 82180, 82184, 82192, 82206, 82208, 82236, 82240, 82296, 82316, 82328, 82352, 82366, 82402, 82404, 82408, 82440, 82448, 82462, 82464, 82492, 82496, 82552, 82672, 82694, 82700, 82712, 82736, 82750, 82784, 82812, 82830, 82882, 82884, 82888, 82896, 82918, 82924, 82952, 82960, 82974, 82976, 83004, 83008, 83064, 83184, 83424, 83468, 83480, 83504, 83518, 83552, 83580, 83648, 83704, 83740, 83768, 83824, 83838, 83842, 83844, 83848, 83856, 83872, 83900, 83910, 83916, 83928, 83950, 83984, 84000, 84028, 84032, 84088, 84208, 84448, 84928, 85040, 85054, 85088, 85116, 85184, 85240, 85488, 85560, 85616, 85630, 85728, 85756, 85764, 85768, 85776, 85790, 85792, 85820, 85824, 85880, 85894, 85900, 85912, 85936, 85966, 85980, 86048, 86080, 86136, 86256, 86496, 86976, 88160, 88188, 88256, 88312, 88560, 89056, 89200, 89214, 89312, 89340, 89536, 89592, 89608, 89616, 89632, 89664, 89720, 89840, 89868, 89880, 89904, 89952, 89980, 89998, 90012, 90040, 90190, 90204, 90254, 90268, 90296, 90306, 90308, 90312, 90334, 90382, 90396, 90424, 90480, 90494, 90500, 90504, 90512, 90526, 90528, 90556, 90566, 90572, 90584, 90610, 90612, 90638, 90652, 90680, 90736, 90750, 90848, 90876, 90884, 90888, 90896, 90910, 90912, 90940, 90944, 91000, 91014, 91020, 91032, 91056, 91070, 91086, 91100, 91106, 91108, 91112, 91126, 91150, 91164, 91192, 91248, 91262, 91360, 91388, 91584, 91640, 91664, 91678, 91680, 91708, 91712, 91768, 91888, 91928, 91952, 91966, 92000, 92028, 92046, 92060, 92088, 92098, 92100, 92104, 92112, 92126, 92134, 92140, 92188, 92216, 92272, 92384, 92412, 92608, 92664, 93168, 93200, 93214, 93216, 93244, 93248, 93304, 93424, 93664, 93720, 93744, 93758, 93792, 93820, 93888, 93944, 93980, 94008, 94064, 94078, 94084, 94088, 94096, 94110, 94112, 94140, 94150, 94156, 94168, 94246, 94252, 94278, 94284, 94296, 94318, 94342, 94348, 94360, 94384, 94398, 94414, 94428, 94440, 94470, 94476, 94488, 94512, 94526, 94560, 94588, 94606, 94620, 94648, 94658, 94660, 94664, 94672, 94686, 94694, 94700, 94714, 94726, 94732, 94744, 94768, 94782, 94816, 94844, 94912, 94968, 94990, 95004, 95032, 95088, 95102, 95112, 95120, 95134, 95136, 95164, 95180, 95192, 95214, 95218, 95220, 95244, 95256, 95280, 95294, 95328, 95356, 95424, 95480, 95728, 95758, 95772, 95800, 95856, 95870, 95968, 95996, 96008, 96016, 96030, 96032, 96060, 96064, 96120, 96152, 96176, 96190, 96220, 96226, 96228, 96232, 96290, 96292, 96296, 96310, 96322, 96324, 96328, 96336, 96350, 96358, 96364, 96386, 96388, 96392, 96400, 96414, 96416, 96444, 96454, 96460, 96472, 96494, 96498, 96500, 96514, 96516, 96520, 96528, 96542, 96544, 96572, 96576, 96632, 96646, 96652, 96664, 96688, 96702, 96718, 96732, 96738, 96740, 96744, 96758, 96772, 96776, 96784, 96798, 96800, 96828, 96832, 96888, 97008, 97030, 97036, 97048, 97072, 97086, 97120, 97148, 97166, 97180, 97208, 97220, 97224, 97232, 97246, 97254, 97260, 97326, 97330, 97332, 97358, 97372, 97378, 97380, 97384, 97398, 97422, 97436, 97464, 97474, 97476, 97480, 97488, 97502, 97510, 97516, 97550, 97564, 97592, 97648, 97666, 97668, 97672, 97680, 97694, 97696, 97724, 97734, 97740, 97752, 97774, 97830, 97836, 97850, 97862, 97868, 97880, 97902, 97906, 97908, 97926, 97932, 97944, 97968, 97998, 98012, 98018, 98020, 98024, 98038, 98618, 98674, 98676, 98838, 98854, 98874, 98892, 98904, 98926, 98930, 98932, 98968, 99006, 99042, 99044, 99048, 99062, 99166, 99194, 99246, 99286, 99350, 99366, 99372, 99386, 99398, 99416, 99438, 99442, 99444, 99462, 99504, 99518, 99534, 99548, 99554, 99556, 99560, 99574, 99590, 99596, 99608, 99632, 99646, 99680, 99708, 99726, 99740, 99768, 99778, 99780, 99784, 99792, 99806, 99814, 99820, 99834, 99858, 99860, 99874, 99880, 99894, 99906, 99920, 99934, 99962, 99970, 99972, 99976, 99984, 99998, 100000, 100028, 100038, 100044, 100056, 100078, 100082, 100084, 100142, 100174, 100188, 100246, 100262, 100268, 100306, 100308, 100390, 100396, 100410, 100422, 100428, 100440, 100462, 100466, 100468, 100486, 100504, 100528, 100542, 100558, 100572, 100578, 100580, 100584, 100598, 100620, 100656, 100670, 100704, 100732, 100750, 100792, 100802, 100808, 100816, 100830, 100838, 100844, 100858, 100888, 100912, 100926, 100960, 100988, 101056, 101112, 101148, 101176, 101232, 101246, 101250, 101252, 101256, 101264, 101278, 101280, 101308, 101318, 101324, 101336, 101358, 101362, 101364, 101410, 101412, 101416, 101430, 101442, 101448, 101456, 101470, 101478, 101498, 101506, 101508, 101520, 101534, 101536, 101564, 101580, 101618, 101620, 101636, 101640, 101648, 101662, 101664, 101692, 101696, 101752, 101766, 101784, 101838, 101858, 101860, 101864, 101934, 101938, 101940, 101966, 101980, 101986, 101988, 101992, 102030, 102044, 102072, 102082, 102084, 102088, 102096, 102138, 102166, 102182, 102188, 102214, 102220, 102232, 102254, 102282, 102290, 102292, 102306, 102308, 102312, 102326, 102444, 102458, 102470, 102476, 102488, 102514, 102516, 102534, 102552, 102576, 102590, 102606, 102620, 102626, 102632, 102646, 102662, 102668, 102704, 102718, 102752, 102780, 102798, 102812, 102840, 102850, 102856, 102864, 102878, 102886, 102892, 102906, 102936, 102974, 103008, 103036, 103104, 103160, 103224, 103280, 103294, 103298, 103300, 103312, 103326, 103328, 103356, 103366, 103372, 103384, 103406, 103410, 103412, 103472, 103486, 103520, 103548, 103616, 103672, 103920, 103992, 104048, 104062, 104160, 104188, 104194, 104196, BuildConfig.VERSION_CODE, 104208, 104224, 104252, 104256, 104312, 104326, 104332, 104344, 104368, 104382, 104398, 104412, 104418, 104420, 104424, 104482, 104484, 104514, 104520, 104528, 104542, 104550, 104570, 104578, 104580, 104592, 104606, 104608, 104636, 104652, 104690, 104692, 104706, 104712, 104734, 104736, 104764, 104768, 104824, 104838, 104856, 104910, 104930, 104932, 104936, 104968, 104976, 104990, 104992, 105020, 105024, 105080, 105200, 105240, 105278, 105312, 105372, 105410, 105412, 105416, 105424, 105446, 105518, 105524, 105550, 105564, 105570, 105572, 105576, 105614, 105628, 105656, 105666, 105672, 105680, 105702, 105722, 105742, 105756, 105784, 105840, 105854, 105858, 105860, 105864, 105872, 105888, 105932, 105970, 105972, 106006, 106022, 106028, 106054, 106060, 106072, 106100, 106118, 106124, 106136, 106160, 106174, 106190, 106210, 106212, 106216, 106250, 106258, 106260, 106274, 106276, 106280, 106306, 106308, 106312, 106320, 106334, 106348, 106394, 106414, 106418, 106420, 106566, 106572, 106610, 106612, 106630, 106636, 106648, 106672, 106686, 106722, 106724, 106728, 106742, 106758, 106764, 106776, 106800, 106814, 106848, 106876, 106894, 106908, 106936, 106946, 106948, 106952, 106960, 106974, 106982, 106988, 107032, 107056, 107070, 107104, 107132, 107200, 107256, 107292, 107320, 107376, 107390, 107394, 107396, 107400, 107408, 107422, 107424, 107452, 107462, 107468, 107480, 107502, 107506, 107508, 107544, 107568, 107582, 107616, 107644, 107712, 107768, 108016, 108060, 108088, 108144, 108158, 108256, 108284, 108290, 108292, 108296, 108304, 108318, 108320, 108348, 108352, 108408, 108422, 108428, 108440, 108464, 108478, 108494, 108508, 108514, 108516, 108520, 108592, 108640, 108668, 108736, 108792, 109040, 109536, 109680, 109694, 109792, 109820, 110016, 110072, 110084, 110088, 110096, 110112, 110140, 110144, 110200, 110320, 110342, 110348, 110360, 110384, 110398, 110432, 110460, 110478, 110492, 110520, 110532, 110536, 110544, 110558, 110658, 110686, 110714, 110722, 110724, 110728, 110736, 110750, 110752, 110780, 110796, 110834, 110836, 110850, 110852, 110856, 110864, 110878, 110880, 110908, 110912, 110968, 110982, RestAPIAbortCodes.SEARCH_INDEXING, 111054, 111074, 111076, 111080, 111108, 111112, 111120, 111134, 111136, 111164, 111168, 111224, 111344, 111372, 111422, 111456, 111516, 111554, 111556, 111560, 111568, 111590, 111632, 111646, 111648, 111676, 111680, 111736, 111856, 112096, 112152, 112224, 112252, 112320, 112440, 112514, 112516, 112520, 112528, 112542, 112544, 112588, 112686, 112718, 112732, 112782, 112796, 112824, 112834, 112836, 112840, 112848, 112870, 112890, 112910, 112924, 112952, 113008, 113022, 113026, 113028, 113032, 113040, 113054, 113056, 113100, 113138, 113140, 113166, 113180, 113208, 113264, 113278, 113376, 113404, 113416, 113424, 113440, 113468, 113472, 113560, 113614, 113634, 113636, 113640, 113686, 113702, 113708, 113734, 113740, 113752, 113778, 113780, 113798, 113804, 113816, 113840, 113854, 113870, 113890, 113892, 113896, 113926, 113932, 113944, 113968, 113982, 114016, 114044, 114076, 114114, 114116, 114120, 114128, 114150, 114170, 114194, 114196, 114210, 114212, 114216, 114242, 114244, 114248, 114256, 114270, 114278, 114306, 114308, 114312, 114320, 114334, 114336, 114364, 114380, 114420, 114458, 114478, 114482, 114484, 114510, 114524, 114530, 114532, 114536, 114842, 114866, 114868, 114970, 114994, 114996, 115042, 115044, 115048, 115062, 115130, 115226, 115250, 115252, 115278, 115292, 115298, 115300, 115304, 115318, 115342, 115394, 115396, 115400, 115408, 115422, 115430, 115436, 115450, 115478, 115494, 115514, 115526, 115532, 115570, 115572, 115738, 115758, 115762, 115764, 115790, 115804, 115810, 115812, 115816, 115830, 115854, 115868, 115896, 115906, 115912, 115920, 115934, 115942, 115948, 115962, 115996, 116024, 116080, 116094, 116098, 116100, 116104, 116112, 116126, 116128, 116156, 116166, 116172, 116184, 116206, 116210, 116212, 116246, 116262, 116268, 116282, 116294, 116300, 116312, 116334, 116338, 116340, 116358, 116364, 116376, 116400, 116414, 116430, 116444, 116450, 116452, 116456, 116498, 116500, 116514, 116520, 116534, 116546, 116548, 116552, 116560, 116574, 116582, 116588, 116602, 116654, 116694, 116714, 116762, 116782, 116786, 116788, 116814, 116828, 116834, 116836, 116840, 116854, 116878, 116892, 116920, 116930, 116936, 116944, 116958, 116966, 116972, 116986, 117006, 117048, 117104, 117118, 117122, 117124, 117136, 117150, 117152, 117180, 117190, 117196, 117208, 117230, 117234, 117236, 117304, 117360, 117374, 117472, 117500, 117506, 117508, 117512, 117520, 117536, 117564, 117568, 117624, 117638, 117644, 117656, 117680, 117694, 117710, 117724, 117730, 117732, 117736, 117750, 117782, 117798, 117804, 117818, 117830, 117848, 117874, 117876, 117894, 117936, 117950, 117966, 117986, 117988, 117992, 118022, 118028, 118040, 118064, 118078, 118112, 118140, 118172, 118210, 118212, 118216, 118224, 118238, 118246, 118266, 118306, 118312, 118338, 118352, 118366, 118374, 118394, 118402, 118404, 118408, 118416, 118430, 118432, 118460, 118476, 118514, 118516, 118574, 118578, 118580, 118606, 118620, 118626, 118628, 118632, 118678, 118694, 118700, 118730, 118738, 118740, 118830, 118834, 118836, 118862, 118876, 118882, 118884, 118888, 118902, 118926, 118940, 118968, 118978, 118980, 118984, 118992, 119006, 119014, 119020, 119034, 119068, 119096, 119152, 119166, 119170, 119172, 119176, 119184, 119198, 119200, 119228, 119238, 119244, 119256, 119278, 119282, 119284, 119324, 119352, 119408, 119422, 119520, 119548, 119554, 119556, 119560, 119568, 119582, 119584, 119612, 119616, 119672, 119686, 119692, 119704, 119728, 119742, 119758, 119772, 119778, 119780, 119784, 119798, 119920, 119934, 120032, 120060, 120256, 120312, 120324, 120328, 120336, 120352, 120384, 120440, 120560, 120582, 120588, 120600, 120624, 120638, 120672, 120700, 120718, 120732, 120760, 120770, 120772, 120776, 120784, 120798, 120806, 120812, 120870, 120876, 120890, 120902, 120908, 120920, 120946, 120948, 120966, 120972, 120984, 121008, 121022, 121038, 121058, 121060, 121064, 121078, 121100, 121112, 121136, 121150, 121184, 121212, 121244, 121282, 121284, 121288, 121296, 121318, 121338, 121356, 121368, 121392, 121406, 121440, 121468, 121536, 121592, 121656, 121730, 121732, 121736, 121744, 121758, 121760, 121804, 121842, 121844, 121890, 121922, 121924, 121928, 121936, 121950, 121958, 121978, 121986, 121988, 121992, 122000, 122014, 122016, 122044, 122060, 122098, 122100, 122116, 122120, 122128, 122142, 122144, 122172, 122176, 122232, 122246, 122264, 122318, 122338, 122340, 122344, 122414, 122418, 122420, 122446, 122460, 122466, 122468, 122472, 122510, 122524, 122552, 122562, 122564, 122568, 122576, 122598, 122618, 122646, 122662, 122668, 122694, 122700, 122712, 122738, 122740, 122762, 122770, 122772, 122786, 122788, 122792, 123018, 123026, 123028, 123042, 123044, 123048, 123062, 123098, 123146, 123154, 123156, 123170, 123172, 123176, 123190, 123202, 123204, 123208, 123216, 123238, 123244, 123258, 123290, 123314, 123316, 123402, 123410, 123412, 123426, 123428, 123432, 123446, 123458, 123464, 123472, 123486, 123494, 123500, 123514, 123522, 123524, 123528, 123536, 123552, 123580, 123590, 123596, 123608, 123630, 123634, 123636, 123674, 123698, 123700, 123740, 123746, 123748, 123752, 123834, 123914, 123922, 123924, 123938, 123944, 123958, 123970, 123976, 123984, 123998, 124006, 124012, 124026, 124034, 124036, 124048, 124062, 124064, 124092, 124102, 124108, 124120, 124142, 124146, 124148, 124162, 124164, 124168, 124176, 124190, 124192, 124220, 124224, 124280, 124294, 124300, 124312, 124336, 124350, 124366, 124380, 124386, 124388, 124392, 124406, 124442, 124462, 124466, 124468, 124494, 124508, 124514, 124520, 124558, 124572, 124600, 124610, 124612, 124616, 124624, 124646, 124666, 124694, 124710, 124716, 124730, 124742, 124748, 124760, 124786, 124788, 124818, 124820, 124834, 124836, 124840, 124854, 124946, 124948, 124962, 124964, 124968, 124982, 124994, 124996, 125000, 125008, 125022, 125030, 125036, 125050, 125058, 125060, 125064, 125072, 125086, 125088, 125116, 125126, 125132, 125144, 125166, 125170, 125172, 125186, 125188, 125192, 125200, 125216, 125244, 125248, 125304, 125318, 125324, 125336, 125360, 125374, 125390, 125404, 125410, 125412, 125416, 125430, 125444, 125448, 125456, 125472, 125504, 125560, 125680, 125702, 125708, 125720, 125744, 125758, 125792, 125820, 125838, 125852, 125880, 125890, 125892, 125896, 125904, 125918, 125926, 125932, 125978, 125998, 126002, 126004, 126030, 126044, 126050, 126052, 126056, 126094, 126108, 126136, 126146, 126148, 126152, 126160, 126182, 126202, 126222, 126236, 126264, 126320, 126334, 126338, 126340, 126344, 126352, 126366, 126368, 126412, 126450, 126452, 126486, 126502, 126508, 126522, 126534, 126540, 126552, 126574, 126578, 126580, 126598, 126604, 126616, 126640, 126654, 126670, 126684, 126690, 126692, 126696, 126738, 126754, 126756, 126760, 126774, 126786, 126788, 126792, 126800, 126814, 126822, 126828, 126842, 126894, 126898, 126900, 126934, 127126, 127142, 127148, 127162, 127178, 127186, 127188, 127254, 127270, 127276, 127290, 127302, 127308, 127320, 127342, 127346, 127348, 127370, 127378, 127380, 127394, 127396, 127400, 127450, 127510, 127526, 127532, 127546, 127558, 127576, 127598, 127602, 127604, 127622, 127628, 127640, 127664, 127678, 127694, 127708, 127714, 127716, 127720, 127734, 127754, 127762, 127764, 127778, 127784, 127810, 127812, 127816, 127824, 127838, 127846, 127866, 127898, 127918, 127922, 127924, 128022, 128038, 128044, 128058, 128070, 128076, 128088, 128110, 128114, 128116, 128134, 128140, 128152, 128176, 128190, 128206, 128220, 128226, 128228, 128232, 128246, 128262, 128268, 128280, 128304, 128318, 128352, 128380, 128398, 128412, 128440, 128450, 128452, 128456, 128464, 128478, 128486, 128492, 128506, 128522, 128530, 128532, 128546, 128548, 128552, 128566, 128578, 128580, 128584, 128592, 128606, 128614, 128634, 128642, 128644, 128648, 128656, 128670, 128672, 128700, 128716, 128754, 128756, 128794, 128814, 128818, 128820, 128846, 128860, 128866, 128868, 128872, 128886, 128918, 128934, 128940, 128954, 128978, 128980, 129178, 129198, 129202, 129204, 129238, 129258, 129306, 129326, 129330, 129332, 129358, 129372, 129378, 129380, 129384, 129398, 129430, 129446, 129452, 129466, 129482, 129490, 129492, 129562, 129582, 129586, 129588, 129614, 129628, 129634, 129636, 129640, 129654, 129678, 129692, 129720, 129730, 129732, 129736, 129744, 129758, 129766, 129772, 129814, 129830, 129836, 129850, 129862, 129868, 129880, 129902, 129906, 129908, 129930, 129938, 129940, 129954, 129956, 129960, 129974, 130010}; + public static final int[] b = {66142, 66170, 66206, 66236, 66290, 66292, 66350, 66382, 66396, 66454, 66470, 66476, 66594, 66600, 66614, 66626, 66628, 66632, 66640, 66654, 66662, 66668, 66682, 66690, 66718, 66720, 66748, 66758, 66776, 66798, 66802, 66804, 66820, 66824, 66832, 66846, 66848, 66876, 66880, 66936, 66950, 66956, 66968, 66992, 67006, 67022, 67036, 67042, 67044, 67048, 67062, 67118, 67150, 67164, 67214, 67228, 67256, 67294, 67322, 67350, 67366, 67372, 67398, 67404, 67416, 67438, 67474, 67476, 67490, 67492, 67496, 67510, 67618, 67624, 67650, 67656, 67664, 67678, 67686, 67692, 67706, 67714, 67716, 67728, 67742, 67744, 67772, 67782, 67788, 67800, 67822, 67826, 67828, 67842, 67848, 67870, 67872, 67900, 67904, 67960, 67974, 67992, 68016, 68030, 68046, 68060, 68066, 68068, 68072, 68086, 68104, 68112, 68126, 68128, 68156, 68160, 68216, 68336, 68358, 68364, 68376, 68400, 68414, 68448, 68476, 68494, 68508, 68536, 68546, 68548, 68552, 68560, 68574, 68582, 68588, 68654, 68686, 68700, 68706, 68708, 68712, 68726, 68750, 68764, 68792, 68802, 68804, 68808, 68816, 68830, 68838, 68844, 68858, 68878, 68892, 68920, 68976, 68990, 68994, 68996, 69000, 69008, 69022, 69024, 69052, 69062, 69068, 69080, 69102, 69106, 69108, 69142, 69158, 69164, 69190, 69208, 69230, 69254, 69260, 69272, 69296, 69310, 69326, 69340, 69386, 69394, 69396, 69410, 69416, 69430, 69442, 69444, 69448, 69456, 69470, 69478, 69484, 69554, 69556, 69666, 69672, 69698, 69704, 69712, 69726, 69754, 69762, 69764, 69776, 69790, 69792, 69820, 69830, 69836, 69848, 69870, 69874, 69876, 69890, 69918, 69920, 69948, 69952, 70008, 70022, 70040, 70064, 70078, 70094, 70108, 70114, 70116, 70120, 70134, 70152, 70174, 70176, 70264, 70384, 70412, 70448, 70462, 70496, 70524, 70542, 70556, 70584, 70594, 70600, 70608, 70622, 70630, 70636, 70664, 70672, 70686, 70688, 70716, 70720, 70776, 70896, 71136, 71180, 71192, 71216, 71230, 71264, 71292, 71360, 71416, 71452, 71480, 71536, 71550, 71554, 71556, 71560, 71568, 71582, 71584, 71612, 71622, 71628, 71640, 71662, 71726, 71732, 71758, 71772, 71778, 71780, 71784, 71798, 71822, 71836, 71864, 71874, 71880, 71888, 71902, 71910, 71916, 71930, 71950, 71964, 71992, 72048, 72062, 72066, 72068, 72080, 72094, 72096, 72124, 72134, 72140, 72152, 72174, 72178, 72180, 72206, 72220, 72248, 72304, 72318, 72416, 72444, 72456, 72464, 72478, 72480, 72508, 72512, 72568, 72588, 72600, 72624, 72638, 72654, 72668, 72674, 72676, 72680, 72694, 72726, 72742, 72748, 72774, 72780, 72792, 72814, 72838, 72856, 72880, 72894, 72910, 72924, 72930, 72932, 72936, 72950, 72966, 72972, 72984, 73008, 73022, 73056, 73084, 73102, 73116, 73144, 73156, 73160, 73168, 73182, 73190, 73196, 73210, 73226, 73234, 73236, 73250, 73252, 73256, 73270, 73282, 73284, 73296, 73310, 73318, 73324, 73346, 73348, 73352, 73360, 73374, 73376, 73404, 73414, 73420, 73432, 73454, 73498, 73518, 73522, 73524, 73550, 73564, 73570, 73572, 73576, 73590, 73800, 73822, 73858, 73860, 73872, 73886, 73888, 73916, 73944, 73970, 73972, 73992, 74014, 74016, 74044, 74048, 74104, 74118, 74136, 74160, 74174, 74210, 74212, 74216, 74230, 74244, 74256, 74270, 74272, 74360, 74480, 74502, 74508, 74544, 74558, 74592, 74620, 74638, 74652, 74680, 74690, 74696, 74704, 74726, 74732, 74782, 74784, 74812, 74992, 75232, 75288, 75326, 75360, 75388, 75456, 75512, 75576, 75632, 75646, 75650, 75652, 75664, 75678, 75680, 75708, 75718, 75724, 75736, 75758, 75808, 75836, 75840, 75896, 76016, 76256, 76736, 76824, 76848, 76862, 76896, 76924, 76992, 77048, 77296, 77340, 77368, 77424, 77438, 77536, 77564, 77572, 77576, 77584, 77600, 77628, 77632, 77688, 77702, 77708, 77720, 77744, 77758, 77774, 77788, 77870, 77902, 77916, 77922, 77928, 77966, 77980, 78008, 78018, 78024, 78032, 78046, 78060, 78074, 78094, 78136, 78192, 78206, 78210, 78212, 78224, 78238, 78240, 78268, 78278, 78284, 78296, 78322, 78324, 78350, 78364, 78448, 78462, 78560, 78588, 78600, 78622, 78624, 78652, 78656, 78712, 78726, 78744, 78768, 78782, 78798, 78812, 78818, 78820, 78824, 78838, 78862, 78876, 78904, 78960, 78974, 79072, 79100, 79296, 79352, 79368, 79376, 79390, 79392, 79420, 79424, 79480, 79600, 79628, 79640, 79664, 79678, 79712, 79740, 79772, 79800, 79810, 79812, 79816, 79824, 79838, 79846, 79852, 79894, 79910, 79916, 79942, 79948, 79960, 79982, 79988, 80006, 80024, 80048, 80062, 80078, 80092, 80098, 80100, 80104, 80134, 80140, 80176, 80190, 80224, 80252, 80270, 80284, 80312, 80328, 80336, 80350, 80358, 80364, 80378, 80390, 80396, 80408, 80432, 80446, 80480, 80508, 80576, 80632, 80654, 80668, 80696, 80752, 80766, 80776, 80784, 80798, 80800, 80828, 80844, 80856, 80878, 80882, 80884, 80914, 80916, 80930, 80932, 80936, 80950, 80962, 80968, 80976, 80990, 80998, 81004, 81026, 81028, 81040, 81054, 81056, 81084, 81094, 81100, 81112, 81134, 81154, 81156, 81160, 81168, 81182, 81184, 81212, 81216, 81272, 81286, 81292, 81304, 81328, 81342, 81358, 81372, 81380, 81384, 81398, 81434, 81454, 81458, 81460, 81486, 81500, 81506, 81508, 81512, 81526, 81550, 81564, 81592, 81602, 81604, 81608, 81616, 81630, 81638, 81644, 81702, 81708, 81722, 81734, 81740, 81752, 81774, 81778, 81780, 82050, 82078, 82080, 82108, 82180, 82184, 82192, 82206, 82208, 82236, 82240, 82296, 82316, 82328, 82352, 82366, 82402, 82404, 82408, 82440, 82448, 82462, 82464, 82492, 82496, 82552, 82672, 82694, 82700, 82712, 82736, 82750, 82784, 82812, 82830, 82882, 82884, 82888, 82896, 82918, 82924, 82952, 82960, 82974, 82976, 83004, 83008, 83064, 83184, 83424, 83468, 83480, 83504, 83518, 83552, 83580, 83648, 83704, 83740, 83768, 83824, 83838, 83842, 83844, 83848, 83856, 83872, 83900, 83910, 83916, 83928, 83950, 83984, 84000, 84028, 84032, 84088, 84208, 84448, 84928, 85040, 85054, 85088, 85116, 85184, 85240, 85488, 85560, 85616, 85630, 85728, 85756, 85764, 85768, 85776, 85790, 85792, 85820, 85824, 85880, 85894, 85900, 85912, 85936, 85966, 85980, 86048, 86080, 86136, 86256, 86496, 86976, 88160, 88188, 88256, 88312, 88560, 89056, 89200, 89214, 89312, 89340, 89536, 89592, 89608, 89616, 89632, 89664, 89720, 89840, 89868, 89880, 89904, 89952, 89980, 89998, 90012, 90040, 90190, 90204, 90254, 90268, 90296, 90306, 90308, 90312, 90334, 90382, 90396, 90424, 90480, 90494, 90500, 90504, 90512, 90526, 90528, 90556, 90566, 90572, 90584, 90610, 90612, 90638, 90652, 90680, 90736, 90750, 90848, 90876, 90884, 90888, 90896, 90910, 90912, 90940, 90944, 91000, 91014, 91020, 91032, 91056, 91070, 91086, 91100, 91106, 91108, 91112, 91126, 91150, 91164, 91192, 91248, 91262, 91360, 91388, 91584, 91640, 91664, 91678, 91680, 91708, 91712, 91768, 91888, 91928, 91952, 91966, 92000, 92028, 92046, 92060, 92088, 92098, 92100, 92104, 92112, 92126, 92134, 92140, 92188, 92216, 92272, 92384, 92412, 92608, 92664, 93168, 93200, 93214, 93216, 93244, 93248, 93304, 93424, 93664, 93720, 93744, 93758, 93792, 93820, 93888, 93944, 93980, 94008, 94064, 94078, 94084, 94088, 94096, 94110, 94112, 94140, 94150, 94156, 94168, 94246, 94252, 94278, 94284, 94296, 94318, 94342, 94348, 94360, 94384, 94398, 94414, 94428, 94440, 94470, 94476, 94488, 94512, 94526, 94560, 94588, 94606, 94620, 94648, 94658, 94660, 94664, 94672, 94686, 94694, 94700, 94714, 94726, 94732, 94744, 94768, 94782, 94816, 94844, 94912, 94968, 94990, 95004, 95032, 95088, 95102, 95112, 95120, 95134, 95136, 95164, 95180, 95192, 95214, 95218, 95220, 95244, 95256, 95280, 95294, 95328, 95356, 95424, 95480, 95728, 95758, 95772, 95800, 95856, 95870, 95968, 95996, 96008, 96016, 96030, 96032, 96060, 96064, 96120, 96152, 96176, 96190, 96220, 96226, 96228, 96232, 96290, 96292, 96296, 96310, 96322, 96324, 96328, 96336, 96350, 96358, 96364, 96386, 96388, 96392, 96400, 96414, 96416, 96444, 96454, 96460, 96472, 96494, 96498, 96500, 96514, 96516, 96520, 96528, 96542, 96544, 96572, 96576, 96632, 96646, 96652, 96664, 96688, 96702, 96718, 96732, 96738, 96740, 96744, 96758, 96772, 96776, 96784, 96798, 96800, 96828, 96832, 96888, 97008, 97030, 97036, 97048, 97072, 97086, 97120, 97148, 97166, 97180, 97208, 97220, 97224, 97232, 97246, 97254, 97260, 97326, 97330, 97332, 97358, 97372, 97378, 97380, 97384, 97398, 97422, 97436, 97464, 97474, 97476, 97480, 97488, 97502, 97510, 97516, 97550, 97564, 97592, 97648, 97666, 97668, 97672, 97680, 97694, 97696, 97724, 97734, 97740, 97752, 97774, 97830, 97836, 97850, 97862, 97868, 97880, 97902, 97906, 97908, 97926, 97932, 97944, 97968, 97998, 98012, 98018, 98020, 98024, 98038, 98618, 98674, 98676, 98838, 98854, 98874, 98892, 98904, 98926, 98930, 98932, 98968, 99006, 99042, 99044, 99048, 99062, 99166, 99194, 99246, 99286, 99350, 99366, 99372, 99386, 99398, 99416, 99438, 99442, 99444, 99462, 99504, 99518, 99534, 99548, 99554, 99556, 99560, 99574, 99590, 99596, 99608, 99632, 99646, 99680, 99708, 99726, 99740, 99768, 99778, 99780, 99784, 99792, 99806, 99814, 99820, 99834, 99858, 99860, 99874, 99880, 99894, 99906, 99920, 99934, 99962, 99970, 99972, 99976, 99984, 99998, 100000, 100028, 100038, 100044, 100056, 100078, 100082, 100084, 100142, 100174, 100188, 100246, 100262, 100268, 100306, 100308, 100390, 100396, 100410, 100422, 100428, 100440, 100462, 100466, 100468, 100486, 100504, 100528, 100542, 100558, 100572, 100578, 100580, 100584, 100598, 100620, 100656, 100670, 100704, 100732, 100750, 100792, 100802, 100808, 100816, 100830, 100838, 100844, 100858, 100888, 100912, 100926, 100960, 100988, 101056, 101112, 101148, 101176, 101232, 101246, 101250, 101252, 101256, 101264, 101278, 101280, 101308, 101318, 101324, 101336, 101358, 101362, 101364, 101410, 101412, 101416, 101430, 101442, 101448, 101456, 101470, 101478, 101498, 101506, 101508, 101520, 101534, 101536, 101564, 101580, 101618, 101620, 101636, 101640, 101648, 101662, 101664, 101692, 101696, 101752, 101766, 101784, 101838, 101858, 101860, 101864, 101934, 101938, 101940, 101966, 101980, 101986, 101988, 101992, 102030, 102044, 102072, 102082, 102084, 102088, 102096, 102138, 102166, 102182, 102188, 102214, 102220, 102232, 102254, 102282, 102290, 102292, 102306, 102308, 102312, 102326, 102444, 102458, 102470, 102476, 102488, 102514, 102516, 102534, 102552, 102576, 102590, 102606, 102620, 102626, 102632, 102646, 102662, 102668, 102704, 102718, 102752, 102780, 102798, 102812, 102840, 102850, 102856, 102864, 102878, 102886, 102892, 102906, 102936, 102974, 103008, 103036, 103104, 103160, 103224, 103280, 103294, 103298, 103300, 103312, 103326, 103328, 103356, 103366, 103372, 103384, 103406, 103410, 103412, 103472, 103486, 103520, 103548, 103616, 103672, 103920, 103992, 104048, 104062, 104160, 104188, 104194, 104196, 104200, 104208, 104224, 104252, 104256, 104312, 104326, 104332, 104344, 104368, 104382, 104398, 104412, 104418, 104420, 104424, 104482, 104484, 104514, 104520, 104528, 104542, 104550, 104570, 104578, 104580, 104592, 104606, 104608, 104636, 104652, 104690, 104692, 104706, 104712, 104734, 104736, 104764, 104768, 104824, 104838, 104856, 104910, 104930, 104932, 104936, 104968, 104976, 104990, 104992, 105020, 105024, 105080, 105200, 105240, 105278, 105312, 105372, 105410, 105412, 105416, 105424, 105446, 105518, 105524, 105550, 105564, 105570, 105572, 105576, 105614, 105628, 105656, 105666, 105672, 105680, 105702, 105722, 105742, 105756, 105784, 105840, 105854, 105858, 105860, 105864, 105872, 105888, 105932, 105970, 105972, 106006, 106022, 106028, 106054, 106060, 106072, 106100, 106118, 106124, 106136, 106160, 106174, 106190, 106210, 106212, 106216, 106250, 106258, 106260, 106274, 106276, 106280, 106306, 106308, 106312, 106320, 106334, 106348, 106394, 106414, 106418, 106420, 106566, 106572, 106610, 106612, 106630, 106636, 106648, 106672, 106686, 106722, 106724, 106728, 106742, 106758, 106764, 106776, 106800, 106814, 106848, 106876, 106894, 106908, 106936, 106946, 106948, 106952, 106960, 106974, 106982, 106988, 107032, 107056, 107070, 107104, 107132, 107200, 107256, 107292, 107320, 107376, 107390, 107394, 107396, 107400, 107408, 107422, 107424, 107452, 107462, 107468, 107480, 107502, 107506, 107508, 107544, 107568, 107582, 107616, 107644, 107712, 107768, 108016, 108060, 108088, 108144, 108158, 108256, 108284, 108290, 108292, 108296, 108304, 108318, 108320, 108348, 108352, 108408, 108422, 108428, 108440, 108464, 108478, 108494, 108508, 108514, 108516, 108520, 108592, 108640, 108668, 108736, 108792, 109040, 109536, 109680, 109694, 109792, 109820, 110016, 110072, 110084, 110088, 110096, 110112, 110140, 110144, 110200, 110320, 110342, 110348, 110360, 110384, 110398, 110432, 110460, 110478, 110492, 110520, 110532, 110536, 110544, 110558, 110658, 110686, 110714, 110722, 110724, 110728, 110736, 110750, 110752, 110780, 110796, 110834, 110836, 110850, 110852, 110856, 110864, 110878, 110880, 110908, 110912, 110968, 110982, RestAPIAbortCodes.SEARCH_INDEXING, 111054, 111074, 111076, 111080, 111108, 111112, 111120, 111134, 111136, 111164, 111168, 111224, 111344, 111372, 111422, 111456, 111516, 111554, 111556, 111560, 111568, 111590, 111632, 111646, 111648, 111676, 111680, 111736, 111856, 112096, 112152, 112224, 112252, 112320, 112440, 112514, 112516, 112520, 112528, 112542, 112544, 112588, 112686, 112718, 112732, 112782, 112796, 112824, 112834, 112836, 112840, 112848, 112870, 112890, 112910, 112924, 112952, 113008, 113022, 113026, 113028, 113032, 113040, 113054, 113056, 113100, 113138, 113140, 113166, 113180, 113208, 113264, 113278, 113376, 113404, 113416, 113424, 113440, 113468, 113472, 113560, 113614, 113634, 113636, 113640, 113686, 113702, 113708, 113734, 113740, 113752, 113778, 113780, 113798, 113804, 113816, 113840, 113854, 113870, 113890, 113892, 113896, 113926, 113932, 113944, 113968, 113982, 114016, 114044, 114076, 114114, 114116, 114120, 114128, 114150, 114170, 114194, 114196, 114210, 114212, 114216, 114242, 114244, 114248, 114256, 114270, 114278, 114306, 114308, 114312, 114320, 114334, 114336, 114364, 114380, 114420, 114458, 114478, 114482, 114484, 114510, 114524, 114530, 114532, 114536, 114842, 114866, 114868, 114970, 114994, 114996, 115042, 115044, 115048, 115062, 115130, 115226, 115250, 115252, 115278, 115292, 115298, 115300, 115304, 115318, 115342, 115394, 115396, 115400, 115408, 115422, 115430, 115436, 115450, 115478, 115494, 115514, 115526, 115532, 115570, 115572, 115738, 115758, 115762, 115764, 115790, 115804, 115810, 115812, 115816, 115830, 115854, 115868, 115896, 115906, 115912, 115920, 115934, 115942, 115948, 115962, 115996, 116024, 116080, 116094, 116098, 116100, 116104, 116112, 116126, 116128, 116156, 116166, 116172, 116184, 116206, 116210, 116212, 116246, 116262, 116268, 116282, 116294, 116300, 116312, 116334, 116338, 116340, 116358, 116364, 116376, 116400, 116414, 116430, 116444, 116450, 116452, 116456, 116498, 116500, 116514, 116520, 116534, 116546, 116548, 116552, 116560, 116574, 116582, 116588, 116602, 116654, 116694, 116714, 116762, 116782, 116786, 116788, 116814, 116828, 116834, 116836, 116840, 116854, 116878, 116892, 116920, 116930, 116936, 116944, 116958, 116966, 116972, 116986, 117006, 117048, 117104, 117118, 117122, 117124, 117136, 117150, 117152, 117180, 117190, 117196, 117208, 117230, 117234, 117236, 117304, 117360, 117374, 117472, 117500, 117506, 117508, 117512, 117520, 117536, 117564, 117568, 117624, 117638, 117644, 117656, 117680, 117694, 117710, 117724, 117730, 117732, 117736, 117750, 117782, 117798, 117804, 117818, 117830, 117848, 117874, 117876, 117894, 117936, 117950, 117966, 117986, 117988, 117992, 118022, 118028, 118040, 118064, 118078, 118112, 118140, 118172, 118210, 118212, 118216, 118224, 118238, 118246, 118266, 118306, 118312, 118338, 118352, 118366, 118374, 118394, 118402, 118404, 118408, 118416, 118430, 118432, 118460, 118476, 118514, 118516, 118574, 118578, 118580, 118606, 118620, 118626, 118628, 118632, 118678, 118694, 118700, 118730, 118738, 118740, 118830, 118834, 118836, 118862, 118876, 118882, 118884, 118888, 118902, 118926, 118940, 118968, 118978, 118980, 118984, 118992, 119006, 119014, 119020, 119034, 119068, 119096, 119152, 119166, 119170, 119172, 119176, 119184, 119198, 119200, 119228, 119238, 119244, 119256, 119278, 119282, 119284, 119324, 119352, 119408, 119422, 119520, 119548, 119554, 119556, 119560, 119568, 119582, 119584, 119612, 119616, 119672, 119686, 119692, 119704, 119728, 119742, 119758, 119772, 119778, 119780, 119784, 119798, 119920, 119934, 120032, 120060, 120256, 120312, 120324, 120328, 120336, 120352, 120384, 120440, 120560, 120582, 120588, 120600, 120624, 120638, 120672, 120700, 120718, 120732, 120760, 120770, 120772, 120776, 120784, 120798, 120806, 120812, 120870, 120876, 120890, 120902, 120908, 120920, 120946, 120948, 120966, 120972, 120984, 121008, 121022, 121038, 121058, 121060, 121064, 121078, 121100, 121112, 121136, 121150, 121184, 121212, 121244, 121282, 121284, 121288, 121296, 121318, 121338, 121356, 121368, 121392, 121406, 121440, 121468, 121536, 121592, 121656, 121730, 121732, 121736, 121744, 121758, 121760, 121804, 121842, 121844, 121890, 121922, 121924, 121928, 121936, 121950, 121958, 121978, 121986, 121988, 121992, 122000, 122014, 122016, 122044, 122060, 122098, 122100, 122116, 122120, 122128, 122142, 122144, 122172, 122176, 122232, 122246, 122264, 122318, 122338, 122340, 122344, 122414, 122418, 122420, 122446, 122460, 122466, 122468, 122472, 122510, 122524, 122552, 122562, 122564, 122568, 122576, 122598, 122618, 122646, 122662, 122668, 122694, 122700, 122712, 122738, 122740, 122762, 122770, 122772, 122786, 122788, 122792, 123018, 123026, 123028, 123042, 123044, 123048, 123062, 123098, 123146, 123154, 123156, 123170, 123172, 123176, 123190, 123202, 123204, 123208, 123216, 123238, 123244, 123258, 123290, 123314, 123316, 123402, 123410, 123412, 123426, 123428, 123432, 123446, 123458, 123464, 123472, 123486, 123494, 123500, 123514, 123522, 123524, 123528, 123536, 123552, 123580, 123590, 123596, 123608, 123630, 123634, 123636, 123674, 123698, 123700, 123740, 123746, 123748, 123752, 123834, 123914, 123922, 123924, 123938, 123944, 123958, 123970, 123976, 123984, 123998, 124006, 124012, 124026, 124034, 124036, 124048, 124062, 124064, 124092, 124102, 124108, 124120, 124142, 124146, 124148, 124162, 124164, 124168, 124176, 124190, 124192, 124220, 124224, 124280, 124294, 124300, 124312, 124336, 124350, 124366, 124380, 124386, 124388, 124392, 124406, 124442, 124462, 124466, 124468, 124494, 124508, 124514, 124520, 124558, 124572, 124600, 124610, 124612, 124616, 124624, 124646, 124666, 124694, 124710, 124716, 124730, 124742, 124748, 124760, 124786, 124788, 124818, 124820, 124834, 124836, 124840, 124854, 124946, 124948, 124962, 124964, 124968, 124982, 124994, 124996, 125000, 125008, 125022, 125030, 125036, 125050, 125058, 125060, 125064, 125072, 125086, 125088, 125116, 125126, 125132, 125144, 125166, 125170, 125172, 125186, 125188, 125192, 125200, 125216, 125244, 125248, 125304, 125318, 125324, 125336, 125360, 125374, 125390, 125404, 125410, 125412, 125416, 125430, 125444, 125448, 125456, 125472, 125504, 125560, 125680, 125702, 125708, 125720, 125744, 125758, 125792, 125820, 125838, 125852, 125880, 125890, 125892, 125896, 125904, 125918, 125926, 125932, 125978, 125998, 126002, 126004, 126030, 126044, 126050, 126052, 126056, 126094, 126108, 126136, 126146, 126148, 126152, 126160, 126182, 126202, 126222, 126236, 126264, 126320, 126334, 126338, 126340, 126344, 126352, 126366, 126368, 126412, 126450, 126452, 126486, 126502, 126508, 126522, 126534, 126540, 126552, 126574, 126578, 126580, 126598, 126604, 126616, 126640, 126654, 126670, 126684, 126690, 126692, 126696, 126738, 126754, 126756, 126760, 126774, 126786, 126788, 126792, 126800, 126814, 126822, 126828, 126842, 126894, 126898, 126900, 126934, 127126, 127142, 127148, 127162, 127178, 127186, 127188, 127254, 127270, 127276, 127290, 127302, 127308, 127320, 127342, 127346, 127348, 127370, 127378, 127380, 127394, 127396, 127400, 127450, 127510, 127526, 127532, 127546, 127558, 127576, 127598, 127602, 127604, 127622, 127628, 127640, 127664, 127678, 127694, 127708, 127714, 127716, 127720, 127734, 127754, 127762, 127764, 127778, 127784, 127810, 127812, 127816, 127824, 127838, 127846, 127866, 127898, 127918, 127922, 127924, 128022, 128038, 128044, 128058, 128070, 128076, 128088, 128110, 128114, 128116, 128134, 128140, 128152, 128176, 128190, 128206, 128220, 128226, 128228, 128232, 128246, 128262, 128268, 128280, 128304, 128318, 128352, 128380, 128398, 128412, 128440, 128450, 128452, 128456, 128464, 128478, 128486, 128492, 128506, 128522, 128530, 128532, 128546, 128548, 128552, 128566, 128578, 128580, 128584, 128592, 128606, 128614, 128634, 128642, 128644, 128648, 128656, 128670, 128672, 128700, 128716, 128754, 128756, 128794, 128814, 128818, 128820, 128846, 128860, 128866, 128868, 128872, 128886, 128918, 128934, 128940, 128954, 128978, 128980, 129178, 129198, 129202, 129204, 129238, 129258, 129306, 129326, 129330, 129332, 129358, 129372, 129378, 129380, 129384, 129398, 129430, 129446, 129452, 129466, 129482, 129490, 129492, 129562, 129582, 129586, 129588, 129614, 129628, 129634, 129636, 129640, 129654, 129678, 129692, 129720, 129730, 129732, 129736, 129744, 129758, 129766, 129772, 129814, 129830, 129836, 129850, 129862, 129868, 129880, 129902, 129906, 129908, 129930, 129938, 129940, 129954, 129956, 129960, 129974, 130010}; /* renamed from: c reason: collision with root package name */ public static final int[] f1477c = {2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, 2779, 2774, 2773, 902, 896, 908, 868, 865, 861, 859, 2511, 873, 871, 1780, 835, 2493, 825, 2491, 842, 837, 844, 1764, 1762, 811, 810, 809, 2483, 807, 2482, 806, 2480, 815, 814, 813, 812, 2484, 817, 816, 1745, 1744, 1742, 1746, 2655, 2637, 2635, 2626, 2625, 2623, 2628, 1820, 2752, 2739, 2737, 2728, 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780, 787, 781, 747, 739, 736, 2413, 754, 752, 1719, 692, 689, 681, 2371, 678, 2369, 700, 697, 694, 703, 1688, 1686, 642, 638, 2343, 631, 2341, 627, 2338, 651, 646, 643, 2345, 654, 652, 1652, 1650, 1647, 1654, 601, 599, 2322, 596, 2321, 594, 2319, 2317, 611, 610, 608, 606, 2324, 603, 2323, 615, 614, 612, 1617, 1616, 1614, 1612, 616, 1619, 1618, 2575, 2538, 2536, 905, 901, 898, 909, 2509, 2507, 2504, 870, 867, 864, 860, 2512, 875, 872, 1781, 2490, 2489, 2487, 2485, 1748, 836, 834, 832, 830, 2494, 827, 2492, 843, 841, 839, 845, 1765, 1763, 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631, 2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, 2753, 2736, 2735, 2733, 2731, 1848, 2740, 2738, 2786, 2784, 591, 588, 576, 569, 566, 2296, 1590, 537, 534, 526, 2276, 522, 2274, 545, 542, 539, 548, 1572, 1570, 481, 2245, 466, 2242, 462, 2239, 492, 485, 482, 2249, 496, 494, 1534, 1531, 1528, 1538, 413, 2196, 406, 2191, 2188, 425, 419, 2202, 415, 2199, 432, 430, 427, 1472, 1467, 1464, 433, 1476, 1474, 368, 367, 2160, 365, 2159, 362, 2157, 2155, 2152, 378, 377, 375, 2166, 372, 2165, 369, 2162, 383, 381, 379, 2168, 1419, 1418, 1416, 1414, 385, 1411, 384, 1423, 1422, 1420, 1424, 2461, 802, 2441, 2439, 790, 786, 783, 794, 2409, 2406, 2403, 750, 742, 738, 2414, 756, 753, 1720, 2367, 2365, 2362, 2359, 1663, 693, 691, 684, 2373, 680, 2370, 702, 699, 696, 704, 1690, 1687, 2337, 2336, 2334, 2332, 1624, 2329, 1622, 640, 637, 2344, 634, 2342, 630, 2340, 650, 648, 645, 2346, 655, 653, 1653, 1651, 1649, 1655, 2612, 2597, 2595, 2571, 2568, 2565, 2576, 2534, 2529, 2526, 1787, 2540, 2537, 907, 904, 900, 910, 2503, 2502, GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES, 2498, 1768, 2495, 1767, 2510, 2508, 2506, 869, 866, 863, 2513, 876, 874, 1782, 2720, 2713, 2711, 2697, 2694, 2691, 2702, 2672, 2670, 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823, 2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, 2762, 1850, 1849, 2751, 2749, 2747, 2754, 353, 2148, 344, 342, 336, 2142, 332, 2140, 345, 1375, 1373, 306, 2130, 299, 2128, 295, 2125, 319, 314, 311, 2132, 1354, 1352, 1349, 1356, 262, 257, 2101, 253, 2096, 2093, 274, AudioAttributesCompat.FLAG_ALL_PUBLIC, 267, 2107, 263, 2104, 280, 278, 275, 1316, 1311, 1308, 1320, 1318, 2052, 202, 2050, 2044, 2040, 219, 2063, 212, 2060, 208, 2055, 224, 221, 2066, 1260, 1258, 1252, 231, 1248, 229, 1266, 1264, 1261, 1268, 155, 1998, 153, 1996, 1994, 1991, 1988, 165, 164, 2007, 162, 2006, 159, 2003, 2000, 172, 171, 169, 2012, 166, 2010, 1186, 1184, 1182, 1179, HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION, 1176, 173, 1192, 1191, 1189, 1187, 176, 1194, 1193, 2313, 2307, 2305, 592, 589, 2294, 2292, 2289, 578, 572, 568, 2297, 580, 1591, 2272, 2267, 2264, 1547, 538, 536, 529, 2278, 525, 2275, 547, 544, 541, 1574, 1571, 2237, 2235, 2229, 1493, 2225, 1489, 478, 2247, 470, 2244, 465, 2241, 493, 488, 484, 2250, 498, 495, 1536, 1533, 1530, 1539, 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427, 414, 412, 2197, 409, 2195, 405, 2193, 2190, 426, 424, 421, 2203, 418, 2201, 431, 429, 1473, 1471, 1469, 1466, 434, 1477, 1475, 2478, 2472, 2470, 2459, 2457, 2454, 2462, 803, 2437, 2432, 2429, 1726, 2443, 2440, 792, 789, 785, 2401, 2399, 2393, 1702, 2389, 1699, 2411, 2408, 2405, 745, 741, 2415, 758, 755, 1721, 2358, 2357, 2355, 2353, 1661, 2350, 1660, 2347, 1657, 2368, 2366, 2364, 2361, 1666, 690, 687, 2374, 683, 2372, 701, 698, 705, 1691, 1689, 2619, 2617, 2610, 2608, 2605, 2613, 2593, 2588, 2585, 1803, 2599, 2596, 2563, 2561, 2555, 1797, 2551, 1795, 2573, 2570, 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785, 2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, 906, 903, 911, 2721, 1844, 2715, 2712, 1838, 1836, 2699, 2696, 2693, 2703, 1827, 1826, 1824, 2673, 2671, 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854, 1853, 1851, 1856, 2766, 2764, 143, 1987, 139, 1986, 135, 133, 131, 1984, 128, 1983, 125, 1981, 138, 137, 136, 1985, 1133, 1132, 1130, 112, 110, 1974, 107, 1973, 104, 1971, 1969, 122, 121, 119, 117, 1977, 114, 1976, 124, 1115, 1114, 1112, 1110, 1117, 1116, 84, 83, 1953, 81, 1952, 78, 1950, 1948, 1945, 94, 93, 91, 1959, 88, 1958, 85, 1955, 99, 97, 95, 1961, 1086, 1085, 1083, 1081, 1078, 100, 1090, 1089, 1087, 1091, 49, 47, 1917, 44, 1915, 1913, 1910, 1907, 59, 1926, 56, 1925, 53, 1922, 1919, 66, 64, 1931, 61, 1929, 1042, 1040, 1038, 71, 1035, 70, 1032, 68, 1048, 1047, 1045, 1043, 1050, 1049, 12, 10, 1869, 1867, 1864, 1861, 21, 1880, 19, 1877, 1874, 1871, 28, 1888, 25, 1886, 22, 1883, 982, 980, 977, 974, 32, 30, 991, 989, 987, 984, 34, 995, 994, 992, 2151, 2150, 2147, 2146, 2144, 356, 355, 354, 2149, 2139, 2138, 2136, 2134, 1359, 343, 341, 338, 2143, 335, 2141, 348, 347, 346, 1376, 1374, 2124, 2123, 2121, 2119, 1326, 2116, 1324, 310, 308, 305, 2131, 302, 2129, 298, 2127, 320, 318, 316, 313, 2133, 322, 321, 1355, 1353, 1351, 1357, 2092, 2091, 2089, 2087, 1276, 2084, 1274, 2081, 1271, 259, 2102, 256, 2100, 252, 2098, 2095, 272, 269, 2108, 266, 2106, 281, 279, 277, 1317, 1315, 1313, 1310, 282, 1321, 1319, 2039, 2037, 2035, 2032, 1203, 2029, 1200, 1197, 207, 2053, 205, 2051, 201, 2049, 2046, 2043, 220, 218, 2064, 215, 2062, 211, 2059, 228, 226, 223, 2069, 1259, 1257, 1254, 232, 1251, 230, 1267, 1265, 1263, 2316, 2315, 2312, 2311, 2309, 2314, 2304, 2303, 2301, 2299, 1593, 2308, 2306, 590, 2288, 2287, 2285, 2283, 1578, 2280, 1577, 2295, 2293, 2291, 579, 577, 574, 571, 2298, 582, 581, 1592, 2263, 2262, 2260, 2258, 1545, 2255, 1544, 2252, 1541, 2273, 2271, 2269, 2266, 1550, 535, 532, 2279, 528, 2277, 546, 543, 549, 1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214, 1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, 480, 477, 2248, 473, 2246, 469, 2243, 490, 487, 2251, 497, 1537, 1535, 1532, 2477, 2476, 2474, 2479, 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452, 2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, 805, 804, 2428, 2427, 2425, 2423, 1725, 2420, 1724, 2417, 1722, 2438, 2436, 2434, 2431, 1727, 2444, 2442, 793, 791, 788, 795, 2388, 2386, 2384, 1697, 2381, 1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, 2392, 1701, 2412, 2410, 2407, 751, 748, 744, 2416, 759, 757, 1807, 2620, 2618, 1806, 1805, 2611, 2609, 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587, 1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, 2560, 2557, 1798, 2554, 1796, 2574, 2572, 2569, 2578, 1847, 1846, 2722, 1843, 1842, 1840, 1845, 2716, 2714, 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695, 2704, 1817, 1811, 1810, 897, 862, 1777, 829, 826, 838, 1760, 1758, 808, 2481, 1741, 1740, 1738, 1743, 2624, 1818, 2726, 2776, 782, 740, 737, 1715, 686, 679, 695, 1682, 1680, 639, 628, 2339, 647, 644, 1645, 1643, 1640, 1648, 602, 600, 597, 595, 2320, 593, 2318, 609, 607, 604, 1611, 1610, 1608, 1606, 613, 1615, 1613, 2328, 926, 924, 892, 886, 899, 857, 850, 2505, 1778, 824, 823, 821, 819, 2488, 818, 2486, 833, 831, 828, 840, 1761, 1759, 2649, 2632, 2630, 2746, 2734, 2732, 2782, 2781, 570, 567, 1587, 531, 527, 523, 540, 1566, 1564, 476, 467, 463, 2240, 486, 483, 1524, 1521, 1518, 1529, 411, 403, 2192, 399, 2189, 423, 416, 1462, 1457, 1454, 428, 1468, 1465, 2210, 366, 363, 2158, 360, 2156, 357, 2153, 376, 373, 370, 2163, 1410, 1409, 1407, 1405, 382, 1402, 380, 1417, 1415, 1412, 1421, 2175, 2174, 777, 774, 771, 784, 732, 725, 722, 2404, 743, 1716, 676, 674, 668, 2363, 665, 2360, 685, 1684, 1681, 626, 624, 622, 2335, 620, 2333, 617, 2330, 641, 635, 649, 1646, 1644, 1642, 2566, 928, 925, 2530, 2527, 894, 891, 888, 2501, 2499, 2496, 858, 856, 854, 851, 1779, 2692, 2668, 2665, 2645, 2643, 2640, 2651, 2768, 2759, 2757, 2744, 2743, 2741, 2748, 352, 1382, 340, 337, 333, 1371, 1369, 307, 300, 296, 2126, 315, 312, 1347, 1342, 1350, 261, 258, 250, 2097, 246, 2094, 271, 268, 264, 1306, 1301, 1298, 276, 1312, 1309, 2115, 203, 2048, 195, 2045, 191, 2041, 213, 209, 2056, 1246, 1244, 1238, HideBottomViewOnScrollBehavior.ENTER_ANIMATION_DURATION, 1234, 222, 1256, 1253, 1249, 1262, 2080, 2079, 154, 1997, FontUtils.MAX_FONT_SCALING, 1995, 147, 1992, 1989, 163, 160, 2004, 156, 2001, 1175, 1174, 1172, 1170, 1167, 170, 1164, 167, 1185, 1183, 1180, 1177, 174, 1190, 1188, 2025, 2024, 2022, 587, 586, 564, 559, 556, 2290, 573, 1588, 520, 518, 512, 2268, 508, 2265, 530, 1568, 1565, 461, 457, 2233, 450, 2230, 446, 2226, 479, 471, 489, 1526, 1523, 1520, 397, 395, 2185, 392, 2183, 389, 2180, 2177, 410, 2194, 402, 422, 1463, 1461, 1459, 1456, 1470, 2455, 799, 2433, 2430, 779, 776, 773, 2397, 2394, 2390, 734, 728, 724, 746, 1717, 2356, 2354, 2351, 2348, 1658, 677, 675, 673, 670, 667, 688, 1685, 1683, 2606, 2589, 2586, 2559, 2556, 2552, 927, 2523, 2521, 2518, 2515, 1784, 2532, 895, 893, 890, 2718, 2709, 2707, 2689, 2687, 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852, 2760, 2758, 142, 141, 1139, 1138, 134, 132, 129, 126, 1982, 1129, 1128, 1126, 1131, 113, 111, 108, 105, 1972, 101, 1970, 120, 118, 115, 1109, 1108, 1106, 1104, 123, 1113, 1111, 82, 79, 1951, 75, 1949, 72, 1946, 92, 89, 86, 1956, 1077, 1076, 1074, 1072, 98, 1069, 96, 1084, 1082, 1079, 1088, 1968, 1967, 48, 45, 1916, 42, 1914, 39, 1911, 1908, 60, 57, 54, 1923, 50, 1920, 1031, 1030, 1028, 1026, 67, AudioAttributesCompat.FLAG_ALL, 65, PointerIconCompat.TYPE_GRAB, 62, 1041, 1039, 1036, 1033, 69, 1046, 1044, 1944, 1943, 1941, 11, 9, 1868, 7, 1865, 1862, 1859, 20, 1878, 16, 1875, 13, 1872, 970, 968, 966, 963, 29, 960, 26, 23, 983, 981, 978, 975, 33, 971, 31, 990, 988, 985, 1906, 1904, 1902, 993, 351, 2145, 1383, 331, 330, 328, 326, 2137, 323, 2135, 339, 1372, 1370, 294, 293, 291, 289, 2122, 286, 2120, 283, 2117, 309, 303, 317, 1348, 1346, 1344, 245, 244, 242, 2090, 239, 2088, 236, 2085, 2082, 260, 2099, 249, 270, 1307, 1305, 1303, 1300, 1314, 189, 2038, 186, 2036, 183, 2033, 2030, 2026, 206, 198, 2047, 194, 216, 1247, 1245, 1243, 1240, 227, 1237, 1255, 2310, 2302, 2300, 2286, 2284, 2281, 565, 563, 561, 558, 575, 1589, 2261, 2259, 2256, 2253, 1542, 521, 519, 517, 514, 2270, FrameMetricsAggregator.EVERY_DURATION, 533, 1569, 1567, 2223, 2221, 2218, 2215, 1483, 2211, 1480, 459, 456, 453, 2232, 449, 474, 491, 1527, 1525, 1522, 2475, 2467, 2465, 2451, 2449, 2446, 801, 800, 2426, 2424, 2421, 2418, 1723, 2435, 780, 778, 775, 2387, 2385, 2382, 2379, 1695, 2375, 1693, 2396, 735, 733, 730, 727, 749, 1718, 2616, 2615, 2604, 2603, 2601, 2584, 2583, 2581, 2579, ModelInvite.Settings.HALF_HOUR, 2591, 2550, 2549, 2547, 2545, 1792, 2542, 1790, 2558, 929, 2719, 1841, 2710, 2708, 1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, 1756, 1754, 1737, 1736, 1734, 1739, 1816, 1711, 1676, 1674, 633, 629, 1638, 1636, 1633, 1641, 598, 1605, 1604, 1602, 1600, 605, 1609, 1607, 2327, 887, 853, 1775, 822, 820, 1757, 1755, 1584, 524, 1560, 1558, 468, 464, 1514, 1511, 1508, 1519, 408, 404, 400, 1452, 1447, 1444, 417, 1458, 1455, 2208, 364, 361, 358, 2154, 1401, 1400, 1398, 1396, 374, 1393, 371, 1408, 1406, 1403, 1413, 2173, 2172, 772, 726, 723, 1712, 672, 669, 666, 682, 1678, 1675, 625, 623, 621, 618, 2331, 636, 632, 1639, 1637, 1635, 920, 918, 884, 880, 889, 849, 848, 847, 846, 2497, 855, 852, 1776, 2641, 2742, 2787, 1380, 334, 1367, 1365, 301, 297, 1340, 1338, 1335, 1343, 255, 251, 247, 1296, 1291, 1288, 265, 1302, 1299, 2113, 204, 196, 192, 2042, 1232, 1230, 1224, 214, 1220, 210, 1242, 1239, 1235, 1250, 2077, 2075, 151, 148, 1993, 144, 1990, 1163, 1162, 1160, 1158, 1155, 161, 1152, 157, 1173, 1171, 1168, 1165, 168, 1181, 1178, 2021, 2020, 2018, 2023, 585, 560, 557, 1585, 516, 509, 1562, 1559, 458, 447, 2227, 472, 1516, 1513, 1510, 398, 396, 393, 390, 2181, 386, 2178, 407, 1453, 1451, 1449, 1446, 420, 1460, 2209, 769, 764, 720, 712, 2391, 729, 1713, 664, 663, 661, 659, 2352, 656, 2349, 671, 1679, 1677, 2553, 922, 919, 2519, 2516, 885, 883, 881, 2685, 2661, 2659, 2767, 2756, 2755, 140, 1137, 1136, 130, 127, 1125, 1124, 1122, 1127, 109, 106, 102, 1103, 1102, 1100, 1098, 116, 1107, 1105, 1980, 80, 76, 73, 1947, 1068, 1067, 1065, 1063, 90, 1060, 87, 1075, 1073, 1070, WidgetEditUserOrGuildMemberProfile.MAX_BANNER_IMAGE_SIZE, 1966, 1965, 46, 43, 40, 1912, 36, 1909, PointerIconCompat.TYPE_ZOOM_OUT, PointerIconCompat.TYPE_ZOOM_IN, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, PointerIconCompat.TYPE_HORIZONTAL_DOUBLE_ARROW, 58, PointerIconCompat.TYPE_COPY, 55, PointerIconCompat.TYPE_TEXT, 51, 1029, 1027, 1024, PointerIconCompat.TYPE_GRABBING, 63, 1037, 1034, 1940, 1939, 1937, 1942, 8, 1866, 4, 1863, 1, 1860, 956, 954, 952, 949, 946, 17, 14, 969, 967, 964, 961, 27, 957, 24, 979, 976, 972, 1901, 1900, 1898, 1896, 986, 1905, 1903, 350, 349, 1381, 329, 327, 324, 1368, 1366, 292, 290, 287, 284, 2118, 304, 1341, 1339, 1337, 1345, 243, 240, 237, 2086, 233, 2083, 254, 1297, 1295, 1293, 1290, 1304, 2114, 190, 187, 184, 2034, BaseTransientBottomBar.ANIMATION_FADE_DURATION, 2031, 177, 2027, 199, 1233, 1231, 1229, 1226, 217, 1223, 1241, 2078, 2076, 584, 555, 554, 552, 550, 2282, 562, 1586, 507, 506, 504, 502, 2257, 499, 2254, 515, 1563, 1561, 445, 443, 441, 2219, 438, 2216, 435, 2212, 460, 454, 475, 1517, 1515, 1512, 2447, 798, 797, 2422, 2419, 770, 768, 766, 2383, 2380, 2376, 721, 719, 717, 714, 731, 1714, 2602, 2582, 2580, 2548, 2546, 2543, 923, 921, 2717, 2706, 2705, 2683, 2682, 2680, 1771, 1752, 1750, 1733, 1732, 1731, 1735, 1814, 1707, 1670, 1668, 1631, 1629, 1626, 1634, 1599, 1598, 1596, 1594, 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552, 1504, 1501, 1498, 1509, 1442, 1437, 1434, 401, 1448, 1445, 2206, 1392, 1391, 1389, 1387, 1384, 359, 1399, 1397, 1394, 1404, 2171, 2170, 1708, 1672, 1669, 619, 1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328, 1336, 1286, 1281, 1278, 248, 1292, 1289, 2111, 1218, 1216, 1210, 197, 1206, 193, 1228, 1225, 1221, 1236, 2073, 2071, 1151, 1150, 1148, 1146, 152, 1143, 149, 1140, 145, 1161, 1159, 1156, 1153, 158, 1169, 1166, 2017, 2016, 2014, 2019, 1582, 510, 1556, 1553, 452, 448, 1506, 1500, 394, 391, 387, 1443, 1441, 1439, 1436, 1450, 2207, 765, 716, 713, 1709, 662, 660, 657, 1673, 1671, 916, 914, 879, 878, 877, 882, 1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, 1092, 103, 1101, 1099, 1979, 1059, 1058, 1056, 1054, 77, 1051, 74, 1066, 1064, 1061, 1071, 1964, 1963, PointerIconCompat.TYPE_CROSSHAIR, PointerIconCompat.TYPE_CELL, PointerIconCompat.TYPE_WAIT, PointerIconCompat.TYPE_HAND, RoomDatabase.MAX_BIND_PARAMETER_CNT, 41, 996, 37, PointerIconCompat.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW, PointerIconCompat.TYPE_VERTICAL_DOUBLE_ARROW, PointerIconCompat.TYPE_NO_DROP, PointerIconCompat.TYPE_VERTICAL_TEXT, 52, InputDeviceCompat.SOURCE_GAMEPAD, 1022, 1936, 1935, 1933, 1938, 942, 940, 938, 935, 932, 5, 2, 955, 953, 950, 947, 18, 943, 15, 965, 962, 958, 1895, 1894, 1892, 1890, 973, 1899, 1897, 1379, 325, 1364, 1362, ScreenShareManager.THUMBNAIL_HEIGHT_PX, 285, 1334, 1332, 1330, 241, 238, 234, 1287, 1285, 1283, 1280, 1294, 2112, 188, 185, 181, 178, 2028, 1219, 1217, 1215, 1212, 200, 1209, 1227, 2074, 2072, 583, 553, 551, 1583, 505, 503, 500, InputDeviceCompat.SOURCE_DPAD, 1557, 1555, 444, 442, 439, 436, 2213, 455, 451, 1507, 1505, 1502, 796, 763, 762, 760, 767, 711, 710, 708, 706, 2377, 718, 715, 1710, 2544, 917, 915, 2681, 1627, 1597, 1595, 2325, 1769, 1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, 1395, 2169, 2167, 1704, 1665, 1662, 1625, 1623, 1620, 1770, 1329, 1282, 1279, 2109, 1214, 1207, 1222, 2068, 2065, 1149, 1147, 1144, 1141, 146, 1157, 1154, 2013, 2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, 1431, 1428, 1425, 388, 1440, 2205, 1705, 658, 1667, 1664, 1119, 1095, 1093, 1978, 1057, 1055, 1052, 1062, 1962, 1960, 1005, PointerIconCompat.TYPE_HELP, 1000, 997, 38, PointerIconCompat.TYPE_ALL_SCROLL, PointerIconCompat.TYPE_ALIAS, 1932, 1930, 1927, 1934, 941, 939, 936, 933, 6, 930, 3, 951, 948, 944, 1889, 1887, 1884, 1881, 959, 1893, 1891, 35, 1377, 1360, 1358, 1327, 1325, 1322, 1331, 1277, 1275, 1272, 1269, 235, 1284, 2110, 1205, 1204, 1201, 1198, 182, 1195, 179, 1213, 2070, 2067, 1580, 501, 1551, 1548, 440, 437, 1497, 1494, 1490, 1503, 761, 709, 707, 1706, 913, 912, 2198, 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054, 1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, 2200, 1698, 1659, 1656, 1975, 1053, 1957, 1954, PointerIconCompat.TYPE_CONTEXT_MENU, 998, 1924, 1921, 1918, 1928, 937, 934, 931, 1879, 1876, 1873, 1870, 945, 1885, 1882, 1323, 1273, 1270, 2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, 1540, 1484, 1481, 1478, 1491, 1700}; diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemove.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemove.java new file mode 100644 index 0000000000..a7d4d14756 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemove.java @@ -0,0 +1,18 @@ +package com.discord.analytics.generated.events; + +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackLocationMetadata; +import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountAccountRemove.kt */ +public final class TrackMultiAccountAccountRemove implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver { + private final transient String analyticsSchemaTypeName = "multi_account_account_remove"; + private TrackBase trackBase; + private TrackLocationMetadata trackLocationMetadata; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemoveReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemoveReceiver.java new file mode 100644 index 0000000000..f3f50883ac --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountAccountRemoveReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountAccountRemove.kt */ +public interface TrackMultiAccountAccountRemoveReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttempt.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttempt.java new file mode 100644 index 0000000000..f373b14864 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttempt.java @@ -0,0 +1,18 @@ +package com.discord.analytics.generated.events; + +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackLocationMetadata; +import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountSwitchAttempt.kt */ +public final class TrackMultiAccountSwitchAttempt implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver { + private final transient String analyticsSchemaTypeName = "multi_account_switch_attempt"; + private TrackBase trackBase; + private TrackLocationMetadata trackLocationMetadata; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttemptReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttemptReceiver.java new file mode 100644 index 0000000000..8aa840a8d5 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchAttemptReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountSwitchAttempt.kt */ +public interface TrackMultiAccountSwitchAttemptReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailure.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailure.java new file mode 100644 index 0000000000..9c33c5aa8f --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailure.java @@ -0,0 +1,15 @@ +package com.discord.analytics.generated.events; + +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountSwitchFailure.kt */ +public final class TrackMultiAccountSwitchFailure implements AnalyticsSchema, TrackBaseReceiver { + private final transient String analyticsSchemaTypeName = "multi_account_switch_failure"; + private TrackBase trackBase; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailureReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailureReceiver.java new file mode 100644 index 0000000000..b7f0eaf05f --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchFailureReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountSwitchFailure.kt */ +public interface TrackMultiAccountSwitchFailureReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccess.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccess.java new file mode 100644 index 0000000000..36ac534ade --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccess.java @@ -0,0 +1,49 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +import java.util.List; +/* compiled from: TrackMultiAccountSwitchSuccess.kt */ +public final class TrackMultiAccountSwitchSuccess implements AnalyticsSchema, TrackBaseReceiver { + private final transient String analyticsSchemaTypeName = "multi_account_switch_success"; + private final Long fromUserId = null; + private final List linkedUserIds = null; + private TrackBase trackBase; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackMultiAccountSwitchSuccess)) { + return false; + } + TrackMultiAccountSwitchSuccess trackMultiAccountSwitchSuccess = (TrackMultiAccountSwitchSuccess) obj; + return m.areEqual(this.fromUserId, trackMultiAccountSwitchSuccess.fromUserId) && m.areEqual(this.linkedUserIds, trackMultiAccountSwitchSuccess.linkedUserIds); + } + + public int hashCode() { + Long l = this.fromUserId; + int i = 0; + int hashCode = (l != null ? l.hashCode() : 0) * 31; + List list = this.linkedUserIds; + if (list != null) { + i = list.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("TrackMultiAccountSwitchSuccess(fromUserId="); + R.append(this.fromUserId); + R.append(", linkedUserIds="); + return a.J(R, this.linkedUserIds, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccessReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccessReceiver.java new file mode 100644 index 0000000000..bcfb63769f --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMultiAccountSwitchSuccessReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackMultiAccountSwitchSuccess.kt */ +public interface TrackMultiAccountSwitchSuccessReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2.java new file mode 100644 index 0000000000..85beee9095 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2.java @@ -0,0 +1,51 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackRoleSubscriptionListingDeletedV2.kt */ +public final class TrackRoleSubscriptionListingDeletedV2 implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver { + private final transient String analyticsSchemaTypeName = "role_subscription_listing_deleted_v2"; + private final Long roleSubscriptionGroupListingId = null; + private final Long roleSubscriptionListingId = null; + private TrackBase trackBase; + private TrackGuild trackGuild; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackRoleSubscriptionListingDeletedV2)) { + return false; + } + TrackRoleSubscriptionListingDeletedV2 trackRoleSubscriptionListingDeletedV2 = (TrackRoleSubscriptionListingDeletedV2) obj; + return m.areEqual(this.roleSubscriptionListingId, trackRoleSubscriptionListingDeletedV2.roleSubscriptionListingId) && m.areEqual(this.roleSubscriptionGroupListingId, trackRoleSubscriptionListingDeletedV2.roleSubscriptionGroupListingId); + } + + public int hashCode() { + Long l = this.roleSubscriptionListingId; + int i = 0; + int hashCode = (l != null ? l.hashCode() : 0) * 31; + Long l2 = this.roleSubscriptionGroupListingId; + if (l2 != null) { + i = l2.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("TrackRoleSubscriptionListingDeletedV2(roleSubscriptionListingId="); + R.append(this.roleSubscriptionListingId); + R.append(", roleSubscriptionGroupListingId="); + return a.F(R, this.roleSubscriptionGroupListingId, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2Receiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2Receiver.java new file mode 100644 index 0000000000..1f3aff14ba --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingDeletedV2Receiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackRoleSubscriptionListingDeletedV2.kt */ +public interface TrackRoleSubscriptionListingDeletedV2Receiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2.java new file mode 100644 index 0000000000..7c1a1dbdbc --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2.java @@ -0,0 +1,51 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackRoleSubscriptionListingPublishedV2.kt */ +public final class TrackRoleSubscriptionListingPublishedV2 implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver { + private final transient String analyticsSchemaTypeName = "role_subscription_listing_published_v2"; + private final Long roleSubscriptionGroupListingId = null; + private final Long roleSubscriptionListingId = null; + private TrackBase trackBase; + private TrackGuild trackGuild; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackRoleSubscriptionListingPublishedV2)) { + return false; + } + TrackRoleSubscriptionListingPublishedV2 trackRoleSubscriptionListingPublishedV2 = (TrackRoleSubscriptionListingPublishedV2) obj; + return m.areEqual(this.roleSubscriptionListingId, trackRoleSubscriptionListingPublishedV2.roleSubscriptionListingId) && m.areEqual(this.roleSubscriptionGroupListingId, trackRoleSubscriptionListingPublishedV2.roleSubscriptionGroupListingId); + } + + public int hashCode() { + Long l = this.roleSubscriptionListingId; + int i = 0; + int hashCode = (l != null ? l.hashCode() : 0) * 31; + Long l2 = this.roleSubscriptionGroupListingId; + if (l2 != null) { + i = l2.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("TrackRoleSubscriptionListingPublishedV2(roleSubscriptionListingId="); + R.append(this.roleSubscriptionListingId); + R.append(", roleSubscriptionGroupListingId="); + return a.F(R, this.roleSubscriptionGroupListingId, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2Receiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2Receiver.java new file mode 100644 index 0000000000..e0814b83a7 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingPublishedV2Receiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackRoleSubscriptionListingPublishedV2.kt */ +public interface TrackRoleSubscriptionListingPublishedV2Receiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2.java new file mode 100644 index 0000000000..ad97932467 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2.java @@ -0,0 +1,51 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackRoleSubscriptionListingUpdatedV2.kt */ +public final class TrackRoleSubscriptionListingUpdatedV2 implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver { + private final transient String analyticsSchemaTypeName = "role_subscription_listing_updated_v2"; + private final Long roleSubscriptionGroupListingId = null; + private final Long roleSubscriptionListingId = null; + private TrackBase trackBase; + private TrackGuild trackGuild; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackRoleSubscriptionListingUpdatedV2)) { + return false; + } + TrackRoleSubscriptionListingUpdatedV2 trackRoleSubscriptionListingUpdatedV2 = (TrackRoleSubscriptionListingUpdatedV2) obj; + return m.areEqual(this.roleSubscriptionListingId, trackRoleSubscriptionListingUpdatedV2.roleSubscriptionListingId) && m.areEqual(this.roleSubscriptionGroupListingId, trackRoleSubscriptionListingUpdatedV2.roleSubscriptionGroupListingId); + } + + public int hashCode() { + Long l = this.roleSubscriptionListingId; + int i = 0; + int hashCode = (l != null ? l.hashCode() : 0) * 31; + Long l2 = this.roleSubscriptionGroupListingId; + if (l2 != null) { + i = l2.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("TrackRoleSubscriptionListingUpdatedV2(roleSubscriptionListingId="); + R.append(this.roleSubscriptionListingId); + R.append(", roleSubscriptionGroupListingId="); + return a.F(R, this.roleSubscriptionGroupListingId, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2Receiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2Receiver.java new file mode 100644 index 0000000000..4e7673267b --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpdatedV2Receiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackRoleSubscriptionListingUpdatedV2.kt */ +public interface TrackRoleSubscriptionListingUpdatedV2Receiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewed.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewed.java index 706f7b1ab3..b7f8dab3ec 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewed.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewed.java @@ -12,37 +12,19 @@ import d0.z.d.m; import java.util.List; /* compiled from: TrackRoleSubscriptionListingUpsellPageViewed.kt */ public final class TrackRoleSubscriptionListingUpsellPageViewed implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver { - private final transient String analyticsSchemaTypeName; - private final Boolean isPremiumMember; - private final Long roleSubscriptionGroupListingId; - private final List roleSubscriptionListingIds; + private final transient String analyticsSchemaTypeName = "role_subscription_listing_upsell_page_viewed"; + private final Boolean isPremiumMember = null; + private final Long roleSubscriptionGroupListingId = null; + private final List roleSubscriptionListingIds = null; private TrackBase trackBase; private TrackChannel trackChannel; private TrackGuild trackGuild; - public TrackRoleSubscriptionListingUpsellPageViewed() { - this.roleSubscriptionGroupListingId = null; - this.roleSubscriptionListingIds = null; - this.isPremiumMember = null; - this.analyticsSchemaTypeName = "role_subscription_listing_upsell_page_viewed"; - } - - public TrackRoleSubscriptionListingUpsellPageViewed(Long l, List list, Boolean bool) { - this.roleSubscriptionGroupListingId = l; - this.roleSubscriptionListingIds = list; - this.isPremiumMember = bool; - this.analyticsSchemaTypeName = "role_subscription_listing_upsell_page_viewed"; - } - @Override // com.discord.api.science.AnalyticsSchema public String b() { return this.analyticsSchemaTypeName; } - public void c(TrackBase trackBase) { - this.trackBase = trackBase; - } - public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2.java new file mode 100644 index 0000000000..b127175309 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2.java @@ -0,0 +1,78 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackChannel; +import com.discord.analytics.generated.traits.TrackChannelReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +import java.util.List; +/* compiled from: TrackRoleSubscriptionListingUpsellPageViewedV2.kt */ +public final class TrackRoleSubscriptionListingUpsellPageViewedV2 implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver { + private final transient String analyticsSchemaTypeName; + private final Boolean isPremiumMember; + private final Long roleSubscriptionGroupListingId; + private final List roleSubscriptionListingIds; + private TrackBase trackBase; + private TrackChannel trackChannel; + private TrackGuild trackGuild; + + public TrackRoleSubscriptionListingUpsellPageViewedV2() { + this.roleSubscriptionGroupListingId = null; + this.roleSubscriptionListingIds = null; + this.isPremiumMember = null; + this.analyticsSchemaTypeName = "role_subscription_listing_upsell_page_viewed_v2"; + } + + public TrackRoleSubscriptionListingUpsellPageViewedV2(Long l, List list, Boolean bool) { + this.roleSubscriptionGroupListingId = l; + this.roleSubscriptionListingIds = list; + this.isPremiumMember = bool; + this.analyticsSchemaTypeName = "role_subscription_listing_upsell_page_viewed_v2"; + } + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public void c(TrackBase trackBase) { + this.trackBase = trackBase; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackRoleSubscriptionListingUpsellPageViewedV2)) { + return false; + } + TrackRoleSubscriptionListingUpsellPageViewedV2 trackRoleSubscriptionListingUpsellPageViewedV2 = (TrackRoleSubscriptionListingUpsellPageViewedV2) obj; + return m.areEqual(this.roleSubscriptionGroupListingId, trackRoleSubscriptionListingUpsellPageViewedV2.roleSubscriptionGroupListingId) && m.areEqual(this.roleSubscriptionListingIds, trackRoleSubscriptionListingUpsellPageViewedV2.roleSubscriptionListingIds) && m.areEqual(this.isPremiumMember, trackRoleSubscriptionListingUpsellPageViewedV2.isPremiumMember); + } + + public int hashCode() { + Long l = this.roleSubscriptionGroupListingId; + int i = 0; + int hashCode = (l != null ? l.hashCode() : 0) * 31; + List list = this.roleSubscriptionListingIds; + int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31; + Boolean bool = this.isPremiumMember; + if (bool != null) { + i = bool.hashCode(); + } + return hashCode2 + i; + } + + public String toString() { + StringBuilder R = a.R("TrackRoleSubscriptionListingUpsellPageViewedV2(roleSubscriptionGroupListingId="); + R.append(this.roleSubscriptionGroupListingId); + R.append(", roleSubscriptionListingIds="); + R.append(this.roleSubscriptionListingIds); + R.append(", isPremiumMember="); + return a.C(R, this.isPremiumMember, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2Receiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2Receiver.java new file mode 100644 index 0000000000..294d7c31c8 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackRoleSubscriptionListingUpsellPageViewedV2Receiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackRoleSubscriptionListingUpsellPageViewedV2.kt */ +public interface TrackRoleSubscriptionListingUpsellPageViewedV2Receiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauth.java b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauth.java new file mode 100644 index 0000000000..d6124cfbc4 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauth.java @@ -0,0 +1,37 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackUserReauth.kt */ +public final class TrackUserReauth implements AnalyticsSchema, TrackBaseReceiver { + private final transient String analyticsSchemaTypeName = "user_reauth"; + private final Boolean success = null; + private TrackBase trackBase; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof TrackUserReauth) && m.areEqual(this.success, ((TrackUserReauth) obj).success); + } + return true; + } + + public int hashCode() { + Boolean bool = this.success; + if (bool != null) { + return bool.hashCode(); + } + return 0; + } + + public String toString() { + return a.C(a.R("TrackUserReauth(success="), this.success, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheck.java b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheck.java new file mode 100644 index 0000000000..7516772bcc --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheck.java @@ -0,0 +1,37 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackUserReauthCheck.kt */ +public final class TrackUserReauthCheck implements AnalyticsSchema, TrackBaseReceiver { + private final transient String analyticsSchemaTypeName = "user_reauth_check"; + private final Boolean requireAuth = null; + private TrackBase trackBase; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof TrackUserReauthCheck) && m.areEqual(this.requireAuth, ((TrackUserReauthCheck) obj).requireAuth); + } + return true; + } + + public int hashCode() { + Boolean bool = this.requireAuth; + if (bool != null) { + return bool.hashCode(); + } + return 0; + } + + public String toString() { + return a.C(a.R("TrackUserReauthCheck(requireAuth="), this.requireAuth, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheckReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheckReceiver.java new file mode 100644 index 0000000000..91f602fcff --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthCheckReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackUserReauthCheck.kt */ +public interface TrackUserReauthCheckReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthReceiver.java new file mode 100644 index 0000000000..8d99bd205e --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackUserReauthReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackUserReauth.kt */ +public interface TrackUserReauthReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLanding.java b/app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLanding.java new file mode 100644 index 0000000000..c831b5443c --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLanding.java @@ -0,0 +1,27 @@ +package com.discord.analytics.generated.events.impression; + +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackChannel; +import com.discord.analytics.generated.traits.TrackChannelReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.analytics.generated.traits.TrackImpressionMetadata; +import com.discord.analytics.generated.traits.TrackImpressionMetadataReceiver; +import com.discord.analytics.generated.traits.TrackLocationMetadata; +import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackImpressionMultiAccountSwitchLanding.kt */ +public final class TrackImpressionMultiAccountSwitchLanding implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver, TrackLocationMetadataReceiver, TrackImpressionMetadataReceiver { + private final transient String analyticsSchemaTypeName = "impression_multi_account_switch_landing"; + private TrackBase trackBase; + private TrackChannel trackChannel; + private TrackGuild trackGuild; + private TrackImpressionMetadata trackImpressionMetadata; + private TrackLocationMetadata trackLocationMetadata; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLandingReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLandingReceiver.java new file mode 100644 index 0000000000..5a96710d16 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/impression/TrackImpressionMultiAccountSwitchLandingReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events.impression; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackImpressionMultiAccountSwitchLanding.kt */ +public interface TrackImpressionMultiAccountSwitchLandingReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionUserLogin.java b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionUserLogin.java index d5919fc123..43c0eeb234 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionUserLogin.java +++ b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionUserLogin.java @@ -13,17 +13,19 @@ import d0.z.d.m; public final class TrackNetworkActionUserLogin implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackNetworkMetadataReceiver { private final transient String analyticsSchemaTypeName; private final CharSequence inviteCode; + private final Boolean isMultiAccount; private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackNetworkMetadata trackNetworkMetadata; public TrackNetworkActionUserLogin() { - this.inviteCode = null; - this.analyticsSchemaTypeName = "network_action_user_login"; + this(null, null, 3); } - public TrackNetworkActionUserLogin(CharSequence charSequence) { - this.inviteCode = charSequence; + public TrackNetworkActionUserLogin(CharSequence charSequence, Boolean bool, int i) { + int i2 = i & 2; + this.inviteCode = (i & 1) != 0 ? null : charSequence; + this.isMultiAccount = null; this.analyticsSchemaTypeName = "network_action_user_login"; } @@ -38,21 +40,31 @@ public final class TrackNetworkActionUserLogin implements AnalyticsSchema, Track } public boolean equals(Object obj) { - if (this != obj) { - return (obj instanceof TrackNetworkActionUserLogin) && m.areEqual(this.inviteCode, ((TrackNetworkActionUserLogin) obj).inviteCode); + if (this == obj) { + return true; } - return true; + if (!(obj instanceof TrackNetworkActionUserLogin)) { + return false; + } + TrackNetworkActionUserLogin trackNetworkActionUserLogin = (TrackNetworkActionUserLogin) obj; + return m.areEqual(this.inviteCode, trackNetworkActionUserLogin.inviteCode) && m.areEqual(this.isMultiAccount, trackNetworkActionUserLogin.isMultiAccount); } public int hashCode() { CharSequence charSequence = this.inviteCode; - if (charSequence != null) { - return charSequence.hashCode(); + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + Boolean bool = this.isMultiAccount; + if (bool != null) { + i = bool.hashCode(); } - return 0; + return hashCode + i; } public String toString() { - return a.D(a.R("TrackNetworkActionUserLogin(inviteCode="), this.inviteCode, ")"); + StringBuilder R = a.R("TrackNetworkActionUserLogin(inviteCode="); + R.append(this.inviteCode); + R.append(", isMultiAccount="); + return a.C(R, this.isMultiAccount, ")"); } } diff --git a/app/src/main/java/com/discord/api/guild/GuildFeature.java b/app/src/main/java/com/discord/api/guild/GuildFeature.java index a3ff6ff240..219dc77122 100644 --- a/app/src/main/java/com/discord/api/guild/GuildFeature.java +++ b/app/src/main/java/com/discord/api/guild/GuildFeature.java @@ -26,5 +26,6 @@ public enum GuildFeature { SEVEN_DAY_THREAD_ARCHIVE, NEW_THREAD_PERMISSIONS, ROLE_ICONS, + ANIMATED_BANNER, TEXT_IN_VOICE_ENABLED } diff --git a/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java b/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java index 357c9733dd..9f4c160fa7 100644 --- a/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java +++ b/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java @@ -10,7 +10,7 @@ public final class SubscriptionPlan { private final SubscriptionInterval interval; private final int intervalCount; private final String name; - private final int priceTier; + private final int price; public final long a() { return this.f1623id; @@ -25,7 +25,7 @@ public final class SubscriptionPlan { } public final int d() { - return this.priceTier; + return this.price; } public boolean equals(Object obj) { @@ -36,7 +36,7 @@ public final class SubscriptionPlan { return false; } SubscriptionPlan subscriptionPlan = (SubscriptionPlan) obj; - return this.f1623id == subscriptionPlan.f1623id && this.intervalCount == subscriptionPlan.intervalCount && m.areEqual(this.interval, subscriptionPlan.interval) && m.areEqual(this.name, subscriptionPlan.name) && this.priceTier == subscriptionPlan.priceTier; + return this.f1623id == subscriptionPlan.f1623id && this.intervalCount == subscriptionPlan.intervalCount && m.areEqual(this.interval, subscriptionPlan.interval) && m.areEqual(this.name, subscriptionPlan.name) && this.price == subscriptionPlan.price; } public int hashCode() { @@ -49,7 +49,7 @@ public final class SubscriptionPlan { if (str != null) { i2 = str.hashCode(); } - return ((hashCode + i2) * 31) + this.priceTier; + return ((hashCode + i2) * 31) + this.price; } public String toString() { @@ -61,7 +61,7 @@ public final class SubscriptionPlan { R.append(this.interval); R.append(", name="); R.append(this.name); - R.append(", priceTier="); - return a.A(R, this.priceTier, ")"); + R.append(", price="); + return a.A(R, this.price, ")"); } } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java index 68240e73f1..196e44da76 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java @@ -18,37 +18,44 @@ import com.discord.widgets.user.profile.UserProfileAdminView; import com.discord.widgets.user.profile.UserProfileConnectionsView; import com.discord.widgets.user.profile.UserProfileHeaderView; import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView; +import com.facebook.drawee.view.SimpleDraweeView; import com.google.android.flexbox.FlexboxLayout; import com.google.android.material.button.MaterialButton; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; public final class WidgetUserSheetBinding implements ViewBinding { @NonNull - public final LinearLayout A; + public final TextInputEditText A; @NonNull - public final View B; + public final TextInputLayout B; @NonNull - public final MaterialButton C; + public final Button C; @NonNull - public final FlexboxLayout D; + public final LinearLayout D; @NonNull - public final UserProfileHeaderView E; + public final View E; @NonNull public final MaterialButton F; @NonNull - public final CardView G; + public final FlexboxLayout G; @NonNull - public final UserProfileStageActionsView H; + public final UserProfileHeaderView H; @NonNull - public final TextView I; + public final MaterialButton I; @NonNull - public final UserProfileVoiceSettingsView J; + public final CardView J; @NonNull - public final RolesListView K; + public final UserProfileStageActionsView K; @NonNull - public final Button L; + public final TextView L; @NonNull - public final CardView M; + public final UserProfileVoiceSettingsView M; + @NonNull + public final RolesListView N; + @NonNull + public final Button O; + @NonNull + public final CardView P; @NonNull public final NestedScrollView a; @NonNull @@ -56,102 +63,105 @@ public final class WidgetUserSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f2118c; + public final SimpleDraweeView f2118c; @NonNull - public final LinkifiedTextView d; + public final TextView d; @NonNull - public final FrameLayout e; + public final TextView e; @NonNull - public final Button f; + public final FlexboxLayout f; @NonNull - public final CardView g; + public final LinkifiedTextView g; @NonNull - public final UserProfileAdminView h; + public final FrameLayout h; @NonNull public final Button i; @NonNull - public final TextView j; + public final CardView j; @NonNull - public final UserProfileConnectionsView k; + public final UserProfileAdminView k; @NonNull - public final TextView l; + public final Button l; @NonNull public final TextView m; @NonNull - public final MaterialButton n; + public final UserProfileConnectionsView n; @NonNull - public final MaterialButton o; + public final TextView o; @NonNull - public final LinearLayout p; + public final TextView p; @NonNull - public final LinearLayout q; + public final MaterialButton q; @NonNull - public final TextView r; + public final MaterialButton r; @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f2119s; + public final LinearLayout f2119s; @NonNull - public final FrameLayout t; + public final LinearLayout t; @NonNull - public final Button u; + public final TextView u; @NonNull - public final ImageView v; + public final TextView v; @NonNull - public final TextView w; + public final FrameLayout w; @NonNull /* renamed from: x reason: collision with root package name */ - public final TextInputEditText f2120x; + public final Button f2120x; @NonNull /* renamed from: y reason: collision with root package name */ - public final TextInputLayout f2121y; + public final ImageView f2121y; @NonNull /* renamed from: z reason: collision with root package name */ - public final Button f2122z; + public final TextView f2122z; - public WidgetUserSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ContentLoadingProgressBar contentLoadingProgressBar, @NonNull FrameLayout frameLayout, @NonNull Button button, @NonNull CardView cardView2, @NonNull UserProfileAdminView userProfileAdminView, @NonNull Button button2, @NonNull TextView textView2, @NonNull UserProfileConnectionsView userProfileConnectionsView, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull FrameLayout frameLayout2, @NonNull Button button3, @NonNull ImageView imageView, @NonNull TextView textView7, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull Button button4, @NonNull LinearLayout linearLayout4, @NonNull View view, @NonNull MaterialButton materialButton3, @NonNull FlexboxLayout flexboxLayout, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull MaterialButton materialButton4, @NonNull CardView cardView3, @NonNull UserProfileStageActionsView userProfileStageActionsView, @NonNull TextView textView8, @NonNull UserProfileVoiceSettingsView userProfileVoiceSettingsView, @NonNull RolesListView rolesListView, @NonNull Button button5, @NonNull CardView cardView4) { + public WidgetUserSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CardView cardView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull FlexboxLayout flexboxLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ContentLoadingProgressBar contentLoadingProgressBar, @NonNull FrameLayout frameLayout, @NonNull Button button, @NonNull CardView cardView2, @NonNull UserProfileAdminView userProfileAdminView, @NonNull Button button2, @NonNull TextView textView3, @NonNull UserProfileConnectionsView userProfileConnectionsView, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull FrameLayout frameLayout2, @NonNull Button button3, @NonNull ImageView imageView, @NonNull TextView textView8, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull Button button4, @NonNull LinearLayout linearLayout4, @NonNull View view, @NonNull MaterialButton materialButton3, @NonNull FlexboxLayout flexboxLayout2, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull MaterialButton materialButton4, @NonNull CardView cardView3, @NonNull UserProfileStageActionsView userProfileStageActionsView, @NonNull TextView textView9, @NonNull UserProfileVoiceSettingsView userProfileVoiceSettingsView, @NonNull RolesListView rolesListView, @NonNull Button button5, @NonNull CardView cardView4) { this.a = nestedScrollView; this.b = cardView; - this.f2118c = textView; - this.d = linkifiedTextView; - this.e = frameLayout; - this.f = button; - this.g = cardView2; - this.h = userProfileAdminView; - this.i = button2; - this.j = textView2; - this.k = userProfileConnectionsView; - this.l = textView3; - this.m = textView4; - this.n = materialButton; - this.o = materialButton2; - this.p = linearLayout2; - this.q = linearLayout3; - this.r = textView5; - this.f2119s = textView6; - this.t = frameLayout2; - this.u = button3; - this.v = imageView; - this.w = textView7; - this.f2120x = textInputEditText; - this.f2121y = textInputLayout; - this.f2122z = button4; - this.A = linearLayout4; - this.B = view; - this.C = materialButton3; - this.D = flexboxLayout; - this.E = userProfileHeaderView; - this.F = materialButton4; - this.G = cardView3; - this.H = userProfileStageActionsView; - this.I = textView8; - this.J = userProfileVoiceSettingsView; - this.K = rolesListView; - this.L = button5; - this.M = cardView4; + this.f2118c = simpleDraweeView; + this.d = textView; + this.e = textView2; + this.f = flexboxLayout; + this.g = linkifiedTextView; + this.h = frameLayout; + this.i = button; + this.j = cardView2; + this.k = userProfileAdminView; + this.l = button2; + this.m = textView3; + this.n = userProfileConnectionsView; + this.o = textView4; + this.p = textView5; + this.q = materialButton; + this.r = materialButton2; + this.f2119s = linearLayout2; + this.t = linearLayout3; + this.u = textView6; + this.v = textView7; + this.w = frameLayout2; + this.f2120x = button3; + this.f2121y = imageView; + this.f2122z = textView8; + this.A = textInputEditText; + this.B = textInputLayout; + this.C = button4; + this.D = linearLayout4; + this.E = view; + this.F = materialButton3; + this.G = flexboxLayout2; + this.H = userProfileHeaderView; + this.I = materialButton4; + this.J = cardView3; + this.K = userProfileStageActionsView; + this.L = textView9; + this.M = userProfileVoiceSettingsView; + this.N = rolesListView; + this.O = button5; + this.P = cardView4; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java index 8564cea263..09d3df3806 100644 --- a/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java +++ b/app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java @@ -33,7 +33,7 @@ public final class StoreAuthentication$login$1 implements b L = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getInviteSettings().getInvite(), 250, false, 2, null).L(StoreAuthentication$login$1$1$invite$1.INSTANCE); ModelInvite modelInvite = (ModelInvite) new a(L).a(L.y()); - return new TrackNetworkActionUserLogin(modelInvite != null ? modelInvite.code : null); + return new TrackNetworkActionUserLogin(modelInvite != null ? modelInvite.code : null, null, 2); } } diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java index 601bbec89c..397a91c9ac 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java @@ -13,7 +13,7 @@ import com.adjust.sdk.Adjust; import com.adjust.sdk.AdjustAttribution; import com.adjust.sdk.AdjustEvent; import com.discord.analytics.generated.events.TrackAgeGateSubmitted; -import com.discord.analytics.generated.events.TrackRoleSubscriptionListingUpsellPageViewed; +import com.discord.analytics.generated.events.TrackRoleSubscriptionListingUpsellPageViewedV2; import com.discord.analytics.generated.events.impression.TrackImpressionInviteAccept; import com.discord.analytics.generated.traits.TrackBase; import com.discord.analytics.generated.traits.TrackSourceMetadata; @@ -1416,9 +1416,9 @@ public final class AnalyticsTracker { public final void guildRoleSubscriptionUpsellOpened(long j, List list, boolean z2, String str) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_LOCATION); AnalyticsUtils.Tracker tracker2 = tracker; - TrackRoleSubscriptionListingUpsellPageViewed trackRoleSubscriptionListingUpsellPageViewed = new TrackRoleSubscriptionListingUpsellPageViewed(Long.valueOf(j), list, Boolean.valueOf(z2)); - trackRoleSubscriptionListingUpsellPageViewed.c(new TrackBase(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, str, null, null, null, null, null, null, null, null, -1, -1073741825, 127)); - tracker2.track(trackRoleSubscriptionListingUpsellPageViewed); + TrackRoleSubscriptionListingUpsellPageViewedV2 trackRoleSubscriptionListingUpsellPageViewedV2 = new TrackRoleSubscriptionListingUpsellPageViewedV2(Long.valueOf(j), list, Boolean.valueOf(z2)); + trackRoleSubscriptionListingUpsellPageViewedV2.c(new TrackBase(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, str, null, null, null, null, null, null, null, null, -1, -1073741825, 127)); + tracker2.track(trackRoleSubscriptionListingUpsellPageViewedV2); } public final void guildTemplateResolved(ModelGuildTemplate modelGuildTemplate) { diff --git a/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java b/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java index 6b2c2746f8..e7669ef6ae 100644 --- a/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java +++ b/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java @@ -15,7 +15,7 @@ public final class ExperimentRegistry { registeredExperiments = linkedHashMap; RegisteredExperiment.Type type = RegisteredExperiment.Type.USER; RegisteredExperiment.Type type2 = RegisteredExperiment.Type.GUILD; - for (Object obj : n.listOf((Object[]) new RegisteredExperiment[]{new RegisteredExperiment("Compact Invite Widget", "2020-01_mobile_invite_suggestion_compact", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Use compact view"}), true), new RegisteredExperiment("Guild Invite Sheet", "2020-12_android_guild_channel_invite_sheet", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen guild invite UI", "Treatment 1: Use the bottom sheet guild invite UI"}), true), new RegisteredExperiment("Disable mentions in landscape", "2020-12_android_disable_landscape_mentions", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hide mentions in landscape"}), true), new RegisteredExperiment("Invite to GDM Sheet", "2020-12_invite_to_gdm", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen GDM invite UI", "Treatment 1: Use the bottom sheet GDM invite UI"}), true), new RegisteredExperiment("Guild Delete Feedback", "2020-12_guild_delete_feedback", type, n.listOf((Object[]) new String[]{"Control: Do not show the feedback modal", "Treatment 1: Show the feedback modal"}), true), new RegisteredExperiment("View Threads", "2021-02_view_threads", type, n.listOf((Object[]) new String[]{"Control: Do not display anything threads-related, except if receiving a notification", "Treatment 1: Show view-only threads features in channel list, in chat view, etc."}), true), new RegisteredExperiment("Create Threads", "2020-09_threads", type2, n.listOf((Object[]) new String[]{"Control: Do not show thread creation entrypoints, or Thread Browser", "Treatment 1: Show thread creation buttons, and show button to open Thread Browser"}), true), new RegisteredExperiment("Disable Camera 2", "2021-02_android_webrtc_camera2", type, n.listOf((Object[]) new String[]{"Control: Use Camera 2 API if supported", "Treatment 1: Force Camera 1 API"}), true), new RegisteredExperiment("MediaSinkWants", "2021-03_android_media_sink_wants", type, n.listOf((Object[]) new String[]{"Control: disabled", "Treatment 1: use MediaSinkWants"}), true), new RegisteredExperiment("Default Invite Expiration", "2021-03_android_extend_invite_expiration", type2, n.listOf((Object[]) new String[]{"Control: Default Invite Expiration is 1 day", "Treatment 1: Default Invite Expiration is 7 days"}), true), new RegisteredExperiment("Emoji Autocomplete Upsell", "2021-03_nitro_emoji_autocomplete_upsell_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Emoji Autocomplete Upsell"}), true), new RegisteredExperiment("Application Command Frecency", "2021-09_android_app_commands_frecency", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show frecent application commands"}), true), new RegisteredExperiment("Attachments Bottom Sheet", "2021-10_android_attachment_bottom_sheet", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show attachments bottom sheet"}), true), new RegisteredExperiment("Bot UI Kit Components", "2021-03_bot_ui_kit_components_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Bot UI Kit Components"}), true), new RegisteredExperiment("Select Bot UI Component", "2021-05_bot_ui_kit_select", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Select Bot Ui Component"}), true), new RegisteredExperiment("Stage Events Guilds", "2021-06_stage_events", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to see events in guilds"}), true), new RegisteredExperiment("Contact Sync: Base Experiment", "2021-04_contact_sync_android_main", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable core Contact Sync features"}), true), new RegisteredExperiment("Contact Sync: Existing Users w/ Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users with a phone number"}), true), new RegisteredExperiment("Contact Sync: Existing Users without Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_without_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users without a phone number"}), true), new RegisteredExperiment("Contact Sync: Empty states", "2021-05_contact_sync_android_empty_states", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync in empty friend lists"}), true), new RegisteredExperiment("Stop Offscreen Video Streams", "2021-03_stop_offscreen_video_streams", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Stop offscreen video streams"}), true), new RegisteredExperiment("Hub Multiple Domains", "2021-08_hub_multi_domain_mobile", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable multiple domains for hubs"}), true), new RegisteredExperiment("Enabled Discord Hub Directories", "2021-06_desktop_school_hubs", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Directories"}), true), new RegisteredExperiment("Enabled Discord Hub Emails", "2021-06_hub_email_connection", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Emails"}), true), new RegisteredExperiment("Enabled Discord Hub Recommendations", "2021-10_hubs_recs_and_rankings", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hub Ranks Enabled", "Treatment 2: Hub Recommendations Enabled", "Treatment 3: Hub Ranks and Recommendations Enabled"}), true), new RegisteredExperiment("Enabled Discord Hub Study Groups", "2021-10_study_group", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hub Study Groups Enabled"}), true), new RegisteredExperiment("Enabled Discord Hub Unreads", "2021-11_hub_unreads", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enabled hub Unreads"}), true), new RegisteredExperiment("Enable Impression Logging", "2021-08_impression_logging_enabled_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable Impression Logging"}), true), new RegisteredExperiment("AudioManager V2 and OpenSL ES", "2021-05_opensl_default_enable_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Default enable OpenSL", "Treatment 2: Use StoreAudioManagerV2 for output routing"}), true), new RegisteredExperiment("Phone Registration - Bailout to Email", "2021-06_reg_bailout_to_email_android", type, n.listOf((Object[]) new String[]{"Control: Just the back button", "Treatment 1: Static button to bailout to the email tab"}), true), new RegisteredExperiment("Enable Network Action Logging", "2021-07_network_action_logging_android", type, n.listOf((Object[]) new String[]{"Off: No Action logging", "On: Enable Action Logging"}), true), new RegisteredExperiment("Preview Promotions", "2021-06_preview_promotions", type, n.listOf((Object[]) new String[]{"Off: Hit normal endpoint", "On: Hit preview endpoint"}), true), new RegisteredExperiment("Route audio to speakerphone by default", "2021-08_android_speakerphone_default", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Always default to speakerphone"}), true), new RegisteredExperiment("New Thread Perms", "2021-08_threads_permissions", type2, n.listOf((Object[]) new String[]{"Control: Use old threads permissions.", "Treatment 1: Use new threads permissions."}), true), new RegisteredExperiment("Longer billing grace periods", "2021-09_longer_billing_grace_periods", type, n.listOf((Object[]) new String[]{"Control: 3-day grace period", "Treatment 1: 7-day grace period"}), true), new RegisteredExperiment("SMS Autofill", "2021-09_android_sms_autofill", type, n.listOf((Object[]) new String[]{"Control: No SMS Autofill", "Treatment 1: SMS Code autofills"}), true), new RegisteredExperiment("Android Text-In-Voice", "2021-10_android_textinvoice", type, n.listOf((Object[]) new String[]{"Control: No Android text-in-voice.", "Treatment 1: Android text-in-voice enabled, if it's enabled for the guild."}), true), new RegisteredExperiment("Guild Member Profiles v2", "2021-10_premium_guild_member_profiles", type, n.listOf((Object[]) new String[]{"Control: No editing of guild member premium profiles.", "Treatment 1: Can edit guild member premium profiles"}), true)})) { + for (Object obj : n.listOf((Object[]) new RegisteredExperiment[]{new RegisteredExperiment("Compact Invite Widget", "2020-01_mobile_invite_suggestion_compact", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Use compact view"}), true), new RegisteredExperiment("Guild Invite Sheet", "2020-12_android_guild_channel_invite_sheet", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen guild invite UI", "Treatment 1: Use the bottom sheet guild invite UI"}), true), new RegisteredExperiment("Disable mentions in landscape", "2020-12_android_disable_landscape_mentions", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hide mentions in landscape"}), true), new RegisteredExperiment("Invite to GDM Sheet", "2020-12_invite_to_gdm", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen GDM invite UI", "Treatment 1: Use the bottom sheet GDM invite UI"}), true), new RegisteredExperiment("Guild Delete Feedback", "2020-12_guild_delete_feedback", type, n.listOf((Object[]) new String[]{"Control: Do not show the feedback modal", "Treatment 1: Show the feedback modal"}), true), new RegisteredExperiment("View Threads", "2021-02_view_threads", type, n.listOf((Object[]) new String[]{"Control: Do not display anything threads-related, except if receiving a notification", "Treatment 1: Show view-only threads features in channel list, in chat view, etc."}), true), new RegisteredExperiment("Create Threads", "2020-09_threads", type2, n.listOf((Object[]) new String[]{"Control: Do not show thread creation entrypoints, or Thread Browser", "Treatment 1: Show thread creation buttons, and show button to open Thread Browser"}), true), new RegisteredExperiment("Disable Camera 2", "2021-02_android_webrtc_camera2", type, n.listOf((Object[]) new String[]{"Control: Use Camera 2 API if supported", "Treatment 1: Force Camera 1 API"}), true), new RegisteredExperiment("MediaSinkWants", "2021-03_android_media_sink_wants", type, n.listOf((Object[]) new String[]{"Control: disabled", "Treatment 1: use MediaSinkWants"}), true), new RegisteredExperiment("Default Invite Expiration", "2021-03_android_extend_invite_expiration", type2, n.listOf((Object[]) new String[]{"Control: Default Invite Expiration is 1 day", "Treatment 1: Default Invite Expiration is 7 days"}), true), new RegisteredExperiment("Emoji Autocomplete Upsell", "2021-03_nitro_emoji_autocomplete_upsell_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Emoji Autocomplete Upsell"}), true), new RegisteredExperiment("Application Command Frecency", "2021-09_android_app_commands_frecency", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show frecent application commands"}), true), new RegisteredExperiment("Attachments Bottom Sheet", "2021-10_android_attachment_bottom_sheet", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show attachments bottom sheet"}), true), new RegisteredExperiment("Bot UI Kit Components", "2021-03_bot_ui_kit_components_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Bot UI Kit Components"}), true), new RegisteredExperiment("Select Bot UI Component", "2021-05_bot_ui_kit_select", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Select Bot Ui Component"}), true), new RegisteredExperiment("Stage Events Guilds", "2021-06_stage_events", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to see events in guilds"}), true), new RegisteredExperiment("Contact Sync: Base Experiment", "2021-04_contact_sync_android_main", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable core Contact Sync features"}), true), new RegisteredExperiment("Contact Sync: Existing Users w/ Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users with a phone number"}), true), new RegisteredExperiment("Contact Sync: Existing Users without Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_without_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users without a phone number"}), true), new RegisteredExperiment("Contact Sync: Empty states", "2021-05_contact_sync_android_empty_states", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync in empty friend lists"}), true), new RegisteredExperiment("Stop Offscreen Video Streams", "2021-03_stop_offscreen_video_streams", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Stop offscreen video streams"}), true), new RegisteredExperiment("Hub Multiple Domains", "2021-08_hub_multi_domain_mobile", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable multiple domains for hubs"}), true), new RegisteredExperiment("Enabled Discord Hub Directories", "2021-06_desktop_school_hubs", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Directories"}), true), new RegisteredExperiment("Enabled Discord Hub Emails", "2021-06_hub_email_connection", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord Hub Emails"}), true), new RegisteredExperiment("Enabled Discord Hub Recommendations", "2021-10_hubs_recs_and_rankings", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hub Ranks Enabled", "Treatment 2: Hub Recommendations Enabled", "Treatment 3: Hub Ranks and Recommendations Enabled"}), true), new RegisteredExperiment("Enabled Discord Hub Study Groups", "2021-10_study_group", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hub Study Groups Enabled"}), true), new RegisteredExperiment("Enabled Discord Hub Unreads", "2021-11_hub_unreads", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enabled hub Unreads"}), true), new RegisteredExperiment("Enable Impression Logging", "2021-08_impression_logging_enabled_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable Impression Logging"}), true), new RegisteredExperiment("AudioManager V2 and OpenSL ES", "2021-05_opensl_default_enable_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Default enable OpenSL", "Treatment 2: Use StoreAudioManagerV2 for output routing"}), true), new RegisteredExperiment("Phone Registration - Bailout to Email", "2021-06_reg_bailout_to_email_android", type, n.listOf((Object[]) new String[]{"Control: Just the back button", "Treatment 1: Static button to bailout to the email tab"}), true), new RegisteredExperiment("Enable Network Action Logging", "2021-07_network_action_logging_android", type, n.listOf((Object[]) new String[]{"Off: No Action logging", "On: Enable Action Logging"}), true), new RegisteredExperiment("Preview Promotions", "2021-06_preview_promotions", type, n.listOf((Object[]) new String[]{"Off: Hit normal endpoint", "On: Hit preview endpoint"}), true), new RegisteredExperiment("Route audio to speakerphone by default", "2021-08_android_speakerphone_default", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Always default to speakerphone"}), true), new RegisteredExperiment("New Thread Perms", "2021-08_threads_permissions", type2, n.listOf((Object[]) new String[]{"Control: Use old threads permissions.", "Treatment 1: Use new threads permissions."}), true), new RegisteredExperiment("Longer billing grace periods", "2021-09_longer_billing_grace_periods", type, n.listOf((Object[]) new String[]{"Control: 3-day grace period", "Treatment 1: 7-day grace period"}), true), new RegisteredExperiment("SMS Autofill", "2021-09_android_sms_autofill", type, n.listOf((Object[]) new String[]{"Control: No SMS Autofill", "Treatment 1: SMS Code autofills"}), true), new RegisteredExperiment("Android Text-In-Voice", "2021-10_android_textinvoice", type, n.listOf((Object[]) new String[]{"Control: No Android text-in-voice.", "Treatment 1: Android text-in-voice enabled, if it's enabled for the guild."}), true), new RegisteredExperiment("Guild Member Profiles v2", "2021-10_premium_guild_member_profiles", type, n.listOf((Object[]) new String[]{"Control: No editing of guild member premium profiles.", "Treatment 1: Can edit guild member premium profiles"}), true), new RegisteredExperiment("Animated Guild Banner", "2021-10_animated_guild_banners", type2, n.listOf((Object[]) new String[]{"Control: No Animated Guild Banners", "Treatment 1: Animated Guild Banners"}), true)})) { linkedHashMap.put(((RegisteredExperiment) obj).getName(), obj); } } diff --git a/app/src/main/java/com/discord/utilities/icon/IconUtils.java b/app/src/main/java/com/discord/utilities/icon/IconUtils.java index 67030799ea..574698f147 100644 --- a/app/src/main/java/com/discord/utilities/icon/IconUtils.java +++ b/app/src/main/java/com/discord/utilities/icon/IconUtils.java @@ -92,18 +92,24 @@ public final class IconUtils { return null; } - public static /* synthetic */ String getBannerForGuild$default(IconUtils iconUtils, Guild guild, Integer num, int i, Object obj) { + public static /* synthetic */ String getBannerForGuild$default(IconUtils iconUtils, Guild guild, Integer num, boolean z2, int i, Object obj) { if ((i & 2) != 0) { num = null; } - return iconUtils.getBannerForGuild(guild, num); + if ((i & 4) != 0) { + z2 = false; + } + return iconUtils.getBannerForGuild(guild, num, z2); } - public static /* synthetic */ String getBannerForGuild$default(IconUtils iconUtils, Long l, String str, Integer num, int i, Object obj) { + public static /* synthetic */ String getBannerForGuild$default(IconUtils iconUtils, Long l, String str, Integer num, boolean z2, int i, Object obj) { if ((i & 4) != 0) { num = null; } - return iconUtils.getBannerForGuild(l, str, num); + if ((i & 8) != 0) { + z2 = false; + } + return iconUtils.getBannerForGuild(l, str, num, z2); } public static final String getForChannel(long j, String str, int i, boolean z2, Integer num) { @@ -667,37 +673,36 @@ public final class IconUtils { } } - public final String getBannerForGuild(Guild guild, Integer num) { + public final String getBannerForGuild(Guild guild, Integer num, boolean z2) { String str = null; Long valueOf = guild != null ? Long.valueOf(guild.getId()) : null; if (guild != null) { str = guild.getBanner(); } - return getBannerForGuild(valueOf, str, num); + return getBannerForGuild(valueOf, str, num, z2); } - public final String getBannerForGuild(Long l, String str, Integer num) { - String str2 = null; + public final String getBannerForGuild(Long l, String str, Integer num, boolean z2) { + String str2; + String str3 = null; if (l == null || str == null) { return null; } Integer valueOf = num != null ? Integer.valueOf(getMediaProxySize(num.intValue())) : null; - if (BuildConfig.HOST_CDN.length() == 0) { - return "https://discord.com/api//guilds/" + l + "/banners/" + str + ".jpg"; - } StringBuilder sb = new StringBuilder(); - sb.append("https://cdn.discordapp.com/banners/"); - sb.append(l); - sb.append(MentionUtilsKt.SLASH_CHAR); - sb.append(str); - sb.append(".jpg"); - if (valueOf != null) { - str2 = a.p("?size=", valueOf.intValue()); - } - if (str2 == null) { - str2 = ""; + if (BuildConfig.HOST_CDN.length() == 0) { + str2 = "https://discord.com/api//guilds/" + l + "/banners/" + str + ".jpg"; + } else { + str2 = "https://cdn.discordapp.com/banners/" + l + MentionUtilsKt.SLASH_CHAR + str + '.' + getImageExtension(str, z2); } sb.append(str2); + if (valueOf != null) { + str3 = a.p("?size=", valueOf.intValue()); + } + if (str3 == null) { + str3 = ""; + } + sb.append(str3); return sb.toString(); } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java index 88ca8f14b1..6b5815f2dd 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java @@ -16,10 +16,10 @@ public final class WidgetAuthMfa$onViewBound$1 implements Action2 implements Ac public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_channel_settings_delete /* 2131364211 */: + case R.id.menu_channel_settings_delete /* 2131364214 */: if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) { WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel()); return; @@ -29,7 +29,7 @@ public final class WidgetTextChannelSettings$configureUI$1 implements Ac WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel()); return; } - case R.id.menu_channel_settings_reset /* 2131364212 */: + case R.id.menu_channel_settings_reset /* 2131364215 */: StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings(); m.checkNotNullExpressionValue(context, "context"); userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel()); diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java index b22233fa5c..acca48ec45 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java @@ -19,11 +19,11 @@ public final class WidgetThreadBrowser$updateMenu$1 implements Action2 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_friends_add_friend /* 2131364231 */: + case R.id.menu_friends_add_friend /* 2131364234 */: WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null); return; - case R.id.menu_friends_contact_sync /* 2131364232 */: + case R.id.menu_friends_contact_sync /* 2131364235 */: ContactSyncFlowAnalytics.Companion.trackStart$default(ContactSyncFlowAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null); AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null)); WidgetContactSync.Companion companion2 = WidgetContactSync.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null); return; - case R.id.menu_friends_start_group /* 2131364233 */: + case R.id.menu_friends_start_group /* 2131364236 */: if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) { GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java index f6f0a85a36..3fc84902b9 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionUtilsKt.java @@ -45,8 +45,8 @@ public final class GuildRoleSubscriptionUtilsKt { return Boolean.valueOf(!PermissionUtils.INSTANCE.canRole(Permission.VIEW_CHANNEL, map != null ? map.get(Long.valueOf(guildRoleSubscriptionGroupListing.e())) : null, null)); } - public static final int getPriceTier(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { - m.checkNotNullParameter(guildRoleSubscriptionTierListing, "$this$getPriceTier"); + public static final int getPrice(GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing) { + m.checkNotNullParameter(guildRoleSubscriptionTierListing, "$this$getPrice"); SubscriptionPlan subscriptionPlan = (SubscriptionPlan) u.getOrNull(guildRoleSubscriptionTierListing.i(), 0); if (subscriptionPlan != null) { return subscriptionPlan.d(); diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java index 2db9e37424..8770997efa 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java @@ -416,7 +416,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (banner.getHash() != null) { int ordinal = banner.getType().ordinal(); if (ordinal == 0) { - str = IconUtils.INSTANCE.getBannerForGuild(Long.valueOf(banner.getGuildId()), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(R.dimen.nav_panel_width))); + str = IconUtils.getBannerForGuild$default(IconUtils.INSTANCE, Long.valueOf(banner.getGuildId()), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(R.dimen.nav_panel_width)), false, 8, null); } else if (ordinal == 1) { str = IconUtils.INSTANCE.getGuildSplashUrl(banner.getGuildId(), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(R.dimen.nav_panel_width))); } else { diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java index d0d4489c45..b5fb095bc2 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java @@ -47,25 +47,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager"); PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager); switch (menuItem.getItemId()) { - case R.id.menu_chat_add_friend /* 2131364213 */: + case R.id.menu_chat_add_friend /* 2131364216 */: WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null); break; - case R.id.menu_chat_search /* 2131364214 */: + case R.id.menu_chat_search /* 2131364217 */: launchForSearch(context); break; - case R.id.menu_chat_side_panel /* 2131364215 */: + case R.id.menu_chat_side_panel /* 2131364218 */: this.$panelLayout.openEndPanel(); break; - case R.id.menu_chat_start_call /* 2131364216 */: + case R.id.menu_chat_start_call /* 2131364219 */: privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_start_group /* 2131364217 */: + case R.id.menu_chat_start_group /* 2131364220 */: ChannelInviteLaunchUtils.inviteToChannel$default(ChannelInviteLaunchUtils.INSTANCE, this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar", null, null, 24, null); break; - case R.id.menu_chat_start_video_call /* 2131364218 */: + case R.id.menu_chat_start_video_call /* 2131364221 */: privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_stop_call /* 2131364219 */: + case R.id.menu_chat_stop_call /* 2131364222 */: StoreStream.Companion.getVoiceChannelSelected().clear(); break; } diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java index 17c98c4dda..014242f566 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java @@ -116,16 +116,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1 implements Action public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_media_browser /* 2131364236 */: + case R.id.menu_media_browser /* 2131364239 */: m.checkNotNullExpressionValue(context, "context"); String uri = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri, "sourceUri.toString()"); UriHandler.handleOrUntrusted$default(context, uri, null, 4, null); return; - case R.id.menu_media_download /* 2131364237 */: + case R.id.menu_media_download /* 2131364240 */: this.this$0.requestMediaDownload(new AnonymousClass1(this, context)); return; - case R.id.menu_media_share /* 2131364238 */: + case R.id.menu_media_share /* 2131364241 */: m.checkNotNullExpressionValue(context, "context"); String uri2 = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri2, "sourceUri.toString()"); diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java index f580883be1..4361cff539 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java @@ -64,11 +64,11 @@ public final class WidgetNoticeDialog extends AppDialog { private static final String ARG_THEME_ID = "theme_id"; /* renamed from: CANCEL_BUTTON */ - public static final int notice_cancel = 2131364385; + public static final int notice_cancel = 2131364388; public static final Companion Companion = new Companion(null); /* renamed from: OK_BUTTON */ - public static final int notice_ok = 2131364390; + public static final int notice_ok = 2131364393; public static final int ON_SHOW = 0; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null); private Map> listenerMap; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java index 77ee1c7296..9d1720dacf 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java @@ -45,13 +45,13 @@ public final class WidgetServerSettingsChannels$configureUI$1 implements public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_sort_channel /* 2131364254 */: + case R.id.menu_sort_channel /* 2131364257 */: WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion; FragmentManager childFragmentManager = this.this$0.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager"); companion.show(childFragmentManager, new AnonymousClass1(this)); return; - case R.id.menu_sort_done /* 2131364255 */: + case R.id.menu_sort_done /* 2131364258 */: WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1); return; default: diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java index 459ec1023d..edddbf6ed0 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java @@ -51,9 +51,9 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { public static final Companion Companion = new Companion(null); private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private static final String INTENT_EXTRA_INTEGRATION_ID = "INTENT_EXTRA_INTEGRATION_ID"; - private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363075; - private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363078; - private static final int STATE_KEY_GRACE_PERIOD = 2131363079; + private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363078; + private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363081; + private static final int STATE_KEY_GRACE_PERIOD = 2131363082; private static final int[] gracePeriodDays = {1, 3, 7, 14, 30}; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditIntegration$binding$2.INSTANCE, null, 2, null); private RadioManager expiryBehaviorRadioManager; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java index bf777e429b..96689d9b48 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java @@ -571,135 +571,135 @@ public final class WidgetServerSettingsEditRole extends AppFragment { for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().g, getBinding().h, getBinding().i, getBinding().j, getBinding().m, getBinding().r, getBinding().u, getBinding().v, getBinding().f1857y, getBinding().C, getBinding().f1858z, getBinding().w, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().H, getBinding().I, getBinding().N, getBinding().O, getBinding().o, getBinding().n, getBinding().P, getBinding().Q, getBinding().R, getBinding().S, getBinding().f, getBinding().T, getBinding().V, getBinding().Z, getBinding().f1853b0, getBinding().Y, getBinding().W, getBinding().X, getBinding().f1852a0, getBinding().G, getBinding().U, getBinding().J, getBinding().f1856x})) { m.checkNotNullExpressionValue(checkedSetting, "setting"); switch (checkedSetting.getId()) { - case R.id.role_settings_add_reactions /* 2131364820 */: + case R.id.role_settings_add_reactions /* 2131364823 */: j = 64; break; - case R.id.role_settings_administrator /* 2131364821 */: + case R.id.role_settings_administrator /* 2131364824 */: j = 8; break; - case R.id.role_settings_attach_files /* 2131364822 */: + case R.id.role_settings_attach_files /* 2131364825 */: j = Permission.ATTACH_FILES; break; - case R.id.role_settings_ban_members /* 2131364823 */: + case R.id.role_settings_ban_members /* 2131364826 */: j = 4; break; - case R.id.role_settings_change_nickname /* 2131364824 */: + case R.id.role_settings_change_nickname /* 2131364827 */: j = Permission.CHANGE_NICKNAME; break; - case R.id.role_settings_color_disabled_overlay /* 2131364825 */: - case R.id.role_settings_color_selector_container /* 2131364826 */: - case R.id.role_settings_current_color_display /* 2131364830 */: - case R.id.role_settings_edit_name_disabled_overlay /* 2131364831 */: - case R.id.role_settings_hoist_checkedsetting /* 2131364833 */: - case R.id.role_settings_icon_container /* 2131364834 */: - case R.id.role_settings_mentionable_checkedsetting /* 2131364846 */: - case R.id.role_settings_overview_scroll /* 2131364847 */: - case R.id.role_settings_role_icon /* 2131364852 */: - case R.id.role_settings_role_icon_divider /* 2131364853 */: - case R.id.role_settings_role_icon_header /* 2131364854 */: + case R.id.role_settings_color_disabled_overlay /* 2131364828 */: + case R.id.role_settings_color_selector_container /* 2131364829 */: + case R.id.role_settings_current_color_display /* 2131364833 */: + case R.id.role_settings_edit_name_disabled_overlay /* 2131364834 */: + case R.id.role_settings_hoist_checkedsetting /* 2131364836 */: + case R.id.role_settings_icon_container /* 2131364837 */: + case R.id.role_settings_mentionable_checkedsetting /* 2131364849 */: + case R.id.role_settings_overview_scroll /* 2131364850 */: + case R.id.role_settings_role_icon /* 2131364855 */: + case R.id.role_settings_role_icon_divider /* 2131364856 */: + case R.id.role_settings_role_icon_header /* 2131364857 */: default: j = 0; break; - case R.id.role_settings_create_instant_invite /* 2131364827 */: + case R.id.role_settings_create_instant_invite /* 2131364830 */: j = 1; break; - case R.id.role_settings_create_private_threads /* 2131364828 */: + case R.id.role_settings_create_private_threads /* 2131364831 */: j = Permission.CREATE_PRIVATE_THREADS; break; - case R.id.role_settings_create_public_threads /* 2131364829 */: + case R.id.role_settings_create_public_threads /* 2131364832 */: j = Permission.CREATE_PUBLIC_THREADS; break; - case R.id.role_settings_embed_links /* 2131364832 */: + case R.id.role_settings_embed_links /* 2131364835 */: j = Permission.EMBED_LINKS; break; - case R.id.role_settings_kick_members /* 2131364835 */: + case R.id.role_settings_kick_members /* 2131364838 */: j = 2; break; - case R.id.role_settings_manage_channels /* 2131364836 */: + case R.id.role_settings_manage_channels /* 2131364839 */: j = 16; break; - case R.id.role_settings_manage_emojis_and_stickers /* 2131364837 */: + case R.id.role_settings_manage_emojis_and_stickers /* 2131364840 */: j = Permission.MANAGE_EMOJIS_AND_STICKERS; break; - case R.id.role_settings_manage_events /* 2131364838 */: + case R.id.role_settings_manage_events /* 2131364841 */: j = Permission.MANAGE_EVENTS; break; - case R.id.role_settings_manage_messages /* 2131364839 */: + case R.id.role_settings_manage_messages /* 2131364842 */: j = Permission.MANAGE_MESSAGES; break; - case R.id.role_settings_manage_nicknames /* 2131364840 */: + case R.id.role_settings_manage_nicknames /* 2131364843 */: j = Permission.MANAGE_NICKNAMES; break; - case R.id.role_settings_manage_roles /* 2131364841 */: + case R.id.role_settings_manage_roles /* 2131364844 */: j = Permission.MANAGE_ROLES; break; - case R.id.role_settings_manage_server /* 2131364842 */: + case R.id.role_settings_manage_server /* 2131364845 */: j = 32; break; - case R.id.role_settings_manage_threads /* 2131364843 */: + case R.id.role_settings_manage_threads /* 2131364846 */: j = Permission.MANAGE_THREADS; break; - case R.id.role_settings_manage_webhooks /* 2131364844 */: + case R.id.role_settings_manage_webhooks /* 2131364847 */: j = Permission.MANAGE_WEBHOOKS; break; - case R.id.role_settings_mention_everyone /* 2131364845 */: + case R.id.role_settings_mention_everyone /* 2131364848 */: j = Permission.MENTION_EVERYONE; break; - case R.id.role_settings_priority_speaker /* 2131364848 */: + case R.id.role_settings_priority_speaker /* 2131364851 */: j = 256; break; - case R.id.role_settings_read_message_history /* 2131364849 */: + case R.id.role_settings_read_message_history /* 2131364852 */: j = Permission.READ_MESSAGE_HISTORY; break; - case R.id.role_settings_read_messages /* 2131364850 */: + case R.id.role_settings_read_messages /* 2131364853 */: j = Permission.VIEW_CHANNEL; break; - case R.id.role_settings_request_to_speak /* 2131364851 */: + case R.id.role_settings_request_to_speak /* 2131364854 */: j = Permission.REQUEST_TO_SPEAK; break; - case R.id.role_settings_send_messages /* 2131364855 */: + case R.id.role_settings_send_messages /* 2131364858 */: j = Permission.SEND_MESSAGES; break; - case R.id.role_settings_send_messages_in_threads /* 2131364856 */: + case R.id.role_settings_send_messages_in_threads /* 2131364859 */: j = Permission.SEND_MESSAGES_IN_THREADS; break; - case R.id.role_settings_send_tts_messages /* 2131364857 */: + case R.id.role_settings_send_tts_messages /* 2131364860 */: j = Permission.SEND_TTS_MESSAGES; break; - case R.id.role_settings_use_application_commands /* 2131364858 */: + case R.id.role_settings_use_application_commands /* 2131364861 */: j = Permission.USE_APPLICATION_COMMANDS; break; - case R.id.role_settings_use_external_emojis /* 2131364859 */: + case R.id.role_settings_use_external_emojis /* 2131364862 */: j = Permission.USE_EXTERNAL_EMOJIS; break; - case R.id.role_settings_use_external_stickers /* 2131364860 */: + case R.id.role_settings_use_external_stickers /* 2131364863 */: j = Permission.USE_EXTERNAL_STICKERS; break; - case R.id.role_settings_view_audit_log /* 2131364861 */: + case R.id.role_settings_view_audit_log /* 2131364864 */: j = 128; break; - case R.id.role_settings_view_guild_analytics /* 2131364862 */: + case R.id.role_settings_view_guild_analytics /* 2131364865 */: j = Permission.VIEW_GUILD_ANALYTICS; break; - case R.id.role_settings_voice_connect /* 2131364863 */: + case R.id.role_settings_voice_connect /* 2131364866 */: j = Permission.CONNECT; break; - case R.id.role_settings_voice_deafen_members /* 2131364864 */: + case R.id.role_settings_voice_deafen_members /* 2131364867 */: j = Permission.DEAFEN_MEMBERS; break; - case R.id.role_settings_voice_move_members /* 2131364865 */: + case R.id.role_settings_voice_move_members /* 2131364868 */: j = Permission.MOVE_MEMBERS; break; - case R.id.role_settings_voice_mute_members /* 2131364866 */: + case R.id.role_settings_voice_mute_members /* 2131364869 */: j = Permission.MUTE_MEMBERS; break; - case R.id.role_settings_voice_speak /* 2131364867 */: + case R.id.role_settings_voice_speak /* 2131364870 */: j = Permission.SPEAK; break; - case R.id.role_settings_voice_use_voice_activity /* 2131364868 */: + case R.id.role_settings_voice_use_voice_activity /* 2131364871 */: j = Permission.USE_VAD; break; - case R.id.role_settings_voice_video /* 2131364869 */: + case R.id.role_settings_voice_video /* 2131364872 */: j = 512; break; } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java index 4390b6758e..0110348966 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java @@ -379,7 +379,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); DisplayMetrics displayMetrics = resources.getDisplayMetrics(); - configureBannerImage(iconUtils.getBannerForGuild(guild, displayMetrics != null ? Integer.valueOf(displayMetrics.widthPixels) : null), null, false); + configureBannerImage(IconUtils.getBannerForGuild$default(iconUtils, guild, displayMetrics != null ? Integer.valueOf(displayMetrics.widthPixels) : null, false, 4, null), null, false); return; } TextView textView5 = getBinding().h.g; diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java index c82a126830..63dd64a05d 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java @@ -33,10 +33,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1 implements Acti public final boolean onMenuItemClick(MenuItem menuItem) { m.checkNotNullExpressionValue(menuItem, "it"); switch (menuItem.getItemId()) { - case R.id.menu_audit_log_sort_actions /* 2131364203 */: + case R.id.menu_audit_log_sort_actions /* 2131364206 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1); break; - case R.id.menu_audit_log_sort_users /* 2131364204 */: + case R.id.menu_audit_log_sort_users /* 2131364207 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0); break; } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java index fd7345e921..4d5dee41f2 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.java @@ -14,9 +14,9 @@ public final class ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt { for (GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing : list) { long c2 = guildRoleSubscriptionTierListing.c(); String e = guildRoleSubscriptionTierListing.e(); - int priceTier = GuildRoleSubscriptionUtilsKt.getPriceTier(guildRoleSubscriptionTierListing); + int price = GuildRoleSubscriptionUtilsKt.getPrice(guildRoleSubscriptionTierListing); ImageAsset d = guildRoleSubscriptionTierListing.d(); - arrayList.add(new ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier(c2, e, priceTier, guildRoleSubscriptionTierListing.a(), guildRoleSubscriptionTierListing.f(), d != null ? Long.valueOf(d.a()) : null)); + arrayList.add(new ServerSettingsGuildRoleSubscriptionTierAdapterItem.Tier(c2, e, price, guildRoleSubscriptionTierListing.a(), guildRoleSubscriptionTierListing.f(), d != null ? Long.valueOf(d.a()) : null)); } } if ((list != null ? list.size() : 0) < i) { diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java index af11369b1c..e9843b8c9f 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java @@ -11,7 +11,6 @@ import com.discord.api.guildrolesubscription.GuildRoleSubscriptionGroupListing; import com.discord.api.guildrolesubscription.GuildRoleSubscriptionTierListing; import com.discord.api.guildrolesubscription.ImageAsset; import com.discord.api.permission.Permission; -import com.discord.api.premium.SubscriptionPlan; import com.discord.api.role.GuildRole; import com.discord.app.AppViewModel; import com.discord.models.domain.emoji.Emoji; @@ -35,7 +34,6 @@ import com.discord.widgets.guild_role_subscriptions.GuildRoleSubscriptionUtilsKt import com.discord.widgets.guild_role_subscriptions.tier.model.Benefit; import com.discord.widgets.guild_role_subscriptions.tier.model.GuildRoleSubscriptionTier; import d0.g0.t; -import d0.t.u; import d0.z.d.m; import d0.z.d.o; import java.util.ArrayList; @@ -655,7 +653,6 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends private final void handleLoadedStoreState(StoreGuildRoleSubscriptions.GuildRoleSubscriptionGroupState.Loaded loaded, Map map, EmojiSet emojiSet, Map map2) { List h; - int i; Long l; Object obj; String str; @@ -664,7 +661,6 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends if (!(guildRoleSubscriptionGroupListing == null || (h = guildRoleSubscriptionGroupListing.h()) == null)) { Iterator it = h.iterator(); while (true) { - i = 0; l = null; if (!it.hasNext()) { obj = null; @@ -722,11 +718,7 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends if (d != null) { l = Long.valueOf(d.a()); } - SubscriptionPlan subscriptionPlan = (SubscriptionPlan) u.getOrNull(guildRoleSubscriptionTierListing.i(), 0); - if (subscriptionPlan != null) { - i = subscriptionPlan.d(); - } - GuildRoleSubscriptionTier guildRoleSubscriptionTier = new GuildRoleSubscriptionTier(e, valueOf2, Integer.valueOf(i), valueOf, null, guildRole, null, l, b2, Boolean.valueOf(guildRoleSubscriptionTierListing.f()), Boolean.valueOf(canRole), arrayList, arrayList2, 80, null); + GuildRoleSubscriptionTier guildRoleSubscriptionTier = new GuildRoleSubscriptionTier(e, valueOf2, Integer.valueOf(GuildRoleSubscriptionUtilsKt.getPrice(guildRoleSubscriptionTierListing)), valueOf, null, guildRole, null, l, b2, Boolean.valueOf(guildRoleSubscriptionTierListing.f()), Boolean.valueOf(canRole), arrayList, arrayList2, 80, null); Boolean fullServerGatingOverwrite = GuildRoleSubscriptionUtilsKt.getFullServerGatingOverwrite(loaded.getGuildRoleSubscriptionGroupListing(), map2); boolean booleanValue = fullServerGatingOverwrite != null ? fullServerGatingOverwrite.booleanValue() : loaded.getGuildRoleSubscriptionGroupListing().d(); this.isFullServerGating = Boolean.valueOf(booleanValue); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java index a7e300054d..1c44f9cef2 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java @@ -17,12 +17,12 @@ public final class WidgetSettings$configureToolbar$1 implements Action2< public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_settings_debugging /* 2131364249 */: + case R.id.menu_settings_debugging /* 2131364252 */: WidgetDebugging.Companion companion = WidgetDebugging.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); return; - case R.id.menu_settings_log_out /* 2131364250 */: + case R.id.menu_settings_log_out /* 2131364253 */: WidgetSettings widgetSettings = this.this$0; m.checkNotNullExpressionValue(context, "context"); WidgetSettings.access$showLogoutDialog(widgetSettings, context); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 7335f27421..5728a7a2bc 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 104.0 - Alpha (104200)"); + textView.setText(string + " - 104.1 - Alpha (104201)"); binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java index c532afb431..96ed729a6f 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java @@ -105,7 +105,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc IconUtils iconUtils = IconUtils.INSTANCE; Guild guild = guildItem.getGuild(); m.checkNotNullExpressionValue(context, "context"); - simpleDraweeView.setImageURI(iconUtils.getBannerForGuild(guild, Integer.valueOf(context.getResources().getDimensionPixelSize(R.dimen.nav_panel_width)))); + simpleDraweeView.setImageURI(IconUtils.getBannerForGuild$default(iconUtils, guild, Integer.valueOf(context.getResources().getDimensionPixelSize(R.dimen.nav_panel_width)), false, 4, null)); View view2 = this.binding.f1733c; m.checkNotNullExpressionValue(view2, "binding.boostedGuildGradient"); view2.setVisibility(0); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java index 70b3f24273..2160717101 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java @@ -65,13 +65,13 @@ public final class WidgetBanUser$onViewBound$3 implements View.OnClickListener { List access$getHistoryRadios$p = WidgetBanUser.access$getHistoryRadios$p(this.this$0); RadioManager access$getDeleteHistoryRadioManager$p = WidgetBanUser.access$getDeleteHistoryRadioManager$p(this.this$0); switch (((CheckedSetting) access$getHistoryRadios$p.get(access$getDeleteHistoryRadioManager$p != null ? access$getDeleteHistoryRadioManager$p.b() : 0)).getId()) { - case R.id.ban_user_delete_messages_1_day /* 2131362109 */: + case R.id.ban_user_delete_messages_1_day /* 2131362112 */: i = 1; break; - case R.id.ban_user_delete_messages_7_days /* 2131362110 */: + case R.id.ban_user_delete_messages_7_days /* 2131362113 */: i = 7; break; - case R.id.ban_user_delete_messages_none /* 2131362111 */: + case R.id.ban_user_delete_messages_none /* 2131362114 */: default: i = 0; break; diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java index f828fa41aa..c644861261 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java +++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java @@ -330,7 +330,7 @@ public final class UserProfileHeaderView extends ConstraintLayout { int dimension = (int) getResources().getDimension(R.dimen.avatar_size_profile_small); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - DraweeSpanStringBuilderExtensionsKt.setAvatar(draweeSpanStringBuilder, context, IconUtils.getForUser(loaded.getUser(), false, Integer.valueOf(dimension)), false, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor), 8194); + DraweeSpanStringBuilderExtensionsKt.setAvatar$default(draweeSpanStringBuilder, context, IconUtils.getForUser(loaded.getUser(), false, Integer.valueOf(dimension)), false, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor), null, 32, null); } CharSequence secondaryNameTextForUser = getSecondaryNameTextForUser(user, guildMember); boolean z2 = true; diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java index ea0a5ba3a1..c1de19b4e5 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java @@ -17,6 +17,7 @@ import com.discord.widgets.stage.usersheet.UserProfileStageActionsView; import com.discord.widgets.user.profile.UserProfileAdminView; import com.discord.widgets.user.profile.UserProfileConnectionsView; import com.discord.widgets.user.profile.UserProfileHeaderView; +import com.facebook.drawee.view.SimpleDraweeView; import com.google.android.flexbox.FlexboxLayout; import com.google.android.material.button.MaterialButton; import com.google.android.material.textfield.TextInputEditText; @@ -37,124 +38,136 @@ public final /* synthetic */ class WidgetUserSheet$binding$2 extends k implement int i = R.id.about_me_card; CardView cardView = (CardView) view.findViewById(R.id.about_me_card); if (cardView != null) { - i = R.id.about_me_header; - TextView textView = (TextView) view.findViewById(R.id.about_me_header); - if (textView != null) { - i = R.id.about_me_text; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.about_me_text); - if (linkifiedTextView != null) { - i = R.id.loading_progress_bar; - ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(R.id.loading_progress_bar); - if (contentLoadingProgressBar != null) { - i = R.id.rich_presence_container; - FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.rich_presence_container); - if (frameLayout != null) { - i = R.id.user_sheet_add_friend_action_button; - Button button = (Button) view.findViewById(R.id.user_sheet_add_friend_action_button); - if (button != null) { - i = R.id.user_sheet_admin_card; - CardView cardView2 = (CardView) view.findViewById(R.id.user_sheet_admin_card); - if (cardView2 != null) { - i = R.id.user_sheet_admin_view; - UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(R.id.user_sheet_admin_view); - if (userProfileAdminView != null) { - i = R.id.user_sheet_call_action_button; - Button button2 = (Button) view.findViewById(R.id.user_sheet_call_action_button); - if (button2 != null) { - i = R.id.user_sheet_connections_header; - TextView textView2 = (TextView) view.findViewById(R.id.user_sheet_connections_header); - if (textView2 != null) { - i = R.id.user_sheet_connections_view; - UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(R.id.user_sheet_connections_view); - if (userProfileConnectionsView != null) { - i = R.id.user_sheet_content; - LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.user_sheet_content); - if (linearLayout != null) { - i = R.id.user_sheet_copy_id; - TextView textView3 = (TextView) view.findViewById(R.id.user_sheet_copy_id); + i = R.id.about_me_guild_icon; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.about_me_guild_icon); + if (simpleDraweeView != null) { + i = R.id.about_me_guild_icon_name; + TextView textView = (TextView) view.findViewById(R.id.about_me_guild_icon_name); + if (textView != null) { + i = R.id.about_me_header; + TextView textView2 = (TextView) view.findViewById(R.id.about_me_header); + if (textView2 != null) { + i = R.id.about_me_header_container; + FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(R.id.about_me_header_container); + if (flexboxLayout != null) { + i = R.id.about_me_text; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.about_me_text); + if (linkifiedTextView != null) { + i = R.id.loading_progress_bar; + ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(R.id.loading_progress_bar); + if (contentLoadingProgressBar != null) { + i = R.id.rich_presence_container; + FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.rich_presence_container); + if (frameLayout != null) { + i = R.id.user_sheet_add_friend_action_button; + Button button = (Button) view.findViewById(R.id.user_sheet_add_friend_action_button); + if (button != null) { + i = R.id.user_sheet_admin_card; + CardView cardView2 = (CardView) view.findViewById(R.id.user_sheet_admin_card); + if (cardView2 != null) { + i = R.id.user_sheet_admin_view; + UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(R.id.user_sheet_admin_view); + if (userProfileAdminView != null) { + i = R.id.user_sheet_call_action_button; + Button button2 = (Button) view.findViewById(R.id.user_sheet_call_action_button); + if (button2 != null) { + i = R.id.user_sheet_connections_header; + TextView textView3 = (TextView) view.findViewById(R.id.user_sheet_connections_header); if (textView3 != null) { - i = R.id.user_sheet_developer_header; - TextView textView4 = (TextView) view.findViewById(R.id.user_sheet_developer_header); - if (textView4 != null) { - i = R.id.user_sheet_friend_request_accept_button; - MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.user_sheet_friend_request_accept_button); - if (materialButton != null) { - i = R.id.user_sheet_friend_request_ignore_button; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.user_sheet_friend_request_ignore_button); - if (materialButton2 != null) { - i = R.id.user_sheet_friend_request_incoming_container; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.user_sheet_friend_request_incoming_container); - if (linearLayout2 != null) { - i = R.id.user_sheet_guild_container; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.user_sheet_guild_container); - if (linearLayout3 != null) { - i = R.id.user_sheet_guild_header; - TextView textView5 = (TextView) view.findViewById(R.id.user_sheet_guild_header); - if (textView5 != null) { - i = R.id.user_sheet_incoming_friend_request_header; - TextView textView6 = (TextView) view.findViewById(R.id.user_sheet_incoming_friend_request_header); - if (textView6 != null) { - i = R.id.user_sheet_loading_container; - FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.user_sheet_loading_container); - if (frameLayout2 != null) { - i = R.id.user_sheet_message_action_button; - Button button3 = (Button) view.findViewById(R.id.user_sheet_message_action_button); - if (button3 != null) { - i = R.id.user_sheet_more_button; - ImageView imageView = (ImageView) view.findViewById(R.id.user_sheet_more_button); - if (imageView != null) { - i = R.id.user_sheet_note_header; - TextView textView7 = (TextView) view.findViewById(R.id.user_sheet_note_header); - if (textView7 != null) { - i = R.id.user_sheet_note_text_field; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.user_sheet_note_text_field); - if (textInputEditText != null) { - i = R.id.user_sheet_note_text_field_wrap; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.user_sheet_note_text_field_wrap); - if (textInputLayout != null) { - i = R.id.user_sheet_pending_friend_request_action_button; - Button button4 = (Button) view.findViewById(R.id.user_sheet_pending_friend_request_action_button); - if (button4 != null) { - i = R.id.user_sheet_profile_actions_container; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.user_sheet_profile_actions_container); - if (linearLayout4 != null) { - i = R.id.user_sheet_profile_actions_divider; - View findViewById = view.findViewById(R.id.user_sheet_profile_actions_divider); - if (findViewById != null) { - i = R.id.user_sheet_profile_edit_button; - MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.user_sheet_profile_edit_button); - if (materialButton3 != null) { - i = R.id.user_sheet_profile_edit_container; - FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(R.id.user_sheet_profile_edit_container); - if (flexboxLayout != null) { - i = R.id.user_sheet_profile_header_view; - UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(R.id.user_sheet_profile_header_view); - if (userProfileHeaderView != null) { - i = R.id.user_sheet_profile_identity_button; - MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.user_sheet_profile_identity_button); - if (materialButton4 != null) { - i = R.id.user_sheet_profile_stage_actions_card; - CardView cardView3 = (CardView) view.findViewById(R.id.user_sheet_profile_stage_actions_card); - if (cardView3 != null) { - i = R.id.user_sheet_profile_stage_actions_view; - UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(R.id.user_sheet_profile_stage_actions_view); - if (userProfileStageActionsView != null) { - i = R.id.user_sheet_profile_voice_settings_header; - TextView textView8 = (TextView) view.findViewById(R.id.user_sheet_profile_voice_settings_header); - if (textView8 != null) { - i = R.id.user_sheet_profile_voice_settings_view; - UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(R.id.user_sheet_profile_voice_settings_view); - if (userProfileVoiceSettingsView != null) { - i = R.id.user_sheet_roles_list; - RolesListView rolesListView = (RolesListView) view.findViewById(R.id.user_sheet_roles_list); - if (rolesListView != null) { - i = R.id.user_sheet_video_action_button; - Button button5 = (Button) view.findViewById(R.id.user_sheet_video_action_button); - if (button5 != null) { - i = R.id.voice_settings_view_card; - CardView cardView4 = (CardView) view.findViewById(R.id.voice_settings_view_card); - if (cardView4 != null) { - return new WidgetUserSheetBinding((NestedScrollView) view, cardView, textView, linkifiedTextView, contentLoadingProgressBar, frameLayout, button, cardView2, userProfileAdminView, button2, textView2, userProfileConnectionsView, linearLayout, textView3, textView4, materialButton, materialButton2, linearLayout2, linearLayout3, textView5, textView6, frameLayout2, button3, imageView, textView7, textInputEditText, textInputLayout, button4, linearLayout4, findViewById, materialButton3, flexboxLayout, userProfileHeaderView, materialButton4, cardView3, userProfileStageActionsView, textView8, userProfileVoiceSettingsView, rolesListView, button5, cardView4); + i = R.id.user_sheet_connections_view; + UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(R.id.user_sheet_connections_view); + if (userProfileConnectionsView != null) { + i = R.id.user_sheet_content; + LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.user_sheet_content); + if (linearLayout != null) { + i = R.id.user_sheet_copy_id; + TextView textView4 = (TextView) view.findViewById(R.id.user_sheet_copy_id); + if (textView4 != null) { + i = R.id.user_sheet_developer_header; + TextView textView5 = (TextView) view.findViewById(R.id.user_sheet_developer_header); + if (textView5 != null) { + i = R.id.user_sheet_friend_request_accept_button; + MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.user_sheet_friend_request_accept_button); + if (materialButton != null) { + i = R.id.user_sheet_friend_request_ignore_button; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.user_sheet_friend_request_ignore_button); + if (materialButton2 != null) { + i = R.id.user_sheet_friend_request_incoming_container; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.user_sheet_friend_request_incoming_container); + if (linearLayout2 != null) { + i = R.id.user_sheet_guild_container; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.user_sheet_guild_container); + if (linearLayout3 != null) { + i = R.id.user_sheet_guild_header; + TextView textView6 = (TextView) view.findViewById(R.id.user_sheet_guild_header); + if (textView6 != null) { + i = R.id.user_sheet_incoming_friend_request_header; + TextView textView7 = (TextView) view.findViewById(R.id.user_sheet_incoming_friend_request_header); + if (textView7 != null) { + i = R.id.user_sheet_loading_container; + FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.user_sheet_loading_container); + if (frameLayout2 != null) { + i = R.id.user_sheet_message_action_button; + Button button3 = (Button) view.findViewById(R.id.user_sheet_message_action_button); + if (button3 != null) { + i = R.id.user_sheet_more_button; + ImageView imageView = (ImageView) view.findViewById(R.id.user_sheet_more_button); + if (imageView != null) { + i = R.id.user_sheet_note_header; + TextView textView8 = (TextView) view.findViewById(R.id.user_sheet_note_header); + if (textView8 != null) { + i = R.id.user_sheet_note_text_field; + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.user_sheet_note_text_field); + if (textInputEditText != null) { + i = R.id.user_sheet_note_text_field_wrap; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.user_sheet_note_text_field_wrap); + if (textInputLayout != null) { + i = R.id.user_sheet_pending_friend_request_action_button; + Button button4 = (Button) view.findViewById(R.id.user_sheet_pending_friend_request_action_button); + if (button4 != null) { + i = R.id.user_sheet_profile_actions_container; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.user_sheet_profile_actions_container); + if (linearLayout4 != null) { + i = R.id.user_sheet_profile_actions_divider; + View findViewById = view.findViewById(R.id.user_sheet_profile_actions_divider); + if (findViewById != null) { + i = R.id.user_sheet_profile_edit_button; + MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.user_sheet_profile_edit_button); + if (materialButton3 != null) { + i = R.id.user_sheet_profile_edit_container; + FlexboxLayout flexboxLayout2 = (FlexboxLayout) view.findViewById(R.id.user_sheet_profile_edit_container); + if (flexboxLayout2 != null) { + i = R.id.user_sheet_profile_header_view; + UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(R.id.user_sheet_profile_header_view); + if (userProfileHeaderView != null) { + i = R.id.user_sheet_profile_identity_button; + MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.user_sheet_profile_identity_button); + if (materialButton4 != null) { + i = R.id.user_sheet_profile_stage_actions_card; + CardView cardView3 = (CardView) view.findViewById(R.id.user_sheet_profile_stage_actions_card); + if (cardView3 != null) { + i = R.id.user_sheet_profile_stage_actions_view; + UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(R.id.user_sheet_profile_stage_actions_view); + if (userProfileStageActionsView != null) { + i = R.id.user_sheet_profile_voice_settings_header; + TextView textView9 = (TextView) view.findViewById(R.id.user_sheet_profile_voice_settings_header); + if (textView9 != null) { + i = R.id.user_sheet_profile_voice_settings_view; + UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(R.id.user_sheet_profile_voice_settings_view); + if (userProfileVoiceSettingsView != null) { + i = R.id.user_sheet_roles_list; + RolesListView rolesListView = (RolesListView) view.findViewById(R.id.user_sheet_roles_list); + if (rolesListView != null) { + i = R.id.user_sheet_video_action_button; + Button button5 = (Button) view.findViewById(R.id.user_sheet_video_action_button); + if (button5 != null) { + i = R.id.voice_settings_view_card; + CardView cardView4 = (CardView) view.findViewById(R.id.voice_settings_view_card); + if (cardView4 != null) { + return new WidgetUserSheetBinding((NestedScrollView) view, cardView, simpleDraweeView, textView, textView2, flexboxLayout, linkifiedTextView, contentLoadingProgressBar, frameLayout, button, cardView2, userProfileAdminView, button2, textView3, userProfileConnectionsView, linearLayout, textView4, textView5, materialButton, materialButton2, linearLayout2, linearLayout3, textView6, textView7, frameLayout2, button3, imageView, textView8, textInputEditText, textInputLayout, button4, linearLayout4, findViewById, materialButton3, flexboxLayout2, userProfileHeaderView, materialButton4, cardView3, userProfileStageActionsView, textView9, userProfileVoiceSettingsView, rolesListView, button5, cardView4); + } + } + } } } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAboutMe$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAboutMe$1.java new file mode 100644 index 0000000000..e9c7ee25aa --- /dev/null +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAboutMe$1.java @@ -0,0 +1,25 @@ +package com.discord.widgets.user.usersheet; + +import android.view.View; +import c.a.k.b; +import com.discord.R; +import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel; +import d0.z.d.m; +/* compiled from: WidgetUserSheet.kt */ +public final class WidgetUserSheet$configureAboutMe$1 implements View.OnClickListener { + public final /* synthetic */ WidgetUserSheetViewModel.ViewState.Loaded $viewState; + public final /* synthetic */ WidgetUserSheet this$0; + + public WidgetUserSheet$configureAboutMe$1(WidgetUserSheet widgetUserSheet, WidgetUserSheetViewModel.ViewState.Loaded loaded) { + this.this$0 = widgetUserSheet; + this.$viewState = loaded; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + if (this.$viewState.getHasGuildMemberBio()) { + m.checkNotNullExpressionValue(view, "it"); + c.a.d.m.h(view.getContext(), b.k(this.this$0, R.string.guild_identity_bio_toast, new Object[]{this.$viewState.getGuildName()}, null, 4), 0, null, 12); + } + } +} diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java index ee1fdf8d56..2b44b7c27b 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java @@ -18,7 +18,7 @@ public final class WidgetUserSheet$onViewCreated$14 implements View.OnFocusChang if (!z2) { WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0); Context context = this.this$0.getContext(); - TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2121y; + TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).B; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout)); } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java index b94e510384..a71caa5001 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java @@ -33,10 +33,10 @@ public final class WidgetUserSheet$onViewCreated$15 extends o implements Functio m.checkNotNullParameter(textView, "it"); WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0); Context context = this.this$0.getContext(); - TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2121y; + TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).B; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout)); - WidgetUserSheet.access$getBinding$p(this.this$0).f2121y.clearFocus(); + WidgetUserSheet.access$getBinding$p(this.this$0).B.clearFocus(); this.this$0.hideKeyboard(this.$view); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java index e2180c1415..380403791d 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java @@ -17,6 +17,6 @@ public final class WidgetUserSheet$onViewCreated$16 extends AccessibilityDelegat m.checkNotNullParameter(view, "host"); m.checkNotNullParameter(accessibilityNodeInfoCompat, "info"); super.onInitializeAccessibilityNodeInfo(view, accessibilityNodeInfoCompat); - accessibilityNodeInfoCompat.setTraversalAfter(WidgetUserSheet.access$getBinding$p(this.this$0).l); + accessibilityNodeInfoCompat.setTraversalAfter(WidgetUserSheet.access$getBinding$p(this.this$0).o); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java index f39ffa0117..e80805ccc5 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java @@ -36,6 +36,9 @@ import com.discord.stores.StoreUserNotes; import com.discord.utilities.accessibility.AccessibilityUtils; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.color.ColorCompat; +import com.discord.utilities.guilds.GuildUtilsKt; +import com.discord.utilities.icon.IconUtils; +import com.discord.utilities.images.MGImages; import com.discord.utilities.presence.ActivityUtilsKt; import com.discord.utilities.presence.PresenceUtils; import com.discord.utilities.rest.RestAPIAbortMessages; @@ -64,6 +67,7 @@ import com.discord.widgets.user.profile.UserProfileHeaderViewModel; import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView; import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel; import com.discord.widgets.voice.fullscreen.WidgetCallFullscreen; +import com.facebook.drawee.view.SimpleDraweeView; import com.google.android.flexbox.FlexboxLayout; import com.google.android.material.button.MaterialButton; import com.google.android.material.textfield.TextInputLayout; @@ -233,12 +237,40 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void configureAboutMe(WidgetUserSheetViewModel.ViewState.Loaded loaded) { + String str; List> bioAst = loaded.getBioAst(); - TextView textView = getBinding().f2118c; + getBinding().f.setOnClickListener(new WidgetUserSheet$configureAboutMe$1(this, loaded)); + TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.aboutMeHeader"); boolean z2 = true; int i = 0; textView.setVisibility(bioAst != null ? 0 : 8); + SimpleDraweeView simpleDraweeView = getBinding().f2118c; + m.checkNotNullExpressionValue(simpleDraweeView, "binding.aboutMeGuildIcon"); + simpleDraweeView.setVisibility(loaded.getHasGuildMemberBio() ? 0 : 8); + String guildIconURL = loaded.getGuildIconURL(); + if (guildIconURL == null || guildIconURL.length() == 0) { + SimpleDraweeView simpleDraweeView2 = getBinding().f2118c; + m.checkNotNullExpressionValue(simpleDraweeView2, "binding.aboutMeGuildIcon"); + IconUtils.setIcon$default(simpleDraweeView2, IconUtils.DEFAULT_ICON_BLURPLE, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); + TextView textView2 = getBinding().d; + m.checkNotNullExpressionValue(textView2, "binding.aboutMeGuildIconName"); + textView2.setVisibility(0); + TextView textView3 = getBinding().d; + m.checkNotNullExpressionValue(textView3, "binding.aboutMeGuildIconName"); + String guildName = loaded.getGuildName(); + if (guildName == null || (str = GuildUtilsKt.computeShortName(guildName)) == null) { + str = ""; + } + textView3.setText(str); + } else { + SimpleDraweeView simpleDraweeView3 = getBinding().f2118c; + m.checkNotNullExpressionValue(simpleDraweeView3, "binding.aboutMeGuildIcon"); + IconUtils.setIcon$default(simpleDraweeView3, loaded.getGuildIconURL(), 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); + TextView textView4 = getBinding().d; + m.checkNotNullExpressionValue(textView4, "binding.aboutMeGuildIconName"); + textView4.setVisibility(8); + } CardView cardView = getBinding().b; m.checkNotNullExpressionValue(cardView, "binding.aboutMeCard"); if (bioAst == null) { @@ -249,21 +281,21 @@ public final class WidgetUserSheet extends AppBottomSheet { } cardView.setVisibility(i); if (bioAst != null) { - LinkifiedTextView linkifiedTextView = getBinding().d; + LinkifiedTextView linkifiedTextView = getBinding().g; m.checkNotNullExpressionValue(linkifiedTextView, "binding.aboutMeText"); Context context = linkifiedTextView.getContext(); m.checkNotNullExpressionValue(context, "binding.aboutMeText.context"); - getBinding().d.setDraweeSpanStringBuilder(AstRenderer.render(loaded.getBioAst(), new MessageRenderContext(context, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetUserSheet$configureAboutMe$renderContext$1(getViewModel()), null, null, 14328, null))); + getBinding().g.setDraweeSpanStringBuilder(AstRenderer.render(loaded.getBioAst(), new MessageRenderContext(context, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetUserSheet$configureAboutMe$renderContext$1(getViewModel()), null, null, 14328, null))); } } private final void configureConnectionsSection(WidgetUserSheetViewModel.ViewState.Loaded loaded) { UserProfileConnectionsView.ViewState connectionsViewState = loaded.getConnectionsViewState(); - TextView textView = getBinding().j; + TextView textView = getBinding().m; m.checkNotNullExpressionValue(textView, "binding.userSheetConnectionsHeader"); int i = 0; textView.setVisibility(connectionsViewState.getShowConnectionsSection() ? 0 : 8); - UserProfileConnectionsView userProfileConnectionsView = getBinding().k; + UserProfileConnectionsView userProfileConnectionsView = getBinding().n; m.checkNotNullExpressionValue(userProfileConnectionsView, "binding.userSheetConnectionsView"); if (!connectionsViewState.getShowConnectionsSection()) { i = 8; @@ -271,18 +303,18 @@ public final class WidgetUserSheet extends AppBottomSheet { userProfileConnectionsView.setVisibility(i); WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1 widgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1 = new WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1(this); User user = loaded.getUser(); - getBinding().k.updateViewState(connectionsViewState, widgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1, new WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1(this, user), new WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1(this, user)); + getBinding().n.updateViewState(connectionsViewState, widgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1, new WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1(this, user), new WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1(this, user)); } private final void configureDeveloperSection(WidgetUserSheetViewModel.ViewState.Loaded loaded) { - TextView textView = getBinding().l; + TextView textView = getBinding().o; int i = 8; textView.setVisibility(StoreStream.Companion.getUserSettings().getIsDeveloperMode() ? 0 : 8); textView.setOnClickListener(new WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1(textView, this, loaded)); - TextView textView2 = getBinding().l; + TextView textView2 = getBinding().o; m.checkNotNullExpressionValue(textView2, "binding.userSheetCopyId"); boolean z2 = textView2.getVisibility() == 0; - TextView textView3 = getBinding().m; + TextView textView3 = getBinding().p; m.checkNotNullExpressionValue(textView3, "binding.userSheetDeveloperHeader"); if (z2) { i = 0; @@ -297,85 +329,85 @@ public final class WidgetUserSheet extends AppBottomSheet { boolean z2 = true; int i = 0; boolean z3 = adminViewState != null && adminViewState.isAdminSectionEnabled(); - LinearLayout linearLayout = getBinding().q; + LinearLayout linearLayout = getBinding().t; m.checkNotNullExpressionValue(linearLayout, "binding.userSheetGuildContainer"); if (!shouldShowRoles && !z3) { z2 = false; } linearLayout.setVisibility(z2 ? 0 : 8); - RolesListView rolesListView = getBinding().K; + RolesListView rolesListView = getBinding().N; m.checkNotNullExpressionValue(rolesListView, "binding.userSheetRolesList"); rolesListView.setVisibility(shouldShowRoles ? 0 : 8); Long guildId = loaded.getGuildId(); if (shouldShowRoles && guildId != null) { - RolesListView rolesListView2 = getBinding().K; - RolesListView rolesListView3 = getBinding().K; + RolesListView rolesListView2 = getBinding().N; + RolesListView rolesListView3 = getBinding().N; m.checkNotNullExpressionValue(rolesListView3, "binding.userSheetRolesList"); rolesListView2.updateView(roleItems, ColorCompat.getThemedColor(rolesListView3.getContext(), (int) R.attr.primary_300), guildId.longValue()); } String guildSectionHeaderText = loaded.getGuildSectionHeaderText(); if (guildSectionHeaderText != null) { - TextView textView = getBinding().r; + TextView textView = getBinding().u; m.checkNotNullExpressionValue(textView, "binding.userSheetGuildHeader"); textView.setText(guildSectionHeaderText); } - CardView cardView = getBinding().g; + CardView cardView = getBinding().j; m.checkNotNullExpressionValue(cardView, "binding.userSheetAdminCard"); cardView.setVisibility(z3 ? 0 : 8); - UserProfileAdminView userProfileAdminView = getBinding().h; + UserProfileAdminView userProfileAdminView = getBinding().k; m.checkNotNullExpressionValue(userProfileAdminView, "binding.userSheetAdminView"); if (!z3) { i = 8; } userProfileAdminView.setVisibility(i); if (adminViewState != null) { - getBinding().h.updateView(adminViewState); + getBinding().k.updateView(adminViewState); } } private final void configureIncomingFriendRequest(WidgetUserSheetViewModel.ViewState.Loaded loaded) { int i = 0; boolean z2 = ModelUserRelationship.getType(Integer.valueOf(loaded.getUserRelationshipType())) == 3; - TextView textView = getBinding().f2119s; + TextView textView = getBinding().v; m.checkNotNullExpressionValue(textView, "binding.userSheetIncomingFriendRequestHeader"); textView.setVisibility(z2 ? 0 : 8); - LinearLayout linearLayout = getBinding().p; + LinearLayout linearLayout = getBinding().f2119s; m.checkNotNullExpressionValue(linearLayout, "binding.userSheetFriendRequestIncomingContainer"); if (!z2) { i = 8; } linearLayout.setVisibility(i); - getBinding().n.setOnClickListener(new WidgetUserSheet$configureIncomingFriendRequest$1(this, loaded)); - getBinding().o.setOnClickListener(new WidgetUserSheet$configureIncomingFriendRequest$2(this)); + getBinding().q.setOnClickListener(new WidgetUserSheet$configureIncomingFriendRequest$1(this, loaded)); + getBinding().r.setOnClickListener(new WidgetUserSheet$configureIncomingFriendRequest$2(this)); } private final void configureNote(WidgetUserSheetViewModel.ViewState.Loaded loaded) { - getBinding().f2120x.setRawInputType(1); + getBinding().A.setRawInputType(1); StoreUserNotes.UserNoteState userNoteFetchState = loaded.getUserNoteFetchState(); if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Empty) { - TextInputLayout textInputLayout = getBinding().f2121y; + TextInputLayout textInputLayout = getBinding().B; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); textInputLayout.setHint(getString(R.string.note_placeholder_mobile)); - TextInputLayout textInputLayout2 = getBinding().f2121y; + TextInputLayout textInputLayout2 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap"); textInputLayout2.setEnabled(true); } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loading) { - TextInputLayout textInputLayout3 = getBinding().f2121y; + TextInputLayout textInputLayout3 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout3, "binding.userSheetNoteTextFieldWrap"); textInputLayout3.setHint(getString(R.string.loading_note)); - TextInputLayout textInputLayout4 = getBinding().f2121y; + TextInputLayout textInputLayout4 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout4, "binding.userSheetNoteTextFieldWrap"); textInputLayout4.setEnabled(false); } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded) { - TextInputLayout textInputLayout5 = getBinding().f2121y; + TextInputLayout textInputLayout5 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout5, "binding.userSheetNoteTextFieldWrap"); textInputLayout5.setHint(getString(R.string.note_placeholder_mobile)); - TextInputLayout textInputLayout6 = getBinding().f2121y; + TextInputLayout textInputLayout6 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout6, "binding.userSheetNoteTextFieldWrap"); textInputLayout6.setEnabled(true); } if (loaded.getUserNote() != null) { - TextInputLayout textInputLayout7 = getBinding().f2121y; + TextInputLayout textInputLayout7 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout7, "binding.userSheetNoteTextFieldWrap"); ViewExtensions.setTextIfDifferent(textInputLayout7, loaded.getUserNote()); } @@ -394,70 +426,70 @@ public final class WidgetUserSheet extends AppBottomSheet { boolean z3; boolean isMe = loaded.isMe(); Long currentGuildId = loaded.getCurrentGuildId(); - FlexboxLayout flexboxLayout = getBinding().D; + FlexboxLayout flexboxLayout = getBinding().G; m.checkNotNullExpressionValue(flexboxLayout, "binding.userSheetProfileEditContainer"); int i = 8; flexboxLayout.setVisibility(isMe ? 0 : 8); - getBinding().C.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$1(this)); - MaterialButton materialButton = getBinding().F; + getBinding().F.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$1(this)); + MaterialButton materialButton = getBinding().I; m.checkNotNullExpressionValue(materialButton, "binding.userSheetProfileIdentityButton"); boolean z4 = true; if (isMe) { if ((currentGuildId != null ? currentGuildId.longValue() : 0) > 0) { z2 = true; materialButton.setVisibility(!z2 ? 0 : 8); - getBinding().F.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(currentGuildId)); + getBinding().I.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(currentGuildId)); boolean isBot = loaded.getUser().isBot(); boolean isSystemUser = loaded.getUser().isSystemUser(); int userRelationshipType = loaded.getUserRelationshipType(); z3 = isMe && !isSystemUser; - View view = getBinding().B; + View view = getBinding().E; m.checkNotNullExpressionValue(view, "binding.userSheetProfileActionsDivider"); view.setVisibility(!z3 ? 0 : 8); - LinearLayout linearLayout = getBinding().A; + LinearLayout linearLayout = getBinding().D; m.checkNotNullExpressionValue(linearLayout, "binding.userSheetProfileActionsContainer"); linearLayout.setVisibility(!z3 ? 0 : 8); if (!z3) { - Button button = getBinding().u; + Button button = getBinding().f2120x; m.checkNotNullExpressionValue(button, "binding.userSheetMessageActionButton"); Channel channel = loaded.getChannel(); button.setVisibility(channel == null || channel.A() != 1 ? 0 : 8); - getBinding().u.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$3(this, loaded)); - getBinding().i.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$4(this)); - getBinding().L.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$5(this)); + getBinding().f2120x.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$3(this, loaded)); + getBinding().l.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$4(this)); + getBinding().O.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$5(this)); if (userRelationshipType == 0) { - Button button2 = getBinding().f; + Button button2 = getBinding().i; m.checkNotNullExpressionValue(button2, "binding.userSheetAddFriendActionButton"); button2.setVisibility(0); - Button button3 = getBinding().f2122z; + Button button3 = getBinding().C; m.checkNotNullExpressionValue(button3, "binding.userSheetPendingFriendRequestActionButton"); button3.setVisibility(8); } else if (userRelationshipType == 3 || userRelationshipType == 4) { - Button button4 = getBinding().f; + Button button4 = getBinding().i; m.checkNotNullExpressionValue(button4, "binding.userSheetAddFriendActionButton"); button4.setVisibility(8); - Button button5 = getBinding().f2122z; + Button button5 = getBinding().C; m.checkNotNullExpressionValue(button5, "binding.userSheetPendingFriendRequestActionButton"); button5.setVisibility(0); } else { - Button button6 = getBinding().f; + Button button6 = getBinding().i; m.checkNotNullExpressionValue(button6, "binding.userSheetAddFriendActionButton"); button6.setVisibility(8); - Button button7 = getBinding().f2122z; + Button button7 = getBinding().C; m.checkNotNullExpressionValue(button7, "binding.userSheetPendingFriendRequestActionButton"); button7.setVisibility(8); } if (isMe || isBot || userRelationshipType != 0) { z4 = false; } - Button button8 = getBinding().f; + Button button8 = getBinding().i; m.checkNotNullExpressionValue(button8, "binding.userSheetAddFriendActionButton"); if (z4) { i = 0; } button8.setVisibility(i); - getBinding().f.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$6(this, loaded)); - getBinding().f2122z.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$7(this, userRelationshipType, loaded)); + getBinding().i.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$6(this, loaded)); + getBinding().C.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$7(this, userRelationshipType, loaded)); return; } return; @@ -465,16 +497,16 @@ public final class WidgetUserSheet extends AppBottomSheet { } z2 = false; materialButton.setVisibility(!z2 ? 0 : 8); - getBinding().F.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(currentGuildId)); + getBinding().I.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(currentGuildId)); boolean isBot = loaded.getUser().isBot(); boolean isSystemUser = loaded.getUser().isSystemUser(); int userRelationshipType = loaded.getUserRelationshipType(); if (isMe) { } - View view = getBinding().B; + View view = getBinding().E; m.checkNotNullExpressionValue(view, "binding.userSheetProfileActionsDivider"); view.setVisibility(!z3 ? 0 : 8); - LinearLayout linearLayout = getBinding().A; + LinearLayout linearLayout = getBinding().D; m.checkNotNullExpressionValue(linearLayout, "binding.userSheetProfileActionsContainer"); linearLayout.setVisibility(!z3 ? 0 : 8); if (!z3) { @@ -482,10 +514,10 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void configureStageActionsSection(WidgetUserSheetViewModel.ViewState.Loaded loaded) { - getBinding().H.updateView(loaded.getStageViewState()); - CardView cardView = getBinding().G; + getBinding().K.updateView(loaded.getStageViewState()); + CardView cardView = getBinding().J; m.checkNotNullExpressionValue(cardView, "binding.userSheetProfileStageActionsCard"); - UserProfileStageActionsView userProfileStageActionsView = getBinding().H; + UserProfileStageActionsView userProfileStageActionsView = getBinding().K; m.checkNotNullExpressionValue(userProfileStageActionsView, "binding.userSheetProfileStageActionsView"); int i = 0; if (!(userProfileStageActionsView.getVisibility() == 0)) { @@ -497,11 +529,11 @@ public final class WidgetUserSheet extends AppBottomSheet { private final void configureUI(WidgetUserSheetViewModel.ViewState viewState) { int i = 0; if (viewState instanceof WidgetUserSheetViewModel.ViewState.Uninitialized) { - FrameLayout frameLayout = getBinding().t; + FrameLayout frameLayout = getBinding().w; m.checkNotNullExpressionValue(frameLayout, "binding.userSheetLoadingContainer"); frameLayout.setVisibility(0); } else if (viewState instanceof WidgetUserSheetViewModel.ViewState.Loaded) { - FrameLayout frameLayout2 = getBinding().t; + FrameLayout frameLayout2 = getBinding().w; m.checkNotNullExpressionValue(frameLayout2, "binding.userSheetLoadingContainer"); frameLayout2.setVisibility(8); WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) viewState; @@ -515,8 +547,8 @@ public final class WidgetUserSheet extends AppBottomSheet { AnalyticsTracker.INSTANCE.openUserSheet(loaded.getHasPremiumCustomization(), primaryActivity != null ? primaryActivity.h() : null, primaryActivity != null ? ActivityUtilsKt.getGamePlatform(primaryActivity) : null, loaded.getGuildMember()); getViewModel().setOpenPopoutLogged(true); } - getBinding().E.setOnBannerPress(new WidgetUserSheet$configureUI$1(this)); - ImageView imageView = getBinding().v; + getBinding().H.setOnBannerPress(new WidgetUserSheet$configureUI$1(this)); + ImageView imageView = getBinding().f2121y; m.checkNotNullExpressionValue(imageView, "binding.userSheetMoreButton"); if (isMe || isSystemUser) { z2 = false; @@ -526,10 +558,10 @@ public final class WidgetUserSheet extends AppBottomSheet { } imageView.setVisibility(i); if (loaded.getConnectionsViewState().getShowConnectionsSection()) { - setPeekHeightBottomView(getBinding().j); + setPeekHeightBottomView(getBinding().m); } ViewHolderUserRichPresence.Companion companion = ViewHolderUserRichPresence.Companion; - FrameLayout frameLayout3 = getBinding().e; + FrameLayout frameLayout3 = getBinding().h; m.checkNotNullExpressionValue(frameLayout3, "binding.richPresenceContainer"); ViewHolderUserRichPresence richPresence = companion.setRichPresence(frameLayout3, primaryActivity, loaded.getStreamContext(), this.activityViewHolder); FragmentManager parentFragmentManager = getParentFragmentManager(); @@ -570,17 +602,17 @@ public final class WidgetUserSheet extends AppBottomSheet { private final void configureVoiceSection(WidgetUserSheetViewModel.ViewState.Loaded loaded) { UserProfileVoiceSettingsView.ViewState voiceSettingsViewState = loaded.getVoiceSettingsViewState(); boolean showVoiceSettings = loaded.getShowVoiceSettings(); - TextView textView = getBinding().I; + TextView textView = getBinding().L; m.checkNotNullExpressionValue(textView, "binding.userSheetProfileVoiceSettingsHeader"); int i = 0; textView.setVisibility(showVoiceSettings ? 0 : 8); - CardView cardView = getBinding().M; + CardView cardView = getBinding().P; m.checkNotNullExpressionValue(cardView, "binding.voiceSettingsViewCard"); if (!showVoiceSettings) { i = 8; } cardView.setVisibility(i); - getBinding().J.updateView(voiceSettingsViewState); + getBinding().M.updateView(voiceSettingsViewState); } private final WidgetUserSheetBinding getBinding() { @@ -735,7 +767,7 @@ public final class WidgetUserSheet extends AppBottomSheet { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null), WidgetUserSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheet$bindSubscriptions$1(this), 62, (Object) null); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeEvents(), this, null, 2, null), WidgetUserSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheet$bindSubscriptions$2(this), 62, (Object) null); UserProfileHeaderView.Companion companion = UserProfileHeaderView.Companion; - UserProfileHeaderView userProfileHeaderView = getBinding().E; + UserProfileHeaderView userProfileHeaderView = getBinding().H; m.checkNotNullExpressionValue(userProfileHeaderView, "binding.userSheetProfileHeaderView"); companion.bind(userProfileHeaderView, this, getViewModelUserProfileHeader().observeViewState()); } @@ -767,10 +799,10 @@ public final class WidgetUserSheet extends AppBottomSheet { if (j > 0 && j2 > 0) { StoreStream.Companion.getGuildSubscriptions().unsubscribeUser(j2, j); } - hideKeyboard(getBinding().f2121y); + hideKeyboard(getBinding().B); WidgetUserSheetViewModel viewModel = getViewModel(); Context context = getContext(); - TextInputLayout textInputLayout = getBinding().f2121y; + TextInputLayout textInputLayout = getBinding().B; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); viewModel.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout)); super.onPause(); @@ -793,34 +825,34 @@ public final class WidgetUserSheet extends AppBottomSheet { super.onViewCreated(view, bundle); long j = getArgumentsOrDefault().getLong(ARG_USER_ID); boolean z2 = j == StoreStream.Companion.getUsers().getMe().getId(); - getBinding().v.setOnClickListener(new WidgetUserSheet$onViewCreated$1(this, j)); - UserProfileHeaderView userProfileHeaderView = getBinding().E; + getBinding().f2121y.setOnClickListener(new WidgetUserSheet$onViewCreated$1(this, j)); + UserProfileHeaderView userProfileHeaderView = getBinding().H; Badge.Companion companion = Badge.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); userProfileHeaderView.setOnBadgeClick(companion.onBadgeClick(parentFragmentManager, requireContext)); - getBinding().H.setOnInviteToSpeak(new WidgetUserSheet$onViewCreated$2(this, z2)); - getBinding().H.setOnMoveToAudience(new WidgetUserSheet$onViewCreated$3(this)); - getBinding().J.setOnMuteChecked(new WidgetUserSheet$onViewCreated$4(this)); - getBinding().J.setOnDeafenChecked(new WidgetUserSheet$onViewCreated$5(this)); - getBinding().J.setOnVolumeChange(new WidgetUserSheet$onViewCreated$6(this)); - getBinding().h.setOnEditMember(new WidgetUserSheet$onViewCreated$7(this)); - getBinding().h.setOnKick(new WidgetUserSheet$onViewCreated$8(this)); - getBinding().h.setOnBan(new WidgetUserSheet$onViewCreated$9(this)); - getBinding().h.setOnServerMute(new WidgetUserSheet$onViewCreated$10(this)); - getBinding().h.setOnServerDeafen(new WidgetUserSheet$onViewCreated$11(this)); - getBinding().h.setOnServerMove(new WidgetUserSheet$onViewCreated$12(this)); - getBinding().h.setOnDisconnect(new WidgetUserSheet$onViewCreated$13(this)); - TextInputLayout textInputLayout = getBinding().f2121y; + getBinding().K.setOnInviteToSpeak(new WidgetUserSheet$onViewCreated$2(this, z2)); + getBinding().K.setOnMoveToAudience(new WidgetUserSheet$onViewCreated$3(this)); + getBinding().M.setOnMuteChecked(new WidgetUserSheet$onViewCreated$4(this)); + getBinding().M.setOnDeafenChecked(new WidgetUserSheet$onViewCreated$5(this)); + getBinding().M.setOnVolumeChange(new WidgetUserSheet$onViewCreated$6(this)); + getBinding().k.setOnEditMember(new WidgetUserSheet$onViewCreated$7(this)); + getBinding().k.setOnKick(new WidgetUserSheet$onViewCreated$8(this)); + getBinding().k.setOnBan(new WidgetUserSheet$onViewCreated$9(this)); + getBinding().k.setOnServerMute(new WidgetUserSheet$onViewCreated$10(this)); + getBinding().k.setOnServerDeafen(new WidgetUserSheet$onViewCreated$11(this)); + getBinding().k.setOnServerMove(new WidgetUserSheet$onViewCreated$12(this)); + getBinding().k.setOnDisconnect(new WidgetUserSheet$onViewCreated$13(this)); + TextInputLayout textInputLayout = getBinding().B; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); ViewExtensions.setOnEditTextFocusChangeListener(textInputLayout, new WidgetUserSheet$onViewCreated$14(this)); - TextInputLayout textInputLayout2 = getBinding().f2121y; + TextInputLayout textInputLayout2 = getBinding().B; m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap"); ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserSheet$onViewCreated$15(this, view), 1, null); - ViewCompat.setAccessibilityDelegate(getBinding().v, new WidgetUserSheet$onViewCreated$16(this)); - for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().j, getBinding().r, getBinding().w, getBinding().m, getBinding().f2119s, getBinding().I})) { + ViewCompat.setAccessibilityDelegate(getBinding().f2121y, new WidgetUserSheet$onViewCreated$16(this)); + for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().m, getBinding().u, getBinding().f2122z, getBinding().p, getBinding().v, getBinding().L})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView, "header"); accessibilityUtils.setViewIsHeading(textView); diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java index c4d67f6724..3591486377 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java @@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$inviteUserToSpeak$1 extends o implem return Unit.a; } - public final void invoke(Void r28) { + public final void invoke(Void r29) { WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0); if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) { access$getViewState$p = null; } WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p; if (loaded != null) { - WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 127, null), null, null, null, 0, null, null, null, false, null, false, null, null, 4193791, null)); + WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 127, null), null, null, null, null, 0, null, null, null, false, null, false, null, null, 8388095, null)); WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java index d8c6aa300d..725a624175 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java @@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$setUserSuppressedInChannel$1 extends return Unit.a; } - public final void invoke(Void r28) { + public final void invoke(Void r29) { WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0); if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) { access$getViewState$p = null; } WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p; if (loaded != null) { - WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 191, null), null, null, null, 0, null, null, null, false, null, false, null, null, 4193791, null)); + WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, false, 191, null), null, null, null, null, 0, null, null, null, false, null, false, null, null, 8388095, null)); WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java index c74591c4b4..c211a10f78 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java @@ -34,6 +34,7 @@ import com.discord.stores.StoreMediaSettings; import com.discord.stores.StoreStream; import com.discord.stores.StoreUserNotes; import com.discord.stores.StoreUserProfile; +import com.discord.utilities.dimen.DimenUtils; import com.discord.utilities.guilds.RoleUtils; import com.discord.utilities.icon.IconUtils; import com.discord.utilities.permissions.ManageUserContext; @@ -1135,10 +1136,13 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final VoiceState channelVoiceState; private final UserProfileConnectionsView.ViewState connectionsViewState; private final Long currentGuildId; + private final String guildIcon; + private final String guildIconURL; private final Long guildId; private final GuildMember guildMember; private final String guildName; private final String guildSectionHeaderText; + private final boolean hasGuildMemberBio; private final boolean hasPremiumCustomization; private final boolean isMe; private final boolean profileLoaded; @@ -1155,7 +1159,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final UserProfileVoiceSettingsView.ViewState voiceSettingsViewState; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List> list2, boolean z5, Long l, GuildMember guildMember) { + public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, String str3, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str4, boolean z4, List> list2, boolean z5, Long l, GuildMember guildMember) { super(null); String avatar; m.checkNotNullParameter(user, "user"); @@ -1164,6 +1168,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { m.checkNotNullParameter(viewState3, "stageViewState"); m.checkNotNullParameter(viewState4, "connectionsViewState"); m.checkNotNullParameter(userNoteState, "userNoteFetchState"); + String str5 = null; this.user = user; this.isMe = z2; this.showVoiceSettings = z3; @@ -1177,25 +1182,26 @@ public final class WidgetUserSheetViewModel extends AppViewModel { this.channel = channel; this.streamContext = streamContext; this.guildName = str2; + this.guildIcon = str3; this.userRelationshipType = i; this.connectionsViewState = viewState4; this.userNoteFetchState = userNoteState; - this.userNote = str3; + this.userNote = str4; this.userInSameVoiceChannel = z4; this.bioAst = list2; this.profileLoaded = z5; this.guildId = l; this.guildMember = guildMember; - boolean z6 = true; - if (user.getBanner() == null && ((avatar = user.getAvatar()) == null || !IconUtils.INSTANCE.isImageHashAnimated(avatar))) { - z6 = false; - } - this.hasPremiumCustomization = z6; + boolean z6 = false; + this.hasPremiumCustomization = user.getBanner() != null || ((avatar = user.getAvatar()) != null && IconUtils.INSTANCE.isImageHashAnimated(avatar)); this.currentGuildId = channel != null ? Long.valueOf(channel.f()) : l; + String bio = guildMember != null ? guildMember.getBio() : null; + this.hasGuildMemberBio = !((bio == null || bio.length() == 0) ? true : z6); + this.guildIconURL = str3 != null ? IconUtils.getForGuild$default(l, str3, null, false, Integer.valueOf(DimenUtils.dpToPixels(16)), 4, null) : str5; } - public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List list2, boolean z5, Long l, GuildMember guildMember, int i2, Object obj) { - return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 65536) != 0 ? loaded.userNote : str3, (i2 & 131072) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 262144) != 0 ? loaded.bioAst : list2, (i2 & 524288) != 0 ? loaded.profileLoaded : z5, (i2 & 1048576) != 0 ? loaded.guildId : l, (i2 & 2097152) != 0 ? loaded.guildMember : guildMember); + public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, String str3, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str4, boolean z4, List list2, boolean z5, Long l, GuildMember guildMember, int i2, Object obj) { + return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.guildIcon : str3, (i2 & 16384) != 0 ? loaded.userRelationshipType : i, (i2 & 32768) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 65536) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 131072) != 0 ? loaded.userNote : str4, (i2 & 262144) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 524288) != 0 ? loaded.bioAst : list2, (i2 & 1048576) != 0 ? loaded.profileLoaded : z5, (i2 & 2097152) != 0 ? loaded.guildId : l, (i2 & 4194304) != 0 ? loaded.guildMember : guildMember); } public final User component1() { @@ -1218,43 +1224,47 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.guildName; } - public final int component14() { + public final String component14() { + return this.guildIcon; + } + + public final int component15() { return this.userRelationshipType; } - public final UserProfileConnectionsView.ViewState component15() { + public final UserProfileConnectionsView.ViewState component16() { return this.connectionsViewState; } - public final StoreUserNotes.UserNoteState component16() { + public final StoreUserNotes.UserNoteState component17() { return this.userNoteFetchState; } - public final String component17() { + public final String component18() { return this.userNote; } - public final boolean component18() { + public final boolean component19() { return this.userInSameVoiceChannel; } - public final List> component19() { - return this.bioAst; - } - public final boolean component2() { return this.isMe; } - public final boolean component20() { + public final List> component20() { + return this.bioAst; + } + + public final boolean component21() { return this.profileLoaded; } - public final Long component21() { + public final Long component22() { return this.guildId; } - public final GuildMember component22() { + public final GuildMember component23() { return this.guildMember; } @@ -1286,14 +1296,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.adminViewState; } - public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List> list2, boolean z5, Long l, GuildMember guildMember) { + public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, String str3, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str4, boolean z4, List> list2, boolean z5, Long l, GuildMember guildMember) { m.checkNotNullParameter(user, "user"); m.checkNotNullParameter(viewState, "voiceSettingsViewState"); m.checkNotNullParameter(list, "roleItems"); m.checkNotNullParameter(viewState3, "stageViewState"); m.checkNotNullParameter(viewState4, "connectionsViewState"); m.checkNotNullParameter(userNoteState, "userNoteFetchState"); - return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, str3, z4, list2, z5, l, guildMember); + return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, str3, i, viewState4, userNoteState, str4, z4, list2, z5, l, guildMember); } public boolean equals(Object obj) { @@ -1304,7 +1314,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return false; } Loaded loaded = (Loaded) obj; - return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst) && this.profileLoaded == loaded.profileLoaded && m.areEqual(this.guildId, loaded.guildId) && m.areEqual(this.guildMember, loaded.guildMember); + return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && m.areEqual(this.guildIcon, loaded.guildIcon) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst) && this.profileLoaded == loaded.profileLoaded && m.areEqual(this.guildId, loaded.guildId) && m.areEqual(this.guildMember, loaded.guildMember); } public final UserProfileAdminView.ViewState getAdminViewState() { @@ -1331,6 +1341,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.currentGuildId; } + public final String getGuildIcon() { + return this.guildIcon; + } + + public final String getGuildIconURL() { + return this.guildIconURL; + } + public final Long getGuildId() { return this.guildId; } @@ -1347,6 +1365,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.guildSectionHeaderText; } + public final boolean getHasGuildMemberBio() { + return this.hasGuildMemberBio; + } + public final boolean getHasPremiumCustomization() { return this.hasPremiumCustomization; } @@ -1447,13 +1469,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel { StreamContext streamContext = this.streamContext; int hashCode10 = (hashCode9 + (streamContext != null ? streamContext.hashCode() : 0)) * 31; String str2 = this.guildName; - int hashCode11 = (((hashCode10 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.userRelationshipType) * 31; + int hashCode11 = (hashCode10 + (str2 != null ? str2.hashCode() : 0)) * 31; + String str3 = this.guildIcon; + int hashCode12 = (((hashCode11 + (str3 != null ? str3.hashCode() : 0)) * 31) + this.userRelationshipType) * 31; UserProfileConnectionsView.ViewState viewState4 = this.connectionsViewState; - int hashCode12 = (hashCode11 + (viewState4 != null ? viewState4.hashCode() : 0)) * 31; + int hashCode13 = (hashCode12 + (viewState4 != null ? viewState4.hashCode() : 0)) * 31; StoreUserNotes.UserNoteState userNoteState = this.userNoteFetchState; - int hashCode13 = (hashCode12 + (userNoteState != null ? userNoteState.hashCode() : 0)) * 31; - String str3 = this.userNote; - int hashCode14 = (hashCode13 + (str3 != null ? str3.hashCode() : 0)) * 31; + int hashCode14 = (hashCode13 + (userNoteState != null ? userNoteState.hashCode() : 0)) * 31; + String str4 = this.userNote; + int hashCode15 = (hashCode14 + (str4 != null ? str4.hashCode() : 0)) * 31; boolean z4 = this.userInSameVoiceChannel; if (z4) { z4 = true; @@ -1461,21 +1485,21 @@ public final class WidgetUserSheetViewModel extends AppViewModel { int i11 = z4 ? 1 : 0; int i12 = z4 ? 1 : 0; int i13 = z4 ? 1 : 0; - int i14 = (hashCode14 + i11) * 31; + int i14 = (hashCode15 + i11) * 31; List> list2 = this.bioAst; - int hashCode15 = (i14 + (list2 != null ? list2.hashCode() : 0)) * 31; + int hashCode16 = (i14 + (list2 != null ? list2.hashCode() : 0)) * 31; boolean z5 = this.profileLoaded; if (!z5) { i2 = z5 ? 1 : 0; } - int i15 = (hashCode15 + i2) * 31; + int i15 = (hashCode16 + i2) * 31; Long l = this.guildId; - int hashCode16 = (i15 + (l != null ? l.hashCode() : 0)) * 31; + int hashCode17 = (i15 + (l != null ? l.hashCode() : 0)) * 31; GuildMember guildMember = this.guildMember; if (guildMember != null) { i = guildMember.hashCode(); } - return hashCode16 + i; + return hashCode17 + i; } public final boolean isMe() { @@ -1514,6 +1538,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { R.append(this.streamContext); R.append(", guildName="); R.append(this.guildName); + R.append(", guildIcon="); + R.append(this.guildIcon); R.append(", userRelationshipType="); R.append(this.userRelationshipType); R.append(", connectionsViewState="); @@ -1769,6 +1795,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { /* JADX WARNING: Removed duplicated region for block: B:138:0x029a */ /* JADX WARNING: Removed duplicated region for block: B:142:0x02a6 */ /* JADX WARNING: Removed duplicated region for block: B:143:0x02ad */ + /* JADX WARNING: Removed duplicated region for block: B:145:0x02b1 */ + /* JADX WARNING: Removed duplicated region for block: B:146:0x02b8 */ /* JADX WARNING: Removed duplicated region for block: B:82:0x01f0 */ /* JADX WARNING: Removed duplicated region for block: B:91:0x0216 */ /* JADX WARNING: Removed duplicated region for block: B:98:0x022d */ @@ -1890,7 +1918,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } else { str = null; } - updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); + updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, guild == null ? guild.getIcon() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); this.mostRecentStoreState = storeState; } } @@ -1914,7 +1942,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (note == null) { } str = note; - updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); + updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, guild == null ? guild.getIcon() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); this.mostRecentStoreState = storeState; } user = user2; @@ -1942,7 +1970,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (note == null) { } str = note; - updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); + updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, guild == null ? guild.getIcon() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); this.mostRecentStoreState = storeState; } } @@ -1976,7 +2004,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (note == null) { } str = note; - updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); + updateViewState(new ViewState.Loaded(user, z7, z9, viewState2, voiceState3, storeState.getRichPresence(), c2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, guild == null ? guild.getIcon() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str, isInSameVoiceChannel, list2, z4, this.guildId, guildMember)); this.mostRecentStoreState = storeState; } @@ -2101,7 +2129,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null && (storeState = this.mostRecentStoreState) != null && (userProfile = storeState.getUserProfile()) != null && (f = userProfile.f()) != null && (d = f.d()) != null && (a = d.a()) != null) { this.revealedBioIndices.add(Integer.valueOf(spoilerNode.getId())); - updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(a), false, null, null, 3932159, null)); + updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(a), false, null, null, 7864319, null)); } } @@ -2114,7 +2142,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) { long id2 = loaded.getUser().getId(); - updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, true, 127, null), null, null, null, 0, null, null, null, false, null, false, null, null, 4193791, null)); + updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, false, true, 127, null), null, null, null, null, 0, null, null, null, false, null, false, null, null, 8388095, null)); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, false, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$inviteUserToSpeak$1(this), 62, (Object) null); } } @@ -2231,7 +2259,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) { long id2 = loaded.getUser().getId(); - updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, true, false, 191, null), null, null, null, 0, null, null, null, false, null, false, null, null, 4193791, null)); + updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m45copyam1GJgw$default(loaded.getStageViewState(), false, null, null, null, false, false, true, false, 191, null), null, null, null, null, 0, null, null, null, false, null, false, null, null, 8388095, null)); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, z2, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$setUserSuppressedInChannel$1(this), 62, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java index 7e574e6573..47c41ffa14 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java @@ -52,21 +52,21 @@ public final class WidgetCallFullscreen$configureMenu$1 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_call_overlay_launcher /* 2131364207 */: + case R.id.menu_call_overlay_launcher /* 2131364210 */: DiscordOverlayService.Companion companion = DiscordOverlayService.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launchForConnect(context); return; - case R.id.menu_call_switch_camera /* 2131364208 */: + case R.id.menu_call_switch_camera /* 2131364211 */: WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed(); return; - case R.id.menu_call_video_list /* 2131364209 */: + case R.id.menu_call_video_list /* 2131364212 */: WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this)); return; - case R.id.menu_call_voice_settings /* 2131364210 */: + case R.id.menu_call_voice_settings /* 2131364213 */: WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion; Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h()); FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/res/layout-v22/widget_user_sheet.xml b/app/src/main/res/layout-v22/widget_user_sheet.xml index 5115e5aac2..b0c294fe1e 100644 --- a/app/src/main/res/layout-v22/widget_user_sheet.xml +++ b/app/src/main/res/layout-v22/widget_user_sheet.xml @@ -26,7 +26,13 @@ - + + + + + + + diff --git a/app/src/main/res/layout/widget_user_sheet.xml b/app/src/main/res/layout/widget_user_sheet.xml index 0cb252afed..0b62dc07e0 100644 --- a/app/src/main/res/layout/widget_user_sheet.xml +++ b/app/src/main/res/layout/widget_user_sheet.xml @@ -26,7 +26,13 @@ - + + + + + + + diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 01f76f194e..0d68bffeba 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -233,7 +233,11 @@ ‏‮Role‬‏ ‏‮Give‬‏ ‏‮special‬‏ ‏‮permissions‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮members.‬‏ ‏‮Set‬‏ ‏‮a‬‏ ‏‮role‬‏ + ‏‮Add‬‏ ‏‮to‬‏ ‏‮Calendar‬‏ ‏‮Add‬‏ ‏‮to‬‏ ‏‮Dictionary‬‏ + ‏‮Add‬‏ ‏‮to‬‏ ‏‮Google‬‏ ‏‮Calendar‬‏ + ‏‮Add‬‏ ‏‮to‬‏ ‏‮Outlook‬‏ + ‏‮Add‬‏ ‏‮to‬‏ ‏‮Yahoo‬‏ ‏‮Add‬‏ ‏‮Topic‬‏ ‏‮Administrative‬‏ ‏‮Administrator‬‏ @@ -1132,6 +1136,7 @@ ‏‮Restart‬‏ ‏‮Augment‬‏ ‏‮Complete‬‏ ‏‮Burgundy‬‏ + ‏‮Discord:‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮server,‬‏ ‏‮!!‬‏‏‮{channelName}‬‏‏‮!!‬‏ ‏‮Call‬‏ ‏‮Call‬‏ ‏‮Ended‬‏ ‏‮!!‬‏‏‮{duration}‬‏‏‮!!‬‏ ‏‮—‬‏ ‏‮!!‬‏‏‮{timestamp}‬‏‏‮!!‬‏ @@ -1610,9 +1615,6 @@ ‏‮Connected‬‏ ‏‮Accounts‬‏ ‏‮Connect‬‏ ‏‮your‬‏ ‏‮accounts‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮special‬‏ ‏‮Discord‬‏ ‏‮integrations‬‏ ‏‮No‬‏ ‏‮Connections‬‏ - ‏‮Let\'s‬‏ ‏‮go‬‏ - ‏‮Connect‬‏ ‏‮a‬‏ ‏‮YouTube‬‏ ‏‮or‬‏ ‏‮Twitch‬‏ ‏‮account‬‏ ‏‮to‬‏ ‏‮find‬‏ ‏‮creator-run‬‏ ‏‮servers.‬‏ - ‏‮Find‬‏ ‏‮your‬‏ ‏‮favorite‬‏ ‏‮creators‬‏ ‏‮Don\'t‬‏ ‏‮Switch‬‏ ‏‮Switch‬‏ ‏‮Device‬‏ ‏‮Discord‬‏ ‏‮has‬‏ ‏‮detected‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮audio‬‏ ‏‮device‬‏ ‏‮named‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**!‬‏ ‏‮Do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮switch‬‏ ‏‮to‬‏ ‏‮it?‬‏ @@ -2336,6 +2338,7 @@ ‏‮Get‬‏ ‏‮Discord‬‏ ‏‮at‬‏ ‏‮home‬‏ ‏‮Download‬‏ ‏‮failed‬‏ ‏‮!!‬‏‏‮{fileName}‬‏‏‮!!‬‏ ‏‮downloaded‬‏ + ‏‮Download‬‏ ‏‮ICS‬‏ ‏‮file‬‏ ‏‮Or‬‏ ‏‮on‬‏ ‏‮the‬‏ ‏‮go‬‏ ‏‮10‬‏ ‏‮MIN‬‏ ‏‮10‬‏ ‏‮Minutes‬‏ @@ -2992,8 +2995,8 @@ ‏‮You‬‏ ‏‮must‬‏ ‏‮grant‬‏ ‏‮Discord‬‏ ‏‮[access‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮camera](onEnableClick)‬‏ ‏‮in‬‏ ‏‮order‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮preview.‬‏ ‏‮Forum‬‏ ‏‮Channel‬‏ ‏‮Organize‬‏ ‏‮all‬‏ ‏‮conversation‬‏ ‏‮in‬‏ ‏‮threads‬‏ - ‏‮Active‬‏ ‏‮Threads‬‏ - ‏‮Archived‬‏ ‏‮Threads‬‏ + ‏‮Active‬‏ ‏‮Posts‬‏ + ‏‮Archived‬‏ ‏‮Posts‬‏ ‏‮French‬‏ ‏‮Frequently‬‏ ‏‮Used‬‏ ‏‮Type‬‏ ‏‮both‬‏ ‏‮their‬‏ ‏‮username‬‏ ‏‮and‬‏ ‏‮4-digit‬‏ ‏‮tag.‬‏ ‏‮Keep‬‏ ‏‮in‬‏ ‏‮mind‬‏ ‏‮that‬‏ ‏‮username‬‏ ‏‮is‬‏ ‏‮case‬‏ ‏‮sensitive.‬‏ @@ -3647,8 +3650,9 @@ ‏‮Verification‬‏ ‏‮link‬‏ ‏‮has‬‏ ‏‮expired.‬‏ ‏‮Verification‬‏ ‏‮success.‬‏ ‏‮Verifying‬‏ ‏‮your‬‏ ‏‮request.‬‏ - ‏‮Once‬‏ ‏‮enabled,‬‏ ‏‮you‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮accept‬‏ ‏‮payment‬‏ ‏‮for‬‏ ‏‮Premium‬‏ ‏‮Subscriptions.‬‏ - ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮enable‬‏ ‏‮monetization‬‏ ‏‮for‬‏ ‏‮this‬‏ ‏‮server?‬‏ + ‏‮You‬‏ ‏‮can‬‏ ‏‮now‬‏ ‏‮accept‬‏ ‏‮payment‬‏ ‏‮for‬‏ ‏‮premium‬‏ ‏‮subscriptions.‬‏ + ‏‮Monetization‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮enabled.‬‏ + ‏‮Create‬‏ ‏‮Team‬‏ ‏‮Enable‬‏ ‏‮In‬‏ ‏‮order‬‏ ‏‮to‬‏ ‏‮enable‬‏ ‏‮server‬‏ ‏‮monetization,‬‏ ‏‮you‬‏ ‏‮must‬‏ ‏‮[set‬‏ ‏‮up‬‏ ‏‮a‬‏ ‏‮Team](‬‏‏‮{createTeamURL}‬‏‏‮)‬‏ ‏‮and‬‏ ‏‮then‬‏ ‏‮select‬‏ ‏‮it‬‏ ‏‮below.‬‏ ‏‮Teams‬‏ ‏‮must‬‏ ‏‮have‬‏ ‏‮valid‬‏ ‏‮payment‬‏ ‏‮information.‬‏ ‏‮Once‬‏ ‏‮enabled,‬‏ ‏‮you‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮accept‬‏ ‏‮payment‬‏ ‏‮for‬‏ ‏‮Premium‬‏ ‏‮Subscriptions.‬‏ ‏‮Enable‬‏ ‏‮Monetization‬‏ @@ -6157,6 +6161,7 @@ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮Sharing‬‏ ‏‮screen‬‏ ‏‮Stop‬‏ ‏‮sharing‬‏ + ‏‮Moderate‬‏ ‏‮Members‬‏ ‏‮Moderation‬‏ ‏‮Allow‬‏ ‏‮requests‬‏ ‏‮from‬‏ ‏‮@everyone‬‏ ‏‮Become‬‏ ‏‮a‬‏ ‏‮Speaker‬‏ @@ -6177,8 +6182,8 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ @@ -8084,6 +8089,7 @@ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮@everyone‬‏ ‏‮(everyone‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server)‬‏ ‏‮or‬‏ ‏‮@here‬‏ ‏‮(only‬‏ ‏‮online‬‏ ‏‮members‬‏ ‏‮in‬‏ ‏‮that‬‏ ‏‮channel).‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮@mention‬‏ ‏‮all‬‏ ‏‮roles,‬‏ ‏‮even‬‏ ‏‮if‬‏ ‏‮the‬‏ ‏‮role’s‬‏ ‏‮“Allow‬‏ ‏‮anyone‬‏ ‏‮to‬‏ ‏‮mention‬‏ ‏‮this‬‏ ‏‮role”‬‏ ‏‮permission‬‏ ‏‮is‬‏ ‏‮disabled.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮@everyone‬‏ ‏‮or‬‏ ‏‮@here‬‏ ‏‮(only‬‏ ‏‮online‬‏ ‏‮members)‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮@mention‬‏ ‏‮all‬‏ ‏‮roles‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels,‬‏ ‏‮even‬‏ ‏‮if‬‏ ‏‮the‬‏ ‏‮role’s‬‏ ‏‮“Allow‬‏ ‏‮anyone‬‏ ‏‮to‬‏ ‏‮mention‬‏ ‏‮this‬‏ ‏‮role”‬‏ ‏‮permission‬‏ ‏‮is‬‏ ‏‮disabled.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮@everyone‬‏ ‏‮or‬‏ ‏‮@here‬‏ ‏‮(only‬‏ ‏‮online‬‏ ‏‮members)‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮@mention‬‏ ‏‮all‬‏ ‏‮roles‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel,‬‏ ‏‮even‬‏ ‏‮if‬‏ ‏‮the‬‏ ‏‮role’s‬‏ ‏‮“Allow‬‏ ‏‮anyone‬‏ ‏‮to‬‏ ‏‮mention‬‏ ‏‮this‬‏ ‏‮role”‬‏ ‏‮permission‬‏ ‏‮is‬‏ ‏‮disabled.‬‏ + ‏‮Allow‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮perform‬‏ ‏‮limited‬‏ ‏‮moderation‬‏ ‏‮actions‬‏ ‏‮(timeout).‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮move‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮voice‬‏ ‏‮channels‬‏ ‏‮that‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮has‬‏ ‏‮access‬‏ ‏‮to.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮disconnect‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮from‬‏ ‏‮these‬‏ ‏‮channels.‬‏ ‏‮They‬‏ ‏‮will‬‏ ‏‮also‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮move‬‏ ‏‮somebody‬‏ ‏‮into‬‏ ‏‮other‬‏ ‏‮channels‬‏ ‏‮that‬‏ ‏‮they‬‏ ‏‮have‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮in.‬‏ ‏‮(Required‬‏ ‏‮for‬‏ ‏‮Stage‬‏ ‏‮moderator)‬‏ ‏‮Allow‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮force‬‏ ‏‮others‬‏ ‏‮to‬‏ ‏‮disconnect‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮channel.‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index a95a68a6cf..82b7c9495a 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -233,7 +233,11 @@ [Ŕöļé one] [ĜîVé šþéçîåļ þéŕḿîššîöñš ţö ýöûŕ ḿéḿɓéŕš. one two three four five] [Šéţ å ŕöļé one two] + [Åðð ţö Çåļéñðåŕ one two three] [Åðð ţö Ðîçţîöñåŕý one two three] + [Åðð ţö Ĝööĝļé Çåļéñðåŕ one two three] + [Åðð ţö Öûţļööķ one two three] + [Åðð ţö Ýåĥöö one two] [Åðð Ţöþîç one two] [ÅðḿîñîšţŕåţîVé one two three] [Åðḿîñîšţŕåţöŕ one two] @@ -1132,6 +1136,7 @@ [Ŕéšţåŕţ one two] [Åûĝḿéñţ Çöḿþļéţé one two three] [βûŕĝûñðý one two] + [Ðîšçöŕð: ¡¡»{guildName}«¡¡ šéŕVéŕ, ¡¡»{channelName}«¡¡ one two three four] [Çåļļ one] [Çåļļ Éñðéð one two] [¡¡»{duration}«¡¡ — ¡¡»{timestamp}«¡¡ one two] @@ -1610,9 +1615,6 @@ [Çöññéçţéð Åççöûñţš one two three] [Çöññéçţ ýöûŕ åççöûñţš ţö ûñļöçķ šþéçîåļ Ðîšçöŕð îñţéĝŕåţîöñš one two three four five six seven] [Ñö Çöññéçţîöñš one two three] - [Ļéţ\'š ĝö one two] - [Çöññéçţ å ÝöûŢûɓé öŕ Ţŵîţçĥ åççöûñţ ţö ƒîñð çŕéåţöŕ-ŕûñ šéŕVéŕš. one two three four five six seven] - [Fîñð ýöûŕ ƒåVöŕîţé çŕéåţöŕš one two three four] [Ðöñ\'ţ Šŵîţçĥ one two] [Šŵîţçĥ ÐéVîçé one two] [Ðîšçöŕð ĥåš ðéţéçţéð å ñéŵ åûðîö ðéVîçé ñåḿéð **¡¡»{name}«¡¡**¡ Ðö ýöû ŵåñţ ţö šŵîţçĥ ţö îţ¿ one two three four five six seven eight nine] @@ -2336,6 +2338,7 @@ [Ĝéţ Ðîšçöŕð åţ ĥöḿé one two three] [Ðöŵñļöåð ƒåîļéð one two three] [¡¡»{fileName}«¡¡ ðöŵñļöåðéð one two three] + [Ðöŵñļöåð ÎÇŠ ƒîļé one two three] [Öŕ öñ ţĥé ĝö one two] [10 ḾÎÑ one two] [10 Ḿîñûţéš one two] @@ -2992,8 +2995,8 @@ [Ýöû ḿûšţ ĝŕåñţ Ðîšçöŕð [åççéšš ţö ýöûŕ çåḿéŕå](öñÉñåɓļéÇļîçķ) îñ öŕðéŕ ţö ɓé åɓļé ţö þŕéVîéŵ. one two three four five six seven eight nine ten] [Föŕûḿ Çĥåññéļ one two] [Öŕĝåñîžé åļļ çöñVéŕšåţîöñ îñ ţĥŕéåðš one two three four five] - [ÅçţîVé Ţĥŕéåðš one two three] - [ÅŕçĥîVéð Ţĥŕéåðš one two three] + [ÅçţîVé Þöšţš one two] + [ÅŕçĥîVéð Þöšţš one two three] [Fŕéñçĥ one two] [FŕéQûéñţļý Ûšéð one two three] [Ţýþé ɓöţĥ ţĥéîŕ ûšéŕñåḿé åñð 4-ðîĝîţ ţåĝ. Ķééþ îñ ḿîñð ţĥåţ ûšéŕñåḿé îš çåšé šéñšîţîVé. one two three four five six seven eight nine] @@ -3647,8 +3650,9 @@ [νéŕîƒîçåţîöñ ļîñķ ĥåš éхþîŕéð. one two three four] [νéŕîƒîçåţîöñ šûççéšš. one two three] [νéŕîƒýîñĝ ýöûŕ ŕéQûéšţ. one two three] - [Öñçé éñåɓļéð, ýöû ŵîļļ ɓé åɓļé ţö åççéþţ þåýḿéñţ ƒöŕ Þŕéḿîûḿ Šûɓšçŕîþţîöñš. one two three four five six seven eight] - [Åŕé ýöû šûŕé ýöû ŵåñţ ţö éñåɓļé ḿöñéţîžåţîöñ ƒöŕ ţĥîš šéŕVéŕ¿ one two three four five six seven] + [Ýöû çåñ ñöŵ åççéþţ þåýḿéñţ ƒöŕ þŕéḿîûḿ šûɓšçŕîþţîöñš. one two three four five six] + [Ḿöñéţîžåţîöñ ĥåš ɓééñ éñåɓļéð. one two three four] + [Çŕéåţé Ţéåḿ one two] [Éñåɓļé one two] [Îñ öŕðéŕ ţö éñåɓļé šéŕVéŕ ḿöñéţîžåţîöñ, ýöû ḿûšţ [šéţ ûþ å Ţéåḿ](»{createTeamURL}«) åñð ţĥéñ šéļéçţ îţ ɓéļöŵ. Ţéåḿš ḿûšţ ĥåVé 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 nine ten eleven twelve thirteen fourteen fiveteen] [Éñåɓļé Ḿöñéţîžåţîöñ one two three] @@ -6157,6 +6161,7 @@ [Šçŕééñ Šĥåŕé one two] [Šĥåŕîñĝ šçŕééñ one two three] [Šţöþ šĥåŕîñĝ one two] + [Ḿöðéŕåţé Ḿéḿɓéŕš one two three] [Ḿöðéŕåţîöñ one two] [Åļļöŵ ŕéQûéšţš ƒŕöḿ @éVéŕýöñé one two three four] [βéçöḿé å Šþéåķéŕ one two three] @@ -6177,8 +6182,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] @@ -8084,6 +8089,7 @@ [Åļļöŵš ḿéḿɓéŕš ţö ûšé @éVéŕýöñé (éVéŕýöñé îñ ţĥé šéŕVéŕ) öŕ @ĥéŕé (öñļý öñļîñé ḿéḿɓéŕš îñ ţĥåţ çĥåññéļ). Ţĥéý çåñ åļšö @ḿéñţîöñ åļļ ŕöļéš, é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 nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Åļļöŵš ḿéḿɓéŕš ţö ûšé @éVéŕýöñé öŕ @ĥéŕé (öñļý öñļîñé ḿéḿɓéŕš) îñ ţĥéšé çĥåññéļš. Ţĥéý çåñ åļšö @ḿéñţîöñ åļļ ŕöļéš îñ ţĥéšé çĥåññéļš, é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 nine ten eleven twelve thirteen fourteen fiveteen] [Åļļöŵš ḿéḿɓéŕš ţö ûšé @éVéŕýöñé öŕ @ĥéŕé (öñļý öñļîñé ḿéḿɓéŕš) îñ ţĥîš çĥåññéļ. Ţĥéý çåñ åļšö @ḿéñţîöñ åļļ ŕöļéš îñ ţĥîš çĥåññéļ, é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 nine ten eleven twelve thirteen fourteen fiveteen] + [Åļļöŵ ḿéḿɓéŕš ţö þéŕƒöŕḿ ļîḿîţéð ḿöðéŕåţîöñ åçţîöñš (ţîḿéöûţ). one two three four five six seven] [Åļļöŵš ḿéḿɓéŕš ţö ḿöVé öţĥéŕ ḿéḿɓéŕš ɓéţŵééñ Vöîçé çĥåññéļš ţĥåţ ţĥé ḿéḿɓéŕ ŵîţĥ ţĥîš þéŕḿîššîöñ ĥåš åççéšš ţö. one two three four five six seven eight nine ten eleven twelve] [Åļļöŵš ḿéḿɓéŕš ţö ðîšçöññéçţ öţĥéŕ ḿéḿɓéŕš ƒŕöḿ ţĥéšé çĥåññéļš. Ţĥéý ŵîļļ åļšö ɓé åɓļé ţö ḿöVé šöḿéɓöðý îñţö öţĥéŕ çĥåññéļš ţĥåţ ţĥéý ĥåVé ţĥîš þéŕḿîššîöñ îñ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [(ŔéQûîŕéð ƒöŕ Šţåĝé ḿöðéŕåţöŕ) Åļļöŵ ḿéḿɓéŕš ţö ƒöŕçé öţĥéŕš ţö ðîšçöññéçţ ƒŕöḿ ţĥîš çĥåññéļ. one two three four five six seven eight nine ten] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 3d70d00e34..87ddcd0355 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -5168,4290 +5168,4293 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14711,10086 +14714,10092 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b1eb37635..44c5acc6a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -233,7 +233,11 @@ Role Give special permissions to your members. Set a role + Add to Calendar Add to Dictionary + Add to Google Calendar + Add to Outlook + Add to Yahoo Add Topic Administrative Administrator @@ -1134,6 +1138,7 @@ Restart Augment Complete Burgundy + Discord: !!{guildName}!! server, !!{channelName}!! Call Call Ended !!{duration}!! — !!{timestamp}!! @@ -1513,7 +1518,7 @@ Select a color Transparency Use Default - 3ec76398720d4fc2aff197f6ea71eb82 + bdcbd8c4bf4e40d39559ddf6b953993d Coming Soon Slash command application {applicationName} {applicationName} application @@ -1614,9 +1619,6 @@ Connected Accounts Connect your accounts to unlock special Discord integrations No Connections - Let\'s go - Connect a YouTube or Twitch account to find creator-run servers. - Find your favorite creators Don\'t Switch Switch Device Discord has detected a new audio device named **!!{name}!!**! Do you want to switch to it? @@ -2342,6 +2344,7 @@ Get Discord at home Download failed !!{fileName}!! downloaded + Download ICS file Or on the go 10 MIN 10 Minutes @@ -3003,8 +3006,8 @@ You must grant Discord [access to your camera](onEnableClick) in order to be able to preview. Forum Channel Organize all conversation in threads - Active Threads - Archived Threads + Active Posts + Archived Posts French Frequently Used Type both their username and 4-digit tag. Keep in mind that username is case sensitive. @@ -3663,8 +3666,9 @@ Verification link has expired. Verification success. Verifying your request. - Once enabled, you will be able to accept payment for Premium Subscriptions. - Are you sure you want to enable monetization for this server? + You can now accept payment for premium subscriptions. + Monetization has been enabled. + Create Team Enable In order to enable server monetization, you must [set up a Team]({createTeamURL}) and then select it below. Teams must have valid payment information. Once enabled, you will be able to accept payment for Premium Subscriptions. Enable Monetization @@ -6176,6 +6180,7 @@ Screen Share Sharing screen Stop sharing + Moderate Members Moderation Allow requests from @everyone Become a Speaker @@ -6196,8 +6201,8 @@ Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications @@ -8111,6 +8116,7 @@ Allows members to use @everyone (everyone in the server) or @here (only online members in that channel). They can also @mention all roles, even if the role’s “Allow anyone to mention this role” permission is disabled. Allows members to use @everyone or @here (only online members) in these channels. They can also @mention all roles in these channels, even if the role’s “Allow anyone to mention this role” permission is disabled. Allows members to use @everyone or @here (only online members) in this channel. They can also @mention all roles in this channel, even if the role’s “Allow anyone to mention this role” permission is disabled. + Allow members to perform limited moderation actions (timeout). Allows members to move other members between voice channels that the member with this permission has access to. Allows members to disconnect other members from these channels. They will also be able to move somebody into other channels that they have this permission in. (Required for Stage moderator) Allow members to force others to disconnect from this channel.