sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename UserProfile{ -> Data}

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-01-09 17:37:28 +01:00
parent 4dd7727f71
commit fdf0d4bd62
No known key found for this signature in database
30 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
View File

@ -38,8 +38,8 @@ namespace osu.Game.Tests.Visual.Online
Child = section = new HistoricalSection(), Child = section = new HistoricalSection(),
}); });
AddStep("Show peppy", () => section.UserProfile.Value = new UserProfile(new APIUser { Id = 2 })); AddStep("Show peppy", () => section.UserProfile.Value = new UserProfileData(new APIUser { Id = 2 }));
AddStep("Show WubWoofWolf", () => section.UserProfile.Value = new UserProfile(new APIUser { Id = 39828 })); AddStep("Show WubWoofWolf", () => section.UserProfile.Value = new UserProfileData(new APIUser { Id = 39828 }));
} }
} }
} }

18
osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
[Cached] [Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red); private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
private readonly Bindable<UserProfile?> user = new Bindable<UserProfile?>(); private readonly Bindable<UserProfileData?> user = new Bindable<UserProfileData?>();
private readonly PlayHistorySubsection section; private readonly PlayHistorySubsection section;
public TestScenePlayHistorySubsection() public TestScenePlayHistorySubsection()
@ -44,49 +44,49 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestNullValues() public void TestNullValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_null_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_null_values));
AddAssert("Section is hidden", () => section.Alpha == 0); AddAssert("Section is hidden", () => section.Alpha == 0);
} }
[Test] [Test]
public void TestEmptyValues() public void TestEmptyValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_empty_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_empty_values));
AddAssert("Section is hidden", () => section.Alpha == 0); AddAssert("Section is hidden", () => section.Alpha == 0);
} }
[Test] [Test]
public void TestOneValue() public void TestOneValue()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_one_value)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_one_value));
AddAssert("Section is hidden", () => section.Alpha == 0); AddAssert("Section is hidden", () => section.Alpha == 0);
} }
[Test] [Test]
public void TestTwoValues() public void TestTwoValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_two_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_two_values));
AddAssert("Section is visible", () => section.Alpha == 1); AddAssert("Section is visible", () => section.Alpha == 1);
} }
[Test] [Test]
public void TestConstantValues() public void TestConstantValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_constant_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_constant_values));
AddAssert("Section is visible", () => section.Alpha == 1); AddAssert("Section is visible", () => section.Alpha == 1);
} }
[Test] [Test]
public void TestConstantZeroValues() public void TestConstantZeroValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_zero_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_zero_values));
AddAssert("Section is visible", () => section.Alpha == 1); AddAssert("Section is visible", () => section.Alpha == 1);
} }
[Test] [Test]
public void TestFilledValues() public void TestFilledValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_filled_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_filled_values));
AddAssert("Section is visible", () => section.Alpha == 1); AddAssert("Section is visible", () => section.Alpha == 1);
AddAssert("Array length is the same", () => user_with_filled_values.MonthlyPlayCounts.Length == getChartValuesLength()); AddAssert("Array length is the same", () => user_with_filled_values.MonthlyPlayCounts.Length == getChartValuesLength());
} }
@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestMissingValues() public void TestMissingValues()
{ {
AddStep("Load user", () => user.Value = new UserProfile(user_with_missing_values)); AddStep("Load user", () => user.Value = new UserProfileData(user_with_missing_values));
AddAssert("Section is visible", () => section.Alpha == 1); AddAssert("Section is visible", () => section.Alpha == 1);
AddAssert("Array length is 7", () => getChartValuesLength() == 7); AddAssert("Array length is 7", () => getChartValuesLength() == 7);
} }

10
osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
View File

@ -29,13 +29,13 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestBasic() public void TestBasic()
{ {
AddStep("Show example user", () => header.UserProfile.Value = new UserProfile(TestSceneUserProfileOverlay.TEST_USER)); AddStep("Show example user", () => header.UserProfile.Value = new UserProfileData(TestSceneUserProfileOverlay.TEST_USER));
} }
[Test] [Test]
public void TestOnlineState() public void TestOnlineState()
{ {
AddStep("Show online user", () => header.UserProfile.Value = new UserProfile(new APIUser AddStep("Show online user", () => header.UserProfile.Value = new UserProfileData(new APIUser
{ {
Id = 1001, Id = 1001,
Username = "IAmOnline", Username = "IAmOnline",
@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Online
IsOnline = true, IsOnline = true,
})); }));
AddStep("Show offline user", () => header.UserProfile.Value = new UserProfile(new APIUser AddStep("Show offline user", () => header.UserProfile.Value = new UserProfileData(new APIUser
{ {
Id = 1002, Id = 1002,
Username = "IAmOffline", Username = "IAmOffline",
@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestRankedState() public void TestRankedState()
{ {
AddStep("Show ranked user", () => header.UserProfile.Value = new UserProfile(new APIUser AddStep("Show ranked user", () => header.UserProfile.Value = new UserProfileData(new APIUser
{ {
Id = 2001, Id = 2001,
Username = "RankedUser", Username = "RankedUser",
@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual.Online
} }
})); }));
AddStep("Show unranked user", () => header.UserProfile.Value = new UserProfile(new APIUser AddStep("Show unranked user", () => header.UserProfile.Value = new UserProfileData(new APIUser
{ {
Id = 2002, Id = 2002,
Username = "UnrankedUser", Username = "UnrankedUser",

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

@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Online
} }
}); });
AddStep("Show cookiezi", () => ranks.UserProfile.Value = new UserProfile(new APIUser { Id = 124493 })); AddStep("Show cookiezi", () => ranks.UserProfile.Value = new UserProfileData(new APIUser { Id = 124493 }));
} }
} }
} }

2
osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
public partial class BottomHeaderContainer : CompositeDrawable public partial class BottomHeaderContainer : CompositeDrawable
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
private LinkFlowContainer topLinkContainer = null!; private LinkFlowContainer topLinkContainer = null!;
private LinkFlowContainer bottomLinkContainer = null!; private LinkFlowContainer bottomLinkContainer = null!;

2
osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Header
public partial class CentreHeaderContainer : CompositeDrawable public partial class CentreHeaderContainer : CompositeDrawable
{ {
public readonly BindableBool DetailsVisible = new BindableBool(true); public readonly BindableBool DetailsVisible = new BindableBool(true);
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
private OverlinedInfoContainer hiddenDetailGlobal = null!; private OverlinedInfoContainer hiddenDetailGlobal = null!;
private OverlinedInfoContainer hiddenDetailCountry = null!; private OverlinedInfoContainer hiddenDetailCountry = null!;

2
osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class FollowersButton : ProfileHeaderStatisticsButton public partial class FollowersButton : ProfileHeaderStatisticsButton
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
public override LocalisableString TooltipText => FriendsStrings.ButtonsDisabled; public override LocalisableString TooltipText => FriendsStrings.ButtonsDisabled;

2
osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class LevelBadge : CompositeDrawable, IHasTooltip public partial class LevelBadge : CompositeDrawable, IHasTooltip
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
public LocalisableString TooltipText { get; private set; } public LocalisableString TooltipText { get; private set; }

2
osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class LevelProgressBar : CompositeDrawable, IHasTooltip public partial class LevelProgressBar : CompositeDrawable, IHasTooltip
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
public LocalisableString TooltipText { get; } public LocalisableString TooltipText { get; }

2
osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class MappingSubscribersButton : ProfileHeaderStatisticsButton public partial class MappingSubscribersButton : ProfileHeaderStatisticsButton
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
public override LocalisableString TooltipText => FollowsStrings.MappingFollowers; public override LocalisableString TooltipText => FollowsStrings.MappingFollowers;

2
osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class MessageUserButton : ProfileHeaderButton public partial class MessageUserButton : ProfileHeaderButton
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
public override LocalisableString TooltipText => UsersStrings.CardSendMessage; public override LocalisableString TooltipText => UsersStrings.CardSendMessage;

4
osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class OverlinedTotalPlayTime : CompositeDrawable, IHasTooltip public partial class OverlinedTotalPlayTime : CompositeDrawable, IHasTooltip
{ {
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
public LocalisableString TooltipText { get; set; } public LocalisableString TooltipText { get; set; }
@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
UserProfile.BindValueChanged(updateTime, true); UserProfile.BindValueChanged(updateTime, true);
} }
private void updateTime(ValueChangedEvent<UserProfile?> userProfile) private void updateTime(ValueChangedEvent<UserProfileData?> userProfile)
{ {
int? playTime = userProfile.NewValue?.User.Statistics?.PlayTime; int? playTime = userProfile.NewValue?.User.Statistics?.PlayTime;
TooltipText = (playTime ?? 0) / 3600 + " hours"; TooltipText = (playTime ?? 0) / 3600 + " hours";

4
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Header
private FillFlowContainer? fillFlow; private FillFlowContainer? fillFlow;
private RankGraph rankGraph = null!; private RankGraph rankGraph = null!;
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
private bool expanded = true; private bool expanded = true;
@ -170,7 +170,7 @@ namespace osu.Game.Overlays.Profile.Header
}; };
} }
private void updateDisplay(UserProfile? userProfile) private void updateDisplay(UserProfileData? userProfile)
{ {
var user = userProfile?.User; var user = userProfile?.User;

2
osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
private FillFlowContainer badgeFlowContainer = null!; private FillFlowContainer badgeFlowContainer = null!;
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)

4
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
private const float avatar_size = 110; private const float avatar_size = 110;
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
[Resolved] [Resolved]
private IAPIProvider api { get; set; } = null!; private IAPIProvider api { get; set; } = null!;
@ -173,7 +173,7 @@ namespace osu.Game.Overlays.Profile.Header
UserProfile.BindValueChanged(user => updateUser(user.NewValue)); UserProfile.BindValueChanged(user => updateUser(user.NewValue));
} }
private void updateUser(UserProfile? userProfile) private void updateUser(UserProfileData? userProfile)
{ {
var user = userProfile?.User; var user = userProfile?.User;

4
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile
{ {
private UserCoverBackground coverContainer = null!; private UserCoverBackground coverContainer = null!;
public Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
private CentreHeaderContainer centreHeaderContainer; private CentreHeaderContainer centreHeaderContainer;
private DetailHeaderContainer detailHeaderContainer; private DetailHeaderContainer detailHeaderContainer;
@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Profile
protected override OverlayTitle CreateTitle() => new ProfileHeaderTitle(); protected override OverlayTitle CreateTitle() => new ProfileHeaderTitle();
private void updateDisplay(UserProfile? userProfile) => coverContainer.User = userProfile?.User; private void updateDisplay(UserProfileData? userProfile) => coverContainer.User = userProfile?.User;
private partial class ProfileHeaderTitle : OverlayTitle private partial class ProfileHeaderTitle : OverlayTitle
{ {

2
osu.Game/Overlays/Profile/ProfileSection.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Profile
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
protected ProfileSection() protected ProfileSection()
{ {

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

@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
protected override int InitialItemsCount => type == BeatmapSetType.Graveyard ? 2 : 6; protected override int InitialItemsCount => type == BeatmapSetType.Graveyard ? 2 : 6;
public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<UserProfile?> user, LocalisableString headerText) public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<UserProfileData?> user, LocalisableString headerText)
: base(user, headerText) : base(user, headerText)
{ {
this.type = type; this.type = type;

4
osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
/// </summary> /// </summary>
protected abstract LocalisableString GraphCounterName { get; } protected abstract LocalisableString GraphCounterName { get; }
protected ChartProfileSubsection(Bindable<UserProfile?> userProfile, LocalisableString headerText) protected ChartProfileSubsection(Bindable<UserProfileData?> userProfile, LocalisableString headerText)
: base(userProfile, headerText) : base(userProfile, headerText)
{ {
} }
@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
UserProfile.BindValueChanged(onUserChanged, true); UserProfile.BindValueChanged(onUserChanged, true);
} }
private void onUserChanged(ValueChangedEvent<UserProfile?> e) private void onUserChanged(ValueChangedEvent<UserProfileData?> e)
{ {
var values = GetValues(e.NewValue?.User); var values = GetValues(e.NewValue?.User);

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

@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
public partial class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap> public partial class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap>
{ {
public PaginatedMostPlayedBeatmapContainer(Bindable<UserProfile?> userProfile) public PaginatedMostPlayedBeatmapContainer(Bindable<UserProfileData?> userProfile)
: base(userProfile, UsersStrings.ShowExtraHistoricalMostPlayedTitle) : base(userProfile, UsersStrings.ShowExtraHistoricalMostPlayedTitle)
{ {
} }

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

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalMonthlyPlaycountsCountLabel; protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalMonthlyPlaycountsCountLabel;
public PlayHistorySubsection(Bindable<UserProfile?> userProfile) public PlayHistorySubsection(Bindable<UserProfileData?> userProfile)
: base(userProfile, UsersStrings.ShowExtraHistoricalMonthlyPlaycountsTitle) : base(userProfile, UsersStrings.ShowExtraHistoricalMonthlyPlaycountsTitle)
{ {
} }

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

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
{ {
protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalReplaysWatchedCountsCountLabel; protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalReplaysWatchedCountsCountLabel;
public ReplaysSubsection(Bindable<UserProfile?> userProfile) public ReplaysSubsection(Bindable<UserProfileData?> userProfile)
: base(userProfile, UsersStrings.ShowExtraHistoricalReplaysWatchedCountsTitle) : base(userProfile, UsersStrings.ShowExtraHistoricalReplaysWatchedCountsTitle)
{ {
} }

4
osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
View File

@ -19,9 +19,9 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
{ {
public partial class KudosuInfo : Container public partial class KudosuInfo : Container
{ {
private readonly Bindable<UserProfile?> userProfile = new Bindable<UserProfile?>(); private readonly Bindable<UserProfileData?> userProfile = new Bindable<UserProfileData?>();
public KudosuInfo(Bindable<UserProfile?> userProfile) public KudosuInfo(Bindable<UserProfileData?> userProfile)
{ {
this.userProfile.BindTo(userProfile); this.userProfile.BindTo(userProfile);
CountSection total; CountSection total;

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

@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
{ {
public partial class PaginatedKudosuHistoryContainer : PaginatedProfileSubsection<APIKudosuHistory> public partial class PaginatedKudosuHistoryContainer : PaginatedProfileSubsection<APIKudosuHistory>
{ {
public PaginatedKudosuHistoryContainer(Bindable<UserProfile?> userProfile) public PaginatedKudosuHistoryContainer(Bindable<UserProfileData?> userProfile)
: base(userProfile, missingText: UsersStrings.ShowExtraKudosuEntryEmpty) : base(userProfile, missingText: UsersStrings.ShowExtraKudosuEntryEmpty)
{ {
} }

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

@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Profile.Sections
private OsuSpriteText missing = null!; private OsuSpriteText missing = null!;
private readonly LocalisableString? missingText; private readonly LocalisableString? missingText;
protected PaginatedProfileSubsection(Bindable<UserProfile?> userProfile, LocalisableString? headerText = null, LocalisableString? missingText = null) protected PaginatedProfileSubsection(Bindable<UserProfileData?> userProfile, LocalisableString? headerText = null, LocalisableString? missingText = null)
: base(userProfile, headerText, CounterVisibilityState.AlwaysVisible) : base(userProfile, headerText, CounterVisibilityState.AlwaysVisible)
{ {
this.missingText = missingText; this.missingText = missingText;
@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Profile.Sections
UserProfile.BindValueChanged(onUserChanged, true); UserProfile.BindValueChanged(onUserChanged, true);
} }
private void onUserChanged(ValueChangedEvent<UserProfile?> e) private void onUserChanged(ValueChangedEvent<UserProfileData?> e)
{ {
loadCancellation?.Cancel(); loadCancellation?.Cancel();
retrievalRequest?.Cancel(); retrievalRequest?.Cancel();

4
osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
View File

@ -11,14 +11,14 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
public abstract partial class ProfileSubsection : FillFlowContainer public abstract partial class ProfileSubsection : FillFlowContainer
{ {
protected readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>(); protected readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
private readonly LocalisableString headerText; private readonly LocalisableString headerText;
private readonly CounterVisibilityState counterVisibilityState; private readonly CounterVisibilityState counterVisibilityState;
private ProfileSubsectionHeader header = null!; private ProfileSubsectionHeader header = null!;
protected ProfileSubsection(Bindable<UserProfile?> userProfile, LocalisableString? headerText = null, CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden) protected ProfileSubsection(Bindable<UserProfileData?> userProfile, LocalisableString? headerText = null, CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
{ {
this.headerText = headerText ?? string.Empty; this.headerText = headerText ?? string.Empty;
this.counterVisibilityState = counterVisibilityState; this.counterVisibilityState = counterVisibilityState;

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

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{ {
private readonly ScoreType type; private readonly ScoreType type;
public PaginatedScoreContainer(ScoreType type, Bindable<UserProfile?> userProfile, LocalisableString headerText) public PaginatedScoreContainer(ScoreType type, Bindable<UserProfileData?> userProfile, LocalisableString headerText)
: base(userProfile, headerText) : base(userProfile, headerText)
{ {
this.type = type; this.type = type;

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

@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
{ {
public partial class PaginatedRecentActivityContainer : PaginatedProfileSubsection<APIRecentActivity> public partial class PaginatedRecentActivityContainer : PaginatedProfileSubsection<APIRecentActivity>
{ {
public PaginatedRecentActivityContainer(Bindable<UserProfile?> userProfile) public PaginatedRecentActivityContainer(Bindable<UserProfileData?> userProfile)
: base(userProfile, missingText: EventsStrings.Empty) : base(userProfile, missingText: EventsStrings.Empty)
{ {
} }

4
osu.Game/Overlays/Profile/UserProfile.cs → osu.Game/Overlays/Profile/UserProfileData.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Overlays.Profile
/// <summary> /// <summary>
/// Contains data about a profile presented on the <see cref="UserProfileOverlay"/>. /// Contains data about a profile presented on the <see cref="UserProfileOverlay"/>.
/// </summary> /// </summary>
public class UserProfile public class UserProfileData
{ {
/// <summary> /// <summary>
/// The user whose profile is being presented. /// The user whose profile is being presented.
@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile
// TODO: add ruleset // TODO: add ruleset
public UserProfile(APIUser user) public UserProfileData(APIUser user)
{ {
User = user; User = user;
} }

2
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -125,7 +125,7 @@ namespace osu.Game.Overlays
{ {
Debug.Assert(sections != null && sectionsContainer != null && tabs != null); Debug.Assert(sections != null && sectionsContainer != null && tabs != null);
var userProfile = new UserProfile(user); var userProfile = new UserProfileData(user);
Header.UserProfile.Value = userProfile; Header.UserProfile.Value = userProfile;
if (user.ProfileOrder != null) if (user.ProfileOrder != null)