Move components to their screen's component folder

stanriders · stanriders · commit b8c17f076a3b · 2025-12-13T23:22:45.000+05:00
diff --git a/PerformanceCalculatorGUI/Components/BeatmapCard.cs b/PerformanceCalculatorGUI/Components/BeatmapCard.cs
@@ -217,7 +217,7 @@ private void updateValues() => Scheduler.AddOnce(() =>
                 if (beatmap?.BeatmapInfo == null)
                     return;
 
-                Ruleset rulesetInstance = ruleset.Value.CreateInstance();
+                var rulesetInstance = ruleset.Value.CreateInstance();
                 var displayAttributes = rulesetInstance.GetBeatmapAttributesForDisplay(beatmap.BeatmapInfo, mods.Value).ToList();
 
                 // make sure we have enough displays
diff --git a/PerformanceCalculatorGUI/Screens/Leaderboard/LeaderboardTable.cs b/PerformanceCalculatorGUI/Screens/Leaderboard/LeaderboardTable.cs
@@ -13,7 +13,7 @@
 using osu.Game.Overlays.Rankings.Tables;
 using osu.Game.Users;
 
-namespace PerformanceCalculatorGUI.Components
+namespace PerformanceCalculatorGUI.Screens.Leaderboard
 {
     public class LeaderboardUser
     {
diff --git a/PerformanceCalculatorGUI/Screens/LeaderboardScreen.cs b/PerformanceCalculatorGUI/Screens/LeaderboardScreen.cs
@@ -24,6 +24,7 @@
 using PerformanceCalculatorGUI.Components;
 using PerformanceCalculatorGUI.Components.TextBoxes;
 using PerformanceCalculatorGUI.Configuration;
+using PerformanceCalculatorGUI.Screens.Leaderboard;
 
 namespace PerformanceCalculatorGUI.Screens
 {
diff --git a/PerformanceCalculatorGUI/Screens/Profile/ProfileSortCriteria.cs b/PerformanceCalculatorGUI/Screens/Profile/ProfileSortCriteria.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace PerformanceCalculatorGUI.Components
+namespace PerformanceCalculatorGUI.Screens.Profile
 {
     public enum ProfileSortCriteria
     {
diff --git a/PerformanceCalculatorGUI/Screens/Profile/UserCard.cs b/PerformanceCalculatorGUI/Screens/Profile/UserCard.cs
@@ -17,7 +17,7 @@
 using osu.Game.Users.Drawables;
 using PerformanceCalculatorGUI.Components.TextBoxes;
 
-namespace PerformanceCalculatorGUI.Components
+namespace PerformanceCalculatorGUI.Screens.Profile
 {
     public struct UserCardData
     {
diff --git a/PerformanceCalculatorGUI/Screens/ProfileScreen.cs b/PerformanceCalculatorGUI/Screens/ProfileScreen.cs
@@ -28,6 +28,7 @@
 using PerformanceCalculatorGUI.Components;
 using PerformanceCalculatorGUI.Components.TextBoxes;
 using PerformanceCalculatorGUI.Configuration;
+using PerformanceCalculatorGUI.Screens.Profile;
 using ButtonState = PerformanceCalculatorGUI.Components.ButtonState;
 
 namespace PerformanceCalculatorGUI.Screens
diff --git a/PerformanceCalculatorGUI/Screens/Simulate/ExtendedUserModSelectOverlay.cs b/PerformanceCalculatorGUI/Screens/Simulate/ExtendedUserModSelectOverlay.cs
@@ -5,7 +5,7 @@
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 
-namespace PerformanceCalculatorGUI.Components
+namespace PerformanceCalculatorGUI.Screens.Simulate
 {
     public partial class ExtendedUserModSelectOverlay : UserModSelectOverlay
     {
diff --git a/PerformanceCalculatorGUI/Screens/Simulate/StrainVisualizer.cs b/PerformanceCalculatorGUI/Screens/Simulate/StrainVisualizer.cs
@@ -20,9 +20,10 @@
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
+using PerformanceCalculatorGUI.Components;
 using PerformanceCalculatorGUI.Components.TextBoxes;
 
-namespace PerformanceCalculatorGUI.Components
+namespace PerformanceCalculatorGUI.Screens.Simulate
 {
     public partial class StrainVisualizer : Container
     {
@@ -245,7 +246,7 @@ private void addTooltipBars(List<float[]> strainLists, int nBars = 1000)
 
         private static List<float[]> getStrainLists(Skill[] skills)
         {
-            List<float[]> strainLists = new List<float[]>();
+            var strainLists = new List<float[]>();
 
             foreach (var skill in skills)
             {
@@ -256,7 +257,7 @@ private static List<float[]> getStrainLists(Skill[] skills)
                 for (int i = 0; i < strains.Length; i++)
                 {
                     double strain = strains[i];
-                    skillStrainList.Add(((float)strain));
+                    skillStrainList.Add((float)strain);
                 }
 
                 strainLists.Add(skillStrainList.ToArray());

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`using osu.Game.Overlays.Rankings.Tables;`
`14`	`14`	`using osu.Game.Users;`
`15`	`15`
`16`		`-namespace PerformanceCalculatorGUI.Components`
	`16`	`+namespace PerformanceCalculatorGUI.Screens.Leaderboard`
`17`	`17`	`{`
`18`	`18`	`public class LeaderboardUser`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`using PerformanceCalculatorGUI.Components;`
`25`	`25`	`using PerformanceCalculatorGUI.Components.TextBoxes;`
`26`	`26`	`using PerformanceCalculatorGUI.Configuration;`
	`27`	`+using PerformanceCalculatorGUI.Screens.Leaderboard;`
`27`	`28`
`28`	`29`	`namespace PerformanceCalculatorGUI.Screens`
`29`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.`
`2`	`2`	`// See the LICENCE file in the repository root for full licence text.`
`3`	`3`
`4`		`-namespace PerformanceCalculatorGUI.Components`
	`4`	`+namespace PerformanceCalculatorGUI.Screens.Profile`
`5`	`5`	`{`
`6`	`6`	`public enum ProfileSortCriteria`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`using osu.Game.Users.Drawables;`
`18`	`18`	`using PerformanceCalculatorGUI.Components.TextBoxes;`
`19`	`19`
`20`		`-namespace PerformanceCalculatorGUI.Components`
	`20`	`+namespace PerformanceCalculatorGUI.Screens.Profile`
`21`	`21`	`{`
`22`	`22`	`public struct UserCardData`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using osu.Game.Overlays;`
`6`	`6`	`using osu.Game.Overlays.Mods;`
`7`	`7`
`8`		`-namespace PerformanceCalculatorGUI.Components`
	`8`	`+namespace PerformanceCalculatorGUI.Screens.Simulate`
`9`	`9`	`{`
`10`	`10`	`public partial class ExtendedUserModSelectOverlay : UserModSelectOverlay`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,10 @@`
`20`	`20`	`using osu.Game.Screens.Edit.Compose.Components.Timeline;`
`21`	`21`	`using osuTK;`
`22`	`22`	`using osuTK.Graphics;`
	`23`	`+using PerformanceCalculatorGUI.Components;`
`23`	`24`	`using PerformanceCalculatorGUI.Components.TextBoxes;`
`24`	`25`
`25`		`-namespace PerformanceCalculatorGUI.Components`
	`26`	`+namespace PerformanceCalculatorGUI.Screens.Simulate`
`26`	`27`	`{`
`27`	`28`	`public partial class StrainVisualizer : Container`
`28`	`29`	`{`
`@@ -245,7 +246,7 @@ private void addTooltipBars(List<float[]> strainLists, int nBars = 1000)`
`245`	`246`
`246`	`247`	`private static List<float[]> getStrainLists(Skill[] skills)`
`247`	`248`	`{`
`248`		`- List<float[]> strainLists = new List<float[]>();`
	`249`	`+ var strainLists = new List<float[]>();`
`249`	`250`
`250`	`251`	`foreach (var skill in skills)`
`251`	`252`	`{`
`@@ -256,7 +257,7 @@ private static List<float[]> getStrainLists(Skill[] skills)`
`256`	`257`	`for (int i = 0; i < strains.Length; i++)`
`257`	`258`	`{`
`258`	`259`	`double strain = strains[i];`
`259`		`- skillStrainList.Add(((float)strain));`
	`260`	`+ skillStrainList.Add((float)strain);`
`260`	`261`	`}`
`261`	`262`
`262`	`263`	`strainLists.Add(skillStrainList.ToArray());`