Mac

Author: meruune

Amethyst.Desktop/Program.cs

@@ -30,28 +30,34 @@ public static AppBuilder BuildAvaloniaApp()
 
 public static class AppBuilderExtensions
 {
-    private static ISystemShell Shell { get; } = new SystemShell();
+    private static ISystemShell Shell { get; set; }
 
     public static AppBuilder SetupDesktopNotifications(this AppBuilder builder, out INotificationManager manager)
     {
-        if (Environment.OSVersion.Platform == PlatformID.Win32NT)
-        {
-            var context = WindowsApplicationContext.FromCurrentProcess();
-            manager = new WindowsNotificationManager(context);
-        }
-        else if (Environment.OSVersion.Platform == PlatformID.Unix)
-        {
-            var context = FreeDesktopApplicationContext.FromCurrentProcess();
-            manager = new FreeDesktopNotificationManager(context);
-        }
-        else
+        if (OperatingSystem.IsWindows()) Shell = new SystemShell();
+
+        // ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
+        switch (Environment.OSVersion.Platform)
         {
-            // TODO: OSX once implemented/stable
-            manager = null;
-            return builder;
+            case PlatformID.Win32NT:
+            {
+                var context = WindowsApplicationContext.FromCurrentProcess();
+                manager = new WindowsNotificationManager(context);
+                break;
+            }
+            case PlatformID.Unix:
+            {
+                var context = FreeDesktopApplicationContext.FromCurrentProcess();
+                manager = new FreeDesktopNotificationManager(context);
+                break;
+            }
+            default:
+                // TODO: OSX once implemented/stable
+                manager = null;
+                return builder;
         }
 
-        if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        if (!OperatingSystem.IsMacCatalyst() && !OperatingSystem.IsMacOS())
             manager.Initialize().GetAwaiter().GetResult();
 
         var notificationManager = manager;

Amethyst/Amethyst.csproj

@@ -6,7 +6,7 @@
     <NoWarn>$(NoWarn);NU1507</NoWarn>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
     <Version>2.0.0.0</Version>
   </PropertyGroup>
 

Amethyst/MainWindow.axaml

@@ -8,7 +8,9 @@
         xmlns:utils="clr-namespace:Amethyst.Utils"
         xmlns:avalonia="clr-namespace:FluentIcons.Avalonia;assembly=FluentIcons.Avalonia"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        Background="Transparent" TransparencyLevelHint="Mica,Transparent" x:Name="Root">
+        Background="{DynamicResource SolidBackgroundFillColorTertiaryBrush}" 
+        TransparencyLevelHint="Mica,Transparent" 
+        x:Name="Root">
 
     <Grid RowDefinitions="Auto,*">
         <Grid Name="TitleBarHost" ZIndex="1"

Amethyst/MainWindow.axaml.cs

@@ -87,6 +87,9 @@ private void OnActualThemeVariantChanged(object sender, EventArgs e)
 
     private void TryEnableMicaEffect()
     {
+        if (OperatingSystem.IsWindows())
+            Background = new SolidColorBrush(Colors.Transparent);
+        
         return;
         // TransparencyBackgroundFallback = Brushes.Transparent;
         // TransparencyLevelHint = WindowTransparencyLevel.Mica;

Amethyst/Utils/SystemShell.cs

@@ -3,7 +3,7 @@
 
 public interface ISystemShell
 {
-    public static ISystemShell Instance => Locator.Current.GetService<ISystemShell>();
+    public static ISystemShell Instance => Locator.Current.GetService<ISystemShell>() ?? StubShell.Instance;
 
     uint TimeBeginPeriod(uint uMilliseconds);
     uint TimeEndPeriod(uint uMilliseconds);
@@ -12,6 +12,16 @@ public interface ISystemShell
     Bitmap GetFileIcon(string path);
 }
 
+public class StubShell : ISystemShell
+{
+    public static StubShell Instance { get; } = new();
+    public uint TimeBeginPeriod(uint uMilliseconds) => 0;
+    public uint TimeEndPeriod(uint uMilliseconds) => 0;
+    public void OpenFolderAndSelectItem(string path) { }
+    public void OpenFolderAndSelectItem(Uri path) { }
+    public Bitmap GetFileIcon(string path) => null;
+}
+
 #if FALSE
 using System;
 using System.ComponentModel;