Skip to content

A Swiss Army knife for developers.

Added support of Compact Overlay

Etienne Baudouxa608ef903136
diff --git a/src/DevTools.sln b/src/DevTools.sln
index c4d4b829d..6afed375d 100644
--- a/src/DevTools.sln
+++ b/src/DevTools.sln
@@ -36,7 +36,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Core.Impl", "dev\i
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Providers.Impl", "dev\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj", "{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Localization", "dev\impl\DevTools.Localization\DevTools.Localization.csproj", "{935D5DF8-C400-4CA6-AABE-34A06A69AF85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Common", "dev\impl\DevTools.Common\DevTools.Common.csproj", "{935D5DF8-C400-4CA6-AABE-34A06A69AF85}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Impl", "dev\impl\DevTools.Impl\DevTools.Impl.csproj", "{E2F0C303-04FC-4504-A272-7662AF9A0A80}"
EndProject
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 842d14d06..40711d9b6 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -41,7 +41,7 @@
<NuGet_MicrosoftNETCoreUniversalWindowsPlatform>6.2.12</NuGet_MicrosoftNETCoreUniversalWindowsPlatform>
<NuGet_MicrosoftToolkitMvvm>7.0.2</NuGet_MicrosoftToolkitMvvm>
<NuGet_MicrosoftUIXaml>2.6.2</NuGet_MicrosoftUIXaml>
- <Nuget_MicrosoftXamlBehaviorsUwpManaged>2.0.1</Nuget_MicrosoftXamlBehaviorsUwpManaged>
+ <Nuget_MicrosoftToolkitUwpUIBehaviors>7.0.2</Nuget_MicrosoftToolkitUwpUIBehaviors>
<NuGet_MicrosoftWindowsSDKBuildTools>10.0.19041.8</NuGet_MicrosoftWindowsSDKBuildTools>
<NuGet_MSTestTestAdapter>2.1.1</NuGet_MSTestTestAdapter>
<NuGet_MSTestTestFramework>2.1.1</NuGet_MSTestTestFramework>
diff --git a/src/dev/def/DevTools.Core/Assumes.cs b/src/dev/def/DevTools.Core/Assumes.cs
new file mode 100644
index 000000000..1a388ce9e
--- /dev/null
+++ b/src/dev/def/DevTools.Core/Assumes.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace DevTools.Core
+{
+ public static class Assumes
+ {
+ public static T NotNull<T>(T? value, string argumentName)
+ {
+ if (value == null)
+ {
+ throw new NullReferenceException(argumentName);
+ }
+
+ return value;
+ }
+
+ public static string NotNullOrEmpty(string? value, string argumentName)
+ {
+ if (string.IsNullOrEmpty(value))
+ {
+ throw new NullReferenceException(argumentName);
+ }
+
+ return value!;
+ }
+
+ public static string NotNullOrWhiteSpace(string? value, string argumentName)
+ {
+ if (string.IsNullOrWhiteSpace(value))
+ {
+ throw new NullReferenceException(argumentName);
+ }
+
+ return value!;
+ }
+ }
+}
diff --git a/src/dev/def/DevTools.Core/Constants.cs b/src/dev/def/DevTools.Core/Constants.cs
index 7a13ec83f..8ff37cd25 100644
--- a/src/dev/def/DevTools.Core/Constants.cs
+++ b/src/dev/def/DevTools.Core/Constants.cs
@@ -2,8 +2,8 @@
{
public static class Constants
{
+ // URI Activation Protocol
public const string UriActivationProtocolName = "devtools://";
-
public const string UriActivationProtocolToolArgument = "tool";
}
}
diff --git a/src/dev/def/DevTools.Core/ITitleBar.cs b/src/dev/def/DevTools.Core/ITitleBar.cs
index 51fe09d3f..56698809b 100644
--- a/src/dev/def/DevTools.Core/ITitleBar.cs
+++ b/src/dev/def/DevTools.Core/ITitleBar.cs
@@ -1,12 +1,18 @@
-using System.Threading.Tasks;
+using System.ComponentModel;
+using System.Threading.Tasks;
namespace DevTools.Core
{
/// <summary>
/// Provides a service designed to manager the window title bar.
/// </summary>
- public interface ITitleBar
+ public interface ITitleBar : INotifyPropertyChanged
{
+ /// <summary>
+ /// Gets the width of the system-reserved region of the upper-right corner of the app window.
+ /// </summary>
+ double SystemOverlayRightInset { get; }
+
/// <summary>
/// Initialize the states of the title bar.
/// </summary>
diff --git a/src/dev/def/DevTools.Providers/CompactOverlaySizeAttribute.cs b/src/dev/def/DevTools.Providers/CompactOverlaySizeAttribute.cs
new file mode 100644
index 000000000..3ff373884
--- /dev/null
+++ b/src/dev/def/DevTools.Providers/CompactOverlaySizeAttribute.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Composition;
+
+namespace DevTools.Providers
+{
+ /// <summary>
+ /// Indicates the size that the window should take in Compact Overlay mode when this <see cref="IToolProvider"/> is active.
+ /// </summary>
+ [MetadataAttribute]
+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+ public sealed class CompactOverlaySizeAttribute : Attribute
+ {
+ public int? CompactOverlayHeight { get; set; }
+
+ public int? CompactOverlayWidth { get; set; }
+
+ public CompactOverlaySizeAttribute(int height, int width)
+ {
+ CompactOverlayHeight = height;
+ CompactOverlayWidth = width;
+ }
+ }
+}
diff --git a/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs b/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs
index 46e2d16c3..29a1f1073 100644
--- a/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs
+++ b/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs
@@ -3,6 +3,9 @@ using System.Composition;
namespace DevTools.Providers
{
+ /// <summary>
+ /// Indicates whether the <see cref="IToolProvider"/> should be displayed at the bottom in the navigation view or not.
+ /// </summary>
[MetadataAttribute]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public sealed class IsFooterItemAttribute : Attribute
diff --git a/src/dev/def/DevTools.Providers/NameAttribute.cs b/src/dev/def/DevTools.Providers/NameAttribute.cs
index e9fdc28a7..96b89aaae 100644
--- a/src/dev/def/DevTools.Providers/NameAttribute.cs
+++ b/src/dev/def/DevTools.Providers/NameAttribute.cs
@@ -3,6 +3,9 @@ using System.Composition;
namespace DevTools.Providers
{
+ /// <summary>
+ /// Indicates an internal non-localized name.
+ /// </summary>
[MetadataAttribute]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public sealed class NameAttribute : Attribute
diff --git a/src/dev/def/DevTools.Providers/OrderAttribute.cs b/src/dev/def/DevTools.Providers/OrderAttribute.cs
index ba5f28a76..43cf3ebc6 100644
--- a/src/dev/def/DevTools.Providers/OrderAttribute.cs
+++ b/src/dev/def/DevTools.Providers/OrderAttribute.cs
@@ -3,6 +3,9 @@ using System.Composition;
namespace DevTools.Providers
{
+ /// <summary>
+ /// Indicates the order in which this <see cref="IToolProvider"/> should appear.
+ /// </summary>
[MetadataAttribute]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public sealed class OrderAttribute : Attribute
diff --git a/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs b/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs
index a06078eb7..bdc11b396 100644
--- a/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs
+++ b/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs
@@ -4,6 +4,9 @@ using System.Linq;
namespace DevTools.Providers
{
+ /// <summary>
+ /// Indicates the tool name used through URI Activation Protocol to access this <see cref="IToolProvider"/>.
+ /// </summary>
[MetadataAttribute]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public sealed class ProtocolNameAttribute : Attribute
diff --git a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs b/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs
index 859450e43..b889367bc 100644
--- a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs
+++ b/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs
@@ -5,19 +5,19 @@ namespace DevTools.Providers
public sealed class ToolProviderMetadata
{
/// <summary>
- /// Gets the internal non-localized name of the provider.
+ /// Gets or sets the internal non-localized name of the provider.
/// </summary>
[DefaultValue("Unnamed")]
public string Name { get; set; } = string.Empty;
/// <summary>
- /// Gets the order in which this tool should appear.
+ /// Gets or sets the order in which this tool should appear.
/// </summary>
[DefaultValue(int.MaxValue)]
public int? Order { get; set; }
/// <summary>
- /// Gets whether the tool should be displayed in the footer of the menu.
+ /// Gets or sets whether the tool should be displayed in the footer of the menu.
/// </summary>
[DefaultValue(false)]
public bool IsFooterItem { get; set; }
@@ -27,5 +27,23 @@ namespace DevTools.Providers
/// </summary>
[DefaultValue("")]
public string ProtocolName { get; set; } = string.Empty;
+
+ /// <summary>
+ /// Gets or sets the default height the Compact Overlay should take when using this tool provider.
+ /// </summary>
+ /// <remarks>
+ /// Windows will limit the size to the system-defined max value.
+ /// </remarks>
+ [DefaultValue(500)]
+ public int CompactOverlayHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets the default width the Compact Overlay should take when using this tool provider.
+ /// </summary>
+ /// <remarks>
+ /// Windows will limit the size to the system-defined max value.
+ /// </remarks>
+ [DefaultValue(500)]
+ public int CompactOverlayWidth { get; set; }
}
}
diff --git a/src/dev/impl/DevTools.Localization/Assets/FluentSystemIcons-Regular.ttf b/src/dev/impl/DevTools.Common/Assets/FluentSystemIcons-Regular.ttf
similarity index 100%
rename from src/dev/impl/DevTools.Localization/Assets/FluentSystemIcons-Regular.ttf
rename to src/dev/impl/DevTools.Common/Assets/FluentSystemIcons-Regular.ttf
diff --git a/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj b/src/dev/impl/DevTools.Common/DevTools.Common.csproj
similarity index 86%
rename from src/dev/impl/DevTools.Localization/DevTools.Localization.csproj
rename to src/dev/impl/DevTools.Common/DevTools.Common.csproj
index 625d56e1b..6b31f52c0 100644
--- a/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj
+++ b/src/dev/impl/DevTools.Common/DevTools.Common.csproj
@@ -7,8 +7,8 @@
<ProjectGuid>{935D5DF8-C400-4CA6-AABE-34A06A69AF85}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools.Localization</RootNamespace>
- <AssemblyName>DevTools.Localization</AssemblyName>
+ <RootNamespace>DevTools.Common</RootNamespace>
+ <AssemblyName>DevTools.Common</AssemblyName>
<DefaultLanguage>en</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
@@ -80,6 +80,11 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
+ <Compile Include="UI\Controls\CustomPathIcon.cs" />
+ <Compile Include="UI\Converters\BooleanToVisibilityConverter.cs" />
+ <Compile Include="UI\Converters\DoubleToGridLengthConverter.cs" />
+ <Compile Include="UI\Converters\InvertedBooleanConverter.cs" />
+ <Compile Include="UI\Extensions\HighlighterExtension.cs" />
<Content Include="LanguageManager.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>LanguageManager.cs</LastGenOutput>
@@ -97,10 +102,14 @@
<Content Include="Assets\FluentSystemIcons-Regular.ttf" />
</ItemGroup>
<ItemGroup>
- <Page Include="Resources.xaml">
+ <Page Include="Themes\Custom.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Themes\Generic.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
</ItemGroup>
<ItemGroup>
<PRIResource Include="Strings\en\Base64EncoderDecoder.resw" />
@@ -108,6 +117,12 @@
<ItemGroup>
<PRIResource Include="Strings\en\Settings.resw" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">
+ <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
+ <Name>DevTools.Providers</Name>
+ </ProjectReference>
+ </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.Common/LanguageManager.cs
similarity index 86%
rename from src/dev/impl/DevTools.Localization/LanguageManager.cs
rename to src/dev/impl/DevTools.Common/LanguageManager.cs
index d7c135753..e2fec57f0 100644
--- a/src/dev/impl/DevTools.Localization/LanguageManager.cs
+++ b/src/dev/impl/DevTools.Common/LanguageManager.cs
@@ -15,7 +15,7 @@ using Windows.ApplicationModel.Resources;
using Windows.Globalization;
using Windows.UI.Xaml;
-namespace DevTools.Localization
+namespace DevTools.Common
{
public partial class LanguageManager : ObservableObject
{
@@ -83,7 +83,7 @@ namespace DevTools.Localization
public class Base64EncoderDecoderStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/Base64EncoderDecoder");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/Base64EncoderDecoder");
/// <summary>
/// Gets the resource DisplayName.
@@ -93,7 +93,17 @@ namespace DevTools.Localization
public class MainPageStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/MainPage");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/MainPage");
+
+ /// <summary>
+ /// Gets the resource EnterCompactOverlayTooltip.
+ /// </summary>
+ public string EnterCompactOverlayTooltip => _resources.GetString("EnterCompactOverlayTooltip");
+
+ /// <summary>
+ /// Gets the resource ExitCompactOverlayTooltip.
+ /// </summary>
+ public string ExitCompactOverlayTooltip => _resources.GetString("ExitCompactOverlayTooltip");
/// <summary>
/// Gets the resource OpenInNewWindow.
@@ -108,7 +118,7 @@ namespace DevTools.Localization
public class SettingsStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/Settings");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/Settings");
/// <summary>
/// Gets the resource DisplayName.
diff --git a/src/dev/impl/DevTools.Localization/LanguageManager.tt b/src/dev/impl/DevTools.Common/LanguageManager.tt
similarity index 98%
rename from src/dev/impl/DevTools.Localization/LanguageManager.tt
rename to src/dev/impl/DevTools.Common/LanguageManager.tt
index 289aa5f66..fdbfbee55 100644
--- a/src/dev/impl/DevTools.Localization/LanguageManager.tt
+++ b/src/dev/impl/DevTools.Common/LanguageManager.tt
@@ -38,7 +38,7 @@ using Windows.ApplicationModel.Resources;
using Windows.Globalization;
using Windows.UI.Xaml;
-namespace DevTools.Localization
+namespace DevTools.Common
{
public partial class LanguageManager : ObservableObject
{
@@ -130,7 +130,7 @@ namespace DevTools.Localization
public class <#= $"{fileName}Strings" #> : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Localization/<#= fileName #>");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/<#= fileName #>");
<#
foreach (DictionaryEntry entry in reader)
{
diff --git a/src/dev/impl/DevTools.Common/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Common/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..58b694e91
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("DevTools.Common")]
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Localization/Strings/en/Base64EncoderDecoder.resw b/src/dev/impl/DevTools.Common/Strings/en/Base64EncoderDecoder.resw
similarity index 100%
rename from src/dev/impl/DevTools.Localization/Strings/en/Base64EncoderDecoder.resw
rename to src/dev/impl/DevTools.Common/Strings/en/Base64EncoderDecoder.resw
diff --git a/src/dev/impl/DevTools.Localization/Strings/en/MainPage.resw b/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
similarity index 96%
rename from src/dev/impl/DevTools.Localization/Strings/en/MainPage.resw
rename to src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
index c3251e422..f35f9d0a6 100644
--- a/src/dev/impl/DevTools.Localization/Strings/en/MainPage.resw
+++ b/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <data name="EnterCompactOverlayTooltip" xml:space="preserve">
+ <value>Keep on top (Ctrl+Up)</value>
+ </data>
+ <data name="ExitCompactOverlayTooltip" xml:space="preserve">
+ <value>Back to full view (Ctrl+Down)</value>
+ </data>
<data name="OpenInNewWindow" xml:space="preserve">
<value>Open in a new window</value>
</data>
diff --git a/src/dev/impl/DevTools.Localization/Strings/en/Settings.resw b/src/dev/impl/DevTools.Common/Strings/en/Settings.resw
similarity index 100%
rename from src/dev/impl/DevTools.Localization/Strings/en/Settings.resw
rename to src/dev/impl/DevTools.Common/Strings/en/Settings.resw
diff --git a/src/dev/impl/DevTools.Common/Themes/Custom.xaml b/src/dev/impl/DevTools.Common/Themes/Custom.xaml
new file mode 100644
index 000000000..bedad5ae3
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/Themes/Custom.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localization="using:DevTools.Common">
+
+ <FontFamily x:Key="FluentSystemIcons">ms-appx:///DevTools.Common/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>
+
+ <!-- Icons. Most of them are from https://github.com/microsoft/fluentui-system-icons/blob/master/icons.md -->
+ <x:String x:Key="EnterCompactOverlayPathIconData">M41.6339 8.13376C42.122 7.64561 42.122 6.85415 41.6339 6.36599C41.1457 5.87784 40.3543 5.87784 39.8661 6.36599L29.5002 16.732V7.25C29.5002 6.55964 28.9405 6 28.2502 6C27.5598 6 27.0002 6.55964 27.0002 7.25V19.75C27.0002 20.4404 27.5598 21 28.2502 21H40.75C41.4404 21 42 20.4404 42 19.75C42 19.0596 41.4404 18.5 40.75 18.5H31.2676L41.6339 8.13376ZM8.5 12.25C8.5 10.1789 10.1789 8.5 12.25 8.5H20.1346C20.825 8.5 21.3846 7.94036 21.3846 7.25C21.3846 6.55964 20.825 6 20.1346 6H12.25C8.79822 6 6 8.79822 6 12.25V35.75C6 39.2018 8.79822 42 12.25 42H35.75C39.2018 42 42 39.2018 42 35.75V27.8654C42 27.175 41.4404 26.6154 40.75 26.6154C40.0596 26.6154 39.5 27.175 39.5 27.8654V35.75C39.5 37.8211 37.8211 39.5 35.75 39.5H24V29.2499C24 26.3504 21.6495 23.9999 18.75 23.9999H8.5V12.25ZM8.5 26.4999H18.75C20.2688 26.4999 21.5 27.7311 21.5 29.2499V39.5H12.25C10.1789 39.5 8.5 37.8211 8.5 35.75V26.4999Z</x:String>
+ <x:String x:Key="ExitCompactOverlayPathIconData">M39.5 12.25C39.5 10.1789 37.8211 8.5 35.75 8.5H27.8654C27.175 8.5 26.6154 7.94036 26.6154 7.25C26.6154 6.55964 27.175 6 27.8654 6H35.75C39.2018 6 42 8.79822 42 12.25V35.75C42 39.2018 39.2018 42 35.75 42H12.25C8.79822 42 6 39.2018 6 35.75V27.8654C6 27.175 6.55964 26.6154 7.25 26.6154C7.94036 26.6154 8.5 27.175 8.5 27.8654V35.75C8.5 37.8211 10.1789 39.5 12.25 39.5H24V29.25C24 26.3505 26.3505 24 29.25 24H39.5V12.25ZM39.5 26.5H29.25C27.7312 26.5 26.5 27.7312 26.5 29.25V39.5H35.75C37.8211 39.5 39.5 37.8211 39.5 35.75V26.5ZM21 7.25C21 6.55964 20.4404 6 19.75 6H7.25015C6.55979 6 6.00015 6.55964 6.00015 7.25V19.75C6.00015 20.4404 6.55979 21 7.25015 21C7.94051 21 8.50015 20.4404 8.50015 19.75V10.2679L18.8661 20.6339C19.3543 21.122 20.1457 21.122 20.6339 20.6339C21.122 20.1457 21.122 19.3543 20.6339 18.8661L10.2678 8.5H19.75C20.4404 8.5 21 7.94036 21 7.25Z</x:String>
+</ResourceDictionary>
diff --git a/src/dev/impl/DevTools.Common/Themes/Generic.xaml b/src/dev/impl/DevTools.Common/Themes/Generic.xaml
new file mode 100644
index 000000000..7767bfc8c
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/Themes/Generic.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:controls="using:DevTools.Common.UI.Controls">
+
+ <Style TargetType="controls:CustomPathIcon">
+ <Setter Property="Stretch" Value="Uniform"/>
+ <Setter Property="Height" Value="16"/>
+ <Setter Property="Width" Value="16"/>
+ <Setter Property="Fill" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
+ </Style>
+</ResourceDictionary>
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomPathIcon.cs b/src/dev/impl/DevTools.Common/UI/Controls/CustomPathIcon.cs
new file mode 100644
index 000000000..f48d28d3f
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/UI/Controls/CustomPathIcon.cs
@@ -0,0 +1,13 @@
+#nullable enable
+
+using Windows.UI.Xaml.Shapes;
+
+namespace DevTools.Common.UI.Controls
+{
+ public sealed class CustomPathIcon : Path
+ {
+ public CustomPathIcon()
+ {
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToVisibilityConverter.cs b/src/dev/impl/DevTools.Common/UI/Converters/BooleanToVisibilityConverter.cs
new file mode 100644
index 000000000..f085da0d5
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/UI/Converters/BooleanToVisibilityConverter.cs
@@ -0,0 +1,56 @@
+#nullable enable
+
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace DevTools.Common.UI.Converters
+{
+ /// <summary>
+ /// Convert a <see cref="bool"/> to a <see cref="Visibility"/> value.
+ /// </summary>
+ public sealed class BooleanToVisibilityConverter : IValueConverter
+ {
+ /// <summary>
+ /// Gets or sets a value that defines whether the converter behavior is inverted or not
+ /// </summary>
+ public bool IsInverted { get; set; }
+
+ public object Convert(object value, Type targetType, object parameter, string language)
+ {
+ var valueBool = value as bool?;
+ if (valueBool == null)
+ {
+ return DependencyProperty.UnsetValue;
+ }
+
+ if (valueBool.Value)
+ {
+ if (!IsInverted)
+ {
+ return Visibility.Visible;
+ }
+ else
+ {
+ return Visibility.Collapsed;
+ }
+ }
+ else
+ {
+ if (!IsInverted)
+ {
+ return Visibility.Collapsed;
+ }
+ else
+ {
+ return Visibility.Visible;
+ }
+ }
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, string language)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/DoubleToGridLengthConverter.cs b/src/dev/impl/DevTools.Common/UI/Converters/DoubleToGridLengthConverter.cs
new file mode 100644
index 000000000..247ac6372
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/UI/Converters/DoubleToGridLengthConverter.cs
@@ -0,0 +1,29 @@
+#nullable enable
+
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace DevTools.Common.UI.Converters
+{
+ /// <summary>
+ /// Converts a <see cref="double"/> value to a <see cref="GridLength"/> value.
+ /// </summary>
+ public sealed class DoubleToGridLengthConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, string language)
+ {
+ if (value is double valueDouble)
+ {
+ return new GridLength(valueDouble);
+ }
+
+ throw new Exception("Double expected");
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, string language)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/InvertedBooleanConverter.cs b/src/dev/impl/DevTools.Common/UI/Converters/InvertedBooleanConverter.cs
new file mode 100644
index 000000000..fa43766ed
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/UI/Converters/InvertedBooleanConverter.cs
@@ -0,0 +1,30 @@
+#nullable enable
+
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace DevTools.Common.UI.Converters
+{
+ /// <summary>
+ /// Convert a <see cref="bool"/> to a inverted <see cref="bool"/> value.
+ /// </summary>
+ public sealed class InvertedBooleanConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, string language)
+ {
+ var valueBool = value as bool?;
+ if (valueBool == null)
+ {
+ return DependencyProperty.UnsetValue;
+ }
+
+ return !valueBool.Value;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, string language)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Impl/Core/UI/Extensions/HighlighterExtension.cs b/src/dev/impl/DevTools.Common/UI/Extensions/HighlighterExtension.cs
similarity index 98%
rename from src/dev/impl/DevTools.Impl/Core/UI/Extensions/HighlighterExtension.cs
rename to src/dev/impl/DevTools.Common/UI/Extensions/HighlighterExtension.cs
index 5439d39c4..53e7df61f 100644
--- a/src/dev/impl/DevTools.Impl/Core/UI/Extensions/HighlighterExtension.cs
+++ b/src/dev/impl/DevTools.Common/UI/Extensions/HighlighterExtension.cs
@@ -11,7 +11,7 @@ using Windows.UI.Xaml.Documents;
using Windows.UI.Xaml.Markup;
using Windows.UI.Xaml.Media;
-namespace DevTools.Impl.Core.UI.Extensions
+namespace DevTools.Common.UI.Extensions
{
[MarkupExtensionReturnType(ReturnType = typeof(IList<TextHighlighter>))]
[Bindable]
diff --git a/src/dev/impl/DevTools.Core.Impl/TitleBar.cs b/src/dev/impl/DevTools.Core.Impl/TitleBar.cs
index 825582eb6..3184305fb 100644
--- a/src/dev/impl/DevTools.Core.Impl/TitleBar.cs
+++ b/src/dev/impl/DevTools.Core.Impl/TitleBar.cs
@@ -3,12 +3,14 @@
using DevTools.Core.Settings;
using DevTools.Core.Theme;
using DevTools.Core.Threading;
+using System.ComponentModel;
using System.Composition;
using System.Threading.Tasks;
using Windows.ApplicationModel.Core;
using Windows.UI;
using Windows.UI.Core;
using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
namespace DevTools.Core.Impl
{
@@ -20,6 +22,23 @@ namespace DevTools.Core.Impl
private readonly ISettingsProvider _settingsProvider;
private readonly IThemeListener _themeListener;
+ private double _systemOverlayRightInset;
+
+ public double SystemOverlayRightInset
+ {
+ get => _systemOverlayRightInset;
+ private set
+ {
+ _systemOverlayRightInset = value;
+ _thread.RunOnUIThreadAsync(() =>
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SystemOverlayRightInset)));
+ });
+ }
+ }
+
+ public event PropertyChangedEventHandler? PropertyChanged;
+
[ImportingConstructor]
public TitleBar(IThread thread, ISettingsProvider settingsProvider, IThemeListener themeListener)
{
@@ -41,7 +60,9 @@ namespace DevTools.Core.Impl
_thread.ThrowIfNotOnUIThread();
Arguments.NotNull(coreTitleBar, nameof(coreTitleBar));
+ Window.Current.SizeChanged += CurrentWindow_SizeChanged;
coreTitleBar.ExtendViewIntoTitleBar = true;
+ SystemOverlayRightInset = coreTitleBar.SystemOverlayRightInset;
// Register a handler for when the size of the overlaid caption control changes.
// For example, when the app moves to a screen with a different DPI.
@@ -104,5 +125,10 @@ namespace DevTools.Core.Impl
{
SetupTitleBar(sender);
}
+
+ private void CurrentWindow_SizeChanged(object sender, WindowSizeChangedEventArgs e)
+ {
+ SystemOverlayRightInset = CoreApplication.GetCurrentView().TitleBar.SystemOverlayRightInset;
+ }
}
}
diff --git a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
index 193cc7fdb..3f741ecc3 100644
--- a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
+++ b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
@@ -74,7 +74,6 @@
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
- <Compile Include="Core\UI\Extensions\HighlighterExtension.cs" />
<Compile Include="Dummy.cs" />
<Compile Include="Models\MatchedToolProviderViewData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -92,8 +91,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />
+ <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Behaviors" Version="$(Nuget_MicrosoftToolkitUwpUIBehaviors)" />
<PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />
- <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="$(Nuget_MicrosoftXamlBehaviorsUwpManaged)" />
<PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />
</ItemGroup>
<ItemGroup>
@@ -105,9 +104,9 @@
<Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
<Name>DevTools.Providers</Name>
</ProjectReference>
- <ProjectReference Include="..\DevTools.Localization\DevTools.Localization.csproj">
+ <ProjectReference Include="..\DevTools.Common\DevTools.Common.csproj">
<Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>
- <Name>DevTools.Localization</Name>
+ <Name>DevTools.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
index 76d8dde9e..f0e517f19 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
@@ -3,7 +3,7 @@
using DevTools.Core;
using DevTools.Core.Threading;
using DevTools.Impl.Models;
-using DevTools.Localization;
+using DevTools.Common;
using DevTools.Providers;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
@@ -17,6 +17,8 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Web;
+using Windows.UI.ViewManagement;
+using Windows.Foundation;
namespace DevTools.Impl.ViewModels
{
@@ -31,9 +33,12 @@ namespace DevTools.Impl.ViewModels
private MatchedToolProviderViewData? _selectedItem;
private string? _searchQuery;
+ private bool _isInCompactOverlayMode;
internal MainPageStrings Strings = LanguageManager.Instance.MainPage;
+ internal ITitleBar TitleBar { get; }
+
/// <summary>
/// Items at the top of the NavigationView.
/// </summary>
@@ -62,7 +67,7 @@ namespace DevTools.Impl.ViewModels
}
/// <summary>
- /// The search query in the search bar.
+ /// Gets or sets search query in the search bar.
/// </summary>
internal string? SearchQuery
{
@@ -79,22 +84,44 @@ namespace DevTools.Impl.ViewModels
}
}
+ /// <summary>
+ /// Gets whether the window is in Compact Overlay mode or not.
+ /// </summary>
+ internal bool IsInCompactOverlayMode
+ {
+ get => _isInCompactOverlayMode;
+ private set
+ {
+ _thread.ThrowIfNotOnUIThread();
+ if (_isInCompactOverlayMode != value)
+ {
+ _isInCompactOverlayMode = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
[ImportingConstructor]
public MainPageViewModel(
IThread thread,
+ ITitleBar titleBar,
IToolProviderFactory toolProviderFactory,
IUriActivationProtocolService launchProtocolService)
{
_thread = thread;
_toolProviderFactory = toolProviderFactory;
_launchProtocolService = launchProtocolService;
+ TitleBar = titleBar;
OpenToolInNewWindowCommand = new AsyncRelayCommand<ToolProviderMetadata>(ExecuteOpenToolInNewWindowCommandAsync);
+ ChangeViewModeCommand = new AsyncRelayCommand<ApplicationViewMode>(ExecuteChangeViewModeCommandAsync);
+
+ IsInCompactOverlayMode = ApplicationView.GetForCurrentView().ViewMode == ApplicationViewMode.CompactOverlay;
}
#region OpenToolInNewWindowCommand
- public IRelayCommand<ToolProviderMetadata> OpenToolInNewWindowCommand { get; }
+ public IAsyncRelayCommand<ToolProviderMetadata> OpenToolInNewWindowCommand { get; }
private async Task ExecuteOpenToolInNewWindowCommandAsync(ToolProviderMetadata? metadata)
{
@@ -104,6 +131,28 @@ namespace DevTools.Impl.ViewModels
#endregion
+ #region ChangeViewModeCommand
+
+ public IAsyncRelayCommand<ApplicationViewMode> ChangeViewModeCommand { get; }
+
+ private async Task ExecuteChangeViewModeCommandAsync(ApplicationViewMode applicationViewMode)
+ {
+ Assumes.NotNull(SelectedMenuItem, nameof(SelectedMenuItem));
+
+ ViewModePreferences compactOptions = ViewModePreferences.CreateDefault(ApplicationViewMode.CompactOverlay);
+ compactOptions.CustomSize = new Size(SelectedMenuItem!.Metadata.CompactOverlayWidth, SelectedMenuItem.Metadata.CompactOverlayHeight);
+
+ if (await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(applicationViewMode, compactOptions))
+ {
+ await _thread.RunOnUIThreadAsync(() =>
+ {
+ IsInCompactOverlayMode = applicationViewMode == ApplicationViewMode.CompactOverlay;
+ });
+ }
+ }
+
+ #endregion
+
/// <summary>
/// Invoked when the Page is loaded and becomes the current source of a parent Frame.
/// </summary>
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
index 26ad62d61..f508f3d0d 100644
--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
@@ -8,13 +8,20 @@
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:models="using:DevTools.Impl.Models"
xmlns:i="using:Microsoft.Xaml.Interactivity"
- xmlns:core="using:Microsoft.Xaml.Interactions.Core"
- xmlns:ex="using:DevTools.Impl.Core.UI.Extensions"
- xmlns:localization="using:DevTools.Localization"
+ xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
+ xmlns:ex="using:DevTools.Common.UI.Extensions"
+ xmlns:converters="using:DevTools.Common.UI.Converters"
+ xmlns:common="using:DevTools.Common"
+ xmlns:controls="using:DevTools.Common.UI.Controls"
+ xmlns:viewmanagement="using:Windows.UI.ViewManagement"
mc:Ignorable="d"
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True">
<Page.Resources>
- <localization:LanguageManager x:Key="LanguageManager"/>
+ <common:LanguageManager x:Key="LanguageManager"/>
+ <converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter"/>
+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+ <converters:BooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" IsInverted="True"/>
+ <converters:InvertedBooleanConverter x:Key="InvertedBooleanConverter"/>
<!--This top margin is the height of the custom TitleBar-->
<Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
@@ -26,33 +33,101 @@
</Grid.BackgroundTransition>
<!-- Title and icon in the title bar -->
- <Border
+ <Grid
VerticalAlignment="Top"
Height="48"
- Margin="48,0,0,0">
- <StackPanel Orientation="Horizontal">
+ Canvas.ZIndex="1">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="{x:Bind ViewModel.TitleBar.SystemOverlayRightInset, Mode=OneWay, Converter={StaticResource DoubleToGridLengthConverter}}" />
+ </Grid.ColumnDefinitions>
+ <Border
+ Grid.Column="0"
+ Width="48"
+ Visibility="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
+
+ <StackPanel
+ Grid.Column="1"
+ Orientation="Horizontal">
<Image
HorizontalAlignment="Left"
VerticalAlignment="Center"
Source="/DevTools.Impl/Assets/Logo/Square44x44Logo.scale-200.png"
Width="16"
- Height="16"/>
+ Height="16"
+ Visibility="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
<TextBlock
Text="DevTools"
VerticalAlignment="Center"
Margin="12,0,0,0"
Style="{StaticResource CaptionTextBlockStyle}" />
</StackPanel>
- </Border>
- <!-- Draggable part of the title bar -->
- <Border
- x:Name="AppTitleBar"
- Background="Transparent"
- VerticalAlignment="Top"
- Height="32"
- Margin="48,0,0,0"
- Canvas.ZIndex="1"/>
+ <!-- Draggable part of the title bar -->
+ <Border
+ x:Name="AppTitleBar"
+ Grid.Column="1"
+ Background="Transparent"
+ VerticalAlignment="Top"
+ HorizontalAlignment="Stretch"
+ Height="32"/>
+
+ <!-- Compact Overlay button -->
+ <Button
+ Grid.Column="2"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Top"
+ Width="46"
+ Height="32"
+ Padding="0"
+ Background="Transparent"
+ BorderBrush="Transparent"
+ ToolTipService.ToolTip="{x:Bind ViewModel.Strings.EnterCompactOverlayTooltip}"
+ Visibility="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"
+ Command="{x:Bind ViewModel.ChangeViewModeCommand}">
+ <Button.CommandParameter>
+ <viewmanagement:ApplicationViewMode>CompactOverlay</viewmanagement:ApplicationViewMode>
+ </Button.CommandParameter>
+ <Button.KeyboardAccelerators>
+ <KeyboardAccelerator Key="Up" Modifiers="Control"/>
+ </Button.KeyboardAccelerators>
+ <controls:CustomPathIcon
+ Data="{StaticResource EnterCompactOverlayPathIconData}"
+ RenderTransformOrigin="0.5,0.5">
+ <controls:CustomPathIcon.RenderTransform>
+ <CompositeTransform Rotation="180"/>
+ </controls:CustomPathIcon.RenderTransform>
+ </controls:CustomPathIcon>
+ </Button>
+ <Button
+ Grid.Column="2"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Top"
+ Width="46"
+ Height="32"
+ Padding="0"
+ Background="Transparent"
+ BorderBrush="Transparent"
+ ToolTipService.ToolTip="{x:Bind ViewModel.Strings.ExitCompactOverlayTooltip}"
+ Visibility="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
+ Command="{x:Bind ViewModel.ChangeViewModeCommand}">
+ <Button.CommandParameter>
+ <viewmanagement:ApplicationViewMode>Default</viewmanagement:ApplicationViewMode>
+ </Button.CommandParameter>
+ <Button.KeyboardAccelerators>
+ <KeyboardAccelerator Key="Down" Modifiers="Control"/>
+ </Button.KeyboardAccelerators>
+ <controls:CustomPathIcon
+ Data="{StaticResource ExitCompactOverlayPathIconData}"
+ RenderTransformOrigin="0.5,0.5">
+ <controls:CustomPathIcon.RenderTransform>
+ <CompositeTransform Rotation="-90"/>
+ </controls:CustomPathIcon.RenderTransform>
+ </controls:CustomPathIcon>
+ </Button>
+ </Grid>
<!-- Navigation view -->
<muxc:NavigationView
@@ -60,12 +135,13 @@
IsSettingsVisible="False"
IsBackButtonVisible="Collapsed"
IsBackEnabled="False"
- Header="Header"
- AlwaysShowHeader="True"
CompactModeThresholdWidth="450"
ExpandedModeThresholdWidth="550"
PaneDisplayMode="Auto"
IsTabStop="False"
+ AlwaysShowHeader="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay}"
+ IsPaneVisible="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanConverter}}"
+ Header="{x:Bind ViewModel.SelectedMenuItem.ToolProvider.DisplayName, Mode=OneWay}"
MenuItemsSource="{x:Bind ViewModel.ToolsMenuItems}"
FooterMenuItemsSource="{x:Bind ViewModel.FooterMenuItems}"
SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs
index ed6dba1c7..a918e05f9 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs
+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolProvider.cs
@@ -1,7 +1,7 @@
#nullable enable
using DevTools.Core.Threading;
-using DevTools.Localization;
+using DevTools.Common;
using DevTools.Providers;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.UI.Xaml.Controls;
@@ -18,6 +18,7 @@ namespace DevTools.Impl.Views.Settings
[Export(typeof(IToolProvider))]
[Name("Settings")]
[ProtocolName("settings")]
+ [CompactOverlaySize(width: 400, height: 300)]
[IsFooterItem]
internal sealed class SettingsToolProvider : ObservableRecipient, IToolProvider
{
diff --git a/src/dev/impl/DevTools.Localization/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Localization/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7a8b99071..000000000
--- a/src/dev/impl/DevTools.Localization/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Localization")]
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Localization/Resources.xaml b/src/dev/impl/DevTools.Localization/Resources.xaml
deleted file mode 100644
index 7762b4b81..000000000
--- a/src/dev/impl/DevTools.Localization/Resources.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ResourceDictionary
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localization="using:DevTools.Localization">
-
- <FontFamily x:Key="FluentSystemIcons">ms-appx:///DevTools.Localization/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>
-
-</ResourceDictionary>
diff --git a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
index 4808b49b4..3b7122a27 100644
--- a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
+++ b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
@@ -93,9 +93,9 @@
<Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
<Name>DevTools.Providers</Name>
</ProjectReference>
- <ProjectReference Include="..\DevTools.Localization\DevTools.Localization.csproj">
+ <ProjectReference Include="..\DevTools.Common\DevTools.Common.csproj">
<Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>
- <Name>DevTools.Localization</Name>
+ <Name>DevTools.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
index 49ec582d8..1bdc15fd6 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
@@ -1,7 +1,7 @@
#nullable enable
using DevTools.Core.Threading;
-using DevTools.Localization;
+using DevTools.Common;
using System;
using System.Composition;
diff --git a/src/dev/startup/DevTools/App.xaml b/src/dev/startup/DevTools/App.xaml
index 48a539c2a..a7bfdbbcd 100644
--- a/src/dev/startup/DevTools/App.xaml
+++ b/src/dev/startup/DevTools/App.xaml
@@ -8,7 +8,8 @@
<controls:XamlControlsResources.MergedDictionaries>
<!-- Other app resources here -->
- <ResourceDictionary Source="ms-appx:///DevTools.Localization/Resources.xaml"/>
+ <ResourceDictionary Source="ms-appx:///DevTools.Common/Themes/Generic.xaml"/>
+ <ResourceDictionary Source="ms-appx:///DevTools.Common/Themes/Custom.xaml"/>
</controls:XamlControlsResources.MergedDictionaries>
</controls:XamlControlsResources>
diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.cs
index 998520b20..183ae6997 100644
--- a/src/dev/startup/DevTools/App.xaml.cs
+++ b/src/dev/startup/DevTools/App.xaml.cs
@@ -8,7 +8,7 @@ using DevTools.Core.Settings;
using DevTools.Core.Theme;
using DevTools.Core.Threading;
using DevTools.Impl.Views;
-using DevTools.Localization;
+using DevTools.Common;
using DevTools.Providers;
using System;
using System.Globalization;
@@ -112,6 +112,9 @@ namespace DevTools
// Ensure the current window is active
Window.Current.Activate();
}
+
+ // Setup the title bar.
+ _mefComposer.ExportProvider.GetExport<ITitleBar>().SetupTitleBarAsync().Forget();
}
/// <summary>
@@ -132,6 +135,9 @@ namespace DevTools
// Ensure the current window is active
Window.Current.Activate();
+
+ // Setup the title bar.
+ _mefComposer.ExportProvider.GetExport<ITitleBar>().SetupTitleBarAsync().Forget();
}
}
@@ -201,9 +207,6 @@ namespace DevTools
{
frameworkElement.RequestedTheme = theme == AppTheme.Light ? ElementTheme.Light : ElementTheme.Dark;
}
-
- // Setup the title bar.
- _mefComposer.ExportProvider.GetExport<ITitleBar>().SetupTitleBarAsync().Forget();
}
}
}
\ No newline at end of file
diff --git a/src/dev/startup/DevTools/DevTools.csproj b/src/dev/startup/DevTools/DevTools.csproj
index 0753fa0d7..3f4cde4bd 100644
--- a/src/dev/startup/DevTools/DevTools.csproj
+++ b/src/dev/startup/DevTools/DevTools.csproj
@@ -134,9 +134,9 @@
<Project>{e2f0c303-04fc-4504-a272-7662af9a0a80}</Project>
<Name>DevTools.Impl</Name>
</ProjectReference>
- <ProjectReference Include="..\..\impl\DevTools.Localization\DevTools.Localization.csproj">
+ <ProjectReference Include="..\..\impl\DevTools.Common\DevTools.Common.csproj">
<Project>{935D5DF8-C400-4CA6-AABE-34A06A69AF85}</Project>
- <Name>DevTools.Localization</Name>
+ <Name>DevTools.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj">
<Project>{8621ed11-e9dd-480a-be2b-c1db00919b6f}</Project>
diff --git a/src/tests/DevTools.Tests/DevTools.Tests.csproj b/src/tests/DevTools.Tests/DevTools.Tests.csproj
index 7d11d1cba..6ecc514ae 100644
--- a/src/tests/DevTools.Tests/DevTools.Tests.csproj
+++ b/src/tests/DevTools.Tests/DevTools.Tests.csproj
@@ -76,6 +76,7 @@
<ItemGroup>
<Compile Include="MefBaseTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="UI\ConvertersTests.cs" />
<Compile Include="UnitTestApp.xaml.cs">
<DependentUpon>UnitTestApp.xaml</DependentUpon>
</Compile>
@@ -126,9 +127,9 @@
<Project>{e2f0c303-04fc-4504-a272-7662af9a0a80}</Project>
<Name>DevTools.Impl</Name>
</ProjectReference>
- <ProjectReference Include="..\..\dev\impl\DevTools.Localization\DevTools.Localization.csproj">
+ <ProjectReference Include="..\..\dev\impl\DevTools.Common\DevTools.Common.csproj">
<Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>
- <Name>DevTools.Localization</Name>
+ <Name>DevTools.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\dev\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj">
<Project>{8621ed11-e9dd-480a-be2b-c1db00919b6f}</Project>
diff --git a/src/tests/DevTools.Tests/MefBaseTest.cs b/src/tests/DevTools.Tests/MefBaseTest.cs
index faaeb8c79..c6ee0faac 100644
--- a/src/tests/DevTools.Tests/MefBaseTest.cs
+++ b/src/tests/DevTools.Tests/MefBaseTest.cs
@@ -1,6 +1,6 @@
using DevTools.Core.Impl.Injection;
using DevTools.Core.Injection;
-using DevTools.Localization;
+using DevTools.Common;
using DevTools.Providers;
using System;
using System.Globalization;
diff --git a/src/tests/DevTools.Tests/UI/ConvertersTests.cs b/src/tests/DevTools.Tests/UI/ConvertersTests.cs
new file mode 100644
index 000000000..cd4246427
--- /dev/null
+++ b/src/tests/DevTools.Tests/UI/ConvertersTests.cs
@@ -0,0 +1,25 @@
+using DevTools.Common.UI.Converters;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Windows.UI.Xaml;
+
+namespace DevTools.Tests.UI
+{
+ [TestClass]
+ public class ConvertersTests
+ {
+ [TestMethod]
+ public void BooleanToVisibilityConverterTest()
+ {
+ var converter = new BooleanToVisibilityConverter();
+ converter.IsInverted = false;
+
+ Assert.AreEqual(Visibility.Visible, converter.Convert(true, typeof(Visibility), null, null));
+ Assert.AreEqual(Visibility.Collapsed, converter.Convert(false, typeof(Visibility), null, null));
+
+ converter.IsInverted = true;
+
+ Assert.AreEqual(Visibility.Collapsed, converter.Convert(true, typeof(Visibility), null, null));
+ Assert.AreEqual(Visibility.Visible, converter.Convert(false, typeof(Visibility), null, null));
+ }
+ }
+}