From 98c7ce1735f34794d12c2ac959b9e6c4b6dcb67e Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Fri, 27 Jul 2018 00:07:48 +0300 Subject: [PATCH] Playlist page markup & adaptive triggers --- FoxTube/FoxTube.csproj | 6 +- FoxTube/Pages/MainPage.xaml.cs | 2 +- FoxTube/Pages/Playlist.xaml | 40 ----------- FoxTube/Pages/PlaylistPage.xaml | 68 +++++++++++++++++++ ...{Playlist.xaml.cs => PlaylistPage.xaml.cs} | 4 +- FoxTube/Pages/Search.xaml | 1 + FoxTube/Pages/Search.xaml.cs | 5 ++ 7 files changed, 80 insertions(+), 46 deletions(-) delete mode 100644 FoxTube/Pages/Playlist.xaml create mode 100644 FoxTube/Pages/PlaylistPage.xaml rename FoxTube/Pages/{Playlist.xaml.cs => PlaylistPage.xaml.cs} (90%) diff --git a/FoxTube/FoxTube.csproj b/FoxTube/FoxTube.csproj index 2daefb6..cbbab59 100644 --- a/FoxTube/FoxTube.csproj +++ b/FoxTube/FoxTube.csproj @@ -153,8 +153,8 @@ PlaylistCardWide.xaml - - Playlist.xaml + + PlaylistPage.xaml @@ -345,7 +345,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs index 40060f1..680290e 100644 --- a/FoxTube/Pages/MainPage.xaml.cs +++ b/FoxTube/Pages/MainPage.xaml.cs @@ -270,7 +270,7 @@ namespace FoxTube if (s == toHistory) content.Navigate(typeof(Settings)); else if (s == toLiked) - content.Navigate(typeof(Settings)); + content.Navigate(typeof(PlaylistPage)); else if (s == toLater) content.Navigate(typeof(Settings)); else if (s == toSubscriptions) diff --git a/FoxTube/Pages/Playlist.xaml b/FoxTube/Pages/Playlist.xaml deleted file mode 100644 index 3555b5a..0000000 --- a/FoxTube/Pages/Playlist.xaml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FoxTube/Pages/PlaylistPage.xaml b/FoxTube/Pages/PlaylistPage.xaml new file mode 100644 index 0000000..31de07f --- /dev/null +++ b/FoxTube/Pages/PlaylistPage.xaml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FoxTube/Pages/Playlist.xaml.cs b/FoxTube/Pages/PlaylistPage.xaml.cs similarity index 90% rename from FoxTube/Pages/Playlist.xaml.cs rename to FoxTube/Pages/PlaylistPage.xaml.cs index 2622298..2ec6f8e 100644 --- a/FoxTube/Pages/Playlist.xaml.cs +++ b/FoxTube/Pages/PlaylistPage.xaml.cs @@ -20,9 +20,9 @@ namespace FoxTube.Pages /// /// An empty page that can be used on its own or navigated to within a Frame. /// - public sealed partial class Playlist : Page + public sealed partial class PlaylistPage : Page { - public Playlist() + public PlaylistPage() { this.InitializeComponent(); } diff --git a/FoxTube/Pages/Search.xaml b/FoxTube/Pages/Search.xaml index b943f79..e363e49 100644 --- a/FoxTube/Pages/Search.xaml +++ b/FoxTube/Pages/Search.xaml @@ -73,6 +73,7 @@ + diff --git a/FoxTube/Pages/Search.xaml.cs b/FoxTube/Pages/Search.xaml.cs index b212af5..c5f37de 100644 --- a/FoxTube/Pages/Search.xaml.cs +++ b/FoxTube/Pages/Search.xaml.cs @@ -280,5 +280,10 @@ namespace FoxTube } catch (NullReferenceException) { } } + + private void inBrowser_Click(object sender, RoutedEventArgs e) + { + + } } }