sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 10:47:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Country -> CountryCode

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-18 08:40:34 +03:00
parent 9e945197dc
commit 100c53f9ef
30 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
Id = 3103765, Id = 3103765,
IsOnline = true, IsOnline = true,
Statistics = new UserStatistics { GlobalRank = 1111 }, Statistics = new UserStatistics { GlobalRank = 1111 },
Country = Country.JP, CountryCode = CountryCode.JP,
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg" CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
}, },
new APIUser new APIUser
@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
Id = 2, Id = 2,
IsOnline = false, IsOnline = false,
Statistics = new UserStatistics { GlobalRank = 2222 }, Statistics = new UserStatistics { GlobalRank = 2222 },
Country = Country.AU, CountryCode = CountryCode.AU,
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
IsSupporter = true, IsSupporter = true,
SupportLevel = 3, SupportLevel = 3,
@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Username = "Evast", Username = "Evast",
Id = 8195163, Id = 8195163,
Country = Country.BY, CountryCode = CountryCode.BY,
CoverUrl = "https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg", CoverUrl = "https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
IsOnline = false, IsOnline = false,
LastVisit = DateTimeOffset.Now LastVisit = DateTimeOffset.Now

6
osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Online
public TestSceneRankingsCountryFilter() public TestSceneRankingsCountryFilter()
{ {
var countryBindable = new Bindable<Country>(); var countryBindable = new Bindable<CountryCode>();
AddRange(new Drawable[] AddRange(new Drawable[]
{ {
@ -56,8 +56,8 @@ namespace osu.Game.Tests.Visual.Online
} }
}); });
const Country country = Country.BY; const CountryCode country = CountryCode.BY;
const Country unknown_country = Country.CK; const CountryCode unknown_country = CountryCode.CK;
AddStep("Set country", () => countryBindable.Value = country); AddStep("Set country", () => countryBindable.Value = country);
AddStep("Set default country", () => countryBindable.Value = default); AddStep("Set default country", () => countryBindable.Value = default);

6
osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Online
public TestSceneRankingsHeader() public TestSceneRankingsHeader()
{ {
var countryBindable = new Bindable<Country>(); var countryBindable = new Bindable<CountryCode>();
var ruleset = new Bindable<RulesetInfo>(); var ruleset = new Bindable<RulesetInfo>();
var scope = new Bindable<RankingsScope>(); var scope = new Bindable<RankingsScope>();
@ -30,8 +30,8 @@ namespace osu.Game.Tests.Visual.Online
Ruleset = { BindTarget = ruleset } Ruleset = { BindTarget = ruleset }
}); });
const Country country = Country.BY; const CountryCode country = CountryCode.BY;
const Country unknown_country = Country.CK; const CountryCode unknown_country = CountryCode.CK;
AddStep("Set country", () => countryBindable.Value = country); AddStep("Set country", () => countryBindable.Value = country);
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score); AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);

8
osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
private TestRankingsOverlay rankingsOverlay; private TestRankingsOverlay rankingsOverlay;
private readonly Bindable<Country> countryBindable = new Bindable<Country>(); private readonly Bindable<CountryCode> countryBindable = new Bindable<CountryCode>();
private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>(); private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();
[SetUp] [SetUp]
@ -49,14 +49,14 @@ namespace osu.Game.Tests.Visual.Online
{ {
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score); AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
AddAssert("Check country is default", () => countryBindable.Value == default); AddAssert("Check country is default", () => countryBindable.Value == default);
AddStep("Set country", () => countryBindable.Value = Country.US); AddStep("Set country", () => countryBindable.Value = CountryCode.US);
AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance); AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
} }
[Test] [Test]
public void TestShowCountry() public void TestShowCountry()
{ {
AddStep("Show US", () => rankingsOverlay.ShowCountry(Country.US)); AddStep("Show US", () => rankingsOverlay.ShowCountry(CountryCode.US));
} }
private void loadRankingsOverlay() private void loadRankingsOverlay()
@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual.Online
private class TestRankingsOverlay : RankingsOverlay private class TestRankingsOverlay : RankingsOverlay
{ {
public new Bindable<Country> Country => base.Country; public new Bindable<CountryCode> Country => base.Country;
} }
} }
} }

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

@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
new CountryStatistics new CountryStatistics
{ {
Country = Country.US, Code = CountryCode.US,
ActiveUsers = 2_972_623, ActiveUsers = 2_972_623,
PlayCount = 3_086_515_743, PlayCount = 3_086_515_743,
RankedScore = 449_407_643_332_546, RankedScore = 449_407_643_332_546,
@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.Online
}, },
new CountryStatistics new CountryStatistics
{ {
Country = Country.RU, Code = CountryCode.RU,
ActiveUsers = 1_609_989, ActiveUsers = 1_609_989,
PlayCount = 1_637_052_841, PlayCount = 1_637_052_841,
RankedScore = 221_660_827_473_004, RankedScore = 221_660_827_473_004,
@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.Online
User = new APIUser User = new APIUser
{ {
Username = "first active user", Username = "first active user",
Country = Country.JP, CountryCode = CountryCode.JP,
Active = true, Active = true,
}, },
Accuracy = 0.9972, Accuracy = 0.9972,
@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual.Online
User = new APIUser User = new APIUser
{ {
Username = "inactive user", Username = "inactive user",
Country = Country.AU, CountryCode = CountryCode.AU,
Active = false, Active = false,
}, },
Accuracy = 0.9831, Accuracy = 0.9831,
@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Online
User = new APIUser User = new APIUser
{ {
Username = "second active user", Username = "second active user",
Country = Country.PL, CountryCode = CountryCode.PL,
Active = true, Active = true,
}, },
Accuracy = 0.9584, Accuracy = 0.9584,

12
osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
View File

@ -157,7 +157,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Id = 6602580, Id = 6602580,
Username = @"waaiiru", Username = @"waaiiru",
Country = Country.ES, CountryCode = CountryCode.ES,
}, },
Mods = new[] Mods = new[]
{ {
@ -180,7 +180,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Id = 4608074, Id = 4608074,
Username = @"Skycries", Username = @"Skycries",
Country = Country.BR, CountryCode = CountryCode.BR,
}, },
Mods = new[] Mods = new[]
{ {
@ -202,7 +202,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Id = 1014222, Id = 1014222,
Username = @"eLy", Username = @"eLy",
Country = Country.JP, CountryCode = CountryCode.JP,
}, },
Mods = new[] Mods = new[]
{ {
@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Id = 1541390, Id = 1541390,
Username = @"Toukai", Username = @"Toukai",
Country = Country.CA, CountryCode = CountryCode.CA,
}, },
Mods = new[] Mods = new[]
{ {
@ -243,7 +243,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Id = 7151382, Id = 7151382,
Username = @"Mayuri Hana", Username = @"Mayuri Hana",
Country = Country.TH, CountryCode = CountryCode.TH,
}, },
Rank = ScoreRank.D, Rank = ScoreRank.D,
PP = 160, PP = 160,
@ -282,7 +282,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Id = 7151382, Id = 7151382,
Username = @"Mayuri Hana", Username = @"Mayuri Hana",
Country = Country.TH, CountryCode = CountryCode.TH,
}, },
Rank = ScoreRank.D, Rank = ScoreRank.D,
PP = 160, PP = 160,

6
osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Username = @"flyte", Username = @"flyte",
Id = 3103765, Id = 3103765,
Country = Country.JP, CountryCode = CountryCode.JP,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
Status = { Value = new UserStatusOnline() } Status = { Value = new UserStatusOnline() }
}) { Width = 300 }, }) { Width = 300 },
@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Username = @"peppy", Username = @"peppy",
Id = 2, Id = 2,
Country = Country.AU, CountryCode = CountryCode.AU,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
IsSupporter = true, IsSupporter = true,
SupportLevel = 3, SupportLevel = 3,
@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Username = @"Evast", Username = @"Evast",
Id = 8195163, Id = 8195163,
Country = Country.BY, CountryCode = CountryCode.BY,
CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg", CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
IsOnline = false, IsOnline = false,
LastVisit = DateTimeOffset.Now LastVisit = DateTimeOffset.Now

8
osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Username = @"Somebody", Username = @"Somebody",
Id = 1, Id = 1,
Country = Country.XX, CountryCode = CountryCode.XX,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
JoinDate = DateTimeOffset.Now.AddDays(-1), JoinDate = DateTimeOffset.Now.AddDays(-1),
LastVisit = DateTimeOffset.Now, LastVisit = DateTimeOffset.Now,
@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Online
Username = @"peppy", Username = @"peppy",
Id = 2, Id = 2,
IsSupporter = true, IsSupporter = true,
Country = Country.AU, CountryCode = CountryCode.AU,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg" CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
})); }));
@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Username = @"flyte", Username = @"flyte",
Id = 3103765, Id = 3103765,
Country = Country.JP, CountryCode = CountryCode.JP,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg" CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
})); }));
@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.Online
Username = @"BanchoBot", Username = @"BanchoBot",
Id = 3, Id = 3,
IsBot = true, IsBot = true,
Country = Country.SH, CountryCode = CountryCode.SH,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg" CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg"
})); }));

24
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
View File

@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 6602580, Id = 6602580,
Username = @"waaiiru", Username = @"waaiiru",
Country = Country.ES, CountryCode = CountryCode.ES,
}, },
}); });
} }
@ -160,7 +160,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 6602580, Id = 6602580,
Username = @"waaiiru", Username = @"waaiiru",
Country = Country.ES, CountryCode = CountryCode.ES,
} }
}); });
} }
@ -217,7 +217,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 6602580, Id = 6602580,
Username = @"waaiiru", Username = @"waaiiru",
Country = Country.ES, CountryCode = CountryCode.ES,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -234,7 +234,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 4608074, Id = 4608074,
Username = @"Skycries", Username = @"Skycries",
Country = Country.BR, CountryCode = CountryCode.BR,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -252,7 +252,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 1014222, Id = 1014222,
Username = @"eLy", Username = @"eLy",
Country = Country.JP, CountryCode = CountryCode.JP,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -270,7 +270,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 1541390, Id = 1541390,
Username = @"Toukai", Username = @"Toukai",
Country = Country.CA, CountryCode = CountryCode.CA,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -288,7 +288,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 2243452, Id = 2243452,
Username = @"Satoruu", Username = @"Satoruu",
Country = Country.VE, CountryCode = CountryCode.VE,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -306,7 +306,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 2705430, Id = 2705430,
Username = @"Mooha", Username = @"Mooha",
Country = Country.FR, CountryCode = CountryCode.FR,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -324,7 +324,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 7151382, Id = 7151382,
Username = @"Mayuri Hana", Username = @"Mayuri Hana",
Country = Country.TH, CountryCode = CountryCode.TH,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -342,7 +342,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 2051389, Id = 2051389,
Username = @"FunOrange", Username = @"FunOrange",
Country = Country.CA, CountryCode = CountryCode.CA,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -360,7 +360,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 6169483, Id = 6169483,
Username = @"-Hebel-", Username = @"-Hebel-",
Country = Country.MX, CountryCode = CountryCode.MX,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -378,7 +378,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 6702666, Id = 6702666,
Username = @"prhtnsm", Username = @"prhtnsm",
Country = Country.DE, CountryCode = CountryCode.DE,
}, },
}, },
}; };

6
osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 6602580, Id = 6602580,
Username = @"waaiiru", Username = @"waaiiru",
Country = Country.ES, CountryCode = CountryCode.ES,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 4608074, Id = 4608074,
Username = @"Skycries", Username = @"Skycries",
Country = Country.BR, CountryCode = CountryCode.BR,
}, },
}, },
new ScoreInfo new ScoreInfo
@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Id = 1541390, Id = 1541390,
Username = @"Toukai", Username = @"Toukai",
Country = Country.CA, CountryCode = CountryCode.CA,
}, },
} }
}; };

4
osu.Game.Tournament/Models/TournamentUser.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Tournament.Models
/// The player's country. /// The player's country.
/// </summary> /// </summary>
[JsonProperty("country_code")] [JsonProperty("country_code")]
public Country Country { get; set; } public CountryCode CountryCode { get; set; }
/// <summary> /// <summary>
/// The player's global rank, or null if not available. /// The player's global rank, or null if not available.
@ -41,7 +41,7 @@ namespace osu.Game.Tournament.Models
{ {
Id = OnlineID, Id = OnlineID,
Username = Username, Username = Username,
Country = Country, CountryCode = CountryCode,
CoverUrl = CoverUrl, CoverUrl = CoverUrl,
}; };

4
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -187,7 +187,7 @@ namespace osu.Game.Tournament
var playersRequiringPopulation = ladder.Teams var playersRequiringPopulation = ladder.Teams
.SelectMany(t => t.Players) .SelectMany(t => t.Players)
.Where(p => string.IsNullOrEmpty(p.Username) .Where(p => string.IsNullOrEmpty(p.Username)
|| p.Country == default || p.CountryCode == default
|| p.Rank == null).ToList(); || p.Rank == null).ToList();
if (playersRequiringPopulation.Count == 0) if (playersRequiringPopulation.Count == 0)
@ -290,7 +290,7 @@ namespace osu.Game.Tournament
user.Username = res.Username; user.Username = res.Username;
user.CoverUrl = res.CoverUrl; user.CoverUrl = res.CoverUrl;
user.Country = res.Country; user.CountryCode = res.CountryCode;
user.Rank = res.Statistics?.GlobalRank; user.Rank = res.Statistics?.GlobalRank;
success?.Invoke(); success?.Invoke();

10
osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
View File

@ -13,21 +13,21 @@ namespace osu.Game.Online.API.Requests
{ {
public readonly UserRankingsType Type; public readonly UserRankingsType Type;
private readonly Country country; private readonly CountryCode countryCode;
public GetUserRankingsRequest(RulesetInfo ruleset, UserRankingsType type = UserRankingsType.Performance, int page = 1, Country country = default) public GetUserRankingsRequest(RulesetInfo ruleset, UserRankingsType type = UserRankingsType.Performance, int page = 1, CountryCode countryCode = default)
: base(ruleset, page) : base(ruleset, page)
{ {
Type = type; Type = type;
this.country = country; this.countryCode = countryCode;
} }
protected override WebRequest CreateWebRequest() protected override WebRequest CreateWebRequest()
{ {
var req = base.CreateWebRequest(); var req = base.CreateWebRequest();
if (country != default) if (countryCode != default)
req.AddParameter("country", country.ToString()); req.AddParameter("country", countryCode.ToString());
return req; return req;
} }

2
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -181,7 +181,7 @@ namespace osu.Game.Online.Leaderboards
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
new UpdateableFlag(user.Country) new UpdateableFlag(user.CountryCode)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,

2
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -165,7 +165,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Font = OsuFont.GetFont(size: text_size), Font = OsuFont.GetFont(size: text_size),
Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
}, },
new UpdateableFlag(score.User.Country) new UpdateableFlag(score.User.CountryCode)
{ {
Size = new Vector2(19, 14), Size = new Vector2(19, 14),
ShowPlaceholderOnUnknown = false, ShowPlaceholderOnUnknown = false,

2
osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
View File

@ -141,7 +141,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
set set
{ {
avatar.User = value.User; avatar.User = value.User;
flag.Country = value.User.Country; flag.CountryCode = value.User.CountryCode;
achievedOn.Date = value.Date; achievedOn.Date = value.Date;
usernameText.Clear(); usernameText.Clear();

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

@ -175,8 +175,8 @@ namespace osu.Game.Overlays.Profile.Header
avatar.User = user; avatar.User = user;
usernameText.Text = user?.Username ?? string.Empty; usernameText.Text = user?.Username ?? string.Empty;
openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}"; openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
userFlag.Country = user?.Country ?? default; userFlag.CountryCode = user?.CountryCode ?? default;
userCountryText.Text = (user?.Country ?? default).GetDescription(); userCountryText.Text = (user?.CountryCode ?? default).GetDescription();
supporterTag.SupportLevel = user?.SupportLevel ?? 0; supporterTag.SupportLevel = user?.SupportLevel ?? 0;
titleText.Text = user?.Title ?? string.Empty; titleText.Text = user?.Title ?? string.Empty;
titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff"); titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");

8
osu.Game/Overlays/Rankings/CountryFilter.cs
View File

@ -16,14 +16,14 @@ using osuTK;
namespace osu.Game.Overlays.Rankings namespace osu.Game.Overlays.Rankings
{ {
public class CountryFilter : CompositeDrawable, IHasCurrentValue<Country> public class CountryFilter : CompositeDrawable, IHasCurrentValue<CountryCode>
{ {
private const int duration = 200; private const int duration = 200;
private const int height = 70; private const int height = 70;
private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>(); private readonly BindableWithCurrent<CountryCode> current = new BindableWithCurrent<CountryCode>();
public Bindable<Country> Current public Bindable<CountryCode> Current
{ {
get => current.Current; get => current.Current;
set => current.Current = value; set => current.Current = value;
@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Rankings
Current.BindValueChanged(onCountryChanged, true); Current.BindValueChanged(onCountryChanged, true);
} }
private void onCountryChanged(ValueChangedEvent<Country> country) private void onCountryChanged(ValueChangedEvent<CountryCode> country)
{ {
if (country.NewValue == default) if (country.NewValue == default)
{ {

10
osu.Game/Overlays/Rankings/CountryPill.cs
View File

@ -22,13 +22,13 @@ using osuTK.Graphics;
namespace osu.Game.Overlays.Rankings namespace osu.Game.Overlays.Rankings
{ {
public class CountryPill : CompositeDrawable, IHasCurrentValue<Country> public class CountryPill : CompositeDrawable, IHasCurrentValue<CountryCode>
{ {
private const int duration = 200; private const int duration = 200;
private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>(); private readonly BindableWithCurrent<CountryCode> current = new BindableWithCurrent<CountryCode>();
public Bindable<Country> Current public Bindable<CountryCode> Current
{ {
get => current.Current; get => current.Current;
set => current.Current = value; set => current.Current = value;
@ -131,12 +131,12 @@ namespace osu.Game.Overlays.Rankings
this.FadeOut(duration, Easing.OutQuint); this.FadeOut(duration, Easing.OutQuint);
} }
private void onCountryChanged(ValueChangedEvent<Country> country) private void onCountryChanged(ValueChangedEvent<CountryCode> country)
{ {
if (country.NewValue == default) if (country.NewValue == default)
return; return;
flag.Country = country.NewValue; flag.CountryCode = country.NewValue;
countryName.Text = country.NewValue.GetDescription(); countryName.Text = country.NewValue.GetDescription();
} }

2
osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Rankings
{ {
public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current; public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
public Bindable<Country> Country => countryFilter.Current; public Bindable<CountryCode> Country => countryFilter.Current;
private OverlayRulesetSelector rulesetSelector; private OverlayRulesetSelector rulesetSelector;
private CountryFilter countryFilter; private CountryFilter countryFilter;

10
osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
View File

@ -34,9 +34,9 @@ namespace osu.Game.Overlays.Rankings.Tables
new RankingsTableColumn(RankingsStrings.StatAveragePerformance, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new RankingsTableColumn(RankingsStrings.StatAveragePerformance, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
}; };
protected override Country GetCountry(CountryStatistics item) => item.Country; protected override CountryCode GetCountryCode(CountryStatistics item) => item.Code;
protected override Drawable CreateFlagContent(CountryStatistics item) => new CountryName(item.Country); protected override Drawable CreateFlagContent(CountryStatistics item) => new CountryName(item.Code);
protected override Drawable[] CreateAdditionalContent(CountryStatistics item) => new Drawable[] protected override Drawable[] CreateAdditionalContent(CountryStatistics item) => new Drawable[]
{ {
@ -71,15 +71,15 @@ namespace osu.Game.Overlays.Rankings.Tables
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]
private RankingsOverlay rankings { get; set; } private RankingsOverlay rankings { get; set; }
public CountryName(Country country) public CountryName(CountryCode countryCode)
: base(t => t.Font = OsuFont.GetFont(size: 12)) : base(t => t.Font = OsuFont.GetFont(size: 12))
{ {
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
RelativeSizeAxes = Axes.Y; RelativeSizeAxes = Axes.Y;
TextAnchor = Anchor.CentreLeft; TextAnchor = Anchor.CentreLeft;
if (country != default) if (countryCode != default)
AddLink(country.GetDescription(), () => rankings?.ShowCountry(country)); AddLink(countryCode.GetDescription(), () => rankings?.ShowCountry(countryCode));
} }
} }
} }

4
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Rankings.Tables
protected sealed override Drawable CreateHeader(int index, TableColumn column) protected sealed override Drawable CreateHeader(int index, TableColumn column)
=> (column as RankingsTableColumn)?.CreateHeaderText() ?? new HeaderText(column?.Header ?? default, false); => (column as RankingsTableColumn)?.CreateHeaderText() ?? new HeaderText(column?.Header ?? default, false);
protected abstract Country GetCountry(TModel item); protected abstract CountryCode GetCountryCode(TModel item);
protected abstract Drawable CreateFlagContent(TModel item); protected abstract Drawable CreateFlagContent(TModel item);
@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Rankings.Tables
Margin = new MarginPadding { Bottom = row_spacing }, Margin = new MarginPadding { Bottom = row_spacing },
Children = new[] Children = new[]
{ {
new UpdateableFlag(GetCountry(item)) new UpdateableFlag(GetCountryCode(item))
{ {
Size = new Vector2(28, 20), Size = new Vector2(28, 20),
ShowPlaceholderOnUnknown = false, ShowPlaceholderOnUnknown = false,

2
osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Rankings.Tables
.Concat(GradeColumns.Select(grade => new GradeTableColumn(grade, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)))) .Concat(GradeColumns.Select(grade => new GradeTableColumn(grade, Anchor.Centre, new Dimension(GridSizeMode.AutoSize))))
.ToArray(); .ToArray();
protected sealed override Country GetCountry(UserStatistics item) => item.User.Country; protected sealed override CountryCode GetCountryCode(UserStatistics item) => item.User.CountryCode;
protected sealed override Drawable CreateFlagContent(UserStatistics item) protected sealed override Drawable CreateFlagContent(UserStatistics item)
{ {

6
osu.Game/Overlays/RankingsOverlay.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Overlays
{ {
public class RankingsOverlay : TabbableOnlineOverlay<RankingsOverlayHeader, RankingsScope> public class RankingsOverlay : TabbableOnlineOverlay<RankingsOverlayHeader, RankingsScope>
{ {
protected Bindable<Country> Country => Header.Country; protected Bindable<CountryCode> Country => Header.Country;
private APIRequest lastRequest; private APIRequest lastRequest;
@ -85,7 +85,7 @@ namespace osu.Game.Overlays
protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader(); protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
public void ShowCountry(Country requested) public void ShowCountry(CountryCode requested)
{ {
if (requested == default) if (requested == default)
return; return;
@ -128,7 +128,7 @@ namespace osu.Game.Overlays
switch (Header.Current.Value) switch (Header.Current.Value)
{ {
case RankingsScope.Performance: case RankingsScope.Performance:
return new GetUserRankingsRequest(ruleset.Value, country: Country.Value); return new GetUserRankingsRequest(ruleset.Value, countryCode: Country.Value);
case RankingsScope.Country: case RankingsScope.Country:
return new GetCountryRankingsRequest(ruleset.Value); return new GetCountryRankingsRequest(ruleset.Value);

2
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
View File

@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Size = new Vector2(28, 20), Size = new Vector2(28, 20),
Country = user?.Country ?? default CountryCode = user?.CountryCode ?? default
}, },
new OsuSpriteText new OsuSpriteText
{ {

2
osu.Game/Users/Country.cs → osu.Game/Users/CountryCode.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Users
{ {
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)] [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
public enum Country public enum CountryCode
{ {
[Description("Unknown")] [Description("Unknown")]
XX = 0, XX = 0,

2
osu.Game/Users/CountryStatistics.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Users
public class CountryStatistics public class CountryStatistics
{ {
[JsonProperty(@"code")] [JsonProperty(@"code")]
public Country Country; public CountryCode Code;
[JsonProperty(@"active_users")] [JsonProperty(@"active_users")]
public long ActiveUsers; public long ActiveUsers;

10
osu.Game/Users/Drawables/DrawableFlag.cs
View File

@ -15,13 +15,13 @@ namespace osu.Game.Users.Drawables
{ {
public class DrawableFlag : Sprite, IHasTooltip public class DrawableFlag : Sprite, IHasTooltip
{ {
private readonly Country country; private readonly CountryCode countryCode;
public LocalisableString TooltipText => country == default ? string.Empty : country.GetDescription(); public LocalisableString TooltipText => countryCode == default ? string.Empty : countryCode.GetDescription();
public DrawableFlag(Country country) public DrawableFlag(CountryCode countryCode)
{ {
this.country = country; this.countryCode = countryCode;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
if (ts == null) if (ts == null)
throw new ArgumentNullException(nameof(ts)); throw new ArgumentNullException(nameof(ts));
string textureName = country == default ? "__" : country.ToString(); string textureName = countryCode == default ? "__" : countryCode.ToString();
Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__"); Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
} }
} }

16
osu.Game/Users/Drawables/UpdateableFlag.cs
View File

@ -13,9 +13,9 @@ using osu.Game.Overlays;
namespace osu.Game.Users.Drawables namespace osu.Game.Users.Drawables
{ {
public class UpdateableFlag : ModelBackedDrawable<Country> public class UpdateableFlag : ModelBackedDrawable<CountryCode>
{ {
public Country Country public CountryCode CountryCode
{ {
get => Model; get => Model;
set => Model = value; set => Model = value;
@ -32,14 +32,14 @@ namespace osu.Game.Users.Drawables
/// </summary> /// </summary>
public Action Action; public Action Action;
public UpdateableFlag(Country country = default) public UpdateableFlag(CountryCode countryCode = default)
{ {
Country = country; CountryCode = countryCode;
} }
protected override Drawable CreateDrawable(Country country) protected override Drawable CreateDrawable(CountryCode countryCode)
{ {
if (country == default && !ShowPlaceholderOnUnknown) if (countryCode == default && !ShowPlaceholderOnUnknown)
return null; return null;
return new Container return new Container
@ -47,7 +47,7 @@ namespace osu.Game.Users.Drawables
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new DrawableFlag(country) new DrawableFlag(countryCode)
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}, },
@ -62,7 +62,7 @@ namespace osu.Game.Users.Drawables
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)
{ {
Action?.Invoke(); Action?.Invoke();
rankingsOverlay?.ShowCountry(Country); rankingsOverlay?.ShowCountry(CountryCode);
return true; return true;
} }
} }

2
osu.Game/Users/ExtendedUserPanel.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Users
protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false); protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false);
protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country) protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.CountryCode)
{ {
Size = new Vector2(36, 26), Size = new Vector2(36, 26),
Action = Action, Action = Action,