sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add placeholder text in profile header.

Browse Source
This commit is contained in:
Huo Yaoyuan
2017-06-13 03:31:17 +08:00
parent 755d2737d0
commit a1c3a456fb
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
osu.Game/Users/Profile/ProfileHeader.cs
View File

@ -1,11 +1,15 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
namespace osu.Game.Users.Profile namespace osu.Game.Users.Profile
@ -14,12 +18,14 @@ namespace osu.Game.Users.Profile
{ {
private readonly User user; private readonly User user;
private readonly OsuTextFlowContainer infoText;
private const float cover_height = 200, avatar_size = 110, avatar_bottom_position = -20; private const float cover_height = 200, avatar_size = 110, avatar_bottom_position = -20;
public ProfileHeader(User user) public ProfileHeader(User user)
{ {
this.user = user; this.user = user;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = cover_height; Height = cover_height + cover_height - UserProfile.TAB_HEIGHT;
Children = new Drawable[] Children = new Drawable[]
{ {
@ -84,8 +90,48 @@ namespace osu.Game.Users.Profile
} }
} }
} }
},
infoText = new OsuTextFlowContainer(t =>
{
t.TextSize = 12;
t.Alpha = 0.8f;
})
{
Y = cover_height + 20,
Margin = new MarginPadding { Horizontal = UserProfile.CONTENT_X_MARGIN },
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
ParagraphSpacing = 1,
//LineSpacing = 0.5f
} }
}; };
Action<SpriteText> bold = t =>
{
t.Font = @"Exo2.0-Bold";
t.Alpha = 1;
};
// placeholder text
infoText.AddTextAwesome(FontAwesome.fa_map_marker);
infoText.AddText(" position ");
infoText.AddTextAwesome(FontAwesome.fa_twitter);
infoText.AddText(" tweet ");
infoText.AddTextAwesome(FontAwesome.fa_heart_o);
infoText.AddText(" favorite ");
infoText.NewParagraph();
infoText.AddText("0 years old");
infoText.NewLine();
infoText.AddText("Commander of ");
infoText.AddText("The Color Scribbles", bold);
infoText.NewParagraph();
infoText.AddText("Joined since ");
infoText.AddText("June 2017", bold);
infoText.NewLine();
infoText.AddText("Last seen ");
infoText.AddText("0 minutes ago", bold);
infoText.NewParagraph();
infoText.AddText("Play with ");
infoText.AddText("Mouse, Keyboard, Tablet", bold);
} }
} }
} }

4
osu.Game/Users/UserProfile.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Users
private ProfileSection lastSection; private ProfileSection lastSection;
private readonly ProfileTabControl tabs; private readonly ProfileTabControl tabs;
public const float CONTENT_X_MARGIN = 50; public const float CONTENT_X_MARGIN = 50, TAB_HEIGHT = 24;
public UserProfile(User user) public UserProfile(User user)
{ {
@ -42,7 +42,7 @@ namespace osu.Game.Users
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Height = 24 Height = TAB_HEIGHT
}; };
sections.ForEach(tabs.AddItem); sections.ForEach(tabs.AddItem);