feat: upgrade packages and use new modal

Author: mika-engineering

OC.OfficeLiteServer/MainWindow.xaml

@@ -9,19 +9,25 @@
         WindowStartupLocation="CenterScreen"
         Title="OfficeLiteServer" Height="350" Width="525"
         Closing="MainWindow_OnClosing">
-        <Grid>
+    <Grid>
+        <Border>
+            <Border.Effect><BlurEffect x:Name="BlurEffect" Radius="0"></BlurEffect></Border.Effect>
+            <Grid>
                 <theme:LogViewer x:Name="LogViewer" Background="Transparent"/>
                 <Button 
-                        VerticalAlignment="Top" 
-                        HorizontalAlignment="Right" 
-                        Click="SettingsOnClick" 
-                        Margin="1" 
-                        Height="26" 
-                        Width="40"
-                        FontSize="14"
-                        Padding="0"
-                        FontFamily="{DynamicResource SymbolThemeFontFamily}">
-                        
+                    VerticalAlignment="Top" 
+                    HorizontalAlignment="Right" 
+                    Click="SettingsOnClick" 
+                    Margin="1" 
+                    Height="26" 
+                    Width="40"
+                    FontSize="14"
+                    Padding="0"
+                    FontFamily="{DynamicResource SymbolThemeFontFamily}">
+                    
                 </Button>
-        </Grid>
+            </Grid>
+        </Border>
+        <theme:Modal BlurEffect="{x:Reference BlurEffect}"></theme:Modal>
+    </Grid>
 </Window>

OC.OfficeLiteServer/MainWindow.xaml.cs

@@ -28,18 +28,22 @@ private void MainWindow_OnClosing(object sender, CancelEventArgs e)
         _server?.Stop();
     }
 
-    private void SettingsOnClick(object sender, RoutedEventArgs e)
+    private async void SettingsOnClick(object sender, RoutedEventArgs e)
     {
-        var settings = new SettingsView();
-        
-        var result = Assistant.Theme.MessageBox
-            .Show("Settings", settings, MessageBoxButton.OKCancel, MessageBoxImage.None);
-
-        if (result != MessageBoxResult.OK || !settings.Apply()) return;
+        try
+        {
+            var settings = new SettingsView();
+            var result = await Modal.Show("Settings", settings, MessageBoxButton.OKCancel, MessageBoxImage.None);
+            if (result != MessageBoxResult.OK || !settings.Apply()) return;
 
-        Logger.LogInfo(this, "Restarting server...");
-        _server?.Stop();
-        _server = new Y200Server(settings.Settings);
-        _server.Start();
+            Logger.LogInfo(this, "Restarting server...");
+            _server?.Stop();
+            _server = new Y200Server(settings.Settings);
+            _server.Start();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(this, ex.Message);
+        }
     }
 }

OC.OfficeLiteServer/OC.OfficeLiteServer.csproj

@@ -29,7 +29,7 @@
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
       <PackageReference Include="OC.Assistant.Sdk" Version="1.7.1" />
-      <PackageReference Include="OC.Assistant.Theme" Version="1.4.11" />
+      <PackageReference Include="OC.Assistant.Theme" Version="1.5.0" />
       <PackageReference Include="System.Text.Json" Version="9.0.5" />
     </ItemGroup>