From 1081b4286820159afd98b5481834b7eb3e63e6e8 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 22 Nov 2024 18:58:09 -0600
Subject: [PATCH 01/64] snapshot of file picker storage api

---
 .../ViewModels/FileOpenPickerViewModel.cs     | 12 ++++
 .../ViewModels/FileSavePickerViewModel.cs     | 12 ++++
 .../ViewModels/FolderPickerViewModel.cs       | 12 ++++
 .../Controls/ViewModels/PickerViewModel.cs    | 55 +++++++++++++++++++
 .../Controls/Views/FileOpenPicker.axaml       | 42 ++++++++++++++
 .../Controls/Views/FileOpenPicker.axaml.cs    | 44 +++++++++++++++
 6 files changed, 177 insertions(+)
 create mode 100644 src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs
 create mode 100644 src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs
 create mode 100644 src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs
 create mode 100644 src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
 create mode 100644 src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
 create mode 100644 src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs

diff --git a/src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs
new file mode 100644
index 00000000..ca5cc011
--- /dev/null
+++ b/src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs
@@ -0,0 +1,12 @@
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Controls.ViewModels
+{
+    public class FileOpenPickerViewModel : PickerViewModel<FilePickerOpenOptions>
+    {
+        public FileOpenPickerViewModel(FilePickerOpenOptions options)
+            : base(options)
+        {
+        }
+    }
+}
diff --git a/src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs
new file mode 100644
index 00000000..97205051
--- /dev/null
+++ b/src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs
@@ -0,0 +1,12 @@
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Controls.ViewModels
+{
+    public class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOptions>
+    {
+        public FileSavePickerViewModel(FilePickerSaveOptions options)
+            : base(options)
+        {
+        }
+    }
+}
diff --git a/src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs
new file mode 100644
index 00000000..f6618541
--- /dev/null
+++ b/src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs
@@ -0,0 +1,12 @@
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Controls.ViewModels
+{
+    public class FolderPickerViewModel : PickerViewModel<FolderPickerOpenOptions>
+    {
+        public FolderPickerViewModel(FolderPickerOpenOptions options)
+            : base(options)
+        {
+        }
+    }
+}
diff --git a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
new file mode 100644
index 00000000..e7230190
--- /dev/null
+++ b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
@@ -0,0 +1,55 @@
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls.ViewModels
+{
+
+    public partial class PickerViewModel<TPickerOptions> : ObservableObject
+        where TPickerOptions : PickerOptions
+    {
+        public PickerViewModel(TPickerOptions options)
+        {
+            Options = options;
+            PropertyChanged += PickerViewModel_PropertyChanged;
+            CurrentFolder = options.SuggestedStartLocation;
+        }
+
+
+        [ObservableProperty]
+        private TPickerOptions _options;
+
+        [ObservableProperty]
+        private IStorageFolder _currentFolder;
+
+        [ObservableProperty]
+        private ObservableCollection<IStorageItem> _items = new ObservableCollection<IStorageItem>();
+
+        [ObservableProperty]
+        private IStorageItem _selectedItem;
+
+        private async void PickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(CurrentFolder):
+                    Items.Clear();
+
+                    await foreach (var item in CurrentFolder.GetItemsAsync())
+                    {
+                        if (item is IStorageFolder)
+                            this.Items.Add(item);
+                    }
+
+                    await foreach (var item in CurrentFolder.GetItemsAsync())
+                    {
+                        if (item is IStorageItem)
+                            this.Items.Add(item);
+                    }
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
new file mode 100644
index 00000000..5376d677
--- /dev/null
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
@@ -0,0 +1,42 @@
+<dialogs:DialogWindow xmlns="https://github.com/avaloniaui"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:viewmodels="clr-namespace:Consolonia.Core.Controls.ViewModels"
+                     xmlns:views="clr-namespace:Consolonia.Core.Controls.Views"
+                     xmlns:storage="clr-namespace:Consolonia.Core.Infrastructure"
+                     xmlns:dialogs="clr-namespace:Consolonia.Core.Controls.Dialog"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     Title="{Binding Title}"
+                     x:DataType="viewmodels:FileOpenPickerViewModel"
+                     x:Class="Consolonia.Core.Controls.Views.FileOpenPicker">
+    <Grid RowDefinitions="Auto * Auto Auto">
+        <StackPanel Orientation="Horizontal" Grid.Row="0">                  r
+            <TextBlock>📁</TextBlock>
+            <TextBox Text="{Binding CurrentFolder.Name}"/>
+        </StackPanel>
+        <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type storage:StorageFolder}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>📁</TextBlock>
+                        <TextBox Text="{Binding Name}"/>
+                    </StackPanel>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type storage:StorageFile}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>📰</TextBlock>
+                        <TextBox Text="{Binding Name}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
+            <TextBlock>Selected:</TextBlock>
+            <SelectableTextBlock Text="{Binding SelectedItem}"/>
+        </StackPanel>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Content="{Binding OKLabel}"/>
+            <Button Content="{Binding CancelLabel}"/>
+        </StackPanel>
+    </Grid>
+</dialogs:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
new file mode 100644
index 00000000..3a69832d
--- /dev/null
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
@@ -0,0 +1,44 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Consolonia.Core.Controls.ViewModels;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Core.Controls.Views
+{
+    public partial class FileOpenPicker : Window
+    {
+        public FileOpenPicker(ushort width, ushort height)
+        {
+            InitializeComponent();
+            Width = width;
+            Height = height;
+            Loaded += (_, _) =>
+            {
+                this.FindControl<Button>("Button")!.Focus();
+            };
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+
+
+        private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
+        {
+            if (e.Source is StorageFolder folder)
+            {
+                var model  = (FileOpenPickerViewModel)this.DataContext;
+                model.CurrentFolder = folder;
+            }
+            if (e.Source is StorageFile file)
+            {
+                var model = (FileOpenPickerViewModel)this.DataContext;
+                model.SelectedItem = file;
+            }
+        }
+
+    }
+}
\ No newline at end of file

From fd11af0ea8fe8b2decc2c87c93562f7b143ec940 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 22 Nov 2024 18:58:30 -0600
Subject: [PATCH 02/64] storage provider

---
 .../Infrastructure/ConsoleWindow.cs           |  3 +
 .../Infrastructure/ConsoloniaPlatform.cs      |  3 +-
 .../Infrastructure/Extensions.cs              | 12 +++
 .../Infrastructure/StorageFile.cs             | 69 +++++++++++++++++
 .../Infrastructure/StorageFolder.cs           | 76 +++++++++++++++++++
 .../Infrastructure/StorageProvider.cs         | 67 ++++++++++++++++
 6 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 src/Consolonia.Core/Infrastructure/Extensions.cs
 create mode 100644 src/Consolonia.Core/Infrastructure/StorageFile.cs
 create mode 100644 src/Consolonia.Core/Infrastructure/StorageFolder.cs
 create mode 100644 src/Consolonia.Core/Infrastructure/StorageProvider.cs

diff --git a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
index 542a7628..c689cc7b 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
@@ -10,6 +10,7 @@
 using Avalonia.Input.Raw;
 using Avalonia.Input.TextInput;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
@@ -251,6 +252,8 @@ public object TryGetFeature(Type featureType)
             if (featureType == typeof(ISystemNavigationManagerImpl))
                 return null;
             if (featureType == typeof(ITextInputMethodImpl)) return null;
+            if (featureType == typeof(IStorageProvider))
+                return AvaloniaLocator.Current.GetService<IStorageProvider>();
             throw new NotImplementedException("Consider this");
         }
 
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
index f65c7f2c..26180cc7 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
@@ -6,10 +6,11 @@
 using Avalonia.Input.Platform;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.Rendering;
 using Avalonia.Threading;
+using Avalonia.Rendering;
 using Consolonia.Core.Dummy;
 using Consolonia.Core.Text;
+using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Infrastructure
 {
diff --git a/src/Consolonia.Core/Infrastructure/Extensions.cs b/src/Consolonia.Core/Infrastructure/Extensions.cs
new file mode 100644
index 00000000..8bfb4158
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/Extensions.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Consolonia.Core.Infrastructure
+{
+    public static class Extensions
+    {
+    }
+}
diff --git a/src/Consolonia.Core/Infrastructure/StorageFile.cs b/src/Consolonia.Core/Infrastructure/StorageFile.cs
new file mode 100644
index 00000000..f4dcd150
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/StorageFile.cs
@@ -0,0 +1,69 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Infrastructure
+{
+    public class StorageFile : IStorageFile
+    {
+        private FileInfo _fileInfo;
+
+        public StorageFile(FileInfo fileInfo)
+        {
+            _fileInfo = fileInfo;
+        }
+
+        public string Name => _fileInfo.Name;
+
+        public Uri Path => new Uri($"file://{_fileInfo.FullName}");
+
+        public bool CanBookmark => false;
+
+        public Task DeleteAsync()
+        {
+            _fileInfo.Delete();
+            return Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public Task<StorageItemProperties> GetBasicPropertiesAsync()
+        {
+            var result = new StorageItemProperties((ulong)_fileInfo.Length, _fileInfo.CreationTime, _fileInfo.LastWriteTime);
+            return Task.FromResult(result);
+        }
+
+        public Task<IStorageFolder> GetParentAsync()
+        {
+            IStorageFolder result = new StorageFolder(_fileInfo.Directory!);
+            return Task.FromResult(result);
+        }
+
+        public Task<IStorageItem> MoveAsync(IStorageFolder destination)
+        {
+            var path = destination.Path.LocalPath;
+            _fileInfo.MoveTo(path);
+            return Task.FromResult((IStorageItem)this);
+        }
+
+        public async Task<Stream> OpenReadAsync()
+        {
+            await Task.CompletedTask.ConfigureAwait(false);
+            return _fileInfo.OpenRead();
+        }
+
+        public async Task<Stream> OpenWriteAsync()
+        {
+            await Task.CompletedTask.ConfigureAwait(false);
+            return _fileInfo.OpenWrite();
+        }
+
+        public Task<string> SaveBookmarkAsync()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Consolonia.Core/Infrastructure/StorageFolder.cs b/src/Consolonia.Core/Infrastructure/StorageFolder.cs
new file mode 100644
index 00000000..1417326e
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/StorageFolder.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Infrastructure
+{
+    [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+    public class StorageFolder : IStorageFolder
+    {
+        private DirectoryInfo _directoryInfo;
+
+        public StorageFolder(DirectoryInfo directoryInfo)
+        {
+            _directoryInfo = directoryInfo;
+        }
+
+        public string Name => _directoryInfo.Name;
+
+        public Uri Path => new Uri($"file://{_directoryInfo.FullName}");
+
+        public bool CanBookmark => throw new NotImplementedException();
+
+        public Task<IStorageFile> CreateFileAsync(string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageFolder> CreateFolderAsync(string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task DeleteAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<StorageItemProperties> GetBasicPropertiesAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IAsyncEnumerable<IStorageItem> GetItemsAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageFolder> GetParentAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageItem> MoveAsync(IStorageFolder destination)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<string> SaveBookmarkAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        private string GetDebuggerDisplay()
+        {
+            return Path.LocalPath;
+        }
+    }
+}
diff --git a/src/Consolonia.Core/Infrastructure/StorageProvider.cs b/src/Consolonia.Core/Infrastructure/StorageProvider.cs
new file mode 100644
index 00000000..c7ba47bb
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/StorageProvider.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Controls.Views;
+using Consolonia.Core.Controls.ViewModels;
+
+namespace Consolonia.Core.Infrastructure
+{
+    public class StorageProvider : IStorageProvider
+    {
+        public bool CanOpen => true;
+
+        public bool CanSave => true;
+
+        public bool CanPickFolder => true;
+
+
+        public async Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
+        {
+            await Task.CompletedTask.ConfigureAwait(false);
+            return null;
+        }
+
+        public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            var model = new FileOpenPickerViewModel(options);
+            var picker = new FileOpenPicker(50,50)
+            {
+                DataContext = model
+            };
+            await picker.ShowDialog(null);
+            return new List<IStorageFile>() { (IStorageFile)model.SelectedItem };
+        }
+
+        public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageFile> TryGetFileFromPathAsync(Uri filePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageFolder> TryGetFolderFromPathAsync(Uri folderPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnownFolder)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

From e9fe1eabb5a1df1b706c82f7569f89e8407ca9b8 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 22 Nov 2024 19:07:08 -0600
Subject: [PATCH 03/64] file picker

---
 src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
index 5376d677..05ea2400 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
@@ -1,9 +1,9 @@
-<dialogs:DialogWindow xmlns="https://github.com/avaloniaui"
+<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:viewmodels="clr-namespace:Consolonia.Core.Controls.ViewModels"
                      xmlns:views="clr-namespace:Consolonia.Core.Controls.Views"
                      xmlns:storage="clr-namespace:Consolonia.Core.Infrastructure"
-                     xmlns:dialogs="clr-namespace:Consolonia.Core.Controls.Dialog"
+                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      Title="{Binding Title}"
@@ -39,4 +39,4 @@
             <Button Content="{Binding CancelLabel}"/>
         </StackPanel>
     </Grid>
-</dialogs:DialogWindow>
\ No newline at end of file
+</dialog:DialogWindow>
\ No newline at end of file

From 23eba995935a7212aa8ce7f4e22eb088122715d9 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 22 Nov 2024 19:13:14 -0600
Subject: [PATCH 04/64] move dialog files into core

---
 src/Consolonia.Core/Consolonia.Core.csproj    |  7 ++
 .../Controls/Dialog/DialogHelpers.cs          |  2 +-
 .../Controls/Dialog/DialogWindow.cs           |  2 +-
 .../Controls/Dialog}/DialogWrap.axaml         |  2 +-
 .../Controls/Dialog}/DialogWrap.axaml.cs      |  3 +-
 src/Consolonia.Gallery/App.cs                 |  6 ++
 .../GalleryViews/GalleryDialog.axaml.cs       |  5 +-
 .../Gallery/GalleryViews/GalleryStorage.axaml | 25 +++++++
 .../GalleryViews/GalleryStorage.axaml.cs      | 69 +++++++++++++++++++
 .../GalleryViews/SomeDialogWindow.axaml       |  2 +-
 .../GalleryViews/SomeDialogWindow.axaml.cs    |  2 +-
 .../Consolonia.Themes.TurboVision.csproj      |  6 --
 .../Templates/Controls/DialogWindow.axaml     |  2 +-
 .../Templates/Controls/Window.axaml           |  2 +-
 .../Controls/DialogWindow.axaml               |  2 +-
 15 files changed, 120 insertions(+), 17 deletions(-)
 rename src/{Consolonia.Themes.TurboVision/Templates => Consolonia.Core}/Controls/Dialog/DialogHelpers.cs (98%)
 rename src/{Consolonia.Themes.TurboVision/Templates => Consolonia.Core}/Controls/Dialog/DialogWindow.cs (98%)
 rename src/{Consolonia.Themes.TurboVision/Templates/Controls => Consolonia.Core/Controls/Dialog}/DialogWrap.axaml (90%)
 rename src/{Consolonia.Themes.TurboVision/Templates/Controls => Consolonia.Core/Controls/Dialog}/DialogWrap.axaml.cs (95%)
 create mode 100644 src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
 create mode 100644 src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs

diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 00b7142a..2741e73c 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -6,10 +6,17 @@
         <PackageReference Include="Avalonia.FreeDesktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
         <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
         <PackageReference Include="Unicode.net" Version="2.0.0" />
         <PackageReference Include="Wcwidth" Version="2.0.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Update="Controls\Dialog\DialogWrap.axaml.cs">
+        <DependentUpon>%(Filename)</DependentUpon>
+      </Compile>
+    </ItemGroup>
+
 </Project>
  
\ No newline at end of file
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogHelpers.cs b/src/Consolonia.Core/Controls/Dialog/DialogHelpers.cs
similarity index 98%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogHelpers.cs
rename to src/Consolonia.Core/Controls/Dialog/DialogHelpers.cs
index a7407024..80f6a80c 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogHelpers.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogHelpers.cs
@@ -11,7 +11,7 @@
 using Avalonia.VisualTree;
 using Consolonia.Core.Helpers;
 
-namespace Consolonia.Themes.TurboVision.Templates.Controls.Dialog
+namespace Consolonia.Core.Controls.Dialog
 {
     public class DialogHost
     {
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogWindow.cs b/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
similarity index 98%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogWindow.cs
rename to src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
index e9fb484e..68601d53 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
@@ -11,7 +11,7 @@
 
 // ReSharper disable MemberCanBeProtected.Global
 
-namespace Consolonia.Themes.TurboVision.Templates.Controls.Dialog
+namespace Consolonia.Core.Controls.Dialog
 {
     [TemplatePart("PART_ContentPresenter", typeof(ContentPresenter))]
     public class DialogWindow : UserControl
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml
similarity index 90%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml
rename to src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml
index 49501ce7..89fcd51e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:drawing1="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
-             x:Class="Consolonia.Themes.TurboVision.Templates.Controls.DialogWrap">
+             x:Class="Consolonia.Core.Controls.Dialog.DialogWrap">
 
     <Panel>
         <Border Background="{drawing1:ConsoleBrush Mode=Shaded}"
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml.cs b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
similarity index 95%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml.cs
rename to src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
index f196c29a..2668a645 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
@@ -7,9 +7,8 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Reactive;
 using Avalonia.VisualTree;
-using Consolonia.Themes.TurboVision.Templates.Controls.Dialog;
 
-namespace Consolonia.Themes.TurboVision.Templates.Controls
+namespace Consolonia.Core.Controls.Dialog
 {
     [SuppressMessage("Usage", "PartialTypeWithSinglePart",
         Justification = "Partial class required for XAML code generation.")]
diff --git a/src/Consolonia.Gallery/App.cs b/src/Consolonia.Gallery/App.cs
index 51beb67f..69849692 100644
--- a/src/Consolonia.Gallery/App.cs
+++ b/src/Consolonia.Gallery/App.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Threading;
+using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Consolonia.Core.Infrastructure;
 using Consolonia.Gallery.View;
@@ -21,6 +22,11 @@ public App()
             Styles.Add(new TurboVisionTheme(new Uri("avares://Consolonia.Gallery")));
         }
 
+        public override void RegisterServices()
+        {
+            base.RegisterServices();
+        }
+
         public override void OnFrameworkInitializationCompleted()
         {
             ((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime)!.MainWindow = new ControlsListView();
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
index 3d67ca9d..c91ff380 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
@@ -20,7 +22,8 @@ private void InitializeComponent()
         private async void Button_OnClick(object _, RoutedEventArgs e)
             // ReSharper restore UnusedParameter.Local
         {
-            await new SomeDialogWindow(50, 15).ShowDialogAsync(this);
+            var lifetime = Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            await new SomeDialogWindow(50, 15).ShowDialogAsync(lifetime.MainWindow);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
new file mode 100644
index 00000000..4581a145
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
@@ -0,0 +1,25 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:gallery="clr-namespace:Consolonia.Gallery.Gallery.GalleryViews"
+             mc:Ignorable="d"
+             x:DataType="gallery:GalleryStorageViewModel"
+             x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryStorage">
+
+    <Grid x:Name="MyGrid" RowDefinitions="Auto *">
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnOpenFile" Background="Gray">Open File</Button>
+            <Button Click="OnOpenFolder" Background="Gray">Open Folder</Button>
+            <Button Click="OnSaveFile" Background="Gray">Save File</Button>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Label>File:</Label>
+            <TextBlock Text="{Binding File.}"/>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Label>Folder:</Label>
+            <TextBlock Text="{Binding Folder}"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
new file mode 100644
index 00000000..7d5141a8
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Gallery.Gallery.GalleryViews
+{
+    public partial class GalleryStorage : UserControl
+    {
+        public GalleryStorage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+            this.DataContext = new GalleryStorageViewModel();
+        }
+
+        private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            if (lifetime != null)
+            {
+                var storageProvider = lifetime.MainWindow.StorageProvider;
+                if (storageProvider.CanOpen)
+                {
+                    var results = await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
+                    {
+                        Title = "Open File",
+                        FileTypeFilter = new List<FilePickerFileType>()
+                        {
+                             new FilePickerFileType("Text") 
+                             {
+                                 Patterns = new List<string>() { "*.txt" } 
+                             } 
+                        },
+                    });
+                    if (results.Any())
+                    {
+
+                    }
+                }
+            }
+        }
+
+        private void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        { }
+        private void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+        }
+    }
+
+    public partial class GalleryStorageViewModel : ObservableObject
+    {
+        [ObservableProperty]
+        private IStorageFile _file;
+
+        [ObservableProperty]
+        private IStorageFolder _folder;
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
index 06c80b17..fc6c7d52 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
@@ -1,7 +1,7 @@
 <dialog:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
-                     xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog;assembly=Consolonia.Themes.TurboVision"
+                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      Title="Dialog"
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
index 38ef926f..eaf5c7fe 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using Consolonia.Themes.TurboVision.Templates.Controls.Dialog;
+using Consolonia.Core.Controls.Dialog;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
diff --git a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
index e8625986..ba859b49 100644
--- a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
+++ b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
@@ -10,10 +10,4 @@
       <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Compile Update="Templates\Controls\DialogWrap.axaml.cs">
-        <DependentUpon>DialogWrap.axaml</DependentUpon>
-      </Compile>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index 0627a67c..a288dcc5 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog"
+        xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
         xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
         xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers">
 
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
index 041ca03d..98995b5e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
@@ -1,5 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui"
-       xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog"
+       xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
        Selector="Window">
     <Setter Property="Background"
             Value="{DynamicResource ThemeBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
index 9a8e5c2d..62b9c73a 100644
--- a/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog">
+        xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core">
     <Style Selector=":is(dialog|DialogWindow)">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeBackgroundBrush}" />

From 17290dad45670436047b18820138a290177d905d Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 12:39:27 -0600
Subject: [PATCH 05/64] hey it displays (kinda)

---
 .../Controls/Dialog/DialogWindow.cs           | 28 ++++--
 .../Controls/ViewModels/PickerViewModel.cs    | 35 ++++---
 .../Controls/Views/FileOpenPicker.axaml       | 30 +++---
 .../Controls/Views/FileOpenPicker.axaml.cs    | 31 ++++--
 .../Infrastructure/ConsoloniaPlatform.cs      |  1 +
 ...ovider.cs => ConsoloniaStorageProvider.cs} | 20 ++--
 .../Infrastructure/StorageFolder.cs           | 76 --------------
 .../{StorageFile.cs => SystemStorageFile.cs}  |  6 +-
 .../Infrastructure/SystemStorageFolder.cs     | 98 +++++++++++++++++++
 .../Gallery/GalleryViews/GalleryStorage.axaml | 10 +-
 .../GalleryViews/GalleryStorage.axaml.cs      |  5 +
 11 files changed, 203 insertions(+), 137 deletions(-)
 rename src/Consolonia.Core/Infrastructure/{StorageProvider.cs => ConsoloniaStorageProvider.cs} (74%)
 delete mode 100644 src/Consolonia.Core/Infrastructure/StorageFolder.cs
 rename src/Consolonia.Core/Infrastructure/{StorageFile.cs => SystemStorageFile.cs} (89%)
 create mode 100644 src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs

diff --git a/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs b/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
index 68601d53..5b93aab9 100644
--- a/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
@@ -13,6 +13,7 @@
 
 namespace Consolonia.Core.Controls.Dialog
 {
+
     [TemplatePart("PART_ContentPresenter", typeof(ContentPresenter))]
     public class DialogWindow : UserControl
     {
@@ -27,7 +28,7 @@ public class DialogWindow : UserControl
         private Size _contentSize;
         private ContentPresenter _partContentPresenter;
 
-        private TaskCompletionSource _taskCompletionSource;
+        private TaskCompletionSource<object?> _taskCompletionSource;
 
         static DialogWindow()
         {
@@ -83,31 +84,42 @@ protected override Size ArrangeOverride(Size finalSize)
             return arrangeOverride;
         }
 
-        private void ShowDialogInternal(Visual parent)
+        protected void ShowDialogInternal(Visual parent)
         {
             DialogHost dialogHost = GetDialogHost(parent);
             dialogHost.OpenInternal(this);
         }
 
         // ReSharper disable once VirtualMemberNeverOverridden.Global overriden in other packages, why resharper suggests this?
-        public virtual void CloseDialog()
+        public virtual void CloseDialog(object? result=null)
         {
             DialogHost dialogHost = GetDialogHost(this);
             dialogHost.PopInternal(this);
-            _taskCompletionSource.SetResult();
+            _taskCompletionSource.SetResult(result);
+        }
+
+        public async Task ShowDialogAsync(Control parent)
+        {
+            if (_taskCompletionSource != null)
+                throw new NotImplementedException();
+
+            _taskCompletionSource = new TaskCompletionSource<object?>();
+            ShowDialogInternal(parent);
+            await _taskCompletionSource.Task.ConfigureAwait(false);
         }
 
-        public Task ShowDialogAsync(Control parent)
+        public async Task<T> ShowDialogAsync<T>(Control parent)
         {
             if (_taskCompletionSource != null)
                 throw new NotImplementedException();
 
-            _taskCompletionSource = new TaskCompletionSource();
+            _taskCompletionSource = new TaskCompletionSource<object?>();
             ShowDialogInternal(parent);
-            return _taskCompletionSource.Task;
+            var result = await _taskCompletionSource.Task.ConfigureAwait(false);
+            return (T)result;
         }
 
-        private static DialogHost GetDialogHost(Visual parent)
+        protected static DialogHost GetDialogHost(Visual parent)
         {
             var window = parent.FindAncestorOfType<Window>(true);
             DialogHost dialogHost = window!.GetValue(DialogHost.DialogHostProperty);
diff --git a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
index e7230190..5e3a6e78 100644
--- a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -15,6 +16,7 @@ public PickerViewModel(TPickerOptions options)
             Options = options;
             PropertyChanged += PickerViewModel_PropertyChanged;
             CurrentFolder = options.SuggestedStartLocation;
+            _ = LoadCurrentFolder();
         }
 
 
@@ -35,21 +37,28 @@ private async void PickerViewModel_PropertyChanged(object sender, System.Compone
             switch (e.PropertyName)
             {
                 case nameof(CurrentFolder):
-                    Items.Clear();
-
-                    await foreach (var item in CurrentFolder.GetItemsAsync())
-                    {
-                        if (item is IStorageFolder)
-                            this.Items.Add(item);
-                    }
-
-                    await foreach (var item in CurrentFolder.GetItemsAsync())
-                    {
-                        if (item is IStorageItem)
-                            this.Items.Add(item);
-                    }
+                    await LoadCurrentFolder();
                     break;
             }
         }
+
+        private async Task LoadCurrentFolder()
+        {
+            Items.Clear();
+            if (CurrentFolder != null)
+            {
+                await foreach (var item in CurrentFolder.GetItemsAsync())
+                {
+                    if (item is IStorageFolder)
+                        this.Items.Add(item);
+                }
+
+                await foreach (var item in CurrentFolder.GetItemsAsync())
+                {
+                    if (item is IStorageItem)
+                        this.Items.Add(item);
+                }
+            }
+        }
     }
 }
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
index 05ea2400..d1608816 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
@@ -1,42 +1,42 @@
 <dialog:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
                      xmlns:viewmodels="clr-namespace:Consolonia.Core.Controls.ViewModels"
                      xmlns:views="clr-namespace:Consolonia.Core.Controls.Views"
-                     xmlns:storage="clr-namespace:Consolonia.Core.Infrastructure"
                      xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
-                     Title="{Binding Title}"
                      x:DataType="viewmodels:FileOpenPickerViewModel"
-                     x:Class="Consolonia.Core.Controls.Views.FileOpenPicker">
+                     x:Class="Consolonia.Core.Controls.Views.FileOpenPicker"
+                     Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
-        <StackPanel Orientation="Horizontal" Grid.Row="0">                  r
-            <TextBlock>📁</TextBlock>
+        <StackPanel Orientation="Horizontal" Grid.Row="0">                  
+            <TextBlock Text="📁" />
             <TextBox Text="{Binding CurrentFolder.Name}"/>
         </StackPanel>
         <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
-                <DataTemplate DataType="{x:Type storage:StorageFolder}">
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock>📁</TextBlock>
+                        <TextBlock Text="📁" Margin="0 0 1 0"/>
                         <TextBox Text="{Binding Name}"/>
                     </StackPanel>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type storage:StorageFile}">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock>📰</TextBlock>
-                        <TextBox Text="{Binding Name}"/>
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
+                        <TextBlock Text="📰" Margin="0 0 1 0"/>
+                        <TextBox Text="{Binding Name}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"/>
                     </StackPanel>
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
-            <TextBlock>Selected:</TextBlock>
-            <SelectableTextBlock Text="{Binding SelectedItem}"/>
+            <TextBlock Text="Selected File:"/>
+            <TextBlock Text="{Binding SelectedItem.Name}"/>
         </StackPanel>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="{Binding OKLabel}"/>
-            <Button Content="{Binding CancelLabel}"/>
+            <Button Content="OK" Click="OnOK"/>
+            <Button Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
 </dialog:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
index 3a69832d..a5dfdf47 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
@@ -1,22 +1,27 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Controls.Dialog;
 using Consolonia.Core.Controls.ViewModels;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls.Views
 {
-    public partial class FileOpenPicker : Window
+    public partial class FileOpenPicker : DialogWindow
     {
-        public FileOpenPicker(ushort width, ushort height)
+        public FileOpenPicker(ushort width, ushort height, FilePickerOpenOptions options)
         {
-            InitializeComponent();
             Width = width;
             Height = height;
             Loaded += (_, _) =>
             {
-                this.FindControl<Button>("Button")!.Focus();
+                this.FindControl<Button>("Button")?.Focus();
             };
+            DataContext = new FileOpenPickerViewModel(options);
+            InitializeComponent();
         }
 
         private void InitializeComponent()
@@ -24,21 +29,31 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
-
+        public FilePickerOpenOptions Options => ((FileOpenPickerViewModel)DataContext).Options;
 
         private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
-            if (e.Source is StorageFolder folder)
+            if (e.Source is SystemStorageFolder folder)
             {
-                var model  = (FileOpenPickerViewModel)this.DataContext;
+                var model = (FileOpenPickerViewModel)this.DataContext;
                 model.CurrentFolder = folder;
             }
-            if (e.Source is StorageFile file)
+            if (e.Source is SystemStorageFile file)
             {
                 var model = (FileOpenPickerViewModel)this.DataContext;
                 model.SelectedItem = file;
             }
         }
 
+        private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var model = (FileOpenPickerViewModel)this.DataContext;
+            this.CloseDialog(new IStorageFile[] { (IStorageFile)model.SelectedItem });
+        }
+
+        private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            this.CloseDialog(null);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
index 26180cc7..a7fc8df5 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
@@ -52,6 +52,7 @@ public void Initialize()
                 .Bind<ICursorFactory>().ToConstant(new DummyCursorFactory())
                 .Bind<IPlatformIconLoader>().ToConstant(new DummyIconLoader())
                 .Bind<IPlatformSettings>().ToSingleton<ConsoloniaPlatformSettings>()
+                .Bind<IStorageProvider>().ToSingleton<ConsoloniaStorageProvider>()
                 /*.Bind<IKeyboardNavigationHandler>().ToTransient<ArrowsAndKeyboardNavigationHandler>() todo: implement this navigation*/
                 //.Bind<IClipboard>().ToConstant(new X11Clipboard(this))
                 //.Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
diff --git a/src/Consolonia.Core/Infrastructure/StorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
similarity index 74%
rename from src/Consolonia.Core/Infrastructure/StorageProvider.cs
rename to src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index c7ba47bb..742ace46 100644
--- a/src/Consolonia.Core/Infrastructure/StorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -1,14 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using Consolonia.Core.Controls.Views;
 using Consolonia.Core.Controls.ViewModels;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia;
+using System.Linq;
 
 namespace Consolonia.Core.Infrastructure
 {
-    public class StorageProvider : IStorageProvider
+    public class ConsoloniaStorageProvider : IStorageProvider
     {
         public bool CanOpen => true;
 
@@ -25,13 +27,13 @@ public async Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
 
         public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
         {
-            var model = new FileOpenPickerViewModel(options);
-            var picker = new FileOpenPicker(50,50)
-            {
-                DataContext = model
-            };
-            await picker.ShowDialog(null);
-            return new List<IStorageFile>() { (IStorageFile)model.SelectedItem };
+            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+
+            var picker = new FileOpenPicker((ushort)(mainWindow.ClientSize.Width * .8), 
+                (ushort)(mainWindow.ClientSize.Height * .8), options);
+
+            var results = await picker.ShowDialogAsync<IStorageFile[]>(mainWindow).ConfigureAwait(false);
+            return results;
         }
 
         public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
diff --git a/src/Consolonia.Core/Infrastructure/StorageFolder.cs b/src/Consolonia.Core/Infrastructure/StorageFolder.cs
deleted file mode 100644
index 1417326e..00000000
--- a/src/Consolonia.Core/Infrastructure/StorageFolder.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Platform.Storage;
-
-namespace Consolonia.Core.Infrastructure
-{
-    [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
-    public class StorageFolder : IStorageFolder
-    {
-        private DirectoryInfo _directoryInfo;
-
-        public StorageFolder(DirectoryInfo directoryInfo)
-        {
-            _directoryInfo = directoryInfo;
-        }
-
-        public string Name => _directoryInfo.Name;
-
-        public Uri Path => new Uri($"file://{_directoryInfo.FullName}");
-
-        public bool CanBookmark => throw new NotImplementedException();
-
-        public Task<IStorageFile> CreateFileAsync(string name)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IStorageFolder> CreateFolderAsync(string name)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task DeleteAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Dispose()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<StorageItemProperties> GetBasicPropertiesAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        public IAsyncEnumerable<IStorageItem> GetItemsAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IStorageFolder> GetParentAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IStorageItem> MoveAsync(IStorageFolder destination)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<string> SaveBookmarkAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        private string GetDebuggerDisplay()
-        {
-            return Path.LocalPath;
-        }
-    }
-}
diff --git a/src/Consolonia.Core/Infrastructure/StorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
similarity index 89%
rename from src/Consolonia.Core/Infrastructure/StorageFile.cs
rename to src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index f4dcd150..748784b8 100644
--- a/src/Consolonia.Core/Infrastructure/StorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -5,11 +5,11 @@
 
 namespace Consolonia.Core.Infrastructure
 {
-    public class StorageFile : IStorageFile
+    public class SystemStorageFile : IStorageFile
     {
         private FileInfo _fileInfo;
 
-        public StorageFile(FileInfo fileInfo)
+        public SystemStorageFile(FileInfo fileInfo)
         {
             _fileInfo = fileInfo;
         }
@@ -38,7 +38,7 @@ public Task<StorageItemProperties> GetBasicPropertiesAsync()
 
         public Task<IStorageFolder> GetParentAsync()
         {
-            IStorageFolder result = new StorageFolder(_fileInfo.Directory!);
+            IStorageFolder result = new SystemStorageFolder(_fileInfo.Directory!);
             return Task.FromResult(result);
         }
 
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
new file mode 100644
index 00000000..938ccf19
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Infrastructure
+{
+    [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+    public class SystemStorageFolder : IStorageFolder
+    {
+        private DirectoryInfo _directoryInfo;
+
+        public SystemStorageFolder(DirectoryInfo directoryInfo)
+        {
+            _directoryInfo = directoryInfo;
+        }
+
+        public string Name => _directoryInfo.Name;
+
+        public Uri Path => new Uri($"file://{_directoryInfo.FullName}");
+
+        public bool CanBookmark => false;
+
+        public async Task<IStorageFile> CreateFileAsync(string name)
+        {
+            await Task.CompletedTask.ConfigureAwait(false);
+
+            var path = System.IO.Path.Combine(_directoryInfo.FullName, name);
+            using (var stream = File.Create(path))
+            {
+            }
+            return new SystemStorageFile(new FileInfo(path));
+        }
+
+        public Task<IStorageFolder> CreateFolderAsync(string name)
+        {
+            var dirInfo = Directory.CreateDirectory(System.IO.Path.Combine(_directoryInfo.FullName, name));
+            return Task.FromResult((IStorageFolder)new SystemStorageFolder(dirInfo));
+        }
+
+        public Task DeleteAsync()
+        {
+            _directoryInfo.Delete();
+            return Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public Task<StorageItemProperties> GetBasicPropertiesAsync()
+        {
+            var properties = new StorageItemProperties(dateCreated: _directoryInfo.CreationTime, dateModified: _directoryInfo.LastAccessTime);
+            return Task.FromResult(properties);
+        }
+
+        public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
+        {
+            await Task.CompletedTask.ConfigureAwait(false);
+            
+            foreach (var folder in _directoryInfo.GetDirectories())
+            {
+                yield return new SystemStorageFolder(folder);
+            }
+
+            foreach (var file in _directoryInfo.GetFiles())
+            {
+                yield return new SystemStorageFile(file);
+            }
+        }
+
+        public Task<IStorageFolder> GetParentAsync()
+        {
+            if (_directoryInfo.Parent == null)
+                return Task.FromResult((IStorageFolder)null);
+
+            return Task.FromResult((IStorageFolder)new SystemStorageFolder(_directoryInfo.Parent));
+        }
+
+        public Task<IStorageItem> MoveAsync(IStorageFolder destination)
+        {
+            _directoryInfo.MoveTo(destination.Path.LocalPath);
+            return Task.FromResult((IStorageItem)new SystemStorageFolder(new DirectoryInfo(destination.Path.LocalPath)));
+        }
+
+        public Task<string> SaveBookmarkAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        private string GetDebuggerDisplay()
+        {
+            return _directoryInfo.FullName;
+        }
+    }
+}
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
index 4581a145..165ec313 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
@@ -7,19 +7,19 @@
              x:DataType="gallery:GalleryStorageViewModel"
              x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryStorage">
 
-    <Grid x:Name="MyGrid" RowDefinitions="Auto *">
+    <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
             <Button Click="OnOpenFile" Background="Gray">Open File</Button>
             <Button Click="OnOpenFolder" Background="Gray">Open Folder</Button>
             <Button Click="OnSaveFile" Background="Gray">Save File</Button>
         </StackPanel>
         <StackPanel Orientation="Horizontal">
-            <Label>File:</Label>
-            <TextBlock Text="{Binding File.}"/>
+            <Label>File</Label>
+            <TextBlock Text="{Binding File.Name}"/>
         </StackPanel>
         <StackPanel Orientation="Horizontal">
             <Label>Folder:</Label>
-            <TextBlock Text="{Binding Folder}"/>
+            <TextBlock Text="{Binding Folder.Name}"/>
         </StackPanel>
-    </Grid>
+    </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 7d5141a8..e08fa7be 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia;
@@ -8,6 +10,8 @@
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Infrastructure;
+using Microsoft.VisualBasic.FileIO;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -35,6 +39,7 @@ private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventA
                     var results = await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
                     {
                         Title = "Open File",
+                        SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
                         FileTypeFilter = new List<FilePickerFileType>()
                         {
                              new FilePickerFileType("Text") 

From 263b23f2f96410921e504926ff6168ca70405caf Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 13:15:57 -0600
Subject: [PATCH 06/64] things mo betta

---
 .../Controls/ViewModels/PickerViewModel.cs    | 28 +++++++++++++------
 .../Controls/Views/FileOpenPicker.axaml       | 14 +++++-----
 .../Controls/Views/FileOpenPicker.axaml.cs    |  5 ++--
 .../Infrastructure/SystemStorageFolder.cs     | 25 +++++++++++------
 .../GalleryViews/GalleryStorage.axaml.cs      |  3 +-
 5 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
index 5e3a6e78..87fe8f27 100644
--- a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
@@ -1,9 +1,11 @@
+using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls.ViewModels
 {
@@ -14,15 +16,19 @@ public partial class PickerViewModel<TPickerOptions> : ObservableObject
         public PickerViewModel(TPickerOptions options)
         {
             Options = options;
-            PropertyChanged += PickerViewModel_PropertyChanged;
+            CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath;
             CurrentFolder = options.SuggestedStartLocation;
             _ = LoadCurrentFolder();
+            PropertyChanged += PickerViewModel_PropertyChanged;
         }
 
 
         [ObservableProperty]
         private TPickerOptions _options;
 
+        [ObservableProperty]
+        private string _currentFolderPath;
+
         [ObservableProperty]
         private IStorageFolder _currentFolder;
 
@@ -36,6 +42,17 @@ private async void PickerViewModel_PropertyChanged(object sender, System.Compone
         {
             switch (e.PropertyName)
             {
+                case nameof(CurrentFolderPath):
+                    try
+                    {
+                        CurrentFolder = new SystemStorageFolder(new DirectoryInfo(this.CurrentFolderPath));
+                    }
+                    catch (DirectoryNotFoundException)
+                    {
+                        // ignore
+                    }
+                    break;
+
                 case nameof(CurrentFolder):
                     await LoadCurrentFolder();
                     break;
@@ -49,14 +66,7 @@ private async Task LoadCurrentFolder()
             {
                 await foreach (var item in CurrentFolder.GetItemsAsync())
                 {
-                    if (item is IStorageFolder)
-                        this.Items.Add(item);
-                }
-
-                await foreach (var item in CurrentFolder.GetItemsAsync())
-                {
-                    if (item is IStorageItem)
-                        this.Items.Add(item);
+                    this.Items.Add(item);
                 }
             }
         }
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
index d1608816..91d20377 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
@@ -10,10 +10,10 @@
                      x:Class="Consolonia.Core.Controls.Views.FileOpenPicker"
                      Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
-        <StackPanel Orientation="Horizontal" Grid.Row="0">                  
-            <TextBlock Text="📁" />
-            <TextBox Text="{Binding CurrentFolder.Name}"/>
-        </StackPanel>
+        <Grid ColumnDefinitions="Auto *">
+            <TextBlock Text="📁 " />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
+        </Grid>
         <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
@@ -31,11 +31,11 @@
             </ListBox.DataTemplates>
         </ListBox>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
-            <TextBlock Text="Selected File:"/>
+            <TextBlock Text="File:" Margin="0 0 1 0"/>
             <TextBlock Text="{Binding SelectedItem.Name}"/>
         </StackPanel>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="OK" Click="OnOK"/>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
+            <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedItem.Exists}"/>
             <Button Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
index a5dfdf47..f257e5cf 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
@@ -33,12 +33,13 @@ private void InitializeComponent()
 
         private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
-            if (e.Source is SystemStorageFolder folder)
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is SystemStorageFolder folder)
             {
                 var model = (FileOpenPickerViewModel)this.DataContext;
                 model.CurrentFolder = folder;
             }
-            if (e.Source is SystemStorageFile file)
+            else if (listbox.SelectedItem is SystemStorageFile file)
             {
                 var model = (FileOpenPickerViewModel)this.DataContext;
                 model.SelectedItem = file;
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index 938ccf19..40af6821 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -11,13 +11,15 @@ namespace Consolonia.Core.Infrastructure
     public class SystemStorageFolder : IStorageFolder
     {
         private DirectoryInfo _directoryInfo;
+        private bool _isParent;
 
-        public SystemStorageFolder(DirectoryInfo directoryInfo)
+        public SystemStorageFolder(DirectoryInfo directoryInfo, bool isParent = false)
         {
+            _isParent = isParent;
             _directoryInfo = directoryInfo;
         }
 
-        public string Name => _directoryInfo.Name;
+        public string Name => (_isParent) ? ".." : _directoryInfo.Name;
 
         public Uri Path => new Uri($"file://{_directoryInfo.FullName}");
 
@@ -59,15 +61,20 @@ public Task<StorageItemProperties> GetBasicPropertiesAsync()
         public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
         {
             await Task.CompletedTask.ConfigureAwait(false);
-            
-            foreach (var folder in _directoryInfo.GetDirectories())
-            {
-                yield return new SystemStorageFolder(folder);
-            }
 
-            foreach (var file in _directoryInfo.GetFiles())
+            if (_directoryInfo.Exists)
             {
-                yield return new SystemStorageFile(file);
+                yield return new SystemStorageFolder(_directoryInfo.Parent, isParent: true);
+
+                foreach (var folder in _directoryInfo.GetDirectories())
+                {
+                    yield return new SystemStorageFolder(folder);
+                }
+
+                foreach (var file in _directoryInfo.GetFiles())
+                {
+                    yield return new SystemStorageFile(file);
+                }
             }
         }
 
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index e08fa7be..266a6e51 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -48,7 +48,8 @@ private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventA
                              } 
                         },
                     });
-                    if (results.Any())
+
+                    if (results != null && results.Any())
                     {
 
                     }

From fa5716da37410b2a1a6fe8761db6fd692ace873f Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 13:31:09 -0600
Subject: [PATCH 07/64] another slice of heavon

---
 .../Controls/ViewModels/PickerViewModel.cs       |  6 ++++++
 .../Controls/Views/FileOpenPicker.axaml          | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
index 87fe8f27..e93ddc5d 100644
--- a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
@@ -36,8 +36,14 @@ public PickerViewModel(TPickerOptions options)
         private ObservableCollection<IStorageItem> _items = new ObservableCollection<IStorageItem>();
 
         [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(SelectedFile))]
+        [NotifyPropertyChangedFor(nameof(SelectedFolder))]
         private IStorageItem _selectedItem;
 
+        public IStorageFile SelectedFile => _selectedItem as IStorageFile;
+
+        public IStorageFolder SelectedFolder => _selectedItem as IStorageFolder;
+
         private async void PickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
index 91d20377..e6dac656 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
@@ -17,25 +17,25 @@
         <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
-                    <StackPanel Orientation="Horizontal">
+                    <Grid ColumnDefinitions="Auto * " Background="Transparent">
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
-                        <TextBox Text="{Binding Name}"/>
-                    </StackPanel>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                    </Grid>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type storage:IStorageFile}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
+                    <Grid ColumnDefinitions="Auto *"  Background="Transparent">
                         <TextBlock Text="📰" Margin="0 0 1 0"/>
-                        <TextBox Text="{Binding Name}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"/>
-                    </StackPanel>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" />
+                    </Grid>
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
             <TextBlock Text="File:" Margin="0 0 1 0"/>
-            <TextBlock Text="{Binding SelectedItem.Name}"/>
+            <TextBlock Text="{Binding SelectedFile.Path.LocalPath}"/>
         </StackPanel>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedItem.Exists}"/>
+            <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
             <Button Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>

From 80049efd2c520707bf2734d9b70e4b7de5c3f469 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 14:02:48 -0600
Subject: [PATCH 08/64] auto center and size using WindowLocation

---
 .../Controls/Dialog/DialogWindow.cs           | 73 ++++++++++++++++++-
 .../Controls/Views/FileOpenPicker.axaml.cs    |  9 +--
 .../ConsoloniaStorageProvider.cs              |  4 +-
 3 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs b/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
index 5b93aab9..8d2cef8e 100644
--- a/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
@@ -25,11 +26,21 @@ public class DialogWindow : UserControl
         public static readonly StyledProperty<bool> IsCloseButtonVisibleProperty =
             AvaloniaProperty.Register<DialogWindow, bool>(nameof(IsCloseButtonVisible), true);
 
+        public static readonly StyledProperty<WindowStartupLocation> WindowStartupLocationProperty =
+            AvaloniaProperty.Register<Window, WindowStartupLocation>(nameof(WindowStartupLocation));
+
+        public static readonly StyledProperty<bool> CanResizeProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(CanResize), true);
+
+        public static readonly StyledProperty<string?> IconProperty =
+            AvaloniaProperty.Register<DialogWindow, string?>(nameof(Icon));
+
         private Size _contentSize;
         private ContentPresenter _partContentPresenter;
 
         private TaskCompletionSource<object?> _taskCompletionSource;
 
+
         static DialogWindow()
         {
             TitleProperty.OverrideDefaultValue<DialogWindow>(string.Empty);
@@ -62,6 +73,43 @@ public bool IsCloseButtonVisible
         // ReSharper disable once MemberCanBePrivate.Global
         public bool CancelOnEscape { get; set; } = true;
 
+
+        /// <summary>
+        /// Enables or disables resizing of the window.
+        /// </summary>
+        public bool CanResize
+        {
+            get => GetValue(CanResizeProperty);
+            set => SetValue(CanResizeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the icon of the window.
+        /// </summary>
+        public string? Icon
+        {
+            get => GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the startup location of the window.
+        /// </summary>
+        public WindowStartupLocation WindowStartupLocation
+        {
+            get => GetValue(WindowStartupLocationProperty);
+            set => SetValue(WindowStartupLocationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the window position in screen coordinates.
+        /// </summary>
+        //public PixelPoint Position
+        //{
+        //    get => PlatformImpl?.Position ?? PixelPoint.Origin;
+        //    set => PlatformImpl?.Move(value);
+        //}
+
         // ReSharper disable once UnusedMember.Global Used by template
         public void CloseClick()
         {
@@ -86,15 +134,38 @@ protected override Size ArrangeOverride(Size finalSize)
 
         protected void ShowDialogInternal(Visual parent)
         {
+            if (this.WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            {
+                this.Width = (ushort)(parent.Bounds.Width * .9);
+                this.Height = (ushort)(parent.Bounds.Height * .9);
+                if (parent is Window window)
+                {
+                    window.SizeChanged += Window_SizeChanged;
+                }
+            }
             DialogHost dialogHost = GetDialogHost(parent);
             dialogHost.OpenInternal(this);
         }
 
+        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            var window = sender as Window;
+            if (window != null)
+            {
+                this.Width = (ushort)(window.Bounds.Width * .9);
+                this.Height = (ushort)(window.Bounds.Height * .9);
+            }
+        }
+
         // ReSharper disable once VirtualMemberNeverOverridden.Global overriden in other packages, why resharper suggests this?
-        public virtual void CloseDialog(object? result=null)
+        public virtual void CloseDialog(object? result = null)
         {
             DialogHost dialogHost = GetDialogHost(this);
             dialogHost.PopInternal(this);
+            if (this.Parent is Window window)
+            {
+                window.SizeChanged -= Window_SizeChanged;
+            }
             _taskCompletionSource.SetResult(result);
         }
 
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
index f257e5cf..d7973555 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
@@ -12,10 +9,10 @@ namespace Consolonia.Core.Controls.Views
 {
     public partial class FileOpenPicker : DialogWindow
     {
-        public FileOpenPicker(ushort width, ushort height, FilePickerOpenOptions options)
+        public FileOpenPicker(FilePickerOpenOptions options)
         {
-            Width = width;
-            Height = height;
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
             Loaded += (_, _) =>
             {
                 this.FindControl<Button>("Button")?.Focus();
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index 742ace46..33103f95 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -29,9 +29,7 @@ public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpe
         {
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
 
-            var picker = new FileOpenPicker((ushort)(mainWindow.ClientSize.Width * .8), 
-                (ushort)(mainWindow.ClientSize.Height * .8), options);
-
+            var picker = new FileOpenPicker(options);
             var results = await picker.ShowDialogAsync<IStorageFile[]>(mainWindow).ConfigureAwait(false);
             return results;
         }

From 6d6b8308ace2a61ecc721ba35e740cec800f4668 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 17:03:06 -0600
Subject: [PATCH 09/64] Clean up dialog layout * .Icon * Left justify * Close
 button in upper right

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 03d170b3..e6c4f816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -766,3 +766,6 @@ fabric.properties
 .idea/
 *.sln.iml
 
+/src/Consolonia.Core/Controls/filesavepicker.axaml
+/src/Consolonia.Core/Controls/filesavepicker.axaml.cs
+/src/Consolonia.Core/Controls/folderopenpicker.axaml

From 0edcddf64f0b21234023b40aa6c5738201abece3 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 17:03:19 -0600
Subject: [PATCH 10/64] move things around, implement folder save first cut

---
 .gitignore                                    |  3 -
 src/Consolonia.Core/Consolonia.Core.csproj    | 13 ++--
 .../Controls/{Views => }/FileOpenPicker.axaml |  8 +--
 .../{Views => }/FileOpenPicker.axaml.cs       | 15 ++--
 .../Controls/FileSavePicker.axaml             | 42 +++++++++++
 .../Controls/FileSavePicker.axaml.cs          | 64 +++++++++++++++++
 .../Controls/FolderOpenPicker.axaml           | 42 +++++++++++
 .../Controls/FolderOpenPicker.axaml.cs        | 64 +++++++++++++++++
 .../{ViewModels => }/PickerViewModel.cs       |  2 +-
 .../ViewModels/FileOpenPickerViewModel.cs     | 12 ----
 .../ViewModels/FileSavePickerViewModel.cs     | 12 ----
 .../ViewModels/FolderPickerViewModel.cs       | 12 ----
 .../ConsoloniaStorageProvider.cs              | 46 +++++++++----
 .../Infrastructure/SystemStorageFile.cs       | 11 +++
 .../Infrastructure/SystemStorageFolder.cs     | 12 +++-
 .../GalleryViews/GalleryStorage.axaml.cs      | 69 +++++++++++++++----
 .../Templates/Controls/DialogWindow.axaml     | 10 +--
 17 files changed, 351 insertions(+), 86 deletions(-)
 rename src/Consolonia.Core/Controls/{Views => }/FileOpenPicker.axaml (87%)
 rename src/Consolonia.Core/Controls/{Views => }/FileOpenPicker.axaml.cs (78%)
 create mode 100644 src/Consolonia.Core/Controls/FileSavePicker.axaml
 create mode 100644 src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
 create mode 100644 src/Consolonia.Core/Controls/FolderOpenPicker.axaml
 create mode 100644 src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
 rename src/Consolonia.Core/Controls/{ViewModels => }/PickerViewModel.cs (98%)
 delete mode 100644 src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs
 delete mode 100644 src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs
 delete mode 100644 src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs

diff --git a/.gitignore b/.gitignore
index e6c4f816..03d170b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -766,6 +766,3 @@ fabric.properties
 .idea/
 *.sln.iml
 
-/src/Consolonia.Core/Controls/filesavepicker.axaml
-/src/Consolonia.Core/Controls/filesavepicker.axaml.cs
-/src/Consolonia.Core/Controls/folderopenpicker.axaml
diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 2741e73c..6c9ff3b5 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -1,5 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+    <ItemGroup>
+      <AvaloniaXaml Remove="Controls\FileOpen\**" />
+      <Compile Remove="Controls\FileOpen\**" />
+      <EmbeddedResource Remove="Controls\FileOpen\**" />
+      <None Remove="Controls\FileOpen\**" />
+    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
@@ -12,11 +18,4 @@
         <PackageReference Include="Wcwidth" Version="2.0.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Compile Update="Controls\Dialog\DialogWrap.axaml.cs">
-        <DependentUpon>%(Filename)</DependentUpon>
-      </Compile>
-    </ItemGroup>
-
 </Project>
- 
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
similarity index 87%
rename from src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
rename to src/Consolonia.Core/Controls/FileOpenPicker.axaml
index e6dac656..0ccaa326 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -1,13 +1,13 @@
 <dialog:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
-                     xmlns:viewmodels="clr-namespace:Consolonia.Core.Controls.ViewModels"
-                     xmlns:views="clr-namespace:Consolonia.Core.Controls.Views"
+                     xmlns:controls="clr-namespace:Consolonia.Core.Controls"
                      xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
-                     x:DataType="viewmodels:FileOpenPickerViewModel"
-                     x:Class="Consolonia.Core.Controls.Views.FileOpenPicker"
+                     x:DataType="controls:FileOpenPickerViewModel"
+                     x:Class="Consolonia.Core.Controls.FileOpenPicker"
+                     Icon="📰"
                      Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
         <Grid ColumnDefinitions="Auto *">
diff --git a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
similarity index 78%
rename from src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
rename to src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index d7973555..4809a824 100644
--- a/src/Consolonia.Core/Controls/Views/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -2,11 +2,17 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using Consolonia.Core.Controls.Dialog;
-using Consolonia.Core.Controls.ViewModels;
 using Consolonia.Core.Infrastructure;
 
-namespace Consolonia.Core.Controls.Views
+namespace Consolonia.Core.Controls
 {
+    public class FileOpenPickerViewModel : PickerViewModel<FilePickerOpenOptions>
+    {
+        public FileOpenPickerViewModel(FilePickerOpenOptions options)
+            : base(options)
+        {
+        }
+    }
     public partial class FileOpenPicker : DialogWindow
     {
         public FileOpenPicker(FilePickerOpenOptions options)
@@ -35,18 +41,19 @@ private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
             {
                 var model = (FileOpenPickerViewModel)this.DataContext;
                 model.CurrentFolder = folder;
+                model.CurrentFolderPath = folder.Path.LocalPath;
             }
             else if (listbox.SelectedItem is SystemStorageFile file)
             {
                 var model = (FileOpenPickerViewModel)this.DataContext;
-                model.SelectedItem = file;
+                this.CloseDialog(new IStorageFile[] { file });
             }
         }
 
         private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             var model = (FileOpenPickerViewModel)this.DataContext;
-            this.CloseDialog(new IStorageFile[] { (IStorageFile)model.SelectedItem });
+            this.CloseDialog(new IStorageFile[] { model.SelectedFile });
         }
 
         private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml b/src/Consolonia.Core/Controls/FileSavePicker.axaml
new file mode 100644
index 00000000..d32af86f
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml
@@ -0,0 +1,42 @@
+<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                     xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     x:DataType="controls:FileSavePickerViewModel"
+                     x:Class="Consolonia.Core.Controls.FileSavePicker"
+                     Icon="📰"
+                     Title="{Binding Options.Title}">
+    <Grid RowDefinitions="Auto * Auto Auto">
+        <Grid ColumnDefinitions="Auto *">
+            <TextBlock Text="📁 " />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
+        </Grid>
+        <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
+                    <Grid ColumnDefinitions="Auto * " Background="Transparent">
+                        <TextBlock Text="📁" Margin="0 0 1 0"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                    </Grid>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <Grid ColumnDefinitions="Auto *"  Background="Transparent">
+                        <TextBlock Text="📰" Margin="0 0 1 0"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <Grid Grid.Row="2" ColumnDefinitions="Auto *">
+            <TextBlock Text="File:" Margin="0 0 1 0"/>
+            <TextBox Text="{Binding SelectedFile.Path.LocalPath}" Grid.Column="1"/>
+        </Grid>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
+            <Button Content="Save" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+            <Button Content="Cancel" Click="OnCancel"/>
+        </StackPanel>
+    </Grid>
+</dialog:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
new file mode 100644
index 00000000..c0efb335
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -0,0 +1,64 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Controls.Dialog;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Core.Controls
+{
+    public class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOptions>
+    {
+        public FileSavePickerViewModel(FilePickerSaveOptions options)
+            : base(options)
+        {
+        }
+    }
+    public partial class FileSavePicker : DialogWindow
+    {
+        public FileSavePicker(FilePickerSaveOptions options)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            Loaded += (_, _) =>
+            {
+                this.FindControl<Button>("Button")?.Focus();
+            };
+            DataContext = new FileSavePickerViewModel(options);
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public FilePickerSaveOptions Options => ((FileSavePickerViewModel)DataContext).Options;
+
+        private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
+        {
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is SystemStorageFolder folder)
+            {
+                var model = (FileSavePickerViewModel)this.DataContext;
+                model.CurrentFolder = folder;
+                model.CurrentFolderPath = folder.Path.LocalPath;
+            }
+            else if (listbox.SelectedItem is SystemStorageFile file)
+            {
+                var model = (FileSavePickerViewModel)this.DataContext;
+                this.CloseDialog(new IStorageFile[] { file });
+            }
+        }
+
+        private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var model = (FileSavePickerViewModel)this.DataContext;
+            this.CloseDialog(new IStorageFile[] { (IStorageFile)model.SelectedItem });
+        }
+
+        private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            this.CloseDialog(null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml
new file mode 100644
index 00000000..4795a5a6
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml
@@ -0,0 +1,42 @@
+<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                     xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     x:DataType="controls:FolderPickerViewModel"
+                     x:Class="Consolonia.Core.Controls.FolderOpenPicker"
+                     Icon="📁"
+                     Title="{Binding Options.Title}">
+    <Grid RowDefinitions="Auto * Auto Auto">
+        <Grid ColumnDefinitions="Auto *">
+            <TextBlock Text="📁" Margin="0 0 1 0" />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
+        </Grid>
+        <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
+                    <Grid ColumnDefinitions="Auto * " Background="Transparent">
+                        <TextBlock Text="📁" Margin="0 0 1 0"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                    </Grid>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <Grid ColumnDefinitions="Auto *"  Background="Transparent">
+                        <TextBlock Text="📰" Margin="0 0 1 0"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
+            <TextBlock Text="Folder:" Margin="0 0 1 0"/>
+            <TextBlock Text="{Binding SelectedFolder.Path.LocalPath}"/>
+        </StackPanel>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
+            <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedFolder, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+            <Button Content="Cancel" Click="OnCancel"/>
+        </StackPanel>
+    </Grid>
+</dialog:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
new file mode 100644
index 00000000..fa8bb137
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
@@ -0,0 +1,64 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Controls.Dialog;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Core.Controls
+{
+    public class FolderPickerViewModel : PickerViewModel<FolderPickerOpenOptions>
+    {
+        public FolderPickerViewModel(FolderPickerOpenOptions options)
+            : base(options)
+        {
+        }
+    }
+    public partial class FolderOpenPicker : DialogWindow
+    {
+        public FolderOpenPicker(FolderPickerOpenOptions options)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            Loaded += (_, _) =>
+            {
+                this.FindControl<Button>("Button")?.Focus();
+            };
+            DataContext = new FolderPickerViewModel(options);
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext).Options;
+
+        private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
+        {
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is SystemStorageFolder folder)
+            {
+                var model = (FileSavePickerViewModel)this.DataContext;
+                model.CurrentFolder = folder;
+                model.CurrentFolderPath = folder.Path.LocalPath;
+            }
+            else if (listbox.SelectedItem is SystemStorageFile file)
+            {
+                var model = (FileSavePickerViewModel)this.DataContext;
+                this.CloseDialog(new IStorageFile[] { file });
+            }
+        }
+
+        private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var model = (FileSavePickerViewModel)this.DataContext;
+            this.CloseDialog(new IStorageFolder[] { model.SelectedFolder });
+        }
+
+        private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            this.CloseDialog(null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs b/src/Consolonia.Core/Controls/PickerViewModel.cs
similarity index 98%
rename from src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
rename to src/Consolonia.Core/Controls/PickerViewModel.cs
index e93ddc5d..c5bcdcfc 100644
--- a/src/Consolonia.Core/Controls/ViewModels/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModel.cs
@@ -7,7 +7,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Consolonia.Core.Infrastructure;
 
-namespace Consolonia.Core.Controls.ViewModels
+namespace Consolonia.Core.Controls
 {
 
     public partial class PickerViewModel<TPickerOptions> : ObservableObject
diff --git a/src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs
deleted file mode 100644
index ca5cc011..00000000
--- a/src/Consolonia.Core/Controls/ViewModels/FileOpenPickerViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Platform.Storage;
-
-namespace Consolonia.Core.Controls.ViewModels
-{
-    public class FileOpenPickerViewModel : PickerViewModel<FilePickerOpenOptions>
-    {
-        public FileOpenPickerViewModel(FilePickerOpenOptions options)
-            : base(options)
-        {
-        }
-    }
-}
diff --git a/src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs
deleted file mode 100644
index 97205051..00000000
--- a/src/Consolonia.Core/Controls/ViewModels/FileSavePickerViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Platform.Storage;
-
-namespace Consolonia.Core.Controls.ViewModels
-{
-    public class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOptions>
-    {
-        public FileSavePickerViewModel(FilePickerSaveOptions options)
-            : base(options)
-        {
-        }
-    }
-}
diff --git a/src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs b/src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs
deleted file mode 100644
index f6618541..00000000
--- a/src/Consolonia.Core/Controls/ViewModels/FolderPickerViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Platform.Storage;
-
-namespace Consolonia.Core.Controls.ViewModels
-{
-    public class FolderPickerViewModel : PickerViewModel<FolderPickerOpenOptions>
-    {
-        public FolderPickerViewModel(FolderPickerOpenOptions options)
-            : base(options)
-        {
-        }
-    }
-}
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index 33103f95..aeebfa1b 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
-using Consolonia.Core.Controls.Views;
-using Consolonia.Core.Controls.ViewModels;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia;
-using System.Linq;
+using System.IO;
+using Consolonia.Core.Controls;
 
 namespace Consolonia.Core.Infrastructure
 {
@@ -21,8 +20,7 @@ public class ConsoloniaStorageProvider : IStorageProvider
 
         public async Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
         {
-            await Task.CompletedTask.ConfigureAwait(false);
-            return null;
+            throw new NotImplementedException();
         }
 
         public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
@@ -39,29 +37,53 @@ public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
             throw new NotImplementedException();
         }
 
-        public Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
         {
-            throw new NotImplementedException();
+            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+
+            var picker = new FolderOpenPicker(options);
+            var results = await picker.ShowDialogAsync<IStorageFolder[]>(mainWindow).ConfigureAwait(false);
+            return results;
         }
 
-        public Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
+        public async Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
         {
-            throw new NotImplementedException();
+            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+
+            var picker = new FileSavePicker(options);
+            var results = await picker.ShowDialogAsync<IStorageFile>(mainWindow).ConfigureAwait(false);
+            return results;
         }
 
         public Task<IStorageFile> TryGetFileFromPathAsync(Uri filePath)
         {
-            throw new NotImplementedException();
+            if (File.Exists(filePath.LocalPath))
+                return Task.FromResult<IStorageFile>(new SystemStorageFile(filePath));
+            return Task.FromResult<IStorageFile>(null);
         }
 
         public Task<IStorageFolder> TryGetFolderFromPathAsync(Uri folderPath)
         {
-            throw new NotImplementedException();
+            if (Directory.Exists(folderPath.LocalPath))
+                return Task.FromResult<IStorageFolder>(new SystemStorageFolder(folderPath));
+            return Task.FromResult<IStorageFolder>(null);
         }
 
         public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnownFolder)
         {
-            throw new NotImplementedException();
+            var dir = wellKnownFolder switch
+            {
+                WellKnownFolder.Desktop => Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+                WellKnownFolder.Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                WellKnownFolder.Downloads => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                WellKnownFolder.Pictures => Environment.GetFolderPath(Environment.SpecialFolder.MyPictures),
+                WellKnownFolder.Music => Environment.GetFolderPath(Environment.SpecialFolder.MyMusic),
+                WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),
+                _ => null
+            };
+            if (dir == null)
+                return Task.FromResult<IStorageFolder>(null);
+            return Task.FromResult<IStorageFolder>(new SystemStorageFolder(dir));
         }
     }
 }
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index 748784b8..f0fc10c1 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -9,6 +9,17 @@ public class SystemStorageFile : IStorageFile
     {
         private FileInfo _fileInfo;
 
+
+        public SystemStorageFile(string file)
+        {
+            _fileInfo = new FileInfo(file);
+        }
+
+        public SystemStorageFile(Uri uri)
+        {
+            _fileInfo = new FileInfo(uri.LocalPath);
+        }
+
         public SystemStorageFile(FileInfo fileInfo)
         {
             _fileInfo = fileInfo;
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index 40af6821..3109eb84 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -13,6 +13,16 @@ public class SystemStorageFolder : IStorageFolder
         private DirectoryInfo _directoryInfo;
         private bool _isParent;
 
+        public SystemStorageFolder(string path)
+        {
+            _directoryInfo = new DirectoryInfo(path);
+        }
+
+        public SystemStorageFolder(Uri uri)
+        {
+            _directoryInfo = new DirectoryInfo(uri.LocalPath);  
+        }
+
         public SystemStorageFolder(DirectoryInfo directoryInfo, bool isParent = false)
         {
             _isParent = isParent;
@@ -33,7 +43,7 @@ public async Task<IStorageFile> CreateFileAsync(string name)
             using (var stream = File.Create(path))
             {
             }
-            return new SystemStorageFile(new FileInfo(path));
+            return new SystemStorageFile(path);
         }
 
         public Task<IStorageFolder> CreateFolderAsync(string name)
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 266a6e51..1b14cfdd 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -36,40 +36,83 @@ private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventA
                 var storageProvider = lifetime.MainWindow.StorageProvider;
                 if (storageProvider.CanOpen)
                 {
-                    var results = await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
+                    var files = await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
                     {
                         Title = "Open File",
                         SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
                         FileTypeFilter = new List<FilePickerFileType>()
                         {
-                             new FilePickerFileType("Text") 
+                             new FilePickerFileType("Text")
                              {
-                                 Patterns = new List<string>() { "*.txt" } 
-                             } 
+                                 Patterns = new List<string>() { "*.txt" }
+                             }
                         },
                     });
 
-                    if (results != null && results.Any())
-                    {
-
-                    }
+                    var model = (GalleryStorageViewModel)this.DataContext;
+                    model.Files = files;
                 }
             }
         }
 
-        private void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-        { }
-        private void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private async void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
+            IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            if (lifetime != null)
+            {
+                var storageProvider = lifetime.MainWindow.StorageProvider;
+                if (storageProvider.CanOpen)
+                {
+                    var folders = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
+                    {
+                        Title = "Select a folder",
+                        AllowMultiple = false
+                    });
+                    var model = (GalleryStorageViewModel)this.DataContext;
+                    model.Folders = folders;
+                }
+            }
+        }
+        private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            if (lifetime != null)
+            {
+                var storageProvider = lifetime.MainWindow.StorageProvider;
+                if (storageProvider.CanOpen)
+                {
+                    var file = await storageProvider.SaveFilePickerAsync(new FilePickerSaveOptions()
+                    {
+                        Title = "Save File",
+                        SuggestedStartLocation = new SystemStorageFolder(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)),
+                        DefaultExtension = "txt",
+                        SuggestedFileName = "NewFile.txt",
+                        FileTypeChoices = new List<FilePickerFileType>()
+                        {
+                             new FilePickerFileType("Text")
+                             {
+                                 Patterns = new List<string>() { "*.txt" }
+                             },
+                             new FilePickerFileType("Comma delimited values")
+                             {
+                                 Patterns = new List<string>() { "*.csv" }
+                             },
+                        },
+                    });
+
+                    var model = (GalleryStorageViewModel)this.DataContext;
+                    model.Files = new List<IStorageFile>() { file };
+                }
+            }
         }
     }
 
     public partial class GalleryStorageViewModel : ObservableObject
     {
         [ObservableProperty]
-        private IStorageFile _file;
+        private IReadOnlyList<IStorageFile> _files;
 
         [ObservableProperty]
-        private IStorageFolder _folder;
+        private IReadOnlyList<IStorageFolder> _folders;
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index a288dcc5..377aeaa1 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -57,27 +57,27 @@
                                     IsHitTestVisible="False"
                                     Margin="{TemplateBinding Padding}" />
                             </Border>
-                            <StackPanel HorizontalAlignment="Center"
+                            <StackPanel HorizontalAlignment="Left"
                                         VerticalAlignment="Top"
                                         Margin="{DynamicResource ConsoloniaDialogWindowBorderMargin}"
                                         ZIndex="10"
                                         Orientation="Horizontal">
-                                <helpers:SymbolsControl Text=" "
+                                <helpers:SymbolsControl Text="{TemplateBinding Icon}"
                                                         Foreground="{TemplateBinding BorderBrush}" />
-                                <TextBlock Text="{TemplateBinding Title}" />
+                                <TextBlock Text="{TemplateBinding Title}" Margin="1 0 0 0" />
                                 <helpers:SymbolsControl Text=" "
                                                         Foreground="{TemplateBinding BorderBrush}" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal"
                                         ZIndex="10"
                                         VerticalAlignment="Top"
+                                        HorizontalAlignment="Right"
                                         Margin="{DynamicResource ConsoloniaDialogWindowBorderMargin}"
                                         IsVisible="{TemplateBinding IsCloseButtonVisible}">
-                                <Button Content="x"
+                                <Button Content="×"
                                         Background="{x:Null}"
                                         IsTabStop="False"
                                         Padding="0"
-                                        Margin="2,0,0,0"
                                         Command="{Binding Path=CloseClick, RelativeSource={RelativeSource TemplatedParent}}">
                                     <Button.Styles>
                                         <Style Selector="Button">

From b2e49911f6137e01f14ba867ca5bf3728823079c Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 17:11:39 -0600
Subject: [PATCH 11/64] update namespaces

---
 src/Consolonia.Core/Controls/{Dialog => }/DialogWindow.cs   | 4 ++--
 src/Consolonia.Core/Controls/FileOpenPicker.axaml           | 5 ++---
 src/Consolonia.Core/Controls/FileSavePicker.axaml           | 5 ++---
 src/Consolonia.Core/Controls/FolderOpenPicker.axaml         | 5 ++---
 .../Gallery/GalleryViews/SomeDialogWindow.axaml             | 6 +++---
 .../Gallery/GalleryViews/SomeDialogWindow.axaml.cs          | 2 +-
 .../Templates/Controls/DialogWindow.axaml                   | 6 +++---
 .../Themes/TurboVisionDark/Controls/DialogWindow.axaml      | 4 ++--
 8 files changed, 17 insertions(+), 20 deletions(-)
 rename src/Consolonia.Core/Controls/{Dialog => }/DialogWindow.cs (98%)

diff --git a/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
similarity index 98%
rename from src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
rename to src/Consolonia.Core/Controls/DialogWindow.cs
index 8d2cef8e..36cc9077 100644
--- a/src/Consolonia.Core/Controls/Dialog/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
@@ -9,10 +8,11 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.VisualTree;
+using Consolonia.Core.Controls.Dialog;
 
 // ReSharper disable MemberCanBeProtected.Global
 
-namespace Consolonia.Core.Controls.Dialog
+namespace Consolonia.Core.Controls
 {
 
     [TemplatePart("PART_ContentPresenter", typeof(ContentPresenter))]
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 0ccaa326..69bfd5fc 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -1,8 +1,7 @@
-<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
                      xmlns:controls="clr-namespace:Consolonia.Core.Controls"
-                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      x:DataType="controls:FileOpenPickerViewModel"
@@ -39,4 +38,4 @@
             <Button Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
-</dialog:DialogWindow>
\ No newline at end of file
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml b/src/Consolonia.Core/Controls/FileSavePicker.axaml
index d32af86f..a2ab15a9 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml
@@ -1,8 +1,7 @@
-<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
                      xmlns:controls="clr-namespace:Consolonia.Core.Controls"
-                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      x:DataType="controls:FileSavePickerViewModel"
@@ -39,4 +38,4 @@
             <Button Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
-</dialog:DialogWindow>
\ No newline at end of file
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml
index 4795a5a6..4dd93ab3 100644
--- a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml
@@ -1,8 +1,7 @@
-<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
                      xmlns:controls="clr-namespace:Consolonia.Core.Controls"
-                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      x:DataType="controls:FolderPickerViewModel"
@@ -39,4 +38,4 @@
             <Button Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
-</dialog:DialogWindow>
\ No newline at end of file
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
index fc6c7d52..1ecf4994 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
@@ -1,7 +1,7 @@
-<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
-                     xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
+                     xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      Title="Dialog"
@@ -31,4 +31,4 @@ Bill Ames
                 VerticalAlignment="Bottom"
                 Click="OneMore_Clicked" />
     </Panel>
-</dialog:DialogWindow>
\ No newline at end of file
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
index eaf5c7fe..71d00651 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using Consolonia.Core.Controls.Dialog;
+using Consolonia.Core.Controls;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index 377aeaa1..6b4de8c7 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -1,10 +1,10 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
+        xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
         xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
         xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers">
 
-    <Style Selector=":is(dialog|DialogWindow)">
+    <Style Selector=":is(controls|DialogWindow)">
         <Style.Resources>
             <Thickness x:Key="ConsoloniaDialogWindowBorderMargin">1,0</Thickness>
         </Style.Resources>
@@ -22,7 +22,7 @@
                 Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="dialog:DialogWindow">
+                <ControlTemplate TargetType="controls:DialogWindow">
                     <Panel>
                         <!--Centered layout-->
                         <!--Panel shade Mode=Shaded-->
diff --git a/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
index 62b9c73a..5d5a9475 100644
--- a/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core">
-    <Style Selector=":is(dialog|DialogWindow)">
+        xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core">
+    <Style Selector=":is(controls|DialogWindow)">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeBackgroundBrush}" />
     </Style>

From 1bf295003084072db529d8be3a7e1dc3f80c52ca Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 18:18:45 -0600
Subject: [PATCH 12/64] file type filtering

---
 .../Controls/FileOpenPicker.axaml             | 15 ++++++---
 .../Controls/FileOpenPicker.axaml.cs          | 31 ++++++++++++++++---
 .../Controls/FileSavePicker.axaml.cs          | 28 ++++++++++++++++-
 .../Controls/FolderOpenPicker.axaml.cs        |  7 ++++-
 .../Controls/PickerViewModel.cs               |  9 +++---
 .../GalleryViews/GalleryStorage.axaml.cs      | 13 ++++++++
 6 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 69bfd5fc..1f2819a9 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -29,10 +29,17 @@
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
-            <TextBlock Text="File:" Margin="0 0 1 0"/>
-            <TextBlock Text="{Binding SelectedFile.Path.LocalPath}"/>
-        </StackPanel>
+        <Grid Grid.Row="2" ColumnDefinitions="Auto * Auto">
+            <TextBlock Text="File name:" Margin="0 0 1 0"/>
+            <TextBlock Text="{Binding SelectedFile.Path.LocalPath}" Grid.Column="1"/>
+            <ComboBox ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" Grid.Column="2">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}" HorizontalAlignment="Stretch" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </Grid>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
             <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
             <Button Content="Cancel" Click="OnCancel"/>
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index 4809a824..cc7a9e4f 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -1,18 +1,43 @@
+using System;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
-using Consolonia.Core.Controls.Dialog;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls
 {
-    public class FileOpenPickerViewModel : PickerViewModel<FilePickerOpenOptions>
+    public partial class FileOpenPickerViewModel : PickerViewModel<FilePickerOpenOptions>
     {
         public FileOpenPickerViewModel(FilePickerOpenOptions options)
             : base(options)
         {
         }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
+        private int _selectedFilterIndex;
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            if (!Options.FileTypeFilter.Any())
+                return true;
+
+            if (item is IStorageFile file)
+            {
+                var selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
+                foreach (var pattern in selectedFileType.Patterns)
+                {
+                    if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+                        return true;
+                }
+                return false;
+            }
+            return true;
+        }
     }
+
     public partial class FileOpenPicker : DialogWindow
     {
         public FileOpenPicker(FilePickerOpenOptions options)
@@ -32,8 +57,6 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
-        public FilePickerOpenOptions Options => ((FileOpenPickerViewModel)DataContext).Options;
-
         private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index c0efb335..5c9f61d3 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -1,17 +1,43 @@
+using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Consolonia.Core.Controls.Dialog;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls
 {
-    public class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOptions>
+    public partial class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOptions>
     {
         public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
         }
+
+        [ObservableProperty]
+        private FilePickerFileType? _selectedFileType;
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            if (_selectedFileType != null)
+            {
+                if (item is IStorageFolder folder)
+                {
+                    return true;
+                }
+                if (item is IStorageFile file)
+                {
+                    foreach (var pattern in _selectedFileType.Patterns)
+                    {
+                        if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+                            return true;
+                    }
+                    return false;
+                }
+            }
+            return true;
+        }
     }
     public partial class FileSavePicker : DialogWindow
     {
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
index fa8bb137..c29ed6f2 100644
--- a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
-using Consolonia.Core.Controls.Dialog;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls
@@ -12,7 +11,13 @@ public FolderPickerViewModel(FolderPickerOpenOptions options)
             : base(options)
         {
         }
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            return item is IStorageFolder;
+        }
     }
+
     public partial class FolderOpenPicker : DialogWindow
     {
         public FolderOpenPicker(FolderPickerOpenOptions options)
diff --git a/src/Consolonia.Core/Controls/PickerViewModel.cs b/src/Consolonia.Core/Controls/PickerViewModel.cs
index c5bcdcfc..6a63d82b 100644
--- a/src/Consolonia.Core/Controls/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModel.cs
@@ -1,7 +1,5 @@
-using System;
 using System.Collections.ObjectModel;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -10,7 +8,7 @@
 namespace Consolonia.Core.Controls
 {
 
-    public partial class PickerViewModel<TPickerOptions> : ObservableObject
+    public abstract partial class PickerViewModel<TPickerOptions> : ObservableObject
         where TPickerOptions : PickerOptions
     {
         public PickerViewModel(TPickerOptions options)
@@ -72,9 +70,12 @@ private async Task LoadCurrentFolder()
             {
                 await foreach (var item in CurrentFolder.GetItemsAsync())
                 {
-                    this.Items.Add(item);
+                    if (this.FilterItem(item))
+                        this.Items.Add(item);
                 }
             }
         }
+
+        protected abstract bool FilterItem(IStorageItem item);
     }
 }
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 1b14cfdd..4eb60fb6 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reactive.Joins;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
@@ -42,9 +43,21 @@ private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventA
                         SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
                         FileTypeFilter = new List<FilePickerFileType>()
                         {
+                             new FilePickerFileType("All files")
+                             {
+                                 Patterns = new List<string>() { "*" }
+                             },
                              new FilePickerFileType("Text")
                              {
                                  Patterns = new List<string>() { "*.txt" }
+                             },
+                             new FilePickerFileType("Comma Delimited Files")
+                             {
+                                 Patterns = new List<string>() { "*.csv" }
+                             },
+                             new FilePickerFileType("PDF")
+                             {
+                                 Patterns = new List<string>() { "*.pdf" }
                              }
                         },
                     });

From 6ce9beb58357e7d6af65311eed1575ef44dd9a6c Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 18:41:15 -0600
Subject: [PATCH 13/64] show dialog results

---
 .../Gallery/GalleryViews/GalleryStorage.axaml | 26 ++++++++++++++-----
 .../GalleryViews/GalleryStorage.axaml.cs      | 25 +++++++-----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
index 165ec313..c71cf7b4 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
@@ -9,17 +9,29 @@
 
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-            <Button Click="OnOpenFile" Background="Gray">Open File</Button>
-            <Button Click="OnOpenFolder" Background="Gray">Open Folder</Button>
-            <Button Click="OnSaveFile" Background="Gray">Save File</Button>
+            <Button Click="OnOpenFile" Background="Gray">Open File Dialog</Button>
+            <Button Click="OnOpenFolder" Background="Gray">Open Folder Dialog</Button>
+            <Button Click="OnSaveFile" Background="Gray">Save File Dialog</Button>
         </StackPanel>
         <StackPanel Orientation="Horizontal">
-            <Label>File</Label>
-            <TextBlock Text="{Binding File.Name}"/>
+            <TextBlock>Files:</TextBlock>
+            <ItemsControl ItemsSource="{Binding Files}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}"/>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
         </StackPanel>
         <StackPanel Orientation="Horizontal">
-            <Label>Folder:</Label>
-            <TextBlock Text="{Binding Folder.Name}"/>
+            <TextBlock>Folders:</TextBlock>
+            <ItemsControl ItemsSource="{Binding Folders}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}"/>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
         </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 4eb60fb6..120d5dcc 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -1,21 +1,24 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Reactive.Joins;
-using System.Reactive.Linq;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Consolonia.Core.Infrastructure;
-using Microsoft.VisualBasic.FileIO;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
+    public partial class GalleryStorageViewModel : ObservableObject
+    {
+        [ObservableProperty]
+        private IReadOnlyList<IStorageFile> _files;
+
+        [ObservableProperty]
+        private IReadOnlyList<IStorageFolder> _folders;
+    }
+
     public partial class GalleryStorage : UserControl
     {
         public GalleryStorage()
@@ -119,13 +122,5 @@ private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventA
             }
         }
     }
-
-    public partial class GalleryStorageViewModel : ObservableObject
-    {
-        [ObservableProperty]
-        private IReadOnlyList<IStorageFile> _files;
-
-        [ObservableProperty]
-        private IReadOnlyList<IStorageFolder> _folders;
-    }
+  
 }
\ No newline at end of file

From 439a91ee69f6d275d97087b0b147b9d0dac12408 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sat, 23 Nov 2024 21:01:59 -0600
Subject: [PATCH 14/64] clean up warningsc

---
 src/Consolonia.Core/Consolonia.Core.csproj     | 11 +++++++----
 src/Consolonia.Core/Controls/DialogWindow.cs   | 18 +++++++++---------
 .../Controls/FileOpenPicker.axaml.cs           |  6 +++---
 .../Controls/FileSavePicker.axaml.cs           | 13 +++++++------
 .../Controls/FolderOpenPicker.axaml.cs         |  6 +++---
 .../Controls/PickerViewModel.cs                |  6 +++---
 .../Infrastructure/ConsoleWindow.cs            |  4 ++--
 .../ConsoloniaStorageProvider.cs               |  8 ++++----
 .../InputLessDefaultNetConsole.cs              |  4 ++--
 .../Infrastructure/SystemStorageFile.cs        |  6 +++---
 .../Infrastructure/SystemStorageFolder.cs      |  6 +++---
 src/Consolonia.NUnit/Consolonia.NUnit.csproj   |  4 ++++
 src/Consolonia.NUnit/ConsoloniaAppTestBase.cs  |  2 +-
 src/Consolonia.NUnit/UnitTestConsole.cs        |  4 ++--
 14 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 6c9ff3b5..dbd62c78 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+    <PropertyGroup>
+        <NoWarn>CA2007;</NoWarn>
+    </PropertyGroup>
     <ItemGroup>
-      <AvaloniaXaml Remove="Controls\FileOpen\**" />
-      <Compile Remove="Controls\FileOpen\**" />
-      <EmbeddedResource Remove="Controls\FileOpen\**" />
-      <None Remove="Controls\FileOpen\**" />
+        <AvaloniaXaml Remove="Controls\FileOpen\**" />
+        <Compile Remove="Controls\FileOpen\**" />
+        <EmbeddedResource Remove="Controls\FileOpen\**" />
+        <None Remove="Controls\FileOpen\**" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Consolonia.Core/Controls/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
index 36cc9077..1c9fe181 100644
--- a/src/Consolonia.Core/Controls/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -32,13 +32,13 @@ public class DialogWindow : UserControl
         public static readonly StyledProperty<bool> CanResizeProperty =
             AvaloniaProperty.Register<Window, bool>(nameof(CanResize), true);
 
-        public static readonly StyledProperty<string?> IconProperty =
-            AvaloniaProperty.Register<DialogWindow, string?>(nameof(Icon));
+        public static readonly StyledProperty<string> IconProperty =
+            AvaloniaProperty.Register<DialogWindow, string>(nameof(Icon));
 
         private Size _contentSize;
         private ContentPresenter _partContentPresenter;
 
-        private TaskCompletionSource<object?> _taskCompletionSource;
+        private TaskCompletionSource<object> _taskCompletionSource;
 
 
         static DialogWindow()
@@ -86,7 +86,7 @@ public bool CanResize
         /// <summary>
         /// Gets or sets the icon of the window.
         /// </summary>
-        public string? Icon
+        public string Icon
         {
             get => GetValue(IconProperty);
             set => SetValue(IconProperty, value);
@@ -158,7 +158,7 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         }
 
         // ReSharper disable once VirtualMemberNeverOverridden.Global overriden in other packages, why resharper suggests this?
-        public virtual void CloseDialog(object? result = null)
+        public virtual void CloseDialog(object result = null)
         {
             DialogHost dialogHost = GetDialogHost(this);
             dialogHost.PopInternal(this);
@@ -174,9 +174,9 @@ public async Task ShowDialogAsync(Control parent)
             if (_taskCompletionSource != null)
                 throw new NotImplementedException();
 
-            _taskCompletionSource = new TaskCompletionSource<object?>();
+            _taskCompletionSource = new TaskCompletionSource<object>();
             ShowDialogInternal(parent);
-            await _taskCompletionSource.Task.ConfigureAwait(false);
+            await _taskCompletionSource.Task;
         }
 
         public async Task<T> ShowDialogAsync<T>(Control parent)
@@ -184,9 +184,9 @@ public async Task<T> ShowDialogAsync<T>(Control parent)
             if (_taskCompletionSource != null)
                 throw new NotImplementedException();
 
-            _taskCompletionSource = new TaskCompletionSource<object?>();
+            _taskCompletionSource = new TaskCompletionSource<object>();
             ShowDialogInternal(parent);
-            var result = await _taskCompletionSource.Task.ConfigureAwait(false);
+            var result = await _taskCompletionSource.Task;
             return (T)result;
         }
 
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index cc7a9e4f..6cae68e0 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -57,7 +57,7 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
-        private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
+        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
             if (listbox.SelectedItem is SystemStorageFolder folder)
@@ -73,13 +73,13 @@ private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
             }
         }
 
-        private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             var model = (FileOpenPickerViewModel)this.DataContext;
             this.CloseDialog(new IStorageFile[] { model.SelectedFile });
         }
 
-        private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             this.CloseDialog(null);
         }
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 5c9f61d3..02b81b56 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -13,14 +13,15 @@ public partial class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOpt
         public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
+
         }
 
         [ObservableProperty]
-        private FilePickerFileType? _selectedFileType;
+        private FilePickerFileType _selectedFileType;
 
         protected override bool FilterItem(IStorageItem item)
         {
-            if (_selectedFileType != null)
+            if (SelectedFileType != null)
             {
                 if (item is IStorageFolder folder)
                 {
@@ -28,7 +29,7 @@ protected override bool FilterItem(IStorageItem item)
                 }
                 if (item is IStorageFile file)
                 {
-                    foreach (var pattern in _selectedFileType.Patterns)
+                    foreach (var pattern in SelectedFileType.Patterns)
                     {
                         if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
                             return true;
@@ -60,7 +61,7 @@ private void InitializeComponent()
 
         public FilePickerSaveOptions Options => ((FileSavePickerViewModel)DataContext).Options;
 
-        private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
+        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
             if (listbox.SelectedItem is SystemStorageFolder folder)
@@ -76,13 +77,13 @@ private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
             }
         }
 
-        private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             var model = (FileSavePickerViewModel)this.DataContext;
             this.CloseDialog(new IStorageFile[] { (IStorageFile)model.SelectedItem });
         }
 
-        private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             this.CloseDialog(null);
         }
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
index c29ed6f2..33f6e753 100644
--- a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
@@ -39,7 +39,7 @@ private void InitializeComponent()
 
         public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext).Options;
 
-        private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
+        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
             if (listbox.SelectedItem is SystemStorageFolder folder)
@@ -55,13 +55,13 @@ private void OnDoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
             }
         }
 
-        private void OnOK(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             var model = (FileSavePickerViewModel)this.DataContext;
             this.CloseDialog(new IStorageFolder[] { model.SelectedFolder });
         }
 
-        private void OnCancel(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             this.CloseDialog(null);
         }
diff --git a/src/Consolonia.Core/Controls/PickerViewModel.cs b/src/Consolonia.Core/Controls/PickerViewModel.cs
index 6a63d82b..80fccff5 100644
--- a/src/Consolonia.Core/Controls/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModel.cs
@@ -11,7 +11,7 @@ namespace Consolonia.Core.Controls
     public abstract partial class PickerViewModel<TPickerOptions> : ObservableObject
         where TPickerOptions : PickerOptions
     {
-        public PickerViewModel(TPickerOptions options)
+        protected PickerViewModel(TPickerOptions options)
         {
             Options = options;
             CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath;
@@ -38,9 +38,9 @@ public PickerViewModel(TPickerOptions options)
         [NotifyPropertyChangedFor(nameof(SelectedFolder))]
         private IStorageItem _selectedItem;
 
-        public IStorageFile SelectedFile => _selectedItem as IStorageFile;
+        public IStorageFile SelectedFile => SelectedItem as IStorageFile;
 
-        public IStorageFolder SelectedFolder => _selectedItem as IStorageFolder;
+        public IStorageFolder SelectedFolder => SelectedItem as IStorageFolder;
 
         private async void PickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
diff --git a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
index c689cc7b..e8729947 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
@@ -317,7 +317,7 @@ private void OnConsoleOnResized()
                 try
                 {
                     // Wait for the delay period, this task will be canceled if another refresh comes in.
-                    await Task.Delay(_resizeDelay, _resizeCancellationTokenSource.Token).ConfigureAwait(false);
+                    await Task.Delay(_resizeDelay, _resizeCancellationTokenSource.Token);
 
                     // dispatch to the UI thread 
                     Dispatcher.UIThread.Post(() =>
@@ -362,7 +362,7 @@ await Dispatcher.UIThread.InvokeAsync(() =>
 #pragma warning restore CS0618 // Type or member is obsolete
                     Input!(rawInputEventArgs);
                     handled = rawInputEventArgs.Handled;
-                }, DispatcherPriority.Input).GetTask().ConfigureAwait(true);
+                }, DispatcherPriority.Input);
 
                 if (!handled && !char.IsControl(keyChar))
                     Dispatcher.UIThread.Post(() =>
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index aeebfa1b..92758248 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -18,7 +18,7 @@ public class ConsoloniaStorageProvider : IStorageProvider
         public bool CanPickFolder => true;
 
 
-        public async Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
+        public Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
         {
             throw new NotImplementedException();
         }
@@ -28,7 +28,7 @@ public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpe
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
 
             var picker = new FileOpenPicker(options);
-            var results = await picker.ShowDialogAsync<IStorageFile[]>(mainWindow).ConfigureAwait(false);
+            var results = await picker.ShowDialogAsync<IStorageFile[]>(mainWindow);
             return results;
         }
 
@@ -42,7 +42,7 @@ public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPic
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
 
             var picker = new FolderOpenPicker(options);
-            var results = await picker.ShowDialogAsync<IStorageFolder[]>(mainWindow).ConfigureAwait(false);
+            var results = await picker.ShowDialogAsync<IStorageFolder[]>(mainWindow);
             return results;
         }
 
@@ -51,7 +51,7 @@ public async Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions option
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
 
             var picker = new FileSavePicker(options);
-            var results = await picker.ShowDialogAsync<IStorageFile>(mainWindow).ConfigureAwait(false);
+            var results = await picker.ShowDialogAsync<IStorageFile>(mainWindow);
             return results;
         }
 
diff --git a/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs b/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
index d23a5d3d..96260749 100644
--- a/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
+++ b/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
@@ -203,10 +203,10 @@ protected void StartSizeCheckTimerAsync(uint slowInterval = 1500)
                 {
                     Task pauseTask = PauseTask;
                     if (pauseTask != null)
-                        await pauseTask.ConfigureAwait(false);
+                        await pauseTask;
 
                     int timeout = (int)(CheckActualizeTheSize() ? 1 : slowInterval);
-                    await Task.Delay(timeout).ConfigureAwait(false);
+                    await Task.Delay(timeout);
                 }
             });
         }
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index f0fc10c1..e91bbcd2 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -5,7 +5,7 @@
 
 namespace Consolonia.Core.Infrastructure
 {
-    public class SystemStorageFile : IStorageFile
+    public sealed class SystemStorageFile : IStorageFile
     {
         private FileInfo _fileInfo;
 
@@ -62,13 +62,13 @@ public Task<IStorageItem> MoveAsync(IStorageFolder destination)
 
         public async Task<Stream> OpenReadAsync()
         {
-            await Task.CompletedTask.ConfigureAwait(false);
+            await Task.CompletedTask;
             return _fileInfo.OpenRead();
         }
 
         public async Task<Stream> OpenWriteAsync()
         {
-            await Task.CompletedTask.ConfigureAwait(false);
+            await Task.CompletedTask;
             return _fileInfo.OpenWrite();
         }
 
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index 3109eb84..f963d42f 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -8,7 +8,7 @@
 namespace Consolonia.Core.Infrastructure
 {
     [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
-    public class SystemStorageFolder : IStorageFolder
+    public sealed class SystemStorageFolder : IStorageFolder
     {
         private DirectoryInfo _directoryInfo;
         private bool _isParent;
@@ -37,7 +37,7 @@ public SystemStorageFolder(DirectoryInfo directoryInfo, bool isParent = false)
 
         public async Task<IStorageFile> CreateFileAsync(string name)
         {
-            await Task.CompletedTask.ConfigureAwait(false);
+            await Task.CompletedTask;
 
             var path = System.IO.Path.Combine(_directoryInfo.FullName, name);
             using (var stream = File.Create(path))
@@ -70,7 +70,7 @@ public Task<StorageItemProperties> GetBasicPropertiesAsync()
 
         public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
         {
-            await Task.CompletedTask.ConfigureAwait(false);
+            await Task.CompletedTask;
 
             if (_directoryInfo.Exists)
             {
diff --git a/src/Consolonia.NUnit/Consolonia.NUnit.csproj b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
index dae1791f..9f8ac3f0 100644
--- a/src/Consolonia.NUnit/Consolonia.NUnit.csproj
+++ b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
@@ -6,6 +6,10 @@
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <NoWarn>CA2007;</NoWarn>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.13.1" />
     </ItemGroup>
diff --git a/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs b/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs
index 9bb49037..2cc76d4b 100644
--- a/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs
+++ b/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs
@@ -70,7 +70,7 @@ await Task.Run(async () =>
                     {
                         Window mainWindow = _lifetime?.MainWindow;
                         return mainWindow != null;
-                    }).GetTask().ConfigureAwait(false);
+                    });
                     if (windowFound)
                         return;
                 }
diff --git a/src/Consolonia.NUnit/UnitTestConsole.cs b/src/Consolonia.NUnit/UnitTestConsole.cs
index a74040ac..baf7b37d 100644
--- a/src/Consolonia.NUnit/UnitTestConsole.cs
+++ b/src/Consolonia.NUnit/UnitTestConsole.cs
@@ -94,9 +94,9 @@ public async Task StringInput(string input)
                 // todo: check why Yield is not enough: https://github.com/jinek/Consolonia/runs/7055199426?check_suite_focus=true
                 const ulong interval = 50;
                 KeyEvent?.Invoke(key, c, RawInputModifiers.None, true, timestamp);
-                await Task.Delay((int)interval).ConfigureAwait(false);
+                await Task.Delay((int)interval);
                 KeyEvent?.Invoke(key, c, RawInputModifiers.None, false, timestamp + interval);
-                await Task.Delay((int)interval).ConfigureAwait(false);
+                await Task.Delay((int)interval);
             }
 
             await WaitRendered().ConfigureAwait(true);

From 26a5987b6a2d6f9ccaec4034081a775207f254c6 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 16:20:58 -0600
Subject: [PATCH 15/64] multiple select works focus works escape works

---
 src/Consolonia.Core/Consolonia.Core.csproj    |  6 ++
 .../Controls/FileOpenPicker.axaml             | 27 +++---
 .../Controls/FileOpenPicker.axaml.cs          | 79 +++++++++---------
 .../Controls/FileOpenPickerViewModel.cs       | 51 ++++++++++++
 .../Controls/FileSavePicker.axaml             |  8 +-
 .../Controls/FileSavePicker.axaml.cs          | 54 ++----------
 .../Controls/FileSavePickerViewModel.cs       | 45 ++++++++++
 .../Controls/FolderOpenPicker.axaml.cs        | 69 ---------------
 ...derOpenPicker.axaml => FolderPicker.axaml} | 19 ++---
 .../Controls/FolderPicker.axaml.cs            | 83 +++++++++++++++++++
 .../Controls/FolderPickerViewModel.cs         | 30 +++++++
 ...kerViewModel.cs => PickerViewModelBase.cs} | 12 +--
 .../ConsoloniaStorageProvider.cs              |  6 +-
 .../Gallery/GalleryViews/GalleryStorage.axaml | 67 +++++++++------
 .../GalleryViews/GalleryStorage.axaml.cs      | 42 +++++++---
 15 files changed, 364 insertions(+), 234 deletions(-)
 create mode 100644 src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
 create mode 100644 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
 delete mode 100644 src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
 rename src/Consolonia.Core/Controls/{FolderOpenPicker.axaml => FolderPicker.axaml} (70%)
 create mode 100644 src/Consolonia.Core/Controls/FolderPicker.axaml.cs
 create mode 100644 src/Consolonia.Core/Controls/FolderPickerViewModel.cs
 rename src/Consolonia.Core/Controls/{PickerViewModel.cs => PickerViewModelBase.cs} (81%)

diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index dbd62c78..9e65a4cf 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -21,4 +21,10 @@
         <PackageReference Include="Wcwidth" Version="2.0.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Update="Controls\FolderPicker.axaml.cs">
+        <DependentUpon>FolderPicker.axaml</DependentUpon>
+      </Compile>
+    </ItemGroup>
+
 </Project>
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 1f2819a9..dff70e1b 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -6,14 +6,15 @@
                      VerticalAlignment="Center"
                      x:DataType="controls:FileOpenPickerViewModel"
                      x:Class="Consolonia.Core.Controls.FileOpenPicker"
-                     Icon="📰"
+                     Icon="📰" CancelOnEscape="True"
                      Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
         <Grid ColumnDefinitions="Auto *">
             <TextBlock Text="📁 " />
             <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
         </Grid>
-        <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+        <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
+                 SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
                     <Grid ColumnDefinitions="Auto * " Background="Transparent">
@@ -29,20 +30,16 @@
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
-        <Grid Grid.Row="2" ColumnDefinitions="Auto * Auto">
-            <TextBlock Text="File name:" Margin="0 0 1 0"/>
-            <TextBlock Text="{Binding SelectedFile.Path.LocalPath}" Grid.Column="1"/>
-            <ComboBox ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" Grid.Column="2">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}" HorizontalAlignment="Stretch" />
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-        </Grid>
+        <ComboBox Grid.Row="2" ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" HorizontalAlignment="Right" >
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Name}" HorizontalAlignment="Stretch" />
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-            <Button Content="Cancel" Click="OnCancel"/>
+            <Button x:Name="OKButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
+            <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index 6cae68e0..7b3240ad 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -1,42 +1,9 @@
-using System;
-using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls
 {
-    public partial class FileOpenPickerViewModel : PickerViewModel<FilePickerOpenOptions>
-    {
-        public FileOpenPickerViewModel(FilePickerOpenOptions options)
-            : base(options)
-        {
-        }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
-        private int _selectedFilterIndex;
-
-        protected override bool FilterItem(IStorageItem item)
-        {
-            if (!Options.FileTypeFilter.Any())
-                return true;
-
-            if (item is IStorageFile file)
-            {
-                var selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
-                foreach (var pattern in selectedFileType.Patterns)
-                {
-                    if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
-                        return true;
-                }
-                return false;
-            }
-            return true;
-        }
-    }
 
     public partial class FileOpenPicker : DialogWindow
     {
@@ -46,12 +13,14 @@ public FileOpenPicker(FilePickerOpenOptions options)
 
             Loaded += (_, _) =>
             {
-                this.FindControl<Button>("Button")?.Focus();
+                this.FindControl<Button>("CancelButton")?.Focus();
             };
             DataContext = new FileOpenPickerViewModel(options);
             InitializeComponent();
         }
 
+        public FileOpenPickerViewModel ViewModel => (FileOpenPickerViewModel)DataContext;
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
@@ -60,28 +29,54 @@ private void InitializeComponent()
         private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
-            if (listbox.SelectedItem is SystemStorageFolder folder)
+            if (listbox.SelectedItem is IStorageFolder folder)
             {
-                var model = (FileOpenPickerViewModel)this.DataContext;
-                model.CurrentFolder = folder;
-                model.CurrentFolderPath = folder.Path.LocalPath;
+                ViewModel.CurrentFolder = folder;
+                ViewModel.CurrentFolderPath = folder.Path.LocalPath;
+                ViewModel.SelectedFiles.Clear();
             }
-            else if (listbox.SelectedItem is SystemStorageFile file)
+            else if (listbox.SelectedItem is IStorageFile file)
             {
-                var model = (FileOpenPickerViewModel)this.DataContext;
                 this.CloseDialog(new IStorageFile[] { file });
             }
         }
 
         private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            var model = (FileOpenPickerViewModel)this.DataContext;
-            this.CloseDialog(new IStorageFile[] { model.SelectedFile });
+            this.CloseDialog(ViewModel.SelectedFiles);
         }
 
         private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             this.CloseDialog(null);
         }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.SelectionMode == SelectionMode.Single)
+            {
+                if ((e.AddedItems.Count > 0) &&
+                    (e.AddedItems[0] is IStorageFile file))
+                {
+                    ViewModel.SelectedFiles.Clear();
+                    ViewModel.SelectedFiles.Add(file);
+                }
+            }
+            else
+            {
+                foreach (var item in e.AddedItems)
+                {
+                    if (item is IStorageFile file)
+                        ViewModel.SelectedFiles.Add(file);
+                }
+
+                foreach (var item in e.RemovedItems)
+                {
+                    if (item is IStorageFile file)
+                        ViewModel.SelectedFiles.Remove(file);
+                }
+            }
+            ViewModel.HasSelection = ViewModel.SelectedFiles.Count > 0;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
new file mode 100644
index 00000000..a28479a2
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FileOpenPickerViewModel : PickerViewModelBase<FilePickerOpenOptions>
+    {
+        public FileOpenPickerViewModel(FilePickerOpenOptions options)
+            : base(options)
+        {
+            this.SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
+        }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
+        private int _selectedFilterIndex;
+
+        [ObservableProperty]
+        private SelectionMode _selectionMode;
+
+        [ObservableProperty]
+        private ObservableCollection<IStorageFile> _selectedFiles = new ObservableCollection<IStorageFile>();
+
+        [ObservableProperty]
+        private bool _hasSelection;
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            if (!Options.FileTypeFilter.Any())
+                return true;
+
+            if (item is IStorageFile file)
+            {
+                var selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
+                foreach (var pattern in selectedFileType.Patterns)
+                {
+                    if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+                        return true;
+                }
+                return false;
+            }
+            return true;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml b/src/Consolonia.Core/Controls/FileSavePicker.axaml
index a2ab15a9..52e14e03 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml
@@ -6,14 +6,14 @@
                      VerticalAlignment="Center"
                      x:DataType="controls:FileSavePickerViewModel"
                      x:Class="Consolonia.Core.Controls.FileSavePicker"
-                     Icon="📰"
+                     Icon="📰" CancelOnEscape="True"
                      Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
         <Grid ColumnDefinitions="Auto *">
             <TextBlock Text="📁 " />
             <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
         </Grid>
-        <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+        <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
                     <Grid ColumnDefinitions="Auto * " Background="Transparent">
@@ -34,8 +34,8 @@
             <TextBox Text="{Binding SelectedFile.Path.LocalPath}" Grid.Column="1"/>
         </Grid>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button Content="Save" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-            <Button Content="Cancel" Click="OnCancel"/>
+            <Button x:Name="SaveButton" Content="Save" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+            <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 02b81b56..c0143f5a 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -1,45 +1,9 @@
-using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Consolonia.Core.Controls.Dialog;
-using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls
 {
-    public partial class FileSavePickerViewModel : PickerViewModel<FilePickerSaveOptions>
-    {
-        public FileSavePickerViewModel(FilePickerSaveOptions options)
-            : base(options)
-        {
-
-        }
-
-        [ObservableProperty]
-        private FilePickerFileType _selectedFileType;
-
-        protected override bool FilterItem(IStorageItem item)
-        {
-            if (SelectedFileType != null)
-            {
-                if (item is IStorageFolder folder)
-                {
-                    return true;
-                }
-                if (item is IStorageFile file)
-                {
-                    foreach (var pattern in SelectedFileType.Patterns)
-                    {
-                        if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
-                            return true;
-                    }
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
     public partial class FileSavePicker : DialogWindow
     {
         public FileSavePicker(FilePickerSaveOptions options)
@@ -48,7 +12,7 @@ public FileSavePicker(FilePickerSaveOptions options)
 
             Loaded += (_, _) =>
             {
-                this.FindControl<Button>("Button")?.Focus();
+                this.FindControl<Button>("CancelButton")?.Focus();
             };
             DataContext = new FileSavePickerViewModel(options);
             InitializeComponent();
@@ -61,26 +25,26 @@ private void InitializeComponent()
 
         public FilePickerSaveOptions Options => ((FileSavePickerViewModel)DataContext).Options;
 
+        public FileSavePickerViewModel ViewModel => (FileSavePickerViewModel)DataContext;
+
         private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
-            if (listbox.SelectedItem is SystemStorageFolder folder)
+            if (listbox.SelectedItem is IStorageFolder folder)
             {
-                var model = (FileSavePickerViewModel)this.DataContext;
-                model.CurrentFolder = folder;
-                model.CurrentFolderPath = folder.Path.LocalPath;
+                ViewModel.CurrentFolder = folder;
+                ViewModel.CurrentFolderPath = folder.Path.LocalPath;
             }
-            else if (listbox.SelectedItem is SystemStorageFile file)
+            else if (listbox.SelectedItem is IStorageFile file)
             {
-                var model = (FileSavePickerViewModel)this.DataContext;
-                this.CloseDialog(new IStorageFile[] { file });
+                this.CloseDialog(file);
             }
         }
 
         private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             var model = (FileSavePickerViewModel)this.DataContext;
-            this.CloseDialog(new IStorageFile[] { (IStorageFile)model.SelectedItem });
+            this.CloseDialog(model.SelectedFile);
         }
 
         private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
new file mode 100644
index 00000000..5b3bf957
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -0,0 +1,45 @@
+using System;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FileSavePickerViewModel : PickerViewModelBase<FilePickerSaveOptions>
+    {
+        public FileSavePickerViewModel(FilePickerSaveOptions options)
+            : base(options)
+        {
+
+        }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(SelectedFile))]
+        private IStorageItem _selectedItem;
+
+        public IStorageFile SelectedFile => SelectedItem as IStorageFile;
+
+        [ObservableProperty]
+        private FilePickerFileType _selectedFileType;
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            if (SelectedFileType != null)
+            {
+                if (item is IStorageFolder folder)
+                {
+                    return true;
+                }
+                if (item is IStorageFile file)
+                {
+                    foreach (var pattern in SelectedFileType.Patterns)
+                    {
+                        if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+                            return true;
+                    }
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
deleted file mode 100644
index 33f6e753..00000000
--- a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Platform.Storage;
-using Consolonia.Core.Infrastructure;
-
-namespace Consolonia.Core.Controls
-{
-    public class FolderPickerViewModel : PickerViewModel<FolderPickerOpenOptions>
-    {
-        public FolderPickerViewModel(FolderPickerOpenOptions options)
-            : base(options)
-        {
-        }
-
-        protected override bool FilterItem(IStorageItem item)
-        {
-            return item is IStorageFolder;
-        }
-    }
-
-    public partial class FolderOpenPicker : DialogWindow
-    {
-        public FolderOpenPicker(FolderPickerOpenOptions options)
-        {
-            WindowStartupLocation = WindowStartupLocation.CenterScreen;
-
-            Loaded += (_, _) =>
-            {
-                this.FindControl<Button>("Button")?.Focus();
-            };
-            DataContext = new FolderPickerViewModel(options);
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext).Options;
-
-        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
-        {
-            var listbox = (ListBox)sender;
-            if (listbox.SelectedItem is SystemStorageFolder folder)
-            {
-                var model = (FileSavePickerViewModel)this.DataContext;
-                model.CurrentFolder = folder;
-                model.CurrentFolderPath = folder.Path.LocalPath;
-            }
-            else if (listbox.SelectedItem is SystemStorageFile file)
-            {
-                var model = (FileSavePickerViewModel)this.DataContext;
-                this.CloseDialog(new IStorageFile[] { file });
-            }
-        }
-
-        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-        {
-            var model = (FileSavePickerViewModel)this.DataContext;
-            this.CloseDialog(new IStorageFolder[] { model.SelectedFolder });
-        }
-
-        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-        {
-            this.CloseDialog(null);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml b/src/Consolonia.Core/Controls/FolderPicker.axaml
similarity index 70%
rename from src/Consolonia.Core/Controls/FolderOpenPicker.axaml
rename to src/Consolonia.Core/Controls/FolderPicker.axaml
index 4dd93ab3..b211e4bb 100644
--- a/src/Consolonia.Core/Controls/FolderOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml
@@ -5,15 +5,16 @@
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      x:DataType="controls:FolderPickerViewModel"
-                     x:Class="Consolonia.Core.Controls.FolderOpenPicker"
-                     Icon="📁"
+                     x:Class="Consolonia.Core.Controls.FolderPicker"
+                     Icon="📁"  CancelOnEscape="True"
                      Title="{Binding Options.Title}">
-    <Grid RowDefinitions="Auto * Auto Auto">
+    <Grid RowDefinitions="Auto * Auto">
         <Grid ColumnDefinitions="Auto *">
             <TextBlock Text="📁" Margin="0 0 1 0" />
             <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
         </Grid>
-        <ListBox Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+        <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
+                 SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
                     <Grid ColumnDefinitions="Auto * " Background="Transparent">
@@ -29,13 +30,9 @@
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
-            <TextBlock Text="Folder:" Margin="0 0 1 0"/>
-            <TextBlock Text="{Binding SelectedFolder.Path.LocalPath}"/>
-        </StackPanel>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button Content="OK" Click="OnOK" IsEnabled="{Binding SelectedFolder, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-            <Button Content="Cancel" Click="OnCancel"/>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
+            <Button x:Name="OKButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
+            <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
new file mode 100644
index 00000000..5115b198
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -0,0 +1,83 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Core.Controls
+{
+
+    public partial class FolderPicker : DialogWindow
+    {
+        public FolderPicker(FolderPickerOpenOptions options)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            Loaded += (_, _) =>
+            {
+                this.FindControl<Button>("CancelButton")?.Focus();
+            };
+            DataContext = new FolderPickerViewModel(options);
+            InitializeComponent();
+        }
+
+        public FolderPickerViewModel ViewModel => (FolderPickerViewModel)DataContext;
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext).Options;
+
+        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
+        {
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is SystemStorageFolder folder)
+            {
+                ViewModel.CurrentFolder = folder;
+                ViewModel.CurrentFolderPath = folder.Path.LocalPath;
+                ViewModel.SelectedFolders.Clear();
+                ViewModel.HasSelection = false;
+            }
+        }
+
+        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            this.CloseDialog(ViewModel.SelectedFolders);
+        }
+
+        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            this.CloseDialog(null);
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.SelectionMode == SelectionMode.Single)
+            {
+                if ((e.AddedItems.Count > 0) &&
+                    (e.AddedItems[0] is IStorageFolder folder))
+                {
+                    ViewModel.SelectedFolders.Clear();
+                    ViewModel.SelectedFolders.Add(folder);
+                }
+            }
+            else
+            {
+                foreach (var item in e.AddedItems)
+                {
+                    if (item is IStorageFolder folder)
+                        ViewModel.SelectedFolders.Add(folder);
+                }
+
+                foreach (var item in e.RemovedItems)
+                {
+                    if (item is IStorageFolder folder)
+                        ViewModel.SelectedFolders.Remove(folder);
+                }
+            }
+            ViewModel.HasSelection = ViewModel.SelectedFolders.Count > 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderPickerViewModel.cs b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
new file mode 100644
index 00000000..a3541df3
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
@@ -0,0 +1,30 @@
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FolderPickerViewModel : PickerViewModelBase<FolderPickerOpenOptions>
+    {
+        public FolderPickerViewModel(FolderPickerOpenOptions options)
+            : base(options)
+        {
+            this.SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
+        }
+
+        [ObservableProperty]
+        private ObservableCollection<IStorageFolder> _selectedFolders = new ObservableCollection<IStorageFolder>();
+
+        [ObservableProperty]
+        private SelectionMode _selectionMode;
+
+        [ObservableProperty]
+        private bool _hasSelection;
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            return item is IStorageFolder;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/PickerViewModel.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
similarity index 81%
rename from src/Consolonia.Core/Controls/PickerViewModel.cs
rename to src/Consolonia.Core/Controls/PickerViewModelBase.cs
index 80fccff5..7bf3620b 100644
--- a/src/Consolonia.Core/Controls/PickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -8,10 +8,10 @@
 namespace Consolonia.Core.Controls
 {
 
-    public abstract partial class PickerViewModel<TPickerOptions> : ObservableObject
+    public abstract partial class PickerViewModelBase<TPickerOptions> : ObservableObject
         where TPickerOptions : PickerOptions
     {
-        protected PickerViewModel(TPickerOptions options)
+        protected PickerViewModelBase(TPickerOptions options)
         {
             Options = options;
             CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath;
@@ -33,14 +33,6 @@ protected PickerViewModel(TPickerOptions options)
         [ObservableProperty]
         private ObservableCollection<IStorageItem> _items = new ObservableCollection<IStorageItem>();
 
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(SelectedFile))]
-        [NotifyPropertyChangedFor(nameof(SelectedFolder))]
-        private IStorageItem _selectedItem;
-
-        public IStorageFile SelectedFile => SelectedItem as IStorageFile;
-
-        public IStorageFolder SelectedFolder => SelectedItem as IStorageFolder;
 
         private async void PickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index 92758248..b0728c3e 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -28,7 +28,7 @@ public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpe
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
 
             var picker = new FileOpenPicker(options);
-            var results = await picker.ShowDialogAsync<IStorageFile[]>(mainWindow);
+            var results = await picker.ShowDialogAsync<IReadOnlyList<IStorageFile>>(mainWindow);
             return results;
         }
 
@@ -41,8 +41,8 @@ public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPic
         {
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
 
-            var picker = new FolderOpenPicker(options);
-            var results = await picker.ShowDialogAsync<IStorageFolder[]>(mainWindow);
+            var picker = new FolderPicker(options);
+            var results = await picker.ShowDialogAsync<IReadOnlyList<IStorageFolder>>(mainWindow);
             return results;
         }
 
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
index c71cf7b4..c84c0750 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
@@ -8,30 +8,47 @@
              x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryStorage">
 
     <StackPanel Orientation="Vertical">
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-            <Button Click="OnOpenFile" Background="Gray">Open File Dialog</Button>
-            <Button Click="OnOpenFolder" Background="Gray">Open Folder Dialog</Button>
-            <Button Click="OnSaveFile" Background="Gray">Save File Dialog</Button>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <TextBlock>Files:</TextBlock>
-            <ItemsControl ItemsSource="{Binding Files}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <TextBlock>Folders:</TextBlock>
-            <ItemsControl ItemsSource="{Binding Folders}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </StackPanel>
+        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnOpenFile" >Open File Dialog</Button>
+            <Button Click="OnOpenMultipleFiles" >Open Multiple File Dialog</Button>
+        </WrapPanel>
+        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnSaveFile" >Save File Dialog</Button>
+        </WrapPanel>
+        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnOpenFolder" >Select Folder Dialog</Button>
+            <Button Click="OnOpenMultipleFolders" >Select Multiple Folder Dialog</Button>
+        </WrapPanel>
+        <Border BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderBrush}" >
+            <StackPanel Orientation="Vertical" >
+                <TextBlock TextDecorations="Underline" Margin="0 -1 0 0">Files</TextBlock>
+                <ItemsControl ItemsSource="{Binding Files}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="📰 "/>
+                                <TextBlock Text="{Binding Name}"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderBrush}" >
+
+            <StackPanel Orientation="Vertical" >
+                <TextBlock TextDecorations="Underline" Margin="0 -1 0 0">Folders</TextBlock>
+                <ItemsControl ItemsSource="{Binding Folders}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="📁 "/>
+                                <TextBlock Text="{Binding Name}"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 120d5dcc..74c6fa7f 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
@@ -26,6 +27,8 @@ public GalleryStorage()
             InitializeComponent();
         }
 
+        public GalleryStorageViewModel ViewModel => (GalleryStorageViewModel)DataContext;
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
@@ -33,6 +36,15 @@ private void InitializeComponent()
         }
 
         private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFiles("Open file", allowMultiple: false);
+        }
+        private async void OnOpenMultipleFiles(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFiles("Open files", allowMultiple: true);
+        }
+
+        private async Task OpenFiles(string title, bool allowMultiple)
         {
             IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
             if (lifetime != null)
@@ -42,7 +54,8 @@ private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventA
                 {
                     var files = await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
                     {
-                        Title = "Open File",
+                        Title = title,
+                        AllowMultiple = allowMultiple,
                         SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
                         FileTypeFilter = new List<FilePickerFileType>()
                         {
@@ -65,13 +78,22 @@ private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventA
                         },
                     });
 
-                    var model = (GalleryStorageViewModel)this.DataContext;
-                    model.Files = files;
+                    ViewModel.Files = files;
                 }
             }
         }
 
         private async void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFolders(title: "Selecct a folder", allowMultiple: false);
+        }
+
+        private async void OnOpenMultipleFolders(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFolders(title: "Select folder(s)", allowMultiple: true);
+        }
+
+        private async Task OpenFolders(string title, bool allowMultiple)
         {
             IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
             if (lifetime != null)
@@ -81,14 +103,15 @@ private async void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEven
                 {
                     var folders = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
                     {
-                        Title = "Select a folder",
-                        AllowMultiple = false
+                        Title = title,
+                        SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
+                        AllowMultiple = allowMultiple
                     });
-                    var model = (GalleryStorageViewModel)this.DataContext;
-                    model.Folders = folders;
+                    ViewModel.Folders = folders;
                 }
             }
         }
+
         private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
@@ -116,11 +139,10 @@ private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventA
                         },
                     });
 
-                    var model = (GalleryStorageViewModel)this.DataContext;
-                    model.Files = new List<IStorageFile>() { file };
+                    ViewModel.Files = new List<IStorageFile>() { file };
                 }
             }
         }
     }
-  
+
 }
\ No newline at end of file

From bd1821ef4234febe9b5f7887ef2021f38248b064 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 16:29:08 -0600
Subject: [PATCH 16/64] update storagefile and storage folder display
 attributes

---
 src/Consolonia.Core/Infrastructure/SystemStorageFile.cs   | 2 ++
 src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index e91bbcd2..c3bb2b02 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Infrastructure
 {
+    [DebuggerDisplay("{Name}")]
     public sealed class SystemStorageFile : IStorageFile
     {
         private FileInfo _fileInfo;
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index f963d42f..801755fa 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Infrastructure
 {
-    [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+    [DebuggerDisplay("{Name}")]
     public sealed class SystemStorageFolder : IStorageFolder
     {
         private DirectoryInfo _directoryInfo;
@@ -106,10 +107,5 @@ public Task<string> SaveBookmarkAsync()
         {
             throw new NotImplementedException();
         }
-
-        private string GetDebuggerDisplay()
-        {
-            return _directoryInfo.FullName;
-        }
     }
 }

From d256979580d2ef94496efbc252756d7e361db22a Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 16:30:00 -0600
Subject: [PATCH 17/64] update display attributes

---
 src/Consolonia.Core/Infrastructure/SystemStorageFile.cs   | 2 +-
 src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index c3bb2b02..ae9ea54a 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -6,7 +6,7 @@
 
 namespace Consolonia.Core.Infrastructure
 {
-    [DebuggerDisplay("{Name}")]
+    [DebuggerDisplay("File: {Name}")]
     public sealed class SystemStorageFile : IStorageFile
     {
         private FileInfo _fileInfo;
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index 801755fa..e9040b37 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -8,7 +8,7 @@
 
 namespace Consolonia.Core.Infrastructure
 {
-    [DebuggerDisplay("{Name}")]
+    [DebuggerDisplay("Folder: {Name}")]
     public sealed class SystemStorageFolder : IStorageFolder
     {
         private DirectoryInfo _directoryInfo;

From 8d8bacba7313cd4a94ddfdca8541717f3b7498b4 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 17:43:21 -0600
Subject: [PATCH 18/64] add unit tests for storage

---
 .../Controls/PickerViewModelBase.cs           |   3 +
 .../Infrastructure/SystemStorageFile.cs       |   5 +-
 .../Infrastructure/SystemStorageFolder.cs     |   7 +-
 .../Consolonia.Core.Tests/StorageTests.cs     | 153 ++++++++++++++++++
 4 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 src/Tests/Consolonia.Core.Tests/StorageTests.cs

diff --git a/src/Consolonia.Core/Controls/PickerViewModelBase.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
index 7bf3620b..69116422 100644
--- a/src/Consolonia.Core/Controls/PickerViewModelBase.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -60,6 +60,9 @@ private async Task LoadCurrentFolder()
             Items.Clear();
             if (CurrentFolder != null)
             {
+
+                this.Items.Add(new SystemStorageFolder(new DirectoryInfo(Path.Combine(CurrentFolder.Path.LocalPath, "..")), true));
+
                 await foreach (var item in CurrentFolder.GetItemsAsync())
                 {
                     if (this.FilterItem(item))
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index ae9ea54a..142d8fbf 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -58,8 +58,9 @@ public Task<IStorageFolder> GetParentAsync()
         public Task<IStorageItem> MoveAsync(IStorageFolder destination)
         {
             var path = destination.Path.LocalPath;
-            _fileInfo.MoveTo(path);
-            return Task.FromResult((IStorageItem)this);
+            var targetPath = System.IO.Path.Combine(path, _fileInfo.Name);
+            _fileInfo.MoveTo(targetPath);
+            return Task.FromResult((IStorageItem)new SystemStorageFile(targetPath));
         }
 
         public async Task<Stream> OpenReadAsync()
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index e9040b37..e9868c65 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -75,8 +75,6 @@ public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
 
             if (_directoryInfo.Exists)
             {
-                yield return new SystemStorageFolder(_directoryInfo.Parent, isParent: true);
-
                 foreach (var folder in _directoryInfo.GetDirectories())
                 {
                     yield return new SystemStorageFolder(folder);
@@ -99,8 +97,9 @@ public Task<IStorageFolder> GetParentAsync()
 
         public Task<IStorageItem> MoveAsync(IStorageFolder destination)
         {
-            _directoryInfo.MoveTo(destination.Path.LocalPath);
-            return Task.FromResult((IStorageItem)new SystemStorageFolder(new DirectoryInfo(destination.Path.LocalPath)));
+            var targetPath = System.IO.Path.Combine(destination.Path.LocalPath, _directoryInfo.Name);
+            _directoryInfo.MoveTo(targetPath);
+            return Task.FromResult((IStorageItem)new SystemStorageFolder(targetPath));
         }
 
         public Task<string> SaveBookmarkAsync()
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
new file mode 100644
index 00000000..f60cc5d6
--- /dev/null
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -0,0 +1,153 @@
+#pragma warning disable CA2007 // Consider calling ConfigureAwait on the awaited task
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Infrastructure;
+using NUnit.Framework;
+
+namespace Consolonia.Core.Tests
+{
+    [TestFixture]
+    public class StorageTests
+    {
+
+        [Test]
+        public void DefaultAttributes()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            Assert.True(storageProvider.CanOpen);
+            Assert.True(storageProvider.CanSave);
+            Assert.True(storageProvider.CanPickFolder);
+        }
+
+        [Test]
+        public async Task TestFileSemantics()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            var tempFile = Path.GetTempFileName();
+            var file = await storageProvider.TryGetFileFromPathAsync(new Uri($"file://{tempFile}"));
+            Assert.IsNotNull(file);
+            Assert.AreEqual(tempFile, file.Path.LocalPath);
+
+            using (var stream = await file.OpenWriteAsync())
+            {
+                using (var streamWriter = new StreamWriter(stream))
+                {
+                    streamWriter.Write("Hello world");
+                }
+            }
+            Assert.True(File.Exists(tempFile));
+            Assert.True(File.Exists(file.Path.LocalPath));
+            var props = await file.GetBasicPropertiesAsync();
+            Assert.AreEqual((DateTimeOffset)File.GetCreationTime(tempFile), props.DateCreated);
+            Assert.AreEqual((DateTimeOffset)File.GetLastWriteTime(tempFile), props.DateModified);
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
+
+            using (var stream = await file.OpenReadAsync())
+            {
+                using (var streamReader = new StreamReader(stream))
+                {
+                    var text = await streamReader.ReadToEndAsync();
+                    Assert.AreEqual("Hello world", text);
+                }
+            }
+
+            props = await file.GetBasicPropertiesAsync();
+            Assert.AreEqual((DateTimeOffset)File.GetCreationTime(tempFile), props.DateCreated);
+            Assert.AreEqual((DateTimeOffset)File.GetLastWriteTime(tempFile), props.DateModified);
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
+
+            var parentFolder = await file.GetParentAsync();
+            Assert.IsNotNull(parentFolder);
+            Assert.AreEqual(Path.GetDirectoryName(tempFile), parentFolder.Path.LocalPath);
+
+            var subPath = Path.Combine(Path.GetDirectoryName(tempFile), nameof(TestFileSemantics));
+            if (Directory.Exists(subPath))
+                Directory.Delete(subPath);
+
+            var subFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{subPath}"));
+            Assert.IsNull(subFolder);
+
+            subFolder = await parentFolder.CreateFolderAsync(nameof(TestFileSemantics));
+            Assert.IsNotNull(subFolder);
+            Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
+
+            var newFile = await file.MoveAsync(subFolder);
+            Assert.True(File.Exists(newFile.Path.LocalPath));
+            Assert.False(File.Exists(tempFile));
+            Assert.AreEqual(new Uri($"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"), newFile.Path);
+            await newFile.DeleteAsync();
+            Assert.False(File.Exists(newFile.Path.LocalPath));
+
+            await subFolder.DeleteAsync();
+            Assert.IsFalse(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
+        }
+
+        [Test]
+        public async Task TestWellKnownFolder()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            var folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Documents);
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Music);
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Videos);
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), folder.Path.LocalPath);
+        }
+
+
+        [Test]
+        public async Task TestFolderSemantics()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            var tempPath = Environment.GetEnvironmentVariable("TEMP"); 
+            var tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
+            var testPath = Path.Combine(Environment.GetEnvironmentVariable("TEMP"), nameof(TestFolderSemantics));
+            var testFolder  = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
+
+            Assert.IsNotNull(testFolder);
+            Assert.AreEqual(testPath, testFolder.Path.LocalPath);
+            Assert.IsFalse(testFolder.CanBookmark);
+            Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
+            var file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
+            Assert.IsTrue(File.Exists(file.Path.LocalPath));
+
+            var props = await testFolder.GetBasicPropertiesAsync();
+            Assert.AreEqual((DateTimeOffset)Directory.GetCreationTime(testPath), props.DateCreated);
+            Assert.AreEqual((DateTimeOffset)Directory.GetLastWriteTime(testPath), props.DateModified);
+
+            await file.DeleteAsync();
+            Assert.IsFalse(File.Exists(file.Path.LocalPath));
+
+            var subFolder = await testFolder.CreateFolderAsync("sub");
+            Assert.IsTrue(Directory.Exists(subFolder.Path.LocalPath));
+
+            file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
+            Assert.IsTrue(File.Exists(file.Path.LocalPath));
+
+            await foreach (var item in subFolder.GetItemsAsync())
+            {
+                Assert.AreEqual(file.Path.LocalPath, item.Path.LocalPath);
+            }
+            await file.DeleteAsync();
+
+            await subFolder.DeleteAsync();
+            Assert.IsFalse(Directory.Exists(subFolder.Path.LocalPath));
+
+            await testFolder.DeleteAsync();
+            Assert.IsFalse(Directory.Exists(testPath));
+        }
+    }
+}
\ No newline at end of file

From 4ab158372ac2ea9be1f18617bb9354f4f4f8e986 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 21:17:39 -0600
Subject: [PATCH 19/64] cleanup sample

---
 .../GalleryViews/GalleryStorage.axaml.cs      | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 74c6fa7f..38d1ae09 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -59,22 +59,10 @@ private async Task OpenFiles(string title, bool allowMultiple)
                         SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
                         FileTypeFilter = new List<FilePickerFileType>()
                         {
-                             new FilePickerFileType("All files")
-                             {
-                                 Patterns = new List<string>() { "*" }
-                             },
-                             new FilePickerFileType("Text")
-                             {
-                                 Patterns = new List<string>() { "*.txt" }
-                             },
-                             new FilePickerFileType("Comma Delimited Files")
-                             {
-                                 Patterns = new List<string>() { "*.csv" }
-                             },
-                             new FilePickerFileType("PDF")
-                             {
-                                 Patterns = new List<string>() { "*.pdf" }
-                             }
+                             new FilePickerFileType("All files") { Patterns = new[] { "*" } },
+                             new FilePickerFileType("Text") { Patterns = new[] { "*.txt" } },
+                             new FilePickerFileType("Comma Delimited Files") { Patterns = new[] { "*.csv" } },
+                             new FilePickerFileType("PDF") { Patterns = new[] { "*.pdf" } }
                         },
                     });
 
@@ -128,14 +116,9 @@ private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventA
                         SuggestedFileName = "NewFile.txt",
                         FileTypeChoices = new List<FilePickerFileType>()
                         {
-                             new FilePickerFileType("Text")
-                             {
-                                 Patterns = new List<string>() { "*.txt" }
-                             },
-                             new FilePickerFileType("Comma delimited values")
-                             {
-                                 Patterns = new List<string>() { "*.csv" }
-                             },
+                             new FilePickerFileType("Text") { Patterns = new[] { "*.txt" } },
+                             new FilePickerFileType("Comma Delimited Files") { Patterns = new[] { "*.csv" } },
+                             new FilePickerFileType("PDF") { Patterns = new[] { "*.pdf" } }
                         },
                     });
 

From 7c3f6e1cf123c92cfa67b82ef93f404c877e20b1 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 21:48:18 -0600
Subject: [PATCH 20/64] lint pass

---
 .../Controls/FileOpenPicker.axaml             |  6 ++---
 .../Controls/FileOpenPickerViewModel.cs       |  5 ++--
 .../Controls/FileSavePickerViewModel.cs       | 23 ++++++++-----------
 .../Controls/FolderPicker.axaml               |  2 +-
 .../Controls/FolderPicker.axaml.cs            |  1 -
 .../Controls/PickerViewModelBase.cs           | 16 ++++++-------
 .../Infrastructure/Extensions.cs              | 12 ----------
 .../Infrastructure/SystemStorageFolder.cs     |  2 +-
 .../Consolonia.Core.Tests/StorageTests.cs     |  6 ++---
 9 files changed, 27 insertions(+), 46 deletions(-)
 delete mode 100644 src/Consolonia.Core/Infrastructure/Extensions.cs

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index dff70e1b..4718f47f 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -17,12 +17,12 @@
                  SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
-                    <Grid ColumnDefinitions="Auto * " Background="Transparent">
+                    <Grid ColumnDefinitions="Auto * " Background="Transparent"  x:DataType="storage:IStorageFolder">
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}"/>
                     </Grid>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                <DataTemplate DataType="{x:Type storage:IStorageFile}"  x:DataType="storage:IStorageFile">
                     <Grid ColumnDefinitions="Auto *"  Background="Transparent">
                         <TextBlock Text="📰" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}" />
@@ -38,7 +38,7 @@
             </ComboBox.ItemTemplate>
         </ComboBox>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button x:Name="OKButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
+            <Button x:Name="OkButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
             <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
diff --git a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
index a28479a2..5c9fca14 100644
--- a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -31,7 +29,7 @@ public FileOpenPickerViewModel(FilePickerOpenOptions options)
 
         protected override bool FilterItem(IStorageItem item)
         {
-            if (!Options.FileTypeFilter.Any())
+            if (Options.FileTypeFilter.Count == 0)
                 return true;
 
             if (item is IStorageFile file)
@@ -44,6 +42,7 @@ protected override bool FilterItem(IStorageItem item)
                 }
                 return false;
             }
+            // show folders
             return true;
         }
 
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 5b3bf957..30ff8dde 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -23,21 +23,18 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
 
         protected override bool FilterItem(IStorageItem item)
         {
-            if (SelectedFileType != null)
+            if (item is IStorageFolder)
             {
-                if (item is IStorageFolder folder)
-                {
-                    return true;
-                }
-                if (item is IStorageFile file)
+                return true;
+            }
+            if (item is IStorageFile file)
+            {
+                foreach (var pattern in SelectedFileType.Patterns)
                 {
-                    foreach (var pattern in SelectedFileType.Patterns)
-                    {
-                        if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
-                            return true;
-                    }
-                    return false;
+                    if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+                        return true;
                 }
+                return false;
             }
             return true;
         }
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml b/src/Consolonia.Core/Controls/FolderPicker.axaml
index b211e4bb..da1dcc88 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml
@@ -31,7 +31,7 @@
             </ListBox.DataTemplates>
         </ListBox>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button x:Name="OKButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
+            <Button x:Name="OkButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
             <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
         </StackPanel>
     </Grid>
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index 5115b198..beb0a10e 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -1,4 +1,3 @@
-using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
diff --git a/src/Consolonia.Core/Controls/PickerViewModelBase.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
index 69116422..2691d78f 100644
--- a/src/Consolonia.Core/Controls/PickerViewModelBase.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Threading.Tasks;
@@ -14,7 +15,7 @@ public abstract partial class PickerViewModelBase<TPickerOptions> : ObservableOb
         protected PickerViewModelBase(TPickerOptions options)
         {
             Options = options;
-            CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath;
+            CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath ?? Environment.CurrentDirectory;
             CurrentFolder = options.SuggestedStartLocation;
             _ = LoadCurrentFolder();
             PropertyChanged += PickerViewModel_PropertyChanged;
@@ -58,16 +59,13 @@ private async void PickerViewModel_PropertyChanged(object sender, System.Compone
         private async Task LoadCurrentFolder()
         {
             Items.Clear();
-            if (CurrentFolder != null)
-            {
 
-                this.Items.Add(new SystemStorageFolder(new DirectoryInfo(Path.Combine(CurrentFolder.Path.LocalPath, "..")), true));
+            this.Items.Add(new SystemStorageFolder(new DirectoryInfo(Path.Combine(CurrentFolder.Path.LocalPath, "..")), true));
 
-                await foreach (var item in CurrentFolder.GetItemsAsync())
-                {
-                    if (this.FilterItem(item))
-                        this.Items.Add(item);
-                }
+            await foreach (var item in CurrentFolder.GetItemsAsync())
+            {
+                if (this.FilterItem(item))
+                    this.Items.Add(item);
             }
         }
 
diff --git a/src/Consolonia.Core/Infrastructure/Extensions.cs b/src/Consolonia.Core/Infrastructure/Extensions.cs
deleted file mode 100644
index 8bfb4158..00000000
--- a/src/Consolonia.Core/Infrastructure/Extensions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Consolonia.Core.Infrastructure
-{
-    public static class Extensions
-    {
-    }
-}
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index e9868c65..2286f96a 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 
@@ -43,6 +42,7 @@ public async Task<IStorageFile> CreateFileAsync(string name)
             var path = System.IO.Path.Combine(_directoryInfo.FullName, name);
             using (var stream = File.Create(path))
             {
+                await stream.WriteAsync(Array.Empty<byte>().AsMemory(0, 0));    
             }
             return new SystemStorageFile(path);
         }
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index f60cc5d6..0349d4dc 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -34,7 +34,7 @@ public async Task TestFileSemantics()
             {
                 using (var streamWriter = new StreamWriter(stream))
                 {
-                    streamWriter.Write("Hello world");
+                    await streamWriter.WriteAsync("Hello world");
                 }
             }
             Assert.True(File.Exists(tempFile));
@@ -62,7 +62,7 @@ public async Task TestFileSemantics()
             Assert.IsNotNull(parentFolder);
             Assert.AreEqual(Path.GetDirectoryName(tempFile), parentFolder.Path.LocalPath);
 
-            var subPath = Path.Combine(Path.GetDirectoryName(tempFile), nameof(TestFileSemantics));
+            var subPath = Path.Combine(Path.GetDirectoryName(tempFile)!, nameof(TestFileSemantics));
             if (Directory.Exists(subPath))
                 Directory.Delete(subPath);
 
@@ -114,7 +114,7 @@ public async Task TestFolderSemantics()
             var storageProvider = new ConsoloniaStorageProvider();
             var tempPath = Environment.GetEnvironmentVariable("TEMP"); 
             var tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
-            var testPath = Path.Combine(Environment.GetEnvironmentVariable("TEMP"), nameof(TestFolderSemantics));
+            var testPath = Path.Combine(Environment.GetEnvironmentVariable("TEMP")!, nameof(TestFolderSemantics))!;
             var testFolder  = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
 
             Assert.IsNotNull(testFolder);

From 3672beb9c3775e3e3c82cd51eac679ebf99dd351 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 21:54:40 -0600
Subject: [PATCH 21/64] remove TEMP dependency

---
 src/Tests/Consolonia.Core.Tests/StorageTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 0349d4dc..76c031c0 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -112,9 +112,9 @@ public async Task TestWellKnownFolder()
         public async Task TestFolderSemantics()
         {
             var storageProvider = new ConsoloniaStorageProvider();
-            var tempPath = Environment.GetEnvironmentVariable("TEMP"); 
+            var tempPath = Path.GetTempPath(); 
             var tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
-            var testPath = Path.Combine(Environment.GetEnvironmentVariable("TEMP")!, nameof(TestFolderSemantics))!;
+            var testPath = Path.Combine(tempPath, nameof(TestFolderSemantics))!;
             var testFolder  = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
 
             Assert.IsNotNull(testFolder);

From 2024c0ee31193986c0661dfe6a44cacae0571c81 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConenll <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 22:25:32 -0600
Subject: [PATCH 22/64] fix unit tests

---
 .../ConsoloniaStorageProvider.cs              |  2 +-
 .../Consolonia.Core.Tests/StorageTests.cs     | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index b0728c3e..6a216438 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -81,7 +81,7 @@ public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnown
                 WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),
                 _ => null
             };
-            if (dir == null)
+            if (String.IsNullOrEmpty(dir))
                 return Task.FromResult<IStorageFolder>(null);
             return Task.FromResult<IStorageFolder>(new SystemStorageFolder(dir));
         }
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 0349d4dc..37e3f85b 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -89,22 +89,28 @@ public async Task TestWellKnownFolder()
         {
             var storageProvider = new ConsoloniaStorageProvider();
             var folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
-            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), folder.Path.LocalPath);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Documents);
-            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), folder.Path.LocalPath);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Music);
-            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), folder.Path.LocalPath);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Videos);
-            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), folder.Path.LocalPath);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
-            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), folder.Path.LocalPath);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);
-            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), folder.Path.LocalPath);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), folder.Path.LocalPath);
         }
 
 
@@ -112,10 +118,10 @@ public async Task TestWellKnownFolder()
         public async Task TestFolderSemantics()
         {
             var storageProvider = new ConsoloniaStorageProvider();
-            var tempPath = Environment.GetEnvironmentVariable("TEMP"); 
+            var tempPath = Path.GetTempPath();
             var tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
-            var testPath = Path.Combine(Environment.GetEnvironmentVariable("TEMP")!, nameof(TestFolderSemantics))!;
-            var testFolder  = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
+            var testPath = Path.Combine(tempPath, nameof(TestFolderSemantics))!;
+            var testFolder = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
 
             Assert.IsNotNull(testFolder);
             Assert.AreEqual(testPath, testFolder.Path.LocalPath);
@@ -126,7 +132,7 @@ public async Task TestFolderSemantics()
 
             var props = await testFolder.GetBasicPropertiesAsync();
             Assert.AreEqual((DateTimeOffset)Directory.GetCreationTime(testPath), props.DateCreated);
-            Assert.AreEqual((DateTimeOffset)Directory.GetLastWriteTime(testPath), props.DateModified);
+            Assert.AreEqual(((DateTimeOffset)Directory.GetLastWriteTime(testPath)).ToString(), props.DateModified.ToString());
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path.LocalPath));

From 3e1d8b049de6e90a29fdae11872c2289c7903762 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConenll <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 22:35:53 -0600
Subject: [PATCH 23/64] change compairon to work on unix

---
 src/Tests/Consolonia.Core.Tests/StorageTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 37e3f85b..da925a08 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -131,8 +131,8 @@ public async Task TestFolderSemantics()
             Assert.IsTrue(File.Exists(file.Path.LocalPath));
 
             var props = await testFolder.GetBasicPropertiesAsync();
-            Assert.AreEqual((DateTimeOffset)Directory.GetCreationTime(testPath), props.DateCreated);
-            Assert.AreEqual(((DateTimeOffset)Directory.GetLastWriteTime(testPath)).ToString(), props.DateModified.ToString());
+            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated.Value.DateTime);
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified.Value.DateTime);
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path.LocalPath));

From b2c61971c2464a9b6c2a48bcaa2e2dbb4b5eb5e2 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 22:53:05 -0600
Subject: [PATCH 24/64] more lint

---
 .../Controls/FileOpenPicker.axaml.cs          |  6 +++---
 .../Controls/FileOpenPickerViewModel.cs       |  5 ++++-
 .../Controls/FileSavePicker.axaml.cs          | 10 +++++-----
 .../Controls/FileSavePickerViewModel.cs       |  4 ++++
 .../Controls/FolderPicker.axaml.cs            |  4 ++--
 .../Controls/PickerViewModelBase.cs           |  2 +-
 .../ConsoloniaStorageProvider.cs              |  3 +++
 .../Consolonia.Core.Tests/StorageTests.cs     | 20 +++++++++----------
 8 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index 7b3240ad..eb618b11 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -37,18 +37,18 @@ private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
             }
             else if (listbox.SelectedItem is IStorageFile file)
             {
-                this.CloseDialog(new IStorageFile[] { file });
+                CloseDialog(new [] { file });
             }
         }
 
         private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.CloseDialog(ViewModel.SelectedFiles);
+            CloseDialog(ViewModel.SelectedFiles);
         }
 
         private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.CloseDialog(null);
+            CloseDialog();
         }
 
         private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
index 5c9fca14..9039697a 100644
--- a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
@@ -29,12 +29,15 @@ public FileOpenPickerViewModel(FilePickerOpenOptions options)
 
         protected override bool FilterItem(IStorageItem item)
         {
-            if (Options.FileTypeFilter.Count == 0)
+            if (Options.FileTypeFilter == null || Options.FileTypeFilter.Count == 0)
                 return true;
 
             if (item is IStorageFile file)
             {
                 var selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
+                if (selectedFileType.Patterns == null)
+                    return true;
+
                 foreach (var pattern in selectedFileType.Patterns)
                 {
                     if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index c0143f5a..014666c9 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
@@ -23,7 +24,7 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
-        public FilePickerSaveOptions Options => ((FileSavePickerViewModel)DataContext).Options;
+        public FilePickerSaveOptions Options => ((FileSavePickerViewModel)DataContext)?.Options ?? throw new ArgumentNullException();
 
         public FileSavePickerViewModel ViewModel => (FileSavePickerViewModel)DataContext;
 
@@ -37,19 +38,18 @@ private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
             }
             else if (listbox.SelectedItem is IStorageFile file)
             {
-                this.CloseDialog(file);
+                CloseDialog(file);
             }
         }
 
         private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            var model = (FileSavePickerViewModel)this.DataContext;
-            this.CloseDialog(model.SelectedFile);
+            CloseDialog(ViewModel.SelectedFile);
         }
 
         private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.CloseDialog(null);
+            CloseDialog();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 30ff8dde..8ff013ea 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -29,6 +30,9 @@ protected override bool FilterItem(IStorageItem item)
             }
             if (item is IStorageFile file)
             {
+                if (SelectedFileType.Patterns == null || SelectedFileType.Patterns.Count == 0)
+                    return true;
+
                 foreach (var pattern in SelectedFileType.Patterns)
                 {
                     if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index beb0a10e..4fbf7570 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -43,12 +43,12 @@ private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
 
         private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.CloseDialog(ViewModel.SelectedFolders);
+            CloseDialog(ViewModel.SelectedFolders);
         }
 
         private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.CloseDialog(null);
+            CloseDialog();
         }
 
         private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/src/Consolonia.Core/Controls/PickerViewModelBase.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
index 2691d78f..fdc53150 100644
--- a/src/Consolonia.Core/Controls/PickerViewModelBase.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -16,7 +16,7 @@ protected PickerViewModelBase(TPickerOptions options)
         {
             Options = options;
             CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath ?? Environment.CurrentDirectory;
-            CurrentFolder = options.SuggestedStartLocation;
+            CurrentFolder = options.SuggestedStartLocation ?? new SystemStorageFolder(Environment.CurrentDirectory);
             _ = LoadCurrentFolder();
             PropertyChanged += PickerViewModel_PropertyChanged;
         }
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index 6a216438..f7531d96 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -26,6 +26,7 @@ public Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
         public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
         {
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+            ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FileOpenPicker(options);
             var results = await picker.ShowDialogAsync<IReadOnlyList<IStorageFile>>(mainWindow);
@@ -40,6 +41,7 @@ public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
         public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
         {
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+            ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FolderPicker(options);
             var results = await picker.ShowDialogAsync<IReadOnlyList<IStorageFolder>>(mainWindow);
@@ -49,6 +51,7 @@ public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPic
         public async Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
         {
             var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+            ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FileSavePicker(options);
             var results = await picker.ShowDialogAsync<IStorageFile>(mainWindow);
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 37e3f85b..13769f82 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -40,8 +40,8 @@ public async Task TestFileSemantics()
             Assert.True(File.Exists(tempFile));
             Assert.True(File.Exists(file.Path.LocalPath));
             var props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual((DateTimeOffset)File.GetCreationTime(tempFile), props.DateCreated);
-            Assert.AreEqual((DateTimeOffset)File.GetLastWriteTime(tempFile), props.DateModified);
+            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated.Value.DateTime);
+            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified.Value.DateTime);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
 
             using (var stream = await file.OpenReadAsync())
@@ -54,8 +54,8 @@ public async Task TestFileSemantics()
             }
 
             props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual((DateTimeOffset)File.GetCreationTime(tempFile), props.DateCreated);
-            Assert.AreEqual((DateTimeOffset)File.GetLastWriteTime(tempFile), props.DateModified);
+            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated.Value.DateTime);
+            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified.Value.DateTime);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
 
             var parentFolder = await file.GetParentAsync();
@@ -74,7 +74,7 @@ public async Task TestFileSemantics()
             Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
 
             var newFile = await file.MoveAsync(subFolder);
-            Assert.True(File.Exists(newFile.Path.LocalPath));
+            Assert.True(File.Exists(newFile.Path?.LocalPath!));
             Assert.False(File.Exists(tempFile));
             Assert.AreEqual(new Uri($"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"), newFile.Path);
             await newFile.DeleteAsync();
@@ -128,20 +128,20 @@ public async Task TestFolderSemantics()
             Assert.IsFalse(testFolder.CanBookmark);
             Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
             var file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path.LocalPath));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath!));
 
             var props = await testFolder.GetBasicPropertiesAsync();
-            Assert.AreEqual((DateTimeOffset)Directory.GetCreationTime(testPath), props.DateCreated);
-            Assert.AreEqual(((DateTimeOffset)Directory.GetLastWriteTime(testPath)).ToString(), props.DateModified.ToString());
+            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated.Value.DateTime);
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified.Value.DateTime);
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path.LocalPath));
 
             var subFolder = await testFolder.CreateFolderAsync("sub");
-            Assert.IsTrue(Directory.Exists(subFolder.Path.LocalPath));
+            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath!));
 
             file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path.LocalPath));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath!));
 
             await foreach (var item in subFolder.GetItemsAsync())
             {

From 2015d1719fe15613321369f0c5a53234812973f4 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 23:14:07 -0600
Subject: [PATCH 25/64] linnnnnnnnt

---
 .../Controls/FileSavePickerViewModel.cs       |  1 -
 .../Controls/FolderPicker.axaml.cs            |  2 +-
 .../ConsoloniaStorageProvider.cs              |  6 ++---
 .../Consolonia.Core.Tests/StorageTests.cs     | 22 +++++++++----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 8ff013ea..9a622a2b 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index 4fbf7570..b52f3293 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -27,7 +27,7 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
-        public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext).Options;
+        public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext)?.Options ?? new FolderPickerOpenOptions();
 
         private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
         {
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index f7531d96..da436486 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -25,7 +25,7 @@ public Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
 
         public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
         {
-            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)?.MainWindow;
             ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FileOpenPicker(options);
@@ -40,7 +40,7 @@ public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
 
         public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
         {
-            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)?.MainWindow;
             ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FolderPicker(options);
@@ -50,7 +50,7 @@ public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPic
 
         public async Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
         {
-            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime).MainWindow;
+            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)?.MainWindow;
             ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FileSavePicker(options);
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 13769f82..c715a932 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -40,8 +40,8 @@ public async Task TestFileSemantics()
             Assert.True(File.Exists(tempFile));
             Assert.True(File.Exists(file.Path.LocalPath));
             var props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated.Value.DateTime);
-            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified.Value.DateTime);
+            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime ?? DateTime.MinValue);
+            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime ?? DateTime.MinValue);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
 
             using (var stream = await file.OpenReadAsync())
@@ -54,8 +54,8 @@ public async Task TestFileSemantics()
             }
 
             props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated.Value.DateTime);
-            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified.Value.DateTime);
+            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime ?? DateTime.MinValue);
+            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime ?? DateTime.MinValue);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
 
             var parentFolder = await file.GetParentAsync();
@@ -74,7 +74,7 @@ public async Task TestFileSemantics()
             Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
 
             var newFile = await file.MoveAsync(subFolder);
-            Assert.True(File.Exists(newFile.Path?.LocalPath!));
+            Assert.True(File.Exists(newFile.Path?.LocalPath));
             Assert.False(File.Exists(tempFile));
             Assert.AreEqual(new Uri($"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"), newFile.Path);
             await newFile.DeleteAsync();
@@ -128,20 +128,20 @@ public async Task TestFolderSemantics()
             Assert.IsFalse(testFolder.CanBookmark);
             Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
             var file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path?.LocalPath!));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
             var props = await testFolder.GetBasicPropertiesAsync();
-            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated.Value.DateTime);
-            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified.Value.DateTime);
+            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated?.DateTime ?? DateTime.MinValue);
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified?.DateTime ?? DateTime.MinValue);
 
             await file.DeleteAsync();
-            Assert.IsFalse(File.Exists(file.Path.LocalPath));
+            Assert.IsFalse(File.Exists(file.Path?.LocalPath));
 
             var subFolder = await testFolder.CreateFolderAsync("sub");
-            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath!));
+            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath));
 
             file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path?.LocalPath!));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
             await foreach (var item in subFolder.GetItemsAsync())
             {

From a06a94aa032c735b0afb435088cd16d5866f6f2d Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 23:27:19 -0600
Subject: [PATCH 26/64] lintlint

---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml |  6 +++---
 src/Tests/Consolonia.Core.Tests/StorageTests.cs   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 4718f47f..0e884ca0 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -16,13 +16,13 @@
         <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
                  SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
-                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
-                    <Grid ColumnDefinitions="Auto * " Background="Transparent"  x:DataType="storage:IStorageFolder">
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}"> x:DataType="storage:IStorageFolder">
+                    <Grid ColumnDefinitions="Auto * " Background="Transparent" >
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}"/>
                     </Grid>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type storage:IStorageFile}"  x:DataType="storage:IStorageFile">
+                <DataTemplate DataType="{x:Type storage:IStorageFile}"  x:DataType="storage:IStorageFolder">
                     <Grid ColumnDefinitions="Auto *"  Background="Transparent">
                         <TextBlock Text="📰" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}" />
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index c715a932..b96126a1 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -42,7 +42,7 @@ public async Task TestFileSemantics()
             var props = await file.GetBasicPropertiesAsync();
             Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime ?? DateTime.MinValue);
             Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime ?? DateTime.MinValue);
-            Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0)  );
 
             using (var stream = await file.OpenReadAsync())
             {
@@ -56,7 +56,7 @@ public async Task TestFileSemantics()
             props = await file.GetBasicPropertiesAsync();
             Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime ?? DateTime.MinValue);
             Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime ?? DateTime.MinValue);
-            Assert.AreEqual(new FileInfo(tempFile).Length, (long)props.Size);
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
             var parentFolder = await file.GetParentAsync();
             Assert.IsNotNull(parentFolder);
@@ -74,7 +74,7 @@ public async Task TestFileSemantics()
             Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
 
             var newFile = await file.MoveAsync(subFolder);
-            Assert.True(File.Exists(newFile.Path?.LocalPath));
+            Assert.True(File.Exists(newFile.Path?.LocalPath ?? string.Empty));
             Assert.False(File.Exists(tempFile));
             Assert.AreEqual(new Uri($"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"), newFile.Path);
             await newFile.DeleteAsync();
@@ -128,7 +128,7 @@ public async Task TestFolderSemantics()
             Assert.IsFalse(testFolder.CanBookmark);
             Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
             var file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath ?? string.Empty));
 
             var props = await testFolder.GetBasicPropertiesAsync();
             Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated?.DateTime ?? DateTime.MinValue);
@@ -138,10 +138,10 @@ public async Task TestFolderSemantics()
             Assert.IsFalse(File.Exists(file.Path?.LocalPath));
 
             var subFolder = await testFolder.CreateFolderAsync("sub");
-            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath));
+            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath ?? string.Empty));
 
             file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath ?? string.Empty));
 
             await foreach (var item in subFolder.GetItemsAsync())
             {

From af01d9571329597c4cc3d5b6a7ddc49dafc76809 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 23:27:52 -0600
Subject: [PATCH 27/64] lintlintlint

---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 0e884ca0..28e5c755 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -16,7 +16,7 @@
         <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
                  SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
-                <DataTemplate DataType="{x:Type storage:IStorageFolder}"> x:DataType="storage:IStorageFolder">
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}" x:DataType="storage:IStorageFolder">
                     <Grid ColumnDefinitions="Auto * " Background="Transparent" >
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}"/>

From 4e9b3222955c0663e08bf25c24465b5d98838814 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 23:37:17 -0600
Subject: [PATCH 28/64] it's a unit test for xsake

---
 .../Controls/FileOpenPicker.axaml             |  4 +++-
 .../Consolonia.Core.Tests/StorageTests.cs     | 22 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 28e5c755..cebbba4b 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -16,18 +16,20 @@
         <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
                  SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
+                <!-- ReSharper disable Xaml.BindingWithContextNotResolved -->
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}" x:DataType="storage:IStorageFolder">
                     <Grid ColumnDefinitions="Auto * " Background="Transparent" >
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}"/>
                     </Grid>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type storage:IStorageFile}"  x:DataType="storage:IStorageFolder">
+                <DataTemplate DataType="{x:Type storage:IStorageFile}"  x:DataType="storage:IStorageFile">
                     <Grid ColumnDefinitions="Auto *"  Background="Transparent">
                         <TextBlock Text="📰" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
+                <!-- ReSharper restore Xaml.BindingWithContextNotResolved -->
             </ListBox.DataTemplates>
         </ListBox>
         <ComboBox Grid.Row="2" ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" HorizontalAlignment="Right" >
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index b96126a1..c1c36088 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -1,4 +1,6 @@
 #pragma warning disable CA2007 // Consider calling ConfigureAwait on the awaited task
+// ReSharper disable PossibleNullReferenceException
+// ReSharper disable ConstantConditionalAccessQualifier
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -40,8 +42,8 @@ public async Task TestFileSemantics()
             Assert.True(File.Exists(tempFile));
             Assert.True(File.Exists(file.Path.LocalPath));
             var props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime ?? DateTime.MinValue);
-            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime ?? DateTime.MinValue);
+            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime);
+            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0)  );
 
             using (var stream = await file.OpenReadAsync())
@@ -54,8 +56,8 @@ public async Task TestFileSemantics()
             }
 
             props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime ?? DateTime.MinValue);
-            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime ?? DateTime.MinValue);
+            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime);
+            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
             var parentFolder = await file.GetParentAsync();
@@ -74,7 +76,7 @@ public async Task TestFileSemantics()
             Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
 
             var newFile = await file.MoveAsync(subFolder);
-            Assert.True(File.Exists(newFile.Path?.LocalPath ?? string.Empty));
+            Assert.True(File.Exists(newFile.Path?.LocalPath));
             Assert.False(File.Exists(tempFile));
             Assert.AreEqual(new Uri($"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"), newFile.Path);
             await newFile.DeleteAsync();
@@ -128,20 +130,20 @@ public async Task TestFolderSemantics()
             Assert.IsFalse(testFolder.CanBookmark);
             Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
             var file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path?.LocalPath ?? string.Empty));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
             var props = await testFolder.GetBasicPropertiesAsync();
-            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated?.DateTime ?? DateTime.MinValue);
-            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified?.DateTime ?? DateTime.MinValue);
+            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated?.DateTime);
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified?.DateTime);
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path?.LocalPath));
 
             var subFolder = await testFolder.CreateFolderAsync("sub");
-            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath ?? string.Empty));
+            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath));
 
             file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
-            Assert.IsTrue(File.Exists(file.Path?.LocalPath ?? string.Empty));
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
             await foreach (var item in subFolder.GetItemsAsync())
             {

From f37efa0b23fd0dfa01caf4716334f400a8c86139 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 23:47:54 -0600
Subject: [PATCH 29/64] gah

---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index cebbba4b..87766405 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -16,20 +16,19 @@
         <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
                  SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
-                <!-- ReSharper disable Xaml.BindingWithContextNotResolved -->
-                <DataTemplate DataType="{x:Type storage:IStorageFolder}" x:DataType="storage:IStorageFolder">
+                <!-- ReSharper disable [Xaml.BindingWithContextNotResolved] -->
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}" >
                     <Grid ColumnDefinitions="Auto * " Background="Transparent" >
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}"/>
                     </Grid>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type storage:IStorageFile}"  x:DataType="storage:IStorageFile">
+                <DataTemplate DataType="{x:Type storage:IStorageFile}" >
                     <Grid ColumnDefinitions="Auto *"  Background="Transparent">
                         <TextBlock Text="📰" Margin="0 0 1 0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
-                <!-- ReSharper restore Xaml.BindingWithContextNotResolved -->
             </ListBox.DataTemplates>
         </ListBox>
         <ComboBox Grid.Row="2" ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" HorizontalAlignment="Right" >

From 5200d1a7ee93714585be5a387ded88072139b26d Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Sun, 24 Nov 2024 23:57:32 -0600
Subject: [PATCH 30/64] oh

---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 87766405..58151535 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -16,7 +16,6 @@
         <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
                  SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
-                <!-- ReSharper disable [Xaml.BindingWithContextNotResolved] -->
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}" >
                     <Grid ColumnDefinitions="Auto * " Background="Transparent" >
                         <TextBlock Text="📁" Margin="0 0 1 0"/>
@@ -33,7 +32,7 @@
         </ListBox>
         <ComboBox Grid.Row="2" ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" HorizontalAlignment="Right" >
             <ComboBox.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate DataType="{x:Type storage:FilePickerFileType}">
                     <TextBlock Text="{Binding Name}" HorizontalAlignment="Stretch" />
                 </DataTemplate>
             </ComboBox.ItemTemplate>

From 99cd7fa87f71271ae108194a9fe1738d40d2b676 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 06:00:44 +0000
Subject: [PATCH 31/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 src/Consolonia.Core/Controls/DialogWindow.cs  | 32 ++++----
 .../Controls/FileOpenPicker.axaml             | 74 ++++++++++++-------
 .../Controls/FileOpenPicker.axaml.cs          | 29 +++-----
 .../Controls/FileOpenPickerViewModel.cs       | 32 ++++----
 .../Controls/FileSavePicker.axaml             | 69 +++++++++++------
 .../Controls/FileSavePicker.axaml.cs          | 22 +++---
 .../Controls/FileSavePickerViewModel.cs       | 23 ++----
 .../Controls/FolderPicker.axaml               | 65 ++++++++++------
 .../Controls/FolderPicker.axaml.cs            | 32 ++++----
 .../Controls/FolderPickerViewModel.cs         | 17 ++---
 .../Controls/PickerViewModelBase.cs           | 42 +++++------
 .../Infrastructure/ConsoloniaPlatform.cs      |  4 +-
 .../ConsoloniaStorageProvider.cs              | 22 +++---
 .../Infrastructure/SystemStorageFile.cs       | 13 ++--
 .../Infrastructure/SystemStorageFolder.cs     | 35 ++++-----
 .../Templates/Controls/DialogWindow.axaml     |  3 +-
 .../Consolonia.Core.Tests/StorageTests.cs     | 55 +++++++-------
 17 files changed, 304 insertions(+), 265 deletions(-)

diff --git a/src/Consolonia.Core/Controls/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
index 1c9fe181..2f59cb3e 100644
--- a/src/Consolonia.Core/Controls/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -14,7 +14,6 @@
 
 namespace Consolonia.Core.Controls
 {
-
     [TemplatePart("PART_ContentPresenter", typeof(ContentPresenter))]
     public class DialogWindow : UserControl
     {
@@ -75,7 +74,7 @@ public bool IsCloseButtonVisible
 
 
         /// <summary>
-        /// Enables or disables resizing of the window.
+        ///     Enables or disables resizing of the window.
         /// </summary>
         public bool CanResize
         {
@@ -84,7 +83,7 @@ public bool CanResize
         }
 
         /// <summary>
-        /// Gets or sets the icon of the window.
+        ///     Gets or sets the icon of the window.
         /// </summary>
         public string Icon
         {
@@ -93,7 +92,7 @@ public string Icon
         }
 
         /// <summary>
-        /// Gets or sets the startup location of the window.
+        ///     Gets or sets the startup location of the window.
         /// </summary>
         public WindowStartupLocation WindowStartupLocation
         {
@@ -102,7 +101,7 @@ public WindowStartupLocation WindowStartupLocation
         }
 
         /// <summary>
-        /// Gets or sets the window position in screen coordinates.
+        ///     Gets or sets the window position in screen coordinates.
         /// </summary>
         //public PixelPoint Position
         //{
@@ -134,15 +133,13 @@ protected override Size ArrangeOverride(Size finalSize)
 
         protected void ShowDialogInternal(Visual parent)
         {
-            if (this.WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
-                this.Width = (ushort)(parent.Bounds.Width * .9);
-                this.Height = (ushort)(parent.Bounds.Height * .9);
-                if (parent is Window window)
-                {
-                    window.SizeChanged += Window_SizeChanged;
-                }
+                Width = (ushort)(parent.Bounds.Width * .9);
+                Height = (ushort)(parent.Bounds.Height * .9);
+                if (parent is Window window) window.SizeChanged += Window_SizeChanged;
             }
+
             DialogHost dialogHost = GetDialogHost(parent);
             dialogHost.OpenInternal(this);
         }
@@ -152,8 +149,8 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
             var window = sender as Window;
             if (window != null)
             {
-                this.Width = (ushort)(window.Bounds.Width * .9);
-                this.Height = (ushort)(window.Bounds.Height * .9);
+                Width = (ushort)(window.Bounds.Width * .9);
+                Height = (ushort)(window.Bounds.Height * .9);
             }
         }
 
@@ -162,10 +159,7 @@ public virtual void CloseDialog(object result = null)
         {
             DialogHost dialogHost = GetDialogHost(this);
             dialogHost.PopInternal(this);
-            if (this.Parent is Window window)
-            {
-                window.SizeChanged -= Window_SizeChanged;
-            }
+            if (Parent is Window window) window.SizeChanged -= Window_SizeChanged;
             _taskCompletionSource.SetResult(result);
         }
 
@@ -186,7 +180,7 @@ public async Task<T> ShowDialogAsync<T>(Control parent)
 
             _taskCompletionSource = new TaskCompletionSource<object>();
             ShowDialogInternal(parent);
-            var result = await _taskCompletionSource.Task;
+            object result = await _taskCompletionSource.Task;
             return (T)result;
         }
 
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
index 58151535..33fbc7ad 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -1,45 +1,69 @@
 <controls:DialogWindow xmlns="https://github.com/avaloniaui"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
-                     xmlns:controls="clr-namespace:Consolonia.Core.Controls"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     x:DataType="controls:FileOpenPickerViewModel"
-                     x:Class="Consolonia.Core.Controls.FileOpenPicker"
-                     Icon="📰" CancelOnEscape="True"
-                     Title="{Binding Options.Title}">
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:FileOpenPickerViewModel"
+                       x:Class="Consolonia.Core.Controls.FileOpenPicker"
+                       Icon="📰"
+                       CancelOnEscape="True"
+                       Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
         <Grid ColumnDefinitions="Auto *">
             <TextBlock Text="📁 " />
-            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}"
+                     Grid.Column="1" />
         </Grid>
-        <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
-                 SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
+        <ListBox x:Name="ItemsListBox"
+                 Grid.Row="1"
+                 ItemsSource="{Binding Items}"
+                 SelectionMode="{Binding SelectionMode}"
+                 SelectionChanged="ListBox_SelectionChanged"
+                 DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
-                <DataTemplate DataType="{x:Type storage:IStorageFolder}" >
-                    <Grid ColumnDefinitions="Auto * " Background="Transparent" >
-                        <TextBlock Text="📁" Margin="0 0 1 0"/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
+                    <Grid ColumnDefinitions="Auto * "
+                          Background="Transparent">
+                        <TextBlock Text="📁"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type storage:IStorageFile}" >
-                    <Grid ColumnDefinitions="Auto *"  Background="Transparent">
-                        <TextBlock Text="📰" Margin="0 0 1 0"/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}" />
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <Grid ColumnDefinitions="Auto *"
+                          Background="Transparent">
+                        <TextBlock Text="📰"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
-        <ComboBox Grid.Row="2" ItemsSource="{Binding Options.FileTypeFilter}" SelectedIndex="{Binding SelectedFilterIndex}" HorizontalAlignment="Right" >
+        <ComboBox Grid.Row="2"
+                  ItemsSource="{Binding Options.FileTypeFilter}"
+                  SelectedIndex="{Binding SelectedFilterIndex}"
+                  HorizontalAlignment="Right">
             <ComboBox.ItemTemplate>
                 <DataTemplate DataType="{x:Type storage:FilePickerFileType}">
-                    <TextBlock Text="{Binding Name}" HorizontalAlignment="Stretch" />
+                    <TextBlock Text="{Binding Name}"
+                               HorizontalAlignment="Stretch" />
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button x:Name="OkButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
-            <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
+        <StackPanel Grid.Row="3"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="1">
+            <Button x:Name="OkButton"
+                    Content="OK"
+                    Click="OnOK"
+                    IsEnabled="{Binding HasSelection}" />
+            <Button x:Name="CancelButton"
+                    Content="Cancel"
+                    Click="OnCancel" />
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index eb618b11..b0eec632 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -1,20 +1,18 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Controls
 {
-
     public partial class FileOpenPicker : DialogWindow
     {
         public FileOpenPicker(FilePickerOpenOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) =>
-            {
-                this.FindControl<Button>("CancelButton")?.Focus();
-            };
+            Loaded += (_, _) => { this.FindControl<Button>("CancelButton")?.Focus(); };
             DataContext = new FileOpenPickerViewModel(options);
             InitializeComponent();
         }
@@ -26,7 +24,7 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
-        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
+        private void OnDoubleTapped(object sender, TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
             if (listbox.SelectedItem is IStorageFolder folder)
@@ -37,16 +35,16 @@ private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
             }
             else if (listbox.SelectedItem is IStorageFile file)
             {
-                CloseDialog(new [] { file });
+                CloseDialog(new[] { file });
             }
         }
 
-        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnOK(object sender, RoutedEventArgs e)
         {
             CloseDialog(ViewModel.SelectedFiles);
         }
 
-        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnCancel(object sender, RoutedEventArgs e)
         {
             CloseDialog();
         }
@@ -55,8 +53,8 @@ private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e
         {
             if (ViewModel.SelectionMode == SelectionMode.Single)
             {
-                if ((e.AddedItems.Count > 0) &&
-                    (e.AddedItems[0] is IStorageFile file))
+                if (e.AddedItems.Count > 0 &&
+                    e.AddedItems[0] is IStorageFile file)
                 {
                     ViewModel.SelectedFiles.Clear();
                     ViewModel.SelectedFiles.Add(file);
@@ -64,18 +62,15 @@ private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e
             }
             else
             {
-                foreach (var item in e.AddedItems)
-                {
+                foreach (object item in e.AddedItems)
                     if (item is IStorageFile file)
                         ViewModel.SelectedFiles.Add(file);
-                }
 
-                foreach (var item in e.RemovedItems)
-                {
+                foreach (object item in e.RemovedItems)
                     if (item is IStorageFile file)
                         ViewModel.SelectedFiles.Remove(file);
-                }
             }
+
             ViewModel.HasSelection = ViewModel.SelectedFiles.Count > 0;
         }
     }
diff --git a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
index 9039697a..475c0f5b 100644
--- a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
@@ -8,24 +8,20 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileOpenPickerViewModel : PickerViewModelBase<FilePickerOpenOptions>
     {
-        public FileOpenPickerViewModel(FilePickerOpenOptions options)
-            : base(options)
-        {
-            this.SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
-        }
+        [ObservableProperty] private bool _hasSelection;
 
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
-        private int _selectedFilterIndex;
+        [ObservableProperty] private ObservableCollection<IStorageFile> _selectedFiles = new();
 
-        [ObservableProperty]
-        private SelectionMode _selectionMode;
+        [ObservableProperty] [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
+        private int _selectedFilterIndex;
 
-        [ObservableProperty]
-        private ObservableCollection<IStorageFile> _selectedFiles = new ObservableCollection<IStorageFile>();
+        [ObservableProperty] private SelectionMode _selectionMode;
 
-        [ObservableProperty]
-        private bool _hasSelection;
+        public FileOpenPickerViewModel(FilePickerOpenOptions options)
+            : base(options)
+        {
+            SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
+        }
 
         protected override bool FilterItem(IStorageItem item)
         {
@@ -34,20 +30,18 @@ protected override bool FilterItem(IStorageItem item)
 
             if (item is IStorageFile file)
             {
-                var selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
+                FilePickerFileType selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
                 if (selectedFileType.Patterns == null)
                     return true;
 
-                foreach (var pattern in selectedFileType.Patterns)
-                {
+                foreach (string pattern in selectedFileType.Patterns)
                     if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
                         return true;
-                }
                 return false;
             }
+
             // show folders
             return true;
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml b/src/Consolonia.Core/Controls/FileSavePicker.axaml
index 52e14e03..f1a9164b 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml
@@ -1,41 +1,64 @@
 <controls:DialogWindow xmlns="https://github.com/avaloniaui"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
-                     xmlns:controls="clr-namespace:Consolonia.Core.Controls"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     x:DataType="controls:FileSavePickerViewModel"
-                     x:Class="Consolonia.Core.Controls.FileSavePicker"
-                     Icon="📰" CancelOnEscape="True"
-                     Title="{Binding Options.Title}">
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:FileSavePickerViewModel"
+                       x:Class="Consolonia.Core.Controls.FileSavePicker"
+                       Icon="📰"
+                       CancelOnEscape="True"
+                       Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto Auto">
         <Grid ColumnDefinitions="Auto *">
             <TextBlock Text="📁 " />
-            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}"
+                     Grid.Column="1" />
         </Grid>
-        <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DoubleTapped="OnDoubleTapped">
+        <ListBox x:Name="ItemsListBox"
+                 Grid.Row="1"
+                 ItemsSource="{Binding Items}"
+                 SelectedItem="{Binding SelectedItem}"
+                 DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
-                    <Grid ColumnDefinitions="Auto * " Background="Transparent">
-                        <TextBlock Text="📁" Margin="0 0 1 0"/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                    <Grid ColumnDefinitions="Auto * "
+                          Background="Transparent">
+                        <TextBlock Text="📁"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type storage:IStorageFile}">
-                    <Grid ColumnDefinitions="Auto *"  Background="Transparent">
-                        <TextBlock Text="📰" Margin="0 0 1 0"/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}" />
+                    <Grid ColumnDefinitions="Auto *"
+                          Background="Transparent">
+                        <TextBlock Text="📰"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
-        <Grid Grid.Row="2" ColumnDefinitions="Auto *">
-            <TextBlock Text="File:" Margin="0 0 1 0"/>
-            <TextBox Text="{Binding SelectedFile.Path.LocalPath}" Grid.Column="1"/>
+        <Grid Grid.Row="2"
+              ColumnDefinitions="Auto *">
+            <TextBlock Text="File:"
+                       Margin="0 0 1 0" />
+            <TextBox Text="{Binding SelectedFile.Path.LocalPath}"
+                     Grid.Column="1" />
         </Grid>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button x:Name="SaveButton" Content="Save" Click="OnOK" IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-            <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
+        <StackPanel Grid.Row="3"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="1">
+            <Button x:Name="SaveButton"
+                    Content="Save"
+                    Click="OnOK"
+                    IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}" />
+            <Button x:Name="CancelButton"
+                    Content="Cancel"
+                    Click="OnCancel" />
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 014666c9..44f91935 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -1,5 +1,7 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 
@@ -11,24 +13,22 @@ public FileSavePicker(FilePickerSaveOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) =>
-            {
-                this.FindControl<Button>("CancelButton")?.Focus();
-            };
+            Loaded += (_, _) => { this.FindControl<Button>("CancelButton")?.Focus(); };
             DataContext = new FileSavePickerViewModel(options);
             InitializeComponent();
         }
 
+        public FilePickerSaveOptions Options =>
+            ((FileSavePickerViewModel)DataContext)?.Options ?? throw new ArgumentNullException();
+
+        public FileSavePickerViewModel ViewModel => (FileSavePickerViewModel)DataContext;
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
 
-        public FilePickerSaveOptions Options => ((FileSavePickerViewModel)DataContext)?.Options ?? throw new ArgumentNullException();
-
-        public FileSavePickerViewModel ViewModel => (FileSavePickerViewModel)DataContext;
-
-        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
+        private void OnDoubleTapped(object sender, TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
             if (listbox.SelectedItem is IStorageFolder folder)
@@ -42,12 +42,12 @@ private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
             }
         }
 
-        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnOK(object sender, RoutedEventArgs e)
         {
             CloseDialog(ViewModel.SelectedFile);
         }
 
-        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnCancel(object sender, RoutedEventArgs e)
         {
             CloseDialog();
         }
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 9a622a2b..637dcf0f 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -6,39 +6,32 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileSavePickerViewModel : PickerViewModelBase<FilePickerSaveOptions>
     {
+        [ObservableProperty] private FilePickerFileType _selectedFileType;
+
+        [ObservableProperty] [NotifyPropertyChangedFor(nameof(SelectedFile))]
+        private IStorageItem _selectedItem;
+
         public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
-
         }
 
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(SelectedFile))]
-        private IStorageItem _selectedItem;
-
         public IStorageFile SelectedFile => SelectedItem as IStorageFile;
 
-        [ObservableProperty]
-        private FilePickerFileType _selectedFileType;
-
         protected override bool FilterItem(IStorageItem item)
         {
-            if (item is IStorageFolder)
-            {
-                return true;
-            }
+            if (item is IStorageFolder) return true;
             if (item is IStorageFile file)
             {
                 if (SelectedFileType.Patterns == null || SelectedFileType.Patterns.Count == 0)
                     return true;
 
-                foreach (var pattern in SelectedFileType.Patterns)
-                {
+                foreach (string pattern in SelectedFileType.Patterns)
                     if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
                         return true;
-                }
                 return false;
             }
+
             return true;
         }
     }
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml b/src/Consolonia.Core/Controls/FolderPicker.axaml
index da1dcc88..705754ed 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml
@@ -1,38 +1,59 @@
 <controls:DialogWindow xmlns="https://github.com/avaloniaui"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
-                     xmlns:controls="clr-namespace:Consolonia.Core.Controls"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     x:DataType="controls:FolderPickerViewModel"
-                     x:Class="Consolonia.Core.Controls.FolderPicker"
-                     Icon="📁"  CancelOnEscape="True"
-                     Title="{Binding Options.Title}">
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:FolderPickerViewModel"
+                       x:Class="Consolonia.Core.Controls.FolderPicker"
+                       Icon="📁"
+                       CancelOnEscape="True"
+                       Title="{Binding Options.Title}">
     <Grid RowDefinitions="Auto * Auto">
         <Grid ColumnDefinitions="Auto *">
-            <TextBlock Text="📁" Margin="0 0 1 0" />
-            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}" Grid.Column="1" />
+            <TextBlock Text="📁"
+                       Margin="0 0 1 0" />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}"
+                     Grid.Column="1" />
         </Grid>
-        <ListBox x:Name="ItemsListBox" Grid.Row="1" ItemsSource="{Binding Items}" SelectionMode="{Binding SelectionMode}"
-                 SelectionChanged="ListBox_SelectionChanged" DoubleTapped="OnDoubleTapped">
+        <ListBox x:Name="ItemsListBox"
+                 Grid.Row="1"
+                 ItemsSource="{Binding Items}"
+                 SelectionMode="{Binding SelectionMode}"
+                 SelectionChanged="ListBox_SelectionChanged"
+                 DoubleTapped="OnDoubleTapped">
             <ListBox.DataTemplates>
                 <DataTemplate DataType="{x:Type storage:IStorageFolder}">
-                    <Grid ColumnDefinitions="Auto * " Background="Transparent">
-                        <TextBlock Text="📁" Margin="0 0 1 0"/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                    <Grid ColumnDefinitions="Auto * "
+                          Background="Transparent">
+                        <TextBlock Text="📁"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type storage:IStorageFile}">
-                    <Grid ColumnDefinitions="Auto *"  Background="Transparent">
-                        <TextBlock Text="📰" Margin="0 0 1 0"/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}" />
+                    <Grid ColumnDefinitions="Auto *"
+                          Background="Transparent">
+                        <TextBlock Text="📰"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
                     </Grid>
                 </DataTemplate>
             </ListBox.DataTemplates>
         </ListBox>
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="1">
-            <Button x:Name="OkButton" Content="OK" Click="OnOK" IsEnabled="{Binding HasSelection}"/>
-            <Button x:Name="CancelButton" Content="Cancel" Click="OnCancel"/>
+        <StackPanel Grid.Row="2"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="1">
+            <Button x:Name="OkButton"
+                    Content="OK"
+                    Click="OnOK"
+                    IsEnabled="{Binding HasSelection}" />
+            <Button x:Name="CancelButton"
+                    Content="Cancel"
+                    Click="OnCancel" />
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index b52f3293..03126f38 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -1,35 +1,34 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Core.Controls
 {
-
     public partial class FolderPicker : DialogWindow
     {
         public FolderPicker(FolderPickerOpenOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) =>
-            {
-                this.FindControl<Button>("CancelButton")?.Focus();
-            };
+            Loaded += (_, _) => { this.FindControl<Button>("CancelButton")?.Focus(); };
             DataContext = new FolderPickerViewModel(options);
             InitializeComponent();
         }
 
         public FolderPickerViewModel ViewModel => (FolderPickerViewModel)DataContext;
 
+        public FolderPickerOpenOptions Options =>
+            ((FolderPickerViewModel)DataContext)?.Options ?? new FolderPickerOpenOptions();
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
 
-        public FolderPickerOpenOptions Options => ((FolderPickerViewModel)DataContext)?.Options ?? new FolderPickerOpenOptions();
-
-        private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
+        private void OnDoubleTapped(object sender, TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
             if (listbox.SelectedItem is SystemStorageFolder folder)
@@ -41,12 +40,12 @@ private void OnDoubleTapped(object sender, Avalonia.Input.TappedEventArgs e)
             }
         }
 
-        private void OnOK(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnOK(object sender, RoutedEventArgs e)
         {
             CloseDialog(ViewModel.SelectedFolders);
         }
 
-        private void OnCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void OnCancel(object sender, RoutedEventArgs e)
         {
             CloseDialog();
         }
@@ -55,8 +54,8 @@ private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e
         {
             if (ViewModel.SelectionMode == SelectionMode.Single)
             {
-                if ((e.AddedItems.Count > 0) &&
-                    (e.AddedItems[0] is IStorageFolder folder))
+                if (e.AddedItems.Count > 0 &&
+                    e.AddedItems[0] is IStorageFolder folder)
                 {
                     ViewModel.SelectedFolders.Clear();
                     ViewModel.SelectedFolders.Add(folder);
@@ -64,18 +63,15 @@ private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e
             }
             else
             {
-                foreach (var item in e.AddedItems)
-                {
+                foreach (object item in e.AddedItems)
                     if (item is IStorageFolder folder)
                         ViewModel.SelectedFolders.Add(folder);
-                }
 
-                foreach (var item in e.RemovedItems)
-                {
+                foreach (object item in e.RemovedItems)
                     if (item is IStorageFolder folder)
                         ViewModel.SelectedFolders.Remove(folder);
-                }
             }
+
             ViewModel.HasSelection = ViewModel.SelectedFolders.Count > 0;
         }
     }
diff --git a/src/Consolonia.Core/Controls/FolderPickerViewModel.cs b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
index a3541df3..a9f127ee 100644
--- a/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
@@ -7,21 +7,18 @@ namespace Consolonia.Core.Controls
 {
     public partial class FolderPickerViewModel : PickerViewModelBase<FolderPickerOpenOptions>
     {
+        [ObservableProperty] private bool _hasSelection;
+
+        [ObservableProperty] private ObservableCollection<IStorageFolder> _selectedFolders = new();
+
+        [ObservableProperty] private SelectionMode _selectionMode;
+
         public FolderPickerViewModel(FolderPickerOpenOptions options)
             : base(options)
         {
-            this.SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
+            SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
         }
 
-        [ObservableProperty]
-        private ObservableCollection<IStorageFolder> _selectedFolders = new ObservableCollection<IStorageFolder>();
-
-        [ObservableProperty]
-        private SelectionMode _selectionMode;
-
-        [ObservableProperty]
-        private bool _hasSelection;
-
         protected override bool FilterItem(IStorageItem item)
         {
             return item is IStorageFolder;
diff --git a/src/Consolonia.Core/Controls/PickerViewModelBase.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
index fdc53150..4b74b81e 100644
--- a/src/Consolonia.Core/Controls/PickerViewModelBase.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
@@ -8,10 +9,18 @@
 
 namespace Consolonia.Core.Controls
 {
-
     public abstract partial class PickerViewModelBase<TPickerOptions> : ObservableObject
         where TPickerOptions : PickerOptions
     {
+        [ObservableProperty] private IStorageFolder _currentFolder;
+
+        [ObservableProperty] private string _currentFolderPath;
+
+        [ObservableProperty] private ObservableCollection<IStorageItem> _items = new();
+
+
+        [ObservableProperty] private TPickerOptions _options;
+
         protected PickerViewModelBase(TPickerOptions options)
         {
             Options = options;
@@ -22,32 +31,20 @@ protected PickerViewModelBase(TPickerOptions options)
         }
 
 
-        [ObservableProperty]
-        private TPickerOptions _options;
-
-        [ObservableProperty]
-        private string _currentFolderPath;
-
-        [ObservableProperty]
-        private IStorageFolder _currentFolder;
-
-        [ObservableProperty]
-        private ObservableCollection<IStorageItem> _items = new ObservableCollection<IStorageItem>();
-
-
-        private async void PickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private async void PickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
             {
                 case nameof(CurrentFolderPath):
                     try
                     {
-                        CurrentFolder = new SystemStorageFolder(new DirectoryInfo(this.CurrentFolderPath));
+                        CurrentFolder = new SystemStorageFolder(new DirectoryInfo(CurrentFolderPath));
                     }
                     catch (DirectoryNotFoundException)
                     {
                         // ignore
                     }
+
                     break;
 
                 case nameof(CurrentFolder):
@@ -60,15 +57,14 @@ private async Task LoadCurrentFolder()
         {
             Items.Clear();
 
-            this.Items.Add(new SystemStorageFolder(new DirectoryInfo(Path.Combine(CurrentFolder.Path.LocalPath, "..")), true));
+            Items.Add(
+                new SystemStorageFolder(new DirectoryInfo(Path.Combine(CurrentFolder.Path.LocalPath, "..")), true));
 
-            await foreach (var item in CurrentFolder.GetItemsAsync())
-            {
-                if (this.FilterItem(item))
-                    this.Items.Add(item);
-            }
+            await foreach (IStorageItem item in CurrentFolder.GetItemsAsync())
+                if (FilterItem(item))
+                    Items.Add(item);
         }
 
         protected abstract bool FilterItem(IStorageItem item);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
index a7fc8df5..898361b3 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
@@ -6,11 +6,11 @@
 using Avalonia.Input.Platform;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.Threading;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Threading;
 using Consolonia.Core.Dummy;
 using Consolonia.Core.Text;
-using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Infrastructure
 {
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index da436486..963474d2 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
-using Avalonia.Platform.Storage;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia;
-using System.IO;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform.Storage;
 using Consolonia.Core.Controls;
 
 namespace Consolonia.Core.Infrastructure
@@ -25,7 +26,8 @@ public Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
 
         public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
         {
-            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)?.MainWindow;
+            Window mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)
+                ?.MainWindow;
             ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FileOpenPicker(options);
@@ -40,7 +42,8 @@ public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
 
         public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
         {
-            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)?.MainWindow;
+            Window mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)
+                ?.MainWindow;
             ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FolderPicker(options);
@@ -50,7 +53,8 @@ public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPic
 
         public async Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
         {
-            var mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)?.MainWindow;
+            Window mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)
+                ?.MainWindow;
             ArgumentNullException.ThrowIfNull(mainWindow);
 
             var picker = new FileSavePicker(options);
@@ -74,7 +78,7 @@ public Task<IStorageFolder> TryGetFolderFromPathAsync(Uri folderPath)
 
         public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnownFolder)
         {
-            var dir = wellKnownFolder switch
+            string dir = wellKnownFolder switch
             {
                 WellKnownFolder.Desktop => Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
                 WellKnownFolder.Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
@@ -84,9 +88,9 @@ public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnown
                 WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),
                 _ => null
             };
-            if (String.IsNullOrEmpty(dir))
+            if (string.IsNullOrEmpty(dir))
                 return Task.FromResult<IStorageFolder>(null);
             return Task.FromResult<IStorageFolder>(new SystemStorageFolder(dir));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
index 142d8fbf..2c8247d0 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -9,7 +9,7 @@ namespace Consolonia.Core.Infrastructure
     [DebuggerDisplay("File: {Name}")]
     public sealed class SystemStorageFile : IStorageFile
     {
-        private FileInfo _fileInfo;
+        private readonly FileInfo _fileInfo;
 
 
         public SystemStorageFile(string file)
@@ -29,7 +29,7 @@ public SystemStorageFile(FileInfo fileInfo)
 
         public string Name => _fileInfo.Name;
 
-        public Uri Path => new Uri($"file://{_fileInfo.FullName}");
+        public Uri Path => new($"file://{_fileInfo.FullName}");
 
         public bool CanBookmark => false;
 
@@ -45,7 +45,8 @@ public void Dispose()
 
         public Task<StorageItemProperties> GetBasicPropertiesAsync()
         {
-            var result = new StorageItemProperties((ulong)_fileInfo.Length, _fileInfo.CreationTime, _fileInfo.LastWriteTime);
+            var result = new StorageItemProperties((ulong)_fileInfo.Length, _fileInfo.CreationTime,
+                _fileInfo.LastWriteTime);
             return Task.FromResult(result);
         }
 
@@ -57,8 +58,8 @@ public Task<IStorageFolder> GetParentAsync()
 
         public Task<IStorageItem> MoveAsync(IStorageFolder destination)
         {
-            var path = destination.Path.LocalPath;
-            var targetPath = System.IO.Path.Combine(path, _fileInfo.Name);
+            string path = destination.Path.LocalPath;
+            string targetPath = System.IO.Path.Combine(path, _fileInfo.Name);
             _fileInfo.MoveTo(targetPath);
             return Task.FromResult((IStorageItem)new SystemStorageFile(targetPath));
         }
@@ -80,4 +81,4 @@ public Task<string> SaveBookmarkAsync()
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index 2286f96a..ce64d1b9 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -10,8 +10,8 @@ namespace Consolonia.Core.Infrastructure
     [DebuggerDisplay("Folder: {Name}")]
     public sealed class SystemStorageFolder : IStorageFolder
     {
-        private DirectoryInfo _directoryInfo;
-        private bool _isParent;
+        private readonly DirectoryInfo _directoryInfo;
+        private readonly bool _isParent;
 
         public SystemStorageFolder(string path)
         {
@@ -20,7 +20,7 @@ public SystemStorageFolder(string path)
 
         public SystemStorageFolder(Uri uri)
         {
-            _directoryInfo = new DirectoryInfo(uri.LocalPath);  
+            _directoryInfo = new DirectoryInfo(uri.LocalPath);
         }
 
         public SystemStorageFolder(DirectoryInfo directoryInfo, bool isParent = false)
@@ -29,9 +29,9 @@ public SystemStorageFolder(DirectoryInfo directoryInfo, bool isParent = false)
             _directoryInfo = directoryInfo;
         }
 
-        public string Name => (_isParent) ? ".." : _directoryInfo.Name;
+        public string Name => _isParent ? ".." : _directoryInfo.Name;
 
-        public Uri Path => new Uri($"file://{_directoryInfo.FullName}");
+        public Uri Path => new($"file://{_directoryInfo.FullName}");
 
         public bool CanBookmark => false;
 
@@ -39,17 +39,18 @@ public async Task<IStorageFile> CreateFileAsync(string name)
         {
             await Task.CompletedTask;
 
-            var path = System.IO.Path.Combine(_directoryInfo.FullName, name);
-            using (var stream = File.Create(path))
+            string path = System.IO.Path.Combine(_directoryInfo.FullName, name);
+            using (FileStream stream = File.Create(path))
             {
-                await stream.WriteAsync(Array.Empty<byte>().AsMemory(0, 0));    
+                await stream.WriteAsync(Array.Empty<byte>().AsMemory(0, 0));
             }
+
             return new SystemStorageFile(path);
         }
 
         public Task<IStorageFolder> CreateFolderAsync(string name)
         {
-            var dirInfo = Directory.CreateDirectory(System.IO.Path.Combine(_directoryInfo.FullName, name));
+            DirectoryInfo dirInfo = Directory.CreateDirectory(System.IO.Path.Combine(_directoryInfo.FullName, name));
             return Task.FromResult((IStorageFolder)new SystemStorageFolder(dirInfo));
         }
 
@@ -65,7 +66,8 @@ public void Dispose()
 
         public Task<StorageItemProperties> GetBasicPropertiesAsync()
         {
-            var properties = new StorageItemProperties(dateCreated: _directoryInfo.CreationTime, dateModified: _directoryInfo.LastAccessTime);
+            var properties = new StorageItemProperties(dateCreated: _directoryInfo.CreationTime,
+                dateModified: _directoryInfo.LastAccessTime);
             return Task.FromResult(properties);
         }
 
@@ -75,15 +77,10 @@ public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
 
             if (_directoryInfo.Exists)
             {
-                foreach (var folder in _directoryInfo.GetDirectories())
-                {
+                foreach (DirectoryInfo folder in _directoryInfo.GetDirectories())
                     yield return new SystemStorageFolder(folder);
-                }
 
-                foreach (var file in _directoryInfo.GetFiles())
-                {
-                    yield return new SystemStorageFile(file);
-                }
+                foreach (FileInfo file in _directoryInfo.GetFiles()) yield return new SystemStorageFile(file);
             }
         }
 
@@ -97,7 +94,7 @@ public Task<IStorageFolder> GetParentAsync()
 
         public Task<IStorageItem> MoveAsync(IStorageFolder destination)
         {
-            var targetPath = System.IO.Path.Combine(destination.Path.LocalPath, _directoryInfo.Name);
+            string targetPath = System.IO.Path.Combine(destination.Path.LocalPath, _directoryInfo.Name);
             _directoryInfo.MoveTo(targetPath);
             return Task.FromResult((IStorageItem)new SystemStorageFolder(targetPath));
         }
@@ -107,4 +104,4 @@ public Task<string> SaveBookmarkAsync()
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index 6b4de8c7..2b431603 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -64,7 +64,8 @@
                                         Orientation="Horizontal">
                                 <helpers:SymbolsControl Text="{TemplateBinding Icon}"
                                                         Foreground="{TemplateBinding BorderBrush}" />
-                                <TextBlock Text="{TemplateBinding Title}" Margin="1 0 0 0" />
+                                <TextBlock Text="{TemplateBinding Title}"
+                                           Margin="1 0 0 0" />
                                 <helpers:SymbolsControl Text=" "
                                                         Foreground="{TemplateBinding BorderBrush}" />
                             </StackPanel>
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index c1c36088..455ce689 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -13,7 +13,6 @@ namespace Consolonia.Core.Tests
     [TestFixture]
     public class StorageTests
     {
-
         [Test]
         public void DefaultAttributes()
         {
@@ -27,30 +26,31 @@ public void DefaultAttributes()
         public async Task TestFileSemantics()
         {
             var storageProvider = new ConsoloniaStorageProvider();
-            var tempFile = Path.GetTempFileName();
-            var file = await storageProvider.TryGetFileFromPathAsync(new Uri($"file://{tempFile}"));
+            string tempFile = Path.GetTempFileName();
+            IStorageFile file = await storageProvider.TryGetFileFromPathAsync(new Uri($"file://{tempFile}"));
             Assert.IsNotNull(file);
             Assert.AreEqual(tempFile, file.Path.LocalPath);
 
-            using (var stream = await file.OpenWriteAsync())
+            using (Stream stream = await file.OpenWriteAsync())
             {
                 using (var streamWriter = new StreamWriter(stream))
                 {
                     await streamWriter.WriteAsync("Hello world");
                 }
             }
+
             Assert.True(File.Exists(tempFile));
             Assert.True(File.Exists(file.Path.LocalPath));
-            var props = await file.GetBasicPropertiesAsync();
+            StorageItemProperties props = await file.GetBasicPropertiesAsync();
             Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime);
             Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime);
-            Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0)  );
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
-            using (var stream = await file.OpenReadAsync())
+            using (Stream stream = await file.OpenReadAsync())
             {
                 using (var streamReader = new StreamReader(stream))
                 {
-                    var text = await streamReader.ReadToEndAsync();
+                    string text = await streamReader.ReadToEndAsync();
                     Assert.AreEqual("Hello world", text);
                 }
             }
@@ -60,25 +60,28 @@ public async Task TestFileSemantics()
             Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime);
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
-            var parentFolder = await file.GetParentAsync();
+            IStorageFolder parentFolder = await file.GetParentAsync();
             Assert.IsNotNull(parentFolder);
             Assert.AreEqual(Path.GetDirectoryName(tempFile), parentFolder.Path.LocalPath);
 
-            var subPath = Path.Combine(Path.GetDirectoryName(tempFile)!, nameof(TestFileSemantics));
+            string subPath = Path.Combine(Path.GetDirectoryName(tempFile)!, nameof(TestFileSemantics));
             if (Directory.Exists(subPath))
                 Directory.Delete(subPath);
 
-            var subFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{subPath}"));
+            IStorageFolder subFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{subPath}"));
             Assert.IsNull(subFolder);
 
             subFolder = await parentFolder.CreateFolderAsync(nameof(TestFileSemantics));
             Assert.IsNotNull(subFolder);
             Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
 
-            var newFile = await file.MoveAsync(subFolder);
+            IStorageItem newFile = await file.MoveAsync(subFolder);
             Assert.True(File.Exists(newFile.Path?.LocalPath));
             Assert.False(File.Exists(tempFile));
-            Assert.AreEqual(new Uri($"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"), newFile.Path);
+            Assert.AreEqual(
+                new Uri(
+                    $"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"),
+                newFile.Path);
             await newFile.DeleteAsync();
             Assert.False(File.Exists(newFile.Path.LocalPath));
 
@@ -90,13 +93,14 @@ public async Task TestFileSemantics()
         public async Task TestWellKnownFolder()
         {
             var storageProvider = new ConsoloniaStorageProvider();
-            var folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
+            IStorageFolder folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
             if (folder != null)
                 Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Documents);
             if (folder != null)
-                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), folder.Path.LocalPath);
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                    folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Music);
             if (folder != null)
@@ -108,7 +112,8 @@ public async Task TestWellKnownFolder()
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
             if (folder != null)
-                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), folder.Path.LocalPath);
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);
             if (folder != null)
@@ -120,35 +125,33 @@ public async Task TestWellKnownFolder()
         public async Task TestFolderSemantics()
         {
             var storageProvider = new ConsoloniaStorageProvider();
-            var tempPath = Path.GetTempPath();
-            var tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
-            var testPath = Path.Combine(tempPath, nameof(TestFolderSemantics))!;
-            var testFolder = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
+            string tempPath = Path.GetTempPath();
+            IStorageFolder tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
+            string testPath = Path.Combine(tempPath, nameof(TestFolderSemantics))!;
+            IStorageFolder testFolder = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
 
             Assert.IsNotNull(testFolder);
             Assert.AreEqual(testPath, testFolder.Path.LocalPath);
             Assert.IsFalse(testFolder.CanBookmark);
             Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
-            var file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
+            IStorageFile file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
             Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
-            var props = await testFolder.GetBasicPropertiesAsync();
+            StorageItemProperties props = await testFolder.GetBasicPropertiesAsync();
             Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated?.DateTime);
             Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified?.DateTime);
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path?.LocalPath));
 
-            var subFolder = await testFolder.CreateFolderAsync("sub");
+            IStorageFolder subFolder = await testFolder.CreateFolderAsync("sub");
             Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath));
 
             file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
             Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
-            await foreach (var item in subFolder.GetItemsAsync())
-            {
+            await foreach (IStorageItem item in subFolder.GetItemsAsync())
                 Assert.AreEqual(file.Path.LocalPath, item.Path.LocalPath);
-            }
             await file.DeleteAsync();
 
             await subFolder.DeleteAsync();

From f4784cd129870f123bb8d0aa9600931d64c777ca Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:20:36 -0600
Subject: [PATCH 32/64] code rabbit changes

---
 src/Consolonia.Core/Controls/DialogWindow.cs                  | 4 ++--
 src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs       | 1 +
 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs       | 1 +
 src/Consolonia.Core/Controls/FolderPickerViewModel.cs         | 2 ++
 src/Consolonia.Core/Controls/PickerViewModelBase.cs           | 1 +
 src/Consolonia.NUnit/Consolonia.NUnit.csproj                  | 4 ----
 src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj  | 2 ++
 .../Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj  | 1 +
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Consolonia.Core/Controls/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
index 2f59cb3e..9ff83ab6 100644
--- a/src/Consolonia.Core/Controls/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -26,10 +26,10 @@ public class DialogWindow : UserControl
             AvaloniaProperty.Register<DialogWindow, bool>(nameof(IsCloseButtonVisible), true);
 
         public static readonly StyledProperty<WindowStartupLocation> WindowStartupLocationProperty =
-            AvaloniaProperty.Register<Window, WindowStartupLocation>(nameof(WindowStartupLocation));
+            AvaloniaProperty.Register<DialogWindow, WindowStartupLocation>(nameof(WindowStartupLocation));
 
         public static readonly StyledProperty<bool> CanResizeProperty =
-            AvaloniaProperty.Register<Window, bool>(nameof(CanResize), true);
+            AvaloniaProperty.Register<DialogWindow, bool>(nameof(CanResize), true);
 
         public static readonly StyledProperty<string> IconProperty =
             AvaloniaProperty.Register<DialogWindow, string>(nameof(Icon));
diff --git a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
index 475c0f5b..8dda9189 100644
--- a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
@@ -20,6 +20,7 @@ [ObservableProperty] [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
         public FileOpenPickerViewModel(FilePickerOpenOptions options)
             : base(options)
         {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
             SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
         }
 
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 637dcf0f..d753dfd5 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -14,6 +14,7 @@ [ObservableProperty] [NotifyPropertyChangedFor(nameof(SelectedFile))]
         public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
         }
 
         public IStorageFile SelectedFile => SelectedItem as IStorageFile;
diff --git a/src/Consolonia.Core/Controls/FolderPickerViewModel.cs b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
index a9f127ee..1b599554 100644
--- a/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.ObjectModel;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
@@ -16,6 +17,7 @@ public partial class FolderPickerViewModel : PickerViewModelBase<FolderPickerOpe
         public FolderPickerViewModel(FolderPickerOpenOptions options)
             : base(options)
         {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
             SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
         }
 
diff --git a/src/Consolonia.Core/Controls/PickerViewModelBase.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
index 4b74b81e..65266f55 100644
--- a/src/Consolonia.Core/Controls/PickerViewModelBase.cs
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -23,6 +23,7 @@ public abstract partial class PickerViewModelBase<TPickerOptions> : ObservableOb
 
         protected PickerViewModelBase(TPickerOptions options)
         {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
             Options = options;
             CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath ?? Environment.CurrentDirectory;
             CurrentFolder = options.SuggestedStartLocation ?? new SystemStorageFolder(Environment.CurrentDirectory);
diff --git a/src/Consolonia.NUnit/Consolonia.NUnit.csproj b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
index 9f8ac3f0..dae1791f 100644
--- a/src/Consolonia.NUnit/Consolonia.NUnit.csproj
+++ b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
@@ -6,10 +6,6 @@
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <NoWarn>CA2007;</NoWarn>
-    </PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.13.1" />
     </ItemGroup>
diff --git a/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj b/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
index a237a748..350706ed 100644
--- a/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
+++ b/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
@@ -4,8 +4,10 @@
 
     <PropertyGroup>
         <IsPackable>false</IsPackable>
+        <NoWarn>CA2007;</NoWarn>
     </PropertyGroup>
 
+
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj b/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj
index 8715e73d..dc977029 100644
--- a/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj
+++ b/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <IsPackable>false</IsPackable>
+        <NoWarn>CA2007;</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

From 7c44cceb91f50474fe8172d6c89b5a213b8a4846 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:21:38 -0600
Subject: [PATCH 33/64] Update
 src/Consolonia.Core/Controls/FileSavePicker.axaml.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../Controls/FileSavePicker.axaml.cs              | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 44f91935..25ab406f 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -18,10 +18,21 @@ public FileSavePicker(FilePickerSaveOptions options)
             InitializeComponent();
         }
 
+        /// <summary>
+        /// Gets the file picker save options associated with this dialog.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
         public FilePickerSaveOptions Options =>
-            ((FileSavePickerViewModel)DataContext)?.Options ?? throw new ArgumentNullException();
+            (DataContext as FileSavePickerViewModel)?.Options 
+                ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
-        public FileSavePickerViewModel ViewModel => (FileSavePickerViewModel)DataContext;
+        /// <summary>
+        /// Gets the view model associated with this dialog.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
+        public FileSavePickerViewModel ViewModel => 
+            DataContext as FileSavePickerViewModel 
+                ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
         private void InitializeComponent()
         {

From 9bdc400ba29defb9cce3373c3bafc35db7875b6e Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:25:21 -0600
Subject: [PATCH 34/64] Update
 src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index b0eec632..a5554728 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -17,7 +17,13 @@ public FileOpenPicker(FilePickerOpenOptions options)
             InitializeComponent();
         }
 
-        public FileOpenPickerViewModel ViewModel => (FileOpenPickerViewModel)DataContext;
+        /// <summary>
+        /// Gets the view model associated with this picker.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
+        public FileOpenPickerViewModel ViewModel => 
+            DataContext as FileOpenPickerViewModel 
+            ?? throw new InvalidOperationException("DataContext is not properly initialized.");
 
         private void InitializeComponent()
         {

From dcb3c1a0e9a5d2574e34ebd170c4699d292dcb87 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:34:56 -0600
Subject: [PATCH 35/64] Update
 src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
index ce64d1b9..2eba8955 100644
--- a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -56,8 +56,7 @@ public Task<IStorageFolder> CreateFolderAsync(string name)
 
         public Task DeleteAsync()
         {
-            _directoryInfo.Delete();
-            return Task.CompletedTask;
+            return Task.Run(() => _directoryInfo.Delete());
         }
 
         public void Dispose()

From e83a7cb29566308f1262933784321392ccaad011 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:37:51 -0600
Subject: [PATCH 36/64] coderabbit changes

---
 src/Consolonia.Core/Controls/DialogWindow.cs                  | 4 ++--
 src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs          | 1 +
 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs       | 2 +-
 .../Infrastructure/ConsoloniaStorageProvider.cs               | 2 +-
 .../Gallery/GalleryViews/GalleryStorage.axaml.cs              | 2 +-
 src/Consolonia.NUnit/UnitTestConsole.cs                       | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Consolonia.Core/Controls/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
index 9ff83ab6..7498a4cf 100644
--- a/src/Consolonia.Core/Controls/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -166,7 +166,7 @@ public virtual void CloseDialog(object result = null)
         public async Task ShowDialogAsync(Control parent)
         {
             if (_taskCompletionSource != null)
-                throw new NotImplementedException();
+                throw new InvalidOperationException("Dialog is already shown.");
 
             _taskCompletionSource = new TaskCompletionSource<object>();
             ShowDialogInternal(parent);
@@ -176,7 +176,7 @@ public async Task ShowDialogAsync(Control parent)
         public async Task<T> ShowDialogAsync<T>(Control parent)
         {
             if (_taskCompletionSource != null)
-                throw new NotImplementedException();
+                throw new InvalidOperationException("Dialog is already shown.");
 
             _taskCompletionSource = new TaskCompletionSource<object>();
             ShowDialogInternal(parent);
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index a5554728..3e575fb5 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index d753dfd5..e3cdc31a 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -24,7 +24,7 @@ protected override bool FilterItem(IStorageItem item)
             if (item is IStorageFolder) return true;
             if (item is IStorageFile file)
             {
-                if (SelectedFileType.Patterns == null || SelectedFileType.Patterns.Count == 0)
+                if (SelectedFileType?.Patterns == null || SelectedFileType.Patterns.Count == 0)
                     return true;
 
                 foreach (string pattern in SelectedFileType.Patterns)
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index 963474d2..c0c1b086 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -82,7 +82,7 @@ public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnown
             {
                 WellKnownFolder.Desktop => Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
                 WellKnownFolder.Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                WellKnownFolder.Downloads => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                WellKnownFolder.Downloads => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
                 WellKnownFolder.Pictures => Environment.GetFolderPath(Environment.SpecialFolder.MyPictures),
                 WellKnownFolder.Music => Environment.GetFolderPath(Environment.SpecialFolder.MyMusic),
                 WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 38d1ae09..84e7e6f3 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -106,7 +106,7 @@ private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventA
             if (lifetime != null)
             {
                 var storageProvider = lifetime.MainWindow.StorageProvider;
-                if (storageProvider.CanOpen)
+                if (storageProvider.CanSave)
                 {
                     var file = await storageProvider.SaveFilePickerAsync(new FilePickerSaveOptions()
                     {
diff --git a/src/Consolonia.NUnit/UnitTestConsole.cs b/src/Consolonia.NUnit/UnitTestConsole.cs
index baf7b37d..a74040ac 100644
--- a/src/Consolonia.NUnit/UnitTestConsole.cs
+++ b/src/Consolonia.NUnit/UnitTestConsole.cs
@@ -94,9 +94,9 @@ public async Task StringInput(string input)
                 // todo: check why Yield is not enough: https://github.com/jinek/Consolonia/runs/7055199426?check_suite_focus=true
                 const ulong interval = 50;
                 KeyEvent?.Invoke(key, c, RawInputModifiers.None, true, timestamp);
-                await Task.Delay((int)interval);
+                await Task.Delay((int)interval).ConfigureAwait(false);
                 KeyEvent?.Invoke(key, c, RawInputModifiers.None, false, timestamp + interval);
-                await Task.Delay((int)interval);
+                await Task.Delay((int)interval).ConfigureAwait(false);
             }
 
             await WaitRendered().ConfigureAwait(true);

From e8c9cd6cc847be109e60c4557af01722a9eb3e7a Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:43:13 -0600
Subject: [PATCH 37/64] hmmm

---
 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index e3cdc31a..a6bdd04c 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -24,7 +24,7 @@ protected override bool FilterItem(IStorageItem item)
             if (item is IStorageFolder) return true;
             if (item is IStorageFile file)
             {
-                if (SelectedFileType?.Patterns == null || SelectedFileType.Patterns.Count == 0)
+                if (SelectedFileType == null || SelectedFileType.Patterns == null || SelectedFileType.Patterns.Count == 0)
                     return true;
 
                 foreach (string pattern in SelectedFileType.Patterns)

From 38a3906820654e8575953e0d9d8051b3986a4c11 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:46:12 -0600
Subject: [PATCH 38/64] this check is needed, ReSharper is smoking crack

---
 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index a6bdd04c..35b04c65 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -24,6 +24,7 @@ protected override bool FilterItem(IStorageItem item)
             if (item is IStorageFolder) return true;
             if (item is IStorageFile file)
             {
+                // ReSharper disable ConstantConditionalAccessQualifier
                 if (SelectedFileType == null || SelectedFileType.Patterns == null || SelectedFileType.Patterns.Count == 0)
                     return true;
 

From 98ec8622fff5d05cc271e29b6e5f6ae709dc43bf Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:49:12 -0600
Subject: [PATCH 39/64] fix unit test

---
 src/Tests/Consolonia.Core.Tests/StorageTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 455ce689..29bdfaf5 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -112,7 +112,7 @@ public async Task TestWellKnownFolder()
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
             if (folder != null)
-                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                Assert.AreEqual(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
                     folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);

From 9437f058ec2bc1f0cb652982dace95df8807100a Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:52:59 -0600
Subject: [PATCH 40/64] um

---
 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 35b04c65..44a27d57 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -25,7 +25,7 @@ protected override bool FilterItem(IStorageItem item)
             if (item is IStorageFile file)
             {
                 // ReSharper disable ConstantConditionalAccessQualifier
-                if (SelectedFileType == null || SelectedFileType.Patterns == null || SelectedFileType.Patterns.Count == 0)
+                if (SelectedFileType == null)
                     return true;
 
                 foreach (string pattern in SelectedFileType.Patterns)

From 6d6c133201ffc99f605274524a8535378b2b399f Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 00:58:16 -0600
Subject: [PATCH 41/64] no filter for save

---
 .../Controls/FileSavePickerViewModel.cs       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 44a27d57..0e1add2a 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -21,18 +21,18 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
 
         protected override bool FilterItem(IStorageItem item)
         {
-            if (item is IStorageFolder) return true;
-            if (item is IStorageFile file)
-            {
-                // ReSharper disable ConstantConditionalAccessQualifier
-                if (SelectedFileType == null)
-                    return true;
+            //if (item is IStorageFolder) return true;
+            //if (item is IStorageFile file)
+            //{
+            //    // ReSharper disable ConstantConditionalAccessQualifier
+            //    if (SelectedFileType == null)
+            //        return true;
 
-                foreach (string pattern in SelectedFileType.Patterns)
-                    if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
-                        return true;
-                return false;
-            }
+            //    foreach (string pattern in SelectedFileType.Patterns)
+            //        if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+            //            return true;
+            //    return false;
+            //}
 
             return true;
         }

From a0cd57480cd5374d1f42750c0dafc34669dd540f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 07:02:40 +0000
Subject: [PATCH 42/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 .../Controls/FileOpenPicker.axaml.cs               |  6 +++---
 .../Controls/FileSavePicker.axaml.cs               | 14 +++++++-------
 .../Infrastructure/ConsoloniaStorageProvider.cs    |  3 ++-
 src/Tests/Consolonia.Core.Tests/StorageTests.cs    |  3 ++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index 3e575fb5..98977bc3 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -19,11 +19,11 @@ public FileOpenPicker(FilePickerOpenOptions options)
         }
 
         /// <summary>
-        /// Gets the view model associated with this picker.
+        ///     Gets the view model associated with this picker.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
-        public FileOpenPickerViewModel ViewModel => 
-            DataContext as FileOpenPickerViewModel 
+        public FileOpenPickerViewModel ViewModel =>
+            DataContext as FileOpenPickerViewModel
             ?? throw new InvalidOperationException("DataContext is not properly initialized.");
 
         private void InitializeComponent()
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 25ab406f..3c897da3 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -19,20 +19,20 @@ public FileSavePicker(FilePickerSaveOptions options)
         }
 
         /// <summary>
-        /// Gets the file picker save options associated with this dialog.
+        ///     Gets the file picker save options associated with this dialog.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
         public FilePickerSaveOptions Options =>
-            (DataContext as FileSavePickerViewModel)?.Options 
-                ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
+            (DataContext as FileSavePickerViewModel)?.Options
+            ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
         /// <summary>
-        /// Gets the view model associated with this dialog.
+        ///     Gets the view model associated with this dialog.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
-        public FileSavePickerViewModel ViewModel => 
-            DataContext as FileSavePickerViewModel 
-                ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
+        public FileSavePickerViewModel ViewModel =>
+            DataContext as FileSavePickerViewModel
+            ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
         private void InitializeComponent()
         {
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
index c0c1b086..49d54b71 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -82,7 +82,8 @@ public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnown
             {
                 WellKnownFolder.Desktop => Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
                 WellKnownFolder.Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                WellKnownFolder.Downloads => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                WellKnownFolder.Downloads => Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
                 WellKnownFolder.Pictures => Environment.GetFolderPath(Environment.SpecialFolder.MyPictures),
                 WellKnownFolder.Music => Environment.GetFolderPath(Environment.SpecialFolder.MyMusic),
                 WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 29bdfaf5..c2180499 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -112,7 +112,8 @@ public async Task TestWellKnownFolder()
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
             if (folder != null)
-                Assert.AreEqual(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                Assert.AreEqual(
+                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
                     folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);

From d083d595212704f2e72d2ccb819c2b6154627fb3 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 01:14:50 -0600
Subject: [PATCH 43/64] rewrote the file handling for save dialog

---
 .../Controls/FileSavePicker.axaml             |  4 +--
 .../Controls/FileSavePicker.axaml.cs          | 27 +++++++++++++++++--
 .../Controls/FileSavePickerViewModel.cs       | 11 +++++++-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml b/src/Consolonia.Core/Controls/FileSavePicker.axaml
index f1a9164b..81554d4f 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml
@@ -45,7 +45,7 @@
               ColumnDefinitions="Auto *">
             <TextBlock Text="File:"
                        Margin="0 0 1 0" />
-            <TextBox Text="{Binding SelectedFile.Path.LocalPath}"
+            <TextBox Text="{Binding SavePath, Mode=TwoWay}"
                      Grid.Column="1" />
         </Grid>
         <StackPanel Grid.Row="3"
@@ -55,7 +55,7 @@
             <Button x:Name="SaveButton"
                     Content="Save"
                     Click="OnOK"
-                    IsEnabled="{Binding SelectedFile, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    IsEnabled="{Binding SavePath, Converter={x:Static ObjectConverters.IsNotNull}}" />
             <Button x:Name="CancelButton"
                     Content="Cancel"
                     Click="OnCancel" />
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 25ab406f..be45ca16 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -1,5 +1,8 @@
 using System;
+using System.IO;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
@@ -53,9 +56,29 @@ private void OnDoubleTapped(object sender, TappedEventArgs e)
             }
         }
 
-        private void OnOK(object sender, RoutedEventArgs e)
+        private async void OnOK(object sender, RoutedEventArgs e)
         {
-            CloseDialog(ViewModel.SelectedFile);
+            var lifetime = (IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime;
+            ArgumentNullException.ThrowIfNull(lifetime);
+
+            var savePath = ViewModel.SavePath;
+            if (!Path.IsPathFullyQualified(ViewModel.SavePath))
+            {
+                savePath = Path.GetFullPath(Path.Combine(ViewModel.CurrentFolder.Path.LocalPath, ViewModel.SavePath));
+            }
+
+            var file = await lifetime.MainWindow.StorageProvider.TryGetFileFromPathAsync(new Uri($"file://{savePath}"));
+            if (file == null)
+            {
+                var folder = await lifetime.MainWindow.StorageProvider.TryGetFolderFromPathAsync(new Uri($"file://{Path.GetDirectoryName(savePath)}"));
+                if (folder == null)
+                {
+                    CloseDialog();
+                    return;
+                }
+                file = await folder.CreateFileAsync(Path.GetFileName(savePath));    
+            }
+            CloseDialog(file);
         }
 
         private void OnCancel(object sender, RoutedEventArgs e)
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 0e1add2a..20ad6636 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -6,7 +6,7 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileSavePickerViewModel : PickerViewModelBase<FilePickerSaveOptions>
     {
-        [ObservableProperty] private FilePickerFileType _selectedFileType;
+        [ObservableProperty] private string _savePath;
 
         [ObservableProperty] [NotifyPropertyChangedFor(nameof(SelectedFile))]
         private IStorageItem _selectedItem;
@@ -15,6 +15,15 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
             ArgumentNullException.ThrowIfNull(options, nameof(options));
+            this.PropertyChanged += FileSavePickerViewModel_PropertyChanged; ;    
+        }
+
+        private void FileSavePickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SelectedFile))
+            {
+                SavePath = SelectedFile?.Path.LocalPath;
+            }
         }
 
         public IStorageFile SelectedFile => SelectedItem as IStorageFile;

From d30f6917ef835c357fecde705fe3dd857aad624d Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 01:23:17 -0600
Subject: [PATCH 44/64] null checks in new code

---
 .../Controls/FileSavePicker.axaml.cs          |  3 ++-
 .../Controls/FileSavePickerViewModel.cs       | 19 +++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 21d80aea..f12f76a6 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -58,8 +58,9 @@ private void OnDoubleTapped(object sender, TappedEventArgs e)
 
         private async void OnOK(object sender, RoutedEventArgs e)
         {
-            var lifetime = (IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime;
+            var lifetime = Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
             ArgumentNullException.ThrowIfNull(lifetime);
+            ArgumentNullException.ThrowIfNull(lifetime.MainWindow);
 
             var savePath = ViewModel.SavePath;
             if (!Path.IsPathFullyQualified(ViewModel.SavePath))
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 20ad6636..b8b42e9d 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -6,7 +6,7 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileSavePickerViewModel : PickerViewModelBase<FilePickerSaveOptions>
     {
-        [ObservableProperty] private string _savePath;
+        [ObservableProperty] private string _savePath=string.Empty;
 
         [ObservableProperty] [NotifyPropertyChangedFor(nameof(SelectedFile))]
         private IStorageItem _selectedItem;
@@ -15,14 +15,14 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
             ArgumentNullException.ThrowIfNull(options, nameof(options));
-            this.PropertyChanged += FileSavePickerViewModel_PropertyChanged; ;    
+            this.PropertyChanged += FileSavePickerViewModel_PropertyChanged; 
         }
 
         private void FileSavePickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(SelectedFile))
             {
-                SavePath = SelectedFile?.Path.LocalPath;
+                SavePath = SelectedFile.Path.LocalPath;
             }
         }
 
@@ -30,19 +30,6 @@ private void FileSavePickerViewModel_PropertyChanged(object sender, System.Compo
 
         protected override bool FilterItem(IStorageItem item)
         {
-            //if (item is IStorageFolder) return true;
-            //if (item is IStorageFile file)
-            //{
-            //    // ReSharper disable ConstantConditionalAccessQualifier
-            //    if (SelectedFileType == null)
-            //        return true;
-
-            //    foreach (string pattern in SelectedFileType.Patterns)
-            //        if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
-            //            return true;
-            //    return false;
-            //}
-
             return true;
         }
     }

From 55eee4184e9dd0166bf59bbc9839affc042a277f Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Mon, 25 Nov 2024 01:28:26 -0600
Subject: [PATCH 45/64] jesus

---
 src/Consolonia.Core/Controls/FileSavePicker.axaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index f12f76a6..a3786eff 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -58,9 +58,10 @@ private void OnDoubleTapped(object sender, TappedEventArgs e)
 
         private async void OnOK(object sender, RoutedEventArgs e)
         {
-            var lifetime = Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
             ArgumentNullException.ThrowIfNull(lifetime);
             ArgumentNullException.ThrowIfNull(lifetime.MainWindow);
+            ArgumentNullException.ThrowIfNull(lifetime.MainWindow.StorageProvider);
 
             var savePath = ViewModel.SavePath;
             if (!Path.IsPathFullyQualified(ViewModel.SavePath))

From adad00e822e4ac4b2e0c29764c93e19a1cc8fd42 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 07:31:36 +0000
Subject: [PATCH 46/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 .../Controls/FileSavePicker.axaml.cs             | 15 +++++++++------
 .../Controls/FileSavePickerViewModel.cs          | 16 +++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index a3786eff..e5279189 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -63,23 +63,26 @@ private async void OnOK(object sender, RoutedEventArgs e)
             ArgumentNullException.ThrowIfNull(lifetime.MainWindow);
             ArgumentNullException.ThrowIfNull(lifetime.MainWindow.StorageProvider);
 
-            var savePath = ViewModel.SavePath;
+            string savePath = ViewModel.SavePath;
             if (!Path.IsPathFullyQualified(ViewModel.SavePath))
-            {
                 savePath = Path.GetFullPath(Path.Combine(ViewModel.CurrentFolder.Path.LocalPath, ViewModel.SavePath));
-            }
 
-            var file = await lifetime.MainWindow.StorageProvider.TryGetFileFromPathAsync(new Uri($"file://{savePath}"));
+            IStorageFile file =
+                await lifetime.MainWindow.StorageProvider.TryGetFileFromPathAsync(new Uri($"file://{savePath}"));
             if (file == null)
             {
-                var folder = await lifetime.MainWindow.StorageProvider.TryGetFolderFromPathAsync(new Uri($"file://{Path.GetDirectoryName(savePath)}"));
+                IStorageFolder folder =
+                    await lifetime.MainWindow.StorageProvider.TryGetFolderFromPathAsync(
+                        new Uri($"file://{Path.GetDirectoryName(savePath)}"));
                 if (folder == null)
                 {
                     CloseDialog();
                     return;
                 }
-                file = await folder.CreateFileAsync(Path.GetFileName(savePath));    
+
+                file = await folder.CreateFileAsync(Path.GetFileName(savePath));
             }
+
             CloseDialog(file);
         }
 
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index b8b42e9d..0c501b14 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -6,7 +7,7 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileSavePickerViewModel : PickerViewModelBase<FilePickerSaveOptions>
     {
-        [ObservableProperty] private string _savePath=string.Empty;
+        [ObservableProperty] private string _savePath = string.Empty;
 
         [ObservableProperty] [NotifyPropertyChangedFor(nameof(SelectedFile))]
         private IStorageItem _selectedItem;
@@ -15,19 +16,16 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
             : base(options)
         {
             ArgumentNullException.ThrowIfNull(options, nameof(options));
-            this.PropertyChanged += FileSavePickerViewModel_PropertyChanged; 
+            PropertyChanged += FileSavePickerViewModel_PropertyChanged;
         }
 
-        private void FileSavePickerViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        public IStorageFile SelectedFile => SelectedItem as IStorageFile;
+
+        private void FileSavePickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SelectedFile))
-            {
-                SavePath = SelectedFile.Path.LocalPath;
-            }
+            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile.Path.LocalPath;
         }
 
-        public IStorageFile SelectedFile => SelectedItem as IStorageFile;
-
         protected override bool FilterItem(IStorageItem item)
         {
             return true;

From b27dcef45fc64a0b4cd0435c737e9b969232127d Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 12:20:54 -0800
Subject: [PATCH 47/64] add messagebox control

---
 src/Consolonia.Core/Consolonia.Core.csproj    |   5 -
 src/Consolonia.Core/Controls/DialogWindow.cs  |   2 +-
 .../Controls/FileOpenPicker.axaml.cs          |   2 +-
 .../Controls/FileSavePicker.axaml.cs          |   2 +-
 .../Controls/FolderPicker.axaml.cs            |   2 +-
 src/Consolonia.Core/Controls/MessageBox.axaml |  35 +++
 .../Controls/MessageBox.axaml.cs              | 218 ++++++++++++++++++
 .../GalleryViews/GalleryMessgeBox.axaml       |  20 ++
 .../GalleryViews/GalleryMessgeBox.axaml.cs    |  99 ++++++++
 .../GalleryViews/GalleryStorage.axaml.cs      |   4 +-
 .../Templates/Controls/DialogWindow.axaml     |   4 +-
 .../Controls/Helpers/SymbolsControl.cs        |  14 +-
 12 files changed, 388 insertions(+), 19 deletions(-)
 create mode 100644 src/Consolonia.Core/Controls/MessageBox.axaml
 create mode 100644 src/Consolonia.Core/Controls/MessageBox.axaml.cs
 create mode 100644 src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml
 create mode 100644 src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs

diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 9e65a4cf..18dd6b13 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -21,10 +21,5 @@
         <PackageReference Include="Wcwidth" Version="2.0.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Compile Update="Controls\FolderPicker.axaml.cs">
-        <DependentUpon>FolderPicker.axaml</DependentUpon>
-      </Compile>
-    </ItemGroup>
 
 </Project>
diff --git a/src/Consolonia.Core/Controls/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
index 7498a4cf..0c8dd64f 100644
--- a/src/Consolonia.Core/Controls/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -147,7 +147,7 @@ protected void ShowDialogInternal(Visual parent)
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             var window = sender as Window;
-            if (window != null)
+            if (window != null && WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
                 Width = (ushort)(window.Bounds.Width * .9);
                 Height = (ushort)(window.Bounds.Height * .9);
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index 98977bc3..ded8ffcb 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -22,7 +22,7 @@ public FileOpenPicker(FilePickerOpenOptions options)
         ///     Gets the view model associated with this picker.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
-        public FileOpenPickerViewModel ViewModel =>
+        private FileOpenPickerViewModel ViewModel =>
             DataContext as FileOpenPickerViewModel
             ?? throw new InvalidOperationException("DataContext is not properly initialized.");
 
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index a3786eff..76c6fd8b 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -33,7 +33,7 @@ public FileSavePicker(FilePickerSaveOptions options)
         ///     Gets the view model associated with this dialog.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
-        public FileSavePickerViewModel ViewModel =>
+        private FileSavePickerViewModel ViewModel =>
             DataContext as FileSavePickerViewModel
             ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index 03126f38..abef1151 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -18,7 +18,7 @@ public FolderPicker(FolderPickerOpenOptions options)
             InitializeComponent();
         }
 
-        public FolderPickerViewModel ViewModel => (FolderPickerViewModel)DataContext;
+        private FolderPickerViewModel ViewModel => (FolderPickerViewModel)DataContext;
 
         public FolderPickerOpenOptions Options =>
             ((FolderPickerViewModel)DataContext)?.Options ?? new FolderPickerOpenOptions();
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml b/src/Consolonia.Core/Controls/MessageBox.axaml
new file mode 100644
index 00000000..5bf0fccd
--- /dev/null
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml
@@ -0,0 +1,35 @@
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:MessageBoxViewModel"
+                       x:Class="Consolonia.Core.Controls.MessageBox"
+                       CancelOnEscape="True"
+                       WindowStartupLocation="CenterOwner"
+                       Title="{Binding Title}">
+    <Grid RowDefinitions="Auto Auto">
+        
+        <TextBlock Text="{Binding Text}" Margin="1"/>
+        
+        <WrapPanel HorizontalAlignment="Right" Grid.Row="1">
+            <Button x:Name="OkButton"
+                    Content="{Binding OkContent}"
+                    IsVisible="{Binding ShowOkButton}"
+                    Click="OnOk"/>
+            <Button x:Name="YesButton"
+                    Content="{Binding YesContent}"
+                    IsVisible="{Binding ShowYesButton}"
+                    Click="OnYes" />
+            <Button x:Name="NoButton"
+                    Content="{Binding NoContent}"
+                    IsVisible="{Binding ShowNoButton}"
+                    Click="OnNo" />
+            <Button x:Name="CancelButton"
+                    Content="{Binding CancelContent}"
+                    IsVisible="{Binding ShowCancelButton}"
+                    Click="OnCancel"/>
+        </WrapPanel>
+    </Grid>
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
new file mode 100644
index 00000000..0ad65c11
--- /dev/null
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Helpers;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class MessageBox : DialogWindow
+    {
+        public static readonly DirectProperty<MessageBox, object> OkProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Ok), mb => mb.Ok, (mb, value) => mb.Ok = value);
+
+        public static readonly DirectProperty<MessageBox, object> CancelProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Cancel), mb => mb.Cancel, (mb, value) => mb.Cancel = value);
+
+        public static readonly DirectProperty<MessageBox, object> YesProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Yes), mb => mb.Yes, (mb, value) => mb.Yes = value);
+
+        public static readonly DirectProperty<MessageBox, object> NoProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(No), mb => mb.No, (mb, value) => mb.No = value);
+
+        public static readonly DirectProperty<MessageBox, Mode> ModeProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, Mode>(nameof(Mode), mb => mb.Mode, (mb, value) => mb.Mode = value);
+
+        public MessageBox()
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            Loaded += (_, _) =>
+            {
+                (
+                    this.FindControl<Button>(nameof(OkButton)) ??
+                    this.FindControl<Button>(nameof(CancelButton)) ??
+                    this.FindControl<Button>(nameof(YesButton)) ??
+                    this.FindControl<Button>(nameof(NoButton))
+                )?.Focus();
+            };
+
+            InitializeComponent();
+        }
+
+        /// <summary>
+        ///     Gets the view model associated with this picker.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
+        private MessageBoxViewModel ViewModel =>
+            DataContext as MessageBoxViewModel
+            ?? throw new InvalidOperationException("DataContext is not properly initialized.");
+
+        private Mode _mode = Mode.Ok;
+        public Mode Mode
+        {
+            get => _mode;
+            set => SetAndRaise(ModeProperty, ref _mode, value);
+        }
+
+
+        private object _ok = "OK";
+        public object Ok
+        {
+            get => _ok;
+            set => SetAndRaise(OkProperty, ref _ok, value);
+        }
+
+        private object _cancel = "Cancel";
+        public object Cancel
+        {
+            get => _cancel;
+            set => SetAndRaise(CancelProperty, ref _cancel, value);
+        }
+
+        private object _yes = "Yes";
+        public object Yes
+        {
+            get => _yes;
+            set => SetAndRaise(YesProperty, ref _yes, value);
+        }
+
+        private object _no = "No";
+        public object No
+        {
+            get => _no;
+            set => SetAndRaise(NoProperty, ref _no, value);
+        }
+
+        public async Task<MessageBoxResult> ShowDialogAsync(Control parent, string text, string title = null)
+        {
+            DataContext = new MessageBoxViewModel(Mode, Ok, Cancel, Yes, No, text, title ?? this.Title);
+#nullable enable
+            var result = await ShowDialogAsync<MessageBoxResult?>(parent);
+            if (result.HasValue)
+            {
+                return result.Value;
+            }
+            return MessageBoxResult.Cancel;
+#nullable disable
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+
+        private void OnOk(object sender, RoutedEventArgs e)
+            => CloseDialog(MessageBoxResult.Ok);
+
+        private void OnCancel(object sender, RoutedEventArgs e)
+            => CloseDialog(MessageBoxResult.Cancel);
+
+        private void OnYes(object sender, RoutedEventArgs e)
+            => CloseDialog(MessageBoxResult.Yes);
+
+        private void OnNo(object sender, RoutedEventArgs e)
+            => CloseDialog(MessageBoxResult.No);
+    }
+
+    public enum Mode
+    {
+        /// <summary>
+        ///  Specifies that the message box contains an OK button.
+        /// </summary>
+        Ok,
+
+        /// <summary>
+        ///  Specifies that the message box contains OK and Cancel buttons.
+        /// </summary>
+        OkCancel,
+
+        /// <summary>
+        ///  Specifies that the message box contains Yes and No buttons.
+        /// </summary>
+        YesNo,
+
+        /// <summary>
+        ///  Specifies that the message box contains Yes, No, and Cancel buttons.
+        /// </summary>
+        YesNoCancel,
+    }
+
+    public enum MessageBoxResult
+    {
+        Ok,
+        Cancel,
+        Yes,
+        No
+    }
+
+    internal partial class MessageBoxViewModel : ObservableObject
+    {
+        internal MessageBoxViewModel(Mode mode, object okContent, object cancelContent, object yesContent, object noContent, string text, string title)
+        {
+            _mode = mode;
+            switch (mode)
+            {
+                case Mode.Ok:
+                    ShowOkButton = true;
+                    break;
+                case Mode.OkCancel:
+                    ShowOkButton = true;
+                    ShowCancelButton = true;
+                    break;
+                case Mode.YesNo:
+                    ShowYesButton = true;
+                    ShowNoButton = true;
+                    break;
+                case Mode.YesNoCancel:
+                    ShowYesButton = true;
+                    ShowNoButton = true;
+                    ShowCancelButton = true;
+                    break;
+            }
+            _okContent = okContent;
+            _cancelContent = cancelContent;
+            _yesContent = yesContent;
+            _noContent = noContent;
+            _text = text;
+            _title = title;
+        }
+
+        [ObservableProperty]
+        private Mode _mode;
+
+        [ObservableProperty]
+        private string _title;
+
+        [ObservableProperty]
+        private bool _showCancelButton;
+
+        [ObservableProperty]
+        private bool _showOkButton;
+
+        [ObservableProperty]
+        private bool _showYesButton;
+
+        [ObservableProperty]
+        private bool _showNoButton;
+
+        [ObservableProperty]
+        private object _okContent;
+
+        [ObservableProperty]
+        private object _cancelContent;
+
+        [ObservableProperty]
+        private object _yesContent;
+
+        [ObservableProperty]
+        private object _noContent;
+
+        [ObservableProperty]
+        private string _text;
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml
new file mode 100644
index 00000000..feea6111
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml
@@ -0,0 +1,20 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:gallery="clr-namespace:Consolonia.Gallery.Gallery.GalleryViews"
+             mc:Ignorable="d"
+             x:DataType="gallery:GalleryMessageBoxViewModel"
+             x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryMessageBox">
+
+    <StackPanel Orientation="Vertical">
+        <WrapPanel Orientation="Vertical" HorizontalAlignment="Left">
+            <Button Click="OnOk" >Show Ok</Button>
+            <Button Click="OnOkCancel" >Show Ok/Cancel</Button>
+            <Button Click="OnYesNo" >Show Yes/No</Button>
+            <Button Click="OnYesNoCancel" >Show Yes/No/Cancel</Button>
+            <Button Click="OnCustom" >Show Custom</Button>
+        </WrapPanel>
+        <TextBlock Text="{Binding Result}"/>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
new file mode 100644
index 00000000..a2e23d7f
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
@@ -0,0 +1,99 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Controls;
+
+namespace Consolonia.Gallery.Gallery.GalleryViews
+{
+    public partial class GalleryMessageBoxViewModel : ObservableObject
+    {
+        [ObservableProperty]
+        private string _result;
+    }
+
+    public partial class GalleryMessageBox : UserControl
+    {
+        public GalleryMessageBox()
+        {
+            InitializeComponent();
+        }
+
+        private GalleryMessageBoxViewModel ViewModel => (GalleryMessageBoxViewModel)DataContext;
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+            this.DataContext = new GalleryMessageBoxViewModel();
+        }
+
+        private async void OnOk(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.Ok,
+                Title = "OK Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "This is a message");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnOkCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.OkCancel,
+                Title = "Ok/Cancel Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "Do you want to OK or cancel?");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnYesNo(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.YesNo,
+                Title = "Yes/No Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "Do you want to?");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnYesNoCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.YesNoCancel,
+                Title = "Yes/No/Cancel Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "Do you want to, or cancel?");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnCustom(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+
+            var mb = new MessageBox()
+            {
+                Mode = Mode.YesNoCancel,
+                Title = "Custom OK content Message box",
+                Yes= new TextBlock()
+                {
+                    Text = "😁 Yes",
+                    Foreground = Brushes.Lime
+                },
+                No = new TextBlock()
+                {
+                    Text = "😒 No",
+                    Foreground = Brushes.Red
+                }
+            };
+            var result = await mb.ShowDialogAsync(this, "Custom OK button");
+            ViewModel.Result = result.ToString();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index 84e7e6f3..f9708986 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -27,7 +27,7 @@ public GalleryStorage()
             InitializeComponent();
         }
 
-        public GalleryStorageViewModel ViewModel => (GalleryStorageViewModel)DataContext;
+        private GalleryStorageViewModel ViewModel => (GalleryStorageViewModel)DataContext;
 
         private void InitializeComponent()
         {
@@ -73,7 +73,7 @@ private async Task OpenFiles(string title, bool allowMultiple)
 
         private async void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            await OpenFolders(title: "Selecct a folder", allowMultiple: false);
+            await OpenFolders(title: "Select a folder", allowMultiple: false);
         }
 
         private async void OnOpenMultipleFolders(object sender, Avalonia.Interactivity.RoutedEventArgs e)
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index 2b431603..db9bb040 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -62,12 +62,10 @@
                                         Margin="{DynamicResource ConsoloniaDialogWindowBorderMargin}"
                                         ZIndex="10"
                                         Orientation="Horizontal">
-                                <helpers:SymbolsControl Text="{TemplateBinding Icon}"
+                                <helpers:SymbolsControl Text="{TemplateBinding Icon}" IsVisible="{Binding Icon.Length}"
                                                         Foreground="{TemplateBinding BorderBrush}" />
                                 <TextBlock Text="{TemplateBinding Title}"
                                            Margin="1 0 0 0" />
-                                <helpers:SymbolsControl Text=" "
-                                                        Foreground="{TemplateBinding BorderBrush}" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal"
                                         ZIndex="10"
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
index 04c1e199..47bd7138 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
@@ -6,6 +6,7 @@
 using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
+using Consolonia.Core.Helpers;
 using Consolonia.Core.Text;
 using TextShaper = Consolonia.Core.Text.TextShaper;
 
@@ -92,15 +93,18 @@ public override void Render(DrawingContext context)
             }
             else
             {
-                var formattedText = new FormattedText(
+                if (Text != null && Text.Length > 0)
+                {
+                    // Draw the text as a repeating pattern
+                    var formattedText = new FormattedText(
                     string.Concat(
-                        Enumerable.Repeat(
-                            Text?[0] ?? ' ', (int)Bounds.Width)),
+                        Enumerable.Repeat(Text, (int)Bounds.Width / Text.MeasureText())),
                     CultureInfo.CurrentCulture,
                     FlowDirection.LeftToRight,
                     Typeface.Default, 1, Foreground);
-                for (int y = 0; y < Bounds.Height; y++)
-                    context.DrawText(formattedText, new Point(0, y));
+                    for (int y = 0; y < Bounds.Height; y++)
+                        context.DrawText(formattedText, new Point(0, y));
+                }
             }
         }
 

From 6db37e3740a11a4dfc6252912e4e87925bb85103 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 12:27:21 -0800
Subject: [PATCH 48/64] change to stack panel

---
 src/Consolonia.Core/Controls/MessageBox.axaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml b/src/Consolonia.Core/Controls/MessageBox.axaml
index 5bf0fccd..83794e59 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml
@@ -13,7 +13,7 @@
         
         <TextBlock Text="{Binding Text}" Margin="1"/>
         
-        <WrapPanel HorizontalAlignment="Right" Grid.Row="1">
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1">
             <Button x:Name="OkButton"
                     Content="{Binding OkContent}"
                     IsVisible="{Binding ShowOkButton}"
@@ -30,6 +30,6 @@
                     Content="{Binding CancelContent}"
                     IsVisible="{Binding ShowCancelButton}"
                     Click="OnCancel"/>
-        </WrapPanel>
+        </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file

From f2e6352f648b008af33b070f0e046f103cd84c97 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 12:34:06 -0800
Subject: [PATCH 49/64] lint

---
 src/Consolonia.Core/Controls/MessageBox.axaml    |  1 -
 src/Consolonia.Core/Controls/MessageBox.axaml.cs | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml b/src/Consolonia.Core/Controls/MessageBox.axaml
index 83794e59..9b32752e 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml
@@ -1,6 +1,5 @@
 <controls:DialogWindow xmlns="https://github.com/avaloniaui"
                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
                        xmlns:controls="clr-namespace:Consolonia.Core.Controls"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index 0ad65c11..61079e00 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -1,11 +1,9 @@
-using System;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.ComponentModel;
-using Consolonia.Core.Helpers;
 
 namespace Consolonia.Core.Controls
 {
@@ -43,14 +41,6 @@ public MessageBox()
             InitializeComponent();
         }
 
-        /// <summary>
-        ///     Gets the view model associated with this picker.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
-        private MessageBoxViewModel ViewModel =>
-            DataContext as MessageBoxViewModel
-            ?? throw new InvalidOperationException("DataContext is not properly initialized.");
-
         private Mode _mode = Mode.Ok;
         public Mode Mode
         {

From 6c796b0ebf623db96a1b234c3674fe42e3de21a4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 20:38:54 +0000
Subject: [PATCH 50/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 src/Consolonia.Core/Controls/MessageBox.axaml |  15 ++-
 .../Controls/MessageBox.axaml.cs              | 118 +++++++++---------
 .../Templates/Controls/DialogWindow.axaml     |   3 +-
 .../Controls/Helpers/SymbolsControl.cs        |  10 +-
 4 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml b/src/Consolonia.Core/Controls/MessageBox.axaml
index 9b32752e..b5f09228 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml
@@ -9,14 +9,17 @@
                        WindowStartupLocation="CenterOwner"
                        Title="{Binding Title}">
     <Grid RowDefinitions="Auto Auto">
-        
-        <TextBlock Text="{Binding Text}" Margin="1"/>
-        
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1">
+
+        <TextBlock Text="{Binding Text}"
+                   Margin="1" />
+
+        <StackPanel Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Grid.Row="1">
             <Button x:Name="OkButton"
                     Content="{Binding OkContent}"
                     IsVisible="{Binding ShowOkButton}"
-                    Click="OnOk"/>
+                    Click="OnOk" />
             <Button x:Name="YesButton"
                     Content="{Binding YesContent}"
                     IsVisible="{Binding ShowYesButton}"
@@ -28,7 +31,7 @@
             <Button x:Name="CancelButton"
                     Content="{Binding CancelContent}"
                     IsVisible="{Binding ShowCancelButton}"
-                    Click="OnCancel"/>
+                    Click="OnCancel" />
         </StackPanel>
     </Grid>
 </controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index 61079e00..3cb86b4c 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -13,16 +13,30 @@ public partial class MessageBox : DialogWindow
             AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Ok), mb => mb.Ok, (mb, value) => mb.Ok = value);
 
         public static readonly DirectProperty<MessageBox, object> CancelProperty =
-            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Cancel), mb => mb.Cancel, (mb, value) => mb.Cancel = value);
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Cancel), mb => mb.Cancel,
+                (mb, value) => mb.Cancel = value);
 
         public static readonly DirectProperty<MessageBox, object> YesProperty =
-            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Yes), mb => mb.Yes, (mb, value) => mb.Yes = value);
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Yes), mb => mb.Yes,
+                (mb, value) => mb.Yes = value);
 
         public static readonly DirectProperty<MessageBox, object> NoProperty =
             AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(No), mb => mb.No, (mb, value) => mb.No = value);
 
         public static readonly DirectProperty<MessageBox, Mode> ModeProperty =
-            AvaloniaProperty.RegisterDirect<MessageBox, Mode>(nameof(Mode), mb => mb.Mode, (mb, value) => mb.Mode = value);
+            AvaloniaProperty.RegisterDirect<MessageBox, Mode>(nameof(Mode), mb => mb.Mode,
+                (mb, value) => mb.Mode = value);
+
+        private object _cancel = "Cancel";
+
+        private Mode _mode = Mode.Ok;
+
+        private object _no = "No";
+
+
+        private object _ok = "OK";
+
+        private object _yes = "Yes";
 
         public MessageBox()
         {
@@ -41,36 +55,30 @@ public MessageBox()
             InitializeComponent();
         }
 
-        private Mode _mode = Mode.Ok;
         public Mode Mode
         {
             get => _mode;
             set => SetAndRaise(ModeProperty, ref _mode, value);
         }
 
-
-        private object _ok = "OK";
         public object Ok
         {
             get => _ok;
             set => SetAndRaise(OkProperty, ref _ok, value);
         }
 
-        private object _cancel = "Cancel";
         public object Cancel
         {
             get => _cancel;
             set => SetAndRaise(CancelProperty, ref _cancel, value);
         }
 
-        private object _yes = "Yes";
         public object Yes
         {
             get => _yes;
             set => SetAndRaise(YesProperty, ref _yes, value);
         }
 
-        private object _no = "No";
         public object No
         {
             get => _no;
@@ -79,13 +87,10 @@ public object No
 
         public async Task<MessageBoxResult> ShowDialogAsync(Control parent, string text, string title = null)
         {
-            DataContext = new MessageBoxViewModel(Mode, Ok, Cancel, Yes, No, text, title ?? this.Title);
+            DataContext = new MessageBoxViewModel(Mode, Ok, Cancel, Yes, No, text, title ?? Title);
 #nullable enable
             var result = await ShowDialogAsync<MessageBoxResult?>(parent);
-            if (result.HasValue)
-            {
-                return result.Value;
-            }
+            if (result.HasValue) return result.Value;
             return MessageBoxResult.Cancel;
 #nullable disable
         }
@@ -97,39 +102,47 @@ private void InitializeComponent()
 
 
         private void OnOk(object sender, RoutedEventArgs e)
-            => CloseDialog(MessageBoxResult.Ok);
+        {
+            CloseDialog(MessageBoxResult.Ok);
+        }
 
         private void OnCancel(object sender, RoutedEventArgs e)
-            => CloseDialog(MessageBoxResult.Cancel);
+        {
+            CloseDialog(MessageBoxResult.Cancel);
+        }
 
         private void OnYes(object sender, RoutedEventArgs e)
-            => CloseDialog(MessageBoxResult.Yes);
+        {
+            CloseDialog(MessageBoxResult.Yes);
+        }
 
         private void OnNo(object sender, RoutedEventArgs e)
-            => CloseDialog(MessageBoxResult.No);
+        {
+            CloseDialog(MessageBoxResult.No);
+        }
     }
 
     public enum Mode
     {
         /// <summary>
-        ///  Specifies that the message box contains an OK button.
+        ///     Specifies that the message box contains an OK button.
         /// </summary>
         Ok,
 
         /// <summary>
-        ///  Specifies that the message box contains OK and Cancel buttons.
+        ///     Specifies that the message box contains OK and Cancel buttons.
         /// </summary>
         OkCancel,
 
         /// <summary>
-        ///  Specifies that the message box contains Yes and No buttons.
+        ///     Specifies that the message box contains Yes and No buttons.
         /// </summary>
         YesNo,
 
         /// <summary>
-        ///  Specifies that the message box contains Yes, No, and Cancel buttons.
+        ///     Specifies that the message box contains Yes, No, and Cancel buttons.
         /// </summary>
-        YesNoCancel,
+        YesNoCancel
     }
 
     public enum MessageBoxResult
@@ -142,7 +155,30 @@ public enum MessageBoxResult
 
     internal partial class MessageBoxViewModel : ObservableObject
     {
-        internal MessageBoxViewModel(Mode mode, object okContent, object cancelContent, object yesContent, object noContent, string text, string title)
+        [ObservableProperty] private object _cancelContent;
+
+        [ObservableProperty] private Mode _mode;
+
+        [ObservableProperty] private object _noContent;
+
+        [ObservableProperty] private object _okContent;
+
+        [ObservableProperty] private bool _showCancelButton;
+
+        [ObservableProperty] private bool _showNoButton;
+
+        [ObservableProperty] private bool _showOkButton;
+
+        [ObservableProperty] private bool _showYesButton;
+
+        [ObservableProperty] private string _text;
+
+        [ObservableProperty] private string _title;
+
+        [ObservableProperty] private object _yesContent;
+
+        internal MessageBoxViewModel(Mode mode, object okContent, object cancelContent, object yesContent,
+            object noContent, string text, string title)
         {
             _mode = mode;
             switch (mode)
@@ -164,6 +200,7 @@ internal MessageBoxViewModel(Mode mode, object okContent, object cancelContent,
                     ShowCancelButton = true;
                     break;
             }
+
             _okContent = okContent;
             _cancelContent = cancelContent;
             _yesContent = yesContent;
@@ -171,38 +208,5 @@ internal MessageBoxViewModel(Mode mode, object okContent, object cancelContent,
             _text = text;
             _title = title;
         }
-
-        [ObservableProperty]
-        private Mode _mode;
-
-        [ObservableProperty]
-        private string _title;
-
-        [ObservableProperty]
-        private bool _showCancelButton;
-
-        [ObservableProperty]
-        private bool _showOkButton;
-
-        [ObservableProperty]
-        private bool _showYesButton;
-
-        [ObservableProperty]
-        private bool _showNoButton;
-
-        [ObservableProperty]
-        private object _okContent;
-
-        [ObservableProperty]
-        private object _cancelContent;
-
-        [ObservableProperty]
-        private object _yesContent;
-
-        [ObservableProperty]
-        private object _noContent;
-
-        [ObservableProperty]
-        private string _text;
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index db9bb040..fa08b57f 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -62,7 +62,8 @@
                                         Margin="{DynamicResource ConsoloniaDialogWindowBorderMargin}"
                                         ZIndex="10"
                                         Orientation="Horizontal">
-                                <helpers:SymbolsControl Text="{TemplateBinding Icon}" IsVisible="{Binding Icon.Length}"
+                                <helpers:SymbolsControl Text="{TemplateBinding Icon}"
+                                                        IsVisible="{Binding Icon.Length}"
                                                         Foreground="{TemplateBinding BorderBrush}" />
                                 <TextBlock Text="{TemplateBinding Title}"
                                            Margin="1 0 0 0" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
index 47bd7138..5aad9256 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
@@ -97,11 +97,11 @@ public override void Render(DrawingContext context)
                 {
                     // Draw the text as a repeating pattern
                     var formattedText = new FormattedText(
-                    string.Concat(
-                        Enumerable.Repeat(Text, (int)Bounds.Width / Text.MeasureText())),
-                    CultureInfo.CurrentCulture,
-                    FlowDirection.LeftToRight,
-                    Typeface.Default, 1, Foreground);
+                        string.Concat(
+                            Enumerable.Repeat(Text, (int)Bounds.Width / Text.MeasureText())),
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        Typeface.Default, 1, Foreground);
                     for (int y = 0; y < Bounds.Height; y++)
                         context.DrawText(formattedText, new Point(0, y));
                 }

From d8d993b9e05acd06eddfe63163008736af9a1b7b Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 12:40:43 -0800
Subject: [PATCH 51/64] added default constructors for lint

---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs | 6 ++++++
 src/Consolonia.Core/Controls/FileSavePicker.axaml.cs | 4 ++++
 src/Consolonia.Core/Controls/FolderPicker.axaml.cs   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index ded8ffcb..9b671593 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
@@ -9,6 +10,11 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileOpenPicker : DialogWindow
     {
+        public FileOpenPicker()
+            : this(new FilePickerOpenOptions())
+        {
+        }
+
         public FileOpenPicker(FilePickerOpenOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 6586628c..b20b4b27 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -12,6 +12,10 @@ namespace Consolonia.Core.Controls
 {
     public partial class FileSavePicker : DialogWindow
     {
+        public FileSavePicker()
+            : this(new FilePickerSaveOptions())
+        {
+        }
         public FileSavePicker(FilePickerSaveOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index abef1151..0305914d 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -9,6 +9,11 @@ namespace Consolonia.Core.Controls
 {
     public partial class FolderPicker : DialogWindow
     {
+        public FolderPicker()
+            : this(new FolderPickerOpenOptions())
+        {
+        }
+
         public FolderPicker(FolderPickerOpenOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;

From d28652754025f05f3bcbec4ca5379223f1a631d7 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 12:48:31 -0800
Subject: [PATCH 52/64] I totally don't understand why this was still there.

---
 src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index 9b671593..e305cbfe 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;

From 519d4519afc033b8cccb6bcc60c262070ce4a4a2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 20:52:59 +0000
Subject: [PATCH 53/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 src/Consolonia.Core/Controls/FileSavePicker.axaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index b20b4b27..d9061728 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -16,6 +16,7 @@ public FileSavePicker()
             : this(new FilePickerSaveOptions())
         {
         }
+
         public FileSavePicker(FilePickerSaveOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;

From 0a33999241b5043fb875bbd86705753eb23279ee Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 13:33:56 -0800
Subject: [PATCH 54/64] Remove InitializeComponent generated function as it's
 not only not used in 11.x avalonia but it breaks initalization of named
 controls. This is why we had to do .FindControl() instead of just the x:Name
 of the control.

---
 .../Controls/Dialog/DialogWrap.axaml.cs       |  6 ----
 .../Controls/FileOpenPicker.axaml.cs          |  8 +----
 .../Controls/FileSavePicker.axaml.cs          |  8 +----
 .../Controls/FileSavePickerViewModel.cs       |  2 +-
 .../Controls/FolderPicker.axaml               |  2 +-
 .../Controls/FolderPicker.axaml.cs            |  8 +----
 .../Controls/MessageBox.axaml.cs              | 26 ++++++----------
 .../GalleryAnimatedLines.axaml.cs             |  6 ----
 .../GalleryViews/GalleryButton.axaml.cs       |  5 ----
 .../GalleryViews/GalleryCalendar.axaml.cs     |  7 +----
 .../GalleryCalendarPicker.axaml.cs            |  7 +----
 .../GalleryViews/GalleryCanvas.axaml.cs       |  5 ----
 .../GalleryViews/GalleryCheckBox.axaml.cs     |  5 ----
 .../GalleryViews/GalleryColors.axaml.cs       |  6 ----
 .../GalleryViews/GalleryComboBox.axaml.cs     | 13 ++------
 .../GalleryViews/GalleryDataGrid.axaml.cs     | 30 +++++++------------
 .../GalleryViews/GalleryDialog.axaml.cs       |  6 ----
 .../GalleryViews/GalleryFlyout.axaml.cs       |  5 ----
 .../GalleryGradientBrush.axaml.cs             | 12 ++------
 .../GalleryViews/GalleryImage.axaml.cs        |  6 ----
 .../GalleryViews/GalleryListBox.axaml.cs      |  5 ----
 .../Gallery/GalleryViews/GalleryMenu.axaml.cs |  6 ----
 .../GalleryViews/GalleryMessgeBox.axaml.cs    |  9 +-----
 .../GalleryViews/GalleryProgressBar.axaml.cs  |  5 ----
 .../GalleryViews/GalleryRadioButton.axaml.cs  |  5 ----
 .../GalleryViews/GalleryScrollViewer.axaml.cs |  9 ------
 .../GalleryViews/GalleryStorage.axaml.cs      |  8 +----
 .../GalleryViews/GalleryTabControl.axaml.cs   |  5 ----
 .../GalleryViews/GalleryTextBlock.axaml.cs    |  5 ----
 .../GalleryViews/GalleryTextBox.axaml.cs      | 10 -------
 .../GalleryViews/GalleryWelcome.axaml.cs      |  5 ----
 .../GalleryViews/SomeDialogWindow.axaml.cs    | 14 ++-------
 .../View/ControlsListView.axaml.cs            | 17 +++--------
 src/Example/App.axaml.cs                      |  6 ----
 src/Example/Views/DataGridTestWindow.axaml    |  2 +-
 src/Example/Views/DataGridTestWindow.axaml.cs | 10 ++-----
 36 files changed, 43 insertions(+), 251 deletions(-)

diff --git a/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
index 2668a645..45e8b518 100644
--- a/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
@@ -4,7 +4,6 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml;
 using Avalonia.Reactive;
 using Avalonia.VisualTree;
 
@@ -51,11 +50,6 @@ private void SetNewSize(Size newSize)
             Height = newSize.Height;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public void SetContent(DialogWindow dialogWindow)
         {
             FoundContentPresenter.Content = dialogWindow;
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
index e305cbfe..d8fec347 100644
--- a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -2,7 +2,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Controls
@@ -18,9 +17,9 @@ public FileOpenPicker(FilePickerOpenOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) => { this.FindControl<Button>("CancelButton")?.Focus(); };
             DataContext = new FileOpenPickerViewModel(options);
             InitializeComponent();
+            CancelButton.Focus();
         }
 
         /// <summary>
@@ -31,11 +30,6 @@ public FileOpenPicker(FilePickerOpenOptions options)
             DataContext as FileOpenPickerViewModel
             ?? throw new InvalidOperationException("DataContext is not properly initialized.");
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void OnDoubleTapped(object sender, TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index b20b4b27..5a018c48 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -5,7 +5,6 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 
 namespace Consolonia.Core.Controls
@@ -20,9 +19,9 @@ public FileSavePicker(FilePickerSaveOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) => { this.FindControl<Button>("CancelButton")?.Focus(); };
             DataContext = new FileSavePickerViewModel(options);
             InitializeComponent();
+            this.CancelButton.Focus();
         }
 
         /// <summary>
@@ -41,11 +40,6 @@ public FileSavePicker(FilePickerSaveOptions options)
             DataContext as FileSavePickerViewModel
             ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void OnDoubleTapped(object sender, TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 0c501b14..fc441517 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -23,7 +23,7 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
 
         private void FileSavePickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile.Path.LocalPath;
+            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile?.Path.LocalPath;
         }
 
         protected override bool FilterItem(IStorageItem item)
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml b/src/Consolonia.Core/Controls/FolderPicker.axaml
index 705754ed..4c4347c0 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml
@@ -51,7 +51,7 @@
                     Content="OK"
                     Click="OnOK"
                     IsEnabled="{Binding HasSelection}" />
-            <Button x:Name="CancelButton"
+            <Button Name="CancelButton"
                     Content="Cancel"
                     Click="OnCancel" />
         </StackPanel>
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
index 0305914d..3999c12f 100644
--- a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using Consolonia.Core.Infrastructure;
 
@@ -18,9 +17,9 @@ public FolderPicker(FolderPickerOpenOptions options)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) => { this.FindControl<Button>("CancelButton")?.Focus(); };
             DataContext = new FolderPickerViewModel(options);
             InitializeComponent();
+            CancelButton.Focus();
         }
 
         private FolderPickerViewModel ViewModel => (FolderPickerViewModel)DataContext;
@@ -28,11 +27,6 @@ public FolderPicker(FolderPickerOpenOptions options)
         public FolderPickerOpenOptions Options =>
             ((FolderPickerViewModel)DataContext)?.Options ?? new FolderPickerOpenOptions();
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void OnDoubleTapped(object sender, TappedEventArgs e)
         {
             var listbox = (ListBox)sender;
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index 3cb86b4c..d0465781 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -2,7 +2,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Consolonia.Core.Controls
@@ -42,17 +41,16 @@ public MessageBox()
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
-            Loaded += (_, _) =>
-            {
-                (
-                    this.FindControl<Button>(nameof(OkButton)) ??
-                    this.FindControl<Button>(nameof(CancelButton)) ??
-                    this.FindControl<Button>(nameof(YesButton)) ??
-                    this.FindControl<Button>(nameof(NoButton))
-                )?.Focus();
-            };
-
             InitializeComponent();
+
+            if (OkButton.IsVisible)
+                OkButton.Focus();
+            else if (CancelButton.IsVisible)
+                CancelButton.Focus();
+            else if (YesButton.IsVisible)
+                YesButton.Focus();
+            else if (NoButton.IsVisible)
+                NoButton.Focus();
         }
 
         public Mode Mode
@@ -95,12 +93,6 @@ public async Task<MessageBoxResult> ShowDialogAsync(Control parent, string text,
 #nullable disable
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
         private void OnOk(object sender, RoutedEventArgs e)
         {
             CloseDialog(MessageBoxResult.Ok);
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs
index 507833ea..24cde639 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs
@@ -3,7 +3,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
@@ -16,11 +15,6 @@ public GalleryAnimatedLines()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         // ReSharper disable UnusedParameter.Local
         private async void PauseButton_OnClick(object _, RoutedEventArgs _2)
             // ReSharper restore UnusedParameter.Local
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs
index dfe84a0d..15ab6006 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryButton()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs
index b4e2ca33..3de08651 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs
@@ -1,6 +1,5 @@
-using System;
+using System;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -20,9 +19,5 @@ public GalleryCalendar()
             cal2.BlackoutDates.Add(new CalendarDateRange(today.AddDays(6)));
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs
index 112474c1..b1b2e693 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.CompilerServices;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -27,10 +26,6 @@ public GalleryCalendarPicker()
             dp4.TemplateApplied += (_, _) => { dp4.BlackoutDates?.AddDatesInPast(); };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 
     public sealed class GalleryCalendarPickerDataContext : INotifyPropertyChanged
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs
index 1b39035e..806e1d36 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryCanvas()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs
index 425d38b2..ce9652f2 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryCheckBox()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs
index 48dfb914..53cdb5b5 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Consolonia.Core.Drawing;
 
@@ -17,11 +16,6 @@ public GalleryColors()
             this.DataContext = new RGBModel() { Color = Color.FromRgb((byte)rnd.Next(255), (byte)rnd.Next(255), (byte)rnd.Next(255)) };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void Random_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             Random rnd = new Random();
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs
index cb07a61c..2deff62f 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Linq;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -12,19 +11,13 @@ public partial class GalleryComboBox : UserControl
         public GalleryComboBox()
         {
             InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
 
-            var fontComboBox = this.Find<ComboBox>("VarsComboBox");
-
-            fontComboBox.ItemsSource = Environment.GetEnvironmentVariables()
+            VarsComboBox.ItemsSource = Environment.GetEnvironmentVariables()
                 .Cast<DictionaryEntry>()
                 .Select(environmentVariable => environmentVariable.Key + "=" + environmentVariable.Value).ToList();
 
-            fontComboBox.SelectedIndex = 0;
+            VarsComboBox.SelectedIndex = 0;
         }
+
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs
index ee219e32..8b5bfea7 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs
@@ -8,7 +8,6 @@
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Data.Converters;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Consolonia.Core.Drawing;
 
@@ -30,10 +29,9 @@ public GalleryDataGrid()
                 ListSortDirection.Ascending, new ReversedStringComparer());
             var collectionView1 = new DataGridCollectionView(Countries.All);
             collectionView1.SortDescriptions.Add(dataGridSortDescription);
-            var dg1 = this.FindControl<DataGrid>("DataGrid1");
-            dg1.IsReadOnly = true;
-            dg1.LoadingRow += Dg1_LoadingRow;
-            dg1.Sorting += (_, a) =>
+            DataGrid1.IsReadOnly = true;
+            DataGrid1.LoadingRow += DataGrid1_LoadingRow;
+            DataGrid1.Sorting += (_, a) =>
             {
                 var binding = (a.Column as DataGridBoundColumn)?.Binding as Binding;
 
@@ -42,18 +40,16 @@ public GalleryDataGrid()
                     && !collectionView1.SortDescriptions.Contains(dataGridSortDescription))
                     collectionView1.SortDescriptions.Add(dataGridSortDescription);
             };
-            dg1.ItemsSource = collectionView1;
+            DataGrid1.ItemsSource = collectionView1;
 
-            var dg2 = this.FindControl<DataGrid>("DataGridGrouping");
-            dg2.IsReadOnly = true;
+            DataGridGrouping.IsReadOnly = true;
 
             var collectionView2 = new DataGridCollectionView(Countries.All);
             collectionView2.GroupDescriptions.Add(new DataGridPathGroupDescription("Region"));
 
-            dg2.ItemsSource = collectionView2;
+            DataGridGrouping.ItemsSource = collectionView2;
 
-            var dg3 = this.FindControl<DataGrid>("DataGridEdit");
-            dg3.IsReadOnly = false;
+            DataGridEdit.IsReadOnly = false;
 
             var items = new List<Person>
             {
@@ -63,23 +59,17 @@ public GalleryDataGrid()
             };
             var collectionView3 = new DataGridCollectionView(items);
 
-            dg3.ItemsSource = collectionView3;
+            DataGridEdit.ItemsSource = collectionView3;
 
-            var addButton = this.FindControl<Button>("BtnAdd");
-            addButton.Click += (_, _) => collectionView3.AddNew();
+            BtnAdd.Click += (_, _) => collectionView3.AddNew();
         }
 
         // ReSharper disable once MemberCanBeMadeStatic.Local
-        private void Dg1_LoadingRow(object sender, DataGridRowEventArgs e)
+        private void DataGrid1_LoadingRow(object sender, DataGridRowEventArgs e)
         {
             e.Row.Header = e.Row.GetIndex() + 1;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private class ReversedStringComparer : IComparer<object>, IComparer
         {
             public int Compare(object x, object y)
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
index c91ff380..612ccbd0 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
@@ -2,7 +2,6 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -13,11 +12,6 @@ public GalleryDialog()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         // ReSharper disable UnusedParameter.Local
         private async void Button_OnClick(object _, RoutedEventArgs e)
             // ReSharper restore UnusedParameter.Local
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs
index 7a078ad4..90b41f5c 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryFlyout()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs
index d2f59d7b..ed372284 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
@@ -12,14 +11,9 @@ public GalleryGradientBrush()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void Linear_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.FindControl<Grid>("MyGrid").Background = new LinearGradientBrush
+            this.MyGrid.Background = new LinearGradientBrush
             {
                 StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
                 EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
@@ -33,7 +27,7 @@ private void Linear_Click(object sender, Avalonia.Interactivity.RoutedEventArgs
 
         private void Radial_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.FindControl<Grid>("MyGrid").Background = new RadialGradientBrush
+            this.MyGrid.Background = new RadialGradientBrush
             {
                 Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
                 GradientOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
@@ -48,7 +42,7 @@ private void Radial_Click(object sender, Avalonia.Interactivity.RoutedEventArgs
         private void Conic_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
 
-            this.FindControl<Grid>("MyGrid").Background = new ConicGradientBrush
+            this.MyGrid.Background = new ConicGradientBrush
             {
                 Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
                 Angle = 0,
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs
index f70812d4..267c9688 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,10 +9,5 @@ public GalleryImage()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs
index 0a847ece..d46892f7 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -12,9 +11,5 @@ public GalleryListBox()
             DataContext = new ListBoxPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs
index bdf04dea..899b5ec2 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -14,11 +13,6 @@ public GalleryMenu()
             DataContext = new MenuPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
index a2e23d7f..71ee6161 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Consolonia.Core.Controls;
@@ -18,16 +16,11 @@ public partial class GalleryMessageBox : UserControl
         public GalleryMessageBox()
         {
             InitializeComponent();
+            this.DataContext = new GalleryMessageBoxViewModel();
         }
 
         private GalleryMessageBoxViewModel ViewModel => (GalleryMessageBoxViewModel)DataContext;
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-            this.DataContext = new GalleryMessageBoxViewModel();
-        }
-
         private async void OnOk(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             var mb = new MessageBox()
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs
index aebc076a..c1435192 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryProgressBar()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs
index 5f3c5de1..dfa597de 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryRadioButton()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs
index 4dc2d3fd..0a100f5c 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs
@@ -1,13 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 // ReSharper disable UnusedMember.Global
 
@@ -25,10 +20,6 @@ public GalleryScrollViewer()
             DataContext = new ScrollViewerPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 
     public class ScrollViewerPageViewModel : ViewModelBase
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
index f9708986..4d7a7206 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Consolonia.Core.Infrastructure;
@@ -25,16 +24,11 @@ public partial class GalleryStorage : UserControl
         public GalleryStorage()
         {
             InitializeComponent();
+            this.DataContext = new GalleryStorageViewModel();
         }
 
         private GalleryStorageViewModel ViewModel => (GalleryStorageViewModel)DataContext;
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-            this.DataContext = new GalleryStorageViewModel();
-        }
-
         private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             await OpenFiles("Open file", allowMultiple: false);
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs
index 2ff611b3..1c3023bb 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
@@ -36,10 +35,6 @@ public GalleryTabControl()
             };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 
     public class PageViewModel : ViewModelBase
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs
index df05e8d8..16bd25fd 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryTextBlock()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs
index ed51c988..29f5a56f 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs
@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input.TextInput;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -12,13 +10,5 @@ public GalleryTextBox()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-            /*var textBox = this.Find<TextBox>("NumericWatermark");
-            if (textBox != null)
-                textBox
-                    .TextInputOptionsQuery += (_, a) => { a.ContentType = TextInputContentType.Number; };todo: migrade this*/
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs
index 865a135c..a3c8b9dd 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryWelcome()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
index 71d00651..7fa50484 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
@@ -1,7 +1,5 @@
 using System;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Consolonia.Core.Controls;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
@@ -15,10 +13,7 @@ public SomeDialogWindow(double width, double height)
             InitializeComponent();
             Width = width;
             Height = height;
-            Loaded += (_, _) =>
-            {
-                this.FindControl<Button>("Button")!.Focus();
-            };
+            this.Button.Focus();
         }
 
         // ReSharper disable once MemberCanBePrivate.Global Can be used by constructor
@@ -26,14 +21,9 @@ public SomeDialogWindow() : this(10 + Random.Next(20), 10 + Random.Next(10))
         {
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         // ReSharper disable UnusedParameter.Local
         private async void OneMore_Clicked(object sender, RoutedEventArgs e)
-            // ReSharper restore UnusedParameter.Local
+        // ReSharper restore UnusedParameter.Local
         {
             await new SomeDialogWindow().ShowDialogAsync(this);
         }
diff --git a/src/Consolonia.Gallery/View/ControlsListView.axaml.cs b/src/Consolonia.Gallery/View/ControlsListView.axaml.cs
index a9a8d3e5..f602520b 100644
--- a/src/Consolonia.Gallery/View/ControlsListView.axaml.cs
+++ b/src/Consolonia.Gallery/View/ControlsListView.axaml.cs
@@ -4,14 +4,12 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using Consolonia.Gallery.Gallery;
 
 namespace Consolonia.Gallery.View
 {
     public partial class ControlsListView : Window
     {
-        private readonly DataGrid _grid;
         private string[] _commandLineArgs;
         private readonly IEnumerable<GalleryItem> _items;
 
@@ -21,9 +19,7 @@ public ControlsListView()
 #if DEBUG
             this.AttachDevTools();
 #endif
-            _grid = this.FindControl<DataGrid>("Grid");
-            
-            _grid.ItemsSource = _items = GalleryItem.Enumerated.ToArray();
+            this.Grid.ItemsSource = _items = GalleryItem.Enumerated.ToArray();
 
             _commandLineArgs = ((ClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime)!.Args!;
             TrySetupSelected();
@@ -33,7 +29,7 @@ private void TrySetupSelected()
         {
             if (_commandLineArgs.Length is not 1 and not 2)
             {
-                _grid.SelectedIndex = 0;
+                this.Grid.SelectedIndex = 0;
                 return;
             }
 
@@ -53,16 +49,11 @@ private void TrySetupSelected()
                     $"Several gallery items found with provided name {itemToSelectName}");
             }
 
-            _grid.SelectedItem = itemToSelect;
-            _grid.Focus();
+            this.Grid.SelectedItem = itemToSelect;
+            this.Grid.Focus();
         }
 
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public void ChangeTo(string[] args)
         {
             _commandLineArgs = args;
diff --git a/src/Example/App.axaml.cs b/src/Example/App.axaml.cs
index 7e3efd47..fb382a2c 100644
--- a/src/Example/App.axaml.cs
+++ b/src/Example/App.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using Consolonia.Core.Infrastructure;
 using Example.Views;
 
@@ -8,11 +7,6 @@ namespace Example
     // ReSharper disable once PartialTypeWithSinglePart
     public partial class App : ConsoloniaApplication
     {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
diff --git a/src/Example/Views/DataGridTestWindow.axaml b/src/Example/Views/DataGridTestWindow.axaml
index bcc538d1..775b2260 100644
--- a/src/Example/Views/DataGridTestWindow.axaml
+++ b/src/Example/Views/DataGridTestWindow.axaml
@@ -94,7 +94,7 @@
                             Grid.ColumnSpan="2"
                             Grid.Column="0"
                             HorizontalAlignment="Center"
-                            Click="delete_Clicked" />
+                            Click="Delete_Clicked" />
 
                 </Grid>
             </Border>
diff --git a/src/Example/Views/DataGridTestWindow.axaml.cs b/src/Example/Views/DataGridTestWindow.axaml.cs
index a67069b0..2953137c 100644
--- a/src/Example/Views/DataGridTestWindow.axaml.cs
+++ b/src/Example/Views/DataGridTestWindow.axaml.cs
@@ -5,7 +5,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 namespace Example.Views
 {
@@ -20,8 +19,7 @@ public DataGridTestWindow()
             this.AttachDevTools();
 #endif
 
-            var comboBox = this.FindControl<ComboBox>("Combo");
-            comboBox.ItemsSource = TheItem.Genres;
+            Combo.ItemsSource = TheItem.Genres;
             var rnd = new Random();
 
             DataContext = _items = new ObservableCollection<TheItem>(Enumerable.Range(1, 50).Select(i => new TheItem
@@ -43,13 +41,9 @@ private async void SetSelectedAsync()
             grid.Focus();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         // ReSharper disable once UnusedParameter.Local //todo: think to remove this rule
-        private void delete_Clicked(object sender, RoutedEventArgs _)
+        private void Delete_Clicked(object sender, RoutedEventArgs _)
         {
             _items.Remove((TheItem)((Control)sender).DataContext);
         }

From a581d25b203e11ff5281be05f1e0a813bc723c96 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 13:37:43 -0800
Subject: [PATCH 55/64] code cleanup

---
 src/Consolonia.Gallery/App.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Consolonia.Gallery/App.cs b/src/Consolonia.Gallery/App.cs
index 69849692..eaae92d2 100644
--- a/src/Consolonia.Gallery/App.cs
+++ b/src/Consolonia.Gallery/App.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Threading;
-using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Consolonia.Core.Infrastructure;
 using Consolonia.Gallery.View;

From 54b4167dc324deafbf10eddb8aace4bc64020dff Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 13:46:34 -0800
Subject: [PATCH 56/64] fix datetime sensityify in unit tests on linux

---
 src/Tests/Consolonia.Core.Tests/StorageTests.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index c2180499..aab7b432 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -2,6 +2,7 @@
 // ReSharper disable PossibleNullReferenceException
 // ReSharper disable ConstantConditionalAccessQualifier
 using System;
+using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
@@ -42,8 +43,8 @@ public async Task TestFileSemantics()
             Assert.True(File.Exists(tempFile));
             Assert.True(File.Exists(file.Path.LocalPath));
             StorageItemProperties props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime);
-            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime);
+            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
             using (Stream stream = await file.OpenReadAsync())
@@ -56,8 +57,8 @@ public async Task TestFileSemantics()
             }
 
             props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile), props.DateCreated?.DateTime);
-            Assert.AreEqual(File.GetLastWriteTime(tempFile), props.DateModified?.DateTime);
+            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
             IStorageFolder parentFolder = await file.GetParentAsync();
@@ -139,8 +140,8 @@ public async Task TestFolderSemantics()
             Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
             StorageItemProperties props = await testFolder.GetBasicPropertiesAsync();
-            Assert.AreEqual(Directory.GetCreationTime(testPath), props.DateCreated?.DateTime);
-            Assert.AreEqual(Directory.GetLastWriteTime(testPath), props.DateModified?.DateTime);
+            Assert.AreEqual(Directory.GetCreationTime(testPath).ToString("G", CultureInfo.InvariantCulture), props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath).ToString("G", CultureInfo.InvariantCulture), props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path?.LocalPath));

From d328507f392f21e4f020a1d62b49e61afbfbe438 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Tue, 26 Nov 2024 13:50:44 -0800
Subject: [PATCH 57/64] lint

---
 src/Consolonia.Core/Controls/FileSavePickerViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index fc441517..94b6be01 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -23,7 +23,7 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
 
         private void FileSavePickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile?.Path.LocalPath;
+            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile?.Path.LocalPath ?? String.Empty;
         }
 
         protected override bool FilterItem(IStorageItem item)

From 331f8e49db8f87eda04e5be30ead55e242b6dd64 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 21:53:58 +0000
Subject: [PATCH 58/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 .../Controls/FileSavePicker.axaml.cs           |  2 +-
 .../Controls/FileSavePickerViewModel.cs        |  2 +-
 .../Consolonia.Core.Tests/StorageTests.cs      | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
index 1d230bd6..2d96f170 100644
--- a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -22,7 +22,7 @@ public FileSavePicker(FilePickerSaveOptions options)
 
             DataContext = new FileSavePickerViewModel(options);
             InitializeComponent();
-            this.CancelButton.Focus();
+            CancelButton.Focus();
         }
 
         /// <summary>
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
index 94b6be01..2fb1f725 100644
--- a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -23,7 +23,7 @@ public FileSavePickerViewModel(FilePickerSaveOptions options)
 
         private void FileSavePickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile?.Path.LocalPath ?? String.Empty;
+            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile?.Path.LocalPath ?? string.Empty;
         }
 
         protected override bool FilterItem(IStorageItem item)
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index aab7b432..03892957 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -43,8 +43,10 @@ public async Task TestFileSemantics()
             Assert.True(File.Exists(tempFile));
             Assert.True(File.Exists(file.Path.LocalPath));
             StorageItemProperties props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
-            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
             using (Stream stream = await file.OpenReadAsync())
@@ -57,8 +59,10 @@ public async Task TestFileSemantics()
             }
 
             props = await file.GetBasicPropertiesAsync();
-            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
-            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture), props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
             Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
 
             IStorageFolder parentFolder = await file.GetParentAsync();
@@ -140,8 +144,10 @@ public async Task TestFolderSemantics()
             Assert.IsTrue(File.Exists(file.Path?.LocalPath));
 
             StorageItemProperties props = await testFolder.GetBasicPropertiesAsync();
-            Assert.AreEqual(Directory.GetCreationTime(testPath).ToString("G", CultureInfo.InvariantCulture), props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
-            Assert.AreEqual(Directory.GetLastWriteTime(testPath).ToString("G", CultureInfo.InvariantCulture), props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(Directory.GetCreationTime(testPath).ToString("G", CultureInfo.InvariantCulture),
+                props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath).ToString("G", CultureInfo.InvariantCulture),
+                props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
 
             await file.DeleteAsync();
             Assert.IsFalse(File.Exists(file.Path?.LocalPath));

From c5470545ec7e76b7a88af74d6546bfc4ea5ce054 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 29 Nov 2024 10:13:17 -0800
Subject: [PATCH 59/64] changes based on jinek code review. disabled CA2007 in
 rpojects

---
 src/Consolonia.Core/Controls/DialogWindow.cs          |  4 ++--
 .../Gallery/GalleryViews/GalleryDialog.axaml.cs       |  4 ++--
 src/Consolonia.GuiCS/Consolonia.GuiCS.csproj          | 11 ++++++-----
 src/Consolonia.NUnit/Consolonia.NUnit.csproj          |  1 +
 .../Consolonia.PlatformSupport.csproj                 |  4 ++++
 .../Consolonia.Themes.TurboVision.csproj              |  6 +++++-
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/Consolonia.Core/Controls/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
index 0c8dd64f..c8a22918 100644
--- a/src/Consolonia.Core/Controls/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -146,8 +146,8 @@ protected void ShowDialogInternal(Visual parent)
 
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            var window = sender as Window;
-            if (window != null && WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            var window = (Window)sender;
+            if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
                 Width = (ushort)(window.Bounds.Width * .9);
                 Height = (ushort)(window.Bounds.Height * .9);
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
index 612ccbd0..94e54faa 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
@@ -14,9 +14,9 @@ public GalleryDialog()
 
         // ReSharper disable UnusedParameter.Local
         private async void Button_OnClick(object _, RoutedEventArgs e)
-            // ReSharper restore UnusedParameter.Local
+        // ReSharper restore UnusedParameter.Local
         {
-            var lifetime = Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            var lifetime = (IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime;
             await new SomeDialogWindow(50, 15).ShowDialogAsync(lifetime.MainWindow);
         }
     }
diff --git a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
index aa57f415..8444456a 100644
--- a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
+++ b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>        
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-    </PropertyGroup>
+  <PropertyGroup>
+    <WarningsAsErrors>false</WarningsAsErrors>
+    <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+    <NoWarn>CA2007;</NoWarn>
+  </PropertyGroup>
 </Project>
diff --git a/src/Consolonia.NUnit/Consolonia.NUnit.csproj b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
index dae1791f..f80b7dce 100644
--- a/src/Consolonia.NUnit/Consolonia.NUnit.csproj
+++ b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
@@ -4,6 +4,7 @@
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
+        <NoWarn>CA2007;</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj b/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
index 67b5a320..95b120dd 100644
--- a/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
+++ b/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
     
+    <PropertyGroup>
+        <NoWarn>CA2007;</NoWarn>
+    </PropertyGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
         <ProjectReference Include="..\Consolonia.GuiCS\Consolonia.GuiCS.csproj" />        
diff --git a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
index ba859b49..e0a8d098 100644
--- a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
+++ b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
@@ -1,7 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-    
+
+    <PropertyGroup>
+        <NoWarn>CA2007;</NoWarn>
+    </PropertyGroup>
+
     <ItemGroup>
       <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     </ItemGroup>

From 99393d31adaea86f63bf0e2820b559b9c733c947 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 29 Nov 2024 11:00:50 -0800
Subject: [PATCH 60/64] fix focus on messgebox

---
 .../Controls/MessageBox.axaml.cs              | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index d0465781..b0b27d59 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -1,6 +1,8 @@
+using System;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -43,14 +45,17 @@ public MessageBox()
 
             InitializeComponent();
 
-            if (OkButton.IsVisible)
-                OkButton.Focus();
-            else if (CancelButton.IsVisible)
-                CancelButton.Focus();
-            else if (YesButton.IsVisible)
-                YesButton.Focus();
-            else if (NoButton.IsVisible)
-                NoButton.Focus();
+            this.AttachedToVisualTree += (s, e) =>
+            {
+                if (OkButton.IsVisible)
+                    OkButton.AttachedToVisualTree += (s2, e2) => OkButton.Focus();
+                else if (YesButton.IsVisible)
+                    YesButton.AttachedToVisualTree += (s2, e2) => YesButton.Focus();
+                else if (CancelButton.IsVisible)
+                    CancelButton.AttachedToVisualTree += (s2, e2) => CancelButton.Focus();
+                else if (NoButton.IsVisible)
+                    NoButton.AttachedToVisualTree += (s2, e2) => NoButton.Focus();
+            };
         }
 
         public Mode Mode

From 41a52407162c6ceb44aeddd3d83cfbb433383830 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 29 Nov 2024 11:07:01 -0800
Subject: [PATCH 61/64] use discard for not used argments

---
 src/Consolonia.Core/Controls/MessageBox.axaml.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index b0b27d59..f92f9d5f 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -45,16 +45,18 @@ public MessageBox()
 
             InitializeComponent();
 
-            this.AttachedToVisualTree += (s, e) =>
+            this.AttachedToVisualTree += (_, _) =>
             {
+                // we don't hook this up until the dialog is shown as the visible state is driven off of the DataContext
+                // which is set at ShowDialogAsync() time. 
                 if (OkButton.IsVisible)
-                    OkButton.AttachedToVisualTree += (s2, e2) => OkButton.Focus();
+                    OkButton.AttachedToVisualTree += (_, _) => OkButton.Focus();
                 else if (YesButton.IsVisible)
-                    YesButton.AttachedToVisualTree += (s2, e2) => YesButton.Focus();
+                    YesButton.AttachedToVisualTree += (_, _) => YesButton.Focus();
                 else if (CancelButton.IsVisible)
-                    CancelButton.AttachedToVisualTree += (s2, e2) => CancelButton.Focus();
+                    CancelButton.AttachedToVisualTree += (_, _) => CancelButton.Focus();
                 else if (NoButton.IsVisible)
-                    NoButton.AttachedToVisualTree += (s2, e2) => NoButton.Focus();
+                    NoButton.AttachedToVisualTree += (_, _) => NoButton.Focus();
             };
         }
 

From cd74f8d673f1fea70f5226b8133fa804883705e3 Mon Sep 17 00:00:00 2001
From: Tom Laird-McConnell <thermous@iciclecreek.com>
Date: Fri, 29 Nov 2024 11:07:24 -0800
Subject: [PATCH 62/64] remove unused usings

---
 src/Consolonia.Core/Controls/MessageBox.axaml.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index f92f9d5f..790d8ccf 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -1,8 +1,6 @@
-using System;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 using CommunityToolkit.Mvvm.ComponentModel;
 

From 088be14fd6f4a8855532d69cea2d4189c36cce74 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Nov 2024 19:12:15 +0000
Subject: [PATCH 63/64] Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>
---
 src/Consolonia.Core/Controls/MessageBox.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
index 790d8ccf..63bd743a 100644
--- a/src/Consolonia.Core/Controls/MessageBox.axaml.cs
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -43,7 +43,7 @@ public MessageBox()
 
             InitializeComponent();
 
-            this.AttachedToVisualTree += (_, _) =>
+            AttachedToVisualTree += (_, _) =>
             {
                 // we don't hook this up until the dialog is shown as the visible state is driven off of the DataContext
                 // which is set at ShowDialogAsync() time. 

From 824defb1db1eaba980e437dc6b23f73bd565dff4 Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <jinek@msn.com>
Date: Sat, 30 Nov 2024 00:52:35 +0100
Subject: [PATCH 64/64] tomlm/storageProvider_CA2007_2 (#155)

* CA2007 to editorconfig

* NoWant for AVA3001

* Automated JetBrains cleanup

Co-authored-by:  <+@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 Directory.Build.props                                        | 1 +
 src/.editorconfig                                            | 1 +
 src/Consolonia.Core/Consolonia.Core.csproj                   | 5 +----
 src/Consolonia.GuiCS/Consolonia.GuiCS.csproj                 | 1 -
 src/Consolonia.NUnit/Consolonia.NUnit.csproj                 | 1 -
 .../Consolonia.PlatformSupport.csproj                        | 4 ----
 .../Consolonia.Themes.TurboVision.csproj                     | 4 ----
 src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj | 1 -
 src/Tests/Consolonia.Core.Tests/StorageTests.cs              | 2 +-
 .../Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj | 1 -
 10 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 31a7bf2b..c61df258 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,7 @@
         <Authors>https://github.com/jinek/Consolonia/graphs/contributors</Authors>
         <Description>Text User Interface implementation of Avalonia UI (GUI Framework)</Description>
         <Copyright>Copyright © Evgeny Gorbovoy 2021 - 2022</Copyright>
+        <NoWarn>AVA3001</NoWarn>
     </PropertyGroup>
     <PropertyGroup>
         <AvaloniaVersion>11.0.9</AvaloniaVersion>
diff --git a/src/.editorconfig b/src/.editorconfig
index 45b7f78a..dc887c0f 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -74,6 +74,7 @@ dotnet_diagnostic.ca1043.severity = none # todo: why not to use indexer rather t
 dotnet_diagnostic.ca1814.severity = none # sometimes we need rectangle array
 dotnet_diagnostic.ca1058.severity = none # check why new documentation warns not to derive from ApplicationException. The purpose of last is to distinguish system exceptions like OOM, AssemblyLoadException etc from application logic
 dotnet_diagnostic.ca2000.severity = none # exceptions which are listed in the rule can be applied to any type
+dotnet_diagnostic.CA2007.severity = none # we are assuming task continuation thread is fine by default
 dotnet_diagnostic.ca2213.severity = none # keeping field does not mean necessarity to dispose - it can be dispose somwhere else
 dotnet_diagnostic.ca2248.severity = none # https://github.com/dotnet/roslyn-analyzers/issues/4432
 dotnet_diagnostic.ca1062.severity = none # we are fine with NRE - no need for additional checks
diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 18dd6b13..d059e8af 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -1,8 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-    <PropertyGroup>
-        <NoWarn>CA2007;</NoWarn>
-    </PropertyGroup>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />    
     <ItemGroup>
         <AvaloniaXaml Remove="Controls\FileOpen\**" />
         <Compile Remove="Controls\FileOpen\**" />
diff --git a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
index 8444456a..63547ffb 100644
--- a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
+++ b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
@@ -3,6 +3,5 @@
     <WarningsAsErrors>false</WarningsAsErrors>
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
-    <NoWarn>CA2007;</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/src/Consolonia.NUnit/Consolonia.NUnit.csproj b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
index f80b7dce..dae1791f 100644
--- a/src/Consolonia.NUnit/Consolonia.NUnit.csproj
+++ b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
@@ -4,7 +4,6 @@
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
-        <NoWarn>CA2007;</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj b/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
index 95b120dd..67b5a320 100644
--- a/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
+++ b/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
@@ -1,10 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
     
-    <PropertyGroup>
-        <NoWarn>CA2007;</NoWarn>
-    </PropertyGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
         <ProjectReference Include="..\Consolonia.GuiCS\Consolonia.GuiCS.csproj" />        
diff --git a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
index e0a8d098..0a5c6c47 100644
--- a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
+++ b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
@@ -2,10 +2,6 @@
 
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
-    <PropertyGroup>
-        <NoWarn>CA2007;</NoWarn>
-    </PropertyGroup>
-
     <ItemGroup>
       <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     </ItemGroup>
diff --git a/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj b/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
index 350706ed..63d154b2 100644
--- a/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
+++ b/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
@@ -4,7 +4,6 @@
 
     <PropertyGroup>
         <IsPackable>false</IsPackable>
-        <NoWarn>CA2007;</NoWarn>
     </PropertyGroup>
 
 
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
index 03892957..ec85480f 100644
--- a/src/Tests/Consolonia.Core.Tests/StorageTests.cs
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -1,6 +1,6 @@
-#pragma warning disable CA2007 // Consider calling ConfigureAwait on the awaited task
 // ReSharper disable PossibleNullReferenceException
 // ReSharper disable ConstantConditionalAccessQualifier
+
 using System;
 using System.Globalization;
 using System.IO;
diff --git a/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj b/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj
index dc977029..8715e73d 100644
--- a/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj
+++ b/src/Tests/Consolonia.Gallery.Tests/Consolonia.Gallery.Tests.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <IsPackable>false</IsPackable>
-        <NoWarn>CA2007;</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>