h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-30 01:49:56 +08:00
Code Issues Releases Wiki Activity

Apply nullability to changelog display classes and adjust fix slightly

Browse Source
This commit is contained in:
Dean Herbert
2025-07-17 21:22:28 +09:00
Unverified
parent 6e9f6ffbde
commit 16a204e696
2 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Overlays/Changelog/ChangelogBuild.cs
+2 -4
View File
@@ -1,8 +1,6 @@
// 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.
#nullable disable
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@@ -18,7 +16,7 @@ namespace osu.Game.Overlays.Changelog
{
public partial class ChangelogBuild : FillFlowContainer
{
public Action<APIChangelogBuild> SelectBuild;
public required Action<APIChangelogBuild> SelectBuild { get; init; }
protected readonly APIChangelogBuild Build;
@@ -79,7 +77,7 @@ namespace osu.Game.Overlays.Changelog
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Action = () => SelectBuild?.Invoke(Build),
Action = () => SelectBuild.Invoke(Build),
Child = new FillFlowContainer<SpriteText>
{
AutoSizeAxes = Axes.Both,
osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+31 -34
View File
@@ -1,8 +1,6 @@
// 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.
#nullable disable
using System;
using System.Threading;
using osu.Framework.Allocation;
@@ -38,12 +36,12 @@ namespace osu.Game.Overlays.Changelog
{
bool complete = false;
APIChangelogBuild buildDetail = null;
APIChangelogBuild? onlineBuildDetails = null;
var req = new GetChangelogBuildRequest(build.UpdateStream.Name, build.Version);
req.Success += res =>
{
buildDetail = res;
onlineBuildDetails = res;
complete = true;
};
req.Failure += _ => complete = true;
@@ -61,36 +59,35 @@ namespace osu.Game.Overlays.Changelog
Thread.Sleep(10);
}
if (buildDetail != null)
if (onlineBuildDetails == null) return;
CommentsContainer comments;
Children = new Drawable[]
{
CommentsContainer comments;
Children = new Drawable[]
new ChangelogBuildWithNavigation(onlineBuildDetails) { SelectBuild = SelectBuild },
new Box
{
new ChangelogBuildWithNavigation(buildDetail) { SelectBuild = SelectBuild },
new Box
{
RelativeSizeAxes = Axes.X,
Height = 2,
Colour = colourProvider.Background6,
Margin = new MarginPadding { Top = 30 },
},
new ChangelogSupporterPromo
{
Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
},
new Box
{
RelativeSizeAxes = Axes.X,
Height = 2,
Colour = colourProvider.Background6,
Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
},
comments = new CommentsContainer()
};
RelativeSizeAxes = Axes.X,
Height = 2,
Colour = colourProvider.Background6,
Margin = new MarginPadding { Top = 30 },
},
new ChangelogSupporterPromo
{
Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
},
new Box
{
RelativeSizeAxes = Axes.X,
Height = 2,
Colour = colourProvider.Background6,
Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
},
comments = new CommentsContainer()
};
comments.ShowComments(CommentableType.Build, buildDetail.Id);
}
comments.ShowComments(CommentableType.Build, onlineBuildDetails.Id);
}
public partial class ChangelogBuildWithNavigation : ChangelogBuild
@@ -100,7 +97,7 @@ namespace osu.Game.Overlays.Changelog
{
}
private OsuSpriteText date;
private OsuSpriteText date = null!;
protected override FillFlowContainer CreateHeader()
{
@@ -146,9 +143,9 @@ namespace osu.Game.Overlays.Changelog
private partial class NavigationIconButton : IconButton
{
public Action<APIChangelogBuild> SelectBuild;
public required Action<APIChangelogBuild> SelectBuild { get; init; }
public NavigationIconButton(APIChangelogBuild build)
public NavigationIconButton(APIChangelogBuild? build)
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;