Skip to content

A Swiss Army knife for developers.

Added IUIList, IUIProgressBar and IUIProgressRing

Etienne Baudoux25599ef59cd6
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 2a1d03a2e..062148b08 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -29,8 +29,6 @@
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.ComponentModel.Composition" Version="$(DotNetVersion)" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
- <PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
- <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="xunit" Version="$(XUnit)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnit)" />
</ItemGroup>
diff --git a/src/app/dev/DevToys.Api/Core/LoggingExtensions.cs b/src/app/dev/DevToys.Api/Core/LoggingExtensions.cs
new file mode 100644
index 000000000..2a359268e
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Core/LoggingExtensions.cs
@@ -0,0 +1,37 @@
+using Microsoft.Extensions.Logging;
+
+namespace DevToys.Api;
+
+public static class LoggingExtensions
+{
+ private static ILoggerFactory _loggerFactory = default!;
+
+ /// <summary>
+ /// Sets the <see cref="ILoggerFactory"/>.
+ /// </summary>
+ public static ILoggerFactory LoggerFactory
+ {
+ private get => _loggerFactory;
+ set
+ {
+ Guard.IsNull(_loggerFactory);
+ Guard.IsNotNull(value);
+ _loggerFactory = value;
+ }
+ }
+
+ /// <summary>
+ /// Creates an instance of <see cref="ILogger"/> for the specified type.
+ /// </summary>
+ public static ILogger Log(this Type forType)
+ => LoggerFactory.CreateLogger(forType);
+
+ /// <summary>
+ /// Creates an instance of <see cref="ILogger"/> for the given object's type.
+ /// </summary>
+ public static ILogger Log<T>(this T instance)
+ {
+ Guard.IsNotNull(instance);
+ return instance.GetType().Log();
+ }
+}
diff --git a/src/app/dev/DevToys.Api/Core/ObservableHashSet.cs b/src/app/dev/DevToys.Api/Core/ObservableHashSet.cs
index 0c3874d8a..a650de3a1 100644
--- a/src/app/dev/DevToys.Api/Core/ObservableHashSet.cs
+++ b/src/app/dev/DevToys.Api/Core/ObservableHashSet.cs
@@ -475,12 +475,12 @@ public class ObservableHashSet<T>
/// <param name="e">Details of the change.</param>
protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
=> CollectionChanged?.Invoke(this, e);
-}
-internal static class ObservableHashSetSingletons
-{
- public static readonly PropertyChangedEventArgs CountPropertyChanged = new("Count");
- public static readonly PropertyChangingEventArgs CountPropertyChanging = new("Count");
+ private static class ObservableHashSetSingletons
+ {
+ public static readonly PropertyChangedEventArgs CountPropertyChanged = new("Count");
+ public static readonly PropertyChangingEventArgs CountPropertyChanging = new("Count");
- public static readonly object[] NoItems = Array.Empty<object>();
+ public static readonly object[] NoItems = Array.Empty<object>();
+ }
}
diff --git a/src/app/dev/DevToys.Api/Core/ThrottledProgress.cs b/src/app/dev/DevToys.Api/Core/ThrottledProgress.cs
new file mode 100644
index 000000000..9f29f8b2b
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Core/ThrottledProgress.cs
@@ -0,0 +1,64 @@
+namespace DevToys.Api;
+
+internal sealed class ThrottledProgress<T> : Progress<T>
+{
+ private readonly TimeSpan _dueTime;
+ private readonly object _locker = new();
+ private (T? Value, bool HasValue) _current;
+ private Task? _task;
+
+ public ThrottledProgress(Action<T> handler, TimeSpan dueTime)
+ : base(handler)
+ {
+ if (dueTime < TimeSpan.Zero || dueTime.TotalMilliseconds > Int32.MaxValue)
+ throw new ArgumentOutOfRangeException(nameof(dueTime));
+ _dueTime = dueTime;
+ }
+
+ protected override void OnReport(T value)
+ {
+ lock (_locker)
+ {
+ if (_task is null)
+ {
+ base.OnReport(value);
+ _task = Task.Run(async () =>
+ {
+ while (true)
+ {
+ await Task.Delay(_dueTime);
+ lock (_locker)
+ {
+ if (_current.HasValue)
+ {
+ base.OnReport(_current.Value!);
+ _current = (default, false);
+ }
+ else
+ {
+ _task = null;
+ break;
+ }
+ }
+ }
+ });
+ }
+ else
+ {
+ _current = (value, true);
+ }
+ }
+ }
+
+ public void Flush()
+ {
+ lock (_locker)
+ {
+ if (_current.HasValue)
+ {
+ base.OnReport(_current.Value!);
+ _current = (default, false);
+ }
+ }
+ }
+}
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs
new file mode 100644
index 000000000..d34cc6d6e
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs
@@ -0,0 +1,203 @@
+using System.Collections.ObjectModel;
+
+namespace DevToys.Api;
+
+/// <summary>
+/// A component that represents a list of items.
+/// </summary>
+public interface IUIList : IUIElement
+{
+ /// <summary>
+ /// Gets the list of items displayed in the list.
+ /// </summary>
+ ObservableCollection<IUIListItem> Items { get; }
+
+ /// <summary>
+ /// Gets whether items are selectable in the list. Default is true.
+ /// </summary>
+ bool CanSelectItem { get; }
+
+ /// <summary>
+ /// Gets the selected item in the list.
+ /// </summary>
+ IUIListItem? SelectedItem { get; }
+
+ /// <summary>
+ /// Gets the action to run when the user selects an item in the list.
+ /// </summary>
+ Func<IUIListItem?, ValueTask>? OnItemSelectedAction { get; }
+
+ /// <summary>
+ /// Raised when <see cref="CanSelectItem"/> is changed.
+ /// </summary>
+ event EventHandler? CanSelectItemChanged;
+
+ /// <summary>
+ /// Raised when <see cref="SelectedItem"/> is changed.
+ /// </summary>
+ event EventHandler? SelectedItemChanged;
+}
+
+[DebuggerDisplay($"Id = {{{nameof(Id)}}}, SelectedItem = {{{nameof(SelectedItem)}}}")]
+internal sealed class UIList : UIElement, IUIList, IDisposable
+{
+ private readonly ObservableCollection<IUIListItem> _items = new();
+ private IUIListItem? _selectedItem;
+ private bool _canSelectItem = true;
+
+ internal UIList(string? id)
+ : base(id)
+ {
+ _items.CollectionChanged += Items_CollectionChanged;
+ }
+
+ public ObservableCollection<IUIListItem> Items => _items;
+
+ public bool CanSelectItem
+ {
+ get => _canSelectItem;
+ internal set
+ {
+ SetPropertyValue(ref _canSelectItem, value, CanSelectItemChanged);
+ if (!value)
+ {
+ SelectedItem = null;
+ }
+ }
+ }
+
+ public IUIListItem? SelectedItem
+ {
+ get => _selectedItem;
+ internal set
+ {
+ if (_selectedItem != value)
+ {
+ _selectedItem = value;
+ OnItemSelectedAction?.Invoke(_selectedItem);
+ SelectedItemChanged?.Invoke(this, EventArgs.Empty);
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ public Func<IUIListItem?, ValueTask>? OnItemSelectedAction { get; internal set; }
+
+ public event EventHandler? CanSelectItemChanged;
+ public event EventHandler? SelectedItemChanged;
+
+ public void Dispose()
+ {
+ _items.CollectionChanged -= Items_CollectionChanged;
+ }
+
+ private void Items_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+ {
+ // Try to preserve the selection.
+ this.Select(SelectedItem);
+ }
+}
+
+public static partial class GUI
+{
+ /// <summary>
+ /// A component that represents a list of items.
+ /// </summary>
+ public static IUIList List()
+ {
+ return List(null);
+ }
+
+ /// <summary>
+ /// A component that represents a list of items.
+ /// </summary>
+ /// <param name="id">An optional unique identifier for this UI element.</param>
+ public static IUIList List(string? id)
+ {
+ return new UIList(id);
+ }
+
+ /// <summary>
+ /// Sets the <see cref="IUISelectDropDownList.Items"/> of the list.
+ /// </summary>
+ public static IUIList WithItems(this IUIList element, params IUIListItem[] items)
+ {
+ var list = (UIList)element;
+ list.Items.Clear();
+ list.Items.AddRange(items);
+
+ return element;
+ }
+
+ /// <summary>
+ /// Sets the action to run when selecting an item in the list.
+ /// </summary>
+ public static IUIList OnItemSelected(this IUIList element, Func<IUIListItem?, ValueTask>? onItemSelectedAction)
+ {
+ ((UIList)element).OnItemSelectedAction = onItemSelectedAction;
+ return element;
+ }
+
+ /// <summary>
+ /// Sets the <see cref="IUIList"/> that should be selected in the list.
+ /// If <paramref name="item"/> is null or does not exist in the list, no item will be selected.
+ /// </summary>
+ public static IUIList Select(this IUIList element, IUIListItem? item)
+ {
+ var list = (UIList)element;
+ if ((item is not null
+ && list.Items is not null
+ && !list.Items.Contains(item))
+ || !list.CanSelectItem)
+ {
+ list.SelectedItem = null;
+ }
+ else
+ {
+ list.SelectedItem = item;
+ }
+
+ return element;
+ }
+
+ /// <summary>
+ /// Sets the <see cref="IUIList"/> that should be selected in the list, using its index in the list.
+ /// If <paramref name="index"/> smaller or greater than the amount of items in the list, no item will be selected.
+ /// </summary>
+ public static IUIList Select(this IUIList element, int index)
+ {
+ var list = (UIList)element;
+
+ if (list.Items is null
+ || index < 0
+ || index > list.Items.Count - 1
+ || !list.CanSelectItem)
+ {
+ list.SelectedItem = null;
+ }
+ else
+ {
+ list.SelectedItem = list.Items[index];
+ }
+
+ return element;
+ }
+
+ /// <summary>
+ /// Allows the user to select an item in the list.
+ /// </summary>
+ public static IUIList AllowSelectItem(this IUIList element)
+ {
+ ((UIList)element).CanSelectItem = true;
+ return element;
+ }
+
+ /// <summary>
+ /// Prevents the user from selecting an item in the list.
+ /// </summary>
+ public static IUIList ForbidSelectItem(this IUIList element)
+ {
+ ((UIList)element).CanSelectItem = false;
+ return element;
+ }
+}
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIListItem.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIListItem.cs
new file mode 100644
index 000000000..52bf1acda
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIListItem.cs
@@ -0,0 +1,45 @@
+namespace DevToys.Api;
+
+/// <summary>
+/// A component that represents an item in a list.
+/// </summary>
+public interface IUIListItem
+{
+ /// <summary>
+ /// Gets the <see cref="IUIElement"/> to display in the item.
+ /// </summary>
+ IUIElement UIElement { get; }
+
+ /// <summary>
+ /// Gets the value associated to the item.
+ /// </summary>
+ object? Value { get; }
+}
+
+[DebuggerDisplay($"Value = {{{nameof(Value)}}}")]
+internal sealed class UIListItem : IUIListItem
+{
+ internal UIListItem(IUIElement uiElement, object? value)
+ {
+ Guard.IsNotNull(uiElement);
+ UIElement = uiElement;
+ Value = value;
+ }
+
+ public IUIElement UIElement { get; }
+
+ public object? Value { get; }
+}
+
+public static partial class GUI
+{
+ /// <summary>
+ /// Create component that represents an item in a list.
+ /// </summary>
+ /// <param name="uiElement">The element to display in the item.</param>
+ /// <param name="value">The value associated to the item.</param>
+ public static IUIListItem Item(IUIElement uiElement, object? value)
+ {
+ return new UIListItem(uiElement, value);
+ }
+}
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIProgressBar.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIProgressBar.cs
new file mode 100644
index 000000000..b50069192
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIProgressBar.cs
@@ -0,0 +1,159 @@
+namespace DevToys.Api;
+
+/// <summary>
+/// A component that indicates the progress of an operation.
+/// </summary>
+public interface IUIProgressBar : IUIElement
+{
+ /// <summary>
+ /// Gets the current position of the progress bar between 0 and 100.
+ /// </summary>
+ double Value { get; }
+
+ /// <summary>
+ /// Gets whether the progress bar shows actual values or generic, continuous progress feedback.
+ /// </summary>
+ bool IsIndeterminate { get; }
+
+ /// <summary>
+ /// Raised when <see cref="Value"/> is changed.
+ /// </summary>
+ event EventHandler? ValueChanged;
+
+ /// <summary>
+ /// Raised when <see cref="Value"/> is changing asynchronously.
+ /// </summary>
+ event EventHandler<double>? ValueChangingAsynchronously;
+
+ /// <summary>
+ /// Raised when <see cref="IsIndeterminate"/> is changed.
+ /// </summary>
+ event EventHandler? IsIndeterminateChanged;
+}
+
+[DebuggerDisplay($"Id = {{{nameof(Id)}}}, Value = {{{nameof(Value)}}}")]
+internal class UIProgressBar : UIElement, IUIProgressBar, IDisposable
+{
+ private readonly ThrottledProgress<double> _asyncProgressReporter;
+ private double _value;
+ private bool _isIndeterminate;
+
+ internal UIProgressBar(string? id)
+ : base(id)
+ {
+ _asyncProgressReporter
+ = new ThrottledProgress<double>(
+ OnReportAsync,
+ TimeSpan.FromMilliseconds(250));
+ }
+
+ public double Value
+ {
+ get => _value;
+ internal set => SetPropertyValue(ref _value, value, ValueChanged);
+ }
+
+ public bool IsIndeterminate
+ {
+ get => _isIndeterminate;
+ internal set => SetPropertyValue(ref _isIndeterminate, value, IsIndeterminateChanged);
+ }
+
+ public event EventHandler? ValueChanged;
+ public event EventHandler<double>? ValueChangingAsynchronously;
+ public event EventHandler? IsIndeterminateChanged;
+
+ public void Dispose()
+ {
+ _asyncProgressReporter.Flush();
+ }
+
+ internal ValueTask ReportAsync(double percentage)
+ {
+ ((IProgress<double>)_asyncProgressReporter).Report(percentage);
+ return ValueTask.CompletedTask;
+ }
+
+ private void OnReportAsync(double percentage)
+ {
+ ValueChangingAsynchronously?.Invoke(this, percentage);
+ }
+}
+
+public static partial class GUI
+{
+ /// <summary>
+ /// Create a component that indicates the progress of an operation.
+ /// </summary>
+ public static IUIProgressBar ProgressBar()
+ {
+ return ProgressBar(null);
+ }
+
+ /// <summary>
+ /// Create a component that indicates the progress of an operation.
+ /// </summary>
+ /// <param name="id">An optional unique identifier for this UI element.</param>
+ public static IUIProgressBar ProgressBar(string? id)
+ {
+ return new UIProgressBar(id);
+ }
+
+ /// <summary>
+ /// Synchronously set the <see cref="IUIProgressBar.Value"/> property.
+ /// </summary>
+ /// <remarks>It is highly recommended to call this method when being on the UI thread.</remarks>
+ /// <param name="percentage">A value between 0 and 100.</param>
+ public static T Progress<T>(this T element, double percentage) where T : IUIProgressBar
+ {
+ Guard.IsBetweenOrEqualTo(percentage, 0, 100);
+ if (element is UIProgressBar progressBar)
+ {
+ progressBar.Value = percentage;
+ }
+ return element;
+ }
+
+ /// <summary>
+ /// Asynchronously set the <see cref="IUIProgressBar.Value"/> property. This method makes sure to update the
+ /// progress bar's value without blocking the caller.
+ /// </summary>
+ /// <remarks>It is highly recommended to call this method when being off the UI thread.</remarks>
+ /// <param name="percentage">A value between 0 and 100.</param>
+ public static ValueTask ProgressAsync<T>(this T element, double percentage) where T : IUIProgressBar
+ {
+ Guard.IsBetweenOrEqualTo(percentage, 0, 100);
+ if (element is UIProgressBar progressBar)
+ {
+ return progressBar.ReportAsync(percentage);
+ }
+
+ return ValueTask.CompletedTask;
+ }
+
+ /// <summary>
+ /// Indicates the progress bar should a generic, continuous progress feedback.
+ /// </summary>
+ public static T StartIndeterminateProgress<T>(this T element) where T : IUIProgressBar
+ {
+ if (element is UIProgressBar progressBar)
+ {
+ progressBar.IsIndeterminate = true;
+ }
+
+ return element;
+ }
+
+ /// <summary>
+ /// Indicates the progress bar should show actual values.
+ /// </summary>
+ public static T StopIndeterminateProgress<T>(this T element) where T : IUIProgressBar
+ {
+ if (element is UIProgressBar progressBar)
+ {
+ progressBar.IsIndeterminate = false;
+ }
+
+ return element;
+ }
+}
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIProgressRing.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIProgressRing.cs
new file mode 100644
index 000000000..143cc224c
--- /dev/null
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIProgressRing.cs
@@ -0,0 +1,37 @@
+namespace DevToys.Api;
+
+/// <summary>
+/// A circular component that indicates the progress of an operation.
+/// </summary>
+public interface IUIProgressRing : IUIProgressBar
+{
+}
+
+[DebuggerDisplay($"Id = {{{nameof(Id)}}}, Value = {{{nameof(Value)}}}")]
+internal sealed class UIProgressRing : UIProgressBar, IUIProgressRing
+{
+ internal UIProgressRing(string? id)
+ : base(id)
+ {
+ }
+}
+
+public static partial class GUI
+{
+ /// <summary>
+ /// Create a circular component that indicates the progress of an operation.
+ /// </summary>
+ public static IUIProgressRing ProgressRing()
+ {
+ return ProgressRing(null);
+ }
+
+ /// <summary>
+ /// Create a circular component that indicates the progress of an operation.
+ /// </summary>
+ /// <param name="id">An optional unique identifier for this UI element.</param>
+ public static IUIProgressRing ProgressRing(string? id)
+ {
+ return new UIProgressRing(id);
+ }
+}
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs
index 1a13d1e7e..48abf6763 100644
--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs
+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs
@@ -159,6 +159,15 @@ namespace DevToys.Blazor.BuiltInTools.Settings {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Editing.
+ /// </summary>
+ internal static string Editing {
+ get {
+ return ResourceManager.GetString("Editing", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Font.
/// </summary>
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx
index a49a976a2..6d6b28ead 100644
--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx
+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx
@@ -150,6 +150,9 @@
<data name="Description" xml:space="preserve">
<value>Customize DevToys look &amp; feel</value>
</data>
+ <data name="Editing" xml:space="preserve">
+ <value>Editing</value>
+ </data>
<data name="Font" xml:space="preserve">
<value>Font</value>
</data>
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs
index bf2389f01..bacfd6b0a 100644
--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs
+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs
@@ -1,12 +1,11 @@
using System.Reflection;
-using DevToys.Api;
using DevToys.Blazor.Core.Languages;
using DevToys.Core.Settings;
namespace DevToys.Blazor.BuiltInTools.Settings;
[Export(typeof(IGuiTool))]
-[Name("Settings")]
+[Name(SettingsInternalToolName)]
[ToolDisplayInformation(
IconFontName = "FluentSystemIcons",
IconGlyph = '\uF6A9',
@@ -21,6 +20,8 @@ namespace DevToys.Blazor.BuiltInTools.Settings;
[NoCompactOverlaySupport]
internal sealed class SettingsGuiTool : IGuiTool
{
+ internal const string SettingsInternalToolName = "Settings";
+
private readonly ISettingsProvider _settingsProvider;
private readonly IClipboard _clipboard;
private readonly IFontProvider _fontProvider;
@@ -120,12 +121,12 @@ internal sealed class SettingsGuiTool : IGuiTool
.Title(Settings.SmartDetectionPaste)
.Handle(_settingsProvider, PredefinedSettings.SmartDetectionPaste))),
- // Text Editor settings
+ // Editing settings
Stack()
.Vertical()
.WithChildren(
- Label().Text(Settings.TextEditor),
+ Label().Text(Settings.Editing),
SettingGroup()
.Icon("FluentSystemIcons", '\uE3BB')
.Title(Settings.TextEditor)
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor
index b2697cb09..13e759d65 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor
@@ -22,7 +22,7 @@
Class="@FinalCssClasses"
Style="@Style"
UseNativeScrollBar="@UseNativeScrollBar"
- AdditionalAttributes="@AdditionalAttributes">
+ @attributes="@AdditionalAttributes">
<ul @ref="Element"
role="@Role"
class="list-box"
@@ -66,7 +66,7 @@
else
{
<div class="@((object.ReferenceEquals(item, SelectedItem) ? "selected" : string.Empty))"
- @onclick="@(() => OnItemClick(item))">
+ @onclick="@(() => OnItemClick(item))">
@ItemTemplate(item)
</div>
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss
index c22be6955..25aeb6891 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss
@@ -15,7 +15,7 @@
cursor: default;
user-select: none;
-webkit-user-select: none;
- block-size: 34px;
+ min-block-size: 34px;
text-decoration: none;
&::before {
@@ -27,7 +27,7 @@
opacity: 0;
inset-inline-start: 0;
inline-size: 3px;
- block-size: 16px;
+ min-block-size: 16px;
transform: scaleY(0);
}
@@ -73,7 +73,7 @@
> :global(svg) {
inline-size: 16px;
- block-size: auto;
+ min-block-size: auto;
fill: currentColor;
margin-inline-end: 16px;
}
@@ -82,6 +82,6 @@
// Compact mode
div[data-compactmode] {
.list-box-item {
- block-size: 24px;
+ min-block-size: 24px;
}
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs
index 3ede3c50f..432c47956 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/SelectBase.cs
@@ -26,6 +26,9 @@ public abstract class SelectBase<TElement> : JSStyledComponentBase where TElemen
[Parameter]
public EventCallback<TElement> SelectedItemChanged { get; set; }
+ [Parameter]
+ public bool CanSelectItem { get; set; } = true;
+
[Parameter]
public bool OverrideDefaultItemTemplate { get; set; }
@@ -113,6 +116,11 @@ public abstract class SelectBase<TElement> : JSStyledComponentBase where TElemen
private void SetSelectedIndex(int index, bool raiseEvent)
{
+ if (!CanSelectItem)
+ {
+ return;
+ }
+
if (index >= Items?.Count)
{
ThrowHelper.ThrowArgumentOutOfRangeException(nameof(index));
@@ -142,7 +150,12 @@ public abstract class SelectBase<TElement> : JSStyledComponentBase where TElemen
private void SetSelectedItem(TElement? item, bool raiseEvent)
{
Guard.IsNotNull(Items);
- if (item == SelectedItem && !raiseEvent)
+
+ if (!CanSelectItem)
+ {
+ return;
+ }
+ else if (item == SelectedItem && !raiseEvent)
{
return;
}
@@ -174,16 +187,19 @@ public abstract class SelectBase<TElement> : JSStyledComponentBase where TElemen
private void RaiseOnSelectionChanged()
{
- OnItemSelected();
-
- if (SelectedIndexChanged.HasDelegate)
+ if (CanSelectItem)
{
- SelectedIndexChanged.InvokeAsync(SelectedIndex);
- }
+ OnItemSelected();
- if (SelectedItemChanged.HasDelegate)
- {
- SelectedItemChanged.InvokeAsync(SelectedItem);
+ if (SelectedIndexChanged.HasDelegate)
+ {
+ SelectedIndexChanged.InvokeAsync(SelectedIndex);
+ }
+
+ if (SelectedItemChanged.HasDelegate)
+ {
+ SelectedItemChanged.InvokeAsync(SelectedItem);
+ }
}
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss
index 72fb94c0c..dbe40da59 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss
@@ -28,6 +28,16 @@
cursor: none;
color: var(--text-fill-color-disabled) !important;
}
+
+ .monaco-editor {
+ height: 100% !important;
+ min-height: min-content !important;
+
+ .overflow-guard {
+ height: 100% !important;
+ min-height: min-content !important;
+ }
+ }
}
&-with-header {
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor
index 638ac374f..d0e17e2e2 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor
@@ -74,6 +74,18 @@
<UILabelPresenter UILabel="@label" />
break;
+ case IUIProgressRing progressRing:
+ <UIProgressRingPresenter UIProgressRing="@progressRing" />
+ break;
+
+ case IUIProgressBar progressBar:
+ <UIProgressBarPresenter UIProgressBar="@progressBar" />
+ break;
+
+ case IUIList list:
+ <UIListPresenter UIList="@list" />
+ break;
+
default:
throw new NotSupportedException($"Gui Tool component of type '{UIElement.GetType().FullName}' isn't supported.");
}
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIListPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIListPresenter.razor
new file mode 100644
index 000000000..f9bd21ccb
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIListPresenter.razor
@@ -0,0 +1,19 @@
+@namespace DevToys.Blazor.Components.UIElements
+@using DevToys.Api;
+@inherits ComponentBase
+
+<ListBox id="@UIList.Id"
+ IsVisible="@UIList.IsVisible"
+ IsEnabled="@UIList.IsEnabled"
+ HorizontalAlignment="@UIList.HorizontalAlignment"
+ VerticalAlignment="@UIList.VerticalAlignment"
+ @bind-SelectedIndex="@SelectedIndex"
+ Items="@UIList.Items"
+ Context="item"
+ CanSelectItem="@UIList.CanSelectItem"
+ OverrideDefaultItemTemplate="@(!UIList.CanSelectItem)"
+ Virtualize="true">
+ <ItemTemplate>
+ <UIElementPresenter UIElement="@item.UIElement"/>
+ </ItemTemplate>
+</ListBox>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIListPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIListPresenter.razor.cs
new file mode 100644
index 000000000..2843a6a4c
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIListPresenter.razor.cs
@@ -0,0 +1,56 @@
+namespace DevToys.Blazor.Components.UIElements;
+
+public partial class UIListPresenter : ComponentBase, IDisposable
+{
+ private int _selectedIndex = -1;
+
+ [Parameter]
+ public IUIList UIList { get; set; } = default!;
+
+ [Parameter]
+ public int SelectedIndex { get; set; }
+
+ protected override void OnInitialized()
+ {
+ base.OnInitialized();
+ UIList.SelectedItemChanged += UIList_SelectedItemChanged;
+ UIList_SelectedItemChanged(this, EventArgs.Empty);
+ }
+
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+ if (_selectedIndex != SelectedIndex)
+ {
+ if (UIList.CanSelectItem)
+ {
+ _selectedIndex = SelectedIndex;
+ UIList.Select(SelectedIndex);
+ }
+ else
+ {
+ SelectedIndex = -1;
+ UIList.Select(-1);
+ }
+ }
+ }
+
+ private void UIList_SelectedItemChanged(object? sender, EventArgs e)
+ {
+ if (UIList.Items is not null && UIList.SelectedItem is not null && UIList.CanSelectItem)
+ {
+ SelectedIndex = UIList.Items.IndexOf(UIList.SelectedItem);
+ }
+ else
+ {
+ SelectedIndex = -1;
+ UIList.Select(-1);
+ }
+ }
+
+ public void Dispose()
+ {
+ UIList.SelectedItemChanged -= UIList_SelectedItemChanged;
+ GC.SuppressFinalize(this);
+ }
+}
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressBarPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressBarPresenter.razor
new file mode 100644
index 000000000..d1eecb66a
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressBarPresenter.razor
@@ -0,0 +1,11 @@
+@namespace DevToys.Blazor.Components.UIElements
+@using DevToys.Api;
+@inherits ComponentBase
+
+<ProgressBar id="@UIProgressBar.Id"
+ IsVisible="@UIProgressBar.IsVisible"
+ IsEnabled="@UIProgressBar.IsEnabled"
+ HorizontalAlignment="@UIProgressBar.HorizontalAlignment"
+ VerticalAlignment="@UIProgressBar.VerticalAlignment"
+ Value="@UIProgressBar.Value"
+ IsIndeterminate="@UIProgressBar.IsIndeterminate"/>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressBarPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressBarPresenter.razor.cs
new file mode 100644
index 000000000..9d7dd1c4d
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressBarPresenter.razor.cs
@@ -0,0 +1,34 @@
+namespace DevToys.Blazor.Components.UIElements;
+
+public partial class UIProgressBarPresenter : ComponentBase, IDisposable
+{
+ [Parameter]
+ public IUIProgressBar UIProgressBar { get; set; } = default!;
+
+ protected override void OnInitialized()
+ {
+ base.OnInitialized();
+
+ if (UIProgressBar is not null)
+ {
+ UIProgressBar.ValueChangingAsynchronously += UIProgressBar_ValueChangingAsynchronously;
+ }
+ }
+
+ public void Dispose()
+ {
+ if (UIProgressBar is not null)
+ {
+ UIProgressBar.ValueChangingAsynchronously -= UIProgressBar_ValueChangingAsynchronously;
+ }
+ GC.SuppressFinalize(this);
+ }
+
+ private void UIProgressBar_ValueChangingAsynchronously(object? sender, double percentage)
+ {
+ InvokeAsync(() =>
+ {
+ UIProgressBar?.Progress(percentage);
+ });
+ }
+}
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressRingPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressRingPresenter.razor
new file mode 100644
index 000000000..9a6ab3897
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressRingPresenter.razor
@@ -0,0 +1,11 @@
+@namespace DevToys.Blazor.Components.UIElements
+@using DevToys.Api;
+@inherits ComponentBase
+
+<ProgressRing id="@UIProgressRing.Id"
+ IsVisible="@UIProgressRing.IsVisible"
+ IsEnabled="@UIProgressRing.IsEnabled"
+ HorizontalAlignment="@UIProgressRing.HorizontalAlignment"
+ VerticalAlignment="@UIProgressRing.VerticalAlignment"
+ Value="@UIProgressRing.Value"
+ IsIndeterminate="@UIProgressRing.IsIndeterminate" />
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressRingPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressRingPresenter.razor.cs
new file mode 100644
index 000000000..5f75e3d13
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIProgressRingPresenter.razor.cs
@@ -0,0 +1,34 @@
+namespace DevToys.Blazor.Components.UIElements;
+
+public partial class UIProgressRingPresenter : ComponentBase, IDisposable
+{
+ [Parameter]
+ public IUIProgressRing UIProgressRing { get; set; } = default!;
+
+ protected override void OnInitialized()
+ {
+ base.OnInitialized();
+
+ if (UIProgressRing is not null)
+ {
+ UIProgressRing.ValueChangingAsynchronously += UIProgressRing_ValueChangingAsynchronously;
+ }
+ }
+
+ public void Dispose()
+ {
+ if (UIProgressRing is not null)
+ {
+ UIProgressRing.ValueChangingAsynchronously -= UIProgressRing_ValueChangingAsynchronously;
+ }
+ GC.SuppressFinalize(this);
+ }
+
+ private void UIProgressRing_ValueChangingAsynchronously(object? sender, double percentage)
+ {
+ InvokeAsync(() =>
+ {
+ UIProgressRing?.Progress(percentage);
+ });
+ }
+}
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs
index c04b81939..a6dd8d5a2 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs
@@ -4,7 +4,6 @@ using DevToys.Core.Settings;
using DevToys.Core.Tools;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Blazor.Components.UIElements;
diff --git a/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs b/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs
index 1bd4a8704..89e682c4f 100644
--- a/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs
+++ b/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs
@@ -1,7 +1,6 @@
using System.Text;
using DevToys.Core.Tools;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Blazor.Core.Services;
diff --git a/src/app/dev/DevToys.Business/DevToys.Business.csproj b/src/app/dev/DevToys.Business/DevToys.Business.csproj
index 00f868b75..7444a3c2d 100644
--- a/src/app/dev/DevToys.Business/DevToys.Business.csproj
+++ b/src/app/dev/DevToys.Business/DevToys.Business.csproj
@@ -15,7 +15,5 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.ComponentModel.Composition" />
- <PackageReference Include="Uno.Core.Extensions.Logging" />
- <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs b/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs
index 7e3c2c763..35f3ec53e 100644
--- a/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs
+++ b/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs
@@ -9,7 +9,6 @@ using DevToys.Core.Tools;
using DevToys.Core.Tools.ViewItems;
using DevToys.Localization.Strings.MainWindow;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Business.ViewModels;
diff --git a/src/app/dev/DevToys.Core/DevToys.Core.csproj b/src/app/dev/DevToys.Core/DevToys.Core.csproj
index 4693a0a44..9566ea7a4 100644
--- a/src/app/dev/DevToys.Core/DevToys.Core.csproj
+++ b/src/app/dev/DevToys.Core/DevToys.Core.csproj
@@ -11,10 +11,9 @@
<PackageReference Include="CommunityToolkit.Diagnostics" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="FuzzySharp" />
+ <PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.ComponentModel.Composition" />
- <PackageReference Include="Uno.Core.Extensions.Logging" />
- <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
</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 18dbb06b4..d6ebe6f9f 100644
--- a/src/app/dev/DevToys.Core/Mef/MefComposer.cs
+++ b/src/app/dev/DevToys.Core/Mef/MefComposer.cs
@@ -1,7 +1,6 @@
using System.ComponentModel.Composition.Hosting;
using System.Reflection;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Core.Mef;
diff --git a/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs b/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs
index a54559e78..da078a0c1 100644
--- a/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs
+++ b/src/app/dev/DevToys.Core/Settings/SettingsProvider.cs
@@ -2,7 +2,6 @@
using System.Globalization;
using System.Text.Json;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Core.Settings;
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs b/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs
index f88fafa6e..bf1b7a665 100644
--- a/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs
+++ b/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs
@@ -3,7 +3,6 @@ using System.Resources;
using CommunityToolkit.Mvvm.ComponentModel;
using DevToys.Core.Tools.Metadata;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Core.Tools;
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
index 51d05e913..fd48accdc 100644
--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
@@ -7,7 +7,6 @@ using DevToys.Localization.Strings.MainWindow;
using FuzzySharp;
using FuzzySharp.PreProcess;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
using PredefinedSettings = DevToys.Core.Settings.PredefinedSettings;
namespace DevToys.Core.Tools;
diff --git a/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs b/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs
index de7b47afb..b789f4bba 100644
--- a/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs
+++ b/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs
@@ -1,6 +1,5 @@
using DevToys.Core.Tools.Metadata;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Core.Tools;
diff --git a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj b/src/app/dev/DevToys.Tools/DevToys.Tools.csproj
index 68c64533f..40220f8a4 100644
--- a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj
+++ b/src/app/dev/DevToys.Tools/DevToys.Tools.csproj
@@ -4,6 +4,10 @@
<!-- See https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enabledynamicloading -->
<EnableDynamicLoading>true</EnableDynamicLoading>
+
+ <!-- NuGet package -->
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+ <Title>DevToys.Tools</Title>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DevToys.Api\DevToys.Api.csproj">
@@ -43,7 +47,6 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>
diff --git a/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs
index daacb2c9e..6aa79e12b 100644
--- a/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs
+++ b/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs
@@ -1,7 +1,5 @@
using System.Text.Json;
-using System.Text.Json.Nodes;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Tools.SmartDetection;
diff --git a/src/app/dev/platforms/desktop/DevToys.CLI/Program.cs b/src/app/dev/platforms/desktop/DevToys.CLI/Program.cs
index 9322443ca..93f6d403d 100644
--- a/src/app/dev/platforms/desktop/DevToys.CLI/Program.cs
+++ b/src/app/dev/platforms/desktop/DevToys.CLI/Program.cs
@@ -35,7 +35,7 @@ internal partial class Program
#endif
});
- Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory = loggerFactory;
+ LoggingExtensions.LoggerFactory = loggerFactory;
logger = new Logger<Program>(loggerFactory);
LogLoggerInitialization(logger, (DateTime.Now - startTime).TotalMilliseconds);
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Clipboard.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Clipboard.cs
index 0914f9422..c23128403 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Clipboard.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/Clipboard.cs
@@ -1,8 +1,8 @@
-using System.Collections.Specialized;
+using DevToys.Api;
+using System.Collections.Specialized;
using Foundation;
using Microsoft.Extensions.Logging;
using UIKit;
-using Uno.Extensions;
namespace DevToys.MacOS.Core;
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FontProvider.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FontProvider.cs
index bd2b0de74..848188ae4 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FontProvider.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FontProvider.cs
@@ -1,6 +1,5 @@
using DevToys.Api;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.MacOS.Core;
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs
index 0f41f334c..80ecc2855 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs
@@ -8,7 +8,6 @@ using DevToys.Core.Mef;
using DevToys.MacOS.Core;
using CommunityToolkit.Maui;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
using PredefinedSettings = DevToys.Core.Settings.PredefinedSettings;
namespace DevToys.MacOS;
@@ -113,7 +112,7 @@ public partial class MauiProgram
ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
ILoggerFactory loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
- Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory = loggerFactory;
+ LoggingExtensions.LoggerFactory = loggerFactory;
_logger = this.Log();
return serviceProvider;
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/Clipboard.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Clipboard.cs
index 7cabdd353..46116fe83 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/Clipboard.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Clipboard.cs
@@ -1,9 +1,9 @@
using System.Collections.Specialized;
using System.IO;
using System.Windows.Threading;
+using DevToys.Api;
using DevToys.Windows.Helpers;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Windows.Core;
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FontProvider.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FontProvider.cs
index ae689c5f4..154179818 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FontProvider.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FontProvider.cs
@@ -1,7 +1,6 @@
using System.Windows.Media;
using DevToys.Api;
using Microsoft.Extensions.Logging;
-using Uno.Extensions;
namespace DevToys.Windows.Core;
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
index db5aff985..c0a17f84a 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows.Interop;
+using System.Transactions;
+using System.Windows.Interop;
using DevToys.Api;
using DevToys.Blazor.BuiltInTools;
using DevToys.Blazor.Core.Languages;
@@ -159,8 +160,8 @@ public partial class MainWindow : MicaWindowWithOverlay
ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
ILoggerFactory loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
- Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory = loggerFactory;
- _logger = loggerFactory.CreateLogger<MainWindow>();
+ LoggingExtensions.LoggerFactory = loggerFactory;
+ _logger = typeof(MainWindow).Log();
return serviceProvider;
}