sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust class naming

Browse Source
This commit is contained in:
Andrei Zavatski
2020-03-04 23:08:58 +03:00
parent 63219a2357
commit bd03dd9b70
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
View File

@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
typeof(FriendsOnlineStatusControl), typeof(FriendsOnlineStatusControl),
typeof(FriendsOnlineStatusItem), typeof(FriendsOnlineStatusItem),
typeof(OverlayUpdateStreamControl<>), typeof(OverlayStreamControl<>),
typeof(OverlayUpdateStreamItem<>), typeof(OverlayStreamItem<>),
typeof(FriendsBundle) typeof(FriendsBundle)
}; };

4
osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
View File

@ -5,8 +5,8 @@ using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Overlays.Changelog namespace osu.Game.Overlays.Changelog
{ {
public class ChangelogUpdateStreamControl : OverlayUpdateStreamControl<APIUpdateStream> public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
{ {
protected override OverlayUpdateStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value); protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
} }
} }

2
osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
View File

@ -8,7 +8,7 @@ using osuTK.Graphics;
namespace osu.Game.Overlays.Changelog namespace osu.Game.Overlays.Changelog
{ {
public class ChangelogUpdateStreamItem : OverlayUpdateStreamItem<APIUpdateStream> public class ChangelogUpdateStreamItem : OverlayStreamItem<APIUpdateStream>
{ {
public ChangelogUpdateStreamItem(APIUpdateStream stream) public ChangelogUpdateStreamItem(APIUpdateStream stream)
: base(stream) : base(stream)

4
osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
View File

@ -7,9 +7,9 @@ using osu.Game.Users;
namespace osu.Game.Overlays.Home.Friends namespace osu.Game.Overlays.Home.Friends
{ {
public class FriendsOnlineStatusControl : OverlayUpdateStreamControl<FriendsBundle> public class FriendsOnlineStatusControl : OverlayStreamControl<FriendsBundle>
{ {
protected override OverlayUpdateStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value); protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
public void Populate(List<User> users) public void Populate(List<User> users)
{ {

2
osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
View File

@ -7,7 +7,7 @@ using osuTK.Graphics;
namespace osu.Game.Overlays.Home.Friends namespace osu.Game.Overlays.Home.Friends
{ {
public class FriendsOnlineStatusItem : OverlayUpdateStreamItem<FriendsBundle> public class FriendsOnlineStatusItem : OverlayStreamItem<FriendsBundle>
{ {
public FriendsOnlineStatusItem(FriendsBundle value) public FriendsOnlineStatusItem(FriendsBundle value)
: base(value) : base(value)

10
osu.Game/Overlays/OverlayUpdateStreamControl.cs → osu.Game/Overlays/OverlayStreamControl.cs
View File

@ -10,9 +10,9 @@ using JetBrains.Annotations;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public abstract class OverlayUpdateStreamControl<T> : TabControl<T> public abstract class OverlayStreamControl<T> : TabControl<T>
{ {
protected OverlayUpdateStreamControl() protected OverlayStreamControl()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
@ -28,7 +28,7 @@ namespace osu.Game.Overlays
}); });
[NotNull] [NotNull]
protected abstract OverlayUpdateStreamItem<T> CreateStreamItem(T value); protected abstract OverlayStreamItem<T> CreateStreamItem(T value);
protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
{ {
@ -39,7 +39,7 @@ namespace osu.Game.Overlays
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>()) foreach (var streamBadge in TabContainer.Children.OfType<OverlayStreamItem<T>>())
streamBadge.UserHoveringArea = true; streamBadge.UserHoveringArea = true;
return base.OnHover(e); return base.OnHover(e);
@ -47,7 +47,7 @@ namespace osu.Game.Overlays
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>()) foreach (var streamBadge in TabContainer.Children.OfType<OverlayStreamItem<T>>())
streamBadge.UserHoveringArea = false; streamBadge.UserHoveringArea = false;
base.OnHoverLost(e); base.OnHoverLost(e);

4
osu.Game/Overlays/OverlayUpdateStreamItem.cs → osu.Game/Overlays/OverlayStreamItem.cs
View File

@ -15,7 +15,7 @@ using osuTK.Graphics;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public abstract class OverlayUpdateStreamItem<T> : TabItem<T> public abstract class OverlayStreamItem<T> : TabItem<T>
{ {
public readonly Bindable<T> SelectedItem = new Bindable<T>(); public readonly Bindable<T> SelectedItem = new Bindable<T>();
@ -36,7 +36,7 @@ namespace osu.Game.Overlays
private FillFlowContainer<SpriteText> text; private FillFlowContainer<SpriteText> text;
private ExpandingBar expandingBar; private ExpandingBar expandingBar;
protected OverlayUpdateStreamItem(T value) protected OverlayStreamItem(T value)
: base(value) : base(value)
{ {
Height = 60; Height = 60;