diff --git a/app/build.gradle b/app/build.gradle index 9784e85907..4622b2c4cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 110202 - versionName "110.2 - Alpha" + versionCode 110203 + versionName "110.3 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 683735ef0f..0df01bbcab 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/b/a/i/q4.java b/app/src/main/java/b/a/i/q4.java index ef8a769a1d..762f35a299 100644 --- a/app/src/main/java/b/a/i/q4.java +++ b/app/src/main/java/b/a/i/q4.java @@ -7,6 +7,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.cardview.widget.CardView; import androidx.viewbinding.ViewBinding; +import com.google.android.material.button.MaterialButton; /* compiled from: WidgetChatInputMemberVerificationGuardBinding */ public final class q4 implements ViewBinding { @NonNull @@ -14,17 +15,23 @@ public final class q4 implements ViewBinding { @NonNull /* renamed from: b reason: collision with root package name */ - public final ImageView f181b; + public final CardView f181b; @NonNull public final ImageView c; @NonNull - public final TextView d; + public final MaterialButton d; + @NonNull + public final ImageView e; + @NonNull + public final TextView f; - public q4(@NonNull RelativeLayout relativeLayout, @NonNull CardView cardView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView) { + public q4(@NonNull RelativeLayout relativeLayout, @NonNull CardView cardView, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView2, @NonNull TextView textView) { this.a = relativeLayout; - this.f181b = imageView; - this.c = imageView2; - this.d = textView; + this.f181b = cardView; + this.c = imageView; + this.d = materialButton; + this.e = imageView2; + this.f = textView; } @Override // androidx.viewbinding.ViewBinding 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 b00099579b..3ae079fc2b 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 /* 2131364295 */: + case R.id.menu_channel_settings_delete /* 2131364296 */: 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 /* 2131364296 */: + case R.id.menu_channel_settings_reset /* 2131364297 */: 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 37f4b2aa5d..1e14a3f752 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 { + public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); + + public AnonymousClass1() { + super(0); + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + } + } + + public WidgetChatInput$configureChatGuard$7(WidgetChatInput widgetChatInput, ChatInputViewModel.ViewState.Loaded loaded) { this.this$0 = widgetChatInput; + this.$viewState = loaded; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - ChatInputViewModel access$getViewModel$p = WidgetChatInput.access$getViewModel$p(this.this$0); - m.checkNotNullExpressionValue(view, "it"); - Context context = view.getContext(); - m.checkNotNullExpressionValue(context, "it.context"); - access$getViewModel$p.verifyAccount(context); + MemberVerificationUtils memberVerificationUtils = MemberVerificationUtils.INSTANCE; + Context requireContext = this.this$0.requireContext(); + FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); + MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, this.$viewState.getChannel().f(), Traits.Location.Page.GUILD_CHANNEL, null, null, AnonymousClass1.INSTANCE, 48, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$8.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$8.java new file mode 100644 index 0000000000..32608179b4 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$8.java @@ -0,0 +1,22 @@ +package com.discord.widgets.chat.input; + +import android.content.Context; +import android.view.View; +import d0.z.d.m; +/* compiled from: WidgetChatInput.kt */ +public final class WidgetChatInput$configureChatGuard$8 implements View.OnClickListener { + public final /* synthetic */ WidgetChatInput this$0; + + public WidgetChatInput$configureChatGuard$8(WidgetChatInput widgetChatInput) { + this.this$0 = widgetChatInput; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + ChatInputViewModel access$getViewModel$p = WidgetChatInput.access$getViewModel$p(this.this$0); + m.checkNotNullExpressionValue(view, "it"); + Context context = view.getContext(); + m.checkNotNullExpressionValue(context, "it.context"); + access$getViewModel$p.verifyAccount(context); + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java index 617a5f0fe4..ede2928e86 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java @@ -282,20 +282,39 @@ public final class WidgetChatInput extends AppFragment { if (joinRequestStatus != null) { int ordinal = joinRequestStatus.ordinal(); if (ordinal == 1) { - getBinding().t.d.setText(R.string.member_verification_application_confirmation_title); - getBinding().t.c.setImageResource(R.drawable.img_member_verification_pending); - getBinding().t.f181b.setImageResource(R.drawable.ic_close_circle_nova_grey_24dp); + ImageView imageView = getBinding().t.c; + m.checkNotNullExpressionValue(imageView, "binding.guardMemberVerif…erVerificationGuardAction"); + imageView.setVisibility(8); + MaterialButton materialButton9 = getBinding().t.d; + m.checkNotNullExpressionValue(materialButton9, "binding.guardMemberVerif…erVerificationGuardButton"); + materialButton9.setVisibility(0); + getBinding().t.f.setText(R.string.member_verification_application_confirmation_title); + getBinding().t.e.setImageResource(R.drawable.img_member_verification_pending); + getBinding().t.c.setImageResource(R.drawable.ic_close_circle_nova_grey_24dp); + getBinding().t.d.setOnClickListener(new WidgetChatInput$configureChatGuard$7(this, loaded)); return; } else if (ordinal == 2) { - getBinding().t.d.setText(R.string.member_verification_application_rejected_title); - getBinding().t.c.setImageResource(R.drawable.img_member_verification_denied); - getBinding().t.f181b.setImageResource(R.drawable.ic_member_verification_chat_guard_cta); + MaterialButton materialButton10 = getBinding().t.d; + m.checkNotNullExpressionValue(materialButton10, "binding.guardMemberVerif…erVerificationGuardButton"); + materialButton10.setVisibility(8); + ImageView imageView2 = getBinding().t.c; + m.checkNotNullExpressionValue(imageView2, "binding.guardMemberVerif…erVerificationGuardAction"); + imageView2.setVisibility(0); + getBinding().t.f.setText(R.string.member_verification_application_rejected_title); + getBinding().t.e.setImageResource(R.drawable.img_member_verification_denied); + getBinding().t.c.setImageResource(R.drawable.ic_arrow_right_24dp); return; } } - getBinding().t.d.setText(R.string.member_verification_chat_blocker_text); - getBinding().t.c.setImageResource(R.drawable.img_member_verification_started); - getBinding().t.f181b.setImageResource(R.drawable.ic_member_verification_chat_guard_cta); + MaterialButton materialButton11 = getBinding().t.d; + m.checkNotNullExpressionValue(materialButton11, "binding.guardMemberVerif…erVerificationGuardButton"); + materialButton11.setVisibility(8); + ImageView imageView3 = getBinding().t.c; + m.checkNotNullExpressionValue(imageView3, "binding.guardMemberVerif…erVerificationGuardAction"); + imageView3.setVisibility(0); + getBinding().t.f.setText(R.string.member_verification_chat_blocker_text); + getBinding().t.e.setImageResource(R.drawable.img_member_verification_started); + getBinding().t.c.setImageResource(R.drawable.ic_arrow_right_24dp); } else { TextView textView4 = getBinding().r.e; m.checkNotNullExpressionValue(textView4, "binding.guard.chatInputGuardText"); @@ -304,17 +323,17 @@ public final class WidgetChatInput extends AppFragment { Context context = textView5.getContext(); m.checkNotNullExpressionValue(context, "binding.guard.chatInputGuardText.context"); textView4.setText(getVerificationText(context, loaded.getVerificationLevelTriggered())); - MaterialButton materialButton9 = getBinding().r.f175b; - m.checkNotNullExpressionValue(materialButton9, "binding.guard.chatInputGuardAction"); - MaterialButton materialButton10 = getBinding().r.f175b; - m.checkNotNullExpressionValue(materialButton10, "binding.guard.chatInputGuardAction"); - Context context2 = materialButton10.getContext(); + MaterialButton materialButton12 = getBinding().r.f175b; + m.checkNotNullExpressionValue(materialButton12, "binding.guard.chatInputGuardAction"); + MaterialButton materialButton13 = getBinding().r.f175b; + m.checkNotNullExpressionValue(materialButton13, "binding.guard.chatInputGuardAction"); + Context context2 = materialButton13.getContext(); m.checkNotNullExpressionValue(context2, "binding.guard.chatInputGuardAction.context"); - ViewExtensions.setTextAndVisibilityBy(materialButton9, getVerificationActionText(context2, loaded.getVerificationLevelTriggered())); - getBinding().r.f175b.setOnClickListener(new WidgetChatInput$configureChatGuard$7(this)); - MaterialButton materialButton11 = getBinding().r.c; - m.checkNotNullExpressionValue(materialButton11, "binding.guard.chatInputGuardActionSecondary"); - materialButton11.setVisibility(8); + ViewExtensions.setTextAndVisibilityBy(materialButton12, getVerificationActionText(context2, loaded.getVerificationLevelTriggered())); + getBinding().r.f175b.setOnClickListener(new WidgetChatInput$configureChatGuard$8(this)); + MaterialButton materialButton14 = getBinding().r.c; + m.checkNotNullExpressionValue(materialButton14, "binding.guard.chatInputGuardActionSecondary"); + materialButton14.setVisibility(8); } } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java index 586e7ac449..4bbfe52ea4 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java @@ -27,19 +27,19 @@ public final class WidgetFriendsList$configureToolbar$1 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_friends_add_friend /* 2131364315 */: + case R.id.menu_friends_add_friend /* 2131364316 */: 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 /* 2131364316 */: + case R.id.menu_friends_contact_sync /* 2131364317 */: 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 /* 2131364317 */: + case R.id.menu_friends_start_group /* 2131364318 */: 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/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java index ea5cccb644..37d5884603 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 /* 2131364297 */: + case R.id.menu_chat_add_friend /* 2131364298 */: WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null); break; - case R.id.menu_chat_search /* 2131364298 */: + case R.id.menu_chat_search /* 2131364299 */: launchForSearch(context); break; - case R.id.menu_chat_side_panel /* 2131364299 */: + case R.id.menu_chat_side_panel /* 2131364300 */: this.$panelLayout.openEndPanel(); break; - case R.id.menu_chat_start_call /* 2131364300 */: + case R.id.menu_chat_start_call /* 2131364301 */: privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_start_group /* 2131364301 */: + case R.id.menu_chat_start_group /* 2131364302 */: 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 /* 2131364302 */: + case R.id.menu_chat_start_video_call /* 2131364303 */: privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_stop_call /* 2131364303 */: + case R.id.menu_chat_stop_call /* 2131364304 */: 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 a1bd452b2f..6c509b5944 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 /* 2131364320 */: + case R.id.menu_media_browser /* 2131364321 */: 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 /* 2131364321 */: + case R.id.menu_media_download /* 2131364322 */: this.this$0.requestMediaDownload(new AnonymousClass1(this, context)); return; - case R.id.menu_media_share /* 2131364322 */: + case R.id.menu_media_share /* 2131364323 */: 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 ee158bf767..0d7eb6713f 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 = 2131364476; + public static final int notice_cancel = 2131364477; public static final Companion Companion = new Companion(null); /* renamed from: OK_BUTTON */ - public static final int notice_ok = 2131364481; + public static final int notice_ok = 2131364482; 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 d7550299cb..29d97c69fd 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 /* 2131364338 */: + case R.id.menu_sort_channel /* 2131364339 */: 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 /* 2131364339 */: + case R.id.menu_sort_done /* 2131364340 */: 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 f11995d48b..917349d234 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 = 2131363112; - private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363115; - private static final int STATE_KEY_GRACE_PERIOD = 2131363116; + private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363113; + private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363116; + private static final int STATE_KEY_GRACE_PERIOD = 2131363117; 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 be502644ba..dca1dbb5d0 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java @@ -591,138 +591,138 @@ 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().f2343y, getBinding().C, getBinding().f2344z, getBinding().w, getBinding().A, getBinding().B, getBinding().G, getBinding().D, getBinding().E, getBinding().I, getBinding().J, getBinding().O, getBinding().P, getBinding().o, getBinding().n, getBinding().Q, getBinding().R, getBinding().S, getBinding().T, getBinding().f, getBinding().U, getBinding().W, getBinding().f2337a0, getBinding().f2340c0, getBinding().Z, getBinding().X, getBinding().Y, getBinding().f2339b0, getBinding().H, getBinding().V, getBinding().K, getBinding().f2342x})) { m.checkNotNullExpressionValue(checkedSetting, "setting"); switch (checkedSetting.getId()) { - case R.id.role_settings_add_reactions /* 2131364887 */: + case R.id.role_settings_add_reactions /* 2131364888 */: j = 64; break; - case R.id.role_settings_administrator /* 2131364888 */: + case R.id.role_settings_administrator /* 2131364889 */: j = 8; break; - case R.id.role_settings_attach_files /* 2131364889 */: + case R.id.role_settings_attach_files /* 2131364890 */: j = Permission.ATTACH_FILES; break; - case R.id.role_settings_ban_members /* 2131364890 */: + case R.id.role_settings_ban_members /* 2131364891 */: j = 4; break; - case R.id.role_settings_change_nickname /* 2131364891 */: + case R.id.role_settings_change_nickname /* 2131364892 */: j = Permission.CHANGE_NICKNAME; break; - case R.id.role_settings_color_disabled_overlay /* 2131364892 */: - case R.id.role_settings_color_selector_container /* 2131364893 */: - case R.id.role_settings_current_color_display /* 2131364897 */: - case R.id.role_settings_edit_name_disabled_overlay /* 2131364898 */: - case R.id.role_settings_hoist_checkedsetting /* 2131364900 */: - case R.id.role_settings_icon_container /* 2131364901 */: - case R.id.role_settings_mentionable_checkedsetting /* 2131364913 */: - case R.id.role_settings_overview_scroll /* 2131364915 */: - case R.id.role_settings_role_icon /* 2131364920 */: - case R.id.role_settings_role_icon_divider /* 2131364921 */: - case R.id.role_settings_role_icon_header /* 2131364922 */: + case R.id.role_settings_color_disabled_overlay /* 2131364893 */: + case R.id.role_settings_color_selector_container /* 2131364894 */: + case R.id.role_settings_current_color_display /* 2131364898 */: + case R.id.role_settings_edit_name_disabled_overlay /* 2131364899 */: + case R.id.role_settings_hoist_checkedsetting /* 2131364901 */: + case R.id.role_settings_icon_container /* 2131364902 */: + case R.id.role_settings_mentionable_checkedsetting /* 2131364914 */: + case R.id.role_settings_overview_scroll /* 2131364916 */: + case R.id.role_settings_role_icon /* 2131364921 */: + case R.id.role_settings_role_icon_divider /* 2131364922 */: + case R.id.role_settings_role_icon_header /* 2131364923 */: default: j = 0; break; - case R.id.role_settings_create_instant_invite /* 2131364894 */: + case R.id.role_settings_create_instant_invite /* 2131364895 */: j = 1; break; - case R.id.role_settings_create_private_threads /* 2131364895 */: + case R.id.role_settings_create_private_threads /* 2131364896 */: j = Permission.CREATE_PRIVATE_THREADS; break; - case R.id.role_settings_create_public_threads /* 2131364896 */: + case R.id.role_settings_create_public_threads /* 2131364897 */: j = Permission.CREATE_PUBLIC_THREADS; break; - case R.id.role_settings_embed_links /* 2131364899 */: + case R.id.role_settings_embed_links /* 2131364900 */: j = Permission.EMBED_LINKS; break; - case R.id.role_settings_kick_members /* 2131364902 */: + case R.id.role_settings_kick_members /* 2131364903 */: j = 2; break; - case R.id.role_settings_manage_channels /* 2131364903 */: + case R.id.role_settings_manage_channels /* 2131364904 */: j = 16; break; - case R.id.role_settings_manage_emojis_and_stickers /* 2131364904 */: + case R.id.role_settings_manage_emojis_and_stickers /* 2131364905 */: j = Permission.MANAGE_EMOJIS_AND_STICKERS; break; - case R.id.role_settings_manage_events /* 2131364905 */: + case R.id.role_settings_manage_events /* 2131364906 */: j = Permission.MANAGE_EVENTS; break; - case R.id.role_settings_manage_messages /* 2131364906 */: + case R.id.role_settings_manage_messages /* 2131364907 */: j = Permission.MANAGE_MESSAGES; break; - case R.id.role_settings_manage_nicknames /* 2131364907 */: + case R.id.role_settings_manage_nicknames /* 2131364908 */: j = Permission.MANAGE_NICKNAMES; break; - case R.id.role_settings_manage_roles /* 2131364908 */: + case R.id.role_settings_manage_roles /* 2131364909 */: j = Permission.MANAGE_ROLES; break; - case R.id.role_settings_manage_server /* 2131364909 */: + case R.id.role_settings_manage_server /* 2131364910 */: j = 32; break; - case R.id.role_settings_manage_threads /* 2131364910 */: + case R.id.role_settings_manage_threads /* 2131364911 */: j = Permission.MANAGE_THREADS; break; - case R.id.role_settings_manage_webhooks /* 2131364911 */: + case R.id.role_settings_manage_webhooks /* 2131364912 */: j = Permission.MANAGE_WEBHOOKS; break; - case R.id.role_settings_mention_everyone /* 2131364912 */: + case R.id.role_settings_mention_everyone /* 2131364913 */: j = Permission.MENTION_EVERYONE; break; - case R.id.role_settings_moderate_member /* 2131364914 */: + case R.id.role_settings_moderate_member /* 2131364915 */: j = Permission.MODERATE_MEMBERS; break; - case R.id.role_settings_priority_speaker /* 2131364916 */: + case R.id.role_settings_priority_speaker /* 2131364917 */: j = 256; break; - case R.id.role_settings_read_message_history /* 2131364917 */: + case R.id.role_settings_read_message_history /* 2131364918 */: j = Permission.READ_MESSAGE_HISTORY; break; - case R.id.role_settings_read_messages /* 2131364918 */: + case R.id.role_settings_read_messages /* 2131364919 */: j = Permission.VIEW_CHANNEL; break; - case R.id.role_settings_request_to_speak /* 2131364919 */: + case R.id.role_settings_request_to_speak /* 2131364920 */: j = Permission.REQUEST_TO_SPEAK; break; - case R.id.role_settings_send_messages /* 2131364923 */: + case R.id.role_settings_send_messages /* 2131364924 */: j = Permission.SEND_MESSAGES; break; - case R.id.role_settings_send_messages_in_threads /* 2131364924 */: + case R.id.role_settings_send_messages_in_threads /* 2131364925 */: j = Permission.SEND_MESSAGES_IN_THREADS; break; - case R.id.role_settings_send_tts_messages /* 2131364925 */: + case R.id.role_settings_send_tts_messages /* 2131364926 */: j = Permission.SEND_TTS_MESSAGES; break; - case R.id.role_settings_use_application_commands /* 2131364926 */: + case R.id.role_settings_use_application_commands /* 2131364927 */: j = Permission.USE_APPLICATION_COMMANDS; break; - case R.id.role_settings_use_external_emojis /* 2131364927 */: + case R.id.role_settings_use_external_emojis /* 2131364928 */: j = Permission.USE_EXTERNAL_EMOJIS; break; - case R.id.role_settings_use_external_stickers /* 2131364928 */: + case R.id.role_settings_use_external_stickers /* 2131364929 */: j = Permission.USE_EXTERNAL_STICKERS; break; - case R.id.role_settings_view_audit_log /* 2131364929 */: + case R.id.role_settings_view_audit_log /* 2131364930 */: j = 128; break; - case R.id.role_settings_view_guild_analytics /* 2131364930 */: + case R.id.role_settings_view_guild_analytics /* 2131364931 */: j = Permission.VIEW_GUILD_ANALYTICS; break; - case R.id.role_settings_voice_connect /* 2131364931 */: + case R.id.role_settings_voice_connect /* 2131364932 */: j = Permission.CONNECT; break; - case R.id.role_settings_voice_deafen_members /* 2131364932 */: + case R.id.role_settings_voice_deafen_members /* 2131364933 */: j = Permission.DEAFEN_MEMBERS; break; - case R.id.role_settings_voice_move_members /* 2131364933 */: + case R.id.role_settings_voice_move_members /* 2131364934 */: j = Permission.MOVE_MEMBERS; break; - case R.id.role_settings_voice_mute_members /* 2131364934 */: + case R.id.role_settings_voice_mute_members /* 2131364935 */: j = Permission.MUTE_MEMBERS; break; - case R.id.role_settings_voice_speak /* 2131364935 */: + case R.id.role_settings_voice_speak /* 2131364936 */: j = Permission.SPEAK; break; - case R.id.role_settings_voice_use_voice_activity /* 2131364936 */: + case R.id.role_settings_voice_use_voice_activity /* 2131364937 */: j = Permission.USE_VAD; break; - case R.id.role_settings_voice_video /* 2131364937 */: + case R.id.role_settings_voice_video /* 2131364938 */: j = 512; break; } diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java index 7ef8a6d24f..9f46e82f37 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 /* 2131364287 */: + case R.id.menu_audit_log_sort_actions /* 2131364288 */: 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 /* 2131364288 */: + case R.id.menu_audit_log_sort_users /* 2131364289 */: 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/member_verification/WidgetMemberVerificationViewModel.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java index b120db1779..f8cd884220 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java @@ -793,13 +793,15 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel formFields = form != null ? form.getFormFields() : null; GuildVerificationLevel verificationLevel = guild != null ? guild.getVerificationLevel() : null; GuildVerificationLevel guildVerificationLevel = GuildVerificationLevel.HIGHEST; - boolean z2 = verificationLevel != guildVerificationLevel; - boolean z3 = (guild != null ? guild.getVerificationLevel() : null) == guildVerificationLevel; - boolean z4 = formFields == null || formFields.isEmpty(); - if (z2) { + boolean z3 = verificationLevel != guildVerificationLevel; + boolean z4 = (guild != null ? guild.getVerificationLevel() : null) == guildVerificationLevel; + boolean z5 = formFields == null || formFields.isEmpty(); + if (z3) { verificationType2 = VerificationType.EMAIL; if (!me2.isVerified()) { } - } else if (z3) { + } else if (z4) { verificationType2 = VerificationType.PHONE; } else { verificationType = null; - boolean z5 = false; - List createFormItems = createFormItems(formFields, false, channels, roles, allowAnimatedEmojis); - if (formFields != null) { + boolean z6 = false; + if (formFields == null) { + boolean z7 = false; int i = 0; for (Object obj : formFields) { int i2 = i + 1; @@ -841,18 +843,22 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel createFormItems = createFormItems(formFields, false, channels, roles, allowAnimatedEmojis); - if (formFields != null) { + boolean z6 = false; + if (formFields == null) { } - updateViewState(new ViewState.Loaded(formFields == null && !formFields.isEmpty(), false, z4 || z5, verificationType, z5, createFormItems, memberVerificationFormData.getForm(), channels, roles, allowAnimatedEmojis, !z4 && !z5, false, guild)); + updateViewState(new ViewState.Loaded(formFields == null && !formFields.isEmpty(), false, z5 || z6, verificationType, z6, createFormItems(formFields, !z2, channels, roles, allowAnimatedEmojis), memberVerificationFormData.getForm(), channels, roles, allowAnimatedEmojis, !z5 && !z6, !z2, guild)); } } } 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 87b9d1bbae..f3b640943f 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 /* 2131364333 */: + case R.id.menu_settings_debugging /* 2131364334 */: WidgetDebugging.Companion companion = WidgetDebugging.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); return; - case R.id.menu_settings_log_out /* 2131364334 */: + case R.id.menu_settings_log_out /* 2131364335 */: 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 25a1d89f67..8934d3da4a 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 + " - 110.2 - Alpha (110202)"); + textView.setText(string + " - 110.3 - Alpha (110203)"); 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/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java index 2fa01cd9c5..e5b1b0925a 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 /* 2131364291 */: + case R.id.menu_call_overlay_launcher /* 2131364292 */: DiscordOverlayService.Companion companion = DiscordOverlayService.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launchForConnect(context); return; - case R.id.menu_call_switch_camera /* 2131364292 */: + case R.id.menu_call_switch_camera /* 2131364293 */: WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed(); return; - case R.id.menu_call_video_list /* 2131364293 */: + case R.id.menu_call_video_list /* 2131364294 */: 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 /* 2131364294 */: + case R.id.menu_call_voice_settings /* 2131364295 */: 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_chat_input_member_verification_guard.xml b/app/src/main/res/layout-v22/widget_chat_input_member_verification_guard.xml new file mode 100644 index 0000000000..1f3d9514ff --- /dev/null +++ b/app/src/main/res/layout-v22/widget_chat_input_member_verification_guard.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml b/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml index 16ce8a5fe4..2a8a8c4f84 100644 --- a/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml +++ b/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml @@ -4,7 +4,8 @@ - + + diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index fbc257785a..c25a2bcd4c 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -3366,6 +3366,7 @@ ‏‮This‬‏ ‏‮event‬‏ ‏‮will‬‏ ‏‮auto‬‏ ‏‮start‬‏ ‏‮when‬‏ ‏‮it\'s‬‏ ‏‮time.‬‏ ‏‮Here\'s‬‏ ‏‮a‬‏ ‏‮preview‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮event.‬‏ ‏‮Only‬‏ ‏‮members‬‏ ‏‮who‬‏ ‏‮can‬‏ ‏‮view‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮this‬‏ ‏‮event.‬‏ + ‏‮Events‬‏ ‏‮in‬‏ ‏‮private‬‏ ‏‮channels‬‏ ‏‮will‬‏ ‏‮only‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮to‬‏ ‏‮people‬‏ ‏‮who‬‏ ‏‮can‬‏ ‏‮access‬‏ ‏‮that‬‏ ‏‮channel.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮give‬‏ ‏‮other‬‏ ‏‮people‬‏ ‏‮permission‬‏ ‏‮to‬‏ ‏‮create‬‏ ‏‮events‬‏ ‏‮in‬‏ ‏‮**[Server‬‏ ‏‮Settings‬‏ ‏‮>‬‏ ‏‮Roles](onClick)**.‬‏ ‏‮They’re‬‏ ‏‮built‬‏ ‏‮for‬‏ ‏‮larger‬‏ ‏‮events‬‏ ‏‮and‬‏ ‏‮come‬‏ ‏‮with‬‏ ‏‮features‬‏ ‏‮like‬‏ ‏‮hand‬‏ ‏‮raise‬‏ ‏‮and‬‏ ‏‮auto-mute.‬‏ ‏‮Good‬‏ ‏‮for:‬‏ ‏‮$[Q&A,‬‏ ‏‮AMA,‬‏ ‏‮Panel‬‏ ‏‮Discussion](suggestionsHook)‬‏ @@ -4761,12 +4762,12 @@ ‏‮Invite‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Student‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮school‬‏ ‏‮A‬‏ ‏‮student‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮is‬‏ ‏‮required‬‏ ‏‮to‬‏ ‏‮join.‬‏ ‏‮New!‬‏ ‏‮Find‬‏ ‏‮study‬‏ ‏‮groups‬‏ ‏‮and‬‏ ‏‮clubs‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Student‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮school.‬‏ - ‏‮Are‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮student‬‏ ‏‮looking‬‏ ‏‮for‬‏ ‏‮student‬‏ ‏‮run‬‏ ‏‮communities?‬‏ + ‏‮Get‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮features‬‏ ‏‮just‬‏ ‏‮for‬‏ ‏‮students‬‏ ‏‮No,‬‏ ‏‮I\'m‬‏ ‏‮not‬‏ ‏‮interested‬‏ ‏‮Yes,‬‏ ‏‮I\'m‬‏ ‏‮a‬‏ ‏‮student‬‏ - ‏‮Help‬‏ ‏‮me‬‏ ‏‮find‬‏ ‏‮my‬‏ ‏‮schools‬‏ ‏‮and‬‏ ‏‮clubs‬‏ + ‏‮Give‬‏ ‏‮me‬‏ ‏‮student‬‏ ‏‮features‬‏ ‏‮Connect‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮classmates‬‏ - ‏‮Discord‬‏ ‏‮Hubs‬‏ ‏‮are‬‏ ‏‮home‬‏ ‏‮to‬‏ ‏‮all‬‏ ‏‮your‬‏ ‏‮schools‬‏ ‏‮communities,‬‏ ‏‮study‬‏ ‏‮groups,‬‏ ‏‮and‬‏ ‏‮clubs.‬‏ + ‏‮Discover‬‏ ‏‮class‬‏ ‏‮chats,‬‏ ‏‮study‬‏ ‏‮groups,‬‏ ‏‮clubs,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Student‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮school.‬‏ ‏‮Easily‬‏ ‏‮find‬‏ ‏‮class‬‏ ‏‮chats‬‏ ‏‮and‬‏ ‏‮study‬‏ ‏‮groups.‬‏ ‏‮Meet‬‏ ‏‮new‬‏ ‏‮students‬‏ ‏‮at‬‏ ‏‮your‬‏ ‏‮school.‬‏ ‏‮Join‬‏ ‏‮clubs‬‏ ‏‮and‬‏ ‏‮communities‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮interests.‬‏ @@ -5878,8 +5879,8 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index e620caeba8..4080340bcd 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -3366,6 +3366,7 @@ [Ţĥîš éVéñţ ŵîļļ åûţö šţåŕţ ŵĥéñ îţ\'š ţîḿé. one two three four five] [Ĥéŕé\'š å þŕéVîéŵ öƒ ýöûŕ éVéñţ. one two three four] [Öñļý ḿéḿɓéŕš ŵĥö çåñ Vîéŵ ţĥîš çĥåññéļ çåñ šéé ţĥîš éVéñţ. one two three four five six seven] + [ÉVéñţš îñ þŕîVåţé çĥåññéļš ŵîļļ öñļý ɓé Vîšîɓļé ţö þéöþļé ŵĥö çåñ åççéšš ţĥåţ çĥåññéļ. one two three four five six seven eight nine] [Ýöû çåñ ĝîVé öţĥéŕ þéöþļé þéŕḿîššîöñ ţö çŕéåţé éVéñţš îñ **[ŠéŕVéŕ Šéţţîñĝš > Ŕöļéš](öñÇļîçķ)**. one two three four five six seven eight nine ten eleven] [Ţĥéý’ŕé ɓûîļţ ƒöŕ ļåŕĝéŕ éVéñţš åñð çöḿé ŵîţĥ ƒéåţûŕéš ļîķé ĥåñð ŕåîšé åñð åûţö-ḿûţé. one two three four five six seven eight nine] [Ĝööð ƒöŕ: €[q&A,Å, ÅḾÅ, Þåñéļ Ðîšçûššîöñ](šûĝĝéšţîöñšĤööķ) one two three four five six seven eight nine ten eleven twelve] @@ -4761,12 +4762,12 @@ [ÎñVîţé ƒŕîéñðš ţö ţĥé Šţûðéñţ Ĥûɓ ƒöŕ ýöûŕ šçĥööļ one two three four five six] [Å šţûðéñţ éḿåîļ åððŕéšš îš ŕéQûîŕéð ţö ĵöîñ. one two three four five] [Ñéŵ¡ Fîñð šţûðý ĝŕöûþš åñð çļûɓš îñ ţĥé Šţûðéñţ Ĥûɓ ƒöŕ ýöûŕ šçĥööļ. one two three four five six seven eight] - [Åŕé ýöû å šţûðéñţ ļööķîñĝ ƒöŕ šţûðéñţ ŕûñ çöḿḿûñîţîéš¿ one two three four five six seven] + [Ĝéţ åççéšš ţö ƒéåţûŕéš ĵûšţ ƒöŕ šţûðéñţš one two three four five] [Ñö, Î\'ḿ ñöţ îñţéŕéšţéð one two three] [Ýéš, Î\'ḿ å šţûðéñţ one two three] - [Ĥéļþ ḿé ƒîñð ḿý šçĥööļš åñð çļûɓš one two three four] + [ĜîVé ḿé šţûðéñţ ƒéåţûŕéš one two three] [Çöññéçţ ŵîţĥ ýöûŕ çļåššḿåţéš one two three four] - [Ðîšçöŕð Ĥûɓš åŕé ĥöḿé ţö åļļ ýöûŕ šçĥööļš çöḿḿûñîţîéš, šţûðý ĝŕöûþš, åñð çļûɓš. one two three four five six seven eight nine] + [ÐîšçöVéŕ çļåšš çĥåţš, šţûðý ĝŕöûþš, çļûɓš, åñð ḿöŕé îñ ţĥé Šţûðéñţ Ĥûɓ ƒöŕ ýöûŕ šçĥööļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Éåšîļý ƒîñð çļåšš çĥåţš åñð šţûðý ĝŕöûþš. one two three four five] [Ḿééţ ñéŵ šţûðéñţš åţ ýöûŕ šçĥööļ. one two three four] [Ĵöîñ çļûɓš åñð çöḿḿûñîţîéš ƒöŕ ýöûŕ îñţéŕéšţš. one two three four five six] @@ -5878,8 +5879,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 29b7e061d1..f146da58d7 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -5965,3615 +5965,3616 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17990,6287 +17991,6288 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 26172b2176..5630c45572 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1441,7 +1441,7 @@ Custom Presets Use Default - 4b85abad2f4e453e9e1428d1377ee56a + f7ffe6aa07b24863bf6912fff7fca975 Slash command application {applicationName} {applicationName} application {applicationName} application selected @@ -3382,6 +3382,7 @@ This event will auto start when it\'s time. Here\'s a preview of your event. Only members who can view this channel can see this event. + Events in private channels will only be visible to people who can access that channel. You can give other people permission to create events in **[Server Settings > Roles](onClick)**. They’re built for larger events and come with features like hand raise and auto-mute. Good for: $[Q&A, AMA, Panel Discussion](suggestionsHook) @@ -4778,12 +4779,12 @@ Invite friends to the Student Hub for your school A student email address is required to join. New! Find study groups and clubs in the Student Hub for your school. - Are you a student looking for student run communities? + Get access to features just for students No, I\'m not interested Yes, I\'m a student - Help me find my schools and clubs + Give me student features Connect with your classmates - Discord Hubs are home to all your schools communities, study groups, and clubs. + Discover class chats, study groups, clubs, and more in the Student Hub for your school. Easily find class chats and study groups. Meet new students at your school. Join clubs and communities for your interests. @@ -5897,8 +5898,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