From ae5b6c3e1068a130396c3a2f8fab554c362603c5 Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Sun, 15 May 2022 19:38:37 +0100
Subject: [PATCH 1/8] Use dummy channel to show selector and remove
`ChannelListSelector`
Add dummy channel `DummySelectorChannel` which should be set as the
current channel in the channel manager when the selector in the chat
overlay should be shown.
Refactors the `ChannelListItem` to not show mention pill and close
button when the channel is the dummy selector channel.
Ensure that the `ChannelList` selects the dummy channel on clicking the
selector item.
Removes `ChannelListSelector` as it is no longer needed.
Removes the `setCurrent` parameter from `ChannelManager.JoinChannel`
method as it is no longer needed.
---
.../Visual/Online/TestSceneChannelList.cs | 12 +-
.../Visual/Online/TestSceneChatOverlayV2.cs | 5 +-
osu.Game/Online/Chat/ChannelManager.cs | 18 +--
.../Overlays/Chat/ChannelList/ChannelList.cs | 10 +-
.../Chat/ChannelList/ChannelListItem.cs | 60 +++++++---
.../Chat/ChannelList/ChannelListSelector.cs | 103 ------------------
osu.Game/Overlays/ChatOverlayV2.cs | 13 ++-
7 files changed, 80 insertions(+), 141 deletions(-)
delete mode 100644 osu.Game/Overlays/Chat/ChannelList/ChannelListSelector.cs
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs b/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs
index 9929642539..53a48fcc58 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs
@@ -118,35 +118,37 @@ namespace osu.Game.Tests.Visual.Online
{
AddStep("Unread Selected", () =>
{
- if (selected.Value != null)
+ if (validItem)
channelList.GetItem(selected.Value).Unread.Value = true;
});
AddStep("Read Selected", () =>
{
- if (selected.Value != null)
+ if (validItem)
channelList.GetItem(selected.Value).Unread.Value = false;
});
AddStep("Add Mention Selected", () =>
{
- if (selected.Value != null)
+ if (validItem)
channelList.GetItem(selected.Value).Mentions.Value++;
});
AddStep("Add 98 Mentions Selected", () =>
{
- if (selected.Value != null)
+ if (validItem)
channelList.GetItem(selected.Value).Mentions.Value += 98;
});
AddStep("Clear Mentions Selected", () =>
{
- if (selected.Value != null)
+ if (validItem)
channelList.GetItem(selected.Value).Mentions.Value = 0;
});
}
+ private bool validItem => selected.Value != null && !(selected.Value is DummySelectorChannel);
+
private Channel createRandomPublicChannel()
{
int id = RNG.Next(0, 10000);
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
index bf1767cc96..48557a4ddb 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
@@ -372,7 +372,7 @@ namespace osu.Game.Tests.Visual.Online
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
- AddStep("Click selector", () => clickDrawable(chatOverlay.ChildrenOfType<ChannelListSelector>().Single()));
+ AddStep("Click selector", () => clickDrawable(channelSelectorButton));
AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
AddStep("Click listing", () => clickDrawable(chatOverlay.ChildrenOfType<ChannelListing>().Single()));
AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
@@ -407,6 +407,9 @@ namespace osu.Game.Tests.Visual.Online
private ChatOverlayTopBar chatOverlayTopBar =>
chatOverlay.ChildrenOfType<ChatOverlayTopBar>().Single();
+ private ChannelListItem channelSelectorButton =>
+ chatOverlay.ChildrenOfType<ChannelListItem>().Single(item => item.Channel is DummySelectorChannel);
+
private void clickDrawable(Drawable d)
{
InputManager.MoveMouseTo(d);
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 1fe784f68b..9524e8c1a7 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -14,6 +14,7 @@ using osu.Game.Input;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
using osu.Game.Overlays.Chat.Tabs;
namespace osu.Game.Online.Chat
@@ -133,7 +134,9 @@ namespace osu.Game.Online.Chat
private void currentChannelChanged(ValueChangedEvent<Channel> e)
{
- if (!(e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel))
+ bool isSelectorChannel = e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel || e.NewValue is DummySelectorChannel;
+
+ if (!isSelectorChannel)
JoinChannel(e.NewValue);
}
@@ -194,7 +197,6 @@ namespace osu.Game.Online.Chat
createNewPrivateMessageRequest.Failure += exception =>
{
- handlePostException(exception);
target.ReplaceMessage(message, null);
dequeueAndRun();
};
@@ -420,11 +422,10 @@ namespace osu.Game.Online.Chat
/// Joins a channel if it has not already been joined. Must be called from the update thread.
/// </summary>
/// <param name="channel">The channel to join.</param>
- /// <param name="setCurrent">Set the channel to join as the current channel if the current channel is null.</param>
/// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns>
- public Channel JoinChannel(Channel channel, bool setCurrent = true) => joinChannel(channel, true, setCurrent);
+ public Channel JoinChannel(Channel channel) => joinChannel(channel, true);
- private Channel joinChannel(Channel channel, bool fetchInitialMessages = false, bool setCurrent = true)
+ private Channel joinChannel(Channel channel, bool fetchInitialMessages = false)
{
if (channel == null) return null;
@@ -440,7 +441,7 @@ namespace osu.Game.Online.Chat
case ChannelType.Multiplayer:
// join is implicit. happens when you join a multiplayer game.
// this will probably change in the future.
- joinChannel(channel, fetchInitialMessages, setCurrent);
+ joinChannel(channel, fetchInitialMessages);
return channel;
case ChannelType.PM:
@@ -461,7 +462,7 @@ namespace osu.Game.Online.Chat
default:
var req = new JoinChannelRequest(channel);
- req.Success += () => joinChannel(channel, fetchInitialMessages, setCurrent);
+ req.Success += () => joinChannel(channel, fetchInitialMessages);
req.Failure += ex => LeaveChannel(channel);
api.Queue(req);
return channel;
@@ -473,8 +474,7 @@ namespace osu.Game.Online.Chat
this.fetchInitialMessages(channel);
}
- if (setCurrent)
- CurrentChannel.Value ??= channel;
+ CurrentChannel.Value ??= channel;
return channel;
}
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
index 6bdf5ee084..c9f3a4d380 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
@@ -18,13 +18,16 @@ namespace osu.Game.Overlays.Chat.ChannelList
{
public class ChannelList : Container
{
- public Action<Channel?>? OnRequestSelect;
+ public Action<Channel>? OnRequestSelect;
public Action<Channel>? OnRequestLeave;
private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
+ private readonly DummySelectorChannel dummySelectorChannel = new DummySelectorChannel();
+
private ChannelListItemFlow publicChannelFlow = null!;
private ChannelListItemFlow privateChannelFlow = null!;
+ private ChannelListItem selector = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
@@ -50,16 +53,17 @@ namespace osu.Game.Overlays.Chat.ChannelList
Children = new Drawable[]
{
publicChannelFlow = new ChannelListItemFlow("CHANNELS"),
- new ChannelListSelector
+ selector = new ChannelListItem(dummySelectorChannel)
{
Margin = new MarginPadding { Bottom = 10 },
- Action = () => OnRequestSelect?.Invoke(null),
},
privateChannelFlow = new ChannelListItemFlow("DIRECT MESSAGES"),
},
},
},
};
+
+ selector.OnRequestSelect += chan => OnRequestSelect?.Invoke(chan);
}
public void AddChannel(Channel channel)
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index dd571c9ad9..dfb0b6d781 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private Box hoverBox = null!;
private Box selectBox = null!;
private OsuSpriteText text = null!;
- private ChannelListItemCloseButton close = null!;
+ private Drawable close = null!;
[Resolved]
private Bindable<Channel> selectedChannel { get; set; } = null!;
@@ -97,20 +97,8 @@ namespace osu.Game.Overlays.Chat.ChannelList
RelativeSizeAxes = Axes.X,
Truncate = true,
},
- new ChannelListItemMentionPill
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Margin = new MarginPadding { Right = 3 },
- Mentions = { BindTarget = Mentions },
- },
- close = new ChannelListItemCloseButton
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Margin = new MarginPadding { Right = 3 },
- Action = () => OnRequestLeave?.Invoke(Channel),
- }
+ createMentionPill(),
+ close = createCloseButton(),
}
},
},
@@ -131,14 +119,20 @@ namespace osu.Game.Overlays.Chat.ChannelList
protected override bool OnHover(HoverEvent e)
{
hoverBox.FadeIn(300, Easing.OutQuint);
- close.FadeIn(300, Easing.OutQuint);
+
+ if (!isSelector)
+ close.FadeIn(300, Easing.OutQuint);
+
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
hoverBox.FadeOut(200, Easing.OutQuint);
- close.FadeOut(200, Easing.OutQuint);
+
+ if (!isSelector)
+ close.FadeOut(200, Easing.OutQuint);
+
base.OnHoverLost(e);
}
@@ -158,9 +152,37 @@ namespace osu.Game.Overlays.Chat.ChannelList
};
}
+ private Drawable createMentionPill()
+ {
+ if (isSelector)
+ return Drawable.Empty();
+
+ return new ChannelListItemMentionPill
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Margin = new MarginPadding { Right = 3 },
+ Mentions = { BindTarget = Mentions },
+ };
+ }
+
+ private Drawable createCloseButton()
+ {
+ if (isSelector)
+ return Drawable.Empty();
+
+ return new ChannelListItemCloseButton
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Margin = new MarginPadding { Right = 3 },
+ Action = () => OnRequestLeave?.Invoke(Channel),
+ };
+ }
+
private void updateState()
{
- bool selected = selectedChannel.Value == Channel;
+ bool selected = selectedChannel.Value == Channel || (isSelector && selectedChannel.Value == null);
if (selected)
selectBox.FadeIn(300, Easing.OutQuint);
@@ -172,5 +194,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
else
text.FadeColour(colourProvider.Light3, 200, Easing.OutQuint);
}
+
+ private bool isSelector => Channel is DummySelectorChannel;
}
}
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListSelector.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListSelector.cs
deleted file mode 100644
index a07aad2041..0000000000
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListSelector.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable enable
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Chat;
-
-namespace osu.Game.Overlays.Chat.ChannelList
-{
- public class ChannelListSelector : OsuClickableContainer
- {
- private Box hoverBox = null!;
- private Box selectBox = null!;
- private OsuSpriteText text = null!;
-
- [Resolved]
- private Bindable<Channel> currentChannel { get; set; } = null!;
-
- [Resolved]
- private OverlayColourProvider colourProvider { get; set; } = null!;
-
- [BackgroundDependencyLoader]
- private void load(OverlayColourProvider colourProvider)
- {
- Height = 30;
- RelativeSizeAxes = Axes.X;
-
- Children = new Drawable[]
- {
- hoverBox = new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = colourProvider.Background3,
- Alpha = 0f,
- },
- selectBox = new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = colourProvider.Background4,
- Alpha = 0f,
- },
- new Container
- {
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Left = 18, Right = 10 },
- Child = text = new OsuSpriteText
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Text = "Add more channels",
- Font = OsuFont.Torus.With(size: 17, weight: FontWeight.SemiBold),
- Colour = colourProvider.Light3,
- Margin = new MarginPadding { Bottom = 2 },
- RelativeSizeAxes = Axes.X,
- Truncate = true,
- },
- },
- };
- }
-
- protected override void LoadComplete()
- {
- base.LoadComplete();
-
- currentChannel.BindValueChanged(channel =>
- {
- // This logic should be handled by the chat overlay rather than this component.
- // Selected state should be moved to an abstract class and shared with ChannelListItem.
- if (channel.NewValue == null)
- {
- text.FadeColour(colourProvider.Content1, 300, Easing.OutQuint);
- selectBox.FadeIn(300, Easing.OutQuint);
- }
- else
- {
- text.FadeColour(colourProvider.Light3, 200, Easing.OutQuint);
- selectBox.FadeOut(200, Easing.OutQuint);
- }
- }, true);
- }
-
- protected override bool OnHover(HoverEvent e)
- {
- hoverBox.FadeIn(300, Easing.OutQuint);
- return base.OnHover(e);
- }
-
- protected override void OnHoverLost(HoverLostEvent e)
- {
- hoverBox.FadeOut(200, Easing.OutQuint);
- base.OnHoverLost(e);
- }
- }
-}
diff --git a/osu.Game/Overlays/ChatOverlayV2.cs b/osu.Game/Overlays/ChatOverlayV2.cs
index 6eec0bbbf4..0307dcfdf3 100644
--- a/osu.Game/Overlays/ChatOverlayV2.cs
+++ b/osu.Game/Overlays/ChatOverlayV2.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Overlays
channelList.OnRequestSelect += channel => channelManager.CurrentChannel.Value = channel;
channelList.OnRequestLeave += channel => channelManager.LeaveChannel(channel);
- channelListing.OnRequestJoin += channel => channelManager.JoinChannel(channel, false);
+ channelListing.OnRequestJoin += channel => channelManager.JoinChannel(channel);
channelListing.OnRequestLeave += channel => channelManager.LeaveChannel(channel);
textBar.OnSearchTermsChanged += searchTerms => channelListing.SearchTerm = searchTerms;
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays
{
Channel? newChannel = channel.NewValue;
- if (newChannel == null)
+ if (newChannel == null || newChannel is DummySelectorChannel)
{
// null channel denotes that we should be showing the listing.
channelListing.State.Value = Visibility.Visible;
@@ -293,4 +293,13 @@ namespace osu.Game.Overlays
channelManager.PostMessage(message);
}
}
+
+ public class DummySelectorChannel : Channel
+ {
+ public DummySelectorChannel()
+ {
+ Name = "Add more channels";
+ Type = ChannelType.System;
+ }
+ }
}
From 932442e2422db30333071d6a441b993d4f50667b Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Tue, 17 May 2022 18:52:19 +0100
Subject: [PATCH 2/8] Use `null` for empty grid cells in `ChannelListItem`
---
.../Chat/ChannelList/ChannelListItem.cs | 22 ++++++++-----------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index dfb0b6d781..da1cfaf617 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private Box hoverBox = null!;
private Box selectBox = null!;
private OsuSpriteText text = null!;
- private Drawable close = null!;
+ private Drawable? close;
[Resolved]
private Bindable<Channel> selectedChannel { get; set; } = null!;
@@ -119,9 +119,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
protected override bool OnHover(HoverEvent e)
{
hoverBox.FadeIn(300, Easing.OutQuint);
-
- if (!isSelector)
- close.FadeIn(300, Easing.OutQuint);
+ close?.FadeIn(300, Easing.OutQuint);
return base.OnHover(e);
}
@@ -129,17 +127,15 @@ namespace osu.Game.Overlays.Chat.ChannelList
protected override void OnHoverLost(HoverLostEvent e)
{
hoverBox.FadeOut(200, Easing.OutQuint);
-
- if (!isSelector)
- close.FadeOut(200, Easing.OutQuint);
+ close?.FadeOut(200, Easing.OutQuint);
base.OnHoverLost(e);
}
- private Drawable createIcon()
+ private UpdateableAvatar? createIcon()
{
if (Channel.Type != ChannelType.PM)
- return Drawable.Empty();
+ return null;
return new UpdateableAvatar(Channel.Users.First(), isInteractive: false)
{
@@ -152,10 +148,10 @@ namespace osu.Game.Overlays.Chat.ChannelList
};
}
- private Drawable createMentionPill()
+ private ChannelListItemMentionPill? createMentionPill()
{
if (isSelector)
- return Drawable.Empty();
+ return null;
return new ChannelListItemMentionPill
{
@@ -166,10 +162,10 @@ namespace osu.Game.Overlays.Chat.ChannelList
};
}
- private Drawable createCloseButton()
+ private ChannelListItemCloseButton? createCloseButton()
{
if (isSelector)
- return Drawable.Empty();
+ return null;
return new ChannelListItemCloseButton
{
From 4015042e369a6d0900cca61beb0a13ee795d1639 Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Wed, 18 May 2022 01:35:39 +0100
Subject: [PATCH 3/8] Ensure close button component is not stored as a
`Drawable`
---
osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index da1cfaf617..eb2bdfdf8a 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private Box hoverBox = null!;
private Box selectBox = null!;
private OsuSpriteText text = null!;
- private Drawable? close;
+ private ChannelListItemCloseButton? close;
[Resolved]
private Bindable<Channel> selectedChannel { get; set; } = null!;
@@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
},
Content = new[]
{
- new[]
+ new Drawable?[]
{
createIcon(),
text = new OsuSpriteText
From dd4b11c593f7869295e246241e388c701e641f99 Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Wed, 18 May 2022 01:47:23 +0100
Subject: [PATCH 4/8] Re-add exception handling on PM message request failure
---
osu.Game/Online/Chat/ChannelManager.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 9524e8c1a7..9e85067f15 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -197,6 +197,7 @@ namespace osu.Game.Online.Chat
createNewPrivateMessageRequest.Failure += exception =>
{
+ handlePostException(exception);
target.ReplaceMessage(message, null);
dequeueAndRun();
};
From 63c97763658c490de30239d0b1e41799dbed9d2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 May 2022 19:24:18 +0900
Subject: [PATCH 5/8] Fix oversight in bindable logic in new overlay class
---
osu.Game/Overlays/ChatOverlayV2.cs | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/osu.Game/Overlays/ChatOverlayV2.cs b/osu.Game/Overlays/ChatOverlayV2.cs
index 0307dcfdf3..42c928014a 100644
--- a/osu.Game/Overlays/ChatOverlayV2.cs
+++ b/osu.Game/Overlays/ChatOverlayV2.cs
@@ -62,6 +62,9 @@ namespace osu.Game.Overlays
[Cached]
private readonly Bindable<Channel> currentChannel = new Bindable<Channel>();
+ private readonly IBindableList<Channel> availableChannels = new BindableList<Channel>();
+ private readonly IBindableList<Channel> joinedChannels = new BindableList<Channel>();
+
public ChatOverlayV2()
{
Height = default_chat_height;
@@ -147,9 +150,13 @@ namespace osu.Game.Overlays
chatHeight.BindValueChanged(height => { Height = height.NewValue; }, true);
currentChannel.BindTo(channelManager.CurrentChannel);
- channelManager.CurrentChannel.BindValueChanged(currentChannelChanged, true);
- channelManager.JoinedChannels.BindCollectionChanged(joinedChannelsChanged, true);
- channelManager.AvailableChannels.BindCollectionChanged(availableChannelsChanged, true);
+ currentChannel.BindValueChanged(currentChannelChanged, true);
+
+ joinedChannels.BindTo(channelManager.JoinedChannels);
+ joinedChannels.BindCollectionChanged(joinedChannelsChanged, true);
+
+ availableChannels.BindTo(channelManager.AvailableChannels);
+ availableChannels.BindCollectionChanged(availableChannelsChanged, true);
channelList.OnRequestSelect += channel => channelManager.CurrentChannel.Value = channel;
channelList.OnRequestLeave += channel => channelManager.LeaveChannel(channel);
@@ -263,8 +270,8 @@ namespace osu.Game.Overlays
switch (args.Action)
{
case NotifyCollectionChangedAction.Add:
- IEnumerable<Channel> joinedChannels = filterChannels(args.NewItems);
- foreach (var channel in joinedChannels)
+ IEnumerable<Channel> newChannels = filterChannels(args.NewItems);
+ foreach (var channel in newChannels)
channelList.AddChannel(channel);
break;
From 136ecb45e241b6d0dd4358107ddb2d9b4299f3bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 May 2022 19:26:14 +0900
Subject: [PATCH 6/8] Rename dummy channel and move to a nested class inside
the `ChannelListing` itself
---
osu.Game.Tests/Visual/Online/TestSceneChannelList.cs | 3 ++-
.../Visual/Online/TestSceneChatOverlayV2.cs | 2 +-
osu.Game/Online/Chat/ChannelManager.cs | 4 ++--
osu.Game/Overlays/Chat/ChannelList/ChannelList.cs | 5 +++--
osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs | 3 ++-
osu.Game/Overlays/Chat/Listing/ChannelListing.cs | 9 +++++++++
osu.Game/Overlays/ChatOverlayV2.cs | 11 +----------
7 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs b/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs
index 53a48fcc58..e4bc5645b6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChannelList.cs
@@ -13,6 +13,7 @@ using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Chat;
using osu.Game.Overlays;
using osu.Game.Overlays.Chat.ChannelList;
+using osu.Game.Overlays.Chat.Listing;
namespace osu.Game.Tests.Visual.Online
{
@@ -147,7 +148,7 @@ namespace osu.Game.Tests.Visual.Online
});
}
- private bool validItem => selected.Value != null && !(selected.Value is DummySelectorChannel);
+ private bool validItem => selected.Value != null && !(selected.Value is ChannelListing.ChannelListingChannel);
private Channel createRandomPublicChannel()
{
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
index 48557a4ddb..3b8849f7c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
@@ -408,7 +408,7 @@ namespace osu.Game.Tests.Visual.Online
chatOverlay.ChildrenOfType<ChatOverlayTopBar>().Single();
private ChannelListItem channelSelectorButton =>
- chatOverlay.ChildrenOfType<ChannelListItem>().Single(item => item.Channel is DummySelectorChannel);
+ chatOverlay.ChildrenOfType<ChannelListItem>().Single(item => item.Channel is ChannelListing.ChannelListingChannel);
private void clickDrawable(Drawable d)
{
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 9e85067f15..b7d67de04d 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -14,7 +14,7 @@ using osu.Game.Input;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
+using osu.Game.Overlays.Chat.Listing;
using osu.Game.Overlays.Chat.Tabs;
namespace osu.Game.Online.Chat
@@ -134,7 +134,7 @@ namespace osu.Game.Online.Chat
private void currentChannelChanged(ValueChangedEvent<Channel> e)
{
- bool isSelectorChannel = e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel || e.NewValue is DummySelectorChannel;
+ bool isSelectorChannel = e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel || e.NewValue is ChannelListing.ChannelListingChannel;
if (!isSelectorChannel)
JoinChannel(e.NewValue);
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
index c9f3a4d380..555b54155c 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
+using osu.Game.Overlays.Chat.Listing;
namespace osu.Game.Overlays.Chat.ChannelList
{
@@ -23,7 +24,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
- private readonly DummySelectorChannel dummySelectorChannel = new DummySelectorChannel();
+ private readonly ChannelListing.ChannelListingChannel channelListingChannel = new ChannelListing.ChannelListingChannel();
private ChannelListItemFlow publicChannelFlow = null!;
private ChannelListItemFlow privateChannelFlow = null!;
@@ -53,7 +54,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
Children = new Drawable[]
{
publicChannelFlow = new ChannelListItemFlow("CHANNELS"),
- selector = new ChannelListItem(dummySelectorChannel)
+ selector = new ChannelListItem(channelListingChannel)
{
Margin = new MarginPadding { Bottom = 10 },
},
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index eb2bdfdf8a..2967d9df11 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
+using osu.Game.Overlays.Chat.Listing;
using osu.Game.Users.Drawables;
using osuTK;
@@ -191,6 +192,6 @@ namespace osu.Game.Overlays.Chat.ChannelList
text.FadeColour(colourProvider.Light3, 200, Easing.OutQuint);
}
- private bool isSelector => Channel is DummySelectorChannel;
+ private bool isSelector => Channel is ChannelListing.ChannelListingChannel;
}
}
diff --git a/osu.Game/Overlays/Chat/Listing/ChannelListing.cs b/osu.Game/Overlays/Chat/Listing/ChannelListing.cs
index 732c78de15..8a5bc18cbf 100644
--- a/osu.Game/Overlays/Chat/Listing/ChannelListing.cs
+++ b/osu.Game/Overlays/Chat/Listing/ChannelListing.cs
@@ -75,5 +75,14 @@ namespace osu.Game.Overlays.Chat.Listing
protected override void PopIn() => this.FadeIn();
protected override void PopOut() => this.FadeOut();
+
+ public class ChannelListingChannel : Channel
+ {
+ public ChannelListingChannel()
+ {
+ Name = "Add more channels";
+ Type = ChannelType.System;
+ }
+ }
}
}
diff --git a/osu.Game/Overlays/ChatOverlayV2.cs b/osu.Game/Overlays/ChatOverlayV2.cs
index 42c928014a..202d70d99b 100644
--- a/osu.Game/Overlays/ChatOverlayV2.cs
+++ b/osu.Game/Overlays/ChatOverlayV2.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Overlays
{
Channel? newChannel = channel.NewValue;
- if (newChannel == null || newChannel is DummySelectorChannel)
+ if (newChannel == null || newChannel is ChannelListing.ChannelListingChannel)
{
// null channel denotes that we should be showing the listing.
channelListing.State.Value = Visibility.Visible;
@@ -300,13 +300,4 @@ namespace osu.Game.Overlays
channelManager.PostMessage(message);
}
}
-
- public class DummySelectorChannel : Channel
- {
- public DummySelectorChannel()
- {
- Name = "Add more channels";
- Type = ChannelType.System;
- }
- }
}
From c37d1e4fae4fe827e7ae36b485407d280fd29ba5 Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Thu, 19 May 2022 11:45:39 +0100
Subject: [PATCH 7/8] Ensure current channel is set to the
`ChannelListingChannel` when it becomes `null`
---
osu.Game/Overlays/Chat/ChannelList/ChannelList.cs | 6 +++---
osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs | 2 +-
osu.Game/Overlays/ChatOverlayV2.cs | 10 ++++++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
index 555b54155c..d1ceae604c 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
@@ -22,9 +22,9 @@ namespace osu.Game.Overlays.Chat.ChannelList
public Action<Channel>? OnRequestSelect;
public Action<Channel>? OnRequestLeave;
- private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
+ public readonly ChannelListing.ChannelListingChannel ChannelListingChannel = new ChannelListing.ChannelListingChannel();
- private readonly ChannelListing.ChannelListingChannel channelListingChannel = new ChannelListing.ChannelListingChannel();
+ private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
private ChannelListItemFlow publicChannelFlow = null!;
private ChannelListItemFlow privateChannelFlow = null!;
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
Children = new Drawable[]
{
publicChannelFlow = new ChannelListItemFlow("CHANNELS"),
- selector = new ChannelListItem(channelListingChannel)
+ selector = new ChannelListItem(ChannelListingChannel)
{
Margin = new MarginPadding { Bottom = 10 },
},
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index 2967d9df11..9ab0c2792a 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
private void updateState()
{
- bool selected = selectedChannel.Value == Channel || (isSelector && selectedChannel.Value == null);
+ bool selected = selectedChannel.Value == Channel;
if (selected)
selectBox.FadeIn(300, Easing.OutQuint);
diff --git a/osu.Game/Overlays/ChatOverlayV2.cs b/osu.Game/Overlays/ChatOverlayV2.cs
index 202d70d99b..fe3f8ba8cb 100644
--- a/osu.Game/Overlays/ChatOverlayV2.cs
+++ b/osu.Game/Overlays/ChatOverlayV2.cs
@@ -244,9 +244,15 @@ namespace osu.Game.Overlays
{
Channel? newChannel = channel.NewValue;
- if (newChannel == null || newChannel is ChannelListing.ChannelListingChannel)
+ // null channel denotes that we should be showing the listing.
+ if (newChannel == null)
+ {
+ currentChannel.Value = channelList.ChannelListingChannel;
+ return;
+ }
+
+ if (newChannel is ChannelListing.ChannelListingChannel)
{
- // null channel denotes that we should be showing the listing.
channelListing.State.Value = Visibility.Visible;
textBar.ShowSearch.Value = true;
}
From efae934e0199713368a4e9cf563cb77a6202f6a6 Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Sat, 21 May 2022 17:35:31 +0100
Subject: [PATCH 8/8] Fix slow loading channel test
---
osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
index 4f916eec18..e27db00003 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs
@@ -397,6 +397,7 @@ namespace osu.Game.Tests.Visual.Online
chatOverlay.SlowLoading = true;
});
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+ AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddAssert("Channel 1 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel1).LoadState == LoadState.Loading);
AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2));