Skip to content

A Swiss Army knife for developers.

Updated Mac app

Etienne Baudoux82bd01227132
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c2e228ab2..ea88f81e0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,6 +17,5 @@
},
"emmet.includeLanguages": {
"aspnetcorerazor": "html"
- },
- "dotnet.defaultSolution": "src\\DevToys-MacOS.sln"
+ }
}
diff --git a/src/app/dev/DevToys.Api/Core/PickedFile.cs b/src/app/dev/DevToys.Api/Core/PickedFile.cs
index 68e066bde..6b5225708 100644
--- a/src/app/dev/DevToys.Api/Core/PickedFile.cs
+++ b/src/app/dev/DevToys.Api/Core/PickedFile.cs
@@ -1,8 +1,33 @@
namespace DevToys.Api;
-public record PickedFile(string FileName, Stream Stream)
+[DebuggerDisplay($"FileName = {{{nameof(FileName)}}}")]
+public record PickedFile : IDisposable
{
- public string FileName { get; init; } = FileName;
+ /// <summary>
+ /// Initializes a new instance of the <see cref="PickedFile"/> class.
+ /// </summary>
+ public PickedFile(string fileName, Stream stream)
+ {
+ FileName = fileName;
+ Stream = stream;
+ }
- public Stream Stream { get; init; } = Stream;
+ /// <summary>
+ /// Gets or sets the name of the file, including its extension.
+ /// </summary>
+ public string FileName { get; init; }
+
+ /// <summary>
+ /// Gets or sets a stream allowing to read the content of the file.
+ /// </summary>
+ /// <remarks>
+ /// The stream is disposed when the <see cref="PickedFile"/> is disposed.
+ /// </remarks>
+ public Stream Stream { get; init; }
+
+ public void Dispose()
+ {
+ Stream?.Dispose();
+ GC.SuppressFinalize(this);
+ }
}
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/UIGridLength.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/UIGridLength.cs
index 3bb4da9a2..85de656ec 100644
--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/UIGridLength.cs
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/UIGridLength.cs
@@ -1,5 +1,6 @@
namespace DevToys.Api;
+[DebuggerDisplay($"{{{nameof(ToString)}}}")]
public readonly struct UIGridLength : IEquatable<UIGridLength>
{
private readonly UIGridUnitType _type;
@@ -133,4 +134,19 @@ public readonly struct UIGridLength : IEquatable<UIGridLength>
{
return _value.GetHashCode() ^ _type.GetHashCode();
}
+
+ public override string ToString()
+ {
+ if (IsAuto)
+ {
+ return "Auto";
+ }
+
+ if (IsAbsolute)
+ {
+ return $"{Value}px";
+ }
+
+ return $"{Value}*";
+ }
}
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs b/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs
index cf565e251..ddb400f84 100644
--- a/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs
+++ b/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs
@@ -23,6 +23,7 @@
/// </code>
/// </example>
/// </remarks>
+[DebuggerDisplay($"DisplayTitle = {{{nameof(DisplayTitle)}}}")]
public class GuiToolGroup
{
/// <summary>
diff --git a/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss b/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss
index f5eaab8fa..f51afef4c 100644
--- a/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss
+++ b/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss
@@ -84,167 +84,186 @@
var(--control-stroke-on-accent-secondary)
var(--control-stroke-on-accent-secondary);
- /* Card */
- --card-stroke-color-default: rgba(0, 0, 0, 0.06);
- --card-background-color: rgba(255, 255, 255, 0.05);
- --card-hover-background-color: rgba(255, 255, 255, 0.06);
-
- /* Button */
- --button-background: var(--control-fill-color-default);
- --button-background-pointer-over: var(--control-fill-color-secondary);
- --button-background-pressed: var(--control-fill-color-tertiary);
- --button-background-disabled: var(--control-fill-color-disabled);
- --button-foreground: var(--text-fill-color-primary);
- --button-foreground-pointer-over: var(--text-fill-color-primary);
- --button-foreground-pressed: var(--text-fill-color-secondary);
- --button-foreground-disabled: var(--text-fill-color-disabled);
- --button-border: var(--control-border-color-default);
- --button-border-pointer-over: var(--control-border-color-default);
- --button-border-pressed: var(--control-stroke-color-default);
- --button-border-disabled: var(--control-stroke-color-default);
- --button-border-thickness: 1px solid;
-
- --accent-button-background: var(--accent-default);
- --accent-button-background-pointer-over: var(--accent-secondary);
- --accent-button-background-pressed: var(--accent-tertiary);
- --accent-button-background-disabled: var(--accent-disabled);
- --accent-button-foreground: var(--text-on-accent-primary);
- --accent-button-foreground-pointer-over: var(--text-on-accent-primary);
- --accent-button-foreground-pressed: var(--text-on-accent-secondary);
- --accent-button-foreground-disabled: var(--text-on-accent-disabled);
- --accent-button-border: var(--accent-control-border-color-default);
- --accent-button-border-pointer-over: var(--accent-control-border-color-default);
- --accent-button-border-pressed: var(--control-fill-color-transparent);
- --accent-button-border-disabled: var(--control-fill-color-transparent);
- --accent-button-border-thickness: 1px solid;
-
- --stealth-button-background: var(--control-fill-color-transparent);
- --stealth-button-background-pointer-over: var(--control-fill-color-secondary);
- --stealth-button-background-pressed: var(--control-fill-color-tertiary);
- --stealth-button-background-disabled: var(--control-fill-color-transparent);
- --stealth-button-foreground: var(--text-fill-color-primary);
- --stealth-button-foreground-pointer-over: var(--text-fill-color-primary);
- --stealth-button-foreground-pressed: var(--text-fill-color-secondary);
- --stealth-button-foreground-disabled: var(--text-fill-color-disabled);
- --stealth-button-border: var(--control-fill-color-transparent);
- --stealth-button-border-pointer-over: var(--control-border-color-default);
- --stealth-button-border-pressed: var(--control-stroke-color-default);
- --stealth-button-border-disabled: var(--control-fill-color-transparent);
- --stealth-button-border-thickness: 1px solid;
-
- /* CheckBox */
- --check-box-check-corner-radius: var(--control-corner-radius);
- --check-box-foreground: var(--text-fill-color-primary);
- --check-box-foreground-disabled: var(--text-fill-color-disabled);
-
- --check-box-check-background-stroke-unchecked: var(--control-strong-stroke-default);
- --check-box-check-background-stroke-unchecked-pointer-over: var(--control-strong-stroke-default);
- --check-box-check-background-stroke-unchecked-pressed: var(--control-strong-stroke-disabled);
- --check-box-check-background-stroke-unchecked-disabled: var(--control-strong-stroke-disabled);
- --check-box-check-background-stroke-checked: var(--accent-default);
- --check-box-check-background-stroke-checked-pointer-over: var(--accent-secondary);
- --check-box-check-background-stroke-checked-pressed: var(--accent-tertiary);
- --check-box-check-background-stroke-checked-disabled: var(--control-strong-stroke-disabled);
- --check-box-check-background-fill-unchecked: var(--control-alt-fill-color-secondary);
- --check-box-check-background-fill-unchecked-pointer-over: var(--control-alt-fill-color-tertiary);
- --check-box-check-background-fill-unchecked-pressed: var(--control-alt-fill-color-quarternary);
- --check-box-check-background-fill-unchecked-disabled: var(--control-alt-fill-color-disabled);
- --check-box-check-background-fill-checked: var(--accent-default);
- --check-box-check-background-fill-checked-pointer-over: var(--accent-secondary);
- --check-box-check-background-fill-checked-pressed: var(--accent-tertiary);
- --check-box-check-background-fill-checked-disabled: var(--accent-disabled);
-
- --check-box-check-glyph-foreground-unchecked: var(--text-on-accent-primary);
- --check-box-check-glyph-foreground-unchecked-pointer-over: var(--text-on-accent-primary);
- --check-box-check-glyph-foreground-unchecked-pressed: var(--text-on-accent-primary);
- --check-box-check-glyph-foreground-unchecked-disabled: var(--text-on-accent-disabled);
- --check-box-check-glyph-foreground-checked: var(--text-on-accent-primary);
- --check-box-check-glyph-foreground-checked-pointer-over: var(--text-on-accent-primary);
- --check-box-check-glyph-foreground-checked-pressed: var(--text-on-accent-secondary);
- --check-box-check-glyph-foreground-checked-disabled: var(--text-on-accent-disabled);
-
- /* RadioButton */
- --radio-button-foreground: var(--text-fill-color-primary);
- --radio-button-foreground-pointer-over: var(--text-fill-color-primary);
- --radio-button-foreground-pressed: var(--text-fill-color-primary);
- --radio-button-foreground-disabled: var(--text-fill-color-disabled);
- --radio-button-background: var(--control-fill-color-transparent);
- --radio-button-background-pointer-over: var(--control-fill-color-transparent);
- --radio-button-background-pressed: var(--control-fill-color-transparent);
- --radio-button-background-disabled: var(--control-fill-color-transparent);
- --radio-button-border: var(--control-fill-color-transparent);
- --radio-button-border-pointer-over: var(--control-fill-color-transparent);
- --radio-button-border-pressed: var(--control-fill-color-transparent);
- --radio-button-border-disabled: var(--control-fill-color-transparent);
-
- --radio-button-outer-ellipse-stroke: var(--control-strong-stroke-default);
- --radio-button-outer-ellipse-stroke-pointer-over: var(--control-strong-stroke-default);
- --radio-button-outer-ellipse-stroke-pressed: var(--control-strong-stroke-disabled);
- --radio-button-outer-ellipse-stroke-disabled: var(--control-strong-stroke-disabled);
- --radio-button-outer-ellipse-fill: var(--control-alt-fill-color-secondary);
- --radio-button-outer-ellipse-fill-pointer-over: var(--control-alt-fill-color-tertiary);
- --radio-button-outer-ellipse-fill-pressed: var(--control-alt-fill-color-quarternary);
- --radio-button-outer-ellipse-fill-disabled: var(--control-alt-fill-color-disabled);
-
- --radio-button-outer-ellipse-checked-stroke: var(--accent-default);
- --radio-button-outer-ellipse-checked-stroke-pointer-over: var(--accent-secondary);
- --radio-button-outer-ellipse-checked-stroke-pressed: var(--accent-tertiary);
- --radio-button-outer-ellipse-checked-stroke-disabled: var(--accent-disabled);
- --radio-button-outer-ellipse-checked-fill: var(--accent-default);
- --radio-button-outer-ellipse-checked-fill-pointer-over: var(--accent-secondary);
- --radio-button-outer-ellipse-checked-fill-pressed: var(--accent-tertiary);
- --radio-button-outer-ellipse-checked-fill-disabled: var(--accent-disabled);
-
- --radio-button-check-glyph-fill: var(--text-on-accent-primary);
- --radio-button-check-glyph-fill-pointer-over: var(--text-on-accent-primary);
- --radio-button-check-glyph-fill-pressed: var(--text-on-accent-primary);
- --radio-button-check-glyph-fill-disabled: var(--text-on-accent-primary);
- --radio-button-check-glyph-stroke: var(--control-stroke-color-default);
- --radio-button-check-glyph-stroke-pointer-over: var(--control-stroke-color-default);
- --radio-button-check-glyph-stroke-pressed: var(--control-stroke-color-default);
- --radio-button-check-glyph-stroke-disabled: var(--control-stroke-color-default);
- --radio-button-check-glyph-stroke-checked: var(--control-stroke-on-accent-default);
- --radio-button-check-glyph-stroke-checked-pointer-over: var(--control-stroke-on-accent-default);
- --radio-button-check-glyph-stroke-checked-pressed: var(--control-stroke-on-accent-default);
- --radio-button-check-glyph-stroke-checked-disabled: var(--control-stroke-color-default);
-
- /* ToggleSwitch */
- --toggle-switch-foreground: var(--text-fill-color-primary);
- --toggle-switch-foreground-disabled: var(--text-fill-color-disabled);
- --toggle-switch-on-stroke-thickness: 0px;
- --toggle-switch-outer-border-stroke-thickness: 1px;
- --toggle-switch-fill-off: var(--control-alt-fill-color-secondary);
- --toggle-switch-fill-off-pointer-over: var(--control-alt-fill-color-tertiary);
- --toggle-switch-fill-off-pressed: var(--control-alt-fill-color-quarternary);
- --toggle-switch-fill-off-disabled: var(--control-alt-fill-color-disabled);
- --toggle-switch-stroke-off: var(--control-strong-stroke-default);
- --toggle-switch-stroke-off-pointer-over: var(--control-strong-stroke-default);
- --toggle-switch-stroke-off-pressed: var(--control-strong-stroke-default);
- --toggle-switch-stroke-off-disabled: var(--control-strong-stroke-disabled);
- --toggle-switch-fill-on: var(--accent-default);
- --toggle-switch-fill-on-pointer-over: var(--accent-secondary);
- --toggle-switch-fill-on-pressed: var(--accent-tertiary);
- --toggle-switch-fill-on-disabled: var(--accent-disabled);
- --toggle-switch-stroke-on: var(--accent-default);
- --toggle-switch-stroke-on-pointer-over: var(--accent-secondary);
- --toggle-switch-stroke-on-pressed: var(--accent-tertiary);
- --toggle-switch-stroke-on-disabled: var(--accent-disabled);
-
- --toggle-switch-knob-fill-off: var(--text-fill-color-secondary);
- --toggle-switch-knob-fill-off-pointer-over: var(--text-fill-color-secondary);
- --toggle-switch-knob-fill-off-pressed: var(--text-fill-color-secondary);
- --toggle-switch-knob-fill-off-disabled: var(--text-fill-color-disabled);
- --toggle-switch-knob-fill-on: var(--text-on-accent-primary);
- --toggle-switch-knob-fill-on-pointer-over: var(--text-on-accent-primary);
- --toggle-switch-knob-fill-on-pressed: var(--text-on-accent-primary);
- --toggle-switch-knob-fill-on-disabled: var(--text-on-accent-disabled);
- --toggle-switch-knob-stroke-on: var(--control-border-color-default);
-
- /* GridView */
- --grid-view-header-border-line: rgba(255, 255, 255, 0.2);
- --grid-view-item-background: var(--card-background-color);
- --grid-view-item-background-hover: var(--card-hover-background-color);
- --grid-view-item-stroke: rgba(0, 0, 0, 0.3);
+ /* Card */
+ --card-stroke-color-default: rgba(0, 0, 0, 0.1);
+ --card-border: var(--card-stroke-color-default);
+ --card-border-thickness: 1px solid;
+ --card-foreground: var(--text-fill-color-primary);
+ --card-foreground-description: var(--text-fill-color-secondary);
+ --card-background-color: rgba(255, 255, 255, 0.05);
+ --card-background-color-secondary: rgba(255, 255, 255, 0.03);
+ --card-hover-background-color: rgba(255, 255, 255, 0.06);
+
+ /* Button */
+ --button-background: var(--control-fill-color-default);
+ --button-background-pointer-over: var(--control-fill-color-secondary);
+ --button-background-pressed: var(--control-fill-color-tertiary);
+ --button-background-disabled: var(--control-fill-color-disabled);
+ --button-foreground: var(--text-fill-color-primary);
+ --button-foreground-pointer-over: var(--text-fill-color-primary);
+ --button-foreground-pressed: var(--text-fill-color-secondary);
+ --button-foreground-disabled: var(--text-fill-color-disabled);
+ --button-border: var(--control-border-color-default);
+ --button-border-pointer-over: var(--control-border-color-default);
+ --button-border-pressed: var(--control-stroke-color-default);
+ --button-border-disabled: var(--control-stroke-color-default);
+ --button-border-thickness: 1px solid;
+
+ --accent-button-background: var(--accent-default);
+ --accent-button-background-pointer-over: var(--accent-secondary);
+ --accent-button-background-pressed: var(--accent-tertiary);
+ --accent-button-background-disabled: var(--accent-disabled);
+ --accent-button-foreground: var(--text-on-accent-primary);
+ --accent-button-foreground-pointer-over: var(--text-on-accent-primary);
+ --accent-button-foreground-pressed: var(--text-on-accent-secondary);
+ --accent-button-foreground-disabled: var(--text-on-accent-disabled);
+ --accent-button-border: var(--accent-control-border-color-default);
+ --accent-button-border-pointer-over: var(--accent-control-border-color-default);
+ --accent-button-border-pressed: var(--control-fill-color-transparent);
+ --accent-button-border-disabled: var(--control-fill-color-transparent);
+ --accent-button-border-thickness: 1px solid;
+
+ --stealth-button-background: var(--control-fill-color-transparent);
+ --stealth-button-background-pointer-over: var(--control-fill-color-secondary);
+ --stealth-button-background-pressed: var(--control-fill-color-tertiary);
+ --stealth-button-background-disabled: var(--control-fill-color-transparent);
+ --stealth-button-foreground: var(--text-fill-color-primary);
+ --stealth-button-foreground-pointer-over: var(--text-fill-color-primary);
+ --stealth-button-foreground-pressed: var(--text-fill-color-secondary);
+ --stealth-button-foreground-disabled: var(--text-fill-color-disabled);
+ --stealth-button-border: var(--control-fill-color-transparent);
+ --stealth-button-border-pointer-over: var(--control-border-color-default);
+ --stealth-button-border-pressed: var(--control-stroke-color-default);
+ --stealth-button-border-disabled: var(--control-fill-color-transparent);
+ --stealth-button-border-thickness: 1px solid;
+
+ --hyperlink-button-background: var(--control-fill-color-transparent);
+ --hyperlink-button-background-pointer-over: var(--control-fill-color-secondary);
+ --hyperlink-button-background-pressed: var(--control-fill-color-tertiary);
+ --hyperlink-button-background-disabled: var(--control-fill-color-transparent);
+ --hyperlink-button-foreground: var(--accent-default);
+ --hyperlink-button-foreground-pointer-over: var(--accent-tertiary);
+ --hyperlink-button-foreground-pressed: var(--accent-disabled);
+ --hyperlink-button-foreground-disabled: var(--accent-disabled);
+ --hyperlink-button-border: var(--control-fill-color-transparent);
+ --hyperlink-button-border-pointer-over: var(--control-border-color-default);
+ --hyperlink-button-border-pressed: var(--control-stroke-color-default);
+ --hyperlink-button-border-disabled: var(--control-fill-color-transparent);
+ --hyperlink-button-border-thickness: 1px solid;
+
+ /* CheckBox */
+ --check-box-check-corner-radius: var(--control-corner-radius);
+ --check-box-foreground: var(--text-fill-color-primary);
+ --check-box-foreground-disabled: var(--text-fill-color-disabled);
+
+ --check-box-check-background-stroke-unchecked: var(--control-strong-stroke-default);
+ --check-box-check-background-stroke-unchecked-pointer-over: var(--control-strong-stroke-default);
+ --check-box-check-background-stroke-unchecked-pressed: var(--control-strong-stroke-disabled);
+ --check-box-check-background-stroke-unchecked-disabled: var(--control-strong-stroke-disabled);
+ --check-box-check-background-stroke-checked: var(--accent-default);
+ --check-box-check-background-stroke-checked-pointer-over: var(--accent-secondary);
+ --check-box-check-background-stroke-checked-pressed: var(--accent-tertiary);
+ --check-box-check-background-stroke-checked-disabled: var(--control-strong-stroke-disabled);
+ --check-box-check-background-fill-unchecked: var(--control-alt-fill-color-secondary);
+ --check-box-check-background-fill-unchecked-pointer-over: var(--control-alt-fill-color-tertiary);
+ --check-box-check-background-fill-unchecked-pressed: var(--control-alt-fill-color-quarternary);
+ --check-box-check-background-fill-unchecked-disabled: var(--control-alt-fill-color-disabled);
+ --check-box-check-background-fill-checked: var(--accent-default);
+ --check-box-check-background-fill-checked-pointer-over: var(--accent-secondary);
+ --check-box-check-background-fill-checked-pressed: var(--accent-tertiary);
+ --check-box-check-background-fill-checked-disabled: var(--accent-disabled);
+
+ --check-box-check-glyph-foreground-unchecked: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-unchecked-pointer-over: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-unchecked-pressed: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-unchecked-disabled: var(--text-on-accent-disabled);
+ --check-box-check-glyph-foreground-checked: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-checked-pointer-over: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-checked-pressed: var(--text-on-accent-secondary);
+ --check-box-check-glyph-foreground-checked-disabled: var(--text-on-accent-disabled);
+
+ /* RadioButton */
+ --radio-button-foreground: var(--text-fill-color-primary);
+ --radio-button-foreground-pointer-over: var(--text-fill-color-primary);
+ --radio-button-foreground-pressed: var(--text-fill-color-primary);
+ --radio-button-foreground-disabled: var(--text-fill-color-disabled);
+ --radio-button-background: var(--control-fill-color-transparent);
+ --radio-button-background-pointer-over: var(--control-fill-color-transparent);
+ --radio-button-background-pressed: var(--control-fill-color-transparent);
+ --radio-button-background-disabled: var(--control-fill-color-transparent);
+ --radio-button-border: var(--control-fill-color-transparent);
+ --radio-button-border-pointer-over: var(--control-fill-color-transparent);
+ --radio-button-border-pressed: var(--control-fill-color-transparent);
+ --radio-button-border-disabled: var(--control-fill-color-transparent);
+
+ --radio-button-outer-ellipse-stroke: var(--control-strong-stroke-default);
+ --radio-button-outer-ellipse-stroke-pointer-over: var(--control-strong-stroke-default);
+ --radio-button-outer-ellipse-stroke-pressed: var(--control-strong-stroke-disabled);
+ --radio-button-outer-ellipse-stroke-disabled: var(--control-strong-stroke-disabled);
+ --radio-button-outer-ellipse-fill: var(--control-alt-fill-color-secondary);
+ --radio-button-outer-ellipse-fill-pointer-over: var(--control-alt-fill-color-tertiary);
+ --radio-button-outer-ellipse-fill-pressed: var(--control-alt-fill-color-quarternary);
+ --radio-button-outer-ellipse-fill-disabled: var(--control-alt-fill-color-disabled);
+
+ --radio-button-outer-ellipse-checked-stroke: var(--accent-default);
+ --radio-button-outer-ellipse-checked-stroke-pointer-over: var(--accent-secondary);
+ --radio-button-outer-ellipse-checked-stroke-pressed: var(--accent-tertiary);
+ --radio-button-outer-ellipse-checked-stroke-disabled: var(--accent-disabled);
+ --radio-button-outer-ellipse-checked-fill: var(--accent-default);
+ --radio-button-outer-ellipse-checked-fill-pointer-over: var(--accent-secondary);
+ --radio-button-outer-ellipse-checked-fill-pressed: var(--accent-tertiary);
+ --radio-button-outer-ellipse-checked-fill-disabled: var(--accent-disabled);
+
+ --radio-button-check-glyph-fill: var(--text-on-accent-primary);
+ --radio-button-check-glyph-fill-pointer-over: var(--text-on-accent-primary);
+ --radio-button-check-glyph-fill-pressed: var(--text-on-accent-primary);
+ --radio-button-check-glyph-fill-disabled: var(--text-on-accent-primary);
+ --radio-button-check-glyph-stroke: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-pointer-over: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-pressed: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-disabled: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-checked: var(--control-stroke-on-accent-default);
+ --radio-button-check-glyph-stroke-checked-pointer-over: var(--control-stroke-on-accent-default);
+ --radio-button-check-glyph-stroke-checked-pressed: var(--control-stroke-on-accent-default);
+ --radio-button-check-glyph-stroke-checked-disabled: var(--control-stroke-color-default);
+
+ /* ToggleSwitch */
+ --toggle-switch-foreground: var(--text-fill-color-primary);
+ --toggle-switch-foreground-disabled: var(--text-fill-color-disabled);
+ --toggle-switch-on-stroke-thickness: 0px;
+ --toggle-switch-outer-border-stroke-thickness: 1px;
+ --toggle-switch-fill-off: var(--control-alt-fill-color-secondary);
+ --toggle-switch-fill-off-pointer-over: var(--control-alt-fill-color-tertiary);
+ --toggle-switch-fill-off-pressed: var(--control-alt-fill-color-quarternary);
+ --toggle-switch-fill-off-disabled: var(--control-alt-fill-color-disabled);
+ --toggle-switch-stroke-off: var(--control-strong-stroke-default);
+ --toggle-switch-stroke-off-pointer-over: var(--control-strong-stroke-default);
+ --toggle-switch-stroke-off-pressed: var(--control-strong-stroke-default);
+ --toggle-switch-stroke-off-disabled: var(--control-strong-stroke-disabled);
+ --toggle-switch-fill-on: var(--accent-default);
+ --toggle-switch-fill-on-pointer-over: var(--accent-secondary);
+ --toggle-switch-fill-on-pressed: var(--accent-tertiary);
+ --toggle-switch-fill-on-disabled: var(--accent-disabled);
+ --toggle-switch-stroke-on: var(--accent-default);
+ --toggle-switch-stroke-on-pointer-over: var(--accent-secondary);
+ --toggle-switch-stroke-on-pressed: var(--accent-tertiary);
+ --toggle-switch-stroke-on-disabled: var(--accent-disabled);
+
+ --toggle-switch-knob-fill-off: var(--text-fill-color-secondary);
+ --toggle-switch-knob-fill-off-pointer-over: var(--text-fill-color-secondary);
+ --toggle-switch-knob-fill-off-pressed: var(--text-fill-color-secondary);
+ --toggle-switch-knob-fill-off-disabled: var(--text-fill-color-disabled);
+ --toggle-switch-knob-fill-on: var(--text-on-accent-primary);
+ --toggle-switch-knob-fill-on-pointer-over: var(--text-on-accent-primary);
+ --toggle-switch-knob-fill-on-pressed: var(--text-on-accent-primary);
+ --toggle-switch-knob-fill-on-disabled: var(--text-on-accent-disabled);
+ --toggle-switch-knob-stroke-on: var(--control-border-color-default);
+
+ /* GridView */
+ --grid-view-header-border-line: rgba(255, 255, 255, 0.2);
+ --grid-view-item-background: var(--card-background-color);
+ --grid-view-item-background-hover: var(--card-hover-background-color);
+ --grid-view-item-stroke: rgba(0, 0, 0, 0.3);
/* NavBar */
--navigation-view-content-background: var(--layer-fill-color-default);
@@ -332,4 +351,13 @@
--info-bar-border: var(--card-stroke-color-default);
--info-bar-border-thickness: 1px;
--info-bar-border-corner-radius: var(--control-corner-radius);
+
+ /* UISettingGroup */
+ --ui-setting-group-presenter-inner-ui-setting-background-color: transparent;
+
+ /* UIFileSelector */
+ --ui-file-selector-background-color: transparent;
+ --ui-file-selector-stroke-color: var(--text-fill-color-disabled);
+ --ui-file-selector-dragging-background-color: var(--control-fill-color-tertiary);
+ --ui-file-selector-dragging-stroke-color: var(--text-fill-color-tertiary);
}
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs
index 1d048f868..7b3e1af90 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs
@@ -84,7 +84,7 @@ internal sealed class FileStorage : IFileStorage
});
}
- public async ValueTask<PickFileResult?> PickOpenFileAsync(string[] fileTypes)
+ public async ValueTask<PickedFile?> PickOpenFileAsync(string[] fileTypes)
{
return await ThreadHelper.RunOnUIThreadAsync(async () =>
{
@@ -102,14 +102,14 @@ internal sealed class FileStorage : IFileStorage
FileResult? fileResult = await FilePicker.Default.PickAsync(otpions);
if (fileResult is not null)
{
- return new PickFileResult(fileResult.FileName, await fileResult.OpenReadAsync());
+ return new PickedFile(fileResult.FileName, await fileResult.OpenReadAsync());
}
return null;
});
}
- public async ValueTask<PickFileResult[]> PickOpenFilesAsync(string[] fileTypes)
+ public async ValueTask<PickedFile[]> PickOpenFilesAsync(string[] fileTypes)
{
return await ThreadHelper.RunOnUIThreadAsync(async () =>
{
@@ -127,16 +127,16 @@ internal sealed class FileStorage : IFileStorage
IEnumerable<FileResult>? fileResults = await FilePicker.Default.PickMultipleAsync(otpions);
if (fileResults is not null)
{
- var result = new List<PickFileResult>();
+ var result = new List<PickedFile>();
foreach (FileResult file in fileResults)
{
- result.Add(new PickFileResult(file.FileName, await file.OpenReadAsync()));
+ result.Add(new PickedFile(file.FileName, await file.OpenReadAsync()));
}
return result.ToArray();
}
- return Array.Empty<PickFileResult>();
+ return Array.Empty<PickedFile>();
});
}
diff --git a/src/build/Build.cs b/src/build/Build.cs
index f105c33e3..fa5896981 100644
--- a/src/build/Build.cs
+++ b/src/build/Build.cs
@@ -213,7 +213,7 @@ class Build : NukeBuild
.SetSelfContained(true)
.SetPublishSingleFile(false) // Not supported by MacCatalyst as it would require UseAppHost to be true, which isn't supported on Mac
.SetPublishReadyToRun(false)
- .SetPublishTrimmed(false)
+ .SetPublishTrimmed(true) // Should be true, even though the CSPROJ disable AOT and Trimming.
.SetVerbosity(DotNetVerbosity.Quiet)
.SetNoRestore(true) /* workaround for https://github.com/xamarin/xamarin-macios/issues/15664#issuecomment-1233123515 */
.SetProcessArgumentConfigurator(_ => _