sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-25 21:27:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move all the logic to it's own namespace

Browse Source
This commit is contained in:
Andrei Zavatski 2019-10-08 14:51:12 +03:00
parent 801b5b474e
commit 1c89841949
3 changed files with 116 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
View File

@ -4,10 +4,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Game.Overlays;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Overlays.Comments;
namespace osu.Game.Tests.Visual.Online namespace osu.Game.Tests.Visual.Online
{ {

45
osu.Game/Overlays/CommentsContainer.cs → osu.Game/Overlays/Comments/CommentsContainer.cs
View File

@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
using osuTK; using osuTK;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Overlays namespace osu.Game.Overlays.Comments
{ {
public class CommentsContainer : CompositeDrawable public class CommentsContainer : CompositeDrawable
{ {
@ -90,47 +90,12 @@ namespace osu.Game.Overlays
foreach (var c in response.Comments) foreach (var c in response.Comments)
{ {
if (!c.IsDeleted) if (!c.IsDeleted && c.IsTopLevel)
createDrawableComment(c); content.AddRange(new Drawable[]
}
}
private void createDrawableComment(Comment comment)
{ {
content.Add(new Container new DrawableComment(c),
{
RelativeSizeAxes = Axes.X,
Height = 70,
Children = new Drawable[]
{
new FillFlowContainer
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 3),
Children = new[]
{
new SpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Text = $"user: {comment.User.Username}",
},
new SpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Text = $"message: {comment.GetMessage()}",
},
}
},
new Container new Container
{ {
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 1, Height = 1,
Child = new Box Child = new Box
@ -139,9 +104,9 @@ namespace osu.Game.Overlays
Colour = colours.Gray1, Colour = colours.Gray1,
} }
} }
}
}); });
} }
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()

99
osu.Game/Overlays/Comments/DrawableComment.cs Normal file
View File

@ -0,0 +1,99 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
using osuTK;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Users.Drawables;
using osu.Game.Graphics.Containers;
using osu.Game.Utils;
namespace osu.Game.Overlays.Comments
{
public class DrawableComment : CompositeDrawable
{
private const int avatar_size = 40;
private const int margin = 10;
public DrawableComment(Comment comment)
{
LinkFlowContainer username;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
InternalChild = new GridContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding(margin),
ColumnDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(),
},
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.AutoSize)
},
Content = new[]
{
new Drawable[]
{
new UpdateableAvatar(comment.User)
{
Size = new Vector2(avatar_size),
Margin = new MarginPadding { Horizontal = margin },
Masking = true,
CornerRadius = avatar_size / 2,
},
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Spacing = new Vector2(0, 2),
Children = new Drawable[]
{
username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true))
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
},
new TextFlowContainer(s => s.Font = OsuFont.GetFont(size: 18))
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Text = comment.GetMessage()
}
}
}
},
new Drawable[]
{
new Container
{
RelativeSizeAxes = Axes.Both,
},
new SpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: 12),
Text = HumanizerUtils.Humanize(comment.CreatedAt)
}
}
}
};
username.AddUserLink(comment.User);
}
}
}