Remove the layout class and definition.

osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/KaraokeSkinElementConverterTest.cs

@@ -44,40 +44,6 @@ public void TestLyricConfigDeserialize()
         ObjectAssert.ArePropertyEqual(expected, actual);
     }
 
-    [Test]
-    public void TestLyricLayoutSerializer()
-    {
-        var lyricLayout = new LyricLayout
-        {
-            ID = 1,
-            Name = "Testing layout",
-            Alignment = Anchor.TopLeft,
-            HorizontalMargin = 10,
-            VerticalMargin = 20,
-        };
-
-        const string expected = "{\"$type\":1,\"id\":1,\"name\":\"Testing layout\",\"alignment\":9,\"horizontal_margin\":10,\"vertical_margin\":20}";
-        string actual = JsonConvert.SerializeObject(lyricLayout, CreateSettings());
-        Assert.AreEqual(expected, actual);
-    }
-
-    [Test]
-    public void TestLyricLayoutDeserialize()
-    {
-        const string json = "{\"$type\":1,\"id\":1,\"name\":\"Testing layout\",\"alignment\":9,\"horizontal_margin\":10,\"vertical_margin\":20}";
-
-        var expected = new LyricLayout
-        {
-            ID = 1,
-            Name = "Testing layout",
-            Alignment = Anchor.TopLeft,
-            HorizontalMargin = 10,
-            VerticalMargin = 20,
-        };
-        var actual = (LyricLayout)JsonConvert.DeserializeObject<IKaraokeSkinElement>(json, CreateSettings())!;
-        ObjectAssert.ArePropertyEqual(expected, actual);
-    }
-
     [Test]
     public void TestLyricStyleSerializer()
     {

osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeBeatmapSkinDecodingTest.cs

@@ -40,22 +40,4 @@ public void TestKaraokeBeatmapSkinDefaultValue()
         Assert.IsNotNull(defaultLyricStyle.Name, "Default lyric style");
         Assert.IsNotNull(defaultNoteStyle.Name, "Default note style");
     }
-
-    [Test]
-    public void TestKaraokeBeatmapSkinLayout()
-    {
-        var storage = TestResources.CreateSkinStorageResourceProvider();
-        var skin = new KaraokeBeatmapSkin(new SkinInfo { Name = "special-skin" }, storage);
-
-        var firstLyric = new Lyric();
-        var secondLyric = new Lyric();
-
-        // try to get customized value from the skin.
-        var firstLyricLayout = skin.GetConfig<Lyric, LyricLayout>(firstLyric)!.Value;
-        var secondLyricLayout = skin.GetConfig<Lyric, LyricLayout>(secondLyric)!.Value;
-
-        // There's no default layout in the skin.
-        Assert.IsNull(firstLyricLayout);
-        Assert.IsNull(secondLyricLayout);
-    }
 }

osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinElementConverter.cs

@@ -19,7 +19,6 @@ public static ElementType GetElementType(MemberInfo elementType) =>
         elementType switch
         {
             _ when elementType == typeof(LyricFontInfo) => ElementType.LyricFontInfo,
-            _ when elementType == typeof(LyricLayout) => ElementType.LyricLayout,
             _ when elementType == typeof(LyricStyle) => ElementType.LyricStyle,
             _ when elementType == typeof(NoteStyle) => ElementType.NoteStyle,
             _ => throw new NotSupportedException(),
@@ -29,7 +28,6 @@ public static Type GetObjectType(ElementType elementType) =>
         elementType switch
         {
             ElementType.LyricFontInfo => typeof(LyricFontInfo),
-            ElementType.LyricLayout => typeof(LyricLayout),
             ElementType.LyricStyle => typeof(LyricStyle),
             ElementType.NoteStyle => typeof(NoteStyle),
             _ => throw new NotSupportedException(),

osu.Game.Rulesets.Karaoke/Skinning/Elements/ElementType.cs

@@ -7,8 +7,6 @@ public enum ElementType
 {
     LyricFontInfo,
 
-    LyricLayout,
-
     LyricStyle,
 
     NoteStyle,

osu.Game.Rulesets.Karaoke/Skinning/KaraokeBeatmapSkin.cs

@@ -61,7 +61,6 @@ static string getFileNameByType(ElementType elementType)
                 => elementType switch
                 {
                     ElementType.LyricFontInfo => "lyric-font-infos",
-                    ElementType.LyricLayout => "lyric-layouts",
                     ElementType.LyricStyle => "lyric-styles",
                     ElementType.NoteStyle => "note-styles",
                     _ => throw new InvalidEnumArgumentException(nameof(elementType)),
@@ -98,7 +97,6 @@ static string getFileNameByType(ElementType elementType)
             case KaraokeIndexLookup indexLookup:
                 return indexLookup switch
                 {
-                    KaraokeIndexLookup.Layout => SkinUtils.As<TValue>(getSelectionFromElementType(ElementType.LyricLayout)),
                     KaraokeIndexLookup.Style => SkinUtils.As<TValue>(getSelectionFromElementType(ElementType.LyricStyle)),
                     KaraokeIndexLookup.Note => SkinUtils.As<TValue>(getSelectionFromElementType(ElementType.NoteStyle)),
                     _ => throw new InvalidEnumArgumentException(nameof(indexLookup)),

osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkin.cs

@@ -130,7 +130,6 @@ public KaraokeSkin(SkinInfo skin, IStorageResourceProvider? resources, IResource
                 return type switch
                 {
                     ElementType.LyricStyle or ElementType.LyricFontInfo or ElementType.NoteStyle => SkinUtils.As<TValue>(new Bindable<TValue>((TValue)DefaultElement[type])),
-                    ElementType.LyricLayout => null,
                     _ => throw new InvalidEnumArgumentException(nameof(type)),
                 };
             }
@@ -164,7 +163,6 @@ public KaraokeSkin(SkinInfo skin, IStorageResourceProvider? resources, IResource
         => type switch
         {
             ElementType.LyricStyle or ElementType.LyricFontInfo or ElementType.NoteStyle => DefaultElement[type],
-            ElementType.LyricLayout => null,
             _ => throw new InvalidEnumArgumentException(nameof(type)),
         };