Merge pull request #312 from andy840119/lyric-editor/able-to-split-lyric

Able to split lyric.
karaoke-dev · Dec 13, 2020 · edbb0de · edbb0de
2 parents 2982aa3 + 5ecc442
commit edbb0de
Show file tree

Hide file tree

Showing 15 changed files with 441 additions and 232 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/LyricControl.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/LyricControl.cs
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/DrawableLyricEditListItem.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/DrawableLyricEditListItem.cs
@@ -8,11 +8,9 @@
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components;
-using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges;
-using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Infos;
+using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos;
+using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Lyrics;
 using osu.Game.Rulesets.Karaoke.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics
 {
@@ -25,7 +23,6 @@ public class DrawableLyricEditListItem : OsuRearrangeableListItem<Lyric>
 
         private Box background;
         private Box dragAlert;
-        private Box headerBackground;
 
         public DrawableLyricEditListItem(Lyric item)
             : base(item)
@@ -73,46 +70,13 @@ protected override Drawable CreateContent()
                         RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize, minSize: min_height, maxSize: max_height) },
                         Content = new[]
                         {
-                            new[]
+                            new Drawable[]
                             {
-                                new Container
+                                new InfoControl(Model)
                                 {
                                     // todo : cannot use relative size to both because it will cause size cannot roll-back if make lyric smaller.
                                     RelativeSizeAxes = Axes.X,
                                     Height = min_height,
-                                    Children = new Drawable[]
-                                    {
-                                        headerBackground = new Box
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            Height = max_height,
-                                            Alpha = 0.7f
-                                        },
-                                        new BadgeFillFlowContainer
-                                        {
-                                            Direction = FillDirection.Vertical,
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Anchor = Anchor.TopRight,
-                                            Origin = Anchor.TopRight,
-                                            Spacing = new Vector2(5),
-                                            Children = new Drawable[]
-                                            {
-                                                new TimeInfoContainer(Model)
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    Height = 36,
-                                                },
-
-                                                // todo : in small display size use badge.
-                                                // in larger size should use real icon.
-                                                new LanguageInfoBadge(Model)
-                                                {
-                                                    Margin = new MarginPadding { Right = 5 }
-                                                }
-                                            }
-                                        },
-                                    }
                                 },
                                 new LyricControl(Model)
                                 {
@@ -131,7 +95,6 @@ private void load(OsuColour colours)
         {
             background.Colour = colours.Gray7;
             dragAlert.Colour = colours.YellowDarker;
-            headerBackground.Colour = colours.Gray2;
         }
 
         protected override bool OnDragStart(DragStartEvent e)
@@ -148,15 +111,5 @@ protected override void OnDragEnd(DragEndEvent e)
             dragAlert.Hide();
             base.OnDragEnd(e);
         }
-
-        public class BadgeFillFlowContainer : FillFlowContainer
-        {
-            public override void Add(Drawable drawable)
-            {
-                drawable.Anchor = Anchor.TopRight;
-                drawable.Origin = Anchor.TopRight;
-                base.Add(drawable);
-            }
-        }
     }
 }
diff --git a/...ke/Edit/Lyrics/Components/Badges/Badge.cs → ...Karaoke/Edit/Lyrics/Infos/Badges/Badge.cs b/...ke/Edit/Lyrics/Components/Badges/Badge.cs → ...Karaoke/Edit/Lyrics/Infos/Badges/Badge.cs
@@ -8,7 +8,7 @@
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Objects;
 
-namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.Badges
 {
     public abstract class Badge : Container
     {

diff --git a/...cs/Components/Badges/LanguageInfoBadge.cs → .../Lyrics/Infos/Badges/LanguageInfoBadge.cs b/...cs/Components/Badges/LanguageInfoBadge.cs → .../Lyrics/Infos/Badges/LanguageInfoBadge.cs
@@ -5,7 +5,7 @@
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Karaoke.Objects;
 
-namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.Badges
 {
     public class LanguageInfoBadge : Badge
     {

diff --git a/...rics/Components/Badges/LayoutInfoBadge.cs → ...it/Lyrics/Infos/Badges/LayoutInfoBadge.cs b/...rics/Components/Badges/LayoutInfoBadge.cs → ...it/Lyrics/Infos/Badges/LayoutInfoBadge.cs
@@ -5,7 +5,7 @@
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Karaoke.Objects;
 
-namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.Badges
 {
     public class LayoutInfoBadge : Badge
     {

diff --git a/...yrics/Components/Badges/StyleInfoBadge.cs → ...dit/Lyrics/Infos/Badges/StyleInfoBadge.cs b/...yrics/Components/Badges/StyleInfoBadge.cs → ...dit/Lyrics/Infos/Badges/StyleInfoBadge.cs
@@ -5,7 +5,7 @@
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Karaoke.Objects;
 
-namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.Badges
 {
     public class StyleInfoBadge : Badge
     {

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Infos/InfoControl.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Infos/InfoControl.cs
@@ -0,0 +1,79 @@
+// Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.Badges;
+using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.TimeInfo;
+using osu.Game.Rulesets.Karaoke.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos
+{
+    public class InfoControl : Container
+    {
+        private const int max_height = 120;
+
+        private readonly Box headerBackground;
+
+        public Lyric Lyric { get; }
+
+        public InfoControl(Lyric lyric)
+        {
+            Lyric = lyric;
+
+            Children = new Drawable[]
+            {
+                headerBackground = new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = max_height,
+                    Alpha = 0.7f
+                },
+                new BadgeFillFlowContainer
+                {
+                    Direction = FillDirection.Vertical,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new TimeInfoContainer(Lyric)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 36,
+                        },
+
+                        // todo : in small display size use badge.
+                        // in larger size should use real icon.
+                        new LanguageInfoBadge(Lyric)
+                        {
+                            Margin = new MarginPadding { Right = 5 }
+                        }
+                    }
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            headerBackground.Colour = colours.Gray2;
+        }
+
+        public class BadgeFillFlowContainer : FillFlowContainer
+        {
+            public override void Add(Drawable drawable)
+            {
+                drawable.Anchor = Anchor.TopRight;
+                drawable.Origin = Anchor.TopRight;
+                base.Add(drawable);
+            }
+        }
+    }
+}
diff --git a/...ics/Components/Infos/TimeInfoContainer.cs → ...yrics/Infos/TimeInfo/TimeInfoContainer.cs b/...ics/Components/Infos/TimeInfoContainer.cs → ...yrics/Infos/TimeInfo/TimeInfoContainer.cs
@@ -10,7 +10,7 @@
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Objects;
 
-namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Infos
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Infos.TimeInfo
 {
     public class TimeInfoContainer : Container
     {