Refactored navigation code (#28)

Author: d2dyno1

Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+	<PropertyGroup>
+		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+	</PropertyGroup>
+</Project>

SecureFolderFS.AvaloniaUI/App.axaml.cs

@@ -1,35 +1,29 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using SecureFolderFS.AvaloniaUI.ServiceImplementation;
-using SecureFolderFS.AvaloniaUI.ServiceImplementation.UserPreferences;
-using SecureFolderFS.AvaloniaUI.Services;
 using SecureFolderFS.AvaloniaUI.WindowViews;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Sdk.Services.UserPreferences;
 using SecureFolderFS.Sdk.Storage;
 using SecureFolderFS.Sdk.Storage.ModifiableStorage;
 using SecureFolderFS.UI;
 using SecureFolderFS.UI.Helpers;
 using SecureFolderFS.UI.ServiceImplementation;
-using SecureFolderFS.UI.ServiceImplementation.UserPreferences;
 using SecureFolderFS.UI.Storage.NativeStorage;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace SecureFolderFS.AvaloniaUI
 {
     public sealed partial class App : Application
     {
-        public static string AppDirectory { get; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SecureFolderFS");
+        private IServiceProvider? _serviceProvider;
 
-        private IServiceProvider? ServiceProvider { get; set; }
+        public static string AppDirectory { get; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SecureFolderFS");
 
         public App()
         {
@@ -55,9 +49,10 @@ public override void OnFrameworkInitializationCompleted()
                 var settingsFolder = new NativeFolder(settingsFolderPath);
 
                 // Configure IoC
-                ServiceProvider = ConfigureServices(settingsFolder);
-                Ioc.Default.ConfigureServices(ServiceProvider);
+                _serviceProvider = ConfigureServices(settingsFolder);
+                Ioc.Default.ConfigureServices(_serviceProvider);
 
+                // Activate MainWindow
                 desktop.MainWindow = new MainWindow();
             }
 
@@ -77,17 +72,7 @@ private IServiceProvider ConfigureServices(IModifiableFolder settingsFolder)
 
             serviceCollection
                 .AddSingleton<ISettingsService, SettingsService>(_ => new SettingsService(settingsFolder))
-                .AddSingleton<ISavedVaultsService, SavedVaultsService>(_ => new SavedVaultsService(settingsFolder))
-                .AddSingleton<IVaultsSettingsService, VaultsSettingsService>(_ => new VaultsSettingsService(settingsFolder))
-                .AddSingleton<IVaultsWidgetsService, VaultsWidgetsService>(_ => new VaultsWidgetsService(settingsFolder))
-                .AddSingleton<IApplicationSettingsService, ApplicationSettingsService>(_ => new ApplicationSettingsService(settingsFolder))
-                .AddSingleton<IPlatformSettingsService, PlatformSettingsService>(_ => new PlatformSettingsService(settingsFolder))
-                .AddSingleton<IGeneralSettingsService, GeneralSettingsService>(sp => GetSettingsService(sp, (database, model) => new GeneralSettingsService(database, model)))
-                .AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>(sp => GetSettingsService(sp, (database, model) => new PreferencesSettingsService(database, model)))
-                .AddSingleton<IPrivacySettingsService, PrivacySettingsService>(sp => GetSettingsService(sp, (database, model) => new PrivacySettingsService(database, model)))
-
-                .AddTransient<IVaultUnlockingService, VaultUnlockingService>()
-                .AddTransient<IVaultCreationService, VaultCreationService>()
+                .AddSingleton<IVaultPersistenceService, VaultPersistenceService>(_ => new VaultPersistenceService(settingsFolder))
                 .AddSingleton<IVaultService, VaultService>()
                 .AddSingleton<IStorageService, NativeStorageService>()
                 .AddSingleton<IDialogService, DialogService>()
@@ -96,20 +81,21 @@ private IServiceProvider ConfigureServices(IModifiableFolder settingsFolder)
                 .AddSingleton<ILocalizationService, LocalizationService>()
                 .AddSingleton<IFileExplorerService, FileExplorerService>()
                 .AddSingleton<IClipboardService, ClipboardService>()
-                .AddSingleton<IUpdateService, UpdateService>();
+                .AddSingleton<IUpdateService, UpdateService>()
+
+                // Transient services
+                .AddTransient<INavigationService, AvaloniaNavigationService>()
+                .AddTransient<IVaultUnlockingService, VaultUnlockingService>()
+                .AddTransient<IVaultCreationService, VaultCreationService>();
 
             return serviceCollection.BuildServiceProvider();
         }
 
-        private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
-        {
-            LogException(e.Exception);
-        }
+        #region Exception Handlers
 
-        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
-            LogException(e.ExceptionObject as Exception);
-        }
+        private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e) => LogException(e.Exception);
+        
+        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) => LogException(e.ExceptionObject as Exception);
 
         private static void LogException(Exception? ex)
         {
@@ -123,12 +109,6 @@ private static void LogException(Exception? ex)
 #endif
         }
 
-        // Terrible.
-        private static TSettingsService GetSettingsService<TSettingsService>(IServiceProvider serviceProvider,
-            Func<IDatabaseModel<string>, ISettingsModel, TSettingsService> initializer) where TSettingsService : SharedSettingsModel
-        {
-            var settingsServiceImpl = serviceProvider.GetRequiredService<ISettingsService>() as SettingsService;
-            return initializer(settingsServiceImpl!.GetDatabaseModel(), settingsServiceImpl);
-        }
+        #endregion
     }
 }

SecureFolderFS.AvaloniaUI/AppModels/ClipboardItemModel.cs

@@ -4,10 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:ic="using:FluentAvalonia.FluentIcons"
-    xmlns:m="using:SecureFolderFS.Sdk.AppModels"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     xmlns:vc="using:SecureFolderFS.AvaloniaUI.ValueConverters"
+    xmlns:vm="using:SecureFolderFS.Sdk.ViewModels.Controls"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -16,7 +16,7 @@
         <ResourceDictionary>
             <x:Double x:Key="ContentDialogMinWidth">800</x:Double>
             <x:Double x:Key="ContentDialogMaxWidth">800</x:Double>
-            <vc:NullToBooleanConverter x:Key="NullToBooleanConverter" />
+            <vc:NullToBoolConverter x:Key="NullToBoolConverter" />
             <vc:OnlyFirstElementOrNullConverter x:Key="OnlyFirstElementOrNullConverter" />
         </ResourceDictionary>
     </ui:ContentDialog.Resources>
@@ -28,58 +28,62 @@
         </Style>
     </ui:ContentDialog.Styles>
 
-    <Grid Height="500" Margin="-8" RowDefinitions="Auto,*">
-        <Grid Margin="-16,-56,-16,8" Background="{StaticResource ContentDialogBackground}" Grid.Row="0">
-                <TextBlock
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    FontSize="16"
-                    Margin="16,0,0,0"
-                    FontWeight="SemiBold"
-                    Text="Licenses" />
+    <Grid
+        Height="500"
+        Margin="-8"
+        RowDefinitions="Auto,*">
+        <Grid
+            Grid.Row="0"
+            Margin="-16,-56,-16,8"
+            Background="{StaticResource ContentDialogBackground}">
+            <TextBlock
+                Margin="16,0,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                FontSize="16"
+                FontWeight="SemiBold"
+                Text="Licenses" />
 
-                <Button
-                    Width="34"
-                    Height="34"
-                    Margin="8"
-                    Padding="0"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Top"
-                    Background="Transparent"
-                    BorderThickness="0"
-                    Click="CloseButton_OnClick"
-                    CornerRadius="20">
-                    <ic:FluentIcon Width="10" Icon="Dismiss48Regular" />
-                </Button>
+            <Button
+                Width="34"
+                Height="34"
+                Margin="8"
+                Padding="0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                Click="CloseButton_OnClick"
+                CornerRadius="20">
+                <ic:FluentIcon Width="10" Icon="Dismiss48Regular" />
+            </Button>
         </Grid>
 
 
         <ScrollViewer Grid.Row="1">
             <ItemsControl Items="{Binding ViewModel.Licenses, RelativeSource={RelativeSource AncestorType={x:Type ui:ContentDialog}}}" Loaded="Control_OnLoaded">
                 <ItemsControl.ItemTemplate>
-                    <DataTemplate DataType="{x:Type m:LicenseModel}">
+                    <DataTemplate DataType="{x:Type vm:LicenseViewModel}">
                         <ui:SettingsExpander
                             DataContext="{Binding .}"
                             Description="{Binding LicenseName}"
                             Header="{Binding PackageName}">
                             <ui:SettingsExpander.Footer>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <ui:HyperlinkButton
-                                        IsVisible="{Binding ProjectWebsiteUri, Converter={StaticResource NullToBooleanConverter}}"
+                                        IsVisible="{Binding ProjectWebsiteUri, Converter={StaticResource NullToBoolConverter}}"
                                         NavigateUri="{Binding ProjectWebsiteUri}">
                                         <TextBlock Text="Project website" />
                                     </ui:HyperlinkButton>
                                     <ui:HyperlinkButton
-                                        IsVisible="{Binding NavigateUri, RelativeSource={RelativeSource Self}, Converter={StaticResource NullToBooleanConverter}}"
+                                        IsVisible="{Binding NavigateUri, RelativeSource={RelativeSource Self}, Converter={StaticResource NullToBoolConverter}}"
                                         NavigateUri="{Binding LicenseUris, Converter={StaticResource OnlyFirstElementOrNullConverter}}">
                                         <TextBlock Text="License" />
                                     </ui:HyperlinkButton>
                                 </StackPanel>
                             </ui:SettingsExpander.Footer>
 
-                            <SelectableTextBlock
-                                Text="{Binding DataContext.License, RelativeSource={RelativeSource AncestorType={x:Type ui:SettingsExpander}}}"
-                                TextWrapping="Wrap" />
+                            <SelectableTextBlock Text="{Binding DataContext.LicenseContent, RelativeSource={RelativeSource AncestorType={x:Type ui:SettingsExpander}}}" TextWrapping="Wrap" />
                         </ui:SettingsExpander>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>

SecureFolderFS.AvaloniaUI/Dialogs/LicensesDialog.axaml

@@ -23,19 +23,14 @@ public LicensesDialogViewModel ViewModel
 
         public LicensesDialog()
         {
-            InitializeComponent();
+            AvaloniaXamlLoader.Load(this);
         }
 
         public Type StyleKey => typeof(ContentDialog);
 
         /// <inheritdoc/>
         public async Task<DialogResult> ShowAsync() => (DialogResult)await base.ShowAsync();
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void Button_OnClick(object? sender, RoutedEventArgs e)
         {
             Hide();

SecureFolderFS.AvaloniaUI/Dialogs/LicensesDialog.axaml.cs

@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Threading.Tasks;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
@@ -9,10 +6,14 @@
 using SecureFolderFS.AvaloniaUI.Animations.Transitions.NavigationTransitions;
 using SecureFolderFS.AvaloniaUI.Messages;
 using SecureFolderFS.Sdk.Enums;
-using SecureFolderFS.Sdk.Messages.Navigation;
+using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.ViewModels.Dialogs;
-using SecureFolderFS.Sdk.ViewModels.Pages.Settings;
+using SecureFolderFS.Sdk.ViewModels.Views.Settings;
+using SecureFolderFS.UI.Helpers;
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
 
 namespace SecureFolderFS.AvaloniaUI.Dialogs
 {
@@ -21,41 +22,41 @@ internal sealed partial class SettingsDialog : ContentDialog, IDialog<SettingsDi
         /// <inheritdoc/>
         public SettingsDialogViewModel ViewModel
         {
-            get => (SettingsDialogViewModel)DataContext;
+            get => (SettingsDialogViewModel)DataContext!;
             set => DataContext = value;
         }
 
+        public Type StyleKey => typeof(ContentDialog);
+
         public SettingsDialog()
         {
             AvaloniaXamlLoader.Load(this);
         }
 
-        public Type StyleKey => typeof(ContentDialog);
-
         /// <inheritdoc/>
         public async Task<DialogResult> ShowAsync() => (DialogResult)await base.ShowAsync();
 
-        private INotifyPropertyChanged GetViewModelForTag(int tag)
+        private INotifyPropertyChanged GetTargetForTag(int tag)
         {
             return tag switch
             {
-                0 => new GeneralSettingsPageViewModel(),
-                1 => new PreferencesSettingsPageViewModel(),
-                2 => new PrivacySettingsPageViewModel(),
-                3 => new AboutSettingsPageViewModel(),
-                _ => new GeneralSettingsPageViewModel()
+                0 => ViewModel.NavigationService.TryGetTarget<GeneralSettingsViewModel>() ?? new(),
+                1 => ViewModel.NavigationService.TryGetTarget<PreferencesSettingsViewModel>() ?? new(),
+                2 => ViewModel.NavigationService.TryGetTarget<PrivacySettingsViewModel>() ?? new(),
+                3 => ViewModel.NavigationService.TryGetTarget<AboutSettingsViewModel>() ?? new(),
+                _ => new GeneralSettingsViewModel()
             };
         }
 
-        private void NavigationView_OnSelectionChanged(object? sender, NavigationViewSelectionChangedEventArgs e)
+        private async void NavigationView_OnSelectionChanged(object? sender, NavigationViewSelectionChangedEventArgs e)
         {
-            if (!ViewModel.Messenger.IsRegistered<NavigationRequestedMessage>(Navigation))
-                ViewModel.Messenger.Register<NavigationRequestedMessage>(Navigation);
+            if (!ViewModel.NavigationService.SetupNavigation(Navigation))
+                return;
 
             var tag = Convert.ToInt32((e.SelectedItem as NavigationViewItem)?.Tag);
-            var viewModel = GetViewModelForTag(tag);
+            var target = GetTargetForTag(tag);
 
-            Navigation.Navigate(viewModel, new EntranceNavigationTransition());
+            await Navigation.NavigateAsync(target, new EntranceNavigationTransition());
         }
 
         private void Button_OnClick(object? sender, RoutedEventArgs e)