Tidy up namespaces

2022-12-10 16:19:59 +00:00
parent 8bbff9bfd1
commit 6670e912ef
29 changed files with 118 additions and 124 deletions
@@ -3,8 +3,8 @@
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<AssemblyName>Toolkit.Foundation.Avalonia</AssemblyName>
-		<RootNamespace>Toolkit.Foundation.Avalonia</RootNamespace>
+		<AssemblyName>Toolkit.Framework.Avalonia</AssemblyName>
+		<RootNamespace>Toolkit.Framework.Avalonia</RootNamespace>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="11.0.0-preview4" />
@@ -1,8 +1,8 @@
 using Avalonia.Data.Converters;
 using System.Globalization;

-namespace Toolkit.Foundation.Avalonia
-{
+namespace Toolkit.Foundation.Avalonia;
+
 public static class EventArgsExtensions
 {
    public static dynamic? GetEventArguments(this EventArgs args, string? path, IValueConverter? converter, object? converterParameter)
@@ -21,4 +21,3 @@ namespace Toolkit.Foundation.Avalonia
        return value;
    }
 }
-}
@@ -3,8 +3,8 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia
-{
+namespace Toolkit.Foundation.Avalonia;
+
 public static class IHostBuilderExtensions
 {
    public static IHostBuilder ConfigureTemplates(this IHostBuilder hostBuilder, Action<ITemplateBuilder> builderDelegate)
@@ -32,4 +32,3 @@ namespace Toolkit.Foundation.Avalonia
        return hostBuilder;
    }
 }
-}
@@ -4,8 +4,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia
-{
+namespace Toolkit.Foundation.Avalonia;
+
 public static class IServiceCollectionExtensions
 {
    public static IServiceCollection AddNavigation(this IServiceCollection serviceCollection)
@@ -19,4 +19,3 @@ namespace Toolkit.Foundation.Avalonia
        return serviceCollection;
    }
 }
-}
@@ -1,7 +1,7 @@
 using Avalonia.Data;

-namespace Toolkit.Foundation.Avalonia
-{
+namespace Toolkit.Foundation.Avalonia;
+
 public static class MarkupExtensions
 {
    public static Binding? ToBinding(this object value)
@@ -14,4 +14,3 @@ namespace Toolkit.Foundation.Avalonia
        return new Binding { Mode = BindingMode.OneWay, Source = value };
    }
 }
-}
@@ -1,8 +1,8 @@
 using Avalonia;
 using Avalonia.Data;

-namespace Toolkit.Foundation.Avalonia
-{
+namespace Toolkit.Foundation.Avalonia;
+
 public static class PropertyPathHelper
 {
    private static readonly Dummy dummy = new();
@@ -25,4 +25,3 @@ namespace Toolkit.Foundation.Avalonia
            AvaloniaProperty.Register<Dummy, object>("Value");
    }
 }
-}
@@ -1,6 +1,6 @@
 using Avalonia.Markup.Xaml;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class CompositeExtension : TriggerExtension
 {
@@ -1,7 +1,7 @@
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class EventParameterExtension : MarkupExtension, IEventParameter
 {
@@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class InvokeExtension : TriggerExtension
 {
@@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
 using Mediator;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class NavigateExtension : TriggerExtension
 {
@@ -7,7 +7,7 @@ using Avalonia.Markup.Xaml;
 using Mediator;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class NavigationRouteExtension : MarkupExtension
 {
@@ -4,7 +4,7 @@ using Avalonia.Data;
 using Avalonia.Markup.Xaml;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class ParameterBindingExtension : MarkupExtension, IParameter
 {
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class TriggerCollection : Collection<Delegate>
 {
@@ -2,7 +2,7 @@
 using Avalonia.Markup.Xaml;
 using System.Reflection;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class TriggerExtension : MarkupExtension
 {
@@ -1,6 +1,6 @@
 using Avalonia.Controls;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public record ContentControlNavigation : Navigation<ContentControl>
 {
@@ -1,7 +1,7 @@
 using Avalonia.Controls.Primitives;
 using Mediator;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class ContentControlNavigationHandler : IRequestHandler<ContentControlNavigation, bool>
 {
@@ -1,6 +1,6 @@
 using FluentAvalonia.UI.Controls;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public record ContentDialogNavigation : Navigation<ContentDialog>
 {
@@ -1,7 +1,7 @@
 using FluentAvalonia.UI.Controls;
 using Mediator;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class ContentDialogNavigationHandler : IRequestHandler<ContentDialogNavigation, bool>
 {
@@ -1,6 +1,6 @@
 using FluentAvalonia.UI.Controls;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public record FrameNavigation : Navigation<Frame>
 {
@@ -2,7 +2,7 @@
 using FluentAvalonia.UI.Navigation;
 using Mediator;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class FrameNavigationHandler : IRequestHandler<FrameNavigation, bool>
 {
@@ -4,7 +4,7 @@ using FluentAvalonia.UI.Controls;
 using Mediator;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class NavigateBackHandler : IRequestHandler<NavigateBack>
 {
@@ -3,7 +3,7 @@ using FluentAvalonia.UI.Controls;
 using Mediator;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class NavigateHandler : IRequestHandler<Navigate>
 {
@@ -1,7 +1,7 @@
 using Avalonia.Controls.Primitives;
 using Mediator;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public record Navigation<TRoute> : IRequest<bool> where TRoute : TemplatedControl
 {
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 internal class NavigationPageFactory : INavigationPageFactory
 {
@@ -3,7 +3,7 @@ using Avalonia.Interactivity;
 using Mediator;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;

 public class NavigationRouteHandler : IRequestHandler<NavigationRoute>
 {
@@ -2,8 +2,8 @@
 using Avalonia.Controls.Templates;
 using Toolkit.Framework.Foundation;

-namespace Toolkit.Foundation.Avalonia
-{
+namespace Toolkit.Foundation.Avalonia;
+
 public class TemplateSelector : IDataTemplate, ITemplateSelector
 {
    private readonly Dictionary<object, IControl> dataTracking = new();
@@ -35,4 +35,3 @@ namespace Toolkit.Foundation.Avalonia
        return true;
    }
 }
-}
@@ -4,8 +4,8 @@
    <TargetFramework>net7.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
-    <AssemblyName>Toolkit.Foundation</AssemblyName>
-    <RootNamespace>Toolkit.Foundation</RootNamespace>
+    <AssemblyName>Toolkit.Framework.Foundation</AssemblyName>
+    <RootNamespace>Toolkit.Framework.Foundation</RootNamespace>
  </PropertyGroup>

  <ItemGroup>
@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;

 public interface IEventParameter
 {
@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;

 public interface INavigationConfirmation
 {