Refactoring data binding to DI

AvaloniaVisualBasic/App.axaml

@@ -1,12 +1,16 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:avaloniaVisualBasic="clr-namespace:AvaloniaVisualBasic"
+             xmlns:vb="clr-namespace:AvaloniaVisualBasic"
              xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
              x:Class="AvaloniaVisualBasic.App"
              RequestedThemeVariant="{x:Static ClassicTheme.Standard}">
 
     <Application.Resources>
         <ResourceDictionary>
+            <!--Creates a shared resource of type Composition and with key "Composition",
+            which will be further used as a data context in the views.-->
+            <vb:Composition x:Key="Composition"  />
+
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="Controls/MDI/MDIWindow.axaml" />
                 <ResourceInclude Source="Controls/MDI/MDIHost.axaml" />
@@ -34,6 +38,6 @@
     </Application.Styles>
 
     <Application.DataTemplates>
-        <avaloniaVisualBasic:ViewLocator />
+        <vb:ViewLocator />
     </Application.DataTemplates>
 </Application>

AvaloniaVisualBasic/App.axaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.Threading.Tasks;
 using Avalonia;
@@ -12,6 +13,7 @@
 using AvaloniaVisualBasic.VisualDesigner;
 using Classic.Avalonia.Theme;
 using Classic.CommonControls.Dialogs;
+using CommunityToolkit.Mvvm.ComponentModel;
 using R3;
 
 namespace AvaloniaVisualBasic;
@@ -27,9 +29,6 @@ public override void Initialize()
 
     public override void OnFrameworkInitializationCompleted()
     {
-        var rootViewModel = new DISetup().Root;
-        Static.RootViewModel = rootViewModel;
-
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             // Line below is needed to remove Avalonia data validation.
@@ -39,19 +38,17 @@ public override void OnFrameworkInitializationCompleted()
             if (Static.ForceSingleView)
             {
                 Static.SingleView = true;
-                Static.MainView = new MainView
-                {
-                    DataContext = rootViewModel
-                };
-
-                desktop.MainWindow = new ClassicWindow()
+                Static.MainView = new MainView();
+                desktop.MainWindow = new ClassicWindow
                 {
                     Content = Static.MainView
                 };
 
-                rootViewModel.ObservePropertyChanged(x => x.Title)
-                    .Subscribe(title => desktop.MainWindow.Title = title);
-
+                if (desktop.MainWindow.DataContext is MainViewViewModel rootViewModel)
+                {
+                    rootViewModel.ObservePropertyChanged(x => x.Title)
+                        .Subscribe(title => desktop.MainWindow.Title = title);
+                }
 #if DEBUG
                 desktop.MainWindow.AttachDevTools();
 #endif
@@ -60,10 +57,7 @@ public override void OnFrameworkInitializationCompleted()
             }
             else
             {
-                var mainWindow = new MainWindow
-                {
-                    DataContext = rootViewModel
-                };
+                var mainWindow = new MainWindow();
                 desktop.MainWindow = mainWindow;
                 Static.SingleView = false;
                 Static.MainView = mainWindow.MainView;
@@ -72,10 +66,7 @@ public override void OnFrameworkInitializationCompleted()
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
             Static.SingleView = true;
-            singleViewPlatform.MainView = Static.MainView = new MainView
-            {
-                DataContext = rootViewModel
-            };
+            singleViewPlatform.MainView = Static.MainView = new MainView();
             Static.MainView.WindowInitialized();
         }
 

AvaloniaVisualBasic/AvaloniaVisualBasic.csproj

@@ -21,7 +21,7 @@
         <PackageReference Include="Classic.Avalonia.Theme.DataGrid" Version="$(ClassicAvaloniaVersion)"/>
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-        <PackageReference Include="Pure.DI" Version="2.1.37">
+        <PackageReference Include="Pure.DI" Version="2.1.70">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

AvaloniaVisualBasic/Composition.cs

@@ -0,0 +1,37 @@
+using Pure.DI;
+using System.Diagnostics;
+using AvaloniaVisualBasic.IDE;
+using AvaloniaVisualBasic.Projects;
+using AvaloniaVisualBasic.Tools;
+using AvaloniaVisualBasic.VisualDesigner;
+using static Pure.DI.Lifetime;
+using static Pure.DI.RootKinds;
+using MdiWindowManager = AvaloniaVisualBasic.IDE.MdiWindowManager;
+
+namespace AvaloniaVisualBasic;
+
+public partial class Composition
+{
+    [Conditional("DI")]
+    static void Setup() =>
+        DI.Setup()
+            .DefaultLifetime(Singleton)
+            .Bind().To<ToolBoxToolViewModel>()
+            .Bind().To<PropertiesToolViewModel>()
+            .Bind().To<ProjectToolViewModel>()
+            .Bind().To<FormLayoutToolViewModel>()
+            .Bind().To<ImmediateToolViewModel>()
+            .Bind().To<LocalsToolViewModel>()
+            .Bind().To<WatchesToolViewModel>()
+            .Bind().To<ColorPaletteToolViewModel>()
+            .Bind().To<MdiWindowManager>()
+            .Bind().To<WindowManager>()
+            .Bind().To<ProjectManager>()
+            .Bind().To<EditorService>()
+            .Bind().To<MainViewViewModel.DockFactory>()
+            .Bind().To<EventBus>()
+            .Bind().To<ProjectRunnerService>()
+            .Bind().To<ProjectService>()
+            .Bind().To<FocusedProjectUtil>()
+            .Root<MainViewViewModel>(nameof(Root), kind: Virtual);
+}

AvaloniaVisualBasic/Controls/Properties/PropertyBox.axaml

@@ -4,10 +4,11 @@
                     xmlns:commonControls="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
                     xmlns:builtinTypes="clr-namespace:AvaloniaVisualBasic.Runtime.BuiltinTypes;assembly=AvaloniaVisualBasic.Runtime"
                     xmlns:converters="clr-namespace:AvaloniaVisualBasic.Converters"
+                    xmlns:avaloniaVisualBasic="clr-namespace:AvaloniaVisualBasic"
                     x:ClassModifier="internal">
     <Design.PreviewWith>
         <StackPanel Orientation="Vertical" Height="200" Width="300">
-            <controls:PropertyFontBox Font="" FontName="" />
+            <controls:PropertyFontBox Font="" FontName="" WindowManager="{Binding Source={StaticResource Composition}, DataType=avaloniaVisualBasic:Composition, Path=Root.WindowManager}" />
             <controls:PropertyEnumBox PropertyType="{x:Type builtinTypes:BorderStyles}" />
             <controls:PropertyColorBox
                 VerticalAlignment="Top"
@@ -43,7 +44,7 @@
         </Setter>
         <Setter Property="FontTemplate">
             <DataTemplate>
-                <controls:PropertyFontBox Font="{Binding $parent[controls:PropertyBox].Object, Mode=TwoWay}" />
+                <controls:PropertyFontBox Font="{Binding $parent[controls:PropertyBox].Object, Mode=TwoWay}" WindowManager="{Binding Source={StaticResource Composition}, DataType=avaloniaVisualBasic:Composition, Path=Root.WindowManager}" />
             </DataTemplate>
         </Setter>
         <Setter Property="StringListTemplate">

AvaloniaVisualBasic/Controls/Properties/PropertyFontBox.cs

@@ -4,6 +4,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.Interactivity;
+using AvaloniaVisualBasic.IDE;
 using AvaloniaVisualBasic.Runtime.BuiltinTypes;
 using AvaloniaVisualBasic.Utils;
 using Classic.CommonControls.Dialogs;
@@ -14,6 +15,7 @@ public class PropertyFontBox : TemplatedControl
 {
     public static readonly StyledProperty<VBFont> FontProperty = AvaloniaProperty.Register<PropertyFontBox, VBFont>("Font", defaultBindingMode: BindingMode.TwoWay, defaultValue: VBFont.Default);
     public static readonly DirectProperty<PropertyFontBox, string?> FontNameProperty = AvaloniaProperty.RegisterDirect<PropertyFontBox, string?>("FontName", o => o.FontName);
+    public static readonly StyledProperty<WindowManager> WindowManagerProperty = AvaloniaProperty.Register<PropertyFontBox, WindowManager>("WindowManager");
 
     public string? FontName
     {
@@ -26,6 +28,12 @@ public VBFont Font
         set => SetValue(FontProperty, value);
     }
 
+    public WindowManager WindowManager
+    {
+        get => GetValue(WindowManagerProperty);
+        set => SetValue(WindowManagerProperty, value);
+    }
+
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
@@ -37,7 +45,7 @@ private void OnButtonClick(object? sender, RoutedEventArgs e)
     {
         async Task OpenFontWindow()
         {
-            var result = await Static.RootViewModel.WindowManager.ShowFontDialog(new FontDialogResult(Font.FontFamily, Font.Style, Font.Weight, Font.Size));
+            var result = await WindowManager.ShowFontDialog(new FontDialogResult(Font.FontFamily, Font.Style, Font.Weight, Font.Size));
             if (result != null)
             {
                 SetCurrentValue(FontProperty, new VBFont(result.Family, (int)result.Size, result.Weight, result.Style));

AvaloniaVisualBasic/DesignTimeComposition.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace AvaloniaVisualBasic;
+
+public class DesignTimeComposition: Composition
+{
+    private readonly Lazy<MainViewViewModel> designTimeRoot = new();
+
+    public override MainViewViewModel Root => designTimeRoot.Value;
+}