From bf2e86a77b7bdbe0bc372888493fb73173c315bf Mon Sep 17 00:00:00 2001
From: Michael Gordeev <michael.xfox@outlook.com>
Date: Sat, 18 May 2019 19:00:12 +0300
Subject: [PATCH] - Updated patchnote and version - Updated user's avatar
 design

---
 FoxTube/Assets/Data/Patchnotes.xml | 14 ++++++++++++--
 FoxTube/Package.appxmanifest       |  2 +-
 FoxTube/Pages/MainPage.xaml        |  6 +++++-
 FoxTube/Pages/MainPage.xaml.cs     |  4 +++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/FoxTube/Assets/Data/Patchnotes.xml b/FoxTube/Assets/Data/Patchnotes.xml
index 15e610d..3052bc7 100644
--- a/FoxTube/Assets/Data/Patchnotes.xml
+++ b/FoxTube/Assets/Data/Patchnotes.xml
@@ -2,7 +2,8 @@
 <items>
   <item time="2019-04-28" version="0.6">
     <content>
-      <en-US>### What's new:
+      <en-US>##[Final pre-release version]
+### What's new:
 - Fixed fails when trying to retrieve history, WL or recommended
 - Fixed ads appearance
 - Fixed ads watermarks on video when it was opened through notification
@@ -22,8 +23,13 @@
 - Player re-design
 - Added quality selector to live streams playback
 - Added "Auto" quality option for videos
+- Updated design of user's avatar in the top-right corner
+
+####[NB]
+This is the final pre-release minor version. That means that until 1.0 release there will be no new features implemented. All subsequent updates will contain only bugfixes
       </en-US>
-      <ru-RU>### Что нового:
+      <ru-RU>##[Последняя предварительная версия]
+### Что нового:
 - Исправлена проблема получения истории, "Посмотреть позже" и рекомендаций
 - Исправлен внешний вид рекламы
 - Исправлено появление водяных занков рекламы на видео при открытии через уведомления
@@ -43,6 +49,10 @@
 - Редизайн плеера
 - Добавлено меню выбора качества для прямых эфиров
 - Добавлено опция "Авто" в меню выбора качеста видео
+- Обновлен дизайн аватара пользователя в верхнем правом углу
+
+####[NB]
+Версия 0.6 станет последней пред релизной версией. Это значит, что новые функции не будут добовляться до полного релиза приложения. Все последующие обновления будут содержать лишь исправления
       </ru-RU>
     </content>
   </item>
diff --git a/FoxTube/Package.appxmanifest b/FoxTube/Package.appxmanifest
index 5ac7f1f..b7e0e6f 100644
--- a/FoxTube/Package.appxmanifest
+++ b/FoxTube/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
-  <Identity Name="53949MichaelXFoxGordeev.FoxTube" Publisher="CN=FD7A34DD-FE4D-4D7D-9D33-2DA9EBBE7725" Version="0.5.0.0" />
+  <Identity Name="53949MichaelXFoxGordeev.FoxTube" Publisher="CN=FD7A34DD-FE4D-4D7D-9D33-2DA9EBBE7725" Version="0.6.0.0" />
   <mp:PhoneIdentity PhoneProductId="04fd81c1-6473-4174-afd7-4ac71dd85721" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>FoxTube</DisplayName>
diff --git a/FoxTube/Pages/MainPage.xaml b/FoxTube/Pages/MainPage.xaml
index 42e31fd..35aaf0b 100644
--- a/FoxTube/Pages/MainPage.xaml
+++ b/FoxTube/Pages/MainPage.xaml
@@ -59,7 +59,11 @@
                                     </Grid>
                                 </Flyout>
                             </Button.Flyout>
-                            <PersonPicture Width="25"/>
+                            <Ellipse Width="25" Height="25">
+                                <Ellipse.Fill>
+                                    <ImageBrush ImageSource="/Assets/Icons/profile.png"/>
+                                </Ellipse.Fill>
+                            </Ellipse>
                         </Button>
                     </StackPanel>
                     <CommandBar HorizontalAlignment="Right" Background="Transparent" OverflowButtonVisibility="Collapsed" Visibility="Collapsed" Margin="100,0">
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index 90ecc1b..b524f0c 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -17,6 +17,8 @@ using Windows.UI.Popups;
 using Windows.Networking.Connectivity;
 using Windows.ApplicationModel.Resources;
 using Microsoft.Services.Store.Engagement;
+using Windows.UI.Xaml.Shapes;
+using Windows.UI.Xaml.Media;
 
 namespace FoxTube
 {
@@ -177,7 +179,7 @@ namespace FoxTube
                     myNameFlyout.Text = SecretsVault.UserInfo.Name;
                     myEmail.Text = SecretsVault.UserInfo.Email;
                     avatarFlyout.ProfilePicture = new BitmapImage(SecretsVault.UserInfo.Picture.ToUri()) { DecodePixelHeight = 65, DecodePixelWidth = 65 };
-                    (avatar.Content as PersonPicture).ProfilePicture = new BitmapImage(SecretsVault.UserInfo.Picture.ToUri()) { DecodePixelHeight = 25, DecodePixelWidth = 25 };
+                    ((avatar.Content as Ellipse).Fill as ImageBrush).ImageSource = new BitmapImage(SecretsVault.UserInfo.Picture.ToUri()) { DecodePixelHeight = 25, DecodePixelWidth = 25 };
 
                     avatar.Visibility = Visibility.Visible;