From 690e6db5bd657701c74eb9a13b0ff46b02428a03 Mon Sep 17 00:00:00 2001
From: Nice3point <nice3point@gmail.com>
Date: Fri, 17 Nov 2023 23:22:28 +0300
Subject: [PATCH] Restore dialogs

---
 .../Controls/ContentDialog/ContentDialog.xaml |  2 +-
 RevitLookup/Core/RevitApi.cs                  |  3 +-
 .../Dialogs/SearchElementsViewModel.cs        |  9 +--
 .../ViewModels/Dialogs/UnitsViewModel.cs      | 17 +++---
 .../ViewModels/Pages/AboutViewModel.cs        | 18 +++++-
 .../ViewModels/Pages/DashboardViewModel.cs    | 58 +++++++------------
 .../Views/Dialogs/OpenSourceDialog.xaml       | 12 ++--
 .../Views/Dialogs/OpenSourceDialog.xaml.cs    | 23 +++++++-
 .../Views/Dialogs/SearchElementsDialog.xaml   | 22 ++-----
 .../Dialogs/SearchElementsDialog.xaml.cs      | 43 +++++++++-----
 RevitLookup/Views/Dialogs/UnitsDialog.xaml    | 14 ++---
 RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs | 48 ++++++++++++++-
 RevitLookup/Views/Pages/AboutView.xaml        |  2 +-
 RevitLookup/Views/Pages/AboutView.xaml.cs     | 19 +-----
 14 files changed, 163 insertions(+), 127 deletions(-)

diff --git a/RevitLookup.UI/Controls/ContentDialog/ContentDialog.xaml b/RevitLookup.UI/Controls/ContentDialog/ContentDialog.xaml
index ddb90575e..b4bff4f0e 100644
--- a/RevitLookup.UI/Controls/ContentDialog/ContentDialog.xaml
+++ b/RevitLookup.UI/Controls/ContentDialog/ContentDialog.xaml
@@ -13,7 +13,7 @@
     <Style TargetType="{x:Type controls:ContentDialog}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource PopupCornerRadius}" />
diff --git a/RevitLookup/Core/RevitApi.cs b/RevitLookup/Core/RevitApi.cs
index c9bb06b81..506f4131c 100644
--- a/RevitLookup/Core/RevitApi.cs
+++ b/RevitLookup/Core/RevitApi.cs
@@ -44,8 +44,9 @@ public static UIControlledApplication CreateUiControlledApplication()
             null);
     }
 
-    public static List<UnitInfo> GetUnitInfos(Type unitType)
+    public static List<UnitInfo> GetUnitInfos<T>()
     {
+        var unitType = typeof(T);
         if (unitType == typeof(BuiltInParameter))
         {
             var parameters = Enum.GetValues(unitType).Cast<BuiltInParameter>();
diff --git a/RevitLookup/ViewModels/Dialogs/SearchElementsViewModel.cs b/RevitLookup/ViewModels/Dialogs/SearchElementsViewModel.cs
index 8a60e6b10..a4a983d4a 100644
--- a/RevitLookup/ViewModels/Dialogs/SearchElementsViewModel.cs
+++ b/RevitLookup/ViewModels/Dialogs/SearchElementsViewModel.cs
@@ -30,7 +30,8 @@ public sealed partial class SearchElementsViewModel : ObservableObject
 {
     [ObservableProperty] private string _searchText = string.Empty;
 
-    public bool SearchIds(ISnoopVisualService snoopVisualService)
+    [Pure]
+    public List<Element> SearchElements()
     {
         var rows = SearchText.Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
         var items = ParseRawRequest(rows);
@@ -66,11 +67,7 @@ public bool SearchIds(ISnoopVisualService snoopVisualService)
             }
         }
 
-        if (results.Count == 0) return false;
-
-        snoopVisualService.Snoop(new SnoopableObject(results));
-        throw new Exception("Required navigation");
-        return true;
+        return results;
     }
 
     private static IEnumerable<Element> SearchByName(string rawId)
diff --git a/RevitLookup/ViewModels/Dialogs/UnitsViewModel.cs b/RevitLookup/ViewModels/Dialogs/UnitsViewModel.cs
index 1f6bd2960..dae9220e8 100644
--- a/RevitLookup/ViewModels/Dialogs/UnitsViewModel.cs
+++ b/RevitLookup/ViewModels/Dialogs/UnitsViewModel.cs
@@ -25,21 +25,15 @@ namespace RevitLookup.ViewModels.Dialogs;
 
 public sealed partial class UnitsViewModel : ObservableObject
 {
-    private readonly List<UnitInfo> _units;
+    [ObservableProperty] private List<UnitInfo> _units;
     [ObservableProperty] private List<UnitInfo> _filteredUnits;
     [ObservableProperty] private string _searchText = string.Empty;
 
-    public UnitsViewModel(List<UnitInfo> unitType)
-    {
-        _units = unitType;
-        _filteredUnits = _units;
-    }
-
     async partial void OnSearchTextChanged(string value)
     {
         if (string.IsNullOrEmpty(SearchText))
         {
-            FilteredUnits = _units;
+            FilteredUnits = Units;
             return;
         }
 
@@ -48,11 +42,16 @@ async partial void OnSearchTextChanged(string value)
             var formattedText = value.ToLower().Trim();
             var searchResults = new List<UnitInfo>();
             // ReSharper disable once LoopCanBeConvertedToQuery
-            foreach (var family in _units)
+            foreach (var family in Units)
                 if (family.Label.ToLower().Contains(formattedText) || family.Unit.ToLower().Contains(formattedText))
                     searchResults.Add(family);
 
             return searchResults;
         });
     }
+
+    partial void OnUnitsChanged(List<UnitInfo> value)
+    {
+        FilteredUnits = value;
+    }
 }
\ No newline at end of file
diff --git a/RevitLookup/ViewModels/Pages/AboutViewModel.cs b/RevitLookup/ViewModels/Pages/AboutViewModel.cs
index 2a06e24be..b2b867839 100644
--- a/RevitLookup/ViewModels/Pages/AboutViewModel.cs
+++ b/RevitLookup/ViewModels/Pages/AboutViewModel.cs
@@ -23,25 +23,30 @@
 using Microsoft.Extensions.Configuration;
 using RevitLookup.Services.Contracts;
 using RevitLookup.Services.Enums;
+using RevitLookup.Views.Dialogs;
+using Wpf.Ui;
 
 namespace RevitLookup.ViewModels.Pages;
 
 public sealed partial class AboutViewModel : ObservableObject
 {
     private readonly ISoftwareUpdateService _updateService;
+    private readonly IContentDialogService _dialogService;
+
     [ObservableProperty] private string _dotNetVersion;
     [ObservableProperty] private bool _isUpdateChecked;
     [ObservableProperty] private string _runtimeVersion;
 
-    public AboutViewModel(ISoftwareUpdateService updateService, IConfiguration configuration)
+    public AboutViewModel(ISoftwareUpdateService updateService, IContentDialogService dialogService, IConfiguration configuration)
     {
         _updateService = updateService;
+        _dialogService = dialogService;
         _dotNetVersion = configuration.GetValue<string>("Framework");
         _runtimeVersion = Environment.Version.ToString();
     }
 
     [RelayCommand]
-    private async Task CheckUpdates()
+    private async Task CheckUpdatesAsync()
     {
         await _updateService.CheckUpdates();
         IsUpdateChecked = true;
@@ -53,13 +58,20 @@ private async Task CheckUpdates()
     }
 
     [RelayCommand]
-    private async Task DownloadUpdate()
+    private async Task DownloadUpdateAsync()
     {
         await _updateService.DownloadUpdate();
         OnPropertyChanged(nameof(State));
         OnPropertyChanged(nameof(ErrorMessage));
     }
 
+    [RelayCommand]
+    private Task ShowSoftwareDialogAsync()
+    {
+        var openSourceDialog = new OpenSourceDialog(_dialogService);
+        return openSourceDialog.ShowAsync();
+    }
+
     #region Updater Wrapping
 
     public SoftwareUpdateState State => _updateService.State;
diff --git a/RevitLookup/ViewModels/Pages/DashboardViewModel.cs b/RevitLookup/ViewModels/Pages/DashboardViewModel.cs
index a46dcda73..fde3944db 100644
--- a/RevitLookup/ViewModels/Pages/DashboardViewModel.cs
+++ b/RevitLookup/ViewModels/Pages/DashboardViewModel.cs
@@ -18,14 +18,17 @@
 // Software - Restricted Rights) and DFAR 252.227-7013(c)(1)(ii)
 // (Rights in Technical Data and Computer Software), as applicable.
 
+using Autodesk.Revit.DB;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using RevitLookup.Core;
 using RevitLookup.Services;
 using RevitLookup.Services.Contracts;
 using RevitLookup.Services.Enums;
+using RevitLookup.Views.Dialogs;
 using RevitLookup.Views.Pages;
 using Wpf.Ui;
+using Wpf.Ui.Controls;
 
 namespace RevitLookup.ViewModels.Pages;
 
@@ -135,44 +138,27 @@ private async Task NavigateSnoopPage(string parameter)
     }
 
     [RelayCommand]
-    private async Task OpenDialog(string parameter)
+    private Task OpenDialog(string parameter)
     {
-        if (!Validate()) return;
+        if (!Validate()) return Task.CompletedTask;
+
+        switch (parameter)
+        {
+            case "parameters":
+                var unitsDialog = new UnitsDialog(_serviceProvider);
+                return unitsDialog.ShowParametersAsync();
+            case "categories":
+                unitsDialog = new UnitsDialog(_serviceProvider);
+                return unitsDialog.ShowCategoriesAsync();
+            case "forge":
+                unitsDialog = new UnitsDialog(_serviceProvider);
+                return unitsDialog.ShowForgeSchemaAsync();
+            case "search":
+                var searchDialog = new SearchElementsDialog(_serviceProvider);
+                return searchDialog.ShowAsync();
+        }
 
-        // var dialog = _dialogService.CreateDialog();
-        // switch (parameter)
-        // {
-        //     case "parameters":
-        //         var units = await Task.Run(() => RevitApi.GetUnitInfos(typeof(BuiltInParameter)));
-        //         dialog.Title = "BuiltIn Parameters";
-        //         dialog.Content = new UnitsDialog(_serviceProvider, units);
-        //         dialog.DialogWidth = 800;
-        //         dialog.DialogHeight = 600;
-        //         await dialog.ShowAsync();
-        //         break;
-        //     case "categories":
-        //         units = await Task.Run(() => RevitApi.GetUnitInfos(typeof(BuiltInCategory)));
-        //         dialog.Title = "BuiltIn Categories";
-        //         dialog.Content = new UnitsDialog(_serviceProvider, units);
-        //         dialog.DialogWidth = 800;
-        //         dialog.DialogHeight = 600;
-        //         await dialog.ShowAsync();
-        //         break;
-        //     case "forge":
-        //         units = await Task.Run(() => RevitApi.GetUnitInfos(typeof(ForgeTypeId)));
-        //         dialog.Title = "Forge Schema";
-        //         dialog.Content = new UnitsDialog(_serviceProvider, units);
-        //         dialog.DialogWidth = 800;
-        //         dialog.DialogHeight = 600;
-        //         await dialog.ShowAsync();
-        //         break;
-        //     case "search":
-        //         dialog = new SearchElementsDialog(_serviceProvider, _dialogService.GetContentPresenter());
-        //         dialog.DialogWidth = 570;
-        //         dialog.DialogHeight = 330;
-        //         await dialog.ShowAsync();
-        //         break;
-        // }
+        return Task.CompletedTask;
     }
 
     private bool Validate()
diff --git a/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml b/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml
index ee508831b..f165ad1c8 100644
--- a/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml
+++ b/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml
@@ -7,14 +7,9 @@
     xmlns:dialogs="clr-namespace:RevitLookup.ViewModels.Dialogs"
     xmlns:rl="http://revitlookup.com/xaml"
     mc:Ignorable="d"
+    MinWidth="300"
+    MinHeight="265"
     d:DataContext="{d:DesignInstance dialogs:OpenSourceViewModel}">
-    <Grid.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <rl:ControlsDictionary />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Grid.Resources>
     <DataGrid
         AutoGenerateColumns="False"
         GridLinesVisibility="None"
@@ -53,6 +48,9 @@
                 </DataGridHyperlinkColumn.ElementStyle>
             </DataGridHyperlinkColumn>
         </DataGrid.Columns>
+        <DataGrid.Resources>
+            <rl:ControlsDictionary />
+        </DataGrid.Resources>
         <DataGrid.CellStyle>
             <Style
                 TargetType="DataGridCell"
diff --git a/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml.cs b/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml.cs
index 1a39dc683..436359a54 100644
--- a/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml.cs
+++ b/RevitLookup/Views/Dialogs/OpenSourceDialog.xaml.cs
@@ -21,17 +21,38 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Documents;
+using RevitLookup.Core.Objects;
+using RevitLookup.Services;
+using RevitLookup.Services.Contracts;
 using RevitLookup.ViewModels.Dialogs;
+using RevitLookup.Views.Pages;
+using Wpf.Ui;
+using Wpf.Ui.Controls;
 
 namespace RevitLookup.Views.Dialogs;
 
 public sealed partial class OpenSourceDialog
 {
-    public OpenSourceDialog()
+    private readonly IContentDialogService _dialogService;
+
+    public OpenSourceDialog(IContentDialogService dialogService)
     {
+        _dialogService = dialogService;
         InitializeComponent();
         DataContext = new OpenSourceViewModel();
     }
+    
+    public async Task ShowAsync()
+    {
+        var dialogOptions = new SimpleContentDialogCreateOptions
+        {
+            Title = "Third-Party Software",
+            Content = this,
+            CloseButtonText = "Close"
+        };
+
+        await _dialogService.ShowSimpleDialogAsync(dialogOptions);
+    }
 
     private void OpenLink(object sender, RoutedEventArgs e)
     {
diff --git a/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml b/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml
index 478bbbca8..572619fc8 100644
--- a/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml
+++ b/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml
@@ -1,34 +1,20 @@
-<rl:ContentDialog
+<Grid
     x:Class="RevitLookup.Views.Dialogs.SearchElementsDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:RevitLookup.Views.Dialogs"
     xmlns:rl="http://revitlookup.com/xaml"
     xmlns:dialogs="clr-namespace:RevitLookup.ViewModels.Dialogs"
     mc:Ignorable="d"
-    Title="Search elements"
-    PrimaryButtonText="Search"
+    MinWidth="370"
+    MinHeight="130"
     d:DataContext="{d:DesignInstance dialogs:SearchElementsViewModel}">
-    <rl:ContentDialog.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <rl:ThemesDictionary />
-                <rl:ControlsDictionary />
-            </ResourceDictionary.MergedDictionaries>
-            <Style
-                BasedOn="{StaticResource {x:Type rl:ContentDialog}}"
-                TargetType="{x:Type local:SearchElementsDialog}" />
-        </ResourceDictionary>
-    </rl:ContentDialog.Resources>
     <rl:TextBox
         Icon="{rl:SymbolIcon Search24}"
         IconPlacement="Right"
         PlaceholderText="Search by Name, Id, UniqueId or IfcGUID...&#xA;Separators: tab, semicolon, comma or space&#xA;&#xA;Example:&#xA;136976, 136977, 136978&#xA;Living Room, Exterior Wall, Swing door&#xA;17836a3c-e764-47fa-a2e0-08216444f621-0007882c"
         TextWrapping="Wrap"
         AcceptsReturn="True"
-        MinHeight="150"
-        MaxHeight="150"
         Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
-</rl:ContentDialog>
\ No newline at end of file
+</Grid>
\ No newline at end of file
diff --git a/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml.cs b/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml.cs
index af740269f..ce25e9854 100644
--- a/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml.cs
+++ b/RevitLookup/Views/Dialogs/SearchElementsDialog.xaml.cs
@@ -18,9 +18,11 @@
 // Software - Restricted Rights) and DFAR 252.227-7013(c)(1)(ii)
 // (Rights in Technical Data and Computer Software), as applicable.
 
-using System.Windows.Controls;
+using RevitLookup.Core.Objects;
+using RevitLookup.Services;
 using RevitLookup.Services.Contracts;
 using RevitLookup.ViewModels.Dialogs;
+using RevitLookup.Views.Pages;
 using Wpf.Ui;
 using Wpf.Ui.Controls;
 
@@ -28,26 +30,39 @@ namespace RevitLookup.Views.Dialogs;
 
 public sealed partial class SearchElementsDialog
 {
-    private readonly ISnackbarService _snackbarService;
-    private readonly ISnoopVisualService _snoopVisualService;
+    private readonly IServiceProvider _serviceProvider;
     private readonly SearchElementsViewModel _viewModel;
 
-    public SearchElementsDialog(IServiceProvider serviceProvider, ContentPresenter contentPresenter) : base(contentPresenter)
+    public SearchElementsDialog(IServiceProvider serviceProvider)
     {
-        _snoopVisualService = serviceProvider.GetService<ISnoopVisualService>();
-        _snackbarService = serviceProvider.GetService<ISnackbarService>();
-        InitializeComponent();
+        _serviceProvider = serviceProvider;
         _viewModel = new SearchElementsViewModel();
         DataContext = _viewModel;
+        InitializeComponent();
     }
 
-    protected override void OnButtonClick(ContentDialogButton button)
+    public async Task ShowAsync()
     {
-        //TODO
-        // if (button != ContentDialogButton.Primary) return;
-        // if (_viewModel.SearchIds(_snoopVisualService)) return;
-        
-        // _snackbarService.Show("Search elements", "There are no elements found for your request", SymbolRegular.Warning24, ControlAppearance.Caution);
-        // return false;
+        var dialogOptions = new SimpleContentDialogCreateOptions
+        {
+            Title = "Search elements",
+            Content = this,
+            CloseButtonText = "Close",
+            PrimaryButtonText = "Search"
+        };
+
+        var dialogResult = await _serviceProvider.GetService<IContentDialogService>().ShowSimpleDialogAsync(dialogOptions);
+        if (dialogResult != ContentDialogResult.Primary) return;
+
+        var elements = _viewModel.SearchElements();
+        if (elements.Count == 0)
+        {
+            var notificationService = _serviceProvider.GetService<NotificationService>();
+            notificationService.ShowWarning("Search elements", "There are no elements found for your request");
+            return;
+        }
+
+        _serviceProvider.GetService<ISnoopVisualService>().Snoop(new SnoopableObject(elements));
+        _serviceProvider.GetService<INavigationService>().Navigate(typeof(SnoopView));
     }
 }
\ No newline at end of file
diff --git a/RevitLookup/Views/Dialogs/UnitsDialog.xaml b/RevitLookup/Views/Dialogs/UnitsDialog.xaml
index c2c9d896f..1a28b478f 100644
--- a/RevitLookup/Views/Dialogs/UnitsDialog.xaml
+++ b/RevitLookup/Views/Dialogs/UnitsDialog.xaml
@@ -6,17 +6,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="clr-namespace:RevitLookup.ViewModels.Dialogs"
     xmlns:rl="http://revitlookup.com/xaml"
-    xmlns:resources="clr-namespace:RevitLookup.Views.Resources"
     mc:Ignorable="d"
+    MinWidth="600"
+    MinHeight="400"
     d:DataContext="{d:DesignInstance dialogs:UnitsViewModel}">
-    <DockPanel.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <rl:ControlsDictionary />
-                <resources:Menus />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </DockPanel.Resources>
     <rl:TextBox
         DockPanel.Dock="Top"
         Icon="{rl:SymbolIcon Search24}"
@@ -45,6 +38,9 @@
                 Binding="{Binding Label}"
                 Header="Label" />
         </DataGrid.Columns>
+        <DataGrid.Resources>
+            <rl:ControlsDictionary />
+        </DataGrid.Resources>
         <DataGrid.CellStyle>
             <Style
                 TargetType="DataGridCell"
diff --git a/RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs b/RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs
index 5257dc27d..e1a43f455 100644
--- a/RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs
+++ b/RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs
@@ -28,18 +28,60 @@
 using RevitLookup.ViewModels.Dialogs;
 using RevitLookup.ViewModels.Objects;
 using RevitLookup.Views.Extensions;
+using Wpf.Ui;
 
 namespace RevitLookup.Views.Dialogs;
 
 public sealed partial class UnitsDialog
 {
+    private readonly UnitsViewModel _viewModel;
     private readonly IServiceProvider _serviceProvider;
 
-    public UnitsDialog(IServiceProvider serviceProvider, List<UnitInfo> unitType)
+    public UnitsDialog(IServiceProvider serviceProvider)
     {
         _serviceProvider = serviceProvider;
+        _viewModel = new UnitsViewModel();
+        DataContext = _viewModel;
         InitializeComponent();
-        DataContext = new UnitsViewModel(unitType);
+    }
+
+    public async Task ShowParametersAsync()
+    {
+        _viewModel.Units = RevitApi.GetUnitInfos<BuiltInParameter>();
+        var dialogOptions = new SimpleContentDialogCreateOptions
+        {
+            Title = "BuiltIn Parameters",
+            Content = this,
+            CloseButtonText = "Close"
+        };
+
+        await _serviceProvider.GetService<IContentDialogService>().ShowSimpleDialogAsync(dialogOptions);
+    }
+
+    public async Task ShowCategoriesAsync()
+    {
+        _viewModel.Units = RevitApi.GetUnitInfos<BuiltInCategory>();
+        var dialogOptions = new SimpleContentDialogCreateOptions
+        {
+            Title = "BuiltIn Categories",
+            Content = this,
+            CloseButtonText = "Close"
+        };
+
+        await _serviceProvider.GetService<IContentDialogService>().ShowSimpleDialogAsync(dialogOptions);
+    }
+
+    public async Task ShowForgeSchemaAsync()
+    {
+        _viewModel.Units = RevitApi.GetUnitInfos<ForgeTypeId>();
+        var dialogOptions = new SimpleContentDialogCreateOptions
+        {
+            Title = "Forge Schema",
+            Content = this,
+            CloseButtonText = "Close"
+        };
+
+        await _serviceProvider.GetService<IContentDialogService>().ShowSimpleDialogAsync(dialogOptions);
     }
 
     private void OnRowLoaded(object sender, RoutedEventArgs routedEventArgs)
@@ -53,7 +95,7 @@ private void CreateTreeContextMenu(UnitInfo info, FrameworkElement row)
     {
         row.ContextMenu = new ContextMenu
         {
-            Resources = Resources
+            Resources = Wpf.Ui.Application.MainWindow.Resources
         };
 
         row.ContextMenu.AddMenuItem("CopyMenuItem")
diff --git a/RevitLookup/Views/Pages/AboutView.xaml b/RevitLookup/Views/Pages/AboutView.xaml
index 19b22de49..4dee790e6 100644
--- a/RevitLookup/Views/Pages/AboutView.xaml
+++ b/RevitLookup/Views/Pages/AboutView.xaml
@@ -222,7 +222,7 @@
                 <rl:HyperlinkButton
                     Content="Powered by open-source software"
                     Icon="{rl:SymbolIcon Link48}"
-                    Click="ShowSoftwareDialog" />
+                    Command="{Binding ViewModel.ShowSoftwareDialogCommand}"/>
                 <rl:HyperlinkButton
                     Content="Contact Us"
                     Icon="{rl:SymbolIcon Link48}"
diff --git a/RevitLookup/Views/Pages/AboutView.xaml.cs b/RevitLookup/Views/Pages/AboutView.xaml.cs
index 7d05c9d14..2156f1cd9 100644
--- a/RevitLookup/Views/Pages/AboutView.xaml.cs
+++ b/RevitLookup/Views/Pages/AboutView.xaml.cs
@@ -18,36 +18,19 @@
 // Software - Restricted Rights) and DFAR 252.227-7013(c)(1)(ii)
 // (Rights in Technical Data and Computer Software), as applicable.
 
-using System.Windows;
-using RevitLookup.Services.Contracts;
 using RevitLookup.ViewModels.Pages;
-using Wpf.Ui;
 using Wpf.Ui.Controls;
 
 namespace RevitLookup.Views.Pages;
 
 public sealed partial class AboutView : INavigableView<AboutViewModel>
 {
-    private readonly IContentDialogService _dialogService;
-
-    public AboutView(AboutViewModel viewModel, IContentDialogService dialogService, ISettingsService settingsService)
+    public AboutView(AboutViewModel viewModel)
     {
         ViewModel = viewModel;
         InitializeComponent();
         DataContext = this;
-        _dialogService = dialogService;
     }
 
     public AboutViewModel ViewModel { get; }
-
-    private async void ShowSoftwareDialog(object sender, RoutedEventArgs e)
-    {
-        //TODO
-        // var dialog = _dialogService.CreateDialog();
-        // dialog.Title = "Third-Party Software";
-        // dialog.DialogWidth = 500;
-        // dialog.DialogHeight = 465;
-        // dialog.Content = new OpenSourceDialog();
-        // await dialog.ShowAsync();
-    }
 }
\ No newline at end of file