diff --git a/FoxTube/Channel.xaml b/FoxTube/Channel.xaml
index cfd0745..ad9abf5 100644
--- a/FoxTube/Channel.xaml
+++ b/FoxTube/Channel.xaml
@@ -10,8 +10,6 @@
-
-
@@ -21,33 +19,14 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/FoxTube/Channel.xaml.cs b/FoxTube/Channel.xaml.cs
index a20f616..d7155dd 100644
--- a/FoxTube/Channel.xaml.cs
+++ b/FoxTube/Channel.xaml.cs
@@ -25,6 +25,7 @@ namespace FoxTube
public Channel()
{
this.InitializeComponent();
+ content.Navigate(typeof(ChannelVideos));
}
}
}
diff --git a/FoxTube/ChannelVideos.xaml b/FoxTube/ChannelVideos.xaml
new file mode 100644
index 0000000..5a553e0
--- /dev/null
+++ b/FoxTube/ChannelVideos.xaml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FoxTube/ChannelVideos.xaml.cs b/FoxTube/ChannelVideos.xaml.cs
new file mode 100644
index 0000000..345b726
--- /dev/null
+++ b/FoxTube/ChannelVideos.xaml.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace FoxTube
+{
+ ///
+ /// An empty page that can be used on its own or navigated to within a Frame.
+ ///
+ public sealed partial class ChannelVideos : Page
+ {
+ public ChannelVideos()
+ {
+ this.InitializeComponent();
+ content.Navigate(typeof(VideoGrid));
+ }
+ }
+}
diff --git a/FoxTube/FoxTube.csproj b/FoxTube/FoxTube.csproj
index fff76c6..121f385 100644
--- a/FoxTube/FoxTube.csproj
+++ b/FoxTube/FoxTube.csproj
@@ -101,12 +101,18 @@
Channel.xaml
+
+ ChannelVideos.xaml
+
Feedback.xaml
General.xaml
+
+ Home.xaml
+
MainFrame.xaml
@@ -121,6 +127,12 @@
Translate.xaml
+
+ VideoCard.xaml
+
+
+ VideoGrid.xaml
+
@@ -196,6 +208,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -204,6 +220,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -220,8 +240,28 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ 1.32.2
+
+
+ 1.32.2
+
+
+ 1.32.2
+
+
+ 1.32.2.1198
+
6.0.8
diff --git a/FoxTube/Home.xaml b/FoxTube/Home.xaml
new file mode 100644
index 0000000..512678e
--- /dev/null
+++ b/FoxTube/Home.xaml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FoxTube/Home.xaml.cs b/FoxTube/Home.xaml.cs
new file mode 100644
index 0000000..9ce28df
--- /dev/null
+++ b/FoxTube/Home.xaml.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace FoxTube
+{
+ ///
+ /// An empty page that can be used on its own or navigated to within a Frame.
+ ///
+ public sealed partial class Home : Page
+ {
+ public Home()
+ {
+ this.InitializeComponent();
+ content.Navigate(typeof(VideoGrid));
+ }
+ }
+}
diff --git a/FoxTube/MainPage.xaml b/FoxTube/MainPage.xaml
index 2d789a7..f212191 100644
--- a/FoxTube/MainPage.xaml
+++ b/FoxTube/MainPage.xaml
@@ -45,30 +45,14 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -174,7 +158,7 @@
-
+
diff --git a/FoxTube/MainPage.xaml.cs b/FoxTube/MainPage.xaml.cs
index d8fa494..aa9493e 100644
--- a/FoxTube/MainPage.xaml.cs
+++ b/FoxTube/MainPage.xaml.cs
@@ -32,7 +32,7 @@ namespace FoxTube
public MainPage()
{
this.InitializeComponent();
- content.Navigate(typeof(Settings));
+ content.Navigate(typeof(Home));
}
protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -55,23 +55,6 @@ namespace FoxTube
{
menu.IsPaneOpen = !menu.IsPaneOpen;
//AddNotification(new Notification("Internal notification", "Menu state has been changed", DateTime.Now, NotificationType.Update));
-
- if(menu.IsPaneOpen)
- {
- subsMenuTitle.Visibility = Visibility.Visible;
- subsMenuStroke.X2 = 165;
- subsMenuStroke.Y1 = subsMenuStroke.Y2 = 10;
- subscriptionsTitle.Height = 17;
- subsLogErr.Visibility = Visibility.Visible;
- }
- else
- {
- subsMenuTitle.Visibility = Visibility.Collapsed;
- subsMenuStroke.X2 = 40;
- subsMenuStroke.Y1 = subsMenuStroke.Y2 = 0;
- subscriptionsTitle.Height = 2;
- subsLogErr.Visibility = Visibility.Collapsed;
- }
}
public void AddNotification(Notification notification , bool needNotify = true)
@@ -200,27 +183,25 @@ namespace FoxTube
{
if(topHamburger.SelectedIndex == 0)
{
- content.Navigate(typeof(About));
+ content.Navigate(typeof(Home));
menu.DisplayMode = SplitViewDisplayMode.CompactInline;
menu.IsPaneOpen = true;
-
- subsMenuTitle.Visibility = Visibility.Visible;
- subsMenuStroke.X2 = 165;
- subsMenuStroke.Y1 = subsMenuStroke.Y2 = 10;
- subscriptionsTitle.Height = 17;
- subsLogErr.Visibility = Visibility.Visible;
}
else if (bottomHaburger.SelectedIndex == 3)
{
content.Navigate(typeof(Settings));
menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
menu.IsPaneOpen = false;
-
- subsMenuTitle.Visibility = Visibility.Collapsed;
- subsMenuStroke.X2 = 40;
- subsMenuStroke.Y1 = subsMenuStroke.Y2 = 0;
- subscriptionsTitle.Height = 2;
- subsLogErr.Visibility = Visibility.Collapsed;
+ }
+ else if (bottomHaburger.SelectedIndex == 0)
+ {
+ content.Navigate(typeof(Channel));
+ menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
+ menu.IsPaneOpen = false;
+ }
+ else if (bottomHaburger.SelectedIndex == 2)
+ {
+ bottomHaburger.SelectedItem = null;
}
}
@@ -251,5 +232,29 @@ namespace FoxTube
Settings s = content.Content as Settings;
s.content.Navigate(typeof(Feedback));
}
+
+ private void menu_PaneClosed(SplitView sender, object args)
+ {
+ try
+ {
+ subsMenuTitle.Visibility = Visibility.Collapsed;
+ subsMenuStroke.X2 = 40;
+ subsMenuStroke.Y1 = subsMenuStroke.Y2 = 0;
+ subscriptionsTitle.Height = 2;
+ subsLogErr.Visibility = Visibility.Collapsed;
+ } catch { }
+ }
+
+ private void menu_PaneOpened(SplitView sender, object args)
+ {
+ try
+ {
+ subsMenuTitle.Visibility = Visibility.Visible;
+ subsMenuStroke.X2 = 165;
+ subsMenuStroke.Y1 = subsMenuStroke.Y2 = 10;
+ subscriptionsTitle.Height = 17;
+ subsLogErr.Visibility = Visibility.Visible;
+ } catch { }
+ }
}
}
diff --git a/FoxTube/VideoCard.xaml b/FoxTube/VideoCard.xaml
new file mode 100644
index 0000000..7fc622a
--- /dev/null
+++ b/FoxTube/VideoCard.xaml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FoxTube/VideoCard.xaml.cs b/FoxTube/VideoCard.xaml.cs
new file mode 100644
index 0000000..e797d3f
--- /dev/null
+++ b/FoxTube/VideoCard.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace FoxTube
+{
+ public sealed partial class VideoCard : UserControl
+ {
+ public VideoCard()
+ {
+ this.InitializeComponent();
+ }
+ }
+}
diff --git a/FoxTube/VideoGrid.xaml b/FoxTube/VideoGrid.xaml
new file mode 100644
index 0000000..a6b97d6
--- /dev/null
+++ b/FoxTube/VideoGrid.xaml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FoxTube/VideoGrid.xaml.cs b/FoxTube/VideoGrid.xaml.cs
new file mode 100644
index 0000000..56a9811
--- /dev/null
+++ b/FoxTube/VideoGrid.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace FoxTube
+{
+ ///
+ /// An empty page that can be used on its own or navigated to within a Frame.
+ ///
+ public sealed partial class VideoGrid : Page
+ {
+ public VideoGrid()
+ {
+ this.InitializeComponent();
+ }
+ }
+}