A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Made secondary tiles icons dynamically generated. (#118)
Etienne Baudoux86fbd6cabef4
diff --git a/assets/logo/logo-figma.fig b/assets/logo/logo-figma.figindex 75fbe112d..73240d4a8 100644Binary files a/assets/logo/logo-figma.fig and b/assets/logo/logo-figma.fig differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-100.png b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-100.pngnew file mode 100644index 000000000..a9a9d7645Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-100.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-125.png b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-125.pngnew file mode 100644index 000000000..32ebac66fBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-125.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-150.png b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-150.pngnew file mode 100644index 000000000..45f611b45Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-150.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-200.png b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-200.pngnew file mode 100644index 000000000..8b4b223cfBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-200.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-400.png b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-400.pngnew file mode 100644index 000000000..905cad45bBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/SmallTile.scale-400.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-100.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-100.pngnew file mode 100644index 000000000..feef34677Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-100.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-125.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-125.pngnew file mode 100644index 000000000..b1b9f17baBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-125.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-150.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-150.pngnew file mode 100644index 000000000..76a7b9490Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-150.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-200.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-200.pngnew file mode 100644index 000000000..a908fb03dBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-200.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-400.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-400.pngnew file mode 100644index 000000000..f724dbac8Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square150x150Logo.scale-400.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-100.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-100.pngnew file mode 100644index 000000000..7a4424ae4Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-100.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-125.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-125.pngnew file mode 100644index 000000000..5ad748028Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-125.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-150.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-150.pngnew file mode 100644index 000000000..225c78d78Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-150.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-200.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-200.pngnew file mode 100644index 000000000..ea23fca8dBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-200.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-400.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-400.pngnew file mode 100644index 000000000..f44fb293cBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.scale-400.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-16.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-16.pngnew file mode 100644index 000000000..671185fceBinary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-16.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-24.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-24.pngnew file mode 100644index 000000000..3952f5209Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-24.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-256.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-256.pngnew file mode 100644index 000000000..d4ee6caa4Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-256.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-32.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-32.pngnew file mode 100644index 000000000..8d5e2f6b8Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-32.png differdiff --git a/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-48.png b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-48.pngnew file mode 100644index 000000000..073c753e1Binary files /dev/null and b/src/dev/impl/DevToys/Assets/TileTemplate/Square44x44Logo.targetsize-48.png differdiff --git a/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs b/src/dev/impl/DevToys/Core/UriActivationProtocolService.csindex 9b19de5ac..13a0c521b 100644--- a/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs+++ b/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs@@ -4,14 +4,28 @@ using System;using System.Collections.Generic;using System.Composition;using System.Globalization;+using System.Runtime.InteropServices.WindowsRuntime;using System.Threading.Tasks;using DevToys.Api.Core;using DevToys.Api.Tools;using DevToys.Core.Threading;+using DevToys.Models;using DevToys.Shared.Core;+using DevToys.Shared.Core.Threading;+using Microsoft.Toolkit.Uwp.Helpers;+using Microsoft.UI.Xaml.Controls;using Windows.ApplicationModel;+using Windows.Graphics.Display;+using Windows.Graphics.Imaging;+using Windows.Storage;+using Windows.Storage.Streams;using Windows.System;+using Windows.UI;using Windows.UI.StartScreen;+using Windows.UI.Xaml;+using Windows.UI.Xaml.Controls;+using Windows.UI.Xaml.Media;+using Windows.UI.Xaml.Media.Imaging;namespace DevToys.Core{@@ -19,6 +33,26 @@ namespace DevToys.Core[Shared]internal sealed class UriActivationProtocolService : IUriActivationProtocolService{+ private readonly TileIconSizeDefinition[] ToolTileIconSizeDefinitions+ = new[]+ {+ new TileIconSizeDefinition("SmallTile.scale-100", size: 71, toolIconRatio: 3.5),+ new TileIconSizeDefinition("SmallTile.scale-125", size: 89, toolIconRatio: 3.5),+ new TileIconSizeDefinition("SmallTile.scale-150", size: 107, toolIconRatio: 3.5),+ new TileIconSizeDefinition("SmallTile.scale-200", size: 142, toolIconRatio: 3.5),+ new TileIconSizeDefinition("SmallTile.scale-400", size: 284, toolIconRatio: 3.5),+ new TileIconSizeDefinition("Square44x44Logo.scale-100", size: 44, toolIconRatio: 2.4),+ new TileIconSizeDefinition("Square44x44Logo.scale-125", size: 55, toolIconRatio: 2.5),+ new TileIconSizeDefinition("Square44x44Logo.scale-150", size: 66, toolIconRatio: 2.5),+ new TileIconSizeDefinition("Square44x44Logo.scale-200", size: 88, toolIconRatio: 2.5),+ new TileIconSizeDefinition("Square44x44Logo.scale-400", size: 176, toolIconRatio: 2.6),+ new TileIconSizeDefinition("Square150x150Logo.scale-100", size: 150, toolIconRatio: 6),+ new TileIconSizeDefinition("Square150x150Logo.scale-125", size: 188, toolIconRatio: 6),+ new TileIconSizeDefinition("Square150x150Logo.scale-150", size: 225, toolIconRatio: 6),+ new TileIconSizeDefinition("Square150x150Logo.scale-200", size: 300, toolIconRatio: 6),+ new TileIconSizeDefinition("Square150x150Logo.scale-400", size: 600, toolIconRatio: 6),+ };+public async Task<bool> LaunchNewAppInstance(string? arguments = null){return await ThreadHelper.RunOnUIThreadAsync(async () =>@@ -51,15 +85,35 @@ namespace DevToys.Core{try{- var tile- = new SecondaryTile(- tileId: toolProvider.Metadata.ProtocolName,- displayName: toolProvider.ToolProvider.SearchDisplayName,- arguments: GenerateLaunchArguments(toolProvider.Metadata.ProtocolName),- new Uri("ms-appx:///Assets/Logo/Square150x150Logo.png"),- TileSize.Default);-- return await tile.RequestCreateAsync();+ ThreadHelper.ThrowIfNotOnUIThread();++ var tileIconGenerationTasks = new List<Task>();+ for (int i = 0; i < ToolTileIconSizeDefinitions.Length; i++)+ {+ TileIconSizeDefinition? iconDefinition = ToolTileIconSizeDefinitions[i];+ tileIconGenerationTasks.Add(+ GenerateCustomTileIconAsync(+ iconDefinition.Size,+ iconDefinition.ToolIconRatio,+ iconDefinition.IconName,+ toolProvider));+ }++ await Task.WhenAll(tileIconGenerationTasks).ConfigureAwait(true);++ var tile = new SecondaryTile(+ tileId: toolProvider.Metadata.ProtocolName)+ {+ DisplayName = toolProvider.ToolProvider.SearchDisplayName,+ Arguments = GenerateLaunchArguments(toolProvider.Metadata.ProtocolName),+ RoamingEnabled = false+ };+ tile.VisualElements.ShowNameOnSquare150x150Logo = true;+ tile.VisualElements.Square150x150Logo = new Uri($"ms-appdata:///local/{toolProvider.Metadata.ProtocolName}/Square150x150Logo.scale-100.png");+ tile.VisualElements.Square44x44Logo = new Uri($"ms-appdata:///local/{toolProvider.Metadata.ProtocolName}/Square44x44Logo.scale-100.png");+ tile.VisualElements.Square71x71Logo = new Uri($"ms-appdata:///local/{toolProvider.Metadata.ProtocolName}/SmallTile.scale-100.png");++ return await tile.RequestCreateForSelectionAsync(Window.Current.Bounds);}catch (Exception ex){@@ -93,5 +147,136 @@ namespace DevToys.Corereturn uriToLaunch;}++ private async Task GenerateCustomTileIconAsync(int targetSize, double toolIconRatio, string inputFileName, MatchedToolProvider toolProvider)+ {+ ThreadHelper.ThrowIfNotOnUIThread();++ /*+ * The code below generates the following equivalent:+ * <Canvas HorizontalAlignment="Left" VerticalAlignment="Top">+ * <Grid>+ * <Image Source="image.scale-100.png" Grid.ColumnSpan="3" Grid.RowSpan="3"/>+ * <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">+ * <IconElement/>+ * </Viewbox>+ * </Grid>+ * </Canvas>+ */++ StorageFolder installationFolder = Package.Current.InstalledLocation;+ var backgroundIconImageFile = (StorageFile)await installationFolder.TryGetItemAsync($"Assets\\TileTemplate\\{inputFileName}.png");++ using (IRandomAccessStream fileStream = await backgroundIconImageFile.OpenAsync(FileAccessMode.Read, StorageOpenOptions.AllowOnlyReaders))+ {+ var backgroundIconImageSource = new BitmapImage+ {+ DecodePixelWidth = targetSize,+ DecodePixelHeight = targetSize+ };+ await backgroundIconImageSource.SetSourceAsync(fileStream);++ var container = new Grid()+ {+ HorizontalAlignment = HorizontalAlignment.Left,+ VerticalAlignment = VerticalAlignment.Top,+ Height = targetSize,+ Width = targetSize,+ MaxHeight = targetSize,+ MaxWidth = targetSize,+ Background = new SolidColorBrush(Colors.Transparent),+ Margin = new Thickness(-1 * targetSize, -1 * targetSize, 0, 0),+ RequestedTheme = ElementTheme.Dark+ };++ var backgroundIcon = new Image+ {+ Height = targetSize,+ Width = targetSize,+ Source = backgroundIconImageSource,+ Stretch = Stretch.UniformToFill+ };++ IconElement toolIcon = await toolProvider.Icon.Task!.ConfigureAwait(true);+ Assumes.NotNull(toolIcon, nameof(toolIcon));++ toolIcon.Height = targetSize / toolIconRatio;+ toolIcon.Width = targetSize / toolIconRatio;++ var toolIconViewBox = new Viewbox+ {+ Height = targetSize / toolIconRatio,+ Width = targetSize / toolIconRatio,+ Margin = new Thickness(0, 3, 0, 0),+ HorizontalAlignment = HorizontalAlignment.Center,+ VerticalAlignment = VerticalAlignment.Center,+ Child = toolIcon+ };++ container.Children.Add(backgroundIcon);+ container.Children.Add(toolIconViewBox);++ ((Grid)((Page)((Frame)Window.Current.Content).Content).Content).Children.Insert(0, container);++ container.UpdateLayout();++ var iconSizeUpdatedTask = new TaskCompletionSource<object?>();+ long registrationToken = 0;++ var imageIcon = toolIcon as ImageIcon;+ if (imageIcon is not null)+ {+ registrationToken = imageIcon.RegisterPropertyChangedCallback(ImageIcon.SourceProperty, (s, e) =>+ {+ iconSizeUpdatedTask.TrySetResult(null);+ });+ }+ else+ {+ iconSizeUpdatedTask.TrySetResult(null);+ }++ // Wait that the icon updates its size and maybe its color theme.+ await Task.WhenAny(iconSizeUpdatedTask.Task, Task.Delay(500)).ConfigureAwait(true);++ if (imageIcon is not null)+ {+ imageIcon.UnregisterPropertyChangedCallback(ImageIcon.SourceProperty, registrationToken);+ }++ ThreadHelper.ThrowIfNotOnUIThread();++ // Create an image from the canvas.+ var resultBitmap = new RenderTargetBitmap();+ await resultBitmap.RenderAsync(container);++ ((Grid)((Page)((Frame)Window.Current.Content).Content).Content).Children.Remove(container);++ ThreadHelper.ThrowIfNotOnUIThread();++ // Save the image on the hard drive.+ IBuffer pixelBuffer = await resultBitmap.GetPixelsAsync();+ byte[] pixels = pixelBuffer.ToArray();+ var displayInformation = DisplayInformation.GetForCurrentView();+ StorageFile file = await ApplicationData.Current.LocalFolder.CreateFileAsync($"{toolProvider.Metadata.ProtocolName}\\{inputFileName}.png", CreationCollisionOption.ReplaceExisting);++ ThreadHelper.ThrowIfNotOnUIThread();++ using (IRandomAccessStream stream = await file.OpenAsync(FileAccessMode.ReadWrite))+ {+ BitmapEncoder encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, stream);+ encoder.SetPixelData(+ BitmapPixelFormat.Bgra8,+ BitmapAlphaMode.Straight,+ (uint)resultBitmap.PixelWidth,+ (uint)resultBitmap.PixelHeight,+ displayInformation.RawDpiX,+ displayInformation.RawDpiY,+ pixels);++ await encoder.FlushAsync();+ }+ }+ }}}diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csprojindex 10cbab4e5..373fc44da 100644--- a/src/dev/impl/DevToys/DevToys.csproj+++ b/src/dev/impl/DevToys/DevToys.csproj@@ -35,6 +35,7 @@<Compile Include="Models\NoResultFoundMockToolProvider.cs" /><Compile Include="Models\Radix.cs" /><Compile Include="Models\NumberBaseFormat.cs" />+ <Compile Include="Models\TileIconSizeDefinition.cs" /><Compile Include="UI\Controls\ToolProvidersGridView.xaml.cs"><DependentUpon>ToolProvidersGridView.xaml</DependentUpon></Compile>@@ -237,6 +238,26 @@<Content Include="Assets\ReleaseNote.txt"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></Content>+ <Content Include="Assets\TileTemplate\SmallTile.scale-100.png" />+ <Content Include="Assets\TileTemplate\SmallTile.scale-125.png" />+ <Content Include="Assets\TileTemplate\SmallTile.scale-150.png" />+ <Content Include="Assets\TileTemplate\SmallTile.scale-200.png" />+ <Content Include="Assets\TileTemplate\SmallTile.scale-400.png" />+ <Content Include="Assets\TileTemplate\Square150x150Logo.scale-100.png" />+ <Content Include="Assets\TileTemplate\Square150x150Logo.scale-125.png" />+ <Content Include="Assets\TileTemplate\Square150x150Logo.scale-150.png" />+ <Content Include="Assets\TileTemplate\Square150x150Logo.scale-200.png" />+ <Content Include="Assets\TileTemplate\Square150x150Logo.scale-400.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.scale-100.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.scale-125.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.scale-150.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.scale-200.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.scale-400.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.targetsize-16.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.targetsize-24.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.targetsize-256.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.targetsize-32.png" />+ <Content Include="Assets\TileTemplate\Square44x44Logo.targetsize-48.png" /><Content Include="Properties\Default.rd.rd.xml" /><Compile Include="Api\Core\IClipboard.cs" /><Compile Include="Api\Core\IMarketingService.cs" />diff --git a/src/dev/impl/DevToys/Models/TileIconSizeDefinition.cs b/src/dev/impl/DevToys/Models/TileIconSizeDefinition.csnew file mode 100644index 000000000..4775cccb0--- /dev/null+++ b/src/dev/impl/DevToys/Models/TileIconSizeDefinition.cs@@ -0,0 +1,22 @@+#nullable enable++using DevToys.Shared.Core;++namespace DevToys.Models+{+ internal sealed class TileIconSizeDefinition+ {+ public TileIconSizeDefinition(string iconName, int size, double toolIconRatio)+ {+ IconName = Arguments.NotNullOrWhiteSpace(iconName, nameof(iconName));+ Size = size;+ ToolIconRatio = toolIconRatio;+ }++ internal int Size { get; }++ internal double ToolIconRatio { get; }++ internal string IconName { get; }+ }+}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.csindex 913987f23..dcf44331a 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs@@ -84,14 +84,7 @@ namespace DevToys.ViewModels.ToolsIconFileNameToSvgMap[iconFileName] = svgFileContent;}- if (actualTheme == ElementTheme.Dark)- {- svgFileContent = svgFileContent.Replace("#FF000000", "#FFFFFFFF").Replace("#000000", "#FFFFFF");- }- else- {- svgFileContent = svgFileContent.Replace("#ffffff", "#000000").Replace("#FFFFFFFF", "#000000");- }+ svgFileContent = ApplyThemeToSvgIcon(actualTheme, svgFileContent);return await ThreadHelper.RunOnUIThreadAsync(ThreadPriority.Low, async () =>{@@ -126,6 +119,8 @@ namespace DevToys.ViewModels.ToolssvgSource.RasterizePixelHeight = newSize.Height;svgSource.RasterizePixelWidth = newSize.Width;+ svgFileContent = ApplyThemeToSvgIcon(imageIcon.ActualTheme, svgFileContent);+using (Stream stream = GenerateStreamFromString(svgFileContent)){await svgSource.SetSourceAsync(stream.AsRandomAccessStream());@@ -158,6 +153,18 @@ namespace DevToys.ViewModels.Toolsreturn stream;}+ private string ApplyThemeToSvgIcon(ElementTheme theme, string svg)+ {+ if (theme == ElementTheme.Dark)+ {+ return svg.Replace("#FF000000", "#FFFFFFFF").Replace("#000000", "#FFFFFF");+ }+ else+ {+ return svg.Replace("#ffffff", "#000000").Replace("#FFFFFFFF", "#000000");+ }+ }+private FrameworkElement? FindParentWithSmallerSize(FrameworkElement origin, Vector2 currentSize){if (VisualTreeHelper.GetParent(origin) is not FrameworkElement parent)