- In-video advert now doesn't appear on minimized playback

- Fixed small header appearing on channel page
- Fixed home page loading after in long active sessions

.gitignore

@@ -258,4 +258,5 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+/Src/Trailer

FoxTube/App.xaml.cs

@@ -57,7 +57,7 @@ namespace FoxTube
         public async void CheckVersion()
         {
             PackageVersion ver = Package.Current.Id.Version;
-            if (SettingsStorage.Version != $"{ver.Major}.{ver.Minor}")
+            if (SettingsStorage.Version != $"{ver.Major}.{ver.Minor}.{ver.Build}")
             {
                 try
                 {
@@ -68,7 +68,7 @@ namespace FoxTube
 
                     ToastNotificationManager.CreateToastNotifier().Show(Background.Notification.GetChangelogToast(e.GetAttribute("version")));
 
-                    SettingsStorage.Version = $"{ver.Major}.{ver.Minor}";
+                    SettingsStorage.Version = $"{ver.Major}.{ver.Minor}.{ver.Build}";
                 }
                 catch
                 {

FoxTube/Assets/Data/Patchnotes.xml

@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <items>
-  <item time="2019-04-28" version="0.6">
+  <item time="2019-05-21" version="0.6.1">
+    <content>
+      <en-US>##[Patch #1]
+### What's new:
+- In-video advert now doesn't appear on minimized playback
+- Fixed small header appearing on channel page
+- Fixed home page loading after in long active sessions
+      </en-US>
+      <ru-RU>##[Патч #1]
+### Что нового:
+- Теперь реклама в видео не появляется в компактном режиме
+- Исправлено появление меленького заголовка на странице канала
+- Исправлено отображение видео на домашней странице при долгой активной сессии
+      </ru-RU>
+    </content>
+  </item>
+  <item time="2019-05-20" version="0.6">
     <content>
       <en-US>##[Final pre-release version]
 ### What's new:
@@ -70,7 +86,7 @@ This is the final pre-release minor version. That means that until 1.0 release t
 - Fixed header titles
 - Some items were moved from menu to header
 - Added "Share" button to video cards
-- Added "Delete video from playlist" button to video cards on playlist page\
+- Added "Delete video from playlist" button to video cards on playlist page
 - Improved channel cover quality
 - If available, shows localized titles and descriptions (based on "Search relevance language" parameter set in settings)
 - Updated russian localization

FoxTube/Classes/SecretsVault.cs

@@ -61,6 +61,11 @@ namespace FoxTube
         #endregion
 
         #region Methods
+        public static void RefreshToken()
+        {
+            Credential?.RefreshTokenAsync(CancellationToken.None);
+        }
+
         /// <summary>
         /// Subscribes or unsibscribes authorized user from the channel
         /// </summary>

FoxTube/Controls/Player/PlayerControls.cs

@@ -518,5 +518,11 @@ namespace FoxTube
                     quality.SelectedIndex = 0;
             }
         }
+
+        public void PushAdvert()
+        {
+            if(State == PlayerDisplayState.Normal)
+                Advert.PushAdvert();
+        }
     }
 }

FoxTube/Controls/Player/VideoPlayer.xaml.cs

@@ -6,20 +6,6 @@ using Google.Apis.YouTube.v3.Data;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.Media;
 using Windows.Storage.Streams;
-using YoutubeExplode.Models.MediaStreams;
-using YoutubeExplode;
-using System.IO;
-using FoxTube.Classes;
-using Windows.Media.Core;
-using System.Linq;
-using Windows.Media.Playback;
-using System.Threading.Tasks;
-using Windows.Media.Editing;
-using Windows.Storage.Pickers;
-using Windows.Storage;
-using Windows.Media.MediaProperties;
-using FoxTube.Controls.Player;
-using System.Diagnostics;
 using Windows.UI.Xaml.Media;
 
 namespace FoxTube
@@ -180,7 +166,7 @@ namespace FoxTube
 
         private void VideoSource_MarkerReached(object sender, TimelineMarkerRoutedEventArgs e)
         {
-            Controls.Advert.PushAdvert();
+            Controls.PushAdvert();
         }
     }
 }

FoxTube/Pages/ChannelPage.xaml

@@ -12,10 +12,10 @@
 
     <Page.Resources>
         <Storyboard x:Name="showHeader">
-            <DoubleAnimation Storyboard.TargetName="ColapsedHeader" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="{StaticResource CardOpacityDuration}"/>
+            <DoubleAnimation Storyboard.TargetName="ColapsedHeader" Storyboard.TargetProperty="Opacity" To="1" Duration="{StaticResource CardOpacityDuration}"/>
         </Storyboard>
         <Storyboard x:Name="hideHeader">
-            <DoubleAnimation Storyboard.TargetName="ColapsedHeader" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="{StaticResource CardOpacityDuration}"/>
+            <DoubleAnimation Storyboard.TargetName="ColapsedHeader" Storyboard.TargetProperty="Opacity" To="0" Duration="{StaticResource CardOpacityDuration}"/>
         </Storyboard>
         <Storyboard x:Name="showThumb">
             <DoubleAnimation Storyboard.TargetName="channelCover" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="{StaticResource CardOpacityDuration}"/>

FoxTube/Pages/ChannelPage.xaml.cs

@@ -259,15 +259,9 @@ namespace FoxTube.Pages
             Rect view = new Rect(0.0, 0.0, videoScroll.ActualWidth, videoScroll.ActualHeight);
 
             if (view.Contains(new Point(panel.Left, panel.Bottom)))
-            {
-                if (ColapsedHeader.Opacity == 1)
-                    hideHeader.Begin();
-            }
+                hideHeader.Begin();
             else
-            {
-                if (ColapsedHeader.Opacity == 0)
-                    showHeader.Begin();
-            }
+                showHeader.Begin();
         }
 
         private void Refresh_Click(object sender, RoutedEventArgs e)

FoxTube/Pages/Home.xaml.cs

@@ -27,6 +27,7 @@ namespace FoxTube
         public Home()
         {
             InitializeComponent();
+            SecretsVault.RefreshToken();
             Initialize();
         }
 

FoxTube/Themes/Resources.xaml

@@ -41,6 +41,6 @@
     <Style TargetType="ui:NavigationViewItemHeader">
         <Setter Property="FontSize" Value="14"/>
     </Style>
-    <Duration x:Key="CardOpacityDuration">0:0:0.5</Duration>
+    <Duration x:Key="CardOpacityDuration">0:0:0.3</Duration>
 
 </ResourceDictionary>