A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Small API improvement
Etienne Baudoux2a8f6ba96d35
diff --git a/README.md b/README.mdindex 83bca5ea6..03f650177 100644--- a/README.md+++ b/README.md@@ -50,7 +50,7 @@ See [LICENSE](LICENSE.md)### A few words regarding the license-DevToys is using a license that permits redistribution of the app as trialware or shareware without changes. However, the authors [Etienne BAUDOUX](https://github.com/veler) and [BenjaminT](https://github.com/btiteux) would prefer you not. If you believe you have a strong reason to do so, kindly reach out to discuss with us first.+DevToys is using a license that permits redistribution of the app as trialware or shareware without changes. However, the authors [Etienne Baudoux](https://github.com/veler) and [BenjaminT](https://github.com/btiteux) would prefer you not. If you believe you have a strong reason to do so, kindly reach out to discuss with us first.## Special Thanksdiff --git a/src/app/dev/DevToys.Api/Core/IFileStorage.cs b/src/app/dev/DevToys.Api/Core/IFileStorage.csindex ce92b6e07..063f6e6c7 100644--- a/src/app/dev/DevToys.Api/Core/IFileStorage.cs+++ b/src/app/dev/DevToys.Api/Core/IFileStorage.cs@@ -17,7 +17,7 @@ public interface IFileStorage/// </summary>/// <param name="fileTypes">The list of file types the user can choose. For example, ".txt". Use "*" for any file type.</param>/// <returns>If succeeded, returns a write-only stream corresponding to the file the user selected, otherwise, returns null.</returns>- ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes);+ ValueTask<Stream?> PickSaveFileAsync(params string[] fileTypes);/// <summary>/// Prompt the user to select a file to open.@@ -25,7 +25,7 @@ public interface IFileStorage/// <remarks>The returned items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>/// <param name="fileTypes">The list of file types the user can choose. For example, ".txt". Use "*" for any file type.</param>/// <returns>If succeeded, returns a read-only stream corresponding to the file the user selected, otherwise, returns null.</returns>- ValueTask<PickedFile?> PickOpenFileAsync(string[] fileTypes);+ ValueTask<PickedFile?> PickOpenFileAsync(params string[] fileTypes);/// <summary>/// Prompt the user to select many files to open.@@ -33,7 +33,7 @@ public interface IFileStorage/// <remarks>The returned items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>/// <param name="fileTypes">The list of file types the user can choose. For example, ".txt". Use "*" for any file type.</param>/// <returns>If succeeded, returns a read-only stream corresponding to the file the user selected, otherwise, returns null.</returns>- ValueTask<PickedFile[]> PickOpenFilesAsync(string[] fileTypes);+ ValueTask<PickedFile[]> PickOpenFilesAsync(params string[] fileTypes);/// <summary>/// Prompt the user to select a folder.@@ -43,6 +43,7 @@ public interface IFileStorage/// <summary>/// Determines whether the file indicated by the given <paramref name="relativeOrAbsoluteFilePath"/> exists.+ /// If a relative path is indicated, use the <see cref="AppCacheDirectory"/> as working directory./// </summary>/// <param name="relativeOrAbsoluteFilePath">The path to the file to check.</param>/// <returns>Returns true if the file exist</returns>diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.csindex 3fc3c86f5..4252484bd 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.cs@@ -122,7 +122,6 @@ internal sealed class UIButton : UIElement, IUIButtonpublic event EventHandler? TextChanged;public event EventHandler? IsAccentChanged;- public event EventHandler? IsHyperlinkChanged;public event EventHandler? IconFontNameChanged;public event EventHandler? IconGlyphChanged;}diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.csindex d34cc6d6e..c86789ae2 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs@@ -200,4 +200,16 @@ public static partial class GUI((UIList)element).CanSelectItem = false;return element;}++ /// <summary>+ /// Removes the first occurrence of an <see cref="IUIListItem"/> where <see cref="IUIListItem.Value"/> match the given <paramref name="value"/>.+ /// </summary>+ public static void RemoveValue(this ObservableCollection<IUIListItem> listItems, object? value)+ {+ IUIListItem? item = listItems.FirstOrDefault(item => item.Value == value);+ if (item is not null)+ {+ listItems.Remove(item);+ }+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.csindex 432c47956..3ef252d26 100644--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs@@ -206,6 +206,7 @@ public abstract class SelectBase<TElement> : JSStyledComponentBase where TElemenprivate void OnItemsChanged(object? sender, NotifyCollectionChangedEventArgs e){SetSelectedItem(SelectedItem, raiseEvent: false);+ StateHasChanged();}protected void OnItemClick(object? selectedItem)diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.csindex bdd81a954..885463617 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs@@ -10,6 +10,14 @@ public partial class MonacoEditor : RicherMonacoEditorBaseprivate bool _oldIsActuallyEnabled;private bool _oldReadOnlyState;+#pragma warning disable IDE0044 // Add readonly modifier+ [Import]+ private IThemeListener _themeListener = default!;++ [Import]+ private ISettingsProvider _settingsProvider = default!;+#pragma warning restore IDE0044 // Add readonly modifier+public MonacoEditor(){}@@ -25,12 +33,6 @@ public partial class MonacoEditor : RicherMonacoEditorBaseClass = @class ?? string.Empty;}- [Import]- internal IThemeListener ThemeListener { get; set; } = default!;-- [Import]- internal ISettingsProvider SettingsProvider { get; set; } = default!;-[Parameter]public string? Header { get; set; }@@ -43,8 +45,8 @@ public partial class MonacoEditor : RicherMonacoEditorBase{base.OnInitialized();- ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;- SettingsProvider.SettingChanged += SettingsProvider_SettingChanged;+ _themeListener.ThemeChanged += ThemeListener_ThemeChanged;+ _settingsProvider.SettingChanged += SettingsProvider_SettingChanged;_oldIsActuallyEnabled = IsActuallyEnabled;}@@ -77,11 +79,11 @@ public partial class MonacoEditor : RicherMonacoEditorBaseoptions.RenderLineHighlightOnlyWhenFocus = true;// Apply global user settings- options.FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont);- options.WordWrap = SettingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off";- options.LineNumbers = SettingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off";- options.RenderLineHighlight = SettingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none";- options.RenderWhitespace = SettingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none";+ options.FontFamily = _settingsProvider.GetSetting(PredefinedSettings.TextEditorFont);+ options.WordWrap = _settingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off";+ options.LineNumbers = _settingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off";+ options.RenderLineHighlight = _settingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none";+ options.RenderWhitespace = _settingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none";// Create the editorawait MonacoEditorHelper.CreateMonacoEditorInstanceAsync(JSRuntime, Id, options, null, Reference);@@ -111,14 +113,14 @@ public partial class MonacoEditor : RicherMonacoEditorBasepublic override ValueTask DisposeAsync(){- if (ThemeListener is not null)+ if (_themeListener is not null){- ThemeListener.ThemeChanged -= ThemeListener_ThemeChanged;+ _themeListener.ThemeChanged -= ThemeListener_ThemeChanged;}- if (SettingsProvider is not null)+ if (_settingsProvider is not null){- SettingsProvider.SettingChanged -= SettingsProvider_SettingChanged;+ _settingsProvider.SettingChanged -= SettingsProvider_SettingChanged;}return base.DisposeAsync();@@ -139,11 +141,11 @@ public partial class MonacoEditor : RicherMonacoEditorBase{var options = new EditorUpdateOptions(){- FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont),- WordWrap = SettingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off",- LineNumbers = SettingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off",- RenderLineHighlight = SettingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none",- RenderWhitespace = SettingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none"+ FontFamily = _settingsProvider.GetSetting(PredefinedSettings.TextEditorFont),+ WordWrap = _settingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off",+ LineNumbers = _settingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off",+ RenderLineHighlight = _settingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none",+ RenderWhitespace = _settingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none"};UpdateOptionsAsync(options);@@ -161,8 +163,8 @@ public partial class MonacoEditor : RicherMonacoEditorBaseprivate string GetTheme(){- Guard.IsNotNull(ThemeListener);- return ThemeListener.ActualAppTheme == ApplicationTheme.Dark ? BuiltinTheme.VsDark : BuiltinTheme.Vs;+ Guard.IsNotNull(_themeListener);+ return _themeListener.ActualAppTheme == ApplicationTheme.Dark ? BuiltinTheme.VsDark : BuiltinTheme.Vs;}private async Task DisplayLoadingIfSlowLoadingAsync()diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.csindex 194b3be9f..0b567083b 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs@@ -10,11 +10,13 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBaseprivate bool _oldIsActuallyEnabled;private bool _oldReadOnlyState;+#pragma warning disable IDE0044 // Add readonly modifier[Import]- internal IThemeListener ThemeListener { get; set; } = default!;+ private IThemeListener _themeListener = default!;[Import]- internal ISettingsProvider SettingsProvider { get; set; } = default!;+ private ISettingsProvider _settingsProvider = default!;+#pragma warning restore IDE0044 // Add readonly modifier[Parameter]public string? Header { get; set; }@@ -28,8 +30,8 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBase{base.OnInitialized();- ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;- SettingsProvider.SettingChanged += SettingsProvider_SettingChanged;+ _themeListener.ThemeChanged += ThemeListener_ThemeChanged;+ _settingsProvider.SettingChanged += SettingsProvider_SettingChanged;_oldIsActuallyEnabled = IsActuallyEnabled;}@@ -66,11 +68,11 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBaseoptions.RenderOverviewRuler = true;// Apply global user settings- options.FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont);- options.WordWrap = SettingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off";- options.LineNumbers = SettingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off";- options.RenderLineHighlight = SettingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none";- options.RenderWhitespace = SettingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none";+ options.FontFamily = _settingsProvider.GetSetting(PredefinedSettings.TextEditorFont);+ options.WordWrap = _settingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off";+ options.LineNumbers = _settingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off";+ options.RenderLineHighlight = _settingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none";+ options.RenderWhitespace = _settingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none";// Create the bridges for the inner editors_originalEditor = MonacoEditorHelper.CreateVirtualEditor(JSRuntime, Id + "_original");@@ -115,14 +117,14 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBasepublic override ValueTask DisposeAsync(){- if (ThemeListener is not null)+ if (_themeListener is not null){- ThemeListener.ThemeChanged -= ThemeListener_ThemeChanged;+ _themeListener.ThemeChanged -= ThemeListener_ThemeChanged;}- if (SettingsProvider is not null)+ if (_settingsProvider is not null){- SettingsProvider.SettingChanged -= SettingsProvider_SettingChanged;+ _settingsProvider.SettingChanged -= SettingsProvider_SettingChanged;}return base.DisposeAsync();@@ -143,11 +145,11 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBase{var options = new DiffEditorOptions(){- FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont),- WordWrap = SettingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off",- LineNumbers = SettingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off",- RenderLineHighlight = SettingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none",- RenderWhitespace = SettingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none"+ FontFamily = _settingsProvider.GetSetting(PredefinedSettings.TextEditorFont),+ WordWrap = _settingsProvider.GetSetting(PredefinedSettings.TextEditorTextWrapping) ? "on" : "off",+ LineNumbers = _settingsProvider.GetSetting(PredefinedSettings.TextEditorLineNumbers) ? "on" : "off",+ RenderLineHighlight = _settingsProvider.GetSetting(PredefinedSettings.TextEditorHighlightCurrentLine) ? "all" : "none",+ RenderWhitespace = _settingsProvider.GetSetting(PredefinedSettings.TextEditorRenderWhitespace) ? "all" : "none"};UpdateOptionsAsync(options);@@ -160,8 +162,8 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBaseprivate string GetTheme(){- Guard.IsNotNull(ThemeListener);- return ThemeListener.ActualAppTheme == ApplicationTheme.Dark ? BuiltinTheme.VsDark : BuiltinTheme.Vs;+ Guard.IsNotNull(_themeListener);+ return _themeListener.ActualAppTheme == ApplicationTheme.Dark ? BuiltinTheme.VsDark : BuiltinTheme.Vs;}private async Task DisplayLoadingIfSlowLoadingAsync()diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.csindex 98c2cbf45..663194640 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs@@ -42,11 +42,13 @@ public partial class TextBox : MefComponentBase, IFocusableprotected override string JavaScriptFile => "./_content/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.js";+#pragma warning disable IDE0044 // Add readonly modifier[Import]- internal IClipboard Clipboard { get; set; } = default!;+ private IClipboard _clipboard = default!;[Import]- internal ISettingsProvider SettingsProvider { get; set; } = default!;+ private ISettingsProvider _settingsProvider = default!;+#pragma warning restore IDE0044 // Add readonly modifier[Parameter]public string? Text { get; set; }@@ -93,7 +95,7 @@ public partial class TextBox : MefComponentBase, IFocusableprotected override void OnInitialized(){base.OnInitialized();- SettingsProvider.SettingChanged += SettingsProvider_SettingChanged;+ _settingsProvider.SettingChanged += SettingsProvider_SettingChanged;}public ValueTask<bool> FocusAsync()@@ -105,9 +107,9 @@ public partial class TextBox : MefComponentBase, IFocusablepublic override async ValueTask DisposeAsync(){- if (SettingsProvider is not null)+ if (_settingsProvider is not null){- SettingsProvider.SettingChanged -= SettingsProvider_SettingChanged;+ _settingsProvider.SettingChanged -= SettingsProvider_SettingChanged;}try@@ -252,13 +254,13 @@ public partial class TextBox : MefComponentBase, IFocusableTextSpan selection = await GetSelectionAsync();string textToCopy = Text.Substring(selection.StartPosition, selection.Length);- await Clipboard.SetClipboardTextAsync(textToCopy);+ await _clipboard.SetClipboardTextAsync(textToCopy);}}private async Task OnPasteAsync(DropDownListItem _){- string? clipboardDataString = await Clipboard.GetClipboardTextAsync();+ string? clipboardDataString = await _clipboard.GetClipboardTextAsync();if (clipboardDataString is not null){TextSpan selection = await GetSelectionAsync();@@ -289,6 +291,6 @@ public partial class TextBox : MefComponentBase, IFocusableprivate void SettingsProvider_SettingChanged(object? sender, SettingChangedEventArgs e){- FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont);+ FontFamily = _settingsProvider.GetSetting(PredefinedSettings.TextEditorFont);}}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.csindex b34fe37f9..2a195b607 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs@@ -10,11 +10,13 @@ public partial class UIFileSelectorPresenter : MefComponentBaseprotected string InputFileId => UIFileSelector.Id + "-" + Id + "-InputFile";+#pragma warning disable IDE0044 // Add readonly modifier[Import]- internal IClipboard Clipboard { get; set; } = default!;+ private IClipboard _clipboard = default!;[Import]- internal IFileStorage FileStorage { get; set; } = default!;+ private IFileStorage _fileStorage = default!;+#pragma warning restore IDE0044 // Add readonly modifier[Parameter]public IUIFileSelector UIFileSelector { get; set; } = default!;@@ -127,11 +129,11 @@ public partial class UIFileSelectorPresenter : MefComponentBasePickedFile[] pickedFiles;if (UIFileSelector.CanSelectManyFiles){- pickedFiles = await FileStorage.PickOpenFilesAsync(fileTypes);+ pickedFiles = await _fileStorage.PickOpenFilesAsync(fileTypes);}else{- PickedFile? pickedFile = await FileStorage.PickOpenFileAsync(fileTypes);+ PickedFile? pickedFile = await _fileStorage.PickOpenFileAsync(fileTypes);if (pickedFile != null){pickedFiles = new[] { pickedFile };@@ -151,7 +153,7 @@ public partial class UIFileSelectorPresenter : MefComponentBaseprivate async Task OnBrowseFoldersButtonClickAsync(){var files = new List<PickedFile>();- string? selectedFolder = await FileStorage.PickFolderAsync();+ string? selectedFolder = await _fileStorage.PickFolderAsync();if (!string.IsNullOrWhiteSpace(selectedFolder)){@@ -186,7 +188,7 @@ public partial class UIFileSelectorPresenter : MefComponentBaseprivate async Task OnPasteButtonClickAsync(){// TODO: Support image (format tbd) + file list.- await Clipboard.GetClipboardDataAsync();+ await _clipboard.GetClipboardDataAsync();}private string[] GetTreatedFileExtensions()diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.csindex a6dd8d5a2..f379c8110 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs@@ -42,16 +42,16 @@ public partial class UITextInputWrapper : MefComponentBaseprotected override string? JavaScriptFile => "./_content/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js";[Import]- internal SmartDetectionService SmartDetectionService { get; set; } = default!;+ private SmartDetectionService _smartDetectionService = default!;[Import]- internal IClipboard Clipboard { get; set; } = default!;+ private IClipboard _clipboard = default!;[Import]- internal IFileStorage FileStorage { get; set; } = default!;+ private IFileStorage _fileStorage = default!;[Import]- internal ISettingsProvider SettingsProvider { get; set; } = default!;+ private ISettingsProvider _settingsProvider = default!;[Parameter]public IUISingleLineTextInput UITextInput { get; set; } = default!;@@ -163,10 +163,10 @@ public partial class UITextInputWrapper : MefComponentBaseprivate async Task OnPasteButtonClickAsync(){- string? clipboardString = await Clipboard.GetClipboardTextAsync();+ string? clipboardString = await _clipboard.GetClipboardTextAsync();if (clipboardString is not null){- if (SettingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText))+ if (_settingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText)){UITextInput.Text(clipboardString);}@@ -184,7 +184,7 @@ public partial class UITextInputWrapper : MefComponentBasePickedFile? pickedFile = null;try{- pickedFile = await FileStorage.PickOpenFileAsync(fileTypes);+ pickedFile = await _fileStorage.PickOpenFileAsync(fileTypes);if (pickedFile is not null){await LoadFileAsync(pickedFile.Stream);@@ -209,7 +209,7 @@ public partial class UITextInputWrapper : MefComponentBaseStream? fileStream = null;try{- fileStream = await FileStorage.PickSaveFileAsync(new[] { "*.*" });+ fileStream = await _fileStorage.PickSaveFileAsync(new[] { "*.*" });if (fileStream is not null){await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(CancellationToken.None);@@ -257,7 +257,7 @@ public partial class UITextInputWrapper : MefComponentBaseprivate void OnCopyButtonClick(){- Clipboard.SetClipboardTextAsync(UITextInput.Text).ForgetSafely();+ _clipboard.SetClipboardTextAsync(UITextInput.Text).ForgetSafely();}private async Task LoadFileAsync(Stream fileStream)@@ -347,7 +347,7 @@ public partial class UITextInputWrapper : MefComponentBase{// Detect tools to recommend.detectedTools- = await SmartDetectionService.DetectAsync(text, strict: false, cancellationToken)+ = await _smartDetectionService.DetectAsync(text, strict: false, cancellationToken).ConfigureAwait(true);await InvokeAsync(() =>diff --git a/src/app/dev/DevToys.Blazor/Pages/MainLayout.razor.cs b/src/app/dev/DevToys.Blazor/Pages/MainLayout.razor.csindex 6e0c3d2e3..f860227ae 100644--- a/src/app/dev/DevToys.Blazor/Pages/MainLayout.razor.cs+++ b/src/app/dev/DevToys.Blazor/Pages/MainLayout.razor.cs@@ -5,17 +5,19 @@ namespace DevToys.Blazor.Pages;public partial class MainLayout : LayoutComponentBase{- [Inject]- protected IMefProvider MefProvider { get; set; } = default!;-+#pragma warning disable IDE0044 // Add readonly modifier[Import]- private IThemeListener ThemeListener { get; set; } = default!;+ private IThemeListener _themeListener = default!;[Import]- private ISettingsProvider SettingsProvider { get; set; } = default!;+ private ISettingsProvider _settingsProvider = default!;[Import]- private IFontProvider FontProvider { get; set; } = default!;+ private IFontProvider _fontProvider = default!;+#pragma warning restore IDE0044 // Add readonly modifier++ [Inject]+ protected IMefProvider MefProvider { get; set; } = default!;[Inject]internal FontService FontService { get; set; } = default!;@@ -50,7 +52,7 @@ public partial class MainLayout : LayoutComponentBase{if (firstRender){- ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;+ _themeListener.ThemeChanged += ThemeListener_ThemeChanged;ApplyTheme();}@@ -68,7 +70,7 @@ public partial class MainLayout : LayoutComponentBaseClass = "theme-transition";string themeName;- if (ThemeListener.ActualAppTheme == ApplicationTheme.Dark)+ if (_themeListener.ActualAppTheme == ApplicationTheme.Dark){if (OperatingSystem.IsWindows()){@@ -92,8 +94,8 @@ public partial class MainLayout : LayoutComponentBase}ThemeName = themeName;- IsCompactMode = ThemeListener.IsCompactMode;- UserIsCompactModePreference = ThemeListener.UserIsCompactModePreference;+ IsCompactMode = _themeListener.IsCompactMode;+ UserIsCompactModePreference = _themeListener.UserIsCompactModePreference;StateHasChanged();Task.Delay(1000).ContinueWith(t =>@@ -108,15 +110,15 @@ public partial class MainLayout : LayoutComponentBaseprivate void SetDefaultTextEditorFont(){- string? currentFontName = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont); // By default, the value is null.- string[] systemFontFamilies = FontProvider.GetFontFamilies();+ string? currentFontName = _settingsProvider.GetSetting(PredefinedSettings.TextEditorFont); // By default, the value is null.+ string[] systemFontFamilies = _fontProvider.GetFontFamilies();if (!systemFontFamilies.Contains(currentFontName)){for (int i = 0; i < PredefinedSettings.DefaultFonts.Length; i++){if (systemFontFamilies.Contains(PredefinedSettings.DefaultFonts[i])){- SettingsProvider.SetSetting(PredefinedSettings.TextEditorFont, PredefinedSettings.DefaultFonts[i]);+ _settingsProvider.SetSetting(PredefinedSettings.TextEditorFont, PredefinedSettings.DefaultFonts[i]);return;}}diff --git a/src/app/dev/DevToys.Core/Logging/FileLoggerProvider.cs b/src/app/dev/DevToys.Core/Logging/FileLoggerProvider.csindex 62ac2accb..57ebf003e 100644--- a/src/app/dev/DevToys.Core/Logging/FileLoggerProvider.cs+++ b/src/app/dev/DevToys.Core/Logging/FileLoggerProvider.cs@@ -6,6 +6,8 @@ namespace DevToys.Core.Logging;[ProviderAlias("File")]internal sealed class FileLoggerProvider : ILoggerProvider{+ private const string LogFolderName = "Logs";+private readonly ConcurrentDictionary<string, FileLogger> _loggers = new();private readonly BlockingCollection<string> _entryQueue = new(1024);private readonly Task _processQueueTask;@@ -23,7 +25,7 @@ internal sealed class FileLoggerProvider : ILoggerProvider// Create log file for the current instance.string logFileName = $"log-{DateTime.Now.ToString("s").Replace(":", string.Empty).Replace("-", string.Empty)}.txt";- _fileStream = new(() => _fileStorage.OpenWriteFile(logFileName, replaceIfExist: true));+ _fileStream = new(() => _fileStorage.OpenWriteFile(Path.Combine(LogFolderName, logFileName), replaceIfExist: true));_textWriter = new(() => new StreamWriter(_fileStream.Value));_processQueueTask@@ -111,12 +113,16 @@ internal sealed class FileLoggerProvider : ILoggerProvider{try{- foreach (string logFilePath in Directory.EnumerateFiles(_fileStorage.AppCacheDirectory, "log-*.txt", SearchOption.TopDirectoryOnly))+ string logFolder = Path.Combine(_fileStorage.AppCacheDirectory, LogFolderName);+ if (Directory.Exists(logFolder)){- var fileInfo = new FileInfo(logFilePath);- if (DateTime.Now - fileInfo.LastWriteTime > TimeSpan.FromDays(2))+ foreach (string logFilePath in Directory.EnumerateFiles(logFolder, "log-*.txt", SearchOption.TopDirectoryOnly)){- File.Delete(logFilePath);+ var fileInfo = new FileInfo(logFilePath);+ if (DateTime.Now - fileInfo.LastWriteTime > TimeSpan.FromDays(2))+ {+ File.Delete(logFilePath);+ }}}}diff --git a/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.csindex 1f6551187..db6533f6c 100644--- a/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.cs@@ -59,19 +59,19 @@ internal sealed class FileStorage : IFileStoragereturn File.OpenWrite(relativeOrAbsoluteFilePath);}- public ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes)+ public ValueTask<Stream?> PickSaveFileAsync(params string[] fileTypes){// TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();}- public ValueTask<PickedFile?> PickOpenFileAsync(string[] fileTypes)+ public ValueTask<PickedFile?> PickOpenFileAsync(params string[] fileTypes){// TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();}- public ValueTask<PickedFile[]> PickOpenFilesAsync(string[] fileTypes)+ public ValueTask<PickedFile[]> PickOpenFilesAsync(params string[] fileTypes){// TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Constants.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Constants.csnew file mode 100644index 000000000..13f7ef255--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Constants.cs@@ -0,0 +1,10 @@+using System.IO;++namespace DevToys.MacOS.Core;++internal static class Constants+{+ internal static readonly string AppCacheDirectory = Path.Combine(FileSystem.CacheDirectory, "com.etiennebaudoux.devtoys");++ internal static string PluginInstallationFolder => Path.Combine(AppCacheDirectory, "Plugins");+}diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.csindex 7b3e1af90..db4f7660b 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs@@ -7,7 +7,7 @@ namespace DevToys.MacOS.Core;[Export(typeof(IFileStorage))]internal sealed class FileStorage : IFileStorage{- public string AppCacheDirectory => Path.Combine(FileSystem.CacheDirectory, "com.etiennebaudoux.devtoys");+ public string AppCacheDirectory => Constants.AppCacheDirectory;public bool FileExists(string relativeOrAbsoluteFilePath){diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/Constants.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Constants.csnew file mode 100644index 000000000..cccbf073c--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Constants.cs@@ -0,0 +1,10 @@+using System.IO;++namespace DevToys.Windows.Core;++internal static class Constants+{+ internal static readonly string AppCacheDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DevToys");++ internal static string PluginInstallationFolder => Path.Combine(AppCacheDirectory, "Plugins");+}diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.csindex 8464bef9b..fd8693170 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs@@ -11,7 +11,7 @@ namespace DevToys.Windows.Core;[Export(typeof(IFileStorage))]internal sealed class FileStorage : IFileStorage{- public string AppCacheDirectory => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DevToys");+ public string AppCacheDirectory => Constants.AppCacheDirectory;public bool FileExists(string relativeOrAbsoluteFilePath){@@ -59,7 +59,7 @@ internal sealed class FileStorage : IFileStoragereturn File.OpenWrite(relativeOrAbsoluteFilePath);}- public async ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes)+ public async ValueTask<Stream?> PickSaveFileAsync(params string[] fileTypes){return await ThreadHelper.RunOnUIThreadAsync(() =>{@@ -90,7 +90,7 @@ internal sealed class FileStorage : IFileStorage});}- public async ValueTask<PickedFile?> PickOpenFileAsync(string[] fileTypes)+ public async ValueTask<PickedFile?> PickOpenFileAsync(params string[] fileTypes){return await ThreadHelper.RunOnUIThreadAsync(() =>{@@ -116,7 +116,7 @@ internal sealed class FileStorage : IFileStorage});}- public async ValueTask<PickedFile[]> PickOpenFilesAsync(string[] fileTypes)+ public async ValueTask<PickedFile[]> PickOpenFilesAsync(params string[] fileTypes){return await ThreadHelper.RunOnUIThreadAsync(() =>{diff --git a/src/app/dev/shared/SharedAssemblyInfo.cs b/src/app/dev/shared/SharedAssemblyInfo.csindex fe65db90c..098327531 100644--- a/src/app/dev/shared/SharedAssemblyInfo.cs+++ b/src/app/dev/shared/SharedAssemblyInfo.cs@@ -15,9 +15,9 @@ using System.Runtime.CompilerServices;// associated with an assembly.[assembly: AssemblyDescription("")][assembly: AssemblyConfiguration("")]-[assembly: AssemblyCompany("Etienne BAUDOUX")]+[assembly: AssemblyCompany("Etienne Baudoux")][assembly: AssemblyProduct("DevToys")]-[assembly: AssemblyCopyright("© Etienne BAUDOUX. All rights reserved.")]+[assembly: AssemblyCopyright("© Etienne Baudoux. All rights reserved.")][assembly: AssemblyTrademark("")][assembly: AssemblyCulture("")]diff --git a/src/app/dev/shared/SharedAssemblyVersion.cs b/src/app/dev/shared/SharedAssemblyVersion.csindex 2aba0ef88..d77ea9319 100644--- a/src/app/dev/shared/SharedAssemblyVersion.cs+++ b/src/app/dev/shared/SharedAssemblyVersion.cs@@ -22,6 +22,7 @@ using System.Reflection;// Please DO NOT commit changes on the 2 lines below unless// you're about to release a new version of the app on the Store.-[assembly: AssemblyVersion("0.0.0.0")]-[assembly: AssemblyFileVersion("0.0.0.0")]+[assembly: AssemblyVersion("2.0.0.0")]+[assembly: AssemblyFileVersion("2.0.0.0")]+[assembly: AssemblyInformationalVersion("2.0.0-pre.0")]diff --git a/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs b/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.csindex 91c167ff0..c19bd763e 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs@@ -24,19 +24,19 @@ internal class MockIFileStorage : IFileStoragethrow new NotImplementedException();}- public ValueTask<Stream> PickSaveFileAsync(string[] fileTypes)+ public ValueTask<Stream> PickSaveFileAsync(params string[] fileTypes){// TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();}- public ValueTask<PickedFile> PickOpenFileAsync(string[] fileTypes)+ public ValueTask<PickedFile> PickOpenFileAsync(params string[] fileTypes){// TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();}- public ValueTask<PickedFile[]> PickOpenFilesAsync(string[] fileTypes)+ public ValueTask<PickedFile[]> PickOpenFilesAsync(params string[] fileTypes){throw new NotImplementedException();}diff --git a/src/spellcheckerexclusion.dic b/src/spellcheckerexclusion.dicindex 1e4f04b1a..6b1a82afb 100644--- a/src/spellcheckerexclusion.dic+++ b/src/spellcheckerexclusion.dic@@ -2,9 +2,11 @@ devtoysBlazorAwaiterFira-wwwroot-ntdll-dwmapi-hwnd-Doesnt-monaco\ No newline at end of file+wwwroot+ntdll+dwmapi+hwnd+Doesnt+monaco+nuget+nuspecdiff --git a/tools/app-version-number.txt b/tools/app-version-number.txtindex 1f2c8da3a..de523f478 100644--- a/tools/app-version-number.txt+++ b/tools/app-version-number.txt@@ -1 +1,3 @@-0.0.0.0\ No newline at end of file+// A version like "2.0.0.+" will increment automatically.+app:2.0.0.++sdk:2.0.0-pre.+\ No newline at end of file