-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31543 from bdach/daily-challenge-completion-marker
Add completion marker to daily challenge profile counter
- Loading branch information
Showing
3 changed files
with
130 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,22 @@ | ||
| // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using System; | ||
| using osu.Framework.Allocation; | ||
| using osu.Framework.Bindables; | ||
| using osu.Framework.Extensions.LocalisationExtensions; | ||
| using osu.Framework.Graphics; | ||
| using osu.Framework.Graphics.Containers; | ||
| using osu.Framework.Graphics.Cursor; | ||
| using osu.Framework.Graphics.Shapes; | ||
| using osu.Framework.Graphics.Sprites; | ||
| using osu.Game.Graphics; | ||
| using osu.Game.Graphics.Containers; | ||
| using osu.Game.Graphics.Sprites; | ||
| using osu.Game.Localisation; | ||
| using osu.Game.Online.API; | ||
| using osu.Game.Online.API.Requests.Responses; | ||
| using osuTK; | ||
|
|
||
| namespace osu.Game.Overlays.Profile.Header.Components | ||
| { | ||
|
|
@@ -23,6 +27,11 @@ public partial class DailyChallengeStatsDisplay : CompositeDrawable, IHasCustomT | |
| public DailyChallengeTooltipData? TooltipContent { get; private set; } | ||
|
|
||
| private OsuSpriteText dailyPlayCount = null!; | ||
| private Container content = null!; | ||
| private CircularContainer completionMark = null!; | ||
|
|
||
| [Resolved] | ||
| private IAPIProvider api { get; set; } = null!; | ||
|
|
||
| [Resolved] | ||
| private OsuColour colours { get; set; } = null!; | ||
|
|
@@ -34,58 +43,91 @@ public partial class DailyChallengeStatsDisplay : CompositeDrawable, IHasCustomT | |
| private void load() | ||
| { | ||
| AutoSizeAxes = Axes.Both; | ||
| CornerRadius = 5; | ||
| Masking = true; | ||
|
|
||
| InternalChildren = new Drawable[] | ||
| { | ||
| new Box | ||
| { | ||
| RelativeSizeAxes = Axes.Both, | ||
| Colour = colourProvider.Background4, | ||
| }, | ||
| new FillFlowContainer | ||
| content = new Container | ||
| { | ||
| Anchor = Anchor.Centre, | ||
| Origin = Anchor.Centre, | ||
| Padding = new MarginPadding(5f), | ||
| AutoSizeAxes = Axes.Both, | ||
| Direction = FillDirection.Horizontal, | ||
| CornerRadius = 6, | ||
| BorderThickness = 2, | ||
| BorderColour = colourProvider.Background4, | ||
| Masking = true, | ||
| Children = new Drawable[] | ||
| { | ||
| new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12)) | ||
| new Box | ||
| { | ||
| AutoSizeAxes = Axes.Both, | ||
| // can't use this because osu-web does weird stuff with \\n. | ||
| // Text = UsersStrings.ShowDailyChallengeTitle., | ||
| Text = "Daily\nChallenge", | ||
| Margin = new MarginPadding { Horizontal = 5f, Bottom = 2f }, | ||
| RelativeSizeAxes = Axes.Both, | ||
| Colour = colourProvider.Background4, | ||
| }, | ||
| new Container | ||
| new FillFlowContainer | ||
| { | ||
| AutoSizeAxes = Axes.X, | ||
| RelativeSizeAxes = Axes.Y, | ||
| CornerRadius = 5f, | ||
| Masking = true, | ||
| Anchor = Anchor.Centre, | ||
| Origin = Anchor.Centre, | ||
| Padding = new MarginPadding(3f), | ||
| AutoSizeAxes = Axes.Both, | ||
| Direction = FillDirection.Horizontal, | ||
| Children = new Drawable[] | ||
| { | ||
| new Box | ||
| new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12)) | ||
| { | ||
| RelativeSizeAxes = Axes.Both, | ||
| Colour = colourProvider.Background6, | ||
| AutoSizeAxes = Axes.Both, | ||
| // can't use this because osu-web does weird stuff with \\n. | ||
| // Text = UsersStrings.ShowDailyChallengeTitle., | ||
| Text = "Daily\nChallenge", | ||
| Margin = new MarginPadding { Horizontal = 5f, Bottom = 2f }, | ||
| }, | ||
| dailyPlayCount = new OsuSpriteText | ||
| new Container | ||
| { | ||
| Anchor = Anchor.Centre, | ||
| Origin = Anchor.Centre, | ||
| UseFullGlyphHeight = false, | ||
| Colour = colourProvider.Content2, | ||
| Margin = new MarginPadding { Horizontal = 10f, Vertical = 5f }, | ||
| AutoSizeAxes = Axes.X, | ||
| RelativeSizeAxes = Axes.Y, | ||
| CornerRadius = 3, | ||
| Masking = true, | ||
| Children = new Drawable[] | ||
| { | ||
| new Box | ||
| { | ||
| RelativeSizeAxes = Axes.Both, | ||
| Colour = colourProvider.Background6, | ||
| }, | ||
| dailyPlayCount = new OsuSpriteText | ||
| { | ||
| Anchor = Anchor.Centre, | ||
| Origin = Anchor.Centre, | ||
| UseFullGlyphHeight = false, | ||
| Colour = colourProvider.Content2, | ||
| Margin = new MarginPadding { Horizontal = 10f, Vertical = 5f }, | ||
| }, | ||
| } | ||
| }, | ||
| } | ||
| }, | ||
| } | ||
| }, | ||
| completionMark = new CircularContainer | ||
| { | ||
| Alpha = 0, | ||
| Size = new Vector2(16), | ||
| Anchor = Anchor.TopRight, | ||
| Origin = Anchor.Centre, | ||
| Masking = true, | ||
| Children = new Drawable[] | ||
| { | ||
| new Box | ||
| { | ||
| RelativeSizeAxes = Axes.Both, | ||
| Colour = colours.Lime1, | ||
| }, | ||
| new SpriteIcon | ||
| { | ||
| Size = new Vector2(8), | ||
| Colour = colourProvider.Background6, | ||
| Anchor = Anchor.Centre, | ||
| Origin = Anchor.Centre, | ||
| Icon = FontAwesome.Solid.Check, | ||
| } | ||
| } | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
|
|
@@ -114,6 +156,29 @@ private void updateDisplay() | |
| dailyPlayCount.Text = DailyChallengeStatsDisplayStrings.UnitDay(stats.PlayCount.ToLocalisableString("N0")); | ||
| dailyPlayCount.Colour = colours.ForRankingTier(DailyChallengeStatsTooltip.TierForPlayCount(stats.PlayCount)); | ||
|
|
||
| bool playedToday = stats.LastUpdate?.Date == DateTimeOffset.UtcNow.Date; | ||
| bool userIsOnOwnProfile = stats.UserID == api.LocalUser.Value.Id; | ||
|
|
||
| if (playedToday && userIsOnOwnProfile) | ||
| { | ||
| if (completionMark.Alpha > 0.8f) | ||
| { | ||
| completionMark.ScaleTo(1.2f).ScaleTo(1, 800, Easing.OutElastic); | ||
| } | ||
| else | ||
| { | ||
| completionMark.FadeIn(500, Easing.OutExpo); | ||
| completionMark.ScaleTo(1.6f).ScaleTo(1, 500, Easing.OutExpo); | ||
| } | ||
|
|
||
| content.BorderColour = colours.Lime1; | ||
| } | ||
| else | ||
| { | ||
| completionMark.FadeOut(50); | ||
| content.BorderColour = colourProvider.Background4; | ||
| } | ||
|
|
||
| TooltipContent = new DailyChallengeTooltipData(colourProvider, stats); | ||
|
|
||
| Show(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters