Merge pull request #14 from AvantiPoint/dev/ds/view-factory

Open Up View Factory

src/MauiMicroMvvm/Internals/ViewFactory.cs

@@ -1,47 +1,38 @@
 #nullable enable
 namespace MauiMicroMvvm.Internals;
 
-internal class ViewFactory : IViewFactory
+public class ViewFactory(IServiceProvider services, IEnumerable<ViewMapping> mappings) : IViewFactory
 {
-    internal static readonly BindableProperty NavigationKeyProperty =
+    public static readonly BindableProperty NavigationKeyProperty =
         BindableProperty.CreateAttached("NavigationKey", typeof(string), typeof(ViewFactory), null);
 
-    internal static string? GetNavigationKey(BindableObject bindable) =>
+    public static string? GetNavigationKey(BindableObject bindable) =>
         (string?)bindable.GetValue(NavigationKeyProperty);
 
-    internal static void SetNavigationKey(BindableObject bindable, string? value) =>
+    public static void SetNavigationKey(BindableObject bindable, string? value) =>
         bindable.SetValue(NavigationKeyProperty, value);
 
-    private IServiceProvider _services { get; }
-    private IEnumerable<ViewMapping> _mappings { get; }
-
-    public ViewFactory(IServiceProvider services, IEnumerable<ViewMapping> mappings)
-    {
-        _services = services;
-        _mappings = mappings;
-    }
+    protected IServiceProvider Services { get; } = services;
+    protected IEnumerable<ViewMapping> Mappings { get; } = mappings;
 
     public TView CreateView<TView>()
         where TView : VisualElement
     {
-        var view = ActivatorUtilities.CreateInstance<TView>(_services);
+        var view = ActivatorUtilities.CreateInstance<TView>(Services);
         Configure(view);
         return view;
     }
 
     public VisualElement CreateView(string key)
     {
-        var mapping = _mappings.FirstOrDefault(x => x.Name == key);
-        if(mapping is null)
-            throw new KeyNotFoundException(key);
-
-        var view = (VisualElement)ActivatorUtilities.CreateInstance(_services, mapping.View);
+        var mapping = Mappings.FirstOrDefault(x => x.Name == key) ?? throw new KeyNotFoundException(key);
+        var view = (VisualElement)ActivatorUtilities.CreateInstance(Services, mapping.View);
         SetNavigationKey(view, key);
         Configure(view);
         return view;
     }
 
-    public TView Configure<TView>(TView view)
+    public virtual TView Configure<TView>(TView view)
         where TView : VisualElement
     {
         if(view.BindingContext is null && (!view.IsSet(Xaml.MauiMicro.AutowireProperty) || Xaml.MauiMicro.GetAutowire(view)))
@@ -93,14 +84,14 @@ private void SetBindingContext(VisualElement view)
         if (mapping?.ViewModel is null)
             return;
 
-        view.BindingContext = _services.GetRequiredService(mapping.ViewModel);
+        view.BindingContext = Services.GetRequiredService(mapping.ViewModel);
     }
 
     private ViewMapping? GetViewMapping(VisualElement view)
     {
         var key = GetNavigationKey(view);
         return string.IsNullOrEmpty(key)
-            ? _mappings.FirstOrDefault(x => x.View == view.GetType())
-            : _mappings.FirstOrDefault(x => x.Name == key);
+            ? Mappings.FirstOrDefault(x => x.View == view.GetType())
+            : Mappings.FirstOrDefault(x => x.Name == key);
     }
 }

src/MauiMicroMvvm/Internals/ViewMapping.cs

@@ -1,4 +1,4 @@
 #nullable enable
 namespace MauiMicroMvvm.Internals;
 
-internal record ViewMapping(string Name, Type View, Type? ViewModel = null);
+public record ViewMapping(string Name, Type View, Type? ViewModel = null);

src/MauiMicroMvvm/MauiMicroMvvm.csproj

@@ -11,6 +11,10 @@
     <Title>MauiMicroMvvm</Title>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="build\Package.*" Pack="true" PackagePath="buildTransitive\$(PackageId)%(Extension)" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
   </ItemGroup>

src/MauiMicroMvvm/build/Package.targets

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup Condition=" '$(ImplicitUsings)' == 'true' OR '$(ImplicitUsings)' == 'enable' ">
+    <Using Include="MauiMicroMvvm"/>
+  </ItemGroup>
+</Project>