Adjust the namespace.

karaoke-dev · Sep 29, 2023 · 894effa · 894effa
1 parent fd4591d
commit 894effa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/...ubyRomaji/GenerateRubyRomajiNavigation.cs → ...cs/GenerateRuby/GenerateRubyNavigation.cs b/...ubyRomaji/GenerateRubyRomajiNavigation.cs → ...cs/GenerateRuby/GenerateRubyNavigation.cs
@@ -6,13 +6,13 @@
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Karaoke.Objects;
 
-namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRubyRomaji;
+namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRuby;
 
-public partial class GenerateRubyRomajiNavigation : TopNavigation<GenerateRubyRomajiStepScreen>
+public partial class GenerateRubyNavigation : TopNavigation<GenerateRubyStepScreen>
 {
     private const string auto_generate_ruby = "AUTO_GENERATE_RUBY";
 
-    public GenerateRubyRomajiNavigation(GenerateRubyRomajiStepScreen screen)
+    public GenerateRubyNavigation(GenerateRubyStepScreen screen)
         : base(screen)
     {
     }
@@ -54,7 +54,7 @@ protected override bool AbleToNextStep(NavigationState value)
 
     private partial class GenerateRubyTextFlowContainer : NavigationTextContainer
     {
-        public GenerateRubyTextFlowContainer(GenerateRubyRomajiStepScreen screen)
+        public GenerateRubyTextFlowContainer(GenerateRubyStepScreen screen)
         {
             AddLinkFactory(auto_generate_ruby, "auto generate ruby", screen.AskForAutoGenerateRuby);
         }

diff --git a/...ubyRomaji/GenerateRubyRomajiStepScreen.cs → ...cs/GenerateRuby/GenerateRubyStepScreen.cs b/...ubyRomaji/GenerateRubyRomajiStepScreen.cs → ...cs/GenerateRuby/GenerateRubyStepScreen.cs
@@ -7,9 +7,9 @@
 using osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Lyrics;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics;
 
-namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRubyRomaji;
+namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRuby;
 
-public partial class GenerateRubyRomajiStepScreen : LyricImporterStepScreenWithLyricEditor
+public partial class GenerateRubyStepScreen : LyricImporterStepScreenWithLyricEditor
 {
     public override string Title => "Generate ruby";
 
@@ -22,13 +22,13 @@ public partial class GenerateRubyRomajiStepScreen : LyricImporterStepScreenWithL
     [Cached(typeof(ILyricPropertyAutoGenerateChangeHandler))]
     private readonly LyricPropertyAutoGenerateChangeHandler lyricPropertyAutoGenerateChangeHandler;
 
-    public GenerateRubyRomajiStepScreen()
+    public GenerateRubyStepScreen()
     {
         AddInternal(lyricPropertyAutoGenerateChangeHandler = new LyricPropertyAutoGenerateChangeHandler());
     }
 
     protected override TopNavigation CreateNavigation()
-        => new GenerateRubyRomajiNavigation(this);
+        => new GenerateRubyNavigation(this);
 
     protected override Drawable CreateContent()
         => base.CreateContent().With(_ =>

diff --git a/...yRomaji/UseAutoGenerateRubyPopupDialog.cs → ...ateRuby/UseAutoGenerateRubyPopupDialog.cs b/...yRomaji/UseAutoGenerateRubyPopupDialog.cs → ...ateRuby/UseAutoGenerateRubyPopupDialog.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
-namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRubyRomaji;
+namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRuby;
 
 public partial class UseAutoGenerateRubyPopupDialog : PopupDialog
 {

diff --git a/....Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs b/....Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs
@@ -9,7 +9,6 @@
 using osu.Game.Rulesets.Karaoke.Objects;
 using osu.Game.Rulesets.Karaoke.Objects.Utils;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics;
-using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRubyRomaji;
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateTimeTag;
 

diff --git a/...omaji/UseAutoGenerateRomajiPopupDialog.cs → ...meTag/UseAutoGenerateRomajiPopupDialog.cs b/...omaji/UseAutoGenerateRomajiPopupDialog.cs → ...meTag/UseAutoGenerateRomajiPopupDialog.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
-namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRubyRomaji;
+namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateTimeTag;
 
 public partial class UseAutoGenerateRomajiPopupDialog : PopupDialog
 {

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterSubScreenStack.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterSubScreenStack.cs
@@ -7,7 +7,7 @@
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.AssignLanguage;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.DragFile;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.EditLyric;
-using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRubyRomaji;
+using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateRuby;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.GenerateTimeTag;
 using osu.Game.Rulesets.Karaoke.Screens.Edit.Import.Lyrics.Success;
 using osu.Game.Screens;
@@ -47,7 +47,7 @@ public void Push(LyricImporterStep step)
                 return;
 
             case LyricImporterStep.GenerateRuby:
-                Push(new GenerateRubyRomajiStepScreen());
+                Push(new GenerateRubyStepScreen());
                 return;
 
             case LyricImporterStep.GenerateTimeTag: