Merge pull request #1287 from andy840119/update-nuget-package

Update nuget package.
karaoke-dev · Apr 24, 2022 · 950c3d7 · 950c3d7
2 parents e6eb7b8 + af76420
commit 950c3d7
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 30 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneKaraokeEditor.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneKaraokeEditor.cs
@@ -52,7 +52,7 @@ private void load()
                 lyricCheckerManager = new LyricCheckerManager()
             });
 
-            Dependencies.Cache(dialogOverlay);
+            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
             Dependencies.Cache(lyricCheckerManager);
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLyricEditorScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLyricEditorScreen.cs
@@ -39,7 +39,7 @@ private void load()
                 lyricCheckManager = new LyricCheckerManager(),
             });
 
-            Dependencies.Cache(dialogOverlay);
+            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
             Dependencies.CacheAs<ILyricsProvider>(lyricsProvider);
             Dependencies.Cache(lyricCheckManager);
             Dependencies.Cache(new KaraokeRulesetLyricEditorConfigManager());

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLyricImporter.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLyricImporter.cs
@@ -53,7 +53,7 @@ private void load()
                 dialogOverlay = new DialogOverlay(),
             });
 
-            Dependencies.Cache(dialogOverlay);
+            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
             Dependencies.Cache(new EditorClock());
         }
 

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneSingerScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneSingerScreen.cs
@@ -87,7 +87,7 @@ private void load()
             Dependencies.CacheAs(editorClock);
             Dependencies.Cache(beatDivisor);
             Dependencies.CacheAs<ILyricsProvider>(lyricsProvider);
-            Dependencies.Cache(dialogOverlay);
+            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneTranslateScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneTranslateScreen.cs
@@ -48,7 +48,7 @@ private void load()
                 lyricsProvider = new LyricsProvider()
             });
 
-            Dependencies.Cache(dialogOverlay);
+            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
             Dependencies.CacheAs<ILyricsProvider>(lyricsProvider);
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Edit/ImportLyric/DragFile/DragFileStepScreen.cs b/osu.Game.Rulesets.Karaoke/Edit/ImportLyric/DragFile/DragFileStepScreen.cs
@@ -134,28 +134,28 @@ public override void ConfirmRollBackFromStep(ILyricImporterStepScreen fromScreen
             });
         }
 
-        public override void OnEntering(IScreen last)
+        public override void OnEntering(ScreenTransitionEvent e)
         {
             game.RegisterImportHandler(this);
-            base.OnEntering(last);
+            base.OnEntering(e);
         }
 
-        public override void OnResuming(IScreen last)
+        public override void OnResuming(ScreenTransitionEvent e)
         {
             game.RegisterImportHandler(this);
-            base.OnResuming(last);
+            base.OnResuming(e);
         }
 
-        public override void OnSuspending(IScreen next)
+        public override void OnSuspending(ScreenTransitionEvent e)
         {
             game.UnregisterImportHandler(this);
-            base.OnSuspending(next);
+            base.OnSuspending(e);
         }
 
-        public override bool OnExiting(IScreen next)
+        public override bool OnExiting(ScreenExitEvent e)
         {
             game.UnregisterImportHandler(this);
-            return base.OnExiting(next);
+            return base.OnExiting(e);
         }
 
         private PopupDialog createFileNotFoundDialog()

diff --git a/osu.Game.Rulesets.Karaoke/Edit/ImportLyric/LyricImporterStepScreen.cs b/osu.Game.Rulesets.Karaoke/Edit/ImportLyric/LyricImporterStepScreen.cs
@@ -24,7 +24,7 @@ public abstract class LyricImporterStepScreen : OsuScreen, ILyricImporterStepScr
         protected LyricImporterSubScreenStack ScreenStack { get; private set; }
 
         [Resolved]
-        protected DialogOverlay DialogOverlay { get; private set; }
+        protected IDialogOverlay DialogOverlay { get; private set; }
 
         public abstract string ShortTitle { get; }
 
@@ -51,31 +51,29 @@ protected LyricImporterStepScreen()
             };
         }
 
-        public override void OnEntering(IScreen last)
+        public override void OnEntering(ScreenTransitionEvent e)
         {
+            base.OnEntering(e);
             this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
-            this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(X_SHIFT).MoveToX(0, X_MOVE_DURATION, Easing.OutQuint);
         }
 
-        public override bool OnExiting(IScreen next)
+        public override bool OnExiting(ScreenExitEvent e)
         {
+            base.OnExiting(e);
             this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(X_SHIFT, X_MOVE_DURATION, Easing.OutQuint);
-
             return false;
         }
 
-        public override void OnResuming(IScreen last)
+        public override void OnResuming(ScreenTransitionEvent e)
         {
-            this.Delay(RESUME_TRANSITION_DELAY).FadeIn(APPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(0, X_MOVE_DURATION, Easing.OutQuint);
+            base.OnResuming(e);
+            this.FadeIn(APPEAR_DURATION, Easing.OutQuint);
         }
 
-        public override void OnSuspending(IScreen next)
+        public override void OnSuspending(ScreenTransitionEvent e)
         {
+            base.OnSuspending(e);
             this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(-X_SHIFT, X_MOVE_DURATION, Easing.OutQuint);
         }
 
         public abstract void Complete();

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/EditLyricRow.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/EditLyricRow.cs
@@ -69,7 +69,7 @@ public class InfoControl : Container, IHasContextMenu
             private readonly IBindable<TimeTagEditMode> bindableTimeTagEditMode = new Bindable<TimeTagEditMode>();
 
             [Resolved(canBeNull: true)]
-            private DialogOverlay dialogOverlay { get; set; }
+            private IDialogOverlay dialogOverlay { get; set; }
 
             [Resolved]
             private ILyricsChangeHandler lyricsChangeHandler { get; set; }

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Singers/Rows/SingerLyricPlacementRow.cs b/osu.Game.Rulesets.Karaoke/Edit/Singers/Rows/SingerLyricPlacementRow.cs
@@ -48,7 +48,7 @@ internal class DrawableSingerInfo : CompositeDrawable, IHasCustomTooltip<Singer>
             private ISingersChangeHandler singersChangeHandler { get; set; }
 
             [Resolved]
-            private DialogOverlay dialogOverlay { get; set; }
+            private IDialogOverlay dialogOverlay { get; set; }
 
             private readonly IBindable<int> bindableOrder = new Bindable<int>();
             private readonly IBindable<float> bindableHue = new Bindable<float>();

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Translate/Components/RemoveLanguageButton.cs b/osu.Game.Rulesets.Karaoke/Edit/Translate/Components/RemoveLanguageButton.cs
@@ -17,7 +17,7 @@ public class RemoveLanguageButton : IconButton
         private ILanguagesChangeHandler languagesChangeHandler { get; set; }
 
         [Resolved]
-        private DialogOverlay dialogOverlay { get; set; }
+        private IDialogOverlay dialogOverlay { get; set; }
 
         [Resolved]
         private IBindable<CultureInfo> currentLanguage { get; set; }

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Layout/Components/DrawableLayoutListItem.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Layout/Components/DrawableLayoutListItem.cs
@@ -157,7 +157,7 @@ public class DeleteButton : CompositeDrawable
                 public Func<Vector2, bool> IsTextBoxHovered;
 
                 [Resolved(CanBeNull = true)]
-                private DialogOverlay dialogOverlay { get; set; }
+                private IDialogOverlay dialogOverlay { get; set; }
 
                 [Resolved(CanBeNull = true)]
                 private LayoutManager layoutManager { get; set; }

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.424.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.327.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.418.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.424.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />