Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow changing current star difficulty of a StarRatingDisplay #12747

Merged
merged 9 commits into from
May 15, 2021
Merged

Allow changing current star difficulty of a StarRatingDisplay #12747

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
301dab1
Refactor `StarRatingDisplay` to be mutable with a current bindable
frenzibyte May 8, 2021
ca772b6
Use regular test steps rather than one-time set up and scheduling
frenzibyte May 8, 2021
1c49590
Apply further refactoring to star rating display UX-wise
frenzibyte May 8, 2021
afc9a1b
Remove rolling support and apply few adjustments
frenzibyte May 10, 2021
0655825
Separate changing star rating display to own test
frenzibyte May 14, 2021
34aab11
Add null star rating display test case
frenzibyte May 14, 2021
6cc678f
Remove nullability and transition support from star rating display
frenzibyte May 14, 2021
8b4e6d2
Remove no longer necessary `FinishTransforms(true)` call
bdach May 14, 2021
1c92b3a
De-duplicate star rating display creation in test
bdach May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove rolling support and apply few adjustments
  • Loading branch information
@frenzibyte
frenzibyte committed May 10, 2021
commit afc9a1bf235ef9c3026292254d788ce98072158d
81 changes: 28 additions & 53 deletions osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
using osu.Framework.Graphics.UserInterface;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.Containers;
using osuTK;
using osuTK.Graphics;

Expand All @@ -25,23 +25,7 @@ namespace osu.Game.Screens.Ranking.Expanded
public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
{
private Box background;
private OsuSpriteText wholePart;
private OsuSpriteText fractionPart;

private double displayedStarRating;

protected double DisplayedStarRating
{
get => displayedStarRating;
set
{
displayedStarRating = value;

var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
wholePart.Text = starRatingParts[0];
fractionPart.Text = starRatingParts[1];
}
}
private OsuTextFlowContainer textFlow;

[Resolved]
private OsuColour colours { get; set; }
Expand Down Expand Up @@ -105,40 +89,13 @@ private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
Icon = FontAwesome.Solid.Star,
Colour = Color4.Black
},
new FillFlowContainer
textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = new[]
{
wholePart = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Colour = Color4.Black,
Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
UseFullGlyphHeight = false,
},
new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Colour = Color4.Black,
Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
UseFullGlyphHeight = false,
},
fractionPart = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Colour = Color4.Black,
Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
UseFullGlyphHeight = false,
}
}
TextAnchor = Anchor.BottomLeft,
}
}
}
Expand All @@ -158,21 +115,39 @@ private void updateDisplay()
const double duration = 400;
const Easing easing = Easing.OutQuint;

ColourInfo backgroundColour;
double stars = Current.Value?.Stars ?? 0.00f;

var starRatingParts = stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
string wholePart = starRatingParts[0];
string fractionPart = starRatingParts[1];
string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;

if (Current.Value == null)
backgroundColour = Color4.SlateGray.Opacity(0.3f);
background.FadeColour(Color4.SlateGray.Opacity(0.3f));
else
{
var rating = Current.Value.Value.DifficultyRating;

backgroundColour = rating == DifficultyRating.ExpertPlus
background.FadeColour(rating == DifficultyRating.ExpertPlus
? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
: (ColourInfo)colours.ForDifficultyRating(rating);
: (ColourInfo)colours.ForDifficultyRating(rating), duration, easing);
}

background.FadeColour(backgroundColour, duration, easing);
this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
textFlow.Clear();

textFlow.AddText($"{wholePart}", s =>
frenzibyte marked this conversation as resolved.
Show resolved Hide resolved
{
s.Colour = Color4.Black;
s.Font = s.Font.With(size: 14);
s.UseFullGlyphHeight = false;
});

textFlow.AddText($"{separator}{fractionPart}", s =>
{
s.Colour = Color4.Black;
s.Font = s.Font.With(size: 7);
s.UseFullGlyphHeight = false;
});
}
}
}