Minor styling fixes

Author: IngvarX

src/Camelot.Services.Abstractions/IAppearanceSettingsService.cs

@@ -1,5 +1,4 @@
 using Camelot.Services.Abstractions.Models;
-using Camelot.Services.Abstractions.Models.Enums;
 
 namespace Camelot.Services.Abstractions;
 

src/Camelot.Services.Environment/Models/DriveInfo.cs

@@ -1,5 +1,4 @@
 using DriveType =  System.IO.DriveType;
-using IoDriveInfo = System.IO.DriveInfo;
 
 namespace Camelot.Services.Environment.Models;
 

src/Camelot.Services/AppearanceSettingsService.cs

@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Camelot.DataAccess.UnitOfWork;
 using Camelot.Services.Abstractions;
 using Camelot.Services.Abstractions.Models;
-using Camelot.Services.Abstractions.Models.Enums;
 
 namespace Camelot.Services;
 
 public class AppearanceSettingsService : IAppearanceSettingsService
 {
     private const string SettingsId = "AppearanceSettings";
+
     private readonly AppearanceSettingsModel _default;
     private readonly IUnitOfWorkFactory _unitOfWorkFactory;
+
     private AppearanceSettingsModel _cachedSettingsValue;
+
     public AppearanceSettingsService(IUnitOfWorkFactory unitOfWorkFactory)
     {
         _unitOfWorkFactory = unitOfWorkFactory;
@@ -28,27 +28,23 @@ public AppearanceSettingsModel GetAppearanceSettings()
             using var uow = _unitOfWorkFactory.Create();
             var repository = uow.GetRepository<AppearanceSettingsModel>();
             var dbModel = repository.GetById(SettingsId);
-            if (dbModel != null)
-                _cachedSettingsValue = dbModel;
-            else
-                _cachedSettingsValue = _default;
-        }
-        else
-        {
-            // we set value of _cachedValue in 'save',
-            // so no need to read from the repository every time.
+            _cachedSettingsValue = dbModel ?? _default;
         }
+
         return _cachedSettingsValue;
     }
 
 
     public void SaveAppearanceSettings(AppearanceSettingsModel appearanceSettingsModel)
     {
         if (appearanceSettingsModel == null)
+        {
             throw new ArgumentNullException(nameof(appearanceSettingsModel));
+        }
 
         using var uow = _unitOfWorkFactory.Create();
         var repository = uow.GetRepository<AppearanceSettingsModel>();
+
         repository.Upsert(SettingsId, appearanceSettingsModel);
         _cachedSettingsValue = appearanceSettingsModel;
     }

src/Camelot.ViewModels.Windows/ShellIcons/WindowsShellIconsService.cs

@@ -3,7 +3,6 @@
 using Camelot.ViewModels.Services.Interfaces.Enums;
 using Camelot.ViewModels.Services.Interfaces.Models;
 using Camelot.ViewModels.Windows.WinApi;
-using SystemBitmap = System.Drawing.Bitmap;
 using AvaloniaBitmap = Avalonia.Media.Imaging.Bitmap;
 
 namespace Camelot.ViewModels.Windows.ShellIcons;

src/Camelot.ViewModels.Windows/WinApi/ShellIcon.cs

@@ -1,5 +1,4 @@
 using Camelot.Services.Windows.WinApi;
-using System.Diagnostics;
 
 namespace Camelot.ViewModels.Windows.WinApi;
 

src/Camelot.ViewModels/Implementations/Settings/AppearanceSettingsViewModel.cs

@@ -17,7 +17,7 @@ public class AppearanceSettingsViewModel : ViewModelBase, ISettingsViewModel
 
 
     public bool IsChanged => _initialShowKeyboardShortcuts != ShowKeyboardShortcuts;
-    
+
     public AppearanceSettingsViewModel(
         IAppearanceSettingsService appearanceSettingService)
     {
@@ -34,13 +34,13 @@ public void Activate()
         _isActivated = true;
 
         var model = _appearanceSettingService.GetAppearanceSettings();
-        _initialShowKeyboardShortcuts = model.ShowKeyboardShortcuts;
-        ShowKeyboardShortcuts = _initialShowKeyboardShortcuts;
+        ShowKeyboardShortcuts = _initialShowKeyboardShortcuts = model.ShowKeyboardShortcuts;
     }
 
     public void SaveChanges()
     {
         var model = new AppearanceSettingsModel(ShowKeyboardShortcuts);
+
         _appearanceSettingService.SaveAppearanceSettings(model);
     }
 }

src/Camelot/Views/Dialogs/Settings/AppearanceSettingsView.xaml.cs

@@ -2,6 +2,7 @@
 using Avalonia.Markup.Xaml;
 
 namespace Camelot.Views.Dialogs.Settings;
+
 public class AppearanceSettingsView : UserControl
 {
     public AppearanceSettingsView()