Skip to content

A Swiss Army knife for developers.

Added Settings provider

Etienne Baudouxdd353b64a8a2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 26f87260b..d406f2b06 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ You can contribute to DevToys app by:
### Build, Run & Debug
1. Open `src/DevToys-Windows.sln` with Visual Studio.
-1. In Visual Studio, set `app/dev/platforms/web/DevToys.Wasm` or `app/dev/platforms/desktop/windows/DevToys.UWP` or `app/dev/platforms/desktop/windows/DevToys.Wasdk` or `app/dev/platforms/desktop/DevToys.CLI` as startup project.
+1. In Visual Studio, set `app/dev/platforms/web/DevToys.Wasm` or `app/dev/platforms/desktop/windows/DevToys.Wasdk` or `app/dev/platforms/desktop/DevToys.CLI` as startup project.
1. Now you should be able to build and run DevToys on your machine by pressing `F5`.
## From macOS
@@ -117,7 +117,7 @@ For the icons of the tools, a custom font is used. See [documentation](https://g
## Things to keep in mind
-We try to avoid at maximum any UWP capability/permission like `internet`, `camera`, `location`...etc. The reason why is that this app is designed to be a tool that we can **trust** when pasting sensitive data inside.
+We try to avoid at maximum any Microsoft Store app capability/permission like `internet`, `camera`, `location`...etc. The reason why is that this app is designed to be a tool that we can **trust** when pasting sensitive data inside.
Therefore, when making changes to DevToys, please try at maximum to avoid any capability requirement.
## Code Style
diff --git a/src/DevToys-MacOS.sln b/src/DevToys-MacOS.sln
index 00d44bce9..066b11f73 100644
--- a/src/DevToys-MacOS.sln
+++ b/src/DevToys-MacOS.sln
@@ -55,15 +55,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.UI.Framework", "app
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.UI", "app\dev\DevToys.UI\DevToys.UI.csproj", "{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}"
EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DevToys.UI.EntryPoint", "app\dev\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.shproj", "{93E31B7F-903D-4F24-B30D-220489242866}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.MonacoEditor", "app\dev\DevToys.MonacoEditor\DevToys.MonacoEditor.csproj", "{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Wasm", "app\dev\platforms\web\DevToys.Wasm\DevToys.Wasm.csproj", "{9E59352A-836D-47DE-AB02-F404A8345242}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevToys.MacOS", "app\dev\platforms\desktop\macos\DevToys.MacOS\DevToys.MacOS.csproj", "{E3E689D3-FC5E-48B4-961E-DD5C0DB62DAF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.MacOS", "app\dev\platforms\desktop\macos\DevToys.MacOS\DevToys.MacOS.csproj", "{E3E689D3-FC5E-48B4-961E-DD5C0DB62DAF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevToys.MauiBlazor", "app\dev\platforms\desktop\DevToys.MauiBlazor\DevToys.MauiBlazor.csproj", "{77A35152-832A-47FA-B7B8-2B0E113E8B29}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.MauiBlazor", "app\dev\platforms\desktop\DevToys.MauiBlazor\DevToys.MauiBlazor.csproj", "{77A35152-832A-47FA-B7B8-2B0E113E8B29}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -95,6 +93,18 @@ Global
{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Release|AnyCPU.Build.0 = Release|Any CPU
+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.Build.0 = Release|Any CPU
+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.Build.0 = Release|Any CPU
+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.Build.0 = Release|Any CPU
{9E59352A-836D-47DE-AB02-F404A8345242}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{9E59352A-836D-47DE-AB02-F404A8345242}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{9E59352A-836D-47DE-AB02-F404A8345242}.Release|AnyCPU.ActiveCfg = Release|Any CPU
@@ -103,18 +113,6 @@ Global
{E3E689D3-FC5E-48B4-961E-DD5C0DB62DAF}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{E3E689D3-FC5E-48B4-961E-DD5C0DB62DAF}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{E3E689D3-FC5E-48B4-961E-DD5C0DB62DAF}.Release|AnyCPU.Build.0 = Release|Any CPU
- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.Build.0 = Debug|Any CPU
- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.ActiveCfg = Release|Any CPU
- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.Build.0 = Release|Any CPU
- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.ActiveCfg = Release|Any CPU
- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.Build.0 = Release|Any CPU
- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.Build.0 = Debug|Any CPU
- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.ActiveCfg = Release|Any CPU
- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.Build.0 = Release|Any CPU
{77A35152-832A-47FA-B7B8-2B0E113E8B29}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{77A35152-832A-47FA-B7B8-2B0E113E8B29}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{77A35152-832A-47FA-B7B8-2B0E113E8B29}.Release|AnyCPU.ActiveCfg = Release|Any CPU
@@ -139,7 +137,6 @@ Global
{A730FA8A-3713-4F7A-915D-79098CA12DF0} = {B20E4027-0777-4A75-A848-609594E9A6B0}
{723A3D71-2425-49EE-B669-1A0DF3A8B486} = {B20E4027-0777-4A75-A848-609594E9A6B0}
{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A} = {B20E4027-0777-4A75-A848-609594E9A6B0}
- {93E31B7F-903D-4F24-B30D-220489242866} = {B20E4027-0777-4A75-A848-609594E9A6B0}
{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8} = {B20E4027-0777-4A75-A848-609594E9A6B0}
{9E59352A-836D-47DE-AB02-F404A8345242} = {04F9E03E-B519-49C5-BC6A-2131ED9BADC0}
{E3E689D3-FC5E-48B4-961E-DD5C0DB62DAF} = {8B003389-15D4-4466-A40E-50FC0D603BF6}
@@ -148,9 +145,4 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C2C953F5-F97F-4198-B15C-4947A886050F}
EndGlobalSection
- GlobalSection(SharedMSBuildProjectFiles) = preSolution
- app\dev\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems*{93e31b7f-903d-4f24-b30d-220489242866}*SharedItemsImports = 13
- app\dev\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems*{97aa45f4-41e2-4fda-b5b7-f4579df2c7ee}*SharedItemsImports = 4
- app\dev\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems*{9e59352a-836d-47de-ab02-f404a8345242}*SharedItemsImports = 5
- EndGlobalSection
EndGlobal
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f94e2c271..e1cfec3c3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -8,9 +8,6 @@
<Windows10MinSDKVersionTrimmed>10.0.19041</Windows10MinSDKVersionTrimmed>
<Windows10MinSDKVersion>$(Windows10MinSDKVersionTrimmed).0</Windows10MinSDKVersion>
- <!-- Can't support 2.1 because UWP is dead and doesn't support it -->
- <NetStandard>netstandard2.0</NetStandard>
-
<NetCore>net7.0</NetCore>
<NetCoreWindows>$(NetCore)-windows$(Windows10MinSDKVersionTrimmed)</NetCoreWindows>
<NetMacCatalyst>$(NetCore)-maccatalyst</NetMacCatalyst>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 701b8eb7b..957e85eb0 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<!--
- Central Package Management isn't supported by UWP and Razor Sdk project type. We keep the version of some packages in variables below so we can reuse
- them in UWP projects explicitely so we keep consistent package version number across the repository.
+ Central Package Management isn't supported by Razor Sdk project type. We keep the version of some packages in variables below so we can reuse
+ them in projects explicitely so we keep consistent package version number across the repository.
-->
<CommunityToolkitVersion>8.1.0</CommunityToolkitVersion>
<DotNetVersion>7.0.0</DotNetVersion>
@@ -36,7 +36,6 @@
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
- <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
<PackageVersion Include="Nuke.Common" Version="6.2.1" />
<PackageVersion Include="PolySharp" Version="$(PolySharpVersion)" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
diff --git a/src/app/dev/DevToys.Api/Core/Threading/AsyncLazy.cs b/src/app/dev/DevToys.Api/Core/Threading/AsyncLazy.cs
new file mode 100644
index 000000000..0c57c4f79
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Core/Threading/AsyncLazy.cs
@@ -0,0 +1,54 @@
+namespace DevToys.Api.Core.Threading;
+
+public class AsyncLazy<T>
+{
+ private static Func<Task<T>> FromFuncT(Func<T> valueFunc)
+ {
+ Guard.IsNotNull(valueFunc);
+ return () => Task.FromResult(valueFunc());
+ }
+
+ private readonly Lazy<Task<T>> _innerLazy;
+
+ public bool IsValueCreated => _innerLazy.IsValueCreated && _innerLazy.Value.IsCompletedSuccessfully;
+
+ public AsyncLazy(T value)
+ {
+ _innerLazy = new Lazy<Task<T>>(Task.FromResult(value));
+ }
+
+ public AsyncLazy(Func<T> valueFactory)
+ {
+ _innerLazy = new Lazy<Task<T>>(FromFuncT(valueFactory));
+ }
+
+ public AsyncLazy(Func<T> valueFactory, bool isThreadSafe)
+ {
+ _innerLazy = new Lazy<Task<T>>(FromFuncT(valueFactory), isThreadSafe);
+ }
+
+ public AsyncLazy(Func<T> valueFactory, LazyThreadSafetyMode mode)
+ {
+ _innerLazy = new Lazy<Task<T>>(FromFuncT(valueFactory), mode);
+ }
+
+ public AsyncLazy(Func<Task<T>> valueFactory)
+ {
+ _innerLazy = new Lazy<Task<T>>(valueFactory);
+ }
+
+ public AsyncLazy(Func<Task<T>> valueFactory, bool isThreadSafe)
+ {
+ _innerLazy = new Lazy<Task<T>>(valueFactory, isThreadSafe);
+ }
+
+ public AsyncLazy(Func<Task<T>> valueFactory, LazyThreadSafetyMode mode)
+ {
+ _innerLazy = new Lazy<Task<T>>(valueFactory, mode);
+ }
+
+ public Task<T> GetValueAsync()
+ {
+ return IsValueCreated ? Task.FromResult(_innerLazy.Value.Result) : _innerLazy.Value;
+ }
+}
diff --git a/src/app/dev/DevToys.Api/DevToys.Api.csproj b/src/app/dev/DevToys.Api/DevToys.Api.csproj
index f6b89926a..598f02c1b 100644
--- a/src/app/dev/DevToys.Api/DevToys.Api.csproj
+++ b/src/app/dev/DevToys.Api/DevToys.Api.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetStandard);$(NetCore)</TargetFrameworks>
+ <TargetFrameworks>$(NetCore)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/src/app/dev/DevToys.Api/Settings/SettingChangedEventArgs.cs b/src/app/dev/DevToys.Api/Settings/SettingChangedEventArgs.cs
index 086e89874..5015086ca 100644
--- a/src/app/dev/DevToys.Api/Settings/SettingChangedEventArgs.cs
+++ b/src/app/dev/DevToys.Api/Settings/SettingChangedEventArgs.cs
@@ -1,9 +1,18 @@
namespace DevToys.Api;
+/// <summary>
+/// Represents the arguments of an event raised when an app setting change.
+/// </summary>
public sealed class SettingChangedEventArgs : EventArgs
{
+ /// <summary>
+ /// Gets the name of the setting that changed.
+ /// </summary>
public string SettingName { get; }
+ /// <summary>
+ /// Gets the new value of the setting.
+ /// </summary>
public object? NewValue { get; }
public SettingChangedEventArgs(string settingName, object? newValue)
diff --git a/src/app/dev/DevToys.Api/Settings/SettingDefinition.cs b/src/app/dev/DevToys.Api/Settings/SettingDefinition.cs
index e1d315e07..93f787db9 100644
--- a/src/app/dev/DevToys.Api/Settings/SettingDefinition.cs
+++ b/src/app/dev/DevToys.Api/Settings/SettingDefinition.cs
@@ -6,11 +6,6 @@
/// <typeparam name="T">The type of value of the setting</typeparam>
public readonly struct SettingDefinition<T> : IEquatable<SettingDefinition<T>>
{
- /// <summary>
- /// Gets whether the setting can be synchronized with the user's Microsoft account.
- /// </summary>
- public bool IsRoaming { get; }
-
/// <summary>
/// Gets the name of the setting.
/// </summary>
@@ -37,7 +32,6 @@ public readonly struct SettingDefinition<T> : IEquatable<SettingDefinition<T>>
throw new ArgumentOutOfRangeException(nameof(name));
}
- IsRoaming = isRoaming;
Name = name;
DefaultValue = defaultValue;
}
@@ -54,16 +48,14 @@ public readonly struct SettingDefinition<T> : IEquatable<SettingDefinition<T>>
public bool Equals(SettingDefinition<T> other)
{
- return other.IsRoaming == IsRoaming
- && string.Equals(other.Name, Name, StringComparison.Ordinal)
+ return string.Equals(other.Name, Name, StringComparison.Ordinal)
&& other.DefaultValue is not null
&& other.DefaultValue.Equals(DefaultValue);
}
public override int GetHashCode()
{
- return (IsRoaming.GetHashCode() ^ 137)
- * (Name.GetHashCode() ^ 47)
+ return (Name.GetHashCode() ^ 47)
* (DefaultValue is null ? 13 : DefaultValue.GetHashCode() ^ 73);
}
diff --git a/src/app/dev/DevToys.Core/AppTheme.cs b/src/app/dev/DevToys.Core/AppTheme.cs
new file mode 100644
index 000000000..129841786
--- /dev/null
+++ b/src/app/dev/DevToys.Core/AppTheme.cs
@@ -0,0 +1,22 @@
+namespace DevToys.Core;
+
+/// <summary>
+/// Specifies a UI theme that should be used for individual UIElement parts of an app UI.
+/// </summary>
+public enum AppTheme
+{
+ /// <summary>
+ /// Use the Application.RequestedTheme value for the element. This is the default.
+ /// </summary>
+ Default,
+
+ /// <summary>
+ /// Use the **Light** default theme.
+ /// </summary>
+ Light,
+
+ /// <summary>
+ /// Use the **Dark** default theme.
+ /// </summary>
+ Dark
+}
diff --git a/src/app/dev/DevToys.Core/DevToys.Core.csproj b/src/app/dev/DevToys.Core/DevToys.Core.csproj
index b035a851b..8c1f08c3f 100644
--- a/src/app/dev/DevToys.Core/DevToys.Core.csproj
+++ b/src/app/dev/DevToys.Core/DevToys.Core.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetStandard);$(NetCore)</TargetFrameworks>
+ <TargetFrameworks>$(NetCore)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DevToys.Api\DevToys.Api.csproj" />
@@ -9,6 +9,7 @@
<PackageReference Include="CommunityToolkit.Common" />
<PackageReference Include="CommunityToolkit.Diagnostics" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+ <PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.ComponentModel.Composition" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Core/Mef/MefComposer.cs b/src/app/dev/DevToys.Core/Mef/MefComposer.cs
index ce10945e8..ef5df4ced 100644
--- a/src/app/dev/DevToys.Core/Mef/MefComposer.cs
+++ b/src/app/dev/DevToys.Core/Mef/MefComposer.cs
@@ -56,7 +56,9 @@ public sealed class MefComposer : IDisposable
var assemblies
= new HashSet<Assembly>(_assemblies)
{
- Assembly.GetExecutingAssembly()
+ Assembly.GetEntryAssembly()!,
+ typeof(IMefProvider).Assembly,
+ typeof(MefComposer).Assembly,
};
// Discover MEF extensions coming from known assemblies.
@@ -74,7 +76,7 @@ public sealed class MefComposer : IDisposable
{
catalog.Catalogs.Add(new RecursiveDirectoryCatalog(pluginFolder));
}
- catch (Exception ex)
+ catch
{
// TODO: Log this. We maybe failed to load a plugin.
}
@@ -102,8 +104,24 @@ public sealed class MefComposer : IDisposable
private static IEnumerable<string> GetPotentialPluginFolders()
{
// TODO: Maybe plugins should be placed in the app's LocalStorage instead?
- string appFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)!;
- string pluginFolder = Path.Combine(appFolder, "Plugins");
- return Directory.EnumerateDirectories(pluginFolder, "*", SearchOption.TopDirectoryOnly);
+ var entryAssembly = Assembly.GetEntryAssembly();
+ if (entryAssembly is not null)
+ {
+ string assemblyLocation = entryAssembly.Location;
+ if (!string.IsNullOrEmpty(assemblyLocation))
+ {
+ string? appFolder = Path.GetDirectoryName(assemblyLocation!);
+ if (!string.IsNullOrEmpty(appFolder))
+ {
+ string pluginFolder = Path.Combine(appFolder!, "Plugins");
+ if (Directory.Exists(pluginFolder))
+ {
+ return Directory.EnumerateDirectories(pluginFolder, "*", SearchOption.TopDirectoryOnly);
+ }
+ }
+ }
+ }
+
+ return Array.Empty<string>();
}
}
diff --git a/src/app/dev/DevToys.Core/Settings/ISettingsStorage.cs b/src/app/dev/DevToys.Core/Settings/ISettingsStorage.cs
new file mode 100644
index 000000000..c69018a46
--- /dev/null
+++ b/src/app/dev/DevToys.Core/Settings/ISettingsStorage.cs
@@ -0,0 +1,22 @@
+namespace DevToys.Core.Settings;
+
+/// <summary>
+/// Provides a platform-specific way to store and read app settings.
+/// </summary>
+public interface ISettingsStorage
+{
+ /// <summary>
+ /// Saves an app setting.
+ /// </summary>
+ void WriteSetting(string settingName, object? value);
+
+ /// <summary>
+ /// Reads an app setting.
+ /// </summary>
+ bool TryReadSetting(string settingName, out object? value);
+
+ /// <summary>
+ /// Deletes the given setting.
+ /// </summary>
+ void ResetSetting(string settingName);
+}
diff --git a/src/app/dev/DevToys.Core/Settings/PredefinedSettings.cs b/src/app/dev/DevToys.Core/Settings/PredefinedSettings.cs
new file mode 100644
index 000000000..e31ee1371
--- /dev/null
+++ b/src/app/dev/DevToys.Core/Settings/PredefinedSettings.cs
@@ -0,0 +1,24 @@
+using DevToys.Api;
+
+namespace DevToys.Core.Settings;
+
+public static class PredefinedSettings
+{
+ /// <summary>
+ /// The language to use for the texts in the user interface.
+ /// </summary>
+ public static readonly SettingDefinition<string> Language
+ = new(
+ name: nameof(Language),
+ isRoaming: false,
+ defaultValue: "default");
+
+ /// <summary>
+ /// The color theme of the application.
+ /// </summary>
+ public static readonly SettingDefinition<AppTheme> Theme
+ = new(
+ name: nameof(Theme),
+ isRoaming: false,
+ defaultValue: AppTheme.Default);
+}
diff --git a/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs b/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs
new file mode 100644
index 000000000..1e3349fe6
--- /dev/null
+++ b/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs
@@ -0,0 +1,68 @@
+using System.Collections;
+using System.Globalization;
+using DevToys.Api;
+using Newtonsoft.Json;
+
+namespace DevToys.Core.Settings;
+
+[Export(typeof(ISettingsProvider))]
+internal sealed class SettingsProvider : ISettingsProvider
+{
+ private readonly ISettingsStorage _settingsStorage;
+
+ [ImportingConstructor]
+ public SettingsProvider(ISettingsStorage settingsStorage)
+ {
+ _settingsStorage = settingsStorage;
+ }
+
+ public event EventHandler<SettingChangedEventArgs>? SettingChanged;
+
+ public T GetSetting<T>(SettingDefinition<T> settingDefinition)
+ {
+ if (_settingsStorage.TryReadSetting(settingDefinition.Name, out object? settingValue))
+ {
+ if (typeof(T).IsEnum)
+ {
+ return (T)Enum.Parse(typeof(T), settingValue?.ToString() ?? string.Empty);
+ }
+ else if (typeof(IList).IsAssignableFrom(typeof(T)))
+ {
+ return JsonConvert.DeserializeObject<T>(settingValue?.ToString() ?? string.Empty)!;
+ }
+
+ object? result = Convert.ChangeType(settingValue, typeof(T), CultureInfo.InvariantCulture);
+ if (result is T strongTypedResult)
+ {
+ return strongTypedResult;
+ }
+ }
+
+ SetSetting(settingDefinition, settingDefinition.DefaultValue);
+ return settingDefinition.DefaultValue;
+ }
+
+ public void SetSetting<T>(SettingDefinition<T> settingDefinition, T value)
+ {
+ object? valueToSave = value;
+ if (value is Enum valueEnum)
+ {
+ valueToSave = valueEnum.ToString();
+ }
+ else if (value is IList list)
+ {
+ valueToSave = JsonConvert.SerializeObject(list, Formatting.None);
+ }
+
+ _settingsStorage.WriteSetting(settingDefinition.Name, valueToSave);
+
+ SettingChanged?.Invoke(this, new SettingChangedEventArgs(settingDefinition.Name, value));
+ }
+
+ public void ResetSetting<T>(SettingDefinition<T> settingDefinition)
+ {
+ _settingsStorage.ResetSetting(settingDefinition.Name);
+
+ SettingChanged?.Invoke(this, new SettingChangedEventArgs(settingDefinition.Name, settingDefinition.DefaultValue));
+ }
+}
diff --git a/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj b/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj
index 586989ca3..e7d2d1587 100644
--- a/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj
+++ b/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj
@@ -10,7 +10,6 @@
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
- <IsUWP>false</IsUWP>
<IsWasm>false</IsWasm>
<IsMacCatalyst>false</IsMacCatalyst>
<IsWasdk>false</IsWasdk>
@@ -19,7 +18,6 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
- <PackageReference Include="Nito.AsyncEx" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
<PackageReference Include="Uno.Core.Extensions.Logging" />
diff --git a/src/app/dev/DevToys.MonacoEditor/highlightjs/Highlighter.cs b/src/app/dev/DevToys.MonacoEditor/highlightjs/Highlighter.cs
index 63d864ac5..cded5481f 100644
--- a/src/app/dev/DevToys.MonacoEditor/highlightjs/Highlighter.cs
+++ b/src/app/dev/DevToys.MonacoEditor/highlightjs/Highlighter.cs
@@ -1,8 +1,8 @@
#if __MACCATALYST__
+using DevToys.Api.Core.Threading;
using JavaScriptCore;
using Windows.Storage;
-using Nito.AsyncEx;
namespace DevToys.MonacoEditor.HighlightJs;
diff --git a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj b/src/app/dev/DevToys.Tools/DevToys.Tools.csproj
index 9ce165c2d..8c7ce9b0f 100644
--- a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj
+++ b/src/app/dev/DevToys.Tools/DevToys.Tools.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetStandard);$(NetCore)</TargetFrameworks>
+ <TargetFrameworks>$(NetCore)</TargetFrameworks>
<!-- See https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enabledynamicloading -->
<EnableDynamicLoading>true</EnableDynamicLoading>
diff --git a/src/app/dev/DevToys.UI.Framework/DevToys.UI.Framework.csproj b/src/app/dev/DevToys.UI.Framework/DevToys.UI.Framework.csproj
index 601561fa0..f5435c13b 100644
--- a/src/app/dev/DevToys.UI.Framework/DevToys.UI.Framework.csproj
+++ b/src/app/dev/DevToys.UI.Framework/DevToys.UI.Framework.csproj
@@ -10,7 +10,6 @@
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
- <IsUWP>false</IsUWP>
<IsWasm>false</IsWasm>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>
@@ -46,7 +45,6 @@
<When Condition="'$(TargetFramework)' == '$(NetCoreWindows)'">
<PropertyGroup>
- <IsUWP>true</IsUWP>
<DefineConstants>$(DefineConstants);__WINDOWS__</DefineConstants>
<TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/src/app/dev/DevToys.UI/DevToys.UI.csproj b/src/app/dev/DevToys.UI/DevToys.UI.csproj
index e64eb60a4..9b17c9b49 100644
--- a/src/app/dev/DevToys.UI/DevToys.UI.csproj
+++ b/src/app/dev/DevToys.UI/DevToys.UI.csproj
@@ -10,7 +10,6 @@
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
- <IsUWP>false</IsUWP>
<IsWasm>false</IsWasm>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>
@@ -46,7 +45,6 @@
<When Condition="'$(TargetFramework)' == '$(NetCoreWindows)'">
<PropertyGroup>
- <IsUWP>true</IsUWP>
<DefineConstants>$(DefineConstants);__WINDOWS__</DefineConstants>
<TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs b/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs
new file mode 100644
index 000000000..dc4695b20
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs
@@ -0,0 +1,22 @@
+using DevToys.Core.Settings;
+
+namespace DevToys.CLI.Core.Settings;
+
+[Export(typeof(ISettingsStorage))]
+internal sealed class SettingsStorage : ISettingsStorage
+{
+ public void ResetSetting(string settingName)
+ {
+ throw new NotImplementedException();
+ }
+
+ public bool TryReadSetting(string settingName, out object? value)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void WriteSetting(string settingName, object? value)
+ {
+ throw new NotImplementedException();
+ }
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Core/Settings/SettingsStorage.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Core/Settings/SettingsStorage.cs
new file mode 100644
index 000000000..41449cc60
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Core/Settings/SettingsStorage.cs
@@ -0,0 +1,29 @@
+using DevToys.Core.Settings;
+
+namespace DevToys.MauiBlazor.Core.Settings;
+
+[Export(typeof(ISettingsStorage))]
+internal sealed class SettingsStorage : ISettingsStorage
+{
+ public void ResetSetting(string settingName)
+ {
+ Preferences.Default.Remove(settingName);
+ }
+
+ public bool TryReadSetting(string settingName, out object? value)
+ {
+ if (Preferences.Default.ContainsKey(settingName))
+ {
+ value = Preferences.Default.Get<object?>(settingName, default);
+ return true;
+ }
+
+ value = null;
+ return false;
+ }
+
+ public void WriteSetting(string settingName, object? value)
+ {
+ Preferences.Default.Set(settingName, value);
+ }
+}
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj
index 8f4e85a61..e0d14d7d8 100644
--- a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetMacCatalyst)</TargetFrameworks>
<!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->
@@ -26,6 +26,9 @@
<CreatePackage>false</CreatePackage>
<DefineConstants>TRACE;__MACCATALYST__</DefineConstants>
</PropertyGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\desktop\windows\DevToys.Wasdk\Core\Settings\SettingsStorage.cs" Link="Core\Settings\SettingsStorage.cs" />
+ </ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.WinUI"/>
<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'"/>
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Wasdk/Core/Settings/SettingsStorage.cs b/src/app/dev/platforms/desktop/windows/DevToys.Wasdk/Core/Settings/SettingsStorage.cs
new file mode 100644
index 000000000..918010f76
--- /dev/null
+++ b/src/app/dev/platforms/desktop/windows/DevToys.Wasdk/Core/Settings/SettingsStorage.cs
@@ -0,0 +1,32 @@
+using DevToys.Core.Settings;
+using Windows.Storage;
+
+namespace DevToys.Wasdk.Core.Settings;
+
+[Export(typeof(ISettingsStorage))]
+internal sealed class SettingsStorage : ISettingsStorage
+{
+ private readonly ApplicationDataContainer _localSettings = ApplicationData.Current.LocalSettings;
+
+ public void ResetSetting(string settingName)
+ {
+ _localSettings.Values.Remove(settingName);
+ }
+
+ public bool TryReadSetting(string settingName, out object? value)
+ {
+ if (_localSettings.Values.ContainsKey(settingName))
+ {
+ value = _localSettings.Values[settingName];
+ return true;
+ }
+
+ value = null;
+ return false;
+ }
+
+ public void WriteSetting(string settingName, object? value)
+ {
+ _localSettings.Values[settingName] = value;
+ }
+}
diff --git a/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj b/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj
index b8997f519..21cc04014 100644
--- a/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj
+++ b/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj
@@ -25,6 +25,9 @@
<ItemGroup>
<UpToDateCheckInput Include="..\..\..\DevToys.UI\**\*.xaml" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\desktop\windows\DevToys.Wasdk\Core\Settings\SettingsStorage.cs" Link="Core\Settings\SettingsStorage.cs" />
+ </ItemGroup>
<ItemGroup>
<EmbeddedResource Include="WasmCSS\Fonts.css" />
<EmbeddedResource Include="WasmScripts\AppManifest.js" />
diff --git a/src/app/dev/shared/App.xaml.cs b/src/app/dev/shared/App.xaml.cs
index 0b69cfc69..a18fcd27c 100644
--- a/src/app/dev/shared/App.xaml.cs
+++ b/src/app/dev/shared/App.xaml.cs
@@ -1,13 +1,20 @@
-using DevToys.UI;
+using DevToys.Api;
+using DevToys.Api.Core.Threading;
+using DevToys.Core.Mef;
+using DevToys.Core.Settings;
+using DevToys.UI;
using DevToys.UI.Views;
using Microsoft.Extensions.Logging;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.Core;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
+using Uno.Extensions;
+using Uno.Logging;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.Core;
using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
+using UnhandledExceptionEventArgs = Microsoft.UI.Xaml.UnhandledExceptionEventArgs;
namespace DevToys;
@@ -16,6 +23,12 @@ namespace DevToys;
/// </summary>
public sealed partial class App : Application
{
+ // Always keep an instance of MefComposer alive so GC doesn't purge it.
+ private readonly Task<MefComposer> _mefComposer;
+
+ private readonly Task<IMefProvider> _mefProvider;
+ private readonly AsyncLazy<ISettingsProvider> _settingsProvider;
+
private Window? _window;
/// <summary>
@@ -26,11 +39,20 @@ public sealed partial class App : Application
{
InitializeLogging();
+ this.UnhandledException += OnUnhandledException;
+
this.InitializeComponent();
#if HAS_UNO || NETFX_CORE
this.Suspending += OnSuspending;
#endif
+
+ _mefComposer = Task.Run(() => new MefComposer());
+ _mefProvider = Task.Run(async () =>
+ {
+ return (await _mefComposer).Provider;
+ });
+ _settingsProvider = new AsyncLazy<ISettingsProvider>(async () => (await _mefProvider).Import<ISettingsProvider>());
}
/// <summary>
@@ -38,7 +60,7 @@ public sealed partial class App : Application
/// will be used such as when the application is launched to open a specific file.
/// </summary>
/// <param name="args">Details about the launch request and process.</param>
- protected override void OnLaunched(LaunchActivatedEventArgs args)
+ protected override async void OnLaunched(LaunchActivatedEventArgs args)
{
#if DEBUG
if (Debugger.IsAttached)
@@ -46,9 +68,13 @@ public sealed partial class App : Application
// this.DebugSettings.EnableFrameRateCounter = true;
}
#endif
- // Set the language of the app for startup. By default, it's the same than Windows, or english.
- // The language defined by the user will be applied later, once MEF is loaded, but before the UI shows up.
- LanguageManager.Instance.SetCurrentCulture(LanguageManager.Instance.AvailableLanguages[0]);
+
+ // Set the user-defined language.
+ string? languageIdentifier = (await _settingsProvider.GetValueAsync()).GetSetting(PredefinedSettings.Language);
+ LanguageDefinition languageDefinition
+ = LanguageManager.Instance.AvailableLanguages.FirstOrDefault(l => string.Equals(l.InternalName, languageIdentifier))
+ ?? LanguageManager.Instance.AvailableLanguages[0];
+ LanguageManager.Instance.SetCurrentCulture(languageDefinition);
#if NET6_0_OR_GREATER && WINDOWS && !HAS_UNO
_window = new Window();
@@ -130,6 +156,19 @@ public sealed partial class App : Application
deferral.Complete();
}
+ private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
+ {
+ ILogger logger = this.Log();
+ if (logger.IsEnabled(LogLevel.Error))
+ {
+ logger.Error($"Unhandled exception !!!", e.Exception);
+ }
+
+ // TODO:
+ // Maybe we need to dispose all tools in case if they have on-going work so they have a chance to finish correctly?
+ // Also, use IMarketingService to NotifyAppEncounteredAProblemAsync ?
+ }
+
/// <summary>
/// Configures global Uno Platform logging
/// </summary>
diff --git a/src/app/tests/DevToys.UnitTests/Core/Threading/AsyncLazyTests.cs b/src/app/tests/DevToys.UnitTests/Core/Threading/AsyncLazyTests.cs
new file mode 100644
index 000000000..3257c18fa
--- /dev/null
+++ b/src/app/tests/DevToys.UnitTests/Core/Threading/AsyncLazyTests.cs
@@ -0,0 +1,71 @@
+using System.Threading.Tasks;
+using DevToys.Api.Core.Threading;
+
+namespace DevToys.UnitTests.Core.Threading;
+
+public class AsyncLazyTests
+{
+ [Fact]
+ public async Task AccurateResultAsync()
+ {
+ var expected = new TestClass(5);
+ var lazy = new AsyncLazy<TestClass>(async () =>
+ {
+ await Task.Yield();
+ return expected;
+ });
+
+ TestClass actual = await lazy.GetValueAsync();
+ Assert.Same(expected, actual);
+ }
+
+ [Fact]
+ public async Task IsValueCreatedAsync()
+ {
+ var tcs = new TaskCompletionSource<bool>();
+ var lazy = new AsyncLazy<TestClass>(async () =>
+ {
+ await tcs.Task;
+ return new TestClass(5);
+ });
+
+ Assert.False(lazy.IsValueCreated);
+ Task<TestClass> resultTask = lazy.GetValueAsync();
+ Assert.False(lazy.IsValueCreated);
+ tcs.SetResult(true);
+ await resultTask;
+ Assert.True(lazy.IsValueCreated);
+ Assert.Equal(5, (await resultTask).Value);
+ }
+
+ [Fact]
+ public void BadArguments()
+ {
+ Assert.Throws<ArgumentNullException>(() => new AsyncLazy<object>(null));
+ }
+
+ public class TestClass
+ {
+ public int Value { get; }
+
+ public TestClass(int value)
+ {
+ Value = value;
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (obj is TestClass other)
+ {
+ return Value == other.Value;
+ }
+
+ return false;
+ }
+
+ public override int GetHashCode()
+ {
+ return Value;
+ }
+ }
+}
diff --git a/src/build/Build.cs b/src/build/Build.cs
index d487be4bd..01390f84a 100644
--- a/src/build/Build.cs
+++ b/src/build/Build.cs
@@ -58,7 +58,7 @@ class Build : NukeBuild
if (PlatformTargets.Contains(PlatformTarget.Windows) && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 0, 0))
{
- Assert.Fail("To build Windows UWP app, you need to run on Windows 10 or later.");
+ Assert.Fail("To build Windows WASDK app, you need to run on Windows 10 or later.");
return;
}