Fix warnings and back package import

TheTrackerCouncil · Dec 20, 2024 · c755856 · c755856
1 parent b7900f3
commit c755856
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/src/TrackerCouncil.Smz3.Data/Services/TrackerSpriteService.cs b/src/TrackerCouncil.Smz3.Data/Services/TrackerSpriteService.cs
@@ -9,9 +9,8 @@ namespace TrackerCouncil.Smz3.Data.Services;
 /// <summary>
 /// Service for loading tracker speech sprites
 /// </summary>
-/// <param name="logger"></param>
 /// <param name="optionsFactory"></param>
-public class TrackerSpriteService(ILogger<TrackerSpriteService> logger, OptionsFactory optionsFactory)
+public class TrackerSpriteService(OptionsFactory optionsFactory)
 {
     private List<TrackerSpeechImagePack> _packs = [];
 

diff --git a/src/TrackerCouncil.Smz3.Data/TrackerCouncil.Smz3.Data.csproj b/src/TrackerCouncil.Smz3.Data/TrackerCouncil.Smz3.Data.csproj
@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Avalonia" Version="11.0.11" />
     <PackageReference Include="MattEqualsCoder.DynamicForms.Core" Version="1.0.1" />
     <PackageReference Include="MattEqualsCoder.GitHubReleaseChecker" Version="1.1.2" />
     <PackageReference Include="MattEqualsCoder.MSURandomizer.Library" Version="3.0.0-rc.5" />
@@ -35,12 +36,6 @@
     <ProjectReference Include="..\TrackerCouncil.Smz3.Shared\TrackerCouncil.Smz3.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Avalonia.Base">
-      <HintPath>..\..\..\..\..\.nuget\packages\avalonia\11.0.11\ref\net6.0\Avalonia.Base.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <!--<ItemGroup>
     <FrameworkReference Include="Microsoft.WindowsDesktop.App" />
   </ItemGroup>-->

diff --git a/src/TrackerCouncil.Smz3.Data/ViewModels/SpriteViewModel.cs b/src/TrackerCouncil.Smz3.Data/ViewModels/SpriteViewModel.cs
@@ -50,8 +50,8 @@ public SpriteViewModel(Sprite sprite)
     public int ImageHeight { get; }
     public float IconOpacity { get; }
 
-    private string _previewPath;
-    public string PreviewPath
+    private string? _previewPath;
+    public string? PreviewPath
     {
         get => _previewPath;
         set => SetField(ref _previewPath, value);

diff --git a/src/TrackerCouncil.Smz3.UI/Services/TrackerSpeechWindowService.cs b/src/TrackerCouncil.Smz3.UI/Services/TrackerSpeechWindowService.cs
@@ -13,7 +13,7 @@
 
 namespace TrackerCouncil.Smz3.UI.Services;
 
-public class TrackerSpeechWindowService(ICommunicator communicator, IUIService uiService, OptionsFactory optionsFactory, TrackerSpriteService trackerSpriteService) : ControlService
+public class TrackerSpeechWindowService(ICommunicator communicator, OptionsFactory optionsFactory, TrackerSpriteService trackerSpriteService) : ControlService
 {
     TrackerSpeechWindowViewModel _model = new();
 

diff --git a/src/TrackerCouncil.Smz3.UI/Views/SpriteWindow.axaml.cs b/src/TrackerCouncil.Smz3.UI/Views/SpriteWindow.axaml.cs
@@ -286,7 +286,7 @@ private async void AddSpriteButton_OnClick(object? sender, RoutedEventArgs e)
                 Model.Sprites.Add(model);
             }
         }
-        catch (Exception exception)
+        catch
         {
             await MessageWindow.ShowErrorDialog("Error attempting to select the sprite");
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                     Model.Sprites.Add(model);
                 }
             }
-            catch (Exception exception)
+            catch
             {
                 await MessageWindow.ShowErrorDialog("Error attempting to select the sprite");
             }
@@ Expand Down @@