diff --git a/FoxTube/Pages/History.xaml b/FoxTube/Pages/History.xaml index 5063c3d..4931d08 100644 --- a/FoxTube/Pages/History.xaml +++ b/FoxTube/Pages/History.xaml @@ -5,10 +5,22 @@ xmlns:local="using:FoxTube.Pages" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:controls="using:FoxTube.Controls" + xmlns:foxtube="using:FoxTube" mc:Ignorable="d" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - - + + + + + + + + + + + + diff --git a/FoxTube/Pages/History.xaml.cs b/FoxTube/Pages/History.xaml.cs index aafbf0f..3d6ac42 100644 --- a/FoxTube/Pages/History.xaml.cs +++ b/FoxTube/Pages/History.xaml.cs @@ -1,4 +1,5 @@ -using System; +using FoxTube.Controls; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -22,9 +23,41 @@ namespace FoxTube.Pages /// public sealed partial class History : Page { + LoadingPage loading; + ShowMore more; + VideoGrid list; + public History() { this.InitializeComponent(); + loading = grid.Children[2] as LoadingPage; + more = stack.Children[1] as ShowMore; + list = stack.Children[0] as VideoGrid; + Initialize(); + } + + public void Initialize() + { + loading.Refresh(); + + more.Complete(true); + + loading.Block(); + } + + private void ShowMore_Clicked() + { + + } + + private void toBrowser_Click(object sender, RoutedEventArgs e) + { + + } + + private void refresh_Click(object sender, RoutedEventArgs e) + { + } } } diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs index 6081c67..eeefb0d 100644 --- a/FoxTube/Pages/MainPage.xaml.cs +++ b/FoxTube/Pages/MainPage.xaml.cs @@ -421,7 +421,7 @@ namespace FoxTube try { XmlDocument doc = new XmlDocument(); - doc.Load($"http://suggestqueries.google.com/complete/search?output=toolbar&hl={(settings.Values["region"] as string).Remove(2)}&q={search.Text}"); + doc.Load($"http://suggestqueries.google.com/complete/search?ds=yt&output=toolbar&hl={CultureInfo.CurrentUICulture.TwoLetterISOLanguageName}&q={search.Text}"); List suggestions = new List(); @@ -449,7 +449,7 @@ namespace FoxTube if (args.SelectedItem == toHome) content.Navigate(typeof(Home)); else if (args.SelectedItem == toHistory) - content.Navigate(typeof(Settings)); + content.Navigate(typeof(History)); else if (args.SelectedItem == toLiked) content.Navigate(typeof(PlaylistPage), SecretsVault.UserChannel.ContentDetails.RelatedPlaylists.Likes); else if (args.SelectedItem == toLater)