A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added API for tools
Etienne Baudoux287d07a39df5
diff --git a/src/DevTools.sln b/src/DevTools.slnindex 3e661d1d9..cfc69eff3 100644--- a/src/DevTools.sln+++ b/src/DevTools.sln@@ -42,19 +42,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Impl", "dev\impl\DEndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolution- Debug|Any CPU = Debug|Any CPUDebug|ARM = Debug|ARMDebug|ARM64 = Debug|ARM64Debug|x64 = Debug|x64Debug|x86 = Debug|x86- Release|Any CPU = Release|Any CPURelease|ARM = Release|ARMRelease|ARM64 = Release|ARM64Release|x64 = Release|x64Release|x86 = Release|x86EndGlobalSectionGlobalSection(ProjectConfigurationPlatforms) = postSolution- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|Any CPU.ActiveCfg = Debug|x86{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.ActiveCfg = Debug|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Build.0 = Debug|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Deploy.0 = Debug|ARM@@ -67,7 +64,6 @@ Global{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.ActiveCfg = Debug|x86{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.Build.0 = Debug|x86{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.Deploy.0 = Debug|x86- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|Any CPU.ActiveCfg = Release|x86{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.ActiveCfg = Release|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Build.0 = Release|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Deploy.0 = Release|ARM@@ -80,7 +76,6 @@ Global{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.ActiveCfg = Release|x86{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Build.0 = Release|x86{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Deploy.0 = Release|x86- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|Any CPU.ActiveCfg = Debug|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.ActiveCfg = Debug|ARM{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.Build.0 = Debug|ARM{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.ActiveCfg = Debug|ARM64@@ -89,7 +84,6 @@ Global{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.Build.0 = Debug|x64{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.ActiveCfg = Debug|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.Build.0 = Debug|x86- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|Any CPU.ActiveCfg = Release|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.ActiveCfg = Release|ARM{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.Build.0 = Release|ARM{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.ActiveCfg = Release|ARM64@@ -98,8 +92,6 @@ Global{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.Build.0 = Release|x64{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.ActiveCfg = Release|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.Build.0 = Release|x86- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|Any CPU.Build.0 = Debug|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM.ActiveCfg = Debug|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM.Build.0 = Debug|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM64.ActiveCfg = Debug|Any CPU@@ -108,8 +100,6 @@ Global{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x64.Build.0 = Debug|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x86.ActiveCfg = Debug|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x86.Build.0 = Debug|Any CPU- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|Any CPU.ActiveCfg = Release|Any CPU- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|Any CPU.Build.0 = Release|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM.ActiveCfg = Release|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM.Build.0 = Release|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM64.ActiveCfg = Release|Any CPU@@ -118,8 +108,6 @@ Global{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x64.Build.0 = Release|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x86.ActiveCfg = Release|Any CPU{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x86.Build.0 = Release|Any CPU- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM.ActiveCfg = Debug|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM.Build.0 = Debug|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM64.ActiveCfg = Debug|Any CPU@@ -128,8 +116,6 @@ Global{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x64.Build.0 = Debug|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x86.ActiveCfg = Debug|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x86.Build.0 = Debug|Any CPU- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|Any CPU.Build.0 = Release|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM.ActiveCfg = Release|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM.Build.0 = Release|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM64.ActiveCfg = Release|Any CPU@@ -138,7 +124,6 @@ Global{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x64.Build.0 = Release|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x86.ActiveCfg = Release|Any CPU{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x86.Build.0 = Release|Any CPU- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|Any CPU.ActiveCfg = Debug|x86{98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM.ActiveCfg = Debug|ARM{98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM.Build.0 = Debug|ARM{98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM64.ActiveCfg = Debug|ARM64@@ -147,7 +132,6 @@ Global{98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x64.Build.0 = Debug|x64{98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x86.ActiveCfg = Debug|x86{98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x86.Build.0 = Debug|x86- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|Any CPU.ActiveCfg = Release|x86{98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM.ActiveCfg = Release|ARM{98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM.Build.0 = Release|ARM{98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM64.ActiveCfg = Release|ARM64@@ -156,7 +140,6 @@ Global{98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x64.Build.0 = Release|x64{98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x86.ActiveCfg = Release|x86{98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x86.Build.0 = Release|x86- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|Any CPU.ActiveCfg = Debug|x86{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM.ActiveCfg = Debug|ARM{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM.Build.0 = Debug|ARM{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM64.ActiveCfg = Debug|ARM64@@ -165,7 +148,6 @@ Global{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x64.Build.0 = Debug|x64{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x86.ActiveCfg = Debug|x86{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x86.Build.0 = Debug|x86- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|Any CPU.ActiveCfg = Release|x86{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM.ActiveCfg = Release|ARM{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM.Build.0 = Release|ARM{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM64.ActiveCfg = Release|ARM64@@ -174,8 +156,6 @@ Global{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x64.Build.0 = Release|x64{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x86.ActiveCfg = Release|x86{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x86.Build.0 = Release|x86- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|Any CPU.Build.0 = Debug|Any CPU{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM.ActiveCfg = Debug|ARM{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM.Build.0 = Debug|ARM{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM64.ActiveCfg = Debug|ARM64@@ -184,8 +164,6 @@ Global{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x64.Build.0 = Debug|x64{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x86.ActiveCfg = Debug|x86{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x86.Build.0 = Debug|x86- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|Any CPU.ActiveCfg = Release|Any CPU- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|Any CPU.Build.0 = Release|Any CPU{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM.ActiveCfg = Release|ARM{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM.Build.0 = Release|ARM{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM64.ActiveCfg = Release|ARM64@@ -194,8 +172,6 @@ Global{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x64.Build.0 = Release|x64{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x86.ActiveCfg = Release|x86{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x86.Build.0 = Release|x86- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|Any CPU.Build.0 = Debug|Any CPU{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM.ActiveCfg = Debug|ARM{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM.Build.0 = Debug|ARM{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM64.ActiveCfg = Debug|ARM64@@ -204,8 +180,6 @@ Global{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x64.Build.0 = Debug|x64{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x86.ActiveCfg = Debug|x86{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x86.Build.0 = Debug|x86- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|Any CPU.ActiveCfg = Release|Any CPU- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|Any CPU.Build.0 = Release|Any CPU{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM.ActiveCfg = Release|ARM{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM.Build.0 = Release|ARM{E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM64.ActiveCfg = Release|ARM64diff --git a/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs b/src/dev/def/DevTools.Core/Navigation/NavigationParameter.csnew file mode 100644index 000000000..5785e821c--- /dev/null+++ b/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs@@ -0,0 +1,20 @@+using DevTools.Core.Injection;++namespace DevTools.Core.Navigation+{+ /// <summary>+ /// Represents the arguments passed to a page or frame.+ /// </summary>+ public class NavigationParameter+ {+ public IMefProvider ExportProvider { get; }++ public object? Parameter { get; }++ public NavigationParameter(IMefProvider exportProvider, object? parameter)+ {+ ExportProvider = Arguments.NotNull(exportProvider, nameof(exportProvider));+ Parameter = parameter;+ }+ }+}diff --git a/src/dev/def/DevTools.Providers/DevTools.Providers.csproj b/src/dev/def/DevTools.Providers/DevTools.Providers.csprojindex 5c38593f9..dc277a325 100644--- a/src/dev/def/DevTools.Providers/DevTools.Providers.csproj+++ b/src/dev/def/DevTools.Providers/DevTools.Providers.csproj@@ -8,5 +8,8 @@<Link>Properties\SharedAssemblyInfo.cs</Link></Compile></ItemGroup>+ <ItemGroup>+ <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)"/>+ </ItemGroup></Project>diff --git a/src/dev/def/DevTools.Providers/IToolProvider.cs b/src/dev/def/DevTools.Providers/IToolProvider.csnew file mode 100644index 000000000..f7ed049d5--- /dev/null+++ b/src/dev/def/DevTools.Providers/IToolProvider.cs@@ -0,0 +1,35 @@+using System.ComponentModel;++namespace DevTools.Providers+{+ /// <summary>+ /// Provides information about a tool and create an instance of it.+ /// </summary>+ public interface IToolProvider : INotifyPropertyChanged+ {+ /// <summary>+ /// Gets the name of the tool. It will be displayed in the list of tools.+ /// </summary>+ string? DisplayName { get; }++ /// <summary>+ /// Gets an object type that has a width, height and image data. It can be an icon through a font, an SVG...etc.+ /// </summary>+ object IconSource { get; }++ /// <summary>+ /// Creates a new instance of the tool.+ /// </summary>+ IToolViewModel CreateTool();++ /// <summary>+ /// Analyze the data given in parameter and tells whether the current tool can treat it.+ /// </summary>+ /// <param name="data"></param>+ /// <returns></returns>+ /// <remarks>+ /// This method is useful for detecting automatically what tool to suggest the user to use based on an input (coming from the clipboard for example).+ /// </remarks>+ bool CanBeTreatedByTool(string data);+ }+}diff --git a/src/dev/def/DevTools.Providers/IToolProviderFactory.cs b/src/dev/def/DevTools.Providers/IToolProviderFactory.csnew file mode 100644index 000000000..4a8f66993--- /dev/null+++ b/src/dev/def/DevTools.Providers/IToolProviderFactory.cs@@ -0,0 +1,24 @@+using System.Collections.Generic;++namespace DevTools.Providers+{+ /// <summary>+ /// Factory allowing to get a set of <see cref="IToolProvider"/>.+ /// </summary>+ public interface IToolProviderFactory+ {+ /// <summary>+ /// Gets the list of tools available.+ /// </summary>+ /// <param name="searchQuery">If not null or empty, the method will return items that match the given search query and order them.</param>+ /// <returns>+ /// Returns a list of provider along with an array of parts that matched <paramref name="searchQuery"/>.+ /// </returns>+ IEnumerable<MatchedToolProvider> GetTools(string? searchQuery);++ /// <summary>+ /// Gets the list of tools available that have the <see cref="IsFooterItemAttribute"/>.+ /// </summary>+ IEnumerable<MatchedToolProvider> GetFooterTools();+ }+}diff --git a/src/dev/def/DevTools.Providers/IToolView.cs b/src/dev/def/DevTools.Providers/IToolView.csnew file mode 100644index 000000000..43e88ca7c--- /dev/null+++ b/src/dev/def/DevTools.Providers/IToolView.cs@@ -0,0 +1,9 @@+namespace DevTools.Providers+{+ /// <summary>+ /// Provides a view to display in the UI for the tool.+ /// </summary>+ public interface IToolView+ {+ }+}\ No newline at end of filediff --git a/src/dev/def/DevTools.Providers/IToolViewModel.cs b/src/dev/def/DevTools.Providers/IToolViewModel.csnew file mode 100644index 000000000..555f29251--- /dev/null+++ b/src/dev/def/DevTools.Providers/IToolViewModel.cs@@ -0,0 +1,15 @@+using System.ComponentModel;++namespace DevTools.Providers+{+ /// <summary>+ /// Provides a view model for a tool.+ /// </summary>+ public interface IToolViewModel : INotifyPropertyChanged+ {+ /// <summary>+ /// Gets an instance of the view to display in the UI.+ /// </summary>+ IToolView View { get; }+ }+}diff --git a/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs b/src/dev/def/DevTools.Providers/IsFooterItemAttribute.csnew file mode 100644index 000000000..46e2d16c3--- /dev/null+++ b/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs@@ -0,0 +1,12 @@+using System;+using System.Composition;++namespace DevTools.Providers+{+ [MetadataAttribute]+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]+ public sealed class IsFooterItemAttribute : Attribute+ {+ public bool IsFooterItem { get; set; } = true;+ }+}diff --git a/src/dev/def/DevTools.Providers/MatchSpan.cs b/src/dev/def/DevTools.Providers/MatchSpan.csnew file mode 100644index 000000000..b34197950--- /dev/null+++ b/src/dev/def/DevTools.Providers/MatchSpan.cs@@ -0,0 +1,15 @@+namespace DevTools.Providers+{+ public struct MatchSpan+ {+ public int StartPosition { get; }++ public int Length { get; }++ public MatchSpan(int startPosition, int length)+ {+ StartPosition = startPosition;+ Length = length;+ }+ }+}diff --git a/src/dev/def/DevTools.Providers/MatchedToolProvider.cs b/src/dev/def/DevTools.Providers/MatchedToolProvider.csnew file mode 100644index 000000000..095249dd8--- /dev/null+++ b/src/dev/def/DevTools.Providers/MatchedToolProvider.cs@@ -0,0 +1,17 @@+using System;++namespace DevTools.Providers+{+ public class MatchedToolProvider+ {+ public IToolProvider ToolProvider { get; }++ public MatchSpan[] MatchedSpans { get; }++ public MatchedToolProvider(IToolProvider toolProvider, MatchSpan[] matchedSpans)+ {+ ToolProvider = toolProvider ?? throw new ArgumentNullException();+ MatchedSpans = matchedSpans ?? throw new ArgumentNullException();+ }+ }+}diff --git a/src/dev/def/DevTools.Providers/NameAttribute.cs b/src/dev/def/DevTools.Providers/NameAttribute.csnew file mode 100644index 000000000..e9fdc28a7--- /dev/null+++ b/src/dev/def/DevTools.Providers/NameAttribute.cs@@ -0,0 +1,17 @@+using System;+using System.Composition;++namespace DevTools.Providers+{+ [MetadataAttribute]+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]+ public sealed class NameAttribute : Attribute+ {+ public string? Name { get; set; }++ public NameAttribute(string? name)+ {+ Name = name;+ }+ }+}diff --git a/src/dev/def/DevTools.Providers/OrderAttribute.cs b/src/dev/def/DevTools.Providers/OrderAttribute.csnew file mode 100644index 000000000..ba5f28a76--- /dev/null+++ b/src/dev/def/DevTools.Providers/OrderAttribute.cs@@ -0,0 +1,17 @@+using System;+using System.Composition;++namespace DevTools.Providers+{+ [MetadataAttribute]+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]+ public sealed class OrderAttribute : Attribute+ {+ public int? Order { get; set; }++ public OrderAttribute(int order)+ {+ Order = order;+ }+ }+}diff --git a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs b/src/dev/def/DevTools.Providers/ToolProviderMetadata.csnew file mode 100644index 000000000..2b77ec95c--- /dev/null+++ b/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs@@ -0,0 +1,16 @@+using System.ComponentModel;++namespace DevTools.Providers+{+ public sealed class ToolProviderMetadata+ {+ [DefaultValue("Unnamed")]+ public string? Name { get; set; }++ [DefaultValue(int.MaxValue)]+ public int? Order { get; set; }++ [DefaultValue(false)]+ public bool IsFooterItem { get; set; }+ }+}diff --git a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj b/src/dev/impl/DevTools.Impl/DevTools.Impl.csprojindex becf9c5fb..826cec9d0 100644--- a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj+++ b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj@@ -75,10 +75,13 @@<Link>Properties\SharedAssemblyInfo.cs</Link></Compile><Compile Include="Dummy.cs" />+ <Compile Include="Models\MatchedToolProviderViewData.cs" /><Compile Include="Properties\AssemblyInfo.cs" />+ <Compile Include="ViewModels\MainPageViewModel.cs" /><Compile Include="Views\MainPage.xaml.cs"><DependentUpon>MainPage.xaml</DependentUpon></Compile>+ <Compile Include="Views\Settings\SettingsToolProvider.cs" /></ItemGroup><ItemGroup><Content Include="..\..\startup\DevTools.Startup\Assets\Logo\Square44x44Logo.scale-200.png">diff --git a/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs b/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.csnew file mode 100644index 000000000..ce77e182b--- /dev/null+++ b/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs@@ -0,0 +1,15 @@+using DevTools.Providers;+using Windows.UI.Xaml.Controls;++namespace DevTools.Impl.Models+{+ public sealed class MatchedToolProviderViewData : MatchedToolProvider+ {+ internal IconElement Icon => (IconElement)ToolProvider.IconSource;++ public MatchedToolProviderViewData(IToolProvider toolProvider, MatchSpan[] matchedSpans)+ : base(toolProvider, matchedSpans)+ {+ }+ }+}diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.csnew file mode 100644index 000000000..80ddfbf54--- /dev/null+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs@@ -0,0 +1,54 @@+#nullable enable++using DevTools.Impl.Models;+using DevTools.Providers;+using Microsoft.Toolkit.Mvvm.ComponentModel;+using System.Collections.ObjectModel;+using System.Composition;++namespace DevTools.Impl.ViewModels+{+ [Export(typeof(MainPageViewModel))]+ [Shared]+ public sealed class MainPageViewModel : ObservableRecipient+ {+ private readonly IToolProviderFactory _toolProviderFactory;++ internal ObservableCollection<MatchedToolProviderViewData> ToolsMenuItems { get; } = new();++ internal ObservableCollection<MatchedToolProviderViewData> FooterMenuItems { get; } = new();++ [ImportingConstructor]+ public MainPageViewModel(IToolProviderFactory toolProviderFactory)+ {+ _toolProviderFactory = toolProviderFactory;++ SetFooterMenuItems();+ SearchTools(searchQuery: string.Empty);+ }++ private void SearchTools(string searchQuery)+ {+ ToolsMenuItems.Clear();+ foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetTools(searchQuery))+ {+ ToolsMenuItems.Add(+ new MatchedToolProviderViewData(+ matchedToolProvider.ToolProvider,+ matchedToolProvider.MatchedSpans));+ }+ }++ private void SetFooterMenuItems()+ {+ FooterMenuItems.Clear();+ foreach (MatchedToolProvider matchedToolProvider in _toolProviderFactory.GetFooterTools())+ {+ FooterMenuItems.Add(+ new MatchedToolProviderViewData(+ matchedToolProvider.ToolProvider,+ matchedToolProvider.MatchedSpans));+ }+ }+ }+}diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xamlindex f0e88c725..1a5b6649b 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml@@ -7,6 +7,7 @@xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:muxc="using:Microsoft.UI.Xaml.Controls"xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"+ xmlns:models="using:DevTools.Impl.Models"mc:Ignorable="d"muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"><Page.Resources>@@ -62,45 +63,20 @@ExpandedModeThresholdWidth="550"PaneDisplayMode="Auto"SelectionFollowsFocus="Disabled"- IsTabStop="False">+ IsTabStop="False"+ MenuItemsSource="{x:Bind ViewModel.ToolsMenuItems}"+ FooterMenuItemsSource="{x:Bind ViewModel.FooterMenuItems}">++ <muxc:NavigationView.MenuItemTemplate>+ <DataTemplate x:DataType="models:MatchedToolProviderViewData">+ <muxc:NavigationViewItem Content="{x:Bind ToolProvider.DisplayName}" Icon="{x:Bind Icon}"/>+ </DataTemplate>+ </muxc:NavigationView.MenuItemTemplate><muxc:NavigationView.AutoSuggestBox><AutoSuggestBox QueryIcon="Find" PlaceholderText="Search" /></muxc:NavigationView.AutoSuggestBox>- <muxc:NavigationView.MenuItems>- <muxc:NavigationViewItem Content="Menu Item1" Tag="SamplePage1" x:Name="SamplePage1Item">- <muxc:NavigationViewItem.Icon>- <SymbolIcon Symbol="Play" />- </muxc:NavigationViewItem.Icon>- </muxc:NavigationViewItem>- <muxc:NavigationViewItem Content="Menu Item2" Tag="SamplePage2" x:Name="SamplePage2Item">- <muxc:NavigationViewItem.Icon>- <SymbolIcon Symbol="Save" />- </muxc:NavigationViewItem.Icon>- </muxc:NavigationViewItem>- <muxc:NavigationViewItem Content="Menu Item3" Tag="SamplePage3" x:Name="SamplePage3Item">- <muxc:NavigationViewItem.Icon>- <SymbolIcon Symbol="Refresh" />- </muxc:NavigationViewItem.Icon>- </muxc:NavigationViewItem>- </muxc:NavigationView.MenuItems>-- <muxc:NavigationView.FooterMenuItems>- <muxc:NavigationViewItem Content="Settings" SelectsOnInvoked="True">- <muxc:NavigationViewItem.Icon>- <muxc:AnimatedIcon>- <muxc:AnimatedIcon.Source>- <animatedvisuals:AnimatedSettingsVisualSource/>- </muxc:AnimatedIcon.Source>- <muxc:AnimatedIcon.FallbackIconSource>- <muxc:FontIconSource FontFamily="FluentSystemIcons-Regular" Glyph="" />- </muxc:AnimatedIcon.FallbackIconSource>- </muxc:AnimatedIcon>- </muxc:NavigationViewItem.Icon>- </muxc:NavigationViewItem>- </muxc:NavigationView.FooterMenuItems>-<Frame x:Name="contentFrame" /></muxc:NavigationView></Grid>diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.csindex 4beea0bf1..1846b4c77 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs@@ -1,17 +1,20 @@#nullable enable+using DevTools.Core.Navigation;+using DevTools.Impl.ViewModels;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;--// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238+using Windows.UI.Xaml.Navigation;namespace DevTools.Impl.Views{- /// <summary>- /// An empty page that can be used on its own or navigated to within a Frame.- /// </summary>public sealed partial class MainPage : Page{+ /// <summary>+ /// Gets the page's view model.+ /// </summary>+ internal MainPageViewModel ViewModel => (MainPageViewModel)DataContext;+public MainPage(){InitializeComponent();@@ -19,5 +22,13 @@ namespace DevTools.Impl.Views// Set custom title bar dragging areaWindow.Current.SetTitleBar(AppTitleBar);}++ protected override void OnNavigatedTo(NavigationEventArgs e)+ {+ var parameters = (NavigationParameter)e.Parameter;+ DataContext = parameters.ExportProvider.Import<MainPageViewModel>();++ base.OnNavigatedTo(e);+ }}}diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.csnew file mode 100644index 000000000..39f5b185e--- /dev/null+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs@@ -0,0 +1,42 @@+#nullable enable++using DevTools.Localization;+using DevTools.Providers;+using Microsoft.Toolkit.Mvvm.ComponentModel;+using Microsoft.UI.Xaml.Controls;+using Microsoft.UI.Xaml.Controls.AnimatedVisuals;+using System;+using System.Composition;+using Windows.UI.Xaml.Media;++namespace DevTools.Impl.Views.Settings+{+ [Export(typeof(IToolProvider))]+ [Name("Settings")]+ [IsFooterItem]+ internal sealed class SettingsToolProvider : ObservableRecipient, IToolProvider+ {+ public string DisplayName => LanguageManager.Instance.Settings.DisplayName;++ public object IconSource { get; }+ = new AnimatedIcon+ {+ Source = new AnimatedSettingsVisualSource(),+ FallbackIconSource = new FontIconSource+ {+ FontFamily = new FontFamily("FluentSystemIcons-Regular"),+ Glyph = ""+ }+ };++ public bool CanBeTreatedByTool(string data)+ {+ throw new NotImplementedException();+ }++ public IToolViewModel CreateTool()+ {+ throw new NotImplementedException();+ }+ }+}diff --git a/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj b/src/dev/impl/DevTools.Localization/DevTools.Localization.csprojindex 3b6ed56c9..625d56e1b 100644--- a/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj+++ b/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj@@ -102,6 +102,12 @@<Generator>MSBuild:Compile</Generator></Page></ItemGroup>+ <ItemGroup>+ <PRIResource Include="Strings\en\Base64EncoderDecoder.resw" />+ </ItemGroup>+ <ItemGroup>+ <PRIResource Include="Strings\en\Settings.resw" />+ </ItemGroup><Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.Other similar extension points exist, see Microsoft.Common.targets.diff --git a/src/dev/impl/DevTools.Localization/LanguageManager.cs b/src/dev/impl/DevTools.Localization/LanguageManager.csindex bc4fccd5f..92942dda8 100644--- a/src/dev/impl/DevTools.Localization/LanguageManager.cs+++ b/src/dev/impl/DevTools.Localization/LanguageManager.cs@@ -21,7 +21,9 @@ namespace DevTools.Localization{private static LanguageManager _languageManager;+ private readonly Base64EncoderDecoderStrings _base64encoderdecoder = new Base64EncoderDecoderStrings();private readonly MainPageStrings _mainpage = new MainPageStrings();+ private readonly SettingsStrings _settings = new SettingsStrings();/// <summary>/// Gets an instance of <see cref="LanguageManager"/>.@@ -33,11 +35,21 @@ namespace DevTools.Localization/// </summary>public FlowDirection FlowDirection { get; private set; }+ /// <summary>+ /// Gets the <see cref="Base64EncoderDecoderStrings"/>.+ /// </summary>+ public Base64EncoderDecoderStrings Base64EncoderDecoder => _base64encoderdecoder;+/// <summary>/// Gets the <see cref="MainPageStrings"/>./// </summary>public MainPageStrings MainPage => _mainpage;+ /// <summary>+ /// Gets the <see cref="SettingsStrings"/>.+ /// </summary>+ public SettingsStrings Settings => _settings;+/// <summary>/// Retrieves the current culture./// </summary>@@ -69,6 +81,16 @@ namespace DevTools.Localization}}+ public class Base64EncoderDecoderStrings : ObservableObject+ {+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/Base64EncoderDecoder");++ /// <summary>+ /// Gets the resource DisplayName.+ /// </summary>+ public string DisplayName => _resources.GetString("DisplayName");+ }+public class MainPageStrings : ObservableObject{private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/MainPage");@@ -78,4 +100,14 @@ namespace DevTools.Localization/// </summary>public string Yes => _resources.GetString("Yes");}++ public class SettingsStrings : ObservableObject+ {+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/Settings");++ /// <summary>+ /// Gets the resource DisplayName.+ /// </summary>+ public string DisplayName => _resources.GetString("DisplayName");+ }}\ No newline at end of filediff --git a/src/dev/impl/DevTools.Localization/Strings/en/Base64EncoderDecoder.resw b/src/dev/impl/DevTools.Localization/Strings/en/Base64EncoderDecoder.reswnew file mode 100644index 000000000..e7e695de7--- /dev/null+++ b/src/dev/impl/DevTools.Localization/Strings/en/Base64EncoderDecoder.resw@@ -0,0 +1,123 @@+<?xml version="1.0" encoding="utf-8"?>+<root>+ <!--+ Microsoft ResX Schema++ Version 2.0++ The primary goals of this format is to allow a simple XML format+ that is mostly human readable. The generation and parsing of the+ various data types are done through the TypeConverter classes+ associated with the data types.++ Example:++ ... ado.net/XML headers & schema ...+ <resheader name="resmimetype">text/microsoft-resx</resheader>+ <resheader name="version">2.0</resheader>+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">+ <value>[base64 mime encoded serialized .NET Framework object]</value>+ </data>+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>+ <comment>This is a comment</comment>+ </data>++ There are any number of "resheader" rows that contain simple+ name/value pairs.++ Each data row contains a name, and value. The row also contains a+ type or mimetype. Type corresponds to a .NET class that support+ text/value conversion through the TypeConverter architecture.+ Classes that don't support this are serialized and stored with the+ mimetype set.++ The mimetype is used for serialized objects, and tells the+ ResXResourceReader how to depersist the object. This is currently not+ extensible. For a given mimetype the value must be set accordingly:++ Note - application/x-microsoft.net.object.binary.base64 is the format+ that the ResXResourceWriter will generate, however the reader can+ read any of the formats listed below.++ mimetype: application/x-microsoft.net.object.binary.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.soap.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.bytearray.base64+ value : The object must be serialized into a byte array+ : using a System.ComponentModel.TypeConverter+ : and then encoded with base64 encoding.+ -->+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />+ <xsd:element name="root" msdata:IsDataSet="true">+ <xsd:complexType>+ <xsd:choice maxOccurs="unbounded">+ <xsd:element name="metadata">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" />+ </xsd:sequence>+ <xsd:attribute name="name" use="required" type="xsd:string" />+ <xsd:attribute name="type" type="xsd:string" />+ <xsd:attribute name="mimetype" type="xsd:string" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="assembly">+ <xsd:complexType>+ <xsd:attribute name="alias" type="xsd:string" />+ <xsd:attribute name="name" type="xsd:string" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="data">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="resheader">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" />+ </xsd:complexType>+ </xsd:element>+ </xsd:choice>+ </xsd:complexType>+ </xsd:element>+ </xsd:schema>+ <resheader name="resmimetype">+ <value>text/microsoft-resx</value>+ </resheader>+ <resheader name="version">+ <value>2.0</value>+ </resheader>+ <resheader name="reader">+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <resheader name="writer">+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <data name="DisplayName" xml:space="preserve">+ <value>Base 64 Encoder/Decoder</value>+ </data>+</root>\ No newline at end of filediff --git a/src/dev/impl/DevTools.Localization/Strings/en/Settings.resw b/src/dev/impl/DevTools.Localization/Strings/en/Settings.reswnew file mode 100644index 000000000..aa31773d5--- /dev/null+++ b/src/dev/impl/DevTools.Localization/Strings/en/Settings.resw@@ -0,0 +1,123 @@+<?xml version="1.0" encoding="utf-8"?>+<root>+ <!--+ Microsoft ResX Schema++ Version 2.0++ The primary goals of this format is to allow a simple XML format+ that is mostly human readable. The generation and parsing of the+ various data types are done through the TypeConverter classes+ associated with the data types.++ Example:++ ... ado.net/XML headers & schema ...+ <resheader name="resmimetype">text/microsoft-resx</resheader>+ <resheader name="version">2.0</resheader>+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">+ <value>[base64 mime encoded serialized .NET Framework object]</value>+ </data>+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>+ <comment>This is a comment</comment>+ </data>++ There are any number of "resheader" rows that contain simple+ name/value pairs.++ Each data row contains a name, and value. The row also contains a+ type or mimetype. Type corresponds to a .NET class that support+ text/value conversion through the TypeConverter architecture.+ Classes that don't support this are serialized and stored with the+ mimetype set.++ The mimetype is used for serialized objects, and tells the+ ResXResourceReader how to depersist the object. This is currently not+ extensible. For a given mimetype the value must be set accordingly:++ Note - application/x-microsoft.net.object.binary.base64 is the format+ that the ResXResourceWriter will generate, however the reader can+ read any of the formats listed below.++ mimetype: application/x-microsoft.net.object.binary.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.soap.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.bytearray.base64+ value : The object must be serialized into a byte array+ : using a System.ComponentModel.TypeConverter+ : and then encoded with base64 encoding.+ -->+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />+ <xsd:element name="root" msdata:IsDataSet="true">+ <xsd:complexType>+ <xsd:choice maxOccurs="unbounded">+ <xsd:element name="metadata">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" />+ </xsd:sequence>+ <xsd:attribute name="name" use="required" type="xsd:string" />+ <xsd:attribute name="type" type="xsd:string" />+ <xsd:attribute name="mimetype" type="xsd:string" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="assembly">+ <xsd:complexType>+ <xsd:attribute name="alias" type="xsd:string" />+ <xsd:attribute name="name" type="xsd:string" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="data">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="resheader">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" />+ </xsd:complexType>+ </xsd:element>+ </xsd:choice>+ </xsd:complexType>+ </xsd:element>+ </xsd:schema>+ <resheader name="resmimetype">+ <value>text/microsoft-resx</value>+ </resheader>+ <resheader name="version">+ <value>2.0</value>+ </resheader>+ <resheader name="reader">+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <resheader name="writer">+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <data name="DisplayName" xml:space="preserve">+ <value>Settings</value>+ </data>+</root>\ No newline at end of filediff --git a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csprojindex 724236043..557d8338c 100644--- a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj+++ b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj@@ -74,6 +74,9 @@</Compile><Compile Include="Dummy.cs" /><Compile Include="Properties\AssemblyInfo.cs" />+ <Compile Include="ToolProviderFactory.cs" />+ <Compile Include="Tools\Base64EncoderDecoder\Base64EncoderDecoderToolProvider.cs" />+ <Compile Include="Tools\ToolProviderBase.cs" /></ItemGroup><ItemGroup><PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />diff --git a/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs b/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.csnew file mode 100644index 000000000..1756fcf6b--- /dev/null+++ b/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs@@ -0,0 +1,72 @@+#nullable enable++using System;+using System.Collections.Generic;+using System.Composition;+using System.Linq;++namespace DevTools.Providers.Impl+{+ [Export(typeof(IToolProviderFactory))]+ internal sealed class ToolProviderFactory : IToolProviderFactory+ {+ private readonly IEnumerable<Lazy<IToolProvider, ToolProviderMetadata>> _providers;++ [ImportingConstructor]+ public ToolProviderFactory(+ [ImportMany] IEnumerable<Lazy<IToolProvider, ToolProviderMetadata>> providers)+ {+ _providers = providers;+ }++ public IEnumerable<MatchedToolProvider> GetTools(string? searchQuery)+ {+ IOrderedEnumerable<Lazy<IToolProvider, ToolProviderMetadata>> orderedProviders+ = _providers+ .Where(item => !item.Metadata.IsFooterItem)+ .OrderBy(item => item.Metadata.Order ?? int.MaxValue)+ .ThenBy(item => item.Value.DisplayName)+ .ThenBy(item => item.Metadata.Name);++ searchQuery = searchQuery?.Trim();+ string[]? searchQueries = searchQuery?.Split(new char[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);++ foreach (Lazy<IToolProvider, ToolProviderMetadata> provider in orderedProviders)+ {+ var matches = new List<MatchSpan>();++ if (searchQueries is not null)+ {+ foreach (string query in searchQueries)+ {+ int i = 0;+ while (i < provider.Value.DisplayName?.Length && i > -1)+ {+ int matchIndex = provider.Value.DisplayName.IndexOf(query, i, StringComparison.OrdinalIgnoreCase);+ if (matchIndex > -1)+ {+ matches.Add(new MatchSpan(matchIndex, query.Length));+ }++ i++;+ }+ }+ }++ if (matches.Count > 0 || searchQueries?.Length == 0)+ {+ yield return new MatchedToolProvider(provider.Value, matches.ToArray());+ }+ }+ }++ public IEnumerable<MatchedToolProvider> GetFooterTools()+ {+ var matches = Array.Empty<MatchSpan>();+ foreach (Lazy<IToolProvider, ToolProviderMetadata> provider in _providers.Where(item => item.Metadata.IsFooterItem))+ {+ yield return new MatchedToolProvider(provider.Value, matches);+ }+ }+ }+}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.csnew file mode 100644index 000000000..4cf2a4c81--- /dev/null+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs@@ -0,0 +1,30 @@+#nullable enable++using DevTools.Localization;+using System;+using System.Composition;++namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder+{+ [Export(typeof(IToolProvider))]+ [Name("Base64 Encoder/Decoder")]+ [Order(0)]+ internal sealed class Base64EncoderDecoderToolProvider : ToolProviderBase, IToolProvider+ {+ public string DisplayName => LanguageManager.Instance.Base64EncoderDecoder.DisplayName;++ public object IconSource { get; }+ = CreatePathIconFromPath(+ "M 0.008 0.008 L 0.008 31.992 L 31.992 31.992 L 31.992 0.008 Z M 2.916 2.916 L 29.084 2.916 L 29.084 29.084 L 2.916 29.084 Z M 11.957 10.094 L 8.777 13.774 C 7.823 14.87 7.276 16.273 7.276 17.727 L 7.276 18.18 C 7.276 20.169 8.924 21.816 10.912 21.816 L 12.366 21.816 C 14.353 21.816 16 20.169 16 18.18 C 16 16.193 14.353 14.546 12.366 14.546 L 11.957 14.546 L 14.137 12.002 Z M 21.816 10.184 L 21.816 14.546 L 20.362 14.546 L 20.362 10.231 L 17.454 10.231 L 17.454 17.454 L 21.816 17.454 L 21.816 21.816 L 24.722 21.816 L 24.722 10.184 Z M 10.276 17.454 L 12.366 17.454 C 12.781 17.454 13.092 17.766 13.092 18.18 C 13.092 18.595 12.781 18.908 12.366 18.908 L 10.912 18.908 C 10.497 18.908 10.184 18.595 10.184 18.18 L 10.184 17.727 C 10.184 17.629 10.264 17.55 10.276 17.454 Z");++ public bool CanBeTreatedByTool(string data)+ {+ throw new NotImplementedException();+ }++ public IToolViewModel CreateTool()+ {+ throw new NotImplementedException();+ }+ }+}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.csnew file mode 100644index 000000000..25418a149--- /dev/null+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs@@ -0,0 +1,22 @@+#nullable enable++using Microsoft.Toolkit.Mvvm.ComponentModel;+using Windows.UI.Xaml.Controls;+using Windows.UI.Xaml.Markup;+using Windows.UI.Xaml.Media;++namespace DevTools.Providers.Impl.Tools+{+ internal abstract class ToolProviderBase : ObservableRecipient+ {+ protected const string AssetsFolderPath = "ms-appx:///DevTools.Providers.Impl/Assets/";++ protected static PathIcon CreatePathIconFromPath(string pathMarkup)+ {+ return new PathIcon+ {+ Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), pathMarkup)+ };+ }+ }+}diff --git a/src/dev/startup/DevTools.Startup/Package.appxmanifest b/src/dev/startup/DevTools.Startup/Package.appxmanifestindex 18050953a..e56ce558a 100644--- a/src/dev/startup/DevTools.Startup/Package.appxmanifest+++ b/src/dev/startup/DevTools.Startup/Package.appxmanifest@@ -4,7 +4,8 @@xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"- IgnorableNamespaces="uap mp">+ xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"+ IgnorableNamespaces="uap mp desktop4"><IdentityName="020c5ec9-262d-4acd-92d0-26ec6e869879"@@ -32,7 +33,8 @@<Applications><Application Id="App"Executable="$targetnametoken$.exe"- EntryPoint="$targetentrypoint$">+ EntryPoint="$targetentrypoint$"+ desktop4:SupportsMultipleInstances="true"><uap:VisualElementsDisplayName="DevTools"Description="DevTools"diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.csindex 5feeecd87..63ac79994 100644--- a/src/dev/startup/DevTools/App.xaml.cs+++ b/src/dev/startup/DevTools/App.xaml.cs@@ -16,6 +16,9 @@ using Windows.UI.Xaml.Navigation;using Windows.ApplicationModel.Core;using DevTools.Core.Theme;using DevTools.Core.Settings;+using DevTools.Core.Navigation;+using DevTools.Core.Injection;+using DevTools.Providers;namespace DevTools{@@ -43,6 +46,7 @@ namespace DevTools_mefComposer= new MefComposer(typeof(MefComposer).Assembly,+ typeof(IToolProvider).Assembly,typeof(Providers.Impl.Dummy).Assembly,typeof(Impl.Dummy).Assembly);@@ -120,7 +124,7 @@ namespace DevTools// When the navigation stack isn't restored navigate to the first page,// configuring the new page by passing required information as a navigation// parameter- rootFrame.Navigate(typeof(MainPage), e.Arguments);+ rootFrame.Navigate(typeof(MainPage), new NavigationParameter(_mefComposer.ExportProvider.GetExport<IMefProvider>(), e.Arguments));}// Ensure the current window is activeWindow.Current.Activate();