From c996da2bfbf473c45aa656d6bc1cadab3b553e48 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Fri, 3 Aug 2018 16:15:22 +0300
Subject: [PATCH] Bug fixes

---
 FoxTube/Controls/CommentCard.xaml    |  2 +-
 FoxTube/Controls/CommentCard.xaml.cs |  2 +-
 FoxTube/Controls/VideoPlayer.xaml.cs |  2 +-
 FoxTube/Pages/MainPage.xaml.cs       | 14 +++++++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/FoxTube/Controls/CommentCard.xaml b/FoxTube/Controls/CommentCard.xaml
index 57788ed..964a639 100644
--- a/FoxTube/Controls/CommentCard.xaml
+++ b/FoxTube/Controls/CommentCard.xaml
@@ -27,7 +27,7 @@
                     <RowDefinition/>
                     <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>
-                <TextBlock Name="meta" Foreground="Gray" FontSize="13" Text="[Author's name] | [Published time span] [?](edited)"/>
+                <TextBlock Name="meta" TextWrapping="WrapWholeWords" Foreground="Gray" FontSize="13" Text="[Author's name] | [Published time span] [?](edited)"/>
                 <TextBlock Name="text" IsTextSelectionEnabled="True" TextWrapping="WrapWholeWords" Grid.Row="1" Text="[Content]"/>
 
                 <StackPanel Grid.Row="1" Name="editor" Visibility="Collapsed">
diff --git a/FoxTube/Controls/CommentCard.xaml.cs b/FoxTube/Controls/CommentCard.xaml.cs
index 0e51b33..90f24bc 100644
--- a/FoxTube/Controls/CommentCard.xaml.cs
+++ b/FoxTube/Controls/CommentCard.xaml.cs
@@ -109,7 +109,7 @@ namespace FoxTube.Controls
             else
                 rating.Text = comment.Snippet.LikeCount.HasValue ? comment.Snippet.LikeCount.ToString() : "";
 
-            meta.Text = string.Format("{0} | {1} {2}", comment.Snippet.AuthorDisplayName, Methods.GetAgo(comment.Snippet.PublishedAt.Value), comment.Snippet.UpdatedAt.HasValue ? "(edited)" : "");
+            meta.Text = string.Format("{0} | {1} {2}", comment.Snippet.AuthorDisplayName, Methods.GetAgo(comment.Snippet.PublishedAt.Value), comment.Snippet.UpdatedAt.Value != comment.Snippet.PublishedAt.Value ? "(edited)" : "");
             text.Text = comment.Snippet.TextDisplay;
 
             try { avatar.ProfilePicture = new BitmapImage(new Uri(comment.Snippet.AuthorProfileImageUrl)); }
diff --git a/FoxTube/Controls/VideoPlayer.xaml.cs b/FoxTube/Controls/VideoPlayer.xaml.cs
index 0827f88..e982330 100644
--- a/FoxTube/Controls/VideoPlayer.xaml.cs
+++ b/FoxTube/Controls/VideoPlayer.xaml.cs
@@ -743,7 +743,7 @@ namespace FoxTube
             videoSource.Pause();
         }
 
-        private void minimize_Click(object sender, RoutedEventArgs e)
+        public void minimize_Click(object sender, RoutedEventArgs e)
         {
             if(fullScreen)
             {
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index d808a05..a08ec6e 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -423,7 +423,7 @@ namespace FoxTube
 
         public void GoToChannel(string id)
         {
-            MinimizeVideo();
+            MinimizeAsInitializer();
             content.Navigate(typeof(ChannelPage), id);
         }
 
@@ -445,13 +445,13 @@ namespace FoxTube
 
         public void GoToDeveloper(string id)
         {
-            MinimizeVideo();
+            MinimizeAsInitializer();
             content.Navigate(typeof(Settings), "inbox");
         }
 
         public void GoToPlaylist(string id)
         {
-            MinimizeVideo();
+            MinimizeAsInitializer();
             content.Navigate(typeof(PlaylistPage), id);
         }
 
@@ -498,6 +498,14 @@ namespace FoxTube
             }
         }
 
+        public void MinimizeAsInitializer()
+        {
+            try
+            {
+                (videoPlaceholder.Content as VideoPage).player.minimize_Click(this, null);
+            }
+        }
+
         public void MinimizeVideo()
         {
             videoPlaceholder.Width = 432;