Skip to content

A Swiss Army knife for developers.

Added a "All tools" menu (#111)

Etienne Baudouxdfa03212e4d8
diff --git a/src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs b/src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs
index b80971c13..fbafee143 100644
--- a/src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs
+++ b/src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs
@@ -38,7 +38,12 @@ namespace DevToys.Api.Tools
IEnumerable<IToolProvider> GetAllChildrenTools(IToolProvider toolProvider);
/// <summary>
- /// Gets the list of tools available that have the <see cref="IsFooterItemAttribute"/>.
+ /// Gets the list of tools available that have should be displayed in the header.
+ /// </summary>
+ Task<IEnumerable<MatchedToolProvider>> GetHeaderToolsAsync();
+
+ /// <summary>
+ /// Gets the list of tools available that have should be displayed in the footer.
/// </summary>
Task<IEnumerable<MatchedToolProvider>> GetFooterToolsAsync();
diff --git a/src/dev/impl/DevToys/Api/Tools/MenuPlacement.cs b/src/dev/impl/DevToys/Api/Tools/MenuPlacement.cs
new file mode 100644
index 000000000..dfb514634
--- /dev/null
+++ b/src/dev/impl/DevToys/Api/Tools/MenuPlacement.cs
@@ -0,0 +1,11 @@
+#nullable enable
+
+namespace DevToys.Api.Tools
+{
+ public enum MenuPlacement
+ {
+ Body,
+ Header,
+ Footer
+ }
+}
diff --git a/src/dev/impl/DevToys/Api/Tools/MenuPlacementAttribute.cs b/src/dev/impl/DevToys/Api/Tools/MenuPlacementAttribute.cs
new file mode 100644
index 000000000..fafe91f82
--- /dev/null
+++ b/src/dev/impl/DevToys/Api/Tools/MenuPlacementAttribute.cs
@@ -0,0 +1,22 @@
+#nullable enable
+
+using System;
+using System.Composition;
+
+namespace DevToys.Api.Tools
+{
+ /// <summary>
+ /// Indicates where the <see cref="IToolProvider"/> should be displayed in the navigation view.
+ /// </summary>
+ [MetadataAttribute]
+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+ public sealed class MenuPlacementAttribute : Attribute
+ {
+ public MenuPlacement MenuPlacement { get; }
+
+ public MenuPlacementAttribute(MenuPlacement menuPlacement)
+ {
+ MenuPlacement = menuPlacement;
+ }
+ }
+}
diff --git a/src/dev/impl/DevToys/Api/Tools/IsFooterItemAttribute.cs b/src/dev/impl/DevToys/Api/Tools/NotSearchableAttribute.cs
similarity index 50%
rename from src/dev/impl/DevToys/Api/Tools/IsFooterItemAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/NotSearchableAttribute.cs
index d8cc50b0d..3224d338d 100644
--- a/src/dev/impl/DevToys/Api/Tools/IsFooterItemAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/NotSearchableAttribute.cs
@@ -6,12 +6,12 @@ using System.Composition;
namespace DevToys.Api.Tools
{
/// <summary>
- /// Indicates whether the <see cref="IToolProvider"/> should be displayed at the bottom in the navigation view or not.
+ /// Indicates that the tool can not be searched.
/// </summary>
[MetadataAttribute]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
- public sealed class IsFooterItemAttribute : Attribute
+ public sealed class NotSearchableAttribute : Attribute
{
- public bool IsFooterItem { get; } = true;
+ public bool NotSearchable { get; } = true;
}
}
diff --git a/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs b/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
index be7215201..e0fd3faa5 100644
--- a/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
+++ b/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
@@ -25,10 +25,10 @@ namespace DevToys.Api.Tools
public int? Order { get; set; }
/// <summary>
- /// Gets or sets whether the tool should be displayed in the footer of the menu.
+ /// Gets or sets where the tool should be displayed in navigation view.
/// </summary>
- [DefaultValue(false)]
- public bool IsFooterItem { get; set; }
+ [DefaultValue(MenuPlacement.Body)]
+ public MenuPlacement MenuPlacement { get; set; }
/// <summary>
/// Gets or sets the tool name used through URI Activation Protocol to access this tool.
@@ -59,5 +59,11 @@ namespace DevToys.Api.Tools
/// </summary>
[DefaultValue(false)]
public bool NotScrollable { get; set; }
+
+ /// <summary>
+ /// Gets or sets whether the tool can be searched.
+ /// </summary>
+ [DefaultValue(false)]
+ public bool NotSearchable { get; set; }
}
}
diff --git a/src/dev/impl/DevToys/Core/ToolProviderFactory.cs b/src/dev/impl/DevToys/Core/ToolProviderFactory.cs
index 2a3756ebe..01addd364 100644
--- a/src/dev/impl/DevToys/Core/ToolProviderFactory.cs
+++ b/src/dev/impl/DevToys/Core/ToolProviderFactory.cs
@@ -19,6 +19,7 @@ namespace DevToys.Providers.Impl
{
private readonly ImmutableArray<MatchedToolProvider> _allProviders;
private readonly Task<ImmutableArray<MatchedToolProvider>> _providersTree;
+ private readonly Task<ImmutableArray<MatchedToolProvider>> _headerProviders;
private readonly Task<ImmutableArray<MatchedToolProvider>> _footerProviders;
private readonly Dictionary<IToolProvider, IToolViewModel> _toolProviderToViewModelCache = new();
@@ -28,6 +29,7 @@ namespace DevToys.Providers.Impl
{
_allProviders = BuildAllTools(providers);
_providersTree = BuildToolsTreeAsync();
+ _headerProviders = BuildHeaderToolsAsync();
_footerProviders = BuildFooterToolsAsync();
App.Current.Suspending += OnAppSuspending;
@@ -81,6 +83,11 @@ namespace DevToys.Providers.Impl
return Array.Empty<IToolProvider>();
}
+ public async Task<IEnumerable<MatchedToolProvider>> GetHeaderToolsAsync()
+ {
+ return await _headerProviders;
+ }
+
public async Task<IEnumerable<MatchedToolProvider>> GetFooterToolsAsync()
{
return await _footerProviders;
@@ -140,7 +147,8 @@ namespace DevToys.Providers.Impl
{
foreach (MatchedToolProvider provider in GetAllTools())
{
- if (provider.ChildrenTools.Count == 0 // do not search groups.
+ if (!provider.Metadata.NotSearchable // do not search tools marked as non-searchable
+ && provider.ChildrenTools.Count == 0 // do not search groups.
&& !string.IsNullOrWhiteSpace(provider.ToolProvider.SearchDisplayName)) // do not search tools without search display name.
{
var matches = new List<MatchSpan>();
@@ -233,7 +241,7 @@ namespace DevToys.Providers.Impl
var results = new List<MatchedToolProvider>();
IEnumerable<MatchedToolProvider> matchedToolProviders
= GetAllTools()
- .Where(item => !item.Metadata.IsFooterItem);
+ .Where(item => item.Metadata.MenuPlacement == MenuPlacement.Body);
foreach (MatchedToolProvider provider in matchedToolProviders)
{
@@ -266,12 +274,41 @@ namespace DevToys.Providers.Impl
return SortTools(results, takeConsiderationOfMatches: false).ToImmutableArray();
}
+ private async Task<ImmutableArray<MatchedToolProvider>> BuildHeaderToolsAsync()
+ {
+ await TaskScheduler.Default;
+
+ ImmutableArray<MatchedToolProvider>.Builder result = ImmutableArray.CreateBuilder<MatchedToolProvider>();
+ foreach (
+ MatchedToolProvider provider
+ in
+ SortTools(
+ GetAllTools()
+ .Where(
+ item => item.Metadata.MenuPlacement == MenuPlacement.Header)
+ .ToList(),
+ takeConsiderationOfMatches: false))
+ {
+ result.Add(provider);
+ }
+
+ return result.ToImmutable();
+ }
+
private async Task<ImmutableArray<MatchedToolProvider>> BuildFooterToolsAsync()
{
await TaskScheduler.Default;
ImmutableArray<MatchedToolProvider>.Builder result = ImmutableArray.CreateBuilder<MatchedToolProvider>();
- foreach (MatchedToolProvider provider in SortTools(GetAllTools().Where(item => item.Metadata.IsFooterItem).ToList(), takeConsiderationOfMatches: false))
+ foreach (
+ MatchedToolProvider provider
+ in
+ SortTools(
+ GetAllTools()
+ .Where(
+ item => item.Metadata.MenuPlacement == MenuPlacement.Footer)
+ .ToList(),
+ takeConsiderationOfMatches: false))
{
result.Add(provider);
}
diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csproj
index 74c5406be..f4e1570e2 100644
--- a/src/dev/impl/DevToys/DevToys.csproj
+++ b/src/dev/impl/DevToys/DevToys.csproj
@@ -22,6 +22,8 @@
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Api\Core\OOP\IAppService.cs" />
+ <Compile Include="Api\Tools\MenuPlacement.cs" />
+ <Compile Include="Api\Tools\NotSearchableAttribute.cs" />
<Compile Include="Api\Tools\ParentAttribute.cs" />
<Compile Include="Core\OOP\AppService.cs" />
<Compile Include="Core\Threading\AsyncLazy.cs" />
@@ -36,6 +38,9 @@
</Compile>
<Compile Include="UI\Converters\BooleanToDoubleConverter.cs" />
<Compile Include="UI\Converters\BooleanToIntegerConverter.cs" />
+ <Compile Include="UI\MainMenuNavigationViewMenuItemSelector.cs" />
+ <Compile Include="ViewModels\Tools\AllTools\AllToolsToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\AllTools\AllToolsToolViewModel.cs" />
<Compile Include="ViewModels\Tools\Converters\ConvertersGroupToolProvider.cs" />
<Compile Include="ViewModels\Tools\EncodersDecoders\EncodersDecodersGroupToolProvider.cs" />
<Compile Include="ViewModels\Tools\Generators\GeneratorsGroupToolProvider.cs" />
@@ -48,7 +53,11 @@
<Compile Include="ViewModels\Tools\Graphic\PngJpgCompressor\PngJpgCompressorToolProvider.cs" />
<Compile Include="ViewModels\Tools\Graphic\PngJpgCompressor\PngJpgCompressorToolViewModel.cs" />
<Compile Include="ViewModels\Tools\Formatters\FormattersGroupToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\GroupToolViewModelBase.cs" />
<Compile Include="ViewModels\Tools\Text\TextGroupToolProvider.cs" />
+ <Compile Include="Views\Tools\AllTools\AllToolsToolPage.xaml.cs">
+ <DependentUpon>AllToolsToolPage.xaml</DependentUpon>
+ </Compile>
<Compile Include="Views\Tools\GroupToolPage.xaml.cs">
<DependentUpon>GroupToolPage.xaml</DependentUpon>
</Compile>
@@ -240,7 +249,7 @@
<Compile Include="Api\Core\Theme\AppTheme.cs" />
<Compile Include="Api\Core\Theme\IThemeListener.cs" />
<Compile Include="Api\Tools\CompactOverlaySizeAttribute.cs" />
- <Compile Include="Api\Tools\IsFooterItemAttribute.cs" />
+ <Compile Include="Api\Tools\MenuPlacementAttribute.cs" />
<Compile Include="Api\Tools\IToolProvider.cs" />
<Compile Include="Api\Tools\IToolProviderFactory.cs" />
<Compile Include="Api\Tools\IToolViewModel.cs" />
@@ -413,6 +422,7 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
+ <PRIResource Include="Strings\en-US\AllTools.resw" />
<PRIResource Include="Strings\*\*.resw" />
<Page Include="Themes\Custom.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -450,6 +460,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="Views\Tools\AllTools\AllToolsToolPage.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Views\Tools\Base64EncoderDecoder\Base64EncoderDecoderToolPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
index 84b4b7678..62129fd06 100644
--- a/src/dev/impl/DevToys/LanguageManager.cs
+++ b/src/dev/impl/DevToys/LanguageManager.cs
@@ -24,6 +24,7 @@ namespace DevToys
{
private static LanguageManager? _languageManager;
+ private readonly AllToolsStrings _alltools = new AllToolsStrings();
private readonly Base64EncoderDecoderStrings _base64encoderdecoder = new Base64EncoderDecoderStrings();
private readonly CommonStrings _common = new CommonStrings();
private readonly GuidGeneratorStrings _guidgenerator = new GuidGeneratorStrings();
@@ -53,6 +54,11 @@ namespace DevToys
/// </summary>
public FlowDirection FlowDirection { get; private set; }
+ /// <summary>
+ /// Gets the <see cref="AllToolsStrings"/>.
+ /// </summary>
+ public AllToolsStrings AllTools => _alltools;
+
/// <summary>
/// Gets the <see cref="Base64EncoderDecoderStrings"/>.
/// </summary>
@@ -190,6 +196,21 @@ namespace DevToys
}
}
+ public class AllToolsStrings : ObservableObject
+ {
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("AllTools");
+
+ /// <summary>
+ /// Gets the resource AccessibleName.
+ /// </summary>
+ public string AccessibleName => _resources.GetString("AccessibleName");
+
+ /// <summary>
+ /// Gets the resource MenuDisplayName.
+ /// </summary>
+ public string MenuDisplayName => _resources.GetString("MenuDisplayName");
+ }
+
public class Base64EncoderDecoderStrings : ObservableObject
{
private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("Base64EncoderDecoder");
diff --git a/src/dev/impl/DevToys/Strings/en-US/AllTools.resw b/src/dev/impl/DevToys/Strings/en-US/AllTools.resw
new file mode 100644
index 000000000..776a137f3
--- /dev/null
+++ b/src/dev/impl/DevToys/Strings/en-US/AllTools.resw
@@ -0,0 +1,126 @@
+<?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="AccessibleName" xml:space="preserve">
+ <value>All tools</value>
+ </data>
+ <data name="MenuDisplayName" xml:space="preserve">
+ <value>All tools</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/UI/MainMenuNavigationViewMenuItemSelector.cs b/src/dev/impl/DevToys/UI/MainMenuNavigationViewMenuItemSelector.cs
new file mode 100644
index 000000000..aecfbdd7b
--- /dev/null
+++ b/src/dev/impl/DevToys/UI/MainMenuNavigationViewMenuItemSelector.cs
@@ -0,0 +1,31 @@
+#nullable enable
+
+using System;
+using DevToys.Api.Tools;
+using Microsoft.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace DevToys.UI
+{
+ public sealed class MainMenuNavigationViewMenuItemSelector : DataTemplateSelector
+ {
+ public DataTemplate ToolProvider { get; set; } = null!;
+
+ public DataTemplate Separator { get; set; } = null!;
+
+ protected override DataTemplate SelectTemplateCore(object item)
+ {
+ if (item is MatchedToolProvider)
+ {
+ return ToolProvider;
+ }
+ else if (item is Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator navigationViewItemSeparator)
+ {
+ return Separator;
+ }
+
+ throw new NotSupportedException();
+ }
+ }
+}
diff --git a/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
index cac76fe1b..255b2b4c3 100644
--- a/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
@@ -62,10 +62,10 @@ namespace DevToys.ViewModels
/// <summary>
/// Items at the top of the NavigationView.
/// </summary>
- internal ExtendedObservableCollection<MatchedToolProvider> ToolsMenuItems { get; } = new();
+ internal ExtendedObservableCollection<object> ToolsMenuItems { get; } = new();
/// <summary>
- /// Items at the bottom of the NavigationView. That includes Settings.
+ /// Items at the bottom of the NavigationView.
/// </summary>
internal ExtendedObservableCollection<MatchedToolProvider> FooterMenuItems { get; } = new();
@@ -358,7 +358,11 @@ namespace DevToys.ViewModels
ThreadPriority.Low,
() =>
{
- SetSelectedMenuItem(toolProviderViewDataToSelect ?? ToolsMenuItems.FirstOrDefault() ?? FooterMenuItems.FirstOrDefault(), null);
+ SetSelectedMenuItem(
+ toolProviderViewDataToSelect
+ ?? ToolsMenuItems.FirstOrDefault(item => item is MatchedToolProvider) as MatchedToolProvider
+ ?? FooterMenuItems.FirstOrDefault(),
+ null);
});
}
@@ -371,32 +375,39 @@ namespace DevToys.ViewModels
}
_isUpdatingSelectedItem = true;
- if (value is not null)
+ try
{
- _selectedItem = value;
- IToolViewModel toolViewModel = _toolProviderFactory.GetToolViewModel(_selectedItem.ToolProvider);
-
- if (!_pasteInFirstSelectedToolIsAllowed // If this is not the first tool we select since the last time tools have been recommended
- || !_selectedItem.IsRecommended // or that the selected tool isn't recommended
- || !_settingsProvider.GetSetting(PredefinedSettings.SmartDetectionPaste)) // or that the user doesn't want to paste automatically in recommended tools
+ if (value is not null)
{
- clipboardContentData = null;
- }
+ _selectedItem = value;
+ IToolViewModel toolViewModel = _toolProviderFactory.GetToolViewModel(_selectedItem.ToolProvider);
- _pasteInFirstSelectedToolIsAllowed = false;
+ if (!_pasteInFirstSelectedToolIsAllowed // If this is not the first tool we select since the last time tools have been recommended
+ || !_selectedItem.IsRecommended // or that the selected tool isn't recommended
+ || !_settingsProvider.GetSetting(PredefinedSettings.SmartDetectionPaste)) // or that the user doesn't want to paste automatically in recommended tools
+ {
+ clipboardContentData = null;
+ }
- IDisposable? menuItemShouldBeExpandedLock = null;
- if (programmaticalSelection)
- {
- menuItemShouldBeExpandedLock = value.ForceMenuItemShouldBeExpanded();
- }
+ _pasteInFirstSelectedToolIsAllowed = false;
+
+ IDisposable? menuItemShouldBeExpandedLock = null;
+ if (programmaticalSelection)
+ {
+ menuItemShouldBeExpandedLock = value.ForceMenuItemShouldBeExpanded();
+ }
- Messenger.Send(new NavigateToToolMessage(toolViewModel, clipboardContentData));
- OnPropertyChanged(nameof(SelectedMenuItem));
- OnPropertyChanged(nameof(HeaderText));
- OnPropertyChanged(nameof(WindowTitle));
+ Messenger.Send(new NavigateToToolMessage(toolViewModel, clipboardContentData));
+ OnPropertyChanged(nameof(SelectedMenuItem));
+ OnPropertyChanged(nameof(HeaderText));
+ OnPropertyChanged(nameof(WindowTitle));
- menuItemShouldBeExpandedLock?.Dispose();
+ menuItemShouldBeExpandedLock?.Dispose();
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.LogFault("NavigationView", ex, "Unable to select a menu item");
}
_isUpdatingSelectedItem = false;
}
@@ -407,13 +418,25 @@ namespace DevToys.ViewModels
try
{
- IEnumerable<MatchedToolProvider> tools = await _toolProviderFactory.GetToolsTreeAsync().ConfigureAwait(false);
- IEnumerable<MatchedToolProvider> footerTools = await _toolProviderFactory.GetFooterToolsAsync().ConfigureAwait(false);
+ var tasks = new List<Task<IEnumerable<MatchedToolProvider>>>
+ {
+ _toolProviderFactory.GetToolsTreeAsync(),
+ _toolProviderFactory.GetHeaderToolsAsync(),
+ _toolProviderFactory.GetFooterToolsAsync()
+ };
+
+ await Task.WhenAll(tasks).ConfigureAwait(false);
+
+ IEnumerable<MatchedToolProvider> tools = await tasks[0];
+ IEnumerable<MatchedToolProvider> headerTools = await tasks[1];
+ IEnumerable<MatchedToolProvider> footerTools = await tasks[2];
await ThreadHelper.RunOnUIThreadAsync(
ThreadPriority.Low,
() =>
{
+ ToolsMenuItems.AddRange(headerTools);
+ ToolsMenuItems.Add(new NavigationViewItemSeparator());
ToolsMenuItems.AddRange(tools);
FooterMenuItems.AddRange(footerTools);
});
@@ -499,7 +522,7 @@ namespace DevToys.ViewModels
using (await _sempahore.WaitAsync(CancellationToken.None).ConfigureAwait(false))
{
if (newRecommendedTools.Length == 1
- && IsToolDisplayedInMenu(ToolsMenuItems, newRecommendedTools[0]))
+ && IsToolDisplayedInMenu(ToolsMenuItems.OfType<MatchedToolProvider>(), newRecommendedTools[0]))
{
// One unique tool is recommended.
// The recommended tool is displayed in the top menu.
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs
new file mode 100644
index 000000000..5a9f3c250
--- /dev/null
+++ b/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs
@@ -0,0 +1,48 @@
+#nullable enable
+
+using System.Composition;
+using DevToys.Api.Tools;
+using DevToys.Core.Threading;
+using DevToys.Shared.Api.Core;
+using DevToys.ViewModels.Tools;
+using Windows.UI.Xaml.Controls;
+
+namespace DevToys.ViewModels.AllTools
+{
+ [Export(typeof(IToolProvider))]
+ [Name("All Tools")]
+ [ProtocolName("all")]
+ [Order(0)]
+ [MenuPlacement(MenuPlacement.Header)]
+ [NotSearchable]
+ internal sealed class AllToolsToolProvider : ToolProviderBase, IToolProvider
+ {
+ private readonly IMefProvider _mefProvider;
+
+ public string MenuDisplayName => LanguageManager.Instance.AllTools.MenuDisplayName;
+
+ public string? SearchDisplayName => MenuDisplayName;
+
+ public string? Description { get; } = null;
+
+ public string AccessibleName => LanguageManager.Instance.AllTools.AccessibleName;
+
+ public TaskCompletionNotifier<IconElement> IconSource => CreateFontIcon("\uF480");
+
+ [ImportingConstructor]
+ public AllToolsToolProvider(IMefProvider mefProvider)
+ {
+ _mefProvider = mefProvider;
+ }
+
+ public bool CanBeTreatedByTool(string data)
+ {
+ return false;
+ }
+
+ public IToolViewModel CreateTool()
+ {
+ return _mefProvider.Import<AllToolsToolViewModel>();
+ }
+ }
+}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolViewModel.cs
new file mode 100644
index 000000000..b2ec96e87
--- /dev/null
+++ b/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolViewModel.cs
@@ -0,0 +1,32 @@
+#nullable enable
+
+using System;
+using System.Composition;
+using System.Linq;
+using DevToys.Api.Tools;
+using DevToys.ViewModels.Tools;
+using DevToys.Views.Tools.AllTools;
+
+namespace DevToys.ViewModels.AllTools
+{
+ [Export(typeof(AllToolsToolViewModel))]
+ public sealed class AllToolsToolViewModel : GroupToolViewModelBase, IToolViewModel
+ {
+ public Type View { get; } = typeof(AllToolsToolPage);
+
+ [ImportingConstructor]
+ public AllToolsToolViewModel(IToolProviderFactory toolProviderFactory)
+ {
+ ToolProviders
+ = toolProviderFactory
+ .GetAllTools()
+ .Where(tool => tool.ChildrenTools.Count == 0 && tool.Metadata.MenuPlacement != MenuPlacement.Header)
+ .OrderBy(tool => tool.Metadata.MenuPlacement)
+ .ThenBy(tool => tool.ToolProvider.MenuDisplayName)
+ .ThenBy(tool => tool.Metadata.Order ?? int.MaxValue)
+ .ThenBy(item => item.Metadata.Name)
+ .Select(tool => tool.ToolProvider)
+ .ToList();
+ }
+ }
+}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModel.cs
index 854ba9e06..e5736e898 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModel.cs
@@ -3,54 +3,18 @@
using System;
using System.Collections.Generic;
using DevToys.Api.Tools;
-using DevToys.Messages;
-using DevToys.Shared.Core;
using DevToys.Views.Tools;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-using Microsoft.Toolkit.Mvvm.Messaging;
namespace DevToys.ViewModels.Tools
{
- public sealed class GroupToolViewModel : ObservableRecipient, IToolViewModel
+ public sealed class GroupToolViewModel : GroupToolViewModelBase, IToolViewModel
{
public Type View { get; } = typeof(GroupToolPage);
- internal IEnumerable<IToolProvider>? ToolProviders { get; }
-
public GroupToolViewModel(IEnumerable<IToolProvider>? toolProviders)
+ : base()
{
ToolProviders = toolProviders;
-
- NavigateToToolCommand = new RelayCommand<IToolProvider>(ExecuteNavigateToToolCommand);
- OpenToolInNewWindowClickCommand = new RelayCommand<IToolProvider>(ExecuteOpenToolInNewWindowClickCommand);
-
- // Activate the view model's messenger.
- IsActive = true;
- }
-
- #region NavigateToToolCommand
-
- public IRelayCommand<IToolProvider> NavigateToToolCommand { get; }
-
- private void ExecuteNavigateToToolCommand(IToolProvider? metadata)
- {
- Arguments.NotNull(metadata, nameof(metadata));
- Messenger.Send(new ChangeSelectedMenuItemMessage(metadata!));
}
-
- #endregion
-
- #region OpenToolInNewWindowClickCommand
-
- public IRelayCommand<IToolProvider> OpenToolInNewWindowClickCommand { get; }
-
- private void ExecuteOpenToolInNewWindowClickCommand(IToolProvider? metadata)
- {
- Arguments.NotNull(metadata, nameof(metadata));
- Messenger.Send(new OpenToolInNewWindowMessage(metadata!));
- }
-
- #endregion
}
}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs
new file mode 100644
index 000000000..bb4632669
--- /dev/null
+++ b/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs
@@ -0,0 +1,50 @@
+#nullable enable
+
+using System.Collections.Generic;
+using DevToys.Api.Tools;
+using DevToys.Messages;
+using DevToys.Shared.Core;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.Toolkit.Mvvm.Messaging;
+
+namespace DevToys.ViewModels.Tools
+{
+ public abstract class GroupToolViewModelBase : ObservableRecipient
+ {
+ public IEnumerable<IToolProvider>? ToolProviders { get; protected set; }
+
+ public GroupToolViewModelBase()
+ {
+ NavigateToToolCommand = new RelayCommand<IToolProvider>(ExecuteNavigateToToolCommand);
+ OpenToolInNewWindowClickCommand = new RelayCommand<IToolProvider>(ExecuteOpenToolInNewWindowClickCommand);
+
+ // Activate the view model's messenger.
+ IsActive = true;
+ }
+
+ #region NavigateToToolCommand
+
+ public IRelayCommand<IToolProvider> NavigateToToolCommand { get; }
+
+ private void ExecuteNavigateToToolCommand(IToolProvider? metadata)
+ {
+ Arguments.NotNull(metadata, nameof(metadata));
+ Messenger.Send(new ChangeSelectedMenuItemMessage(metadata!));
+ }
+
+ #endregion
+
+ #region OpenToolInNewWindowClickCommand
+
+ public IRelayCommand<IToolProvider> OpenToolInNewWindowClickCommand { get; }
+
+ private void ExecuteOpenToolInNewWindowClickCommand(IToolProvider? metadata)
+ {
+ Arguments.NotNull(metadata, nameof(metadata));
+ Messenger.Send(new OpenToolInNewWindowMessage(metadata!));
+ }
+
+ #endregion
+ }
+}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs
index 264548ff5..92a7e6c2b 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs
@@ -18,7 +18,7 @@ namespace DevToys.ViewModels.Settings
[Name("Settings")]
[ProtocolName("settings")]
[CompactOverlaySize(width: 400, height: 500)]
- [IsFooterItem]
+ [MenuPlacement(MenuPlacement.Footer)]
internal sealed class SettingsToolProvider : ObservableRecipient, IToolProvider
{
private readonly IMefProvider _mefProvider;
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs
index 88c179198..913987f23 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs
@@ -1,6 +1,7 @@
#nullable enable
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -25,7 +26,7 @@ namespace DevToys.ViewModels.Tools
private const int IconMinimalSize = 16;
protected const string AssetsFolderPath = "ms-appx:///Assets/";
- private static readonly Dictionary<string, string> IconFileNameToSvgMap = new();
+ private static readonly ConcurrentDictionary<string, string> IconFileNameToSvgMap = new();
protected TaskCompletionNotifier<IconElement> CreatePathIconFromPath(string resourceName)
{
diff --git a/src/dev/impl/DevToys/Views/MainPage.xaml b/src/dev/impl/DevToys/Views/MainPage.xaml
index a281103f2..b5ae99c30 100644
--- a/src/dev/impl/DevToys/Views/MainPage.xaml
+++ b/src/dev/impl/DevToys/Views/MainPage.xaml
@@ -6,11 +6,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:tools="using:DevToys.Api.Tools"
+ xmlns:ui="using:DevToys.UI"
xmlns:controls="using:DevToys.UI.Controls"
xmlns:converters="using:DevToys.UI.Converters"
xmlns:ex="using:DevToys.UI.Extensions"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
- xmlns:viewmanagement="using:Windows.UI.ViewManagement" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+ xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+ xmlns:i="using:Microsoft.Xaml.Interactivity"
+ xmlns:viewmanagement="using:Windows.UI.ViewManagement"
mc:Ignorable="d"
NavigationCacheMode="Enabled"
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True">
@@ -222,49 +225,58 @@
</AutoSuggestBox>
</muxc:NavigationView.AutoSuggestBox>
- <muxc:NavigationView.MenuItemTemplate>
- <DataTemplate x:DataType="tools:MatchedToolProvider">
- <muxc:NavigationViewItem
- Icon="{x:Bind Icon.Result, Mode=OneWay}"
- AutomationProperties.Name="{x:Bind ToolProvider.AccessibleName}"
- MenuItemsSource="{x:Bind ChildrenTools, Mode=OneWay}"
- IsExpanded="{x:Bind MenuItemShouldBeExpanded, Mode=OneWay}">
- <muxc:NavigationViewItem.ContextFlyout>
- <MenuFlyout>
- <MenuFlyoutItem
- Text="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"
- Command="{Binding OpenToolInNewWindowCommand}"
- CommandParameter="{x:Bind Metadata}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF8B5;" />
- </MenuFlyoutItem.Icon>
- </MenuFlyoutItem>
- </MenuFlyout>
- </muxc:NavigationViewItem.ContextFlyout>
- <muxc:NavigationViewItem.Content>
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*"/>
- <ColumnDefinition Width="Auto"/>
- </Grid.ColumnDefinitions>
- <TextBlock
- Grid.Column="0"
- HorizontalAlignment="Stretch"
- TextWrapping="NoWrap"
- TextTrimming="CharacterEllipsis"
- Text="{x:Bind ToolProvider.MenuDisplayName}"/>
- <muxc:ImageIcon
- x:Name="NavigationViewItemRecommendedIcon"
- x:Load="{x:Bind IsRecommended, Mode=OneWay}"
- Grid.Column="1"
- Source="/Assets/Icons/Idea.svg"
- Height="16"
- Width="16"/>
- </Grid>
- </muxc:NavigationViewItem.Content>
- </muxc:NavigationViewItem>
- </DataTemplate>
- </muxc:NavigationView.MenuItemTemplate>
+ <muxc:NavigationView.MenuItemTemplateSelector>
+ <ui:MainMenuNavigationViewMenuItemSelector>
+ <ui:MainMenuNavigationViewMenuItemSelector.ToolProvider>
+ <DataTemplate x:DataType="tools:MatchedToolProvider">
+ <muxc:NavigationViewItem
+ Icon="{x:Bind Icon.Result, Mode=OneWay}"
+ AutomationProperties.Name="{x:Bind ToolProvider.AccessibleName}"
+ MenuItemsSource="{x:Bind ChildrenTools, Mode=OneWay}"
+ IsExpanded="{x:Bind MenuItemShouldBeExpanded, Mode=OneWay}">
+ <muxc:NavigationViewItem.ContextFlyout>
+ <MenuFlyout>
+ <MenuFlyoutItem
+ Text="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"
+ Command="{Binding OpenToolInNewWindowCommand}"
+ CommandParameter="{x:Bind Metadata}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF8B5;" />
+ </MenuFlyoutItem.Icon>
+ </MenuFlyoutItem>
+ </MenuFlyout>
+ </muxc:NavigationViewItem.ContextFlyout>
+ <muxc:NavigationViewItem.Content>
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <TextBlock
+ Grid.Column="0"
+ HorizontalAlignment="Stretch"
+ TextWrapping="NoWrap"
+ TextTrimming="CharacterEllipsis"
+ Text="{x:Bind ToolProvider.MenuDisplayName}"/>
+ <muxc:ImageIcon
+ x:Name="NavigationViewItemRecommendedIcon"
+ x:Load="{x:Bind IsRecommended, Mode=OneWay}"
+ Grid.Column="1"
+ Source="/Assets/Icons/Idea.svg"
+ Height="16"
+ Width="16"/>
+ </Grid>
+ </muxc:NavigationViewItem.Content>
+ </muxc:NavigationViewItem>
+ </DataTemplate>
+ </ui:MainMenuNavigationViewMenuItemSelector.ToolProvider>
+ <ui:MainMenuNavigationViewMenuItemSelector.Separator>
+ <DataTemplate>
+ <muxc:NavigationViewItemSeparator/>
+ </DataTemplate>
+ </ui:MainMenuNavigationViewMenuItemSelector.Separator>
+ </ui:MainMenuNavigationViewMenuItemSelector>
+ </muxc:NavigationView.MenuItemTemplateSelector>
<Grid>
<Grid.RowDefinitions>
diff --git a/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml
new file mode 100644
index 000000000..c2b6bc348
--- /dev/null
+++ b/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml
@@ -0,0 +1,25 @@
+<Page
+ x:Class="DevToys.Views.Tools.AllTools.AllToolsToolPage"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:local="using:DevToys.Views.Tools.AllTools"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:controls="using:DevToys.UI.Controls"
+ mc:Ignorable="d"
+ NavigationCacheMode="Required">
+
+ <Grid x:Name="RootGrid" RowSpacing="12" Margin="0,0,0,16">
+ <Grid.ChildrenTransitions>
+ <TransitionCollection>
+ <EntranceThemeTransition IsStaggeringEnabled="True" FromVerticalOffset="50"/>
+ </TransitionCollection>
+ </Grid.ChildrenTransitions>
+
+ <controls:ToolProvidersGridView
+ TabIndex="0"
+ Tools="{x:Bind ViewModel.ToolProviders, Mode=OneWay}"
+ ToolClickCommand="{x:Bind ViewModel.NavigateToToolCommand}"
+ OpenToolInNewWindowClickCommand="{x:Bind ViewModel.OpenToolInNewWindowClickCommand}"/>
+ </Grid>
+</Page>
diff --git a/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml.cs
new file mode 100644
index 000000000..5a8d55111
--- /dev/null
+++ b/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml.cs
@@ -0,0 +1,47 @@
+#nullable enable
+
+using DevToys.Api.Core.Navigation;
+using DevToys.Shared.Core;
+using DevToys.ViewModels.AllTools;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace DevToys.Views.Tools.AllTools
+{
+ public sealed partial class AllToolsToolPage : Page
+ {
+ public static readonly DependencyProperty ViewModelProperty
+ = DependencyProperty.Register(
+ nameof(ViewModel),
+ typeof(AllToolsToolViewModel),
+ typeof(GroupToolPage),
+ new PropertyMetadata(null));
+
+ /// <summary>
+ /// Gets the page's view model.
+ /// </summary>
+ public AllToolsToolViewModel ViewModel
+ {
+ get => (AllToolsToolViewModel)GetValue(ViewModelProperty);
+ set => SetValue(ViewModelProperty, value);
+ }
+
+ public AllToolsToolPage()
+ {
+ InitializeComponent();
+ }
+
+ protected override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ var parameters = (NavigationParameter)e.Parameter;
+
+ // Set the view model
+ Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));
+ ViewModel = (AllToolsToolViewModel)parameters.ViewModel!;
+ DataContext = ViewModel;
+
+ base.OnNavigatedTo(e);
+ }
+ }
+}