From 60954f969d77f6350b0f63903cf2f5696046c248 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 13 Oct 2019 12:38:50 +0300
Subject: [PATCH] DeletedChildsPlaceholder refactor

---
 .../Overlays/Comments/CommentsContainer.cs    | 33 ++++++++++++++++---
 .../Comments/DeletedChildsPlaceholder.cs      | 30 ++++++++++++-----
 osu.Game/Overlays/Comments/DrawableComment.cs |  5 ++-
 3 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 3b997540c4..1fca9ca5e5 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Overlays.Comments
 
         private readonly Box background;
         private readonly FillFlowContainer content;
+        private readonly FillFlowContainer footer;
+        private readonly DeletedChildsPlaceholder deletedChildsPlaceholder;
 
         public CommentsContainer(CommentableType type, long id)
         {
@@ -64,6 +66,32 @@ namespace osu.Game.Overlays.Comments
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = OsuColour.Gray(0.2f)
+                                },
+                                footer = new FillFlowContainer
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical,
+                                    Children = new Drawable[]
+                                    {
+                                        deletedChildsPlaceholder = new DeletedChildsPlaceholder
+                                        {
+                                            ShowDeleted = { BindTarget = ShowDeleted }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -121,10 +149,7 @@ namespace osu.Game.Overlays.Comments
                         deletedComments++;
                 });
 
-                content.Add(new DeletedChildsPlaceholder(deletedComments)
-                {
-                    ShowDeleted = { BindTarget = ShowDeleted }
-                });
+                deletedChildsPlaceholder.DeletedCount.Value = deletedComments;
             }, loadCancellation.Token);
         }
 
diff --git a/osu.Game/Overlays/Comments/DeletedChildsPlaceholder.cs b/osu.Game/Overlays/Comments/DeletedChildsPlaceholder.cs
index 7aae42908e..b5dcf433f1 100644
--- a/osu.Game/Overlays/Comments/DeletedChildsPlaceholder.cs
+++ b/osu.Game/Overlays/Comments/DeletedChildsPlaceholder.cs
@@ -17,18 +17,18 @@ namespace osu.Game.Overlays.Comments
         private const int margin = 10;
 
         public readonly BindableBool ShowDeleted = new BindableBool();
+        public readonly BindableInt DeletedCount = new BindableInt();
 
-        private readonly bool canBeVisible;
+        private bool canBeShown;
 
-        public DeletedChildsPlaceholder(int count)
+        private readonly SpriteText countText;
+
+        public DeletedChildsPlaceholder()
         {
-            canBeVisible = count != 0;
-
             AutoSizeAxes = Axes.Both;
             Direction = FillDirection.Horizontal;
             Spacing = new Vector2(3, 0);
             Margin = new MarginPadding { Vertical = margin, Left = deleted_placeholder_margin };
-            Alpha = 0;
             Children = new Drawable[]
             {
                 new SpriteIcon
@@ -36,24 +36,38 @@ namespace osu.Game.Overlays.Comments
                     Icon = FontAwesome.Solid.Trash,
                     Size = new Vector2(14),
                 },
-                new SpriteText
+                countText = new SpriteText
                 {
                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                    Text = $@"{count} deleted comment{(count.ToString().ToCharArray().Last() == '1' ? "" : "s")}"
                 }
             };
         }
 
         protected override void LoadComplete()
         {
+            DeletedCount.BindValueChanged(onCountChanged, true);
             ShowDeleted.BindValueChanged(onShowDeletedChanged, true);
             base.LoadComplete();
         }
 
         private void onShowDeletedChanged(ValueChangedEvent<bool> showDeleted)
         {
-            if (canBeVisible)
+            if (canBeShown)
                 this.FadeTo(showDeleted.NewValue ? 0 : 1);
         }
+
+        private void onCountChanged(ValueChangedEvent<int> count)
+        {
+            canBeShown = count.NewValue != 0;
+
+            if (!canBeShown)
+            {
+                Hide();
+                return;
+            }
+
+            countText.Text = $@"{count.NewValue} deleted comment{(count.NewValue.ToString().ToCharArray().Last() == '1' ? "" : "s")}";
+            Show();
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 4617f6f86e..8c356a6156 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Overlays.Comments
 
         private readonly FillFlowContainer childCommentsVisibilityContainer;
         private readonly Comment comment;
+        private readonly DeletedChildsPlaceholder deletedChildsPlaceholder;
 
         public DrawableComment(Comment comment)
         {
@@ -168,7 +169,7 @@ namespace osu.Game.Overlays.Comments
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Vertical
                             },
-                            new DeletedChildsPlaceholder(comment.GetDeletedChildsCount())
+                            deletedChildsPlaceholder = new DeletedChildsPlaceholder
                             {
                                 ShowDeleted = { BindTarget = ShowDeleted }
                             }
@@ -177,6 +178,8 @@ namespace osu.Game.Overlays.Comments
                 }
             };
 
+            deletedChildsPlaceholder.DeletedCount.Value = comment.GetDeletedChildsCount();
+
             if (comment.UserId == null)
                 username.AddText(comment.LegacyName);
             else