From 0669b8910ce2bd9666a107e3d8fb295379cca65a Mon Sep 17 00:00:00 2001
From: Selim Mustafaev <selim@fastmail.fm>
Date: Mon, 6 May 2024 01:44:57 +0300
Subject: [PATCH] Warnings cleanup

---
 AutoCat/App.axaml                          |  1 -
 AutoCat/App.axaml.cs                       |  2 +-
 AutoCat/Extensions/MathExtension.cs        |  5 ++--
 AutoCat/Extensions/TernaryExtension.cs     | 14 ++++-------
 AutoCat/Extensions/ThicknessExtension.cs   | 27 ----------------------
 AutoCat/Pages/HistoryPage.axaml.cs         |  2 --
 AutoCat/Pages/ReportPage.axaml.cs          |  5 +---
 AutoCat/Pages/SettingsPage.axaml.cs        |  2 --
 AutoCat/ViewModels/AuthWindowViewModel.cs  |  3 ---
 AutoCat/ViewModels/CheckNumberViewModel.cs |  2 --
 AutoCat/ViewModels/HistoryViewModel.cs     |  3 +--
 AutoCat/Views/MasterDetailView.axaml       |  1 -
 AutoCat/Views/MasterDetailView.axaml.cs    |  1 -
 AutoCat/Views/PlateView.axaml              |  7 +++---
 AutoCat/Views/PlateView.axaml.cs           |  6 +----
 AutoCat/Views/ReportTextItem.axaml.cs      |  1 -
 AutoCat/Windows/AuthWindow.axaml           |  2 +-
 AutoCat/Windows/AuthWindow.axaml.cs        |  3 +--
 AutoCat/Windows/CheckNumberDialog.axaml    |  1 -
 AutoCat/Windows/CheckNumberDialog.axaml.cs |  4 ----
 AutoCat/Windows/MainWindow.axaml           |  1 -
 AutoCat/Windows/MainWindow.axaml.cs        |  3 +--
 AutoCatCore/Model/AutoCatDbContext.cs      |  5 ----
 23 files changed, 17 insertions(+), 84 deletions(-)
 delete mode 100644 AutoCat/Extensions/ThicknessExtension.cs

diff --git a/AutoCat/App.axaml b/AutoCat/App.axaml
index 76b15f6..f7a96ad 100644
--- a/AutoCat/App.axaml
+++ b/AutoCat/App.axaml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:AutoCat"
              xmlns:sty="using:FluentAvalonia.Styling"
              x:Class="AutoCat.App"
              RequestedThemeVariant="Default">
diff --git a/AutoCat/App.axaml.cs b/AutoCat/App.axaml.cs
index 1c0996d..97e0876 100644
--- a/AutoCat/App.axaml.cs
+++ b/AutoCat/App.axaml.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Hosting;
 
 namespace AutoCat;
 
-public partial class App : Application
+public class App : Application
 {
     public IHost AppHost { get; private set; }
 
diff --git a/AutoCat/Extensions/MathExtension.cs b/AutoCat/Extensions/MathExtension.cs
index 3d10f5b..abfea05 100644
--- a/AutoCat/Extensions/MathExtension.cs
+++ b/AutoCat/Extensions/MathExtension.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
@@ -7,9 +6,9 @@ using Avalonia.Markup.Xaml.MarkupExtensions;
 
 namespace AutoCat.Extensions;
 
-public class MathExtension: MarkupExtension
+public class MathExtension(string path): MarkupExtension
 {
-    public string Path { get; set; }
+    public string Path { get; set; } = path;
     
     public double Mult { get; set; } = 1;
     public double Add { get; set; } = 0;
diff --git a/AutoCat/Extensions/TernaryExtension.cs b/AutoCat/Extensions/TernaryExtension.cs
index 994d85c..257a90d 100644
--- a/AutoCat/Extensions/TernaryExtension.cs
+++ b/AutoCat/Extensions/TernaryExtension.cs
@@ -6,24 +6,20 @@ using Avalonia.Markup.Xaml.MarkupExtensions;
 
 namespace AutoCat.Extensions;
 
-public class TernaryExtension : MarkupExtension
+public class TernaryExtension(string path) : MarkupExtension
 {
-    public TernaryExtension()
-    {
-    }
+    public string Path { get; set; } = path;
     
-    public string Path { get; set; }
+    public object? True { get; set; }
     
-    public object True { get; set; }
-    
-    public object False { get; set; }
+    public object? False { get; set; }
     
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
         var binding = new ReflectionBindingExtension(Path)
         {
             Mode = BindingMode.OneWay,
-            Converter = new FuncValueConverter<bool, object>(e => e ? True : False)
+            Converter = new FuncValueConverter<bool, object?>(e => e ? True : False)
         };
 
         return binding.ProvideValue(serviceProvider);
diff --git a/AutoCat/Extensions/ThicknessExtension.cs b/AutoCat/Extensions/ThicknessExtension.cs
deleted file mode 100644
index 8ae888c..0000000
--- a/AutoCat/Extensions/ThicknessExtension.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.MarkupExtensions;
-
-namespace AutoCat.Extensions;
-
-public class ThicknessExtension: MarkupExtension
-{
-    public string Path { get; set; }
-    
-    public double Mult { get; set; } = 1;
-    public double Add { get; set; } = 0;
-
-    public override object ProvideValue(IServiceProvider serviceProvider)
-    {
-        var binding = new ReflectionBindingExtension(Path)
-        {
-            Mode = BindingMode.OneWay,
-            Converter = new FuncValueConverter<double, object>(e => new Thickness( e*Mult + Add))
-        };
-
-        return binding.ProvideValue(serviceProvider);
-    }
-}
\ No newline at end of file
diff --git a/AutoCat/Pages/HistoryPage.axaml.cs b/AutoCat/Pages/HistoryPage.axaml.cs
index 4a53307..a14edea 100644
--- a/AutoCat/Pages/HistoryPage.axaml.cs
+++ b/AutoCat/Pages/HistoryPage.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AutoCat.Pages;
 
diff --git a/AutoCat/Pages/ReportPage.axaml.cs b/AutoCat/Pages/ReportPage.axaml.cs
index 0011543..2f3aa5f 100644
--- a/AutoCat/Pages/ReportPage.axaml.cs
+++ b/AutoCat/Pages/ReportPage.axaml.cs
@@ -1,9 +1,6 @@
-using System;
-using System.ComponentModel;
 using AutoCatCore.Model;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AutoCat.Pages;
 
@@ -20,7 +17,7 @@ public partial class ReportPage : UserControl
     
     public Vehicle Vehicle
     {
-        get => (Vehicle)GetValue(VehicleProperty);
+        get => GetValue(VehicleProperty);
         set => SetValue(VehicleProperty, value);
     }
 
diff --git a/AutoCat/Pages/SettingsPage.axaml.cs b/AutoCat/Pages/SettingsPage.axaml.cs
index 3ed72a8..f4ad958 100644
--- a/AutoCat/Pages/SettingsPage.axaml.cs
+++ b/AutoCat/Pages/SettingsPage.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AutoCat.Pages;
 
diff --git a/AutoCat/ViewModels/AuthWindowViewModel.cs b/AutoCat/ViewModels/AuthWindowViewModel.cs
index f18edd5..effab50 100644
--- a/AutoCat/ViewModels/AuthWindowViewModel.cs
+++ b/AutoCat/ViewModels/AuthWindowViewModel.cs
@@ -5,9 +5,6 @@ using AutoCat.Utils;
 using AutoCatCore.Services.Api;
 using AutoCatCore.Services.Storage;
 using ReactiveUI;
-using MsBox.Avalonia;
-using MsBox.Avalonia.Dto;
-using MsBox.Avalonia.Enums;
 
 namespace AutoCat.ViewModels;
 
diff --git a/AutoCat/ViewModels/CheckNumberViewModel.cs b/AutoCat/ViewModels/CheckNumberViewModel.cs
index 78a4a6d..9bb5b66 100644
--- a/AutoCat/ViewModels/CheckNumberViewModel.cs
+++ b/AutoCat/ViewModels/CheckNumberViewModel.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Reactive;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 using AutoCat.Utils;
 using AutoCatCore.Model;
 using AutoCatCore.Services.Api;
-using DynamicData.Binding;
 using ReactiveUI;
 
 namespace AutoCat.ViewModels;
diff --git a/AutoCat/ViewModels/HistoryViewModel.cs b/AutoCat/ViewModels/HistoryViewModel.cs
index 8d1e09e..75b59bf 100644
--- a/AutoCat/ViewModels/HistoryViewModel.cs
+++ b/AutoCat/ViewModels/HistoryViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Threading.Tasks;
 using AutoCatCore.Model;
 using AutoCatCore.Services.Api;
 using DynamicData;
@@ -28,7 +27,7 @@ public class HistoryViewModel: ViewModelBase
         LoadVehicles();
     }
     
-    private async Task LoadVehicles()
+    private async void LoadVehicles()
     {
         try
         {
diff --git a/AutoCat/Views/MasterDetailView.axaml b/AutoCat/Views/MasterDetailView.axaml
index fcd2685..dce56b1 100644
--- a/AutoCat/Views/MasterDetailView.axaml
+++ b/AutoCat/Views/MasterDetailView.axaml
@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pages="clr-namespace:AutoCat.Pages"
              xmlns:views="clr-namespace:AutoCat.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="AutoCat.Views.MasterDetailView"
diff --git a/AutoCat/Views/MasterDetailView.axaml.cs b/AutoCat/Views/MasterDetailView.axaml.cs
index 966cf97..4f14d96 100644
--- a/AutoCat/Views/MasterDetailView.axaml.cs
+++ b/AutoCat/Views/MasterDetailView.axaml.cs
@@ -2,7 +2,6 @@ using System.Collections;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Avalonia.Markup.Xaml;
 
 namespace AutoCat.Views;
 
diff --git a/AutoCat/Views/PlateView.axaml b/AutoCat/Views/PlateView.axaml
index f8eb420..72e9247 100644
--- a/AutoCat/Views/PlateView.axaml
+++ b/AutoCat/Views/PlateView.axaml
@@ -9,7 +9,7 @@
              x:Name="PlateViewControl"
              SizeChanged="UserControl_SizeChanged">
     
-    <Grid Height="{ext:Math Path=#PlateViewControl.Bounds.Width, Mult={x:Static views:PlateView.AspectRatio}}">
+    <Grid Height="{ext:Math #PlateViewControl.Bounds.Width, Mult={x:Static views:PlateView.AspectRatio}}">
             <Rectangle Name="MainRect" Fill="#ccc"/>
             <Grid ColumnDefinitions="73*,27*">
 
@@ -44,13 +44,12 @@
                                 Orientation="Horizontal" 
                                 HorizontalAlignment="Center" 
                                 VerticalAlignment="Center">
-                        <TextBlock Grid.Column="0" 
-                                   x:Name="CountryName" 
+                        <TextBlock x:Name="CountryName" 
                                    Text="RUS" 
                                    VerticalAlignment="Center" 
                                    HorizontalAlignment="Center"
                                    Foreground="#ccc"/>
-                        <Grid Grid.Column="2" x:Name="FlagGrid" RowDefinitions="*,*,*">
+                        <Grid x:Name="FlagGrid" RowDefinitions="*,*,*">
                             <Rectangle Grid.Row="0" Fill="White"/>
                             <Rectangle Grid.Row="1" Fill="Blue"/>
                             <Rectangle Grid.Row="2" Fill="Red"/>
diff --git a/AutoCat/Views/PlateView.axaml.cs b/AutoCat/Views/PlateView.axaml.cs
index a1cb28e..f150a94 100644
--- a/AutoCat/Views/PlateView.axaml.cs
+++ b/AutoCat/Views/PlateView.axaml.cs
@@ -1,10 +1,6 @@
-using System;
 using AutoCatCore.Model;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Markup.Xaml;
-using SkiaSharp;
 
 namespace AutoCat.Views;
 
@@ -21,7 +17,7 @@ public partial class PlateView : UserControl
     
     public string Number
     {
-        get => (string)GetValue(NumberProperty);
+        get => GetValue(NumberProperty);
         set => SetValue(NumberProperty, value);
     }
 
diff --git a/AutoCat/Views/ReportTextItem.axaml.cs b/AutoCat/Views/ReportTextItem.axaml.cs
index 754275c..08f068c 100644
--- a/AutoCat/Views/ReportTextItem.axaml.cs
+++ b/AutoCat/Views/ReportTextItem.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AutoCat.Views;
 
diff --git a/AutoCat/Windows/AuthWindow.axaml b/AutoCat/Windows/AuthWindow.axaml
index 4e6ad7d..48c6bb0 100644
--- a/AutoCat/Windows/AuthWindow.axaml
+++ b/AutoCat/Windows/AuthWindow.axaml
@@ -28,7 +28,7 @@
         <TextBox Watermark="Password" PasswordChar="*" 
                  Text="{Binding Password}"
                  IsEnabled="{Binding !LoginCommand.IsExecuting^}"/>
-        <Button Content="{ext:Ternary Path=LoginCommand.IsExecuting^, True=Logging In..., False=Log In}"  
+        <Button Content="{ext:Ternary LoginCommand.IsExecuting^, True=Logging In..., False=Log In}"  
                 Command="{Binding LoginCommand}"
                 IsEnabled="{Binding !LoginCommand.IsExecuting^}"
                 HorizontalAlignment="Stretch" 
diff --git a/AutoCat/Windows/AuthWindow.axaml.cs b/AutoCat/Windows/AuthWindow.axaml.cs
index 1e3444b..8cc201b 100644
--- a/AutoCat/Windows/AuthWindow.axaml.cs
+++ b/AutoCat/Windows/AuthWindow.axaml.cs
@@ -3,7 +3,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting.Internal;
 
 namespace AutoCat.Windows;
 
@@ -15,7 +14,7 @@ public partial class AuthWindow : Window
 
         if (DataContext is AuthWindowViewModel vm)
         {
-            vm.ReplaceWithMainWindowEvent += (sender, args) =>
+            vm.ReplaceWithMainWindowEvent += (_, _) =>
             {
                 if (Application.Current is not App app) return;
                 if (app.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop) return;
diff --git a/AutoCat/Windows/CheckNumberDialog.axaml b/AutoCat/Windows/CheckNumberDialog.axaml
index 7987af0..c19ee6b 100644
--- a/AutoCat/Windows/CheckNumberDialog.axaml
+++ b/AutoCat/Windows/CheckNumberDialog.axaml
@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:utils="using:AutoCat.Utils"
              xmlns:vm="using:AutoCat.ViewModels"
-             xmlns:ext="using:AutoCat.Extensions"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="AutoCat.Windows.CheckNumberDialog"
              x:DataType="vm:CheckNumberViewModel"
diff --git a/AutoCat/Windows/CheckNumberDialog.axaml.cs b/AutoCat/Windows/CheckNumberDialog.axaml.cs
index 04aa9e1..c600556 100644
--- a/AutoCat/Windows/CheckNumberDialog.axaml.cs
+++ b/AutoCat/Windows/CheckNumberDialog.axaml.cs
@@ -1,8 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Markup.Xaml;
-using FluentAvalonia.UI.Controls;
 
 namespace AutoCat.Windows;
 
diff --git a/AutoCat/Windows/MainWindow.axaml b/AutoCat/Windows/MainWindow.axaml
index d195ee6..dc6a280 100644
--- a/AutoCat/Windows/MainWindow.axaml
+++ b/AutoCat/Windows/MainWindow.axaml
@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:utils="using:AutoCat.Utils"
         xmlns:ui="using:FluentAvalonia.UI.Controls"
-        xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="800"
         Height="600"
diff --git a/AutoCat/Windows/MainWindow.axaml.cs b/AutoCat/Windows/MainWindow.axaml.cs
index e03cfd4..91401e9 100644
--- a/AutoCat/Windows/MainWindow.axaml.cs
+++ b/AutoCat/Windows/MainWindow.axaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoCat.Pages;
 using AutoCat.ViewModels;
 using Avalonia.Controls;
@@ -66,7 +65,7 @@ public partial class MainWindow : Window
         
         if (dialogContent.DataContext is CheckNumberViewModel vm)
         {
-            vm.AutoCloseEvent += (sender, args) =>
+            vm.AutoCloseEvent += (_, _) =>
             {
                 dialog.Hide();
                 Console.WriteLine($"Checked number: {vm.Vehicle?.Number}");
diff --git a/AutoCatCore/Model/AutoCatDbContext.cs b/AutoCatCore/Model/AutoCatDbContext.cs
index 3d985bb..9e0cb88 100644
--- a/AutoCatCore/Model/AutoCatDbContext.cs
+++ b/AutoCatCore/Model/AutoCatDbContext.cs
@@ -1,9 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AutoCatCore.Model
 {