Skip to content

Commit e290d91

Browse files
authored
Improve Avalonia UI and fix Linux build issues (#4807)
1 parent 5c24a77 commit e290d91

17 files changed

Lines changed: 552 additions & 327 deletions

src/UniGetUI.Avalonia/App.axaml.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System.Diagnostics;
2-
using System.Diagnostics.CodeAnalysis;
32
using System.IO;
43
using Avalonia;
54
using Avalonia.Controls.ApplicationLifetimes;
65
using Avalonia.Markup.Xaml;
7-
using Avalonia.Markup.Xaml.Styling;
86
using Avalonia.Platform;
97
using Avalonia.Styling;
108
using Avalonia.Threading;
@@ -23,25 +21,12 @@ namespace UniGetUI.Avalonia;
2321

2422
public partial class App : Application
2523
{
26-
[UnconditionalSuppressMessage(
27-
"Trimming",
28-
"IL2026",
29-
Justification = "Platform theme dictionaries are Avalonia resources included in the app package; only the resource URI is selected dynamically.")]
3024
public override void Initialize()
3125
{
3226
AvaloniaXamlLoader.Load(this);
3327
#if AVALONIA_DIAGNOSTICS_ENABLED
3428
this.AttachDeveloperTools();
3529
#endif
36-
37-
string platform = OperatingSystem.IsWindows() ? "Windows"
38-
: OperatingSystem.IsMacOS() ? "macOS"
39-
: "Linux";
40-
41-
Styles.Add(new StyleInclude(new Uri("avares://UniGetUI.Avalonia/"))
42-
{
43-
Source = new Uri($"avares://UniGetUI.Avalonia/Assets/Styles/Styles.{platform}.axaml")
44-
});
4530
}
4631

4732
public override void OnFrameworkInitializationCompleted()

src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml

Lines changed: 227 additions & 0 deletions
Large diffs are not rendered by default.

src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml

Lines changed: 0 additions & 81 deletions
This file was deleted.

src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)