Even more code tweaks

codemonkey85 · Dec 17, 2024 · 6bd1dc2 · 6bd1dc2
1 parent 25aef8f
commit 6bd1dc2
Show file tree

Hide file tree

Showing 36 changed files with 283 additions and 329 deletions.
diff --git a/Pkmds.Web/Components/BoxComponent.razor.cs b/Pkmds.Web/Components/BoxComponent.razor.cs
@@ -2,8 +2,7 @@ namespace Pkmds.Web.Components;
 
 public partial class BoxComponent : IDisposable
 {
-    [Parameter]
-    public int BoxNumber { get; set; }
+    [Parameter] public int BoxNumber { get; set; }
 
     private BoxEdit? BoxEdit { get; set; }
 
@@ -38,9 +37,8 @@ private void ReloadBox()
             return;
         }
 
-        BoxEdit = new BoxEdit(AppState.SaveFile);
+        BoxEdit = new(AppState.SaveFile);
         BoxEdit.LoadBox(BoxNumber);
         RefreshService.Refresh();
     }
 }
-
diff --git a/Pkmds.Web/Components/BoxGrid.razor.cs b/Pkmds.Web/Components/BoxGrid.razor.cs
@@ -2,11 +2,9 @@ namespace Pkmds.Web.Components;
 
 public partial class BoxGrid : IDisposable
 {
-    [Parameter, EditorRequired]
-    public BoxEdit? BoxEdit { get; set; }
+    [Parameter, EditorRequired] public BoxEdit? BoxEdit { get; set; }
 
-    [Parameter, EditorRequired]
-    public int BoxNumber { get; set; }
+    [Parameter, EditorRequired] public int BoxNumber { get; set; }
 
     private string BoxGridClass =>
         AppState.SaveFile?.BoxSlotCount == 20 ? "box-grid-20" : "box-grid-30";

diff --git a/Pkmds.Web/Components/BoxSlotComponent.cs b/Pkmds.Web/Components/BoxSlotComponent.cs
@@ -2,6 +2,5 @@ namespace Pkmds.Web.Components;
 
 public class BoxSlotComponent : PokemonSlotComponent
 {
-    [Parameter, EditorRequired]
-    public int BoxNumber { get; set; }
+    [Parameter, EditorRequired] public int BoxNumber { get; set; }
 }
diff --git a/Pkmds.Web/Components/DateOnlyPicker.razor.cs b/Pkmds.Web/Components/DateOnlyPicker.razor.cs
@@ -2,32 +2,23 @@ namespace Pkmds.Web.Components;
 
 public partial class DateOnlyPicker
 {
-    [CascadingParameter]
-    public EditContext? EditContext { get; set; }
+    [CascadingParameter] public EditContext? EditContext { get; set; }
 
-    [Parameter, EditorRequired]
-    public DateOnly? Date { get; set; }
+    [Parameter, EditorRequired] public DateOnly? Date { get; set; }
 
-    [Parameter]
-    public EventCallback<DateOnly?> DateChanged { get; set; }
+    [Parameter] public EventCallback<DateOnly?> DateChanged { get; set; }
 
-    [Parameter, EditorRequired]
-    public string? Label { get; set; }
+    [Parameter, EditorRequired] public string? Label { get; set; }
 
-    [Parameter]
-    public Expression<Func<DateOnly?>>? For { get; set; }
+    [Parameter] public Expression<Func<DateOnly?>>? For { get; set; }
 
-    [Parameter]
-    public bool ReadOnly { get; set; }
+    [Parameter] public bool ReadOnly { get; set; }
 
-    [Parameter]
-    public string? HelperText { get; set; }
+    [Parameter] public string? HelperText { get; set; }
 
-    [Parameter]
-    public Variant Variant { get; set; } = Variant.Outlined;
+    [Parameter] public Variant Variant { get; set; } = Variant.Outlined;
 
-    [Parameter]
-    public Color Color { get; set; } = Color.Default;
+    [Parameter] public Color Color { get; set; } = Color.Default;
 
     private MudDatePicker? datePickerRef;
 
@@ -36,11 +27,13 @@ private DateTime? DateBindTarget
         get => Date?.ToDateTime(TimeOnly.MinValue);
         set
         {
-            if (value is not null)
+            if (value is null)
             {
-                Date = DateOnly.FromDateTime((DateTime)value);
-                DateChanged.InvokeAsync(Date);
+                return;
             }
+
+            Date = DateOnly.FromDateTime((DateTime)value);
+            DateChanged.InvokeAsync(Date);
         }
     }
 
@@ -53,11 +46,14 @@ protected override void OnAfterRender(bool firstRender)
 
         if (EditContext is null)
         {
-            throw new Exception("Using 'For' without an 'EditContext' is not supported. Are you missing an 'EditForm'?");
+            throw new(
+                "Using 'For' without an 'EditContext' is not supported. Are you missing an 'EditForm'?");
         }
 
         // Get the private field _fieldidentifier by reflection.
-        var fieldIdentifierField = typeof(MudFormComponent<DateTime?, string>).GetField("_fieldIdentifier", BindingFlags.Instance | BindingFlags.NonPublic);
+        var fieldIdentifierField =
+            typeof(MudFormComponent<DateTime?, string>).GetField("_fieldIdentifier",
+                BindingFlags.Instance | BindingFlags.NonPublic);
 
         // Set the field identifier with our DateOnly? expression, avoiding the type issue between DateOnly vs DateTime
         fieldIdentifierField?.SetValue(datePickerRef, FieldIdentifier.Create(For));

diff --git a/Pkmds.Web/Components/Dialogs/ConfirmActionDialog.razor.cs b/Pkmds.Web/Components/Dialogs/ConfirmActionDialog.razor.cs
@@ -2,35 +2,25 @@ namespace Pkmds.Web.Components.Dialogs;
 
 public partial class ConfirmActionDialog
 {
-    [CascadingParameter]
-    private MudDialogInstance? MudDialog { get; set; }
+    [CascadingParameter] private MudDialogInstance? MudDialog { get; set; }
 
-    [Parameter]
-    public string Title { get; set; } = "Confirm Action";
+    [Parameter] public string Title { get; set; } = "Confirm Action";
 
-    [Parameter]
-    public string Message { get; set; } = "Are you sure you want to perform this action?";
+    [Parameter] public string Message { get; set; } = "Are you sure you want to perform this action?";
 
-    [Parameter]
-    public string ConfirmText { get; set; } = "Confirm";
+    [Parameter] public string ConfirmText { get; set; } = "Confirm";
 
-    [Parameter]
-    public string ConfirmIcon { get; set; } = Icons.Material.Filled.Check;
+    [Parameter] public string ConfirmIcon { get; set; } = Icons.Material.Filled.Check;
 
-    [Parameter]
-    public Color ConfirmColor { get; set; } = Color.Primary;
+    [Parameter] public Color ConfirmColor { get; set; } = Color.Primary;
 
-    [Parameter]
-    public string CancelText { get; set; } = "Cancel";
+    [Parameter] public string CancelText { get; set; } = "Cancel";
 
-    [Parameter]
-    public string CancelIcon { get; set; } = Icons.Material.Filled.Clear;
+    [Parameter] public string CancelIcon { get; set; } = Icons.Material.Filled.Clear;
 
-    [Parameter]
-    public Color CancelColor { get; set; } = Color.Secondary;
+    [Parameter] public Color CancelColor { get; set; } = Color.Secondary;
 
-    [Parameter]
-    public EventCallback<bool> OnConfirm { get; set; }
+    [Parameter] public EventCallback<bool> OnConfirm { get; set; }
 
     private void Confirm()
     {

diff --git a/Pkmds.Web/Components/Dialogs/ShowdownExportDialog.razor.cs b/Pkmds.Web/Components/Dialogs/ShowdownExportDialog.razor.cs
@@ -2,13 +2,13 @@ namespace Pkmds.Web.Components.Dialogs;
 
 public partial class ShowdownExportDialog
 {
-    [Parameter]
-    public PKM? Pokemon { get; set; }
+    [Parameter] public PKM? Pokemon { get; set; }
 
-    [CascadingParameter]
-    private MudDialogInstance? MudDialog { get; set; }
+    [CascadingParameter] private MudDialogInstance? MudDialog { get; set; }
 
-    private string ShowdownExport => Pokemon is not null ? AppService.ExportPokemonAsShowdown(Pokemon) : AppService.ExportPartyAsShowdown();
+    private string ShowdownExport => Pokemon is not null
+        ? AppService.ExportPokemonAsShowdown(Pokemon)
+        : AppService.ExportPartyAsShowdown();
 
     private void Close() => MudDialog?.Close();
 }
diff --git a/Pkmds.Web/Components/EditForms/PokemonEditForm.razor.cs b/Pkmds.Web/Components/EditForms/PokemonEditForm.razor.cs
@@ -2,8 +2,7 @@ namespace Pkmds.Web.Components.EditForms;
 
 public partial class PokemonEditForm : IDisposable
 {
-    [Parameter, EditorRequired]
-    public PKM? Pokemon { get; set; }
+    [Parameter, EditorRequired] public PKM? Pokemon { get; set; }
 
     protected override void OnInitialized() =>
         RefreshService.OnAppStateChanged += StateHasChanged;
@@ -14,14 +13,8 @@ public void Dispose() =>
     private void ExportAsShowdown() =>
         DialogService.Show<ShowdownExportDialog>(
             "Showdown Export",
-            new DialogParameters
-            {
-                { nameof(ShowdownExportDialog.Pokemon), Pokemon }
-            },
-            new DialogOptions
-            {
-                CloseOnEscapeKey = true,
-            });
+            new() { { nameof(ShowdownExportDialog.Pokemon), Pokemon } },
+            new() { CloseOnEscapeKey = true, });
 
     private void DeletePokemon()
     {
@@ -34,22 +27,17 @@ private void DeletePokemon()
             { nameof(ConfirmActionDialog.ConfirmColor), Color.Default },
             { nameof(ConfirmActionDialog.CancelText), "Cancel" },
             { nameof(ConfirmActionDialog.CancelIcon), Icons.Material.Filled.Clear },
-            { nameof(ConfirmActionDialog.CancelColor), Color.Error},
+            { nameof(ConfirmActionDialog.CancelColor), Color.Error },
             { nameof(ConfirmActionDialog.OnConfirm), EventCallback.Factory.Create<bool>(this, OnDeleteConfirm) }
         };
 
         DialogService.Show<ConfirmActionDialog>(
             "Confirm Action",
             parameters,
-            new DialogOptions
-            {
-                CloseOnEscapeKey = true,
-                MaxWidth = MaxWidth.Small,
-            });
+            new() { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, });
 
         void OnDeleteConfirm(bool confirmed)
         {
-
             if (!confirmed)
             {
                 return;
@@ -99,24 +87,23 @@ void ShowPasteConfirmation()
             var parameters = new DialogParameters
             {
                 { nameof(ConfirmActionDialog.Title), "Paste Pokémon" },
-                { nameof(ConfirmActionDialog.Message), "Are you sure you want to paste the copied Pokémon? The Pokémon in the selected slot will be replaced." },
+                {
+                    nameof(ConfirmActionDialog.Message),
+                    "Are you sure you want to paste the copied Pokémon? The Pokémon in the selected slot will be replaced."
+                },
                 { nameof(ConfirmActionDialog.ConfirmText), "Paste" },
                 { nameof(ConfirmActionDialog.ConfirmIcon), Icons.Material.Filled.Delete },
                 { nameof(ConfirmActionDialog.ConfirmColor), Color.Default },
                 { nameof(ConfirmActionDialog.CancelText), "Cancel" },
                 { nameof(ConfirmActionDialog.CancelIcon), Icons.Material.Filled.Clear },
-                { nameof(ConfirmActionDialog.CancelColor), Color.Primary},
+                { nameof(ConfirmActionDialog.CancelColor), Color.Primary },
                 { nameof(ConfirmActionDialog.OnConfirm), EventCallback.Factory.Create<bool>(this, OnPasteConfirm) }
             };
 
             DialogService.Show<ConfirmActionDialog>(
                 "Confirm Action",
                 parameters,
-                new DialogOptions
-                {
-                    CloseOnEscapeKey = true,
-                    MaxWidth = MaxWidth.Small,
-                });
+                new() { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, });
         }
 
         void OnPasteConfirm(bool confirmed)

diff --git a/Pkmds.Web/Components/EditForms/Tabs/CosmeticTab.razor.cs b/Pkmds.Web/Components/EditForms/Tabs/CosmeticTab.razor.cs
@@ -2,8 +2,7 @@ namespace Pkmds.Web.Components.EditForms.Tabs;
 
 public partial class CosmeticTab : IDisposable
 {
-    [Parameter, EditorRequired]
-    public PKM? Pokemon { get; set; }
+    [Parameter, EditorRequired] public PKM? Pokemon { get; set; }
 
     protected override void OnInitialized() =>
         RefreshService.OnAppStateChanged += StateHasChanged;

diff --git a/Pkmds.Web/Components/EditForms/Tabs/MetTab.razor.cs b/Pkmds.Web/Components/EditForms/Tabs/MetTab.razor.cs
@@ -2,8 +2,7 @@ namespace Pkmds.Web.Components.EditForms.Tabs;
 
 public partial class MetTab : IDisposable
 {
-    [Parameter, EditorRequired]
-    public PKM? Pokemon { get; set; }
+    [Parameter, EditorRequired] public PKM? Pokemon { get; set; }
 
     /// <summary>
     /// Currently loaded met location group that is populating Met and Egg location comboboxes
@@ -51,6 +50,7 @@ private void CheckMetLocationChange(GameVersion version, EntityContext context)
                 version = group = context.GetSingleGameVersion();
             }
         }
+
         if (group != origintrack || context != originFormat)
         {
             currentLocationSearchVersion = version;
@@ -70,7 +70,8 @@ private ComboItem GetMetLocation()
 
         CheckMetLocationChange(pkm.Version, pkm.Context);
 
-        return AppService.GetMetLocationComboItem(Pokemon.MetLocation, currentLocationSearchVersion, currentLocationSearchContext);
+        return AppService.GetMetLocationComboItem(Pokemon.MetLocation, currentLocationSearchVersion,
+            currentLocationSearchContext);
     }
 
     private ComboItem GetEggMetLocation()
@@ -81,7 +82,8 @@ private ComboItem GetEggMetLocation()
         }
 
         CheckMetLocationChange(pkm.Version, pkm.Context);
-        return AppService.GetMetLocationComboItem(Pokemon.EggLocation, currentLocationSearchVersion, currentLocationSearchContext, true);
+        return AppService.GetMetLocationComboItem(Pokemon.EggLocation, currentLocationSearchVersion,
+            currentLocationSearchContext, true);
     }
 
     private void OriginGameChanged()
@@ -95,10 +97,12 @@ private void OriginGameChanged()
     }
 
     private Task<IEnumerable<ComboItem>> SearchMetLocations(string searchString, CancellationToken token) =>
-        Task.FromResult(AppService.SearchMetLocations(searchString, currentLocationSearchVersion, currentLocationSearchContext));
+        Task.FromResult(AppService.SearchMetLocations(searchString, currentLocationSearchVersion,
+            currentLocationSearchContext));
 
     private Task<IEnumerable<ComboItem>> SearchEggMetLocations(string searchString, CancellationToken token) =>
-        Task.FromResult(AppService.SearchMetLocations(searchString, currentLocationSearchVersion, currentLocationSearchContext, isEggLocation: true));
+        Task.FromResult(AppService.SearchMetLocations(searchString, currentLocationSearchVersion,
+            currentLocationSearchContext, isEggLocation: true));
 
     private MetTimeOfDay GetMetTimeOfDay => Pokemon is not (PK2 and ICaughtData2 c2)
         ? MetTimeOfDay.None
@@ -139,6 +143,7 @@ private void MetAsEggChanged(bool newValue)
                     {
                         Pokemon.IsEgg = false;
                     }
+
                     Pokemon.EggDay = Pokemon.EggMonth = Pokemon.EggYear = 0;
                     Pokemon.EggLocation = 0;
                     break;

diff --git a/Pkmds.Web/Components/EditForms/Tabs/MovesTab.razor.cs b/Pkmds.Web/Components/EditForms/Tabs/MovesTab.razor.cs
@@ -2,8 +2,7 @@ namespace Pkmds.Web.Components.EditForms.Tabs;
 
 public partial class MovesTab : IDisposable
 {
-    [Parameter, EditorRequired]
-    public PKM? Pokemon { get; set; }
+    [Parameter, EditorRequired] public PKM? Pokemon { get; set; }
 
     protected override void OnInitialized() =>
         RefreshService.OnAppStateChanged += StateHasChanged;
@@ -26,9 +25,11 @@ private void SetPokemonMove(int moveIndex, ComboItem moveComboItem)
         RefreshService.Refresh();
     }
 
+    // ReSharper disable once InconsistentNaming
     private int GetPokemonPP(int moveIndex) =>
         Pokemon?.GetPP()[moveIndex] ?? 0;
 
+    // ReSharper disable once InconsistentNaming
     private void SetPokemonPP(int moveIndex, int pp)
     {
         if (Pokemon is null)
@@ -41,9 +42,11 @@ private void SetPokemonPP(int moveIndex, int pp)
         RefreshService.Refresh();
     }
 
+    // ReSharper disable once InconsistentNaming
     private int GetPokemonPPUps(int moveIndex) =>
         Pokemon?.GetPPUps()[moveIndex] ?? 0;
 
+    // ReSharper disable once InconsistentNaming
     private void SetPokemonPPUps(int moveIndex, int ppUps)
     {
         if (Pokemon is null)

diff --git a/Pkmds.Web/Components/EditForms/Tabs/OtMiscTab.razor.cs b/Pkmds.Web/Components/EditForms/Tabs/OtMiscTab.razor.cs
@@ -2,8 +2,7 @@ namespace Pkmds.Web.Components.EditForms.Tabs;
 
 public partial class OtMiscTab : IDisposable
 {
-    [Parameter, EditorRequired]
-    public PKM? Pokemon { get; set; }
+    [Parameter, EditorRequired] public PKM? Pokemon { get; set; }
 
     protected override void OnInitialized() =>
         RefreshService.OnAppStateChanged += StateHasChanged;
@@ -35,8 +34,6 @@ private void FillFromGame()
                 Pokemon.SetTrainerTID7(saveFile.TrainerTID7);
                 Pokemon.SetTrainerSID7(saveFile.TrainerSID7);
                 break;
-            default:
-                break;
         }
     }