h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 07:22:55 +08:00
Code Issues Releases Wiki Activity

Cleanup bottom header container

Browse Source
This commit is contained in:
smoogipoo 2019-04-25 18:42:19 +09:00
parent 1766ed8f9e
commit b33c0e9a93
2 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/Online/TestCaseUserProfileHeader.cs
View File

@ -21,6 +21,7 @@ namespace osu.Game.Tests.Visual.Online
typeof(RankGraph), typeof(RankGraph),
typeof(LineGraph), typeof(LineGraph),
typeof(ProfileHeaderTabControl), typeof(ProfileHeaderTabControl),
typeof(BottomHeaderContainer)
}; };
[Resolved] [Resolved]

108
osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
View File

@ -20,18 +20,21 @@ namespace osu.Game.Overlays.Profile.Header
{ {
public class BottomHeaderContainer : CompositeDrawable public class BottomHeaderContainer : CompositeDrawable
{ {
private LinkFlowContainer bottomTopLinkContainer;
private LinkFlowContainer bottomLinkContainer;
private Color4 linkBlue, communityUserGrayGreenLighter;
public readonly Bindable<User> User = new Bindable<User>(); public readonly Bindable<User> User = new Bindable<User>();
private LinkFlowContainer topLinkContainer;
private LinkFlowContainer bottomLinkContainer;
private Color4 iconColour;
public BottomHeaderContainer()
{
AutoSizeAxes = Axes.Y;
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
AutoSizeAxes = Axes.Y;
User.ValueChanged += e => updateDisplay(e.NewValue);
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box new Box
@ -48,7 +51,7 @@ namespace osu.Game.Overlays.Profile.Header
Spacing = new Vector2(0, 10), Spacing = new Vector2(0, 10),
Children = new Drawable[] Children = new Drawable[]
{ {
bottomTopLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12)) topLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
@ -62,80 +65,55 @@ namespace osu.Game.Overlays.Profile.Header
} }
}; };
linkBlue = colours.BlueLight; iconColour = colours.CommunityUserGrayGreenLighter;
communityUserGrayGreenLighter = colours.CommunityUserGrayGreenLighter;
User.BindValueChanged(user => updateDisplay(user.NewValue));
} }
private void updateDisplay(User user) private void updateDisplay(User user)
{ {
void bold(SpriteText t) => t.Font = t.Font.With(weight: FontWeight.Bold); topLinkContainer.Clear();
void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });
bottomTopLinkContainer.Clear();
bottomLinkContainer.Clear(); bottomLinkContainer.Clear();
if (user == null) return; if (user == null) return;
if (user.JoinDate.ToUniversalTime().Year < 2008) if (user.JoinDate.ToUniversalTime().Year < 2008)
{ topLinkContainer.AddText("Here since the beginning");
bottomTopLinkContainer.AddText("Here since the beginning");
}
else else
{ {
bottomTopLinkContainer.AddText("Joined "); topLinkContainer.AddText("Joined ");
bottomTopLinkContainer.AddText(new DrawableDate(user.JoinDate), bold); topLinkContainer.AddText(new DrawableDate(user.JoinDate), embolden);
} }
addSpacer(bottomTopLinkContainer); addSpacer(topLinkContainer);
if (user.PlayStyles?.Length > 0) if (user.PlayStyles?.Length > 0)
{ {
bottomTopLinkContainer.AddText("Plays with "); topLinkContainer.AddText("Plays with ");
bottomTopLinkContainer.AddText(string.Join(", ", user.PlayStyles.Select(style => style.GetDescription())), bold); topLinkContainer.AddText(string.Join(", ", user.PlayStyles.Select(style => style.GetDescription())), embolden);
addSpacer(bottomTopLinkContainer); addSpacer(topLinkContainer);
} }
if (user.LastVisit.HasValue) if (user.LastVisit.HasValue)
{ {
bottomTopLinkContainer.AddText("Last seen "); topLinkContainer.AddText("Last seen ");
bottomTopLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), bold); topLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);
addSpacer(bottomTopLinkContainer); addSpacer(topLinkContainer);
} }
bottomTopLinkContainer.AddText("Contributed "); topLinkContainer.AddText("Contributed ");
bottomTopLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: bold); topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
void tryAddInfo(IconUsage icon, string content, string link = null)
{
if (string.IsNullOrEmpty(content)) return;
bottomLinkContainer.AddIcon(icon, text =>
{
text.Font = text.Font.With(size: 10);
text.Colour = communityUserGrayGreenLighter;
});
if (link != null)
{
bottomLinkContainer.AddLink(" " + content, link, creationParameters: text =>
{
bold(text);
text.Colour = linkBlue;
});
}
else
bottomLinkContainer.AddText(" " + content, bold);
addSpacer(bottomLinkContainer);
}
string websiteWithoutProtcol = user.Website; string websiteWithoutProtcol = user.Website;
if (!string.IsNullOrEmpty(websiteWithoutProtcol)) if (!string.IsNullOrEmpty(websiteWithoutProtcol))
{ {
int protocolIndex = websiteWithoutProtcol.IndexOf("//", StringComparison.Ordinal); if (Uri.TryCreate(websiteWithoutProtcol, UriKind.Absolute, out var uri))
if (protocolIndex >= 0) {
websiteWithoutProtcol = websiteWithoutProtcol.Substring(protocolIndex + 2); websiteWithoutProtcol = uri.Host + uri.PathAndQuery + uri.Fragment;
websiteWithoutProtcol = websiteWithoutProtcol.TrimEnd('/');
}
} }
tryAddInfo(FontAwesome.Solid.MapMarker, user.Location); tryAddInfo(FontAwesome.Solid.MapMarker, user.Location);
@ -149,5 +127,27 @@ namespace osu.Game.Overlays.Profile.Header
tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}"); tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtcol, user.Website); tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtcol, user.Website);
} }
private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });
private void tryAddInfo(IconUsage icon, string content, string link = null)
{
if (string.IsNullOrEmpty(content)) return;
bottomLinkContainer.AddIcon(icon, text =>
{
text.Font = text.Font.With(size: 10);
text.Colour = iconColour;
});
if (link != null)
bottomLinkContainer.AddLink(" " + content, link, creationParameters: embolden);
else
bottomLinkContainer.AddText(" " + content, embolden);
addSpacer(bottomLinkContainer);
}
private void embolden(SpriteText text) => text.Font = text.Font.With(weight: FontWeight.Bold);
} }
} }