#41 Support Selecting custom page to be shown on startup (#42)

- Fixed FrameworkVersion warnings
- NavigationItemKey ordered alphabetically

Author: zsolt3991

WingetGUIInstaller/Constants/ConfigurationPropertyKeys.cs

@@ -1,4 +1,6 @@
-namespace WingetGUIInstaller.Constants
+using WingetGUIInstaller.Enums;
+
+namespace WingetGUIInstaller.Constants
 {
     public static class ConfigurationPropertyKeys
     {
@@ -8,12 +10,14 @@ public static class ConfigurationPropertyKeys
         public const string DisabledPackageSources = "disabledPackageSources";
         public const string IgnoreEmptyPackageSources = "ignoreEmptyPackageSources";
         public const string AutomaticUpdates = "AutomaticUpdates";
+        public const string SelectedPage = "SelectedPage";
 
         public const bool ConsoleEnabledDefaultValue = true;
         public const bool NotificationsEnabledDefaultValue = true;
         public const bool PackageSourceFilteringEnabledDefaultValue = false;
         public const string DisabledPackageSourcesDefaultValue = "";
         public const bool IgnoreEmptyPackageSourcesDefaultValue = true;
         public const bool AutomaticUpdatesDefaultValue = false;
+        public const int SelectedPageDefaultValue = (int)NavigationItemKey.Recommendations;
     }
 }

WingetGUIInstaller/Enums/NavigationItemKey.cs

@@ -5,13 +5,13 @@ public enum NavigationItemKey
         About,
         Console,
         Home,
+        ImportExport,
         InstalledPackages,
+        PackageDetails,
+        PackageSources,
         Recommendations,
         Search,
         Settings,
         Upgrades,
-        PackageDetails,
-        ImportExport,
-        PackageSources,
     }
 }

WingetGUIInstaller/Pages/MainPage.xaml.cs

@@ -1,10 +1,12 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI.Helpers;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 using System;
 using System.Linq;
 using Windows.System;
+using WingetGUIInstaller.Constants;
 using WingetGUIInstaller.Enums;
 using WingetGUIInstaller.Messages;
 using WingetGUIInstaller.Services;
@@ -16,6 +18,7 @@ namespace WingetGUIInstaller.Pages
     [PageKey(NavigationItemKey.Home)]
     public sealed partial class MainPage : Page
     {
+        private readonly ApplicationDataStorageHelper _applicationSettings;
         private NavigationItemKey _defaultPage = NavigationItemKey.Recommendations;
         private bool _pageLoaded = false;
         private readonly IMultiLevelNavigationService<NavigationItemKey> _navigationService;
@@ -26,10 +29,16 @@ public MainPage()
             InitializeComponent();
             Loaded += MainPage_Loaded;
             Unloaded += MainPage_Unloaded;
+
             _navigationService = Ioc.Default.GetRequiredService<IMultiLevelNavigationService<NavigationItemKey>>();
             _navigationService.AddNavigationLevel(ContentFrame);
+            _applicationSettings = Ioc.Default.GetRequiredService<ApplicationDataStorageHelper>();
+            _defaultPage = (NavigationItemKey)_applicationSettings
+                .Read(ConfigurationPropertyKeys.SelectedPage, ConfigurationPropertyKeys.SelectedPageDefaultValue);
+
             DataContext = ViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
             ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+
             WeakReferenceMessenger.Default.Register(this, (MessageHandler<object, NavigationRequestedMessage>)((r, m) =>
             {
                 DispatcherQueue.TryEnqueue(() =>

WingetGUIInstaller/Pages/SettingsPage.xaml

@@ -40,6 +40,14 @@
                                                                 IsOn="{x:Bind ViewModel.ConsoleTabEnabled, Mode=TwoWay}"
                                                                 PrimaryText="Show Console output"
                                                                 SecondaryText="Enables the ability to view raw command ouput for actions" />
+                    <customControls:CustomContentSettingsControl Margin="0,1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" PrimaryText="Default Page"
+                                                                 SecondaryText="Change the page that is shown when the application starts up">
+                        <customControls:CustomContentSettingsControl.CustomContent>
+                            <ComboBox HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+                                      ItemsSource="{x:Bind ViewModel.AvailablePages, Mode=OneTime}"
+                                      SelectedItem="{x:Bind ViewModel.SelectedPage, Mode=TwoWay}" />
+                        </customControls:CustomContentSettingsControl.CustomContent>
+                    </customControls:CustomContentSettingsControl>
                 </StackPanel>
             </Expander>
 

WingetGUIInstaller/ViewModels/SettingsPageViewModel.cs

@@ -4,23 +4,30 @@
 using CommunityToolkit.WinUI.Helpers;
 using GithubPackageUpdater.Services;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Windows.ApplicationModel;
 using WingetGUIInstaller.Constants;
+using WingetGUIInstaller.Enums;
 using WingetGUIInstaller.Messages;
 
 namespace WingetGUIInstaller.ViewModels
 {
     public class SettingsPageViewModel : ObservableObject
     {
+        private readonly NavigationItemKey[] _disallowedKeys = new NavigationItemKey[] {
+            NavigationItemKey.Settings, NavigationItemKey.About, NavigationItemKey.Console, NavigationItemKey.Home };
         private readonly ApplicationDataStorageHelper _configurationStore;
         private readonly GithubPackageUpdaterSerivce _updaterSerivce;
         private bool? _consoleTabEnabled;
         private bool? _notificationsEnabled;
         private bool? _packageSourceFilteringEnabled;
         private bool? _ignoreEmptyPackageSourceEnabled;
         private bool? _automaticUpdatesEnabled;
+        private NavigationItemKey? _selectedPage;
+
 
         public SettingsPageViewModel(ApplicationDataStorageHelper configurationStore,
            GithubPackageUpdaterSerivce updaterSerivce)
@@ -129,7 +136,30 @@ public bool AutomaticUpdatesEnabled
                     _configurationStore.Save(ConfigurationPropertyKeys.AutomaticUpdates, value);
                 }
             }
-        }      
+        }
+
+        public NavigationItemKey SelectedPage
+        {
+            get
+            {
+                if (_selectedPage == null)
+                {
+                    _selectedPage = (NavigationItemKey)_configurationStore
+                        .Read(ConfigurationPropertyKeys.SelectedPage, ConfigurationPropertyKeys.SelectedPageDefaultValue);
+                }
+                return _selectedPage.Value;
+            }
+            set
+            {
+                if (SetProperty(ref _selectedPage, value))
+                {
+                    _configurationStore.Save(ConfigurationPropertyKeys.SelectedPage, (int)value);
+                }
+            }
+        }
+
+        public IReadOnlyList<NavigationItemKey> AvailablePages => Enum.GetValues<NavigationItemKey>().Cast<NavigationItemKey>()
+            .Where(key => !_disallowedKeys.Contains(key)).ToList();
 
         public ICommand CheckForUpdatesCommand => new AsyncRelayCommand(CheckForUpdatesAsync);
 

WingetGUIInstaller/WingetGUIInstaller.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <RootNamespace>WingetGUIInstaller</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>