mirror of
https://github.com/osukey/osukey.git
synced 2025-06-01 02:47:31 +09:00
Add cover toggle button
This commit is contained in:
Bartłomiej Dach
parent
ef7812412b
commit
e74176e5bd
@ -5,7 +5,6 @@ using osu.Framework.Allocation;
|
|||||||
using osu.Framework.Audio;
|
using osu.Framework.Audio;
|
||||||
using osu.Framework.Audio.Sample;
|
using osu.Framework.Audio.Sample;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
@ -15,11 +14,11 @@ using osuTK;
|
|||||||
|
|
||||||
namespace osu.Game.Overlays.Profile.Header.Components
|
namespace osu.Game.Overlays.Profile.Header.Components
|
||||||
{
|
{
|
||||||
public partial class ExpandDetailsButton : ProfileHeaderButton
|
public partial class ToggleCoverButton : ProfileHeaderButton
|
||||||
{
|
{
|
||||||
public readonly BindableBool DetailsVisible = new BindableBool();
|
public readonly BindableBool CoverVisible = new BindableBool();
|
||||||
|
|
||||||
public override LocalisableString TooltipText => DetailsVisible.Value ? CommonStrings.ButtonsCollapse : CommonStrings.ButtonsExpand;
|
public override LocalisableString TooltipText => CoverVisible.Value ? UsersStrings.ShowCoverTo0 : UsersStrings.ShowCoverTo1;
|
||||||
|
|
||||||
private SpriteIcon icon = null!;
|
private SpriteIcon icon = null!;
|
||||||
private Sample? sampleOpen;
|
private Sample? sampleOpen;
|
||||||
@ -27,12 +26,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
|
|
||||||
protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverClickSounds();
|
protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverClickSounds();
|
||||||
|
|
||||||
public ExpandDetailsButton()
|
public ToggleCoverButton()
|
||||||
{
|
{
|
||||||
Action = () =>
|
Action = () =>
|
||||||
{
|
{
|
||||||
DetailsVisible.Toggle();
|
CoverVisible.Toggle();
|
||||||
(DetailsVisible.Value ? sampleOpen : sampleClose)?.Play();
|
(CoverVisible.Value ? sampleOpen : sampleClose)?.Play();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,19 +39,21 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
private void load(OverlayColourProvider colourProvider, AudioManager audio)
|
private void load(OverlayColourProvider colourProvider, AudioManager audio)
|
||||||
{
|
{
|
||||||
IdleColour = colourProvider.Background2;
|
IdleColour = colourProvider.Background2;
|
||||||
HoverColour = colourProvider.Background2.Lighten(0.2f);
|
HoverColour = colourProvider.Background1;
|
||||||
|
|
||||||
sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
|
sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
|
||||||
sampleClose = audio.Samples.Get(@"UI/dropdown-close");
|
sampleClose = audio.Samples.Get(@"UI/dropdown-close");
|
||||||
|
|
||||||
|
AutoSizeAxes = Axes.None;
|
||||||
|
Size = new Vector2(30);
|
||||||
Child = icon = new SpriteIcon
|
Child = icon = new SpriteIcon
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
Size = new Vector2(20, 12)
|
Size = new Vector2(10.5f, 12)
|
||||||
};
|
};
|
||||||
|
|
||||||
DetailsVisible.BindValueChanged(visible => updateState(visible.NewValue), true);
|
CoverVisible.BindValueChanged(visible => updateState(visible.NewValue), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateState(bool detailsVisible) => icon.Icon = detailsVisible ? FontAwesome.Solid.ChevronUp : FontAwesome.Solid.ChevronDown;
|
private void updateState(bool detailsVisible) => icon.Icon = detailsVisible ? FontAwesome.Solid.ChevronUp : FontAwesome.Solid.ChevronDown;
|
||||||
@ -65,108 +65,122 @@ namespace osu.Game.Overlays.Profile.Header
|
|||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
Height = 250,
|
Height = 250,
|
||||||
},
|
},
|
||||||
new FillFlowContainer
|
new Container
|
||||||
{
|
{
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Padding = new MarginPadding
|
|
||||||
{
|
|
||||||
Left = UserProfileOverlay.CONTENT_X_MARGIN,
|
|
||||||
Vertical = 10
|
|
||||||
},
|
|
||||||
Spacing = new Vector2(20, 0),
|
|
||||||
Height = 85,
|
|
||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
avatar = new UpdateableAvatar(isInteractive: false, showGuestOnNull: false)
|
new FillFlowContainer
|
||||||
{
|
{
|
||||||
Anchor = Anchor.BottomLeft,
|
Direction = FillDirection.Horizontal,
|
||||||
Origin = Anchor.BottomLeft,
|
Padding = new MarginPadding
|
||||||
Size = new Vector2(avatar_size),
|
|
||||||
Masking = true,
|
|
||||||
CornerRadius = avatar_size * 0.25f,
|
|
||||||
EdgeEffect = new EdgeEffectParameters
|
|
||||||
{
|
{
|
||||||
Type = EdgeEffectType.Shadow,
|
Left = UserProfileOverlay.CONTENT_X_MARGIN,
|
||||||
Offset = new Vector2(0, 1),
|
Vertical = 10
|
||||||
Radius = 3,
|
},
|
||||||
Colour = Colour4.Black.Opacity(0.25f),
|
Spacing = new Vector2(20, 0),
|
||||||
|
Height = 85,
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
avatar = new UpdateableAvatar(isInteractive: false, showGuestOnNull: false)
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Size = new Vector2(avatar_size),
|
||||||
|
Masking = true,
|
||||||
|
CornerRadius = avatar_size * 0.25f,
|
||||||
|
EdgeEffect = new EdgeEffectParameters
|
||||||
|
{
|
||||||
|
Type = EdgeEffectType.Shadow,
|
||||||
|
Offset = new Vector2(0, 1),
|
||||||
|
Radius = 3,
|
||||||
|
Colour = Colour4.Black.Opacity(0.25f),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
new OsuContextMenuContainer
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
RelativeSizeAxes = Axes.Y,
|
||||||
|
AutoSizeAxes = Axes.X,
|
||||||
|
Child = new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Anchor = Anchor.CentreLeft,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Spacing = new Vector2(5, 0),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
usernameText = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Font = OsuFont.GetFont(size: 24, weight: FontWeight.Regular)
|
||||||
|
},
|
||||||
|
supporterTag = new SupporterIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.CentreLeft,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
Height = 15,
|
||||||
|
},
|
||||||
|
openUserExternally = new ExternalLinkButton
|
||||||
|
{
|
||||||
|
Anchor = Anchor.CentreLeft,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
},
|
||||||
|
groupBadgeFlow = new GroupBadgeFlow
|
||||||
|
{
|
||||||
|
Anchor = Anchor.CentreLeft,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
titleText = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
|
||||||
|
Margin = new MarginPadding { Bottom = 5 }
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
userFlag = new UpdateableFlag
|
||||||
|
{
|
||||||
|
Size = new Vector2(28, 20),
|
||||||
|
ShowPlaceholderOnUnknown = false,
|
||||||
|
},
|
||||||
|
userCountryText = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
|
||||||
|
Margin = new MarginPadding { Left = 5 },
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
Anchor = Anchor.CentreLeft,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new OsuContextMenuContainer
|
new ToggleCoverButton
|
||||||
{
|
{
|
||||||
Anchor = Anchor.BottomLeft,
|
Anchor = Anchor.CentreRight,
|
||||||
Origin = Anchor.BottomLeft,
|
Origin = Anchor.CentreRight,
|
||||||
RelativeSizeAxes = Axes.Y,
|
Margin = new MarginPadding { Right = 10 }
|
||||||
AutoSizeAxes = Axes.X,
|
|
||||||
Child = new FillFlowContainer
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Direction = FillDirection.Vertical,
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Spacing = new Vector2(5, 0),
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
usernameText = new OsuSpriteText
|
|
||||||
{
|
|
||||||
Font = OsuFont.GetFont(size: 24, weight: FontWeight.Regular)
|
|
||||||
},
|
|
||||||
supporterTag = new SupporterIcon
|
|
||||||
{
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
Height = 15,
|
|
||||||
},
|
|
||||||
openUserExternally = new ExternalLinkButton
|
|
||||||
{
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
},
|
|
||||||
groupBadgeFlow = new GroupBadgeFlow
|
|
||||||
{
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
titleText = new OsuSpriteText
|
|
||||||
{
|
|
||||||
Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
|
|
||||||
Margin = new MarginPadding { Bottom = 5 }
|
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
userFlag = new UpdateableFlag
|
|
||||||
{
|
|
||||||
Size = new Vector2(28, 20),
|
|
||||||
ShowPlaceholderOnUnknown = false,
|
|
||||||
},
|
|
||||||
userCountryText = new OsuSpriteText
|
|
||||||
{
|
|
||||||
Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
|
|
||||||
Margin = new MarginPadding { Left = 5 },
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user