Navigation improvements

FoxTube/Pages/MainPage.xaml.cs

@@ -48,6 +48,8 @@ namespace FoxTube
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
 
+    public enum Sender { Menu, Frame, None }
+
     public sealed partial class MainPage : Page
     {
         public DownloadAgent Agent = new DownloadAgent();
@@ -55,6 +57,7 @@ namespace FoxTube
         ApplicationDataContainer settings = ApplicationData.Current.LocalSettings;
 
         NotificationsCenter notificationsCenter = new NotificationsCenter();
+        Sender s = Sender.None;
         public MainPage()
         {
             this.InitializeComponent();
@@ -389,6 +392,9 @@ namespace FoxTube
 
         private void nav_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         {
+            if (s == Sender.None)
+            {
+                s = Sender.Menu;
                 if (args.IsSettingsSelected)
                     content.Navigate(typeof(Settings));
                 else
@@ -411,6 +417,9 @@ namespace FoxTube
                         content.Navigate(typeof(ChannelPage), SecretsVault.Subscriptions[Convert.ToInt32((args.SelectedItem as NavigationViewItem).Name)].Snippet.ResourceId.ChannelId);
                 }
             }
+            else if (s == Sender.Frame)
+                s = Sender.None;
+        }
 
         private void content_Navigated(object sender, NavigationEventArgs e)
         {
@@ -425,7 +434,35 @@ namespace FoxTube
                 { typeof(Downloads), () => header.Text = "Downloads" }
             };
 
-            switchCase[e.SourcePageType]();
+            try { switchCase[e.SourcePageType](); }
+            catch { }
+
+            if (s == Sender.None)
+            {
+                s = Sender.Frame;
+
+                Dictionary<Type, Action> navCase = new Dictionary<Type, Action>()
+                {
+                    { typeof(Settings), () => nav.SelectedItem = nav.SettingsItem },
+                    { typeof(ChannelPage), () => 
+                    {
+                        //Check channel
+                    } },
+                    { typeof(PlaylistPage), () => 
+                    {
+                        //Check playlist
+                    } },
+                    { typeof(Search), () => nav.SelectedItem = null },
+                    { typeof(History), () => nav.SelectedItem = toHistory },
+                    { typeof(Home), () => nav.SelectedItem = toHome },
+                    { typeof(Downloads), () => nav.SelectedItem = toDownloads }
+                };
+
+                try { navCase[e.SourcePageType](); }
+                catch { }
+            }
+            else if (s == Sender.Menu)
+                s = Sender.None;
 
             if (content.CanGoBack)
                 nav.IsBackEnabled = true;