Merge branch 'develop'

gunt3001 · May 11, 2024 · 90d13ae · 90d13ae
2 parents 49d511b + 23c5c7b
commit 90d13ae
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 227 deletions.
diff --git a/HsrGraphicsTool/FodyWeavers.xml b/HsrGraphicsTool/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>
diff --git a/HsrGraphicsTool/HsrGraphicsTool.csproj b/HsrGraphicsTool/HsrGraphicsTool.csproj
@@ -7,6 +7,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <Version>1.1.0</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -22,5 +23,6 @@
         <!--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.10" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
+        <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
     </ItemGroup>
 </Project>
diff --git a/HsrGraphicsTool/Models/HsrGraphicsConfiguration.cs b/HsrGraphicsTool/Models/HsrGraphicsConfiguration.cs
@@ -3,21 +3,22 @@
 /// <summary>
 /// Record representing the graphics settings of Honkai: Star Rail
 /// </summary>
-public record HsrGraphicsConfiguration
+public record HsrGraphicsConfiguration(GraphicsPresetOption GraphicsPreset,
+    HsrResolution Resolution, HsrCustomGraphics CustomGraphics)
 {
     /// <summary>
     /// The in-game "Graphics Quality" option
     /// </summary>
-    public GraphicsPresetOption GraphicsPreset { get; set; }
+    public GraphicsPresetOption GraphicsPreset { get; } = GraphicsPreset;
 
     /// <summary>
     /// Advanced graphics settings when the GraphicsPreset is set to Custom.
     /// Known values from the game will be used for other presets from Very Low to Very High.
     /// </summary>
-    public HsrCustomGraphics CustomGraphics { get; set; }
+    public HsrCustomGraphics CustomGraphics { get; } = CustomGraphics;
 
     /// <summary>
     /// The graphics resolution settings
     /// </summary>
-    public HsrResolution Resolution { get; set; }
+    public HsrResolution Resolution { get; } = Resolution;
 }
diff --git a/HsrGraphicsTool/Models/Services/HsrRegistryManager.cs b/HsrGraphicsTool/Models/Services/HsrRegistryManager.cs
@@ -70,12 +70,7 @@ class HsrRegistryManager : IHsrRegistryManager
 
         // If graphics object is still empty, read default values for the preset
         customGraphics ??= GetCustomGraphicsSettingsForPreset(preset);
-        return new HsrGraphicsConfiguration
-        {
-            GraphicsPreset = preset,
-            Resolution = resolution,
-            CustomGraphics = customGraphics,
-        };
+        return new HsrGraphicsConfiguration(preset, resolution, customGraphics);
     }
 
     /// <inheritdoc />