h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 12:42:54 +08:00
Code Issues Releases Wiki Activity

Privatize ViewTarget

Browse Source
This commit is contained in:
Lucas A 2020-02-11 18:10:46 +01:00
parent 30e0a34e50
commit b9e10cb498
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
View File

@ -32,6 +32,8 @@ namespace osu.Game.Tests.Visual.Online
{ {
public new LoadingAnimation LoadingAnimation => base.LoadingAnimation; public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
public CompositeDrawable ViewTarget => base.Content.Parent;
public TestOnlineViewContainer() public TestOnlineViewContainer()
: base(@"Please sign in to view dummy test content") : base(@"Please sign in to view dummy test content")
{ {
@ -53,9 +55,9 @@ namespace osu.Game.Tests.Visual.Online
}; };
} }
protected override void FadeContentOut(Drawable content) => content.Hide(); protected override void PopContentOut(Drawable content) => content.Hide();
protected override void FadeContentIn(Drawable content) => content.Show(); protected override void PopContentIn(Drawable content) => content.Show();
} }
[Test] [Test]
@ -63,7 +65,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online); AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
AddAssert("children are visible", () => onlineView.TransformationTarget.IsPresent); AddAssert("children are visible", () => onlineView.ViewTarget.IsPresent);
AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent); AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
} }
@ -72,7 +74,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline); AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent); AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent); AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
} }
@ -81,12 +83,16 @@ namespace osu.Game.Tests.Visual.Online
{ {
AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting); AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent); AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent); AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
}
[Test]
public void TestFailingStateVisibility()
{
AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing); AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent); AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent); AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
} }
} }

16
osu.Game/Online/OnlineViewContainer.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Online.Placeholders;
namespace osu.Game.Online namespace osu.Game.Online
{ {
/// <summary> /// <summary>
/// A <see cref="Container"/> for dislaying online content which require a local user to be logged in. /// A <see cref="Container"/> for displaying online content which require a local user to be logged in.
/// Shows its children only when the local user is logged in and supports displaying a placeholder if not. /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
/// </summary> /// </summary>
public abstract class OnlineViewContainer : Container, IOnlineComponent public abstract class OnlineViewContainer : Container, IOnlineComponent
@ -21,7 +21,7 @@ namespace osu.Game.Online
protected const double TRANSFORM_TIME = 300.0; protected const double TRANSFORM_TIME = 300.0;
internal readonly Container TransformationTarget; private readonly Container viewTarget;
protected override Container<Drawable> Content { get; } protected override Container<Drawable> Content { get; }
[Resolved] [Resolved]
@ -31,7 +31,7 @@ namespace osu.Game.Online
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
TransformationTarget = new Container viewTarget = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = Content = new Container Child = Content = new Container
@ -52,30 +52,30 @@ namespace osu.Game.Online
switch (state) switch (state)
{ {
case APIState.Offline: case APIState.Offline:
FadeContentOut(TransformationTarget); PopContentOut(viewTarget);
placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint); placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint); placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
LoadingAnimation.Hide(); LoadingAnimation.Hide();
break; break;
case APIState.Online: case APIState.Online:
FadeContentIn(TransformationTarget); PopContentIn(viewTarget);
placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint); placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
LoadingAnimation.Hide(); LoadingAnimation.Hide();
break; break;
case APIState.Failing: case APIState.Failing:
case APIState.Connecting: case APIState.Connecting:
FadeContentOut(TransformationTarget); PopContentOut(viewTarget);
LoadingAnimation.Show(); LoadingAnimation.Show();
placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint); placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
break; break;
} }
} }
protected abstract void FadeContentOut(Drawable content); protected abstract void PopContentOut(Drawable content);
protected abstract void FadeContentIn(Drawable content); protected abstract void PopContentIn(Drawable content);
protected override void LoadComplete() protected override void LoadComplete()
{ {