Updated Switcher

MOBA-Manager/MOBA-Manager/Source/UI/InGame/PlayerView/PlayerPage.xaml

@@ -10,5 +10,6 @@
 
     <Grid>
         <Label x:Name="PlayerNameLabel" Content="Label" HorizontalAlignment="Left" Margin="20,20,0,0" VerticalAlignment="Top" Style="{DynamicResource Header}"/>
+        <Button x:Name="BackButtton" Content="Button" HorizontalAlignment="Left" Margin="690,29,0,0" VerticalAlignment="Top" Width="75" Click="BackButtton_Click"/>
     </Grid>
 </Page>

MOBA-Manager/MOBA-Manager/Source/UI/InGame/PlayerView/PlayerPage.xaml.cs

@@ -1,4 +1,5 @@
 using MOBA_Manager.DataModel;
+using MOBA_Manager.UI;
 using System.Windows.Controls;
 
 namespace MOBA_Manager.Source.UI.InGame.PlayerView
@@ -22,6 +23,9 @@ private void ShowPlayerDetails()
             PlayerNameLabel.Content = player.GetFullName();
         }
 
-
+        private void BackButtton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            Switcher.NavigatePreviousIngame();
+        }
     }
 }

MOBA-Manager/MOBA-Manager/Source/UI/Switcher.cs

@@ -6,25 +6,39 @@ public static class Switcher
     {
         public static MainWindow pageSwitcher;
         public static Frame ingameFrame;
+        private static Page previousMainPage;
+        private static Page previousIngamePage;
 
         public static void Switch(Page newPage)
         {
+            previousMainPage = pageSwitcher.MainWindowFrame.Content != null ? pageSwitcher.MainWindowFrame.Content as Page : newPage;
             pageSwitcher.Navigate(newPage);
         }
 
-        public static Frame GetMainFrame()
+        public static void SwitchIngame(Page newPage)
         {
-            return pageSwitcher.MainWindowFrame;
+            previousIngamePage = ingameFrame.Content != null ? ingameFrame.Content as Page : newPage;
+            ingameFrame.Navigate(newPage);
         }
 
-        public static void SwitchIngame(Page newPage)
+        public static Frame GetMainFrame()
         {
-            ingameFrame.Navigate(newPage);
+            return pageSwitcher.MainWindowFrame;
         }
 
         public static Frame GetMainIngameFrame()
         {
             return ingameFrame;
         }
+
+        public static void NavigatePreviousIngame()
+        {
+            ingameFrame.Navigate(previousIngamePage);
+        }
+
+        public static void NavigatePrevious()
+        {
+            pageSwitcher.Navigate(previousMainPage);
+        }
     }
 }