Add Back Button

Author: ghost1372

src/HandyWinget/Assets/ISettings.cs

@@ -28,6 +28,7 @@ public class ISettings : NotifiyingJsonSettings, IVersionable
         public virtual Brush Accent { get; set; }
         public virtual bool AutoRefreshInStartup { get; set; } = false;
         public virtual bool IsStoreDataGridColumnWidth { get; set; } = false;
+        public virtual bool IsBackEnabled { get; set; } = true;
         public virtual Version Version { get; set; }
 
         private ObservableCollection<DataGridLength> _DataGridColumnWidth = new ObservableCollection<DataGridLength>();

src/HandyWinget/MainWindow.xaml

@@ -79,7 +79,7 @@
         </ui:CommandBar>
         <ui:NavigationView Name="navView" SelectionChanged="NavigationView_SelectionChanged" PaneTitle="HandyWinGet" AlwaysShowHeader="True" 
                        Header="{Binding SelectedItem.Content, RelativeSource={RelativeSource Mode=Self}}" IsSettingsVisible="False"
-                       IsBackButtonVisible="Collapsed">
+                       IsBackButtonVisible="Visible" BackRequested="navView_BackRequested" IsBackEnabled="True">
             <ui:NavigationView.MenuItems>
                 <ui:NavigationViewItem Tag="General" Content="General">
                     <ui:NavigationViewItem.Icon>
@@ -98,7 +98,7 @@
                 </ui:NavigationViewItem>
 
             </ui:NavigationView.MenuItems>
-            <ui:Frame x:Name="contentFrame"/>
+            <ui:Frame x:Name="contentFrame" Navigated="contentFrame_Navigated" Navigating="contentFrame_Navigating"/>
             <ui:NavigationView.PaneFooter>
                 <StackPanel>
                     <ui:NavigationViewItem Name="nvOpenTerminal" Content="Open Terminal" MouseLeftButtonDown="nvOpenTerminal_MouseLeftButtonDown">

src/HandyWinget/MainWindow.xaml.cs

@@ -4,9 +4,11 @@
 using HandyWinget.Views;
 using ModernWpf.Controls;
 using ModernWpf.Controls.Primitives;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Navigation;
 using static HandyWinget.Assets.Helper;
 namespace HandyWinget
 {
@@ -31,6 +33,7 @@ private void LoadSettings()
             }
 
             navView.PaneDisplayMode = Settings.PaneDisplayMode;
+            navView.IsBackButtonVisible = Settings.IsBackEnabled ? NavigationViewBackButtonVisible.Visible : NavigationViewBackButtonVisible.Collapsed;
         }
 
         public void CommandButtonsVisibility(Visibility visibility)
@@ -181,5 +184,43 @@ private void nvOpenTerminal_MouseLeftButtonDown(object sender, MouseButtonEventA
         {
             OpenFlyout("TerminalCommandBar", nvOpenTerminal);
         }
+
+        private void navView_BackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args)
+        {
+            if (contentFrame.CanGoBack)
+            {
+                contentFrame.GoBack();
+            }
+        }
+
+        private void contentFrame_Navigated(object sender, NavigationEventArgs e)
+        {
+            var pageName = contentFrame.Content.GetType().Name;
+            var menuItem = navView.MenuItems
+                                     .OfType<NavigationViewItem>()
+                                     .Where(item => item.Tag.ToString() == pageName)
+                                     .FirstOrDefault();
+            if (menuItem != null)
+            {
+                navView.SelectedItem = menuItem;
+            }
+
+            if (contentFrame.CanGoBack)
+            {
+                navView.IsBackEnabled = true;
+            }
+            else
+            {
+                navView.IsBackEnabled = false;
+            }
+        }
+
+        private void contentFrame_Navigating(object sender, NavigatingCancelEventArgs e)
+        {
+            if (e.NavigationMode == NavigationMode.Back)
+            {
+                contentFrame.RemoveBackEntry();
+            }
+        }
     }
 }

src/HandyWinget/Views/CreatePackage.xaml

@@ -1,7 +1,8 @@
-<UserControl x:Class="HandyWinget.Views.CreatePackage"
+<ui:Page x:Class="HandyWinget.Views.CreatePackage"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
+             KeepAlive="True"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <hc:ScrollViewer>
         <StackPanel>
@@ -60,4 +61,4 @@
             </StackPanel>
         </StackPanel>
     </hc:ScrollViewer>
-</UserControl>
+</ui:Page>

src/HandyWinget/Views/CreatePackage.xaml.cs

@@ -20,7 +20,7 @@ namespace HandyWinget.Views
     /// <summary>
     /// Interaction logic for CreatePackage.xaml
     /// </summary>
-    public partial class CreatePackage : UserControl, INotifyPropertyChanged
+    public partial class CreatePackage : ModernWpf.Controls.Page, INotifyPropertyChanged
     {
         #region INotify
         public event PropertyChangedEventHandler PropertyChanged;

src/HandyWinget/Views/General.xaml

@@ -1,8 +1,9 @@
-<UserControl x:Class="HandyWinget.Views.General"
+<ui:Page x:Class="HandyWinget.Views.General"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:ui="http://schemas.modernwpf.com/2019"
              xmlns:enum="clr-namespace:HandyWinget.Assets"
+             KeepAlive="True"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <hc:ScrollViewer>
         <Grid>
@@ -30,7 +31,8 @@
                 <ToggleButton x:Name="tgAutoRefresh" Style="{StaticResource ToggleButtonSwitch}" HorizontalAlignment="Left" Margin="10,0" Content="Auto Refresh Packages When Application Startup" Checked="tgAutoRefresh_Checked" Unchecked="tgAutoRefresh_Checked" />
 
                 <ToggleButton x:Name="tgSaveDGColumnWidth" Style="{StaticResource ToggleButtonSwitch}" HorizontalAlignment="Left" Margin="10" Content="Save and Restore DataGrid Columns Width" Checked="tgSaveDGColumnWidth_Checked" Unchecked="tgSaveDGColumnWidth_Checked" />
-
+                
+                <ToggleButton x:Name="tgIsBackEnabled" Style="{StaticResource ToggleButtonSwitch}" HorizontalAlignment="Left" Margin="10" Content="Show Back Button for Navigation" Checked="tgIsBackEnabled_Checked" Unchecked="tgIsBackEnabled_Checked" />
 
                 <Button Click="ResetAccent_Click" Style="{StaticResource DefaultButtonStyle}" Content="Reset Accent Color" Margin="0,20"/>
             </StackPanel>
@@ -69,4 +71,4 @@
         </Grid>
     </hc:ScrollViewer>
 
-</UserControl>
+</ui:Page>

src/HandyWinget/Views/General.xaml.cs

@@ -12,7 +12,7 @@ namespace HandyWinget.Views
     /// <summary>
     /// Interaction logic for General
     /// </summary>
-    public partial class General : UserControl
+    public partial class General : ModernWpf.Controls.Page
     {
         string Version = string.Empty;
         public General()
@@ -184,5 +184,15 @@ private void tgSaveDGColumnWidth_Checked(object sender, RoutedEventArgs e)
                 Settings.IsStoreDataGridColumnWidth = state;
             }
         }
+
+        private void tgIsBackEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            var state = tgIsBackEnabled.IsChecked.Value;
+            if (state != Settings.IsBackEnabled)
+            {
+                Settings.IsBackEnabled = state;
+                MainWindow.Instance.navView.IsBackButtonVisible = state ? NavigationViewBackButtonVisible.Visible : NavigationViewBackButtonVisible.Collapsed;
+            }
+        }
     }
 }

src/HandyWinget/Views/Packages.xaml

@@ -1,8 +1,9 @@
-<UserControl x:Class="HandyWinget.Views.Packages"
+<ui:Page x:Class="HandyWinget.Views.Packages"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:ui="http://schemas.modernwpf.com/2019"
+             KeepAlive="True"
              KeyDown="UserControl_KeyDown">
     <hc:ToggleBlock Name="tgBlock" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
         <hc:ToggleBlock.UnCheckedContent>
@@ -161,4 +162,4 @@
             </Grid>
         </hc:ToggleBlock.CheckedContent>
     </hc:ToggleBlock>
-</UserControl>
+</ui:Page>

src/HandyWinget/Views/Packages.xaml.cs

@@ -25,7 +25,7 @@
 using static HandyWinget.Assets.Helper;
 namespace HandyWinget.Views
 {
-    public partial class Packages : UserControl
+    public partial class Packages : ModernWpf.Controls.Page
     {
         internal static Packages Instance;
 
@@ -59,7 +59,6 @@ public Packages()
             BindingOperations.EnableCollectionSynchronization(DataList, Lock);
             BindingOperations.EnableCollectionSynchronization(_temoList, Lock);
             BindingOperations.EnableCollectionSynchronization(_tempVersions, Lock);
-
             DownloadManifests();
             SetDataListGrouping();
         }