1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 16:32:54 +08:00

Move code around

This commit is contained in:
Dean Herbert 2021-05-26 14:29:46 +09:00
parent 8ffa7f4a5a
commit 0f21510b8b

View File

@ -74,7 +74,13 @@ namespace osu.Game.Overlays
base.LoadComplete();
// should not be run until first pop-in to avoid requesting data before user views.
article.BindValueChanged(onArticleChanged);
article.BindValueChanged(a =>
{
if (a.NewValue == null)
loadListing();
else
loadArticle(a.NewValue);
});
}
protected override NewsHeader CreateHeader() => new NewsHeader { ShowFrontPage = ShowFrontPage };
@ -131,14 +137,6 @@ namespace osu.Game.Overlays
sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
}
private void onArticleChanged(ValueChangedEvent<string> article)
{
if (article.NewValue == null)
loadListing();
else
loadArticle(article.NewValue);
}
private void loadListing(int? year = null)
{
beginLoading();
@ -159,16 +157,6 @@ namespace osu.Game.Overlays
});
}
private void getMorePosts()
{
lastRequest?.Cancel();
performListingRequest(response =>
{
if (content.Child is ArticleListing listing)
listing.AddPosts(response);
});
}
private void loadArticle(string article)
{
beginLoading();
@ -179,6 +167,16 @@ namespace osu.Game.Overlays
LoadDisplay(Empty());
}
private void getMorePosts()
{
lastRequest?.Cancel();
performListingRequest(response =>
{
if (content.Child is ArticleListing listing)
listing.AddPosts(response);
});
}
private void performListingRequest(Action<GetNewsResponse> onSuccess)
{
lastRequest = new GetNewsRequest(displayedYear, lastCursor);