mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 01:42:55 +08:00
Country
-> CountryCode
This commit is contained in:
parent
9e945197dc
commit
100c53f9ef
@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
Id = 3103765,
|
||||
IsOnline = true,
|
||||
Statistics = new UserStatistics { GlobalRank = 1111 },
|
||||
Country = Country.JP,
|
||||
CountryCode = CountryCode.JP,
|
||||
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
|
||||
},
|
||||
new APIUser
|
||||
@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
Id = 2,
|
||||
IsOnline = false,
|
||||
Statistics = new UserStatistics { GlobalRank = 2222 },
|
||||
Country = Country.AU,
|
||||
CountryCode = CountryCode.AU,
|
||||
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
|
||||
IsSupporter = true,
|
||||
SupportLevel = 3,
|
||||
@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Username = "Evast",
|
||||
Id = 8195163,
|
||||
Country = Country.BY,
|
||||
CountryCode = CountryCode.BY,
|
||||
CoverUrl = "https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
|
||||
IsOnline = false,
|
||||
LastVisit = DateTimeOffset.Now
|
||||
|
@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
|
||||
public TestSceneRankingsCountryFilter()
|
||||
{
|
||||
var countryBindable = new Bindable<Country>();
|
||||
var countryBindable = new Bindable<CountryCode>();
|
||||
|
||||
AddRange(new Drawable[]
|
||||
{
|
||||
@ -56,8 +56,8 @@ namespace osu.Game.Tests.Visual.Online
|
||||
}
|
||||
});
|
||||
|
||||
const Country country = Country.BY;
|
||||
const Country unknown_country = Country.CK;
|
||||
const CountryCode country = CountryCode.BY;
|
||||
const CountryCode unknown_country = CountryCode.CK;
|
||||
|
||||
AddStep("Set country", () => countryBindable.Value = country);
|
||||
AddStep("Set default country", () => countryBindable.Value = default);
|
||||
|
@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
|
||||
public TestSceneRankingsHeader()
|
||||
{
|
||||
var countryBindable = new Bindable<Country>();
|
||||
var countryBindable = new Bindable<CountryCode>();
|
||||
var ruleset = new Bindable<RulesetInfo>();
|
||||
var scope = new Bindable<RankingsScope>();
|
||||
|
||||
@ -30,8 +30,8 @@ namespace osu.Game.Tests.Visual.Online
|
||||
Ruleset = { BindTarget = ruleset }
|
||||
});
|
||||
|
||||
const Country country = Country.BY;
|
||||
const Country unknown_country = Country.CK;
|
||||
const CountryCode country = CountryCode.BY;
|
||||
const CountryCode unknown_country = CountryCode.CK;
|
||||
|
||||
AddStep("Set country", () => countryBindable.Value = country);
|
||||
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
|
||||
|
@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
|
||||
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>();
|
||||
|
||||
[SetUp]
|
||||
@ -49,14 +49,14 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
|
||||
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);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestShowCountry()
|
||||
{
|
||||
AddStep("Show US", () => rankingsOverlay.ShowCountry(Country.US));
|
||||
AddStep("Show US", () => rankingsOverlay.ShowCountry(CountryCode.US));
|
||||
}
|
||||
|
||||
private void loadRankingsOverlay()
|
||||
@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
|
||||
private class TestRankingsOverlay : RankingsOverlay
|
||||
{
|
||||
public new Bindable<Country> Country => base.Country;
|
||||
public new Bindable<CountryCode> Country => base.Country;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
new CountryStatistics
|
||||
{
|
||||
Country = Country.US,
|
||||
Code = CountryCode.US,
|
||||
ActiveUsers = 2_972_623,
|
||||
PlayCount = 3_086_515_743,
|
||||
RankedScore = 449_407_643_332_546,
|
||||
@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
},
|
||||
new CountryStatistics
|
||||
{
|
||||
Country = Country.RU,
|
||||
Code = CountryCode.RU,
|
||||
ActiveUsers = 1_609_989,
|
||||
PlayCount = 1_637_052_841,
|
||||
RankedScore = 221_660_827_473_004,
|
||||
@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
User = new APIUser
|
||||
{
|
||||
Username = "first active user",
|
||||
Country = Country.JP,
|
||||
CountryCode = CountryCode.JP,
|
||||
Active = true,
|
||||
},
|
||||
Accuracy = 0.9972,
|
||||
@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
User = new APIUser
|
||||
{
|
||||
Username = "inactive user",
|
||||
Country = Country.AU,
|
||||
CountryCode = CountryCode.AU,
|
||||
Active = false,
|
||||
},
|
||||
Accuracy = 0.9831,
|
||||
@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
User = new APIUser
|
||||
{
|
||||
Username = "second active user",
|
||||
Country = Country.PL,
|
||||
CountryCode = CountryCode.PL,
|
||||
Active = true,
|
||||
},
|
||||
Accuracy = 0.9584,
|
||||
|
@ -157,7 +157,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Id = 6602580,
|
||||
Username = @"waaiiru",
|
||||
Country = Country.ES,
|
||||
CountryCode = CountryCode.ES,
|
||||
},
|
||||
Mods = new[]
|
||||
{
|
||||
@ -180,7 +180,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Id = 4608074,
|
||||
Username = @"Skycries",
|
||||
Country = Country.BR,
|
||||
CountryCode = CountryCode.BR,
|
||||
},
|
||||
Mods = new[]
|
||||
{
|
||||
@ -202,7 +202,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Id = 1014222,
|
||||
Username = @"eLy",
|
||||
Country = Country.JP,
|
||||
CountryCode = CountryCode.JP,
|
||||
},
|
||||
Mods = new[]
|
||||
{
|
||||
@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Id = 1541390,
|
||||
Username = @"Toukai",
|
||||
Country = Country.CA,
|
||||
CountryCode = CountryCode.CA,
|
||||
},
|
||||
Mods = new[]
|
||||
{
|
||||
@ -243,7 +243,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Id = 7151382,
|
||||
Username = @"Mayuri Hana",
|
||||
Country = Country.TH,
|
||||
CountryCode = CountryCode.TH,
|
||||
},
|
||||
Rank = ScoreRank.D,
|
||||
PP = 160,
|
||||
@ -282,7 +282,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Id = 7151382,
|
||||
Username = @"Mayuri Hana",
|
||||
Country = Country.TH,
|
||||
CountryCode = CountryCode.TH,
|
||||
},
|
||||
Rank = ScoreRank.D,
|
||||
PP = 160,
|
||||
|
@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Username = @"flyte",
|
||||
Id = 3103765,
|
||||
Country = Country.JP,
|
||||
CountryCode = CountryCode.JP,
|
||||
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
|
||||
Status = { Value = new UserStatusOnline() }
|
||||
}) { Width = 300 },
|
||||
@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Username = @"peppy",
|
||||
Id = 2,
|
||||
Country = Country.AU,
|
||||
CountryCode = CountryCode.AU,
|
||||
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
|
||||
IsSupporter = true,
|
||||
SupportLevel = 3,
|
||||
@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Username = @"Evast",
|
||||
Id = 8195163,
|
||||
Country = Country.BY,
|
||||
CountryCode = CountryCode.BY,
|
||||
CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
|
||||
IsOnline = false,
|
||||
LastVisit = DateTimeOffset.Now
|
||||
|
@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Username = @"Somebody",
|
||||
Id = 1,
|
||||
Country = Country.XX,
|
||||
CountryCode = CountryCode.XX,
|
||||
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
|
||||
JoinDate = DateTimeOffset.Now.AddDays(-1),
|
||||
LastVisit = DateTimeOffset.Now,
|
||||
@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
Username = @"peppy",
|
||||
Id = 2,
|
||||
IsSupporter = true,
|
||||
Country = Country.AU,
|
||||
CountryCode = CountryCode.AU,
|
||||
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
|
||||
}));
|
||||
|
||||
@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
{
|
||||
Username = @"flyte",
|
||||
Id = 3103765,
|
||||
Country = Country.JP,
|
||||
CountryCode = CountryCode.JP,
|
||||
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
|
||||
}));
|
||||
|
||||
@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
Username = @"BanchoBot",
|
||||
Id = 3,
|
||||
IsBot = true,
|
||||
Country = Country.SH,
|
||||
CountryCode = CountryCode.SH,
|
||||
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg"
|
||||
}));
|
||||
|
||||
|
@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 6602580,
|
||||
Username = @"waaiiru",
|
||||
Country = Country.ES,
|
||||
CountryCode = CountryCode.ES,
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -160,7 +160,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 6602580,
|
||||
Username = @"waaiiru",
|
||||
Country = Country.ES,
|
||||
CountryCode = CountryCode.ES,
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -217,7 +217,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 6602580,
|
||||
Username = @"waaiiru",
|
||||
Country = Country.ES,
|
||||
CountryCode = CountryCode.ES,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -234,7 +234,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 4608074,
|
||||
Username = @"Skycries",
|
||||
Country = Country.BR,
|
||||
CountryCode = CountryCode.BR,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -252,7 +252,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 1014222,
|
||||
Username = @"eLy",
|
||||
Country = Country.JP,
|
||||
CountryCode = CountryCode.JP,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -270,7 +270,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 1541390,
|
||||
Username = @"Toukai",
|
||||
Country = Country.CA,
|
||||
CountryCode = CountryCode.CA,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -288,7 +288,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 2243452,
|
||||
Username = @"Satoruu",
|
||||
Country = Country.VE,
|
||||
CountryCode = CountryCode.VE,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -306,7 +306,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 2705430,
|
||||
Username = @"Mooha",
|
||||
Country = Country.FR,
|
||||
CountryCode = CountryCode.FR,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -324,7 +324,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 7151382,
|
||||
Username = @"Mayuri Hana",
|
||||
Country = Country.TH,
|
||||
CountryCode = CountryCode.TH,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -342,7 +342,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 2051389,
|
||||
Username = @"FunOrange",
|
||||
Country = Country.CA,
|
||||
CountryCode = CountryCode.CA,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -360,7 +360,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 6169483,
|
||||
Username = @"-Hebel-",
|
||||
Country = Country.MX,
|
||||
CountryCode = CountryCode.MX,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -378,7 +378,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 6702666,
|
||||
Username = @"prhtnsm",
|
||||
Country = Country.DE,
|
||||
CountryCode = CountryCode.DE,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 6602580,
|
||||
Username = @"waaiiru",
|
||||
Country = Country.ES,
|
||||
CountryCode = CountryCode.ES,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 4608074,
|
||||
Username = @"Skycries",
|
||||
Country = Country.BR,
|
||||
CountryCode = CountryCode.BR,
|
||||
},
|
||||
},
|
||||
new ScoreInfo
|
||||
@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
||||
{
|
||||
Id = 1541390,
|
||||
Username = @"Toukai",
|
||||
Country = Country.CA,
|
||||
CountryCode = CountryCode.CA,
|
||||
},
|
||||
}
|
||||
};
|
||||
|
@ -23,7 +23,7 @@ namespace osu.Game.Tournament.Models
|
||||
/// The player's country.
|
||||
/// </summary>
|
||||
[JsonProperty("country_code")]
|
||||
public Country Country { get; set; }
|
||||
public CountryCode CountryCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The player's global rank, or null if not available.
|
||||
@ -41,7 +41,7 @@ namespace osu.Game.Tournament.Models
|
||||
{
|
||||
Id = OnlineID,
|
||||
Username = Username,
|
||||
Country = Country,
|
||||
CountryCode = CountryCode,
|
||||
CoverUrl = CoverUrl,
|
||||
};
|
||||
|
||||
|
@ -187,7 +187,7 @@ namespace osu.Game.Tournament
|
||||
var playersRequiringPopulation = ladder.Teams
|
||||
.SelectMany(t => t.Players)
|
||||
.Where(p => string.IsNullOrEmpty(p.Username)
|
||||
|| p.Country == default
|
||||
|| p.CountryCode == default
|
||||
|| p.Rank == null).ToList();
|
||||
|
||||
if (playersRequiringPopulation.Count == 0)
|
||||
@ -290,7 +290,7 @@ namespace osu.Game.Tournament
|
||||
|
||||
user.Username = res.Username;
|
||||
user.CoverUrl = res.CoverUrl;
|
||||
user.Country = res.Country;
|
||||
user.CountryCode = res.CountryCode;
|
||||
user.Rank = res.Statistics?.GlobalRank;
|
||||
|
||||
success?.Invoke();
|
||||
|
@ -13,21 +13,21 @@ namespace osu.Game.Online.API.Requests
|
||||
{
|
||||
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)
|
||||
{
|
||||
Type = type;
|
||||
this.country = country;
|
||||
this.countryCode = countryCode;
|
||||
}
|
||||
|
||||
protected override WebRequest CreateWebRequest()
|
||||
{
|
||||
var req = base.CreateWebRequest();
|
||||
|
||||
if (country != default)
|
||||
req.AddParameter("country", country.ToString());
|
||||
if (countryCode != default)
|
||||
req.AddParameter("country", countryCode.ToString());
|
||||
|
||||
return req;
|
||||
}
|
||||
|
@ -181,7 +181,7 @@ namespace osu.Game.Online.Leaderboards
|
||||
Masking = true,
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new UpdateableFlag(user.Country)
|
||||
new UpdateableFlag(user.CountryCode)
|
||||
{
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Origin = Anchor.CentreLeft,
|
||||
|
@ -165,7 +165,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
|
||||
Font = OsuFont.GetFont(size: text_size),
|
||||
Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
|
||||
},
|
||||
new UpdateableFlag(score.User.Country)
|
||||
new UpdateableFlag(score.User.CountryCode)
|
||||
{
|
||||
Size = new Vector2(19, 14),
|
||||
ShowPlaceholderOnUnknown = false,
|
||||
|
@ -141,7 +141,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
|
||||
set
|
||||
{
|
||||
avatar.User = value.User;
|
||||
flag.Country = value.User.Country;
|
||||
flag.CountryCode = value.User.CountryCode;
|
||||
achievedOn.Date = value.Date;
|
||||
|
||||
usernameText.Clear();
|
||||
|
@ -175,8 +175,8 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
avatar.User = user;
|
||||
usernameText.Text = user?.Username ?? string.Empty;
|
||||
openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
|
||||
userFlag.Country = user?.Country ?? default;
|
||||
userCountryText.Text = (user?.Country ?? default).GetDescription();
|
||||
userFlag.CountryCode = user?.CountryCode ?? default;
|
||||
userCountryText.Text = (user?.CountryCode ?? default).GetDescription();
|
||||
supporterTag.SupportLevel = user?.SupportLevel ?? 0;
|
||||
titleText.Text = user?.Title ?? string.Empty;
|
||||
titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
|
||||
|
@ -16,14 +16,14 @@ using osuTK;
|
||||
|
||||
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 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;
|
||||
set => current.Current = value;
|
||||
@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Rankings
|
||||
Current.BindValueChanged(onCountryChanged, true);
|
||||
}
|
||||
|
||||
private void onCountryChanged(ValueChangedEvent<Country> country)
|
||||
private void onCountryChanged(ValueChangedEvent<CountryCode> country)
|
||||
{
|
||||
if (country.NewValue == default)
|
||||
{
|
||||
|
@ -22,13 +22,13 @@ using osuTK.Graphics;
|
||||
|
||||
namespace osu.Game.Overlays.Rankings
|
||||
{
|
||||
public class CountryPill : CompositeDrawable, IHasCurrentValue<Country>
|
||||
public class CountryPill : CompositeDrawable, IHasCurrentValue<CountryCode>
|
||||
{
|
||||
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;
|
||||
set => current.Current = value;
|
||||
@ -131,12 +131,12 @@ namespace osu.Game.Overlays.Rankings
|
||||
this.FadeOut(duration, Easing.OutQuint);
|
||||
}
|
||||
|
||||
private void onCountryChanged(ValueChangedEvent<Country> country)
|
||||
private void onCountryChanged(ValueChangedEvent<CountryCode> country)
|
||||
{
|
||||
if (country.NewValue == default)
|
||||
return;
|
||||
|
||||
flag.Country = country.NewValue;
|
||||
flag.CountryCode = country.NewValue;
|
||||
countryName.Text = country.NewValue.GetDescription();
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Rankings
|
||||
{
|
||||
public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
|
||||
|
||||
public Bindable<Country> Country => countryFilter.Current;
|
||||
public Bindable<CountryCode> Country => countryFilter.Current;
|
||||
|
||||
private OverlayRulesetSelector rulesetSelector;
|
||||
private CountryFilter countryFilter;
|
||||
|
@ -34,9 +34,9 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
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[]
|
||||
{
|
||||
@ -71,15 +71,15 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
[Resolved(canBeNull: true)]
|
||||
private RankingsOverlay rankings { get; set; }
|
||||
|
||||
public CountryName(Country country)
|
||||
public CountryName(CountryCode countryCode)
|
||||
: base(t => t.Font = OsuFont.GetFont(size: 12))
|
||||
{
|
||||
AutoSizeAxes = Axes.X;
|
||||
RelativeSizeAxes = Axes.Y;
|
||||
TextAnchor = Anchor.CentreLeft;
|
||||
|
||||
if (country != default)
|
||||
AddLink(country.GetDescription(), () => rankings?.ShowCountry(country));
|
||||
if (countryCode != default)
|
||||
AddLink(countryCode.GetDescription(), () => rankings?.ShowCountry(countryCode));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
protected sealed override Drawable CreateHeader(int index, TableColumn column)
|
||||
=> (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);
|
||||
|
||||
@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
Margin = new MarginPadding { Bottom = row_spacing },
|
||||
Children = new[]
|
||||
{
|
||||
new UpdateableFlag(GetCountry(item))
|
||||
new UpdateableFlag(GetCountryCode(item))
|
||||
{
|
||||
Size = new Vector2(28, 20),
|
||||
ShowPlaceholderOnUnknown = false,
|
||||
|
@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
.Concat(GradeColumns.Select(grade => new GradeTableColumn(grade, Anchor.Centre, new Dimension(GridSizeMode.AutoSize))))
|
||||
.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)
|
||||
{
|
||||
|
@ -17,7 +17,7 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
public class RankingsOverlay : TabbableOnlineOverlay<RankingsOverlayHeader, RankingsScope>
|
||||
{
|
||||
protected Bindable<Country> Country => Header.Country;
|
||||
protected Bindable<CountryCode> Country => Header.Country;
|
||||
|
||||
private APIRequest lastRequest;
|
||||
|
||||
@ -85,7 +85,7 @@ namespace osu.Game.Overlays
|
||||
|
||||
protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
|
||||
|
||||
public void ShowCountry(Country requested)
|
||||
public void ShowCountry(CountryCode requested)
|
||||
{
|
||||
if (requested == default)
|
||||
return;
|
||||
@ -128,7 +128,7 @@ namespace osu.Game.Overlays
|
||||
switch (Header.Current.Value)
|
||||
{
|
||||
case RankingsScope.Performance:
|
||||
return new GetUserRankingsRequest(ruleset.Value, country: Country.Value);
|
||||
return new GetUserRankingsRequest(ruleset.Value, countryCode: Country.Value);
|
||||
|
||||
case RankingsScope.Country:
|
||||
return new GetCountryRankingsRequest(ruleset.Value);
|
||||
|
@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Origin = Anchor.CentreLeft,
|
||||
Size = new Vector2(28, 20),
|
||||
Country = user?.Country ?? default
|
||||
CountryCode = user?.CountryCode ?? default
|
||||
},
|
||||
new OsuSpriteText
|
||||
{
|
||||
|
@ -10,7 +10,7 @@ namespace osu.Game.Users
|
||||
{
|
||||
[JsonConverter(typeof(StringEnumConverter))]
|
||||
[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
|
||||
public enum Country
|
||||
public enum CountryCode
|
||||
{
|
||||
[Description("Unknown")]
|
||||
XX = 0,
|
@ -10,7 +10,7 @@ namespace osu.Game.Users
|
||||
public class CountryStatistics
|
||||
{
|
||||
[JsonProperty(@"code")]
|
||||
public Country Country;
|
||||
public CountryCode Code;
|
||||
|
||||
[JsonProperty(@"active_users")]
|
||||
public long ActiveUsers;
|
||||
|
@ -15,13 +15,13 @@ namespace osu.Game.Users.Drawables
|
||||
{
|
||||
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]
|
||||
@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
|
||||
if (ts == null)
|
||||
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/__");
|
||||
}
|
||||
}
|
||||
|
@ -13,9 +13,9 @@ using osu.Game.Overlays;
|
||||
|
||||
namespace osu.Game.Users.Drawables
|
||||
{
|
||||
public class UpdateableFlag : ModelBackedDrawable<Country>
|
||||
public class UpdateableFlag : ModelBackedDrawable<CountryCode>
|
||||
{
|
||||
public Country Country
|
||||
public CountryCode CountryCode
|
||||
{
|
||||
get => Model;
|
||||
set => Model = value;
|
||||
@ -32,14 +32,14 @@ namespace osu.Game.Users.Drawables
|
||||
/// </summary>
|
||||
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 new Container
|
||||
@ -47,7 +47,7 @@ namespace osu.Game.Users.Drawables
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new DrawableFlag(country)
|
||||
new DrawableFlag(countryCode)
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both
|
||||
},
|
||||
@ -62,7 +62,7 @@ namespace osu.Game.Users.Drawables
|
||||
protected override bool OnClick(ClickEvent e)
|
||||
{
|
||||
Action?.Invoke();
|
||||
rankingsOverlay?.ShowCountry(Country);
|
||||
rankingsOverlay?.ShowCountry(CountryCode);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ namespace osu.Game.Users
|
||||
|
||||
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),
|
||||
Action = Action,
|
||||
|
Loading…
Reference in New Issue
Block a user