From 91fd3f6ab9b2c55b8a09b604d66ae463f7f0ad89 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Sun, 23 Dec 2018 14:24:16 +0300
Subject: [PATCH] Refreshing fixed

Related Work Items: #212
---
 FoxTube/Pages/ChannelPage.xaml.cs  |  6 +++---
 FoxTube/Pages/Downloads.xaml.cs    | 15 ---------------
 FoxTube/Pages/Home.xaml            |  1 -
 FoxTube/Pages/Home.xaml.cs         |  2 +-
 FoxTube/Pages/MainPage.xaml.cs     |  5 +++++
 FoxTube/Pages/PlaylistPage.xaml.cs |  2 +-
 FoxTube/Pages/Search.xaml.cs       |  2 +-
 FoxTube/Pages/VideoPage.xaml.cs    |  3 +--
 8 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/FoxTube/Pages/ChannelPage.xaml.cs b/FoxTube/Pages/ChannelPage.xaml.cs
index 1491eb3..2f374cf 100644
--- a/FoxTube/Pages/ChannelPage.xaml.cs
+++ b/FoxTube/Pages/ChannelPage.xaml.cs
@@ -83,7 +83,7 @@ namespace FoxTube.Pages
             loading.Refresh();
             playlistLoading.Refresh();
 
-            //try
+            try
             {
                 channelId = id;
                 if (Methods.NeedToResponse)
@@ -147,14 +147,14 @@ namespace FoxTube.Pages
 
                 loading.Close();
             }
-            /*catch (System.Net.Http.HttpRequestException)
+            catch (System.Net.Http.HttpRequestException)
             {
                 loading.Error("System.Net.Http.HttpRequestException", "Unable to connect to Google servers.", true);
             }
             catch (Exception e)
             {
                 loading.Error(e.GetType().ToString(), e.Message);
-            }*/
+            }
         }
 
         async void LoadPlaylist()
diff --git a/FoxTube/Pages/Downloads.xaml.cs b/FoxTube/Pages/Downloads.xaml.cs
index da7562d..589b7b6 100644
--- a/FoxTube/Pages/Downloads.xaml.cs
+++ b/FoxTube/Pages/Downloads.xaml.cs
@@ -66,20 +66,5 @@ namespace FoxTube.Pages
         {
             await Launcher.LaunchFolderAsync(DownloadAgent.Downloads);
         }
-
-        /*private async void changePath_Click(object sender, RoutedEventArgs e)
-        {
-            FolderPicker picker = new FolderPicker()
-            {
-                SuggestedStartLocation = PickerLocationId.Downloads,
-                ViewMode = PickerViewMode.Thumbnail
-            };
-            picker.FileTypeFilter.Add(".shit"); //Because overwise it trhows an exception
-
-            StorageFolder p = await picker.PickSingleFolderAsync();
-            if (p != null)
-                settings.Values["defaultDownload"] = p.Path;
-            path.Text = settings.Values["defaultDownload"] as string;
-        }*/
     }
 }
diff --git a/FoxTube/Pages/Home.xaml b/FoxTube/Pages/Home.xaml
index f1bca84..46eaa88 100644
--- a/FoxTube/Pages/Home.xaml
+++ b/FoxTube/Pages/Home.xaml
@@ -1,5 +1,4 @@
 <Page
-    NavigationCacheMode="Enabled"
     x:Class="FoxTube.Home"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/FoxTube/Pages/Home.xaml.cs b/FoxTube/Pages/Home.xaml.cs
index 64b99d5..50889e3 100644
--- a/FoxTube/Pages/Home.xaml.cs
+++ b/FoxTube/Pages/Home.xaml.cs
@@ -71,7 +71,7 @@ namespace FoxTube
 
         private void refreshPage(object sender, RoutedEventArgs e)
         {
-            (Parent as Frame).Navigate(typeof(Home));
+            Methods.MainPage.GoToHome();
         }
 
         private void RecMore_Clicked()
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index 1dc25c3..7a766ed 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -285,6 +285,11 @@ namespace FoxTube
             content.Navigate(typeof(ChannelPage), id);
         }
 
+        public void GoToHome()
+        {
+            content.Navigate(typeof(Home));
+        }
+
         public async void GoToVideo(string id, string playlistId = null)
         {
             bool cancel = false;
diff --git a/FoxTube/Pages/PlaylistPage.xaml.cs b/FoxTube/Pages/PlaylistPage.xaml.cs
index 3b815e1..89dbd9e 100644
--- a/FoxTube/Pages/PlaylistPage.xaml.cs
+++ b/FoxTube/Pages/PlaylistPage.xaml.cs
@@ -129,7 +129,7 @@ namespace FoxTube.Pages
 
         private void refresh_Click(object sender, RoutedEventArgs e)
         {
-            Initialize(playlistId);
+            Methods.MainPage.GoToPlaylist(playlistId);
         }
 
         private void share_Click(object sender, RoutedEventArgs e)
diff --git a/FoxTube/Pages/Search.xaml.cs b/FoxTube/Pages/Search.xaml.cs
index 0fe757c..b3811b5 100644
--- a/FoxTube/Pages/Search.xaml.cs
+++ b/FoxTube/Pages/Search.xaml.cs
@@ -185,7 +185,7 @@ namespace FoxTube
 
         private void AppBarButton_Click(object sender, RoutedEventArgs e)
         {
-            Initialize(Parameters);
+            Methods.MainPage.GoToSearch(Parameters);
         }
 
         private async void more_Clicked()
diff --git a/FoxTube/Pages/VideoPage.xaml.cs b/FoxTube/Pages/VideoPage.xaml.cs
index 44bff2f..40aaff5 100644
--- a/FoxTube/Pages/VideoPage.xaml.cs
+++ b/FoxTube/Pages/VideoPage.xaml.cs
@@ -330,8 +330,7 @@ namespace FoxTube.Pages
 
         public void refresh_Click(object sender, RoutedEventArgs e)
         {
-            player = new VideoPlayer();
-            Initialize(new string[2] { videoId, playlistId });
+            Methods.MainPage.GoToVideo(videoId, playlistId);
         }
 
         private void grid_SizeChanged(object sender, SizeChangedEventArgs e)