RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-10 16:19:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename class and reword settings text/tooltips to avoid clashing with other naming

Browse Source
This commit is contained in:
Dean Herbert 2022-11-23 16:31:50 +09:00
parent a9192c32ea
commit b89689a34a
2 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
osu.Game/Skinning/Components/BeatmapInfoDrawable.cs → osu.Game/Skinning/Components/BeatmapAttributeText.cs
View File

@ -22,47 +22,46 @@ using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Skinning.Components namespace osu.Game.Skinning.Components
{ {
[UsedImplicitly] [UsedImplicitly]
public class BeatmapInfoDrawable : Container, ISkinnableDrawable public class BeatmapAttributeText : Container, ISkinnableDrawable
{ {
private const BeatmapInfo default_beatmap_info = BeatmapInfo.StarRating;
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
[SettingSource("Tracked Beatmap Info/Label", "Which part of the BeatmapInformation should be displayed.")] [SettingSource("Attribute", "The attribute to be displayed.")]
public Bindable<BeatmapInfo> Type { get; } = new Bindable<BeatmapInfo>(default_beatmap_info); public Bindable<BeatmapAttribute> Attribute { get; } = new Bindable<BeatmapAttribute>(BeatmapAttribute.StarRating);
[SettingSource("Template", "Bypass the restriction of 1 Info per element. Format is '{'+Type+'}' to substitue values. e.g. '{Song}' ")] [SettingSource("Template", "Supports {Label} and {Value}, but also including arbitrary attributes like {StarRating} (see attribute list for supported values).")]
public Bindable<string> Template { get; set; } = new Bindable<string>("{Label}: {Value}"); public Bindable<string> Template { get; set; } = new Bindable<string>("{Label}: {Value}");
[Resolved] [Resolved]
private IBindable<WorkingBeatmap> beatmap { get; set; } = null!; private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
private readonly Dictionary<BeatmapInfo, LocalisableString> valueDictionary = new Dictionary<BeatmapInfo, LocalisableString>(); private readonly Dictionary<BeatmapAttribute, LocalisableString> valueDictionary = new Dictionary<BeatmapAttribute, LocalisableString>();
private static readonly ImmutableDictionary<BeatmapInfo, LocalisableString> label_dictionary; private static readonly ImmutableDictionary<BeatmapAttribute, LocalisableString> label_dictionary;
private readonly OsuSpriteText text; private readonly OsuSpriteText text;
static BeatmapInfoDrawable() static BeatmapAttributeText()
{ {
label_dictionary = new Dictionary<BeatmapInfo, LocalisableString> label_dictionary = new Dictionary<BeatmapAttribute, LocalisableString>
{ {
[BeatmapInfo.CircleSize] = BeatmapsetsStrings.ShowStatsCs, [BeatmapAttribute.CircleSize] = BeatmapsetsStrings.ShowStatsCs,
[BeatmapInfo.Accuracy] = BeatmapsetsStrings.ShowStatsAccuracy, [BeatmapAttribute.Accuracy] = BeatmapsetsStrings.ShowStatsAccuracy,
[BeatmapInfo.HPDrain] = BeatmapsetsStrings.ShowStatsDrain, [BeatmapAttribute.HPDrain] = BeatmapsetsStrings.ShowStatsDrain,
[BeatmapInfo.ApproachRate] = BeatmapsetsStrings.ShowStatsAr, [BeatmapAttribute.ApproachRate] = BeatmapsetsStrings.ShowStatsAr,
[BeatmapInfo.StarRating] = BeatmapsetsStrings.ShowStatsStars, [BeatmapAttribute.StarRating] = BeatmapsetsStrings.ShowStatsStars,
[BeatmapInfo.Song] = EditorSetupStrings.Title, [BeatmapAttribute.Song] = EditorSetupStrings.Title,
[BeatmapInfo.Artist] = EditorSetupStrings.Artist, [BeatmapAttribute.Artist] = EditorSetupStrings.Artist,
[BeatmapInfo.Difficulty] = EditorSetupStrings.DifficultyHeader, [BeatmapAttribute.Difficulty] = EditorSetupStrings.DifficultyHeader,
//todo: is there a good alternative, to NotificationsOptionsMapping? //todo: is there a good alternative, to NotificationsOptionsMapping?
[BeatmapInfo.Mapper] = AccountsStrings.NotificationsOptionsMapping, [BeatmapAttribute.Mapper] = AccountsStrings.NotificationsOptionsMapping,
[BeatmapInfo.Length] = ArtistStrings.TracklistLength, [BeatmapAttribute.Length] = ArtistStrings.TracklistLength,
[BeatmapInfo.Status] = BeatmapDiscussionsStrings.IndexFormBeatmapsetStatusDefault, [BeatmapAttribute.Status] = BeatmapDiscussionsStrings.IndexFormBeatmapsetStatusDefault,
[BeatmapInfo.BPM] = BeatmapsetsStrings.ShowStatsBpm, [BeatmapAttribute.BPM] = BeatmapsetsStrings.ShowStatsBpm,
[BeatmapInfo.None] = BeatmapInfo.None.ToString() [BeatmapAttribute.None] = BeatmapAttribute.None.ToString()
}.ToImmutableDictionary(); }.ToImmutableDictionary();
} }
public BeatmapInfoDrawable() public BeatmapAttributeText()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
@ -76,7 +75,7 @@ namespace osu.Game.Skinning.Components
} }
}; };
foreach (var type in Enum.GetValues(typeof(BeatmapInfo)).Cast<BeatmapInfo>()) foreach (var type in Enum.GetValues(typeof(BeatmapAttribute)).Cast<BeatmapAttribute>())
{ {
valueDictionary[type] = type.ToString(); valueDictionary[type] = type.ToString();
} }
@ -85,7 +84,7 @@ namespace osu.Game.Skinning.Components
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
Type.BindValueChanged(_ => updateLabel()); Attribute.BindValueChanged(_ => updateLabel());
Template.BindValueChanged(f => updateLabel(), true); Template.BindValueChanged(f => updateLabel(), true);
beatmap.BindValueChanged(b => beatmap.BindValueChanged(b =>
{ {
@ -96,10 +95,10 @@ namespace osu.Game.Skinning.Components
private void updateLabel() private void updateLabel()
{ {
string newText = Template.Value.Replace("{Label}", label_dictionary[Type.Value].ToString()) string newText = Template.Value.Replace("{Label}", label_dictionary[Attribute.Value].ToString())
.Replace("{Value}", valueDictionary[Type.Value].ToString()); .Replace("{Value}", valueDictionary[Attribute.Value].ToString());
foreach (var type in Enum.GetValues(typeof(BeatmapInfo)).Cast<BeatmapInfo>()) foreach (var type in Enum.GetValues(typeof(BeatmapAttribute)).Cast<BeatmapAttribute>())
{ {
newText = newText.Replace("{" + type + "}", valueDictionary[type].ToString()); newText = newText.Replace("{" + type + "}", valueDictionary[type].ToString());
} }
@ -111,34 +110,34 @@ namespace osu.Game.Skinning.Components
{ {
//update cs //update cs
double cs = workingBeatmap.BeatmapInfo.Difficulty.CircleSize; double cs = workingBeatmap.BeatmapInfo.Difficulty.CircleSize;
valueDictionary[BeatmapInfo.CircleSize] = cs.ToString("F2"); valueDictionary[BeatmapAttribute.CircleSize] = cs.ToString("F2");
//update HP //update HP
double hp = workingBeatmap.BeatmapInfo.Difficulty.DrainRate; double hp = workingBeatmap.BeatmapInfo.Difficulty.DrainRate;
valueDictionary[BeatmapInfo.HPDrain] = hp.ToString("F2"); valueDictionary[BeatmapAttribute.HPDrain] = hp.ToString("F2");
//update od //update od
double od = workingBeatmap.BeatmapInfo.Difficulty.OverallDifficulty; double od = workingBeatmap.BeatmapInfo.Difficulty.OverallDifficulty;
valueDictionary[BeatmapInfo.Accuracy] = od.ToString("F2"); valueDictionary[BeatmapAttribute.Accuracy] = od.ToString("F2");
//update ar //update ar
double ar = workingBeatmap.BeatmapInfo.Difficulty.ApproachRate; double ar = workingBeatmap.BeatmapInfo.Difficulty.ApproachRate;
valueDictionary[BeatmapInfo.ApproachRate] = ar.ToString("F2"); valueDictionary[BeatmapAttribute.ApproachRate] = ar.ToString("F2");
//update sr //update sr
double sr = workingBeatmap.BeatmapInfo.StarRating; double sr = workingBeatmap.BeatmapInfo.StarRating;
valueDictionary[BeatmapInfo.StarRating] = sr.ToString("F2"); valueDictionary[BeatmapAttribute.StarRating] = sr.ToString("F2");
//update song title //update song title
valueDictionary[BeatmapInfo.Song] = workingBeatmap.BeatmapInfo.Metadata.Title; valueDictionary[BeatmapAttribute.Song] = workingBeatmap.BeatmapInfo.Metadata.Title;
//update artist //update artist
valueDictionary[BeatmapInfo.Artist] = workingBeatmap.BeatmapInfo.Metadata.Artist; valueDictionary[BeatmapAttribute.Artist] = workingBeatmap.BeatmapInfo.Metadata.Artist;
//update difficulty name //update difficulty name
valueDictionary[BeatmapInfo.Difficulty] = workingBeatmap.BeatmapInfo.DifficultyName; valueDictionary[BeatmapAttribute.Difficulty] = workingBeatmap.BeatmapInfo.DifficultyName;
//update mapper //update mapper
valueDictionary[BeatmapInfo.Mapper] = workingBeatmap.BeatmapInfo.Metadata.Author.Username; valueDictionary[BeatmapAttribute.Mapper] = workingBeatmap.BeatmapInfo.Metadata.Author.Username;
//update Length //update Length
valueDictionary[BeatmapInfo.Length] = TimeSpan.FromMilliseconds(workingBeatmap.BeatmapInfo.Length).ToFormattedDuration(); valueDictionary[BeatmapAttribute.Length] = TimeSpan.FromMilliseconds(workingBeatmap.BeatmapInfo.Length).ToFormattedDuration();
//update Status //update Status
valueDictionary[BeatmapInfo.Status] = GetBetmapStatus(workingBeatmap.BeatmapInfo.Status); valueDictionary[BeatmapAttribute.Status] = GetBetmapStatus(workingBeatmap.BeatmapInfo.Status);
//update BPM //update BPM
valueDictionary[BeatmapInfo.BPM] = workingBeatmap.BeatmapInfo.BPM.ToString("F2"); valueDictionary[BeatmapAttribute.BPM] = workingBeatmap.BeatmapInfo.BPM.ToString("F2");
valueDictionary[BeatmapInfo.None] = string.Empty; valueDictionary[BeatmapAttribute.None] = string.Empty;
} }
public static LocalisableString GetBetmapStatus(BeatmapOnlineStatus status) public static LocalisableString GetBetmapStatus(BeatmapOnlineStatus status)
@ -178,7 +177,7 @@ namespace osu.Game.Skinning.Components
} }
} }
public enum BeatmapInfo public enum BeatmapAttribute
{ {
CircleSize, CircleSize,
HPDrain, HPDrain,

2
osu.Game/Skinning/Components/TextElement.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Skinning.Components
{ {
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
[SettingSource("Displayed Text", "What text should be displayed")] [SettingSource("Text", "The text to be displayed.")]
public Bindable<string> Text { get; } = new Bindable<string>("Circles!"); public Bindable<string> Text { get; } = new Bindable<string>("Circles!");
public TextElement() public TextElement()