Merge pull request #5 from RolandKoenig/3-create-viewservicehostuserc…

…ontrol-base-class

3 create viewservicehostusercontrol base class

src/Directory.Build.props

@@ -2,7 +2,8 @@
 
     <!-- Version -->
     <PropertyGroup>
-        <VersionPrefix>2.0.0</VersionPrefix>
+        <VersionPrefix>2.0.1</VersionPrefix>
+        <VersionSuffix>preview1</VersionSuffix>
     </PropertyGroup>
 
     <!-- Nuget -->

src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs

@@ -7,7 +7,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Tests.Views;
+namespace RolandK.AvaloniaExtensions.Tests.Mvvm;
 
 [Collection(nameof(ApplicationTestCollection))]
 public class MvvmUserControlTests

src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs

@@ -0,0 +1,60 @@
+using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Tests.Util;
+using RolandK.AvaloniaExtensions.ViewServices;
+using RolandK.AvaloniaExtensions.ViewServices.Base;
+
+namespace RolandK.AvaloniaExtensions.Tests.ViewServices;
+
+[Collection(nameof(ApplicationTestCollection))]
+public class ViewServiceHostUserControlTests
+{
+    [Fact]
+    public Task DefaultViewService_from_ViewServiceHostUserControl()
+    {
+        return UnitTestApplication.RunInApplicationContextAsync(() =>
+        {
+            // Arrange
+            var testViewServiceUserControl = new ViewServiceHostUserControl();
+
+            var hostWindow = new TestRootWindow();
+            hostWindow.Content = testViewServiceUserControl;
+
+            // Act
+            var srvOpenFileDialog = testViewServiceUserControl.TryFindViewService<IOpenFileViewService>();
+
+            // Assert
+            Assert.NotNull(srvOpenFileDialog);
+
+            GC.KeepAlive(hostWindow);
+        });
+    }
+
+    [Fact]
+    public Task Find_ViewService_From_ParentContainer()
+    {
+        return UnitTestApplication.RunInApplicationContextAsync(() =>
+        {
+            // Arrange
+            var testViewServiceUserControl = new ViewServiceHostUserControl();
+
+            var parentViewServiceUserControl = new ViewServiceHostUserControl();
+            parentViewServiceUserControl.Content = testViewServiceUserControl;
+            parentViewServiceUserControl.ViewServices.Add(new DummyViewService());
+
+            var hostWindow = new TestRootWindow();
+            hostWindow.Content = parentViewServiceUserControl;
+
+            // Act
+            var srvOpenFileDialog = testViewServiceUserControl.TryFindViewService<IDummyViewService>();
+
+            // Assert
+            Assert.NotNull(srvOpenFileDialog);
+
+            GC.KeepAlive(hostWindow);
+        });
+    }
+
+    private interface IDummyViewService : IViewService { }
+
+    private class DummyViewService : ViewServiceBase, IDummyViewService { }
+}

src/RolandK.AvaloniaExtensions/Mvvm/Markup/ViewServiceHostUserControl.cs

@@ -0,0 +1,27 @@
+using Avalonia.Controls;
+using RolandK.AvaloniaExtensions.ViewServices;
+using RolandK.AvaloniaExtensions.ViewServices.Base;
+
+namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+
+public class ViewServiceHostUserControl : UserControl, IViewServiceHost
+{
+    private ViewServiceContainer _viewServiceContainer;
+
+    /// <inheritdoc />
+    public ICollection<IViewService> ViewServices => _viewServiceContainer.ViewServices;
+
+    /// <inheritdoc />
+    public IViewServiceHost? ParentViewServiceHost => this.TryGetParentViewServiceHost();
+
+    public ViewServiceHostUserControl()
+    {
+        _viewServiceContainer = new ViewServiceContainer(this);
+    }
+
+    /// <inheritdoc />
+    public object? TryGetDefaultViewService(Type viewServiceType)
+    {
+        return DefaultViewServices.TryGetDefaultViewService(this, viewServiceType);
+    }
+}

src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs

@@ -1,7 +1,5 @@
-using System;
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
 using RolandK.AvaloniaExtensions.Views;
 using RolandK.AvaloniaExtensions.ViewServices.FileDialogs;
 using RolandK.AvaloniaExtensions.ViewServices.MessageBox;

src/RolandK.AvaloniaExtensions/ViewServices/IOpenDirectoryViewService.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RolandK.AvaloniaExtensions.ViewServices.Base;
+using RolandK.AvaloniaExtensions.ViewServices.Base;
 
 namespace RolandK.AvaloniaExtensions.ViewServices;