From b5f4a007ff97057a1017761b24ef023431e7c2f8 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Tue, 8 Jan 2019 00:19:30 +0300
Subject: [PATCH] Localization fixed. Player fixes. Menu fixes

Related Work Items: #243, #245
---
 FoxTube/Controls/VideoPlayer.xaml.cs | 6 +-----
 FoxTube/Pages/MainPage.xaml.cs       | 5 +++--
 FoxTube/Strings/en-US/Main.resw      | 2 +-
 FoxTube/Strings/ru-RU/Main.resw      | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/FoxTube/Controls/VideoPlayer.xaml.cs b/FoxTube/Controls/VideoPlayer.xaml.cs
index 7f013da..b1cd1fc 100644
--- a/FoxTube/Controls/VideoPlayer.xaml.cs
+++ b/FoxTube/Controls/VideoPlayer.xaml.cs
@@ -294,6 +294,7 @@ namespace FoxTube
                 {
                     seek.Value = controller.Position.TotalMilliseconds;
                     seekIndicator.Value = seek.Value;
+                    bufferingLevel.Value = videoPlayer.PlaybackSession.DownloadProgress * 100;
                 });
             }
             catch { }
@@ -777,11 +778,6 @@ namespace FoxTube
             LoadTrack();
         }
 
-        private void videoSource_BufferingProgressChanged(object sender, RoutedEventArgs e)
-        {
-            bufferingLevel.Value = videoPlayer.PlaybackSession.DownloadProgress * 100;
-        }
-
         private void GotoLive_Click(object sender, RoutedEventArgs e) //TODO: Refactor
         {
             try
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index 42967ba..e14d930 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -220,6 +220,9 @@ namespace FoxTube
             }
             else if (e[0] as bool? == false)
             {
+                for (int k = nav.MenuItems.Count - 1; k > 8; k--)
+                    nav.MenuItems.RemoveAt(k);
+
                 account.Visibility = Visibility.Visible;
                 avatar.Visibility = Visibility.Collapsed;
 
@@ -232,8 +235,6 @@ namespace FoxTube
                 subsHeader.Visibility = Visibility.Collapsed;
 
                 subsHeader.Visibility = Visibility.Collapsed;
-                for(int k = 9; k < nav.MenuItems.Count; k++)
-                    nav.MenuItems.RemoveAt(k);
             }
             else
             {
diff --git a/FoxTube/Strings/en-US/Main.resw b/FoxTube/Strings/en-US/Main.resw
index 1721f7b..a53def0 100644
--- a/FoxTube/Strings/en-US/Main.resw
+++ b/FoxTube/Strings/en-US/Main.resw
@@ -180,7 +180,7 @@
   <data name="signEx.Text" xml:space="preserve">
     <value>Sign in with existing account</value>
   </data>
-  <data name="signIn.Content" xml:space="preserve">
+  <data name="signIn.Text" xml:space="preserve">
     <value>Add account</value>
   </data>
   <data name="signNew.Text" xml:space="preserve">
diff --git a/FoxTube/Strings/ru-RU/Main.resw b/FoxTube/Strings/ru-RU/Main.resw
index b8263f6..a7638c5 100644
--- a/FoxTube/Strings/ru-RU/Main.resw
+++ b/FoxTube/Strings/ru-RU/Main.resw
@@ -180,7 +180,7 @@
   <data name="signEx.Text" xml:space="preserve">
     <value>Войти с помощью существующего аккаунта Google</value>
   </data>
-  <data name="signIn.Content" xml:space="preserve">
+  <data name="signIn.Text" xml:space="preserve">
     <value>Войти в аккаунт</value>
   </data>
   <data name="signNew.Text" xml:space="preserve">