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>
<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" />
Framework/Avalonia/Extensions/EventArgsExtensions.cs
+3 -4
View File
@@ -1,10 +1,10 @@
using Avalonia.Data.Converters;
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)
{
return !string.IsNullOrWhiteSpace(path) ? GetEventArgsPropertyPathValue(args, path) : converter is not null ? converter.Convert(args, typeof(object), converterParameter, CultureInfo.CurrentCulture) : (dynamic)args;
@@ -20,5 +20,4 @@ namespace Toolkit.Foundation.Avalonia
return value;
}
}
}
Framework/Avalonia/Extensions/IHostBuilderExtensions.cs
+3 -4
View File
@@ -3,10 +3,10 @@ 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 class IHostBuilderExtensions
{
public static IHostBuilder ConfigureTemplates(this IHostBuilder hostBuilder, Action<ITemplateBuilder> builderDelegate)
{
hostBuilder.ConfigureServices((hostBuilderContext, serviceCollection) =>
@@ -31,5 +31,4 @@ namespace Toolkit.Foundation.Avalonia
return hostBuilder;
}
}
}
Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs
+3 -4
View File
@@ -4,10 +4,10 @@ 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 class IServiceCollectionExtensions
{
public static IServiceCollection AddNavigation(this IServiceCollection serviceCollection)
{
serviceCollection.TryAddSingleton<INavigationRouteDescriptorCollection, NavigationRouteDescriptorCollection>();
@@ -18,5 +18,4 @@ namespace Toolkit.Foundation.Avalonia
return serviceCollection;
}
}
}
Framework/Avalonia/Extensions/MarkupExtensions.cs
+3 -4
View File
@@ -1,9 +1,9 @@
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)
{
if (value is Binding)
@@ -13,5 +13,4 @@ namespace Toolkit.Foundation.Avalonia
return new Binding { Mode = BindingMode.OneWay, Source = value };
}
}
}
Framework/Avalonia/Extensions/PropertyPathHelper..cs
+3 -4
View File
@@ -1,10 +1,10 @@
using Avalonia;
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();
public static object GetValue(object args, string path)
@@ -24,5 +24,4 @@ namespace Toolkit.Foundation.Avalonia
public static readonly StyledProperty<object> ValueProperty =
AvaloniaProperty.Register<Dummy, object>("Value");
}
}
}
Framework/Avalonia/Markups/CompositeExtension.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using Avalonia.Markup.Xaml;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public class CompositeExtension : TriggerExtension
{
Framework/Avalonia/Markups/EventParameterExtension.cs
+1 -1
View File
@@ -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
{
Framework/Avalonia/Markups/InvokeExtension.cs
+1 -1
View File
@@ -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
{
Framework/Avalonia/Markups/NavigateExtension.cs
+1 -1
View File
@@ -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
{
Framework/Avalonia/Markups/NavigationRouteExtension.cs
+1 -1
View File
@@ -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
{
Framework/Avalonia/Markups/ParameterBindingExtension.cs
+1 -1
View File
@@ -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
{
Framework/Avalonia/Markups/TriggerCollection.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.ObjectModel;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public class TriggerCollection : Collection<Delegate>
{
Framework/Avalonia/Markups/TriggerExtension.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using Avalonia.Markup.Xaml;
using System.Reflection;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public class TriggerExtension : MarkupExtension
{
Framework/Avalonia/Navigation/ContentControlNavigation.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using Avalonia.Controls;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public record ContentControlNavigation : Navigation<ContentControl>
{
Framework/Avalonia/Navigation/ContentControlNavigationHandler.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Avalonia.Controls.Primitives;
using Mediator;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public class ContentControlNavigationHandler : IRequestHandler<ContentControlNavigation, bool>
{
Framework/Avalonia/Navigation/ContentDialogNavigation.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using FluentAvalonia.UI.Controls;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public record ContentDialogNavigation : Navigation<ContentDialog>
{
Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using FluentAvalonia.UI.Controls;
using Mediator;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public class ContentDialogNavigationHandler : IRequestHandler<ContentDialogNavigation, bool>
{
Framework/Avalonia/Navigation/FrameNavigation.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using FluentAvalonia.UI.Controls;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public record FrameNavigation : Navigation<Frame>
{
Framework/Avalonia/Navigation/FrameNavigationHandler.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using FluentAvalonia.UI.Navigation;
using Mediator;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
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 Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
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 Toolkit.Framework.Foundation;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
public class NavigateHandler : IRequestHandler<Navigate>
{
Framework/Avalonia/Navigation/Navigation.cs
+1 -1
View File
@@ -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
{
Framework/Avalonia/Navigation/NavigationPageFactory.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Avalonia.Controls;
using FluentAvalonia.UI.Controls;
namespace Toolkit.Foundation.Avalonia;
namespace Toolkit.Framework.Avalonia;
internal class NavigationPageFactory : INavigationPageFactory
{
Framework/Avalonia/Navigation/NavigationRouteHandler.cs
+1 -1
View File
@@ -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>
{
Framework/Avalonia/Templates/TemplateSelector.cs
+3 -4
View File
@@ -2,10 +2,10 @@
using Avalonia.Controls.Templates;
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 ITemplateFactory templateFactory;
@@ -34,5 +34,4 @@ namespace Toolkit.Foundation.Avalonia
{
return true;
}
}
}
Framework/Foundation/Foundation.csproj
+2 -2
View File
@@ -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>
Framework/Foundation/Navigation/IEventParameter.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Toolkit.Foundation;
namespace Toolkit.Framework.Foundation;
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
{