sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggested changes

Browse Source
This commit is contained in:
Andrei Zavatski
2019-08-02 07:41:11 +03:00
parent bb331106b2
commit de96e5dfc6
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/Online/TestScenePreviousUsernamesContainer.cs
View File

@ -43,6 +43,11 @@ namespace osu.Game.Tests.Visual.Online
PreviousUsernames = new[] { "ihavenoidea", "howcani", "makethistext", "anylonger" }, PreviousUsernames = new[] { "ihavenoidea", "howcani", "makethistext", "anylonger" },
}); });
AddStep("many usernames", () => user.Value = new User
{
PreviousUsernames = new[] { "ihavenoidea", "howcani", "makethistext", "anylonger", "but", "ican", "try", "tomake", "this" },
});
AddStep("no username", () => user.Value = new User AddStep("no username", () => user.Value = new User
{ {
PreviousUsernames = new string[0], PreviousUsernames = new string[0],

58
osu.Game/Overlays/Profile/Header/PreviousUsernamesContainer.cs
View File

@ -16,12 +16,12 @@ using System.Linq;
namespace osu.Game.Overlays.Profile.Header namespace osu.Game.Overlays.Profile.Header
{ {
public class PreviousUsernamesContainer : Container public class PreviousUsernamesContainer : CompositeDrawable
{ {
private const int duration = 200; private const int duration = 200;
private const int margin = 10; private const int margin = 10;
private const int width = 350; private const int width = 310;
private const int move_offset = 20; private const int move_offset = 15;
public readonly Bindable<User> User = new Bindable<User>(); public readonly Bindable<User> User = new Bindable<User>();
@ -33,43 +33,35 @@ namespace osu.Game.Overlays.Profile.Header
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Width = width; Width = width;
Children = new Drawable[]
AddRangeInternal(new Drawable[]
{ {
contentContainer = new ContentContainer(), contentContainer = new ContentContainer(),
hoverIcon = new HoverIconContainer(), hoverIcon = new HoverIconContainer(),
}; });
hoverIcon.ActivateHover += () => hoverIcon.ActivateHover += () =>
{ {
contentContainer.Show(); contentContainer.Show();
this.MoveToY(-move_offset, duration, Easing.OutQuint); this.MoveToY(-move_offset, duration, Easing.OutQuint);
}; };
}
User.BindValueChanged(onUserChanged); protected override void LoadComplete()
Hide(); {
base.LoadComplete();
User.BindValueChanged(onUserChanged, true);
} }
private void onUserChanged(ValueChangedEvent<User> user) private void onUserChanged(ValueChangedEvent<User> user)
{ {
contentContainer.Clear(); contentContainer.Text = string.Empty;
var usernames = user.NewValue.PreviousUsernames; var usernames = user.NewValue?.PreviousUsernames;
if (usernames.Any()) if (usernames?.Any() ?? false)
{ {
var amount = usernames.Length; contentContainer.Text = string.Join(", ", usernames);
for (int i = 0; i < amount; i++)
{
string text = (i + 1 == amount) ? usernames[i] : $@"{usernames[i]},";
contentContainer.Usernames.AddText(new SpriteText
{
Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
Text = text,
});
}
Show(); Show();
return; return;
} }
@ -86,11 +78,15 @@ namespace osu.Game.Overlays.Profile.Header
private class ContentContainer : VisibilityContainer private class ContentContainer : VisibilityContainer
{ {
private const int header_height = 25; private const int header_height = 20;
private const int content_padding = 60; private const int content_padding = 40;
public readonly TextFlowContainer Usernames; public string Text
{
set => usernames.Text = value;
}
private readonly TextFlowContainer usernames;
private readonly Box background; private readonly Box background;
public ContentContainer() public ContentContainer()
@ -126,16 +122,16 @@ namespace osu.Game.Overlays.Profile.Header
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Padding = new MarginPadding { Left = content_padding }, Padding = new MarginPadding { Left = content_padding },
Text = @"formerly known as", Text = @"formerly known as",
Font = OsuFont.GetFont(size: 14, italics: true) Font = OsuFont.GetFont(size: 10, italics: true)
} }
} }
}, },
Usernames = new TextFlowContainer usernames = new TextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold, italics: true))
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FillDirection.Full, Direction = FillDirection.Full,
Spacing = new Vector2(5, 5), Spacing = new Vector2(0, 5),
Padding = new MarginPadding { Left = content_padding, Bottom = margin }, Padding = new MarginPadding { Left = content_padding, Bottom = margin },
}, },
} }
@ -149,8 +145,6 @@ namespace osu.Game.Overlays.Profile.Header
background.Colour = colours.GreySeafoamDarker; background.Colour = colours.GreySeafoamDarker;
} }
public override void Clear(bool disposeChildren) => Usernames.Clear(disposeChildren);
protected override void PopIn() => this.FadeIn(duration, Easing.OutQuint); protected override void PopIn() => this.FadeIn(duration, Easing.OutQuint);
protected override void PopOut() => this.FadeOut(duration, Easing.OutQuint); protected override void PopOut() => this.FadeOut(duration, Easing.OutQuint);
@ -166,7 +160,7 @@ namespace osu.Game.Overlays.Profile.Header
Child = new SpriteIcon Child = new SpriteIcon
{ {
Margin = new MarginPadding(margin) { Top = 6 }, Margin = new MarginPadding(margin) { Top = 6 },
Size = new Vector2(20), Size = new Vector2(15),
Icon = FontAwesome.Solid.IdCard, Icon = FontAwesome.Solid.IdCard,
}; };
} }