Skip to content

test: chat-friends #6265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

test: chat-friends #6265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions ...enderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public struct Configuration
private LeaveChannelConfirmationWindowController channelLeaveWindow;
private CancellationTokenSource openPrivateChatCancellationToken = new ();

private bool isFriendsFeatureEnabled => DataStore.i.featureFlags.flags.Get().IsFeatureEnabled("friends_enabled");
// private bool isFriendsFeatureEnabled => DataStore.i.featureFlags.flags.Get().IsFeatureEnabled("friends_enabled");
private bool isFriendsFeatureEnabled => false;

public event Action OnAnyTaskbarButtonClicked;

Expand Down Expand Up @@ -93,24 +94,24 @@ public void Initialize(IMouseCatcher mouseCatcher)

view.leftWindowContainerLayout.enabled = false;

view.OnChatToggle += HandleChatToggle;
view.OnFriendsToggle += HandleFriendsToggle;
// view.OnChatToggle += HandleChatToggle;
// view.OnFriendsToggle += HandleFriendsToggle;
view.OnEmotesToggle += HandleEmotesToggle;
view.OnExperiencesToggle += HandleExperiencesToggle;
view.OnVoiceChatToggle += HandleVoiceChatToggle;
view.OnIntercomPressed += OpenIntercom;

toggleFriendsTrigger = Resources.Load<InputAction_Trigger>("ToggleFriends");
toggleFriendsTrigger.OnTriggered -= ToggleFriendsTrigger_OnTriggered;
toggleFriendsTrigger.OnTriggered += ToggleFriendsTrigger_OnTriggered;

closeWindowTrigger = Resources.Load<InputAction_Trigger>("CloseWindow");
closeWindowTrigger.OnTriggered -= CloseWindowTrigger_OnTriggered;
closeWindowTrigger.OnTriggered += CloseWindowTrigger_OnTriggered;

toggleWorldChatTrigger = Resources.Load<InputAction_Trigger>("ToggleWorldChat");
toggleWorldChatTrigger.OnTriggered -= ToggleWorldChatTrigger_OnTriggered;
toggleWorldChatTrigger.OnTriggered += ToggleWorldChatTrigger_OnTriggered;
// view.OnVoiceChatToggle += HandleVoiceChatToggle;
// view.OnIntercomPressed += OpenIntercom;

// toggleFriendsTrigger = Resources.Load<InputAction_Trigger>("ToggleFriends");
// toggleFriendsTrigger.OnTriggered -= ToggleFriendsTrigger_OnTriggered;
// toggleFriendsTrigger.OnTriggered += ToggleFriendsTrigger_OnTriggered;
//
// closeWindowTrigger = Resources.Load<InputAction_Trigger>("CloseWindow");
// closeWindowTrigger.OnTriggered -= CloseWindowTrigger_OnTriggered;
// closeWindowTrigger.OnTriggered += CloseWindowTrigger_OnTriggered;
//
// toggleWorldChatTrigger = Resources.Load<InputAction_Trigger>("ToggleWorldChat");
// toggleWorldChatTrigger.OnTriggered -= ToggleWorldChatTrigger_OnTriggered;
// toggleWorldChatTrigger.OnTriggered += ToggleWorldChatTrigger_OnTriggered;

isEmotesWheelInitialized.OnChange += InitializeEmotesSelector;
InitializeEmotesSelector(isEmotesWheelInitialized.Get(), false);
Expand Down Expand Up @@ -348,10 +349,10 @@ public void AddWorldChatWindow(WorldChatWindowController controller)

worldChatWindowHud = controller;

view.ShowChatButton();
worldChatWindowHud.OnCloseView += ToggleOffChatIcon;
worldChatWindowHud.OnOpenChannelCreation += OpenChannelCreation;
worldChatWindowHud.OnOpenChannelLeave += OpenChannelLeaveConfirmation;
// view.ShowChatButton();
// worldChatWindowHud.OnCloseView += ToggleOffChatIcon;
// worldChatWindowHud.OnOpenChannelCreation += OpenChannelCreation;
// worldChatWindowHud.OnOpenChannelLeave += OpenChannelLeaveConfirmation;
}

private void ToggleOffChatIcon() =>
Expand Down
Loading