sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify UI implementation

Browse Source
This commit is contained in:
MATRIX-feather
2020-12-04 04:10:08 +08:00
parent 85de1a1d20
commit fb080284d2
1 changed files with 54 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
osu.Game/Screens/Import/FileImportScreen.cs
View File

@ -13,7 +13,6 @@ using osu.Framework.Screens;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Graphics.UserInterfaceV2;
using osuTK; using osuTK;
using osu.Game.Overlays;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osuTK.Graphics; using osuTK.Graphics;
@ -22,30 +21,32 @@ namespace osu.Game.Screens.Import
{ {
public class FileImportScreen : OsuScreen public class FileImportScreen : OsuScreen
{ {
private Container contentContainer;
private FileSelector fileSelector;
private Container fileSelectContainer;
public override bool HideOverlaysOnEnter => true; public override bool HideOverlaysOnEnter => true;
private string defaultPath;
private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>(); private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>(); private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
private FileSelector fileSelector;
private Container contentContainer;
private TextFlowContainer currentFileText; private TextFlowContainer currentFileText;
private OsuScrollContainer fileNameScroll; private OsuScrollContainer fileNameScroll;
private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
private const float duration = 300;
private const float button_height = 50;
private const float button_vertical_margin = 15;
[Resolved] [Resolved]
private OsuGameBase gameBase { get; set; } private OsuGameBase gameBase { get; set; }
[Resolved]
private OsuColour colours { get; set; }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(Storage storage) private void load(Storage storage)
{ {
storage.GetStorageForDirectory("imports"); storage.GetStorageForDirectory("imports");
var originalPath = storage.GetFullPath("imports", true); var originalPath = storage.GetFullPath("imports", true);
string[] fileExtensions = { ".osk", ".osr", ".osz" }; string[] fileExtensions = { ".osk", ".osr", ".osz" };
defaultPath = originalPath;
var directory = currentDirectory.Value?.FullName ?? defaultPath;
InternalChild = contentContainer = new Container InternalChild = contentContainer = new Container
{ {
@ -59,19 +60,13 @@ namespace osu.Game.Screens.Import
{ {
new Box new Box
{ {
Colour = overlayColourProvider.Background5, Colour = colours.GreySeafoamDark,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
fileSelectContainer = new Container fileSelector = new FileSelector(initialPath: originalPath, validFileExtensions: fileExtensions)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Width = 0.65f, Width = 0.65f
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
Child = fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
{
RelativeSizeAxes = Axes.Both
}
}, },
new Container new Container
{ {
@ -79,87 +74,48 @@ namespace osu.Game.Screens.Import
Width = 0.35f, Width = 0.35f,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Masking = true,
CornerRadius = 10,
Children = new Drawable[] Children = new Drawable[]
{ {
new GridContainer new Box
{
Colour = colours.GreySeafoamDarker,
RelativeSizeAxes = Axes.Both
},
new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RowDimensions = new[] Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
Child = fileNameScroll = new OsuScrollContainer
{ {
new Dimension(), RelativeSizeAxes = Axes.Both,
new Dimension(GridSizeMode.AutoSize), Anchor = Anchor.TopCentre,
}, Origin = Anchor.TopCentre,
Content = new[] Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
{
new Drawable[]
{ {
new Container AutoSizeAxes = Axes.Y,
{ RelativeSizeAxes = Axes.X,
RelativeSizeAxes = Axes.Both, Anchor = Anchor.Centre,
Anchor = Anchor.TopCentre, Origin = Anchor.Centre,
Origin = Anchor.TopCentre, TextAnchor = Anchor.Centre
Children = new Drawable[]
{
new Box
{
Colour = overlayColourProvider.Background3,
RelativeSizeAxes = Axes.Both
},
fileNameScroll = new OsuScrollContainer
{
Masking = false,
RelativeSizeAxes = Axes.Both,
Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextAnchor = Anchor.Centre
},
},
}
},
}, },
new Drawable[] },
{ },
new Container new TriangleButton
{ {
RelativeSizeAxes = Axes.X, Text = "Import",
AutoSizeAxes = Axes.Y, Anchor = Anchor.BottomCentre,
Margin = new MarginPadding { Bottom = 15, Top = 15 }, Origin = Anchor.BottomCentre,
Children = new Drawable[] RelativeSizeAxes = Axes.X,
{ Height = button_height,
new FillFlowContainer Width = 0.9f,
{ Margin = new MarginPadding { Vertical = button_vertical_margin },
RelativeSizeAxes = Axes.X, Action = () =>
AutoSizeAxes = Axes.Y, {
Children = new Drawable[] var d = currentFile.Value?.FullName;
{ if (d != null)
new TriangleButton startImport(d);
{ else
Text = "Import", currentFileText.FlashColour(Color4.Red, 500);
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = 50,
Width = 0.9f,
Action = () =>
{
var d = currentFile.Value?.FullName;
if (d != null)
startImport(d);
else
currentFileText.FlashColour(Color4.Red, 500);
}
}
}
}
}
}
}
} }
} }
} }
@ -190,15 +146,14 @@ namespace osu.Game.Screens.Import
contentContainer.FadeOut().Then().ScaleTo(0.95f) contentContainer.FadeOut().Then().ScaleTo(0.95f)
.Then() .Then()
.ScaleTo(1, 300, Easing.OutQuint) .ScaleTo(1, duration, Easing.OutQuint)
.FadeIn(300); .FadeIn(duration);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
contentContainer.ScaleTo(0.95f, 300, Easing.OutQuint) contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
.FadeOut(300); this.FadeOut(duration, Easing.OutQuint);
this.FadeOut(500, Easing.OutExpo);
return base.OnExiting(next); return base.OnExiting(next);
} }
@ -210,8 +165,8 @@ namespace osu.Game.Screens.Import
if (!File.Exists(path)) if (!File.Exists(path))
{ {
currentFileText.Text = "File not exist"; currentFileText.Text = "No such file";
currentFileText.FlashColour(Color4.Red, 500); currentFileText.FlashColour(colours.Red, duration);
return; return;
} }