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

Rename classes

Browse Source
This commit is contained in:
smoogipoo 2020-09-05 03:55:43 +09:00
parent ebd11ae0b7
commit 345fb9d8e0
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Collections/TestSceneCollectionDialog.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Collections
{
Children = new Drawable[]
{
new CollectionDialog { State = { Value = Visibility.Visible } },
new ManageCollectionDialog { State = { Value = Visibility.Visible } },
dialogOverlay = new DialogOverlay()
};
}

2
osu.Game/Collections/CollectionManager.cs → osu.Game/Collections/BeatmapCollectionManager.cs
View File

@ -18,7 +18,7 @@ using osu.Game.IO.Legacy;
namespace osu.Game.Collections
{
public class CollectionManager : CompositeDrawable
public class BeatmapCollectionManager : CompositeDrawable
{
/// <summary>
/// Database version in YYYYMMDD format (matching stable).

2
osu.Game/Collections/DeleteCollectionDialog.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Collections
public class DeleteCollectionDialog : PopupDialog
{
[Resolved]
private CollectionManager collectionManager { get; set; }
private BeatmapCollectionManager collectionManager { get; set; }
public DeleteCollectionDialog(BeatmapCollection collection)
{

4
osu.Game/Collections/CollectionList.cs → osu.Game/Collections/DrawableCollectionList.cs
View File

@ -8,7 +8,7 @@ using osuTK;
namespace osu.Game.Collections
{
public class CollectionList : OsuRearrangeableListContainer<BeatmapCollection>
public class DrawableCollectionList : OsuRearrangeableListContainer<BeatmapCollection>
{
protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
{
@ -22,6 +22,6 @@ namespace osu.Game.Collections
Spacing = new Vector2(0, 2)
};
protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new CollectionListItem(item);
protected override OsuRearrangeableListItem<BeatmapCollection> CreateOsuDrawable(BeatmapCollection item) => new DrawableCollectionListItem(item);
}
}

4
osu.Game/Collections/CollectionListItem.cs → osu.Game/Collections/DrawableCollectionListItem.cs
View File

@ -18,11 +18,11 @@ using osuTK.Graphics;
namespace osu.Game.Collections
{
public class CollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
public class DrawableCollectionListItem : OsuRearrangeableListItem<BeatmapCollection>
{
private const float item_height = 35;
public CollectionListItem(BeatmapCollection item)
public DrawableCollectionListItem(BeatmapCollection item)
: base(item)
{
Padding = new MarginPadding { Right = 20 };

8
osu.Game/Collections/CollectionDialog.cs → osu.Game/Collections/ManageCollectionDialog.cs
View File

@ -13,15 +13,15 @@ using osuTK;
namespace osu.Game.Collections
{
public class CollectionDialog : OsuFocusedOverlayContainer
public class ManageCollectionDialog : OsuFocusedOverlayContainer
{
private const double enter_duration = 500;
private const double exit_duration = 200;
[Resolved]
private CollectionManager collectionManager { get; set; }
private BeatmapCollectionManager collectionManager { get; set; }
public CollectionDialog()
public ManageCollectionDialog()
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
@ -79,7 +79,7 @@ namespace osu.Game.Collections
RelativeSizeAxes = Axes.Both,
Colour = colours.GreySeafoamDarker
},
new CollectionList
new DrawableCollectionList
{
RelativeSizeAxes = Axes.Both,
Items = { BindTarget = collectionManager.Collections }

2
osu.Game/OsuGame.cs
View File

@ -633,7 +633,7 @@ namespace osu.Game
loadComponentSingleFile(CreateUpdateManager(), Add, true);
// overlay elements
loadComponentSingleFile(new CollectionDialog(), overlayContent.Add, true);
loadComponentSingleFile(new ManageCollectionDialog(), overlayContent.Add, true);
loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true);

4
osu.Game/OsuGameBase.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game
protected BeatmapManager BeatmapManager;
protected CollectionManager CollectionManager;
protected BeatmapCollectionManager CollectionManager;
protected ScoreManager ScoreManager;
@ -225,7 +225,7 @@ namespace osu.Game
dependencies.Cache(difficultyManager);
AddInternal(difficultyManager);
dependencies.Cache(CollectionManager = new CollectionManager());
dependencies.Cache(CollectionManager = new BeatmapCollectionManager());
AddInternal(CollectionManager);
dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));

8
osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
private TriangleButton undeleteButton;
[BackgroundDependencyLoader]
private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collections, DialogOverlay dialogOverlay)
private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, BeatmapCollectionManager collectionManager, DialogOverlay dialogOverlay)
{
if (beatmaps.SupportsImportFromStable)
{
@ -108,7 +108,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
}
});
if (collections.SupportsImportFromStable)
if (collectionManager.SupportsImportFromStable)
{
Add(importCollectionsButton = new SettingsButton
{
@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
Action = () =>
{
importCollectionsButton.Enabled.Value = false;
collections.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
collectionManager.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
}
});
}
@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
Text = "Delete ALL collections",
Action = () =>
{
dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() => collections.Collections.Clear()));
dialogOverlay?.Push(new DeleteAllBeatmapsDialog(() => collectionManager.Collections.Clear()));
}
});

8
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -49,10 +49,10 @@ namespace osu.Game.Screens.Select.Carousel
private BeatmapDifficultyManager difficultyManager { get; set; }
[Resolved]
private CollectionManager collectionManager { get; set; }
private BeatmapCollectionManager collectionManager { get; set; }
[Resolved(CanBeNull = true)]
private CollectionDialog collectionDialog { get; set; }
private ManageCollectionDialog manageCollectionDialog { get; set; }
private IBindable<StarDifficulty> starDifficultyBindable;
private CancellationTokenSource starDifficultyCancellationSource;
@ -228,8 +228,8 @@ namespace osu.Game.Screens.Select.Carousel
items.Add(new OsuMenuItem("Details", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value)));
var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
if (collectionDialog != null)
collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, collectionDialog.Show));
if (manageCollectionDialog != null)
collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionDialog.Show));
items.Add(new OsuMenuItem("Add to...") { Items = collectionItems });

8
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -36,10 +36,10 @@ namespace osu.Game.Screens.Select.Carousel
private DialogOverlay dialogOverlay { get; set; }
[Resolved]
private CollectionManager collectionManager { get; set; }
private BeatmapCollectionManager collectionManager { get; set; }
[Resolved(CanBeNull = true)]
private CollectionDialog collectionDialog { get; set; }
private ManageCollectionDialog manageCollectionDialog { get; set; }
private readonly BeatmapSetInfo beatmapSet;
@ -149,8 +149,8 @@ namespace osu.Game.Screens.Select.Carousel
items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay.Push(new BeatmapDeleteDialog(beatmapSet))));
var collectionItems = collectionManager.Collections.OrderByDescending(c => c.LastModifyTime).Take(3).Select(createCollectionMenuItem).ToList();
if (collectionDialog != null)
collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, collectionDialog.Show));
if (manageCollectionDialog != null)
collectionItems.Add(new OsuMenuItem("More...", MenuItemType.Standard, manageCollectionDialog.Show));
items.Add(new OsuMenuItem("Add all to...") { Items = collectionItems });

2
osu.Game/Screens/Select/FilterControl.cs
View File

@ -216,7 +216,7 @@ namespace osu.Game.Screens.Select
}
[BackgroundDependencyLoader]
private void load(CollectionManager collectionManager)
private void load(BeatmapCollectionManager collectionManager)
{
collections.BindTo(collectionManager.Collections);
collections.CollectionChanged += (_, __) => collectionsChanged();