Skip to content

Commit

Permalink
Made secondary tiles icons dynamically generated. (#118)
Browse files Browse the repository at this point in the history
  • Loading branch information
veler authored Dec 16, 2021
1 parent 9848208 commit 7a0f37c
Show file tree
Hide file tree
Showing 25 changed files with 252 additions and 17 deletions.
Binary file modified assets/logo/logo-figma.fig
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
203 changes: 194 additions & 9 deletions src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,55 @@
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
{
[Export(typeof(IUriActivationProtocolService))]
[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 () =>
Expand Down Expand Up @@ -51,15 +85,35 @@ public async Task<bool> PinToolToStart(MatchedToolProvider toolProvider)
{
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)
{
Expand Down Expand Up @@ -93,5 +147,136 @@ private string GenerateLaunchUri(string? toolProtocol)

return 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();
}
}
}
}
}
21 changes: 21 additions & 0 deletions src/dev/impl/DevToys/DevToys.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
22 changes: 22 additions & 0 deletions src/dev/impl/DevToys/Models/TileIconSizeDefinition.cs
Original file line number Diff line number Diff line change
@@ -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; }
}
}
23 changes: 15 additions & 8 deletions src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,7 @@ var result
IconFileNameToSvgMap[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 () =>
{
Expand Down Expand Up @@ -126,6 +119,8 @@ var result
svgSource.RasterizePixelHeight = newSize.Height;
svgSource.RasterizePixelWidth = newSize.Width;
svgFileContent = ApplyThemeToSvgIcon(imageIcon.ActualTheme, svgFileContent);
using (Stream stream = GenerateStreamFromString(svgFileContent))
{
await svgSource.SetSourceAsync(stream.AsRandomAccessStream());
Expand Down Expand Up @@ -158,6 +153,18 @@ private Stream GenerateStreamFromString(string input)
return 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)
Expand Down

0 comments on commit 7a0f37c

Please sign in to comment.