h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:07:52 +08:00
Code Issues Releases Wiki Activity

Refactor ArticleListing

Browse Source
This commit is contained in:
Andrei Zavatski 2021-05-26 15:35:38 +03:00
parent 82d977f80a
commit 1bde11a07e
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
osu.Game/Overlays/News/Displays/ArticleListing.cs
View File

@ -2,13 +2,16 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Threading;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osuTK;
namespace osu.Game.Overlays.News.Displays
@ -20,20 +23,12 @@ namespace osu.Game.Overlays.News.Displays
{
public Action RequestMorePosts;
private readonly BindableList<APINewsPost> posts = new BindableList<APINewsPost>();
private bool showMoreButtonIsVisible;
private FillFlowContainer content;
private ShowMoreButton showMore;
private readonly GetNewsResponse initialResponse;
/// <summary>
/// Instantiate a listing for the specified year.
/// </summary>
/// <param name="initialResponse">Initial response to create articles from.</param>
public ArticleListing(GetNewsResponse initialResponse)
{
this.initialResponse = initialResponse;
}
[BackgroundDependencyLoader]
private void load()
{
@ -45,7 +40,6 @@ namespace osu.Game.Overlays.News.Displays
Left = 30,
Right = 50
};
InternalChild = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
@ -61,8 +55,7 @@ namespace osu.Game.Overlays.News.Displays
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 10),
Children = initialResponse.NewsPosts.Select(p => new NewsCard(p)).ToList()
Spacing = new Vector2(0, 10)
},
showMore = new ShowMoreButton
{
@ -73,24 +66,45 @@ namespace osu.Game.Overlays.News.Displays
Top = 15
},
Action = RequestMorePosts,
Alpha = initialResponse.Cursor != null ? 1 : 0
Alpha = 0
}
}
};
}
protected override void LoadComplete()
{
base.LoadComplete();
posts.BindCollectionChanged((sender, args) =>
{
switch (args.Action)
{
case NotifyCollectionChangedAction.Add:
addPosts(args.NewItems.Cast<APINewsPost>());
break;
default:
throw new NotSupportedException(@"You can only add items to this list. Other actions are not supported.");
}
}, true);
}
public void AddPosts(IEnumerable<APINewsPost> posts, bool showMoreButtonIsVisible)
{
this.showMoreButtonIsVisible = showMoreButtonIsVisible;
this.posts.AddRange(posts);
}
private CancellationTokenSource cancellationToken;
public void AddPosts(GetNewsResponse response)
private void addPosts(IEnumerable<APINewsPost> posts)
{
cancellationToken?.Cancel();
LoadComponentsAsync(response.NewsPosts.Select(p => new NewsCard(p)).ToList(), loaded =>
LoadComponentsAsync(posts.Select(p => new NewsCard(p)).ToList(), loaded =>
{
content.AddRange(loaded);
showMore.IsLoading = false;
showMore.Alpha = response.Cursor != null ? 1 : 0;
showMore.Alpha = showMoreButtonIsVisible ? 1 : 0;
}, (cancellationToken = new CancellationTokenSource()).Token);
}

9
osu.Game/Overlays/NewsOverlay.cs
View File

@ -152,10 +152,9 @@ namespace osu.Game.Overlays
lastCursor = response.Cursor;
sidebar.Metadata.Value = response.SidebarMetadata;
LoadDisplay(new ArticleListing(response)
{
RequestMorePosts = getMorePosts
});
var listing = new ArticleListing { RequestMorePosts = getMorePosts };
listing.AddPosts(response.NewsPosts, response.Cursor != null);
LoadDisplay(listing);
});
API.PerformAsync(request);
@ -170,7 +169,7 @@ namespace osu.Game.Overlays
{
lastCursor = response.Cursor;
if (content.Child is ArticleListing listing)
listing.AddPosts(response);
listing.AddPosts(response.NewsPosts, response.Cursor != null);
});
API.PerformAsync(request);