dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up namespaces

Browse Source
This commit is contained in:
Daniel Clark
2022-12-10 16:19:59 +00:00
parent 8bbff9bfd1
commit 6670e912ef
29 changed files with 118 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Framework/Avalonia/Avalonia.csproj
+2 -2
View File
@@ -3,8 +3,8 @@
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Toolkit.Foundation.Avalonia</AssemblyName> <AssemblyName>Toolkit.Framework.Avalonia</AssemblyName>
<RootNamespace>Toolkit.Foundation.Avalonia</RootNamespace> <RootNamespace>Toolkit.Framework.Avalonia</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview4" /> <PackageReference Include="Avalonia" Version="11.0.0-preview4" />
Framework/Avalonia/Extensions/EventArgsExtensions.cs
+2 -3
View File
@@ -1,8 +1,8 @@
using Avalonia.Data.Converters; using Avalonia.Data.Converters;
using System.Globalization; using System.Globalization;
namespace Toolkit.Foundation.Avalonia namespace Toolkit.Foundation.Avalonia;
{
public static class EventArgsExtensions public static class EventArgsExtensions
{ {
public static dynamic? GetEventArguments(this EventArgs args, string? path, IValueConverter? converter, object? converterParameter) public static dynamic? GetEventArguments(this EventArgs args, string? path, IValueConverter? converter, object? converterParameter)
@@ -21,4 +21,3 @@ namespace Toolkit.Foundation.Avalonia
return value; return value;
} }
} }
}
Framework/Avalonia/Extensions/IHostBuilderExtensions.cs
+2 -3
View File
@@ -3,8 +3,8 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia namespace Toolkit.Foundation.Avalonia;
{
public static class IHostBuilderExtensions public static class IHostBuilderExtensions
{ {
public static IHostBuilder ConfigureTemplates(this IHostBuilder hostBuilder, Action<ITemplateBuilder> builderDelegate) public static IHostBuilder ConfigureTemplates(this IHostBuilder hostBuilder, Action<ITemplateBuilder> builderDelegate)
@@ -32,4 +32,3 @@ namespace Toolkit.Foundation.Avalonia
return hostBuilder; return hostBuilder;
} }
} }
}
Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs
+2 -3
View File
@@ -4,8 +4,8 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia namespace Toolkit.Foundation.Avalonia;
{
public static class IServiceCollectionExtensions public static class IServiceCollectionExtensions
{ {
public static IServiceCollection AddNavigation(this IServiceCollection serviceCollection) public static IServiceCollection AddNavigation(this IServiceCollection serviceCollection)
@@ -19,4 +19,3 @@ namespace Toolkit.Foundation.Avalonia
return serviceCollection; return serviceCollection;
} }
} }
}
Framework/Avalonia/Extensions/MarkupExtensions.cs
+2 -3
View File
@@ -1,7 +1,7 @@
using Avalonia.Data; using Avalonia.Data;
namespace Toolkit.Foundation.Avalonia namespace Toolkit.Foundation.Avalonia;
{
public static class MarkupExtensions public static class MarkupExtensions
{ {
public static Binding? ToBinding(this object value) public static Binding? ToBinding(this object value)
@@ -14,4 +14,3 @@ namespace Toolkit.Foundation.Avalonia
return new Binding { Mode = BindingMode.OneWay, Source = value }; return new Binding { Mode = BindingMode.OneWay, Source = value };
} }
} }
}
Framework/Avalonia/Extensions/PropertyPathHelper..cs
+2 -3
View File
@@ -1,8 +1,8 @@
using Avalonia; using Avalonia;
using Avalonia.Data; using Avalonia.Data;
namespace Toolkit.Foundation.Avalonia namespace Toolkit.Foundation.Avalonia;
{
public static class PropertyPathHelper public static class PropertyPathHelper
{ {
private static readonly Dummy dummy = new(); private static readonly Dummy dummy = new();
@@ -25,4 +25,3 @@ namespace Toolkit.Foundation.Avalonia
AvaloniaProperty.Register<Dummy, object>("Value"); AvaloniaProperty.Register<Dummy, object>("Value");
} }
} }
}
Framework/Avalonia/Markups/CompositeExtension.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class CompositeExtension : TriggerExtension public class CompositeExtension : TriggerExtension
{ {
Framework/Avalonia/Markups/EventParameterExtension.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Avalonia.Data.Converters; using Avalonia.Data.Converters;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class EventParameterExtension : MarkupExtension, IEventParameter public class EventParameterExtension : MarkupExtension, IEventParameter
{ {
Framework/Avalonia/Markups/InvokeExtension.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Reflection; using System.Reflection;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class InvokeExtension : TriggerExtension public class InvokeExtension : TriggerExtension
{ {
Framework/Avalonia/Markups/NavigateExtension.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
using Mediator; using Mediator;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class NavigateExtension : TriggerExtension public class NavigateExtension : TriggerExtension
{ {
Framework/Avalonia/Markups/NavigationRouteExtension.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using Avalonia.Markup.Xaml;
using Mediator; using Mediator;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class NavigationRouteExtension : MarkupExtension public class NavigationRouteExtension : MarkupExtension
{ {
Framework/Avalonia/Markups/ParameterBindingExtension.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using Avalonia.Data;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class ParameterBindingExtension : MarkupExtension, IParameter public class ParameterBindingExtension : MarkupExtension, IParameter
{ {
Framework/Avalonia/Markups/TriggerCollection.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class TriggerCollection : Collection<Delegate> public class TriggerCollection : Collection<Delegate>
{ {
Framework/Avalonia/Markups/TriggerExtension.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using System.Reflection; using System.Reflection;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class TriggerExtension : MarkupExtension public class TriggerExtension : MarkupExtension
{ {
Framework/Avalonia/Navigation/ContentControlNavigation.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public record ContentControlNavigation : Navigation<ContentControl> public record ContentControlNavigation : Navigation<ContentControl>
{ {
Framework/Avalonia/Navigation/ContentControlNavigationHandler.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Mediator; using Mediator;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class ContentControlNavigationHandler : IRequestHandler<ContentControlNavigation, bool> public class ContentControlNavigationHandler : IRequestHandler<ContentControlNavigation, bool>
{ {
Framework/Avalonia/Navigation/ContentDialogNavigation.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public record ContentDialogNavigation : Navigation<ContentDialog> public record ContentDialogNavigation : Navigation<ContentDialog>
{ {
Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Mediator; using Mediator;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class ContentDialogNavigationHandler : IRequestHandler<ContentDialogNavigation, bool> public class ContentDialogNavigationHandler : IRequestHandler<ContentDialogNavigation, bool>
{ {
Framework/Avalonia/Navigation/FrameNavigation.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public record FrameNavigation : Navigation<Frame> public record FrameNavigation : Navigation<Frame>
{ {
Framework/Avalonia/Navigation/FrameNavigationHandler.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using FluentAvalonia.UI.Navigation; using FluentAvalonia.UI.Navigation;
using Mediator; using Mediator;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class FrameNavigationHandler : IRequestHandler<FrameNavigation, bool> public class FrameNavigationHandler : IRequestHandler<FrameNavigation, bool>
{ {
Framework/Avalonia/Navigation/NavigateBackHandler.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using FluentAvalonia.UI.Controls;
using Mediator; using Mediator;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class NavigateBackHandler : IRequestHandler<NavigateBack> public class NavigateBackHandler : IRequestHandler<NavigateBack>
{ {
Framework/Avalonia/Navigation/NavigateHandler.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using FluentAvalonia.UI.Controls;
using Mediator; using Mediator;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class NavigateHandler : IRequestHandler<Navigate> public class NavigateHandler : IRequestHandler<Navigate>
{ {
Framework/Avalonia/Navigation/Navigation.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Mediator; using Mediator;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public record Navigation<TRoute> : IRequest<bool> where TRoute : TemplatedControl public record Navigation<TRoute> : IRequest<bool> where TRoute : TemplatedControl
{ {
Framework/Avalonia/Navigation/NavigationPageFactory.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
internal class NavigationPageFactory : INavigationPageFactory internal class NavigationPageFactory : INavigationPageFactory
{ {
Framework/Avalonia/Navigation/NavigationRouteHandler.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Interactivity;
using Mediator; using Mediator;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia; namespace Toolkit.Framework.Avalonia;
public class NavigationRouteHandler : IRequestHandler<NavigationRoute> public class NavigationRouteHandler : IRequestHandler<NavigationRoute>
{ {
Framework/Avalonia/Templates/TemplateSelector.cs
+2 -3
View File
@@ -2,8 +2,8 @@
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Toolkit.Framework.Foundation; using Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia namespace Toolkit.Foundation.Avalonia;
{
public class TemplateSelector : IDataTemplate, ITemplateSelector public class TemplateSelector : IDataTemplate, ITemplateSelector
{ {
private readonly Dictionary<object, IControl> dataTracking = new(); private readonly Dictionary<object, IControl> dataTracking = new();
@@ -35,4 +35,3 @@ namespace Toolkit.Foundation.Avalonia
return true; return true;
} }
} }
}
Framework/Foundation/Foundation.csproj
+2 -2
View File
@@ -4,8 +4,8 @@
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Toolkit.Foundation</AssemblyName> <AssemblyName>Toolkit.Framework.Foundation</AssemblyName>
<RootNamespace>Toolkit.Foundation</RootNamespace> <RootNamespace>Toolkit.Framework.Foundation</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
Framework/Foundation/Navigation/IEventParameter.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Toolkit.Foundation; namespace Toolkit.Framework.Foundation;
public interface IEventParameter public interface IEventParameter
{ {
Framework/Foundation/Navigation/INavigationConfirmation.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Toolkit.Foundation; namespace Toolkit.Framework.Foundation;
public interface INavigationConfirmation public interface INavigationConfirmation
{ {