Dev

.github/workflows/buildandtest.yml

@@ -2,7 +2,7 @@ name: Build and Test
 
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ dev ]
     paths-ignore:
       - "**.md"
       - "**.ps1"
@@ -12,11 +12,11 @@ on:
       - '**/*.gitattributes'
       - '**/*.yml'
   pull_request:
-    branches: [ "dev", "main" ]
+    branches: [ dev, main ]
 
 jobs:
   build:
-    name: "Build and Test"
+    name: Build and Test
     # use ubuntu-latest image to run steps on
     runs-on: ubuntu-latest
 

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ main ]
     paths-ignore:
       - "**.md"
       - "**.ps1"
@@ -14,7 +14,7 @@ on:
 
 jobs:
   deploy:
-    name: "Deploy to GitHub Pages"
+    name: Deploy to GitHub Pages
     # use ubuntu-latest image to run steps on
     runs-on: ubuntu-latest
     steps:

Pkmds.Web/Components/BasePkmdsComponent.razor

@@ -1,44 +1,45 @@
 @code {
-    public const string ColumnClass = "d-flex align-center justify-center";
+    protected const string ColumnClass = "d-flex align-center justify-center";
 
-    public static RenderFragment TypeSummary(byte type1, byte type2) =>
-    @<MudStack Row
-               Class="my-2"
-               AlignItems="@AlignItems.Center">
-        <MudText>
-            Type:
-        </MudText>
-        <MudImage Src="@SpriteHelper.GetTypeWideSpriteFileName(type1)"
-                  Alt="@GameInfo.Strings.Types[type1]"
-                  title="@GameInfo.Strings.Types[type1]"
-                  ObjectFit="@ObjectFit.Contain"
-                  ObjectPosition="@ObjectPosition.Center" />
-        @if (type1 != type2)
-    {
-        <MudImage Src="@SpriteHelper.GetTypeWideSpriteFileName(type2)"
-                  Alt="@GameInfo.Strings.Types[type2]"
-                  title="@GameInfo.Strings.Types[type2]"
-                  ObjectFit="@ObjectFit.Contain"
-                  ObjectPosition="@ObjectPosition.Center" />
-    }
-    </MudStack>;
+    private static RenderFragment TypeSummary(byte type1, byte type2) =>
+        @<MudStack Row
+                   Class="my-2"
+                   AlignItems="@AlignItems.Center">
+            <MudText>
+                Type:
+            </MudText>
+            <MudImage Src="@SpriteHelper.GetTypeWideSpriteFileName(type1)"
+                      Alt="@GameInfo.Strings.Types[type1]"
+                      title="@GameInfo.Strings.Types[type1]"
+                      ObjectFit="@ObjectFit.Contain"
+                      ObjectPosition="@ObjectPosition.Center"/>
+            @if (type1 != type2)
+            {
+                <MudImage Src="@SpriteHelper.GetTypeWideSpriteFileName(type2)"
+                          Alt="@GameInfo.Strings.Types[type2]"
+                          title="@GameInfo.Strings.Types[type2]"
+                          ObjectFit="@ObjectFit.Contain"
+                          ObjectPosition="@ObjectPosition.Center"/>
+            }
+        </MudStack>;
 
-    public static RenderFragment TypeSummary((byte Type1, byte Type2) types) =>
+    protected static RenderFragment TypeSummary((byte Type1, byte Type2) types) =>
         TypeSummary(types.Type1, types.Type2);
 
-    public static RenderFragment MoveTypeSummary(byte type) =>
-    @<MudImage Src="@SpriteHelper.GetTypeSquareSpriteFileName(type)"
-               Alt="@GameInfo.Strings.Types[type]"
-               title="@GameInfo.Strings.Types[type]"
-               ObjectFit="@ObjectFit.Contain"
-               ObjectPosition="@ObjectPosition.Center"
-               Width="30"/>;
+    protected static RenderFragment MoveTypeSummary(byte type) =>
+        @<MudImage Src="@SpriteHelper.GetTypeSquareSpriteFileName(type)"
+                   Alt="@GameInfo.Strings.Types[type]"
+                   title="@GameInfo.Strings.Types[type]"
+                   ObjectFit="@ObjectFit.Contain"
+                   ObjectPosition="@ObjectPosition.Center"
+                   Width="30"/>;
 
     public static RenderFragment MoveCategorySummary(int categoryId) =>
-    @<MudImage Src="@SpriteHelper.GetMoveCategorySpriteFileName(categoryId)"
-               Alt="@GameInfoExtensions.GetCategoryName(categoryId)"
-               title="@GameInfoExtensions.GetCategoryName(categoryId)"
-               ObjectFit="@ObjectFit.Contain"
-               ObjectPosition="@ObjectPosition.Center"
-               Width="30" />;
+        @<MudImage Src="@SpriteHelper.GetMoveCategorySpriteFileName(categoryId)"
+                   Alt="@GameInfoExtensions.GetCategoryName(categoryId)"
+                   title="@GameInfoExtensions.GetCategoryName(categoryId)"
+                   ObjectFit="@ObjectFit.Contain"
+                   ObjectPosition="@ObjectPosition.Center"
+                   Width="30"/>;
+
 }

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();
     }
 }
-

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";

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; }
 }

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));

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()
     {

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();
 }

Pkmds.Web/Components/EditForms/PokemonEditForm.razor

@@ -1,12 +1,15 @@
 @inherits BasePkmdsComponent
 
 @if (Pokemon is not null &&
-AppState.SaveFile is { Context: { } saveFileEntityContext, Generation: { } saveGeneration } saveFile &&
-saveFileEntityContext is not
-EntityContext.None or
-EntityContext.SplitInvalid or
-EntityContext.MaxInvalid &&
-AppState.SelectedSlotsAreValid)
+     AppState.SaveFile is
+     {
+         Context: not
+         (EntityContext.None or
+         EntityContext.SplitInvalid or
+         EntityContext.MaxInvalid),
+         Generation: var saveGeneration
+     } &&
+     AppState.SelectedSlotsAreValid)
 {
     <MudStack Row
               Justify="@Justify.FlexStart">
@@ -80,33 +83,33 @@ AppState.SelectedSlotsAreValid)
                  Border>
 
             <MudTabPanel Text="Main">
-                <MainTab Pokemon="@Pokemon" />
+                <MainTab Pokemon="@Pokemon"/>
             </MudTabPanel>
 
             @if (saveGeneration >= 2)
             {
                 <MudTabPanel Text="Met">
-                    <MetTab Pokemon="@Pokemon" />
+                    <MetTab Pokemon="@Pokemon"/>
                 </MudTabPanel>
             }
 
             <MudTabPanel Text="Stats">
-                <StatsTab Pokemon="@Pokemon" />
+                <StatsTab Pokemon="@Pokemon"/>
             </MudTabPanel>
 
             <MudTabPanel Text="Moves">
-                <MovesTab Pokemon="@Pokemon" />
+                <MovesTab Pokemon="@Pokemon"/>
             </MudTabPanel>
 
             @if (saveGeneration >= 3)
             {
                 <MudTabPanel Text="Cosmetic">
-                    <CosmeticTab Pokemon="@Pokemon" />
+                    <CosmeticTab Pokemon="@Pokemon"/>
                 </MudTabPanel>
             }
 
             <MudTabPanel Text="OT/Misc">
-                <OtMiscTab Pokemon="@Pokemon" />
+                <OtMiscTab Pokemon="@Pokemon"/>
             </MudTabPanel>
 
         </MudTabs>