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

Pagination -> `PaginationParameters

Browse Source
This commit is contained in:
Salman Ahmed 2022-04-19 02:48:34 +03:00
parent 96d4369cc8
commit c858ec2483
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Online.API.Requests
private readonly BeatmapSetType type; private readonly BeatmapSetType type;
public GetUserBeatmapsRequest(long userId, BeatmapSetType type, Pagination pagination) public GetUserBeatmapsRequest(long userId, BeatmapSetType type, PaginationParameters pagination)
: base(pagination) : base(pagination)
{ {
this.userId = userId; this.userId = userId;

2
osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Online.API.Requests
{ {
private readonly long userId; private readonly long userId;
public GetUserKudosuHistoryRequest(long userId, Pagination pagination) public GetUserKudosuHistoryRequest(long userId, PaginationParameters pagination)
: base(pagination) : base(pagination)
{ {
this.userId = userId; this.userId = userId;

2
osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Online.API.Requests
{ {
private readonly long userId; private readonly long userId;
public GetUserMostPlayedBeatmapsRequest(long userId, Pagination pagination) public GetUserMostPlayedBeatmapsRequest(long userId, PaginationParameters pagination)
: base(pagination) : base(pagination)
{ {
this.userId = userId; this.userId = userId;

2
osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Online.API.Requests
{ {
private readonly long userId; private readonly long userId;
public GetUserRecentActivitiesRequest(long userId, Pagination pagination) public GetUserRecentActivitiesRequest(long userId, PaginationParameters pagination)
: base(pagination) : base(pagination)
{ {
this.userId = userId; this.userId = userId;

2
osu.Game/Online/API/Requests/GetUserScoresRequest.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Online.API.Requests
private readonly ScoreType type; private readonly ScoreType type;
private readonly RulesetInfo ruleset; private readonly RulesetInfo ruleset;
public GetUserScoresRequest(long userId, ScoreType type, Pagination pagination, RulesetInfo ruleset = null) public GetUserScoresRequest(long userId, ScoreType type, PaginationParameters pagination, RulesetInfo ruleset = null)
: base(pagination) : base(pagination)
{ {
this.userId = userId; this.userId = userId;

4
osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
View File

@ -8,9 +8,9 @@ namespace osu.Game.Online.API.Requests
{ {
public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
{ {
private readonly Pagination pagination; private readonly PaginationParameters pagination;
protected PaginatedAPIRequest(Pagination pagination) protected PaginatedAPIRequest(PaginationParameters pagination)
{ {
this.pagination = pagination; this.pagination = pagination;
} }

10
osu.Game/Online/API/Requests/Pagination.cs → osu.Game/Online/API/Requests/PaginationParameters.cs
View File

@ -6,7 +6,7 @@ namespace osu.Game.Online.API.Requests
/// <summary> /// <summary>
/// Represents a pagination data used for <see cref="PaginatedAPIRequest{T}"/>. /// Represents a pagination data used for <see cref="PaginatedAPIRequest{T}"/>.
/// </summary> /// </summary>
public readonly struct Pagination public readonly struct PaginationParameters
{ {
/// <summary> /// <summary>
/// The starting point of the request. /// The starting point of the request.
@ -18,21 +18,21 @@ namespace osu.Game.Online.API.Requests
/// </summary> /// </summary>
public int Limit { get; } public int Limit { get; }
public Pagination(int offset, int limit) public PaginationParameters(int offset, int limit)
{ {
Offset = offset; Offset = offset;
Limit = limit; Limit = limit;
} }
public Pagination(int limit) public PaginationParameters(int limit)
: this(0, limit) : this(0, limit)
{ {
} }
/// <summary> /// <summary>
/// Returns a <see cref="Pagination"/> of the next number of items defined by <paramref name="limit"/> after this. /// Returns a <see cref="PaginationParameters"/> of the next number of items defined by <paramref name="limit"/> after this.
/// </summary> /// </summary>
/// <param name="limit">The limit of the next pagination.</param> /// <param name="limit">The limit of the next pagination.</param>
public Pagination TakeNext(int limit) => new Pagination(Offset + Limit, limit); public PaginationParameters TakeNext(int limit) => new PaginationParameters(Offset + Limit, limit);
} }
} }

2
osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
} }
} }
protected override APIRequest<List<APIBeatmapSet>> CreateRequest(Pagination pagination) => protected override APIRequest<List<APIBeatmapSet>> CreateRequest(PaginationParameters pagination) =>
new GetUserBeatmapsRequest(User.Value.Id, type, pagination); new GetUserBeatmapsRequest(User.Value.Id, type, pagination);
protected override Drawable CreateDrawableItem(APIBeatmapSet model) => model.OnlineID > 0 protected override Drawable CreateDrawableItem(APIBeatmapSet model) => model.OnlineID > 0

2
osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
protected override int GetCount(APIUser user) => user.BeatmapPlayCountsCount; protected override int GetCount(APIUser user) => user.BeatmapPlayCountsCount;
protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(Pagination pagination) => protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(PaginationParameters pagination) =>
new GetUserMostPlayedBeatmapsRequest(User.Value.Id, pagination); new GetUserMostPlayedBeatmapsRequest(User.Value.Id, pagination);
protected override Drawable CreateDrawableItem(APIUserMostPlayedBeatmap mostPlayed) => protected override Drawable CreateDrawableItem(APIUserMostPlayedBeatmap mostPlayed) =>

2
osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
{ {
} }
protected override APIRequest<List<APIKudosuHistory>> CreateRequest(Pagination pagination) protected override APIRequest<List<APIKudosuHistory>> CreateRequest(PaginationParameters pagination)
=> new GetUserKudosuHistoryRequest(User.Value.Id, pagination); => new GetUserKudosuHistoryRequest(User.Value.Id, pagination);
protected override Drawable CreateDrawableItem(APIKudosuHistory item) => new DrawableKudosuHistoryItem(item); protected override Drawable CreateDrawableItem(APIKudosuHistory item) => new DrawableKudosuHistoryItem(item);

6
osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IAPIProvider api { get; set; }
protected Pagination? CurrentPage { get; private set; } protected PaginationParameters? CurrentPage { get; private set; }
protected ReverseChildIDFillFlowContainer<Drawable> ItemsContainer { get; private set; } protected ReverseChildIDFillFlowContainer<Drawable> ItemsContainer { get; private set; }
@ -111,7 +111,7 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
loadCancellation = new CancellationTokenSource(); loadCancellation = new CancellationTokenSource();
CurrentPage = CurrentPage?.TakeNext(ItemsPerPage) ?? new Pagination(InitialItemsCount); CurrentPage = CurrentPage?.TakeNext(ItemsPerPage) ?? new PaginationParameters(InitialItemsCount);
retrievalRequest = CreateRequest(CurrentPage.Value); retrievalRequest = CreateRequest(CurrentPage.Value);
retrievalRequest.Success += UpdateItems; retrievalRequest.Success += UpdateItems;
@ -151,7 +151,7 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
} }
protected abstract APIRequest<List<TModel>> CreateRequest(Pagination pagination); protected abstract APIRequest<List<TModel>> CreateRequest(PaginationParameters pagination);
protected abstract Drawable CreateDrawableItem(TModel model); protected abstract Drawable CreateDrawableItem(TModel model);

2
osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
base.OnItemsReceived(items); base.OnItemsReceived(items);
} }
protected override APIRequest<List<APIScore>> CreateRequest(Pagination pagination) => protected override APIRequest<List<APIScore>> CreateRequest(PaginationParameters pagination) =>
new GetUserScoresRequest(User.Value.Id, type, pagination); new GetUserScoresRequest(User.Value.Id, type, pagination);
private int drawableItemIndex; private int drawableItemIndex;

2
osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
ItemsContainer.Spacing = new Vector2(0, 8); ItemsContainer.Spacing = new Vector2(0, 8);
} }
protected override APIRequest<List<APIRecentActivity>> CreateRequest(Pagination pagination) => protected override APIRequest<List<APIRecentActivity>> CreateRequest(PaginationParameters pagination) =>
new GetUserRecentActivitiesRequest(User.Value.Id, pagination); new GetUserRecentActivitiesRequest(User.Value.Id, pagination);
protected override Drawable CreateDrawableItem(APIRecentActivity model) => new DrawableRecentActivity(model); protected override Drawable CreateDrawableItem(APIRecentActivity model) => new DrawableRecentActivity(model);