port to avalonia 11 rc1

vddCore · Jul 1, 2023 · 7c1a183 · 7c1a183
1 parent 47eeff4
commit 7c1a183
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 21 deletions.
diff --git a/Slate/App.axaml b/Slate/App.axaml
@@ -42,8 +42,7 @@
     <Application.Styles>
         <fa:FluentAvaloniaTheme PreferSystemTheme="False"
                                 PreferUserAccentColor="True"
-                                UseSystemFontOnWindows="True"
-                                RequestedTheme="Dark" />
+                                UseSystemFontOnWindows="True" />
 
         <StyleInclude Source="/Resources/Styles/ToggleSwitch.axaml" />
         <StyleInclude Source="/Resources/Styles/Card.axaml" />

diff --git a/Slate/App.axaml.cs b/Slate/App.axaml.cs
@@ -48,10 +48,8 @@ public override void OnFrameworkInitializationCompleted()
 
             base.OnFrameworkInitializationCompleted();
 
-            TrayIcon.GetIcons(this)[0].IsVisible = true;
-
-            _platformSettings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
-            _platformSettings.ColorValuesChanged += PlatformSettings_ColorValuesChanged;
+            TrayIcon.GetIcons(this)![0].IsVisible = true;
+            PlatformSettings!.ColorValuesChanged += PlatformSettings_ColorValuesChanged;
         }
 
         private void OnMainWindowTransitionFinished(MainWindowTransitionFinishedMessage msg)

diff --git a/Slate/Infrastructure/Services/IApplicationExecutionService.cs b/Slate/Infrastructure/Services/IApplicationExecutionService.cs
@@ -0,0 +1,9 @@
+using Glitonea.Mvvm;
+
+namespace Slate.Infrastructure.Services
+{
+    public interface IApplicationExecutionService : IService
+    {
+        void RunElevatedProcess(string path);
+    }
+}
diff --git a/Slate/Infrastructure/Services/Implementations/ApplicationExecutionService.cs b/Slate/Infrastructure/Services/Implementations/ApplicationExecutionService.cs
@@ -0,0 +1,19 @@
+using System.Diagnostics;
+using System.IO;
+
+namespace Slate.Infrastructure.Services.Implementations
+{
+    public class ApplicationExecutionService : IApplicationExecutionService
+    {
+        public void RunElevatedProcess(string path)
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                UseShellExecute = true,
+                WorkingDirectory = Path.GetDirectoryName(path),
+                FileName = path,
+                Verb = "runas"
+            });
+        }
+    }
+}
diff --git a/Slate/Slate.csproj b/Slate/Slate.csproj
@@ -15,15 +15,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-preview5" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview5" />
-        <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview5" />
-        <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.700-11.0.0-preview5" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
+        <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-rc1" />
+        <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.802-11.0.0-rc1.1" />
         <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
         <PackageReference Include="System.Management" Version="7.0.0" />
-        <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Slate/View/Window/MainWindow.axaml.cs b/Slate/View/Window/MainWindow.axaml.cs
@@ -57,10 +57,13 @@ private void UpdateVisualState(PageMarker page)
 
         protected override void OnLoaded()
         {
-            var hwnd = PlatformImpl!.Handle.Handle;
-
-            ConfigureAsToolWindow(hwnd);
+            var hwnd = TryGetPlatformHandle()?.Handle ?? IntPtr.Zero;
 
+            if (hwnd != IntPtr.Zero)
+            {
+                ConfigureAsToolWindow(hwnd);
+            }
+
             IsVisible = false;
             Position = HiddenDesktopPosition;
 

diff --git a/Slate/ViewModel/Control/AuraColorControlViewModel.cs b/Slate/ViewModel/Control/AuraColorControlViewModel.cs
@@ -77,9 +77,7 @@ public bool FollowSystemAccentColor
 
                 if (value)
                 {
-                    var color = AvaloniaLocator
-                        .Current
-                        .GetRequiredService<IPlatformSettings>()
+                    var color = Application.Current!.PlatformSettings!
                         .GetColorValues()
                         .AccentColor1;
 

diff --git a/Slate/ViewModel/Page/FansPageViewModel.cs b/Slate/ViewModel/Page/FansPageViewModel.cs
@@ -64,9 +64,7 @@ public FansPageViewModel(
             _asusHalService = asusHalService;
             HardwareMonitor = hardwareMonitor;
 
-            var primaryColor = AvaloniaLocator
-                .Current
-                .GetRequiredService<IPlatformSettings>()
+            var primaryColor = Application.Current!.PlatformSettings!
                 .GetColorValues()
                 .AccentColor1
                 .ToSKColor();