Add common gender display RenderFragments

codemonkey85 · Sep 16, 2023 · ab11602 · ab11602
1 parent 2c83a20
commit ab11602
Show file tree

Hide file tree

Showing 21 changed files with 140 additions and 62 deletions.
diff --git a/Pkmds.Rcl/AppState.cs b/Pkmds.Rcl/AppState.cs
@@ -39,6 +39,4 @@ public SaveFile? SaveFile
     public int? SelectedPartySlotNumber { get; set; }
 
     public bool ShowProgressIndicator { get; set; }
-
-    public string FileDisplayName { get; set; } = string.Empty;
 }
diff --git a/Pkmds.Rcl/Components/BasePkmdsComponent.razor b/Pkmds.Rcl/Components/BasePkmdsComponent.razor
@@ -0,0 +1,72 @@
+@code {
+    public static RenderFragment TypeSummary(byte type1, byte type2) =>
+    @<MudStack Row="@true"
+                   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 TeraTypeSummary(byte type) =>
+    @<MudStack Row="@true"
+                   Class="my-2"
+                   AlignItems="@AlignItems.Center">
+        <MudText>
+            Tera Type:
+        </MudText>
+        <MudImage Src="@SpriteHelper.GetTypeGemSpriteFileName(type)"
+                  Alt="@GameInfo.Strings.Types[type]"
+                  title="@GameInfo.Strings.Types[type]"
+                  ObjectFit="@ObjectFit.Contain"
+                  ObjectPosition="@ObjectPosition.Center"
+                  Width="30" />
+    </MudStack>;
+
+    public static RenderFragment GenderDisplayIcon(int gender)
+    {
+        var icon = gender switch
+        {
+            0 => Icons.Material.Filled.Male,
+            1 => Icons.Material.Filled.Female,
+            _ => string.Empty,
+        };
+        var color = gender switch
+        {
+            0 => Colors.Blue.Default,
+            1 => Colors.Red.Default,
+            _ => string.Empty,
+        };
+        return @<MudIcon Icon="@icon" Style="@($"color: {color};")" />;
+    }
+
+    public static RenderFragment GenderDisplayAscii(int gender)
+    {
+        var color = gender switch
+        {
+            0 => Colors.Blue.Default,
+            1 => Colors.Red.Default,
+            _ => string.Empty,
+        };
+        return @<MudText Style="@($"color: { color}; ")">@GameInfo.GenderSymbolASCII[gender]</MudText>;
+    }
+
+    public static RenderFragment GenderDisplay(int gender) =>
+    @<MudStack Row="@true">
+        @GenderDisplayIcon(gender)
+        @GenderDisplayAscii(gender)
+    </MudStack>;
+}
diff --git a/Pkmds.Rcl/Components/BoxComponent.razor b/Pkmds.Rcl/Components/BoxComponent.razor
@@ -1,4 +1,6 @@
-@if (BoxEdit is not null)
+@inherits BasePkmdsComponent
+
+@if (BoxEdit is not null)
 {
     <div>
         <MudText Typo="Typo.h5">

diff --git a/Pkmds.Rcl/Components/BoxGrid.razor b/Pkmds.Rcl/Components/BoxGrid.razor
@@ -1,4 +1,6 @@
-@if (BoxEdit is not null)
+@inherits BasePkmdsComponent
+
+@if (BoxEdit is not null)
 {
     <MudGrid Spacing="1"
              Justify="@Justify.Center"

diff --git a/Pkmds.Rcl/Components/BoxSlotComponent.razor b/Pkmds.Rcl/Components/BoxSlotComponent.razor
@@ -1,4 +1,6 @@
-<MudPaper Elevation="3"
+@inherits BasePkmdsComponent
+
+<MudPaper Elevation="3"
           @onclick="SetSelectedPokemon"
           Width="68px"
           Height="68px"

diff --git a/Pkmds.Rcl/Components/EditForms/PokemonEditForm.razor b/Pkmds.Rcl/Components/EditForms/PokemonEditForm.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or

diff --git a/Pkmds.Rcl/Components/EditForms/Tabs/CosmeticTab.razor b/Pkmds.Rcl/Components/EditForms/Tabs/CosmeticTab.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or

diff --git a/Pkmds.Rcl/Components/EditForms/Tabs/MainTab.razor b/Pkmds.Rcl/Components/EditForms/Tabs/MainTab.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or
@@ -200,42 +202,3 @@ EntityContext.MaxInvalid &&
 
     </MudStack>
 }
-
-@code {
-    private static RenderFragment TypeSummary(byte type1, byte type2) =>
-        @<MudStack Row="@true"
-                   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 TeraTypeSummary(byte type) =>
-        @<MudStack Row="@true"
-                   Class="my-2"
-                   AlignItems="@AlignItems.Center">
-            <MudText>
-                Tera Type:
-            </MudText>
-            <MudImage Src="@SpriteHelper.GetTypeGemSpriteFileName(type)"
-                      Alt="@GameInfo.Strings.Types[type]"
-                      title="@GameInfo.Strings.Types[type]"
-                      ObjectFit="@ObjectFit.Contain"
-                      ObjectPosition="@ObjectPosition.Center"
-                      Width="30" />
-        </MudStack>;
-}
diff --git a/Pkmds.Rcl/Components/EditForms/Tabs/MetTab.razor b/Pkmds.Rcl/Components/EditForms/Tabs/MetTab.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or

diff --git a/Pkmds.Rcl/Components/EditForms/Tabs/MovesTab.razor b/Pkmds.Rcl/Components/EditForms/Tabs/MovesTab.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or

diff --git a/Pkmds.Rcl/Components/EditForms/Tabs/OtMiscTab.razor b/Pkmds.Rcl/Components/EditForms/Tabs/OtMiscTab.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or

diff --git a/Pkmds.Rcl/Components/EditForms/Tabs/StatsTab.razor b/Pkmds.Rcl/Components/EditForms/Tabs/StatsTab.razor
@@ -1,4 +1,6 @@
-@if (Pokemon is not null &&
+@inherits BasePkmdsComponent
+
+@if (Pokemon is not null &&
 AppState.SaveFile?.Context is EntityContext saveFileEntityContext &&
 saveFileEntityContext is not
 EntityContext.None or

diff --git a/Pkmds.Rcl/Components/FeatureNotImplemented.razor b/Pkmds.Rcl/Components/FeatureNotImplemented.razor
@@ -1,3 +1,5 @@
-<MudText>
+@inherits BasePkmdsComponent
+
+<MudText>
     Feature not implemented.
 </MudText>
diff --git a/Pkmds.Rcl/Components/FileUploadDialog.razor b/Pkmds.Rcl/Components/FileUploadDialog.razor
@@ -1,4 +1,6 @@
-<MudDialog>
+@inherits BasePkmdsComponent
+
+<MudDialog>
     <DialogContent>
         <MudFileUpload T="IBrowserFile"
                        FilesChanged="HandleFile">

diff --git a/Pkmds.Rcl/Components/PartyGrid.razor b/Pkmds.Rcl/Components/PartyGrid.razor
@@ -1,4 +1,6 @@
-@if (AppState.SaveFile is not null)
+@inherits BasePkmdsComponent
+
+@if (AppState.SaveFile is not null)
 {
     <div class="party-grid">
         <MudGrid Spacing="1"

diff --git a/Pkmds.Rcl/Components/PartySlotComponent.razor b/Pkmds.Rcl/Components/PartySlotComponent.razor
@@ -1,4 +1,6 @@
-<MudPaper Elevation="3"
+@inherits BasePkmdsComponent
+
+<MudPaper Elevation="3"
           @onclick="SetSelectedPokemon"
           Width="68px"
           Height="68px"

diff --git a/Pkmds.Rcl/Components/PokemonStorageComponent.razor b/Pkmds.Rcl/Components/PokemonStorageComponent.razor
@@ -1,4 +1,6 @@
-@if (AppState.SaveFile is not null)
+@inherits BasePkmdsComponent
+
+@if (AppState.SaveFile is not null)
 {
     <PartyGrid />
 

diff --git a/Pkmds.Rcl/Components/SaveFileComponent.razor b/Pkmds.Rcl/Components/SaveFileComponent.razor
@@ -1,4 +1,6 @@
-@if (AppState.SaveFile is null)
+@inherits BasePkmdsComponent
+
+@if (AppState.SaveFile is null)
 {
     @if (AppState.ShowProgressIndicator)
     {
@@ -18,11 +20,11 @@
 else
 {
     <PageTitle>
-        PKMDS Save Editor - @AppState.FileDisplayName
+        PKMDS Save Editor - <SaveFileNameDisplay />
     </PageTitle>
 
     <MudText Typo="Typo.h5">
-        @AppState.FileDisplayName
+        <SaveFileNameDisplay />
     </MudText>
 
     <MudGrid Spacing="1"

diff --git a/Pkmds.Rcl/Components/SaveFileNameDisplay.razor b/Pkmds.Rcl/Components/SaveFileNameDisplay.razor
@@ -0,0 +1,18 @@
+@inherits BasePkmdsComponent
+
+@if (AppState.SaveFile is { Gender: 0 or 1 } saveFile)
+{
+    var gender = saveFile.Gender;
+    @Display(saveFile, gender)
+}
+
+@code {
+    private static RenderFragment Display(SaveFile saveFile, int gender) =>
+    @<MudStack Row="@true" Spacing="1">
+        <span>@saveFile.OT </span>
+        @GenderDisplayIcon(gender)
+        <span>(@saveFile.DisplayTID</span>
+        <span>, @saveFile.Version</span>
+        <span>, @saveFile.PlayTimeString)</span>
+    </MudStack>;
+}
diff --git a/Pkmds.Rcl/IAppState.cs b/Pkmds.Rcl/IAppState.cs
@@ -16,8 +16,6 @@ public interface IAppState
 
     bool ShowProgressIndicator { get; set; }
 
-    string FileDisplayName { get; set; }
-
     static string? AppVersion => Assembly.GetAssembly(typeof(App))?.GetName().Version?.ToString();
 
     static string? PkhexVersion => Assembly.GetAssembly(typeof(PKM))?.GetName().Version?.ToString();

diff --git a/Pkmds.Rcl/Shared/MainLayout.razor.cs b/Pkmds.Rcl/Shared/MainLayout.razor.cs
@@ -69,7 +69,6 @@ private async Task LoadSaveFileAsync()
             return;
         }
 
-        AppState.FileDisplayName = $"{AppState.SaveFile.OT} ({AppState.SaveFile.DisplayTID}, {AppState.SaveFile.Version}, {AppState.SaveFile.PlayTimeString})";
         RefreshService.Refresh();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ private async Task LoadSaveFileAsync() @@
                 return;
             }
-            AppState.FileDisplayName = $"{AppState.SaveFile.OT} ({AppState.SaveFile.DisplayTID}, {AppState.SaveFile.Version}, {AppState.SaveFile.PlayTimeString})";
             RefreshService.Refresh();
         }
@@ Expand Down @@