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

Initial pass of schedule screen design update

Browse Source
This commit is contained in:
Dean Herbert 2020-03-06 16:09:07 +09:00
parent 1c5d6e0cf4
commit 059aea8ead
1 changed files with 95 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Linq; using System.Linq;
using Humanizer;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -18,7 +19,7 @@ using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Schedule namespace osu.Game.Tournament.Screens.Schedule
{ {
public class ScheduleScreen : TournamentScreen public class ScheduleScreen : TournamentScreen // IProvidesVideo
{ {
private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>(); private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
private Container mainContainer; private Container mainContainer;
@ -38,10 +39,63 @@ namespace osu.Game.Tournament.Screens.Schedule
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Loop = true, Loop = true,
}, },
mainContainer = new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
} Padding = new MarginPadding(100) { Bottom = 50 },
Children = new Drawable[]
{
new GridContainer
{
RelativeSizeAxes = Axes.Both,
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(),
},
Content = new[]
{
new Drawable[]
{
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new DrawableTournamentTitleText(),
new Container
{
Margin = new MarginPadding { Top = 40 },
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
new Box
{
Colour = Color4.White,
Size = new Vector2(50, 10),
},
new TournamentSpriteTextWithBackground("Schedule")
{
X = 60,
Scale = new Vector2(0.8f)
}
}
},
}
},
},
new Drawable[]
{
mainContainer = new Container
{
RelativeSizeAxes = Axes.Both,
}
}
}
}
}
},
}; };
currentMatch.BindValueChanged(matchChanged); currentMatch.BindValueChanged(matchChanged);
@ -91,7 +145,7 @@ namespace osu.Game.Tournament.Screens.Schedule
.Take(8) .Take(8)
.Select(p => new ScheduleMatch(p)) .Select(p => new ScheduleMatch(p))
}, },
new ScheduleContainer("match overview") new ScheduleContainer("upcoming matches")
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Width = 0.6f, Width = 0.6f,
@ -100,26 +154,45 @@ namespace osu.Game.Tournament.Screens.Schedule
} }
} }
}, },
new ScheduleContainer("current match") new ScheduleContainer("coming up next")
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Height = 0.25f, Height = 0.25f,
Children = new Drawable[] Children = new Drawable[]
{ {
new TournamentSpriteText new FillFlowContainer
{ {
Margin = new MarginPadding { Left = -10, Bottom = 10, Top = -5 }, RelativeSizeAxes = Axes.Both,
Spacing = new Vector2(10, 0), Direction = FillDirection.Horizontal,
Text = match.NewValue.Round.Value?.Name.Value, Spacing = new Vector2(30),
Colour = Color4.Black, Children = new Drawable[]
Font = OsuFont.Torus.With(size: 20) {
}, new ScheduleMatch(match.NewValue, false)
new ScheduleMatch(match.NewValue, false), {
new TournamentSpriteText Anchor = Anchor.CentreLeft,
{ Origin = Anchor.CentreLeft,
Text = "Start Time " + match.NewValue.Date.Value.ToUniversalTime().ToString("HH:mm UTC"), },
Colour = Color4.Black, new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value)
Font = OsuFont.Torus.With(size: 20) {
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Scale = new Vector2(0.5f)
},
new TournamentSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
},
new TournamentSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Text = $"Starting {match.NewValue.Date.Value.Humanize()}",
Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
},
}
}, },
} }
} }
@ -170,29 +243,20 @@ namespace osu.Game.Tournament.Screens.Schedule
public ScheduleContainer(string title) public ScheduleContainer(string title)
{ {
Padding = new MarginPadding { Left = 30, Top = 30 }; Padding = new MarginPadding { Left = 30, Top = 10 };
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new TournamentSpriteText new TournamentSpriteTextWithBackground(title.ToUpperInvariant())
{ {
X = 30, X = 30,
Text = title, Scale = new Vector2(0.5f)
Colour = Color4.Black,
Spacing = new Vector2(10, 0),
Font = OsuFont.Torus.With(size: 30)
}, },
content = new FillFlowContainer content = new FillFlowContainer
{ {
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Margin = new MarginPadding(40) Margin = new MarginPadding(10)
}, },
new Circle
{
Colour = new Color4(233, 187, 79, 255),
Width = 5,
RelativeSizeAxes = Axes.Y,
}
}; };
} }
} }