Merge pull request #2397 from Nexus-Mods/healthcheck-redesign

Health Check redesign
Nexus-Mods · Jan 6, 2025 · 8fff44d · 8fff44d
2 parents 9dc0ec6 + 51f30b2
commit 8fff44d
Show file tree

Hide file tree

Showing 26 changed files with 287 additions and 227 deletions.
diff --git a/src/NexusMods.App.UI/Assets/Pictograms/health.svg b/src/NexusMods.App.UI/Assets/Pictograms/health.svg
diff --git a/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryDesignViewModel.cs b/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryDesignViewModel.cs
@@ -6,6 +6,8 @@ namespace NexusMods.App.UI.Controls.Diagnostics;
 public class DiagnosticEntryDesignViewModel : DiagnosticEntryViewModel
 {
     public DiagnosticEntryDesignViewModel() : base(Data, Writer) { }
+
+    public DiagnosticEntryDesignViewModel(Diagnostic diagnostic) : base(diagnostic, Writer) { }
 
     private static readonly Diagnostic Data = new()
     {

diff --git a/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryView.axaml b/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryView.axaml
@@ -10,20 +10,41 @@
                                 xmlns:panels="clr-namespace:Avalonia.Labs.Panels;assembly=Avalonia.Labs.Panels"
                                 mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="100"
                                 x:Class="NexusMods.App.UI.Controls.Diagnostics.DiagnosticEntryView">
-
+    
     <Design.DataContext>
         <diagnostics:DiagnosticEntryDesignViewModel />
     </Design.DataContext>
 
-    <Border x:Name="DropShadowBorder">
-        <navigation:NavigationControl x:Name="EntryButton">
-            <panels:FlexPanel x:Name="EntryFlexPanel">
-                <icons:UnifiedIcon x:Name="SeverityIcon" />
-                <TextBlock x:Name="DescriptionText" />
-                <icons:UnifiedIcon x:Name="NavigationIcon" Value="{x:Static icons:IconValues.ChevronRight}" />
-            </panels:FlexPanel>
-        </navigation:NavigationControl>
-    </Border>
-
+    <navigation:NavigationControl x:Name="EntryButton"
+                                  Padding="16,12"
+                                  HorizontalAlignment="Stretch"
+                                  Height="62">
+
+        <DockPanel>
+            <icons:UnifiedIcon x:Name="SeverityIcon" 
+                               DockPanel.Dock="Left" />
+            <icons:UnifiedIcon
+                x:Name="NavigationIcon" 
+                DockPanel.Dock="Right" 
+                Value="{x:Static icons:IconValues.ChevronRight}"/>
+
+            <StackPanel Margin="16,0">
+                <TextBlock x:Name="TitleText" 
+                           Text="Name"
+                           Theme="{StaticResource BodyMDNormalTheme}"
+                           Foreground="{StaticResource NeutralStrongBrush}"
+                           TextTrimming="CharacterEllipsis"
+                           TextWrapping="NoWrap"
+                           />
+                <TextBlock x:Name="DescriptionText"
+                           Theme="{StaticResource BodySMNormalTheme}"
+                           Foreground="{StaticResource NeutralSubduedBrush}"
+                           TextTrimming="CharacterEllipsis"
+                           TextWrapping="NoWrap"
+                           />
+            </StackPanel>
+
+        </DockPanel>
+    </navigation:NavigationControl>
 
 </reactiveUi:ReactiveUserControl>
diff --git a/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryView.axaml.cs b/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryView.axaml.cs
@@ -48,5 +48,6 @@ private void InitializeData(IDiagnosticEntryViewModel vm)
         }
 
         DescriptionText.Text = vm.Summary;
+        TitleText.Text = vm.Title;
     }
 }
diff --git a/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryViewModel.cs b/src/NexusMods.App.UI/Controls/Diagnostics/DiagnosticEntryViewModel.cs
@@ -11,12 +11,14 @@ public class DiagnosticEntryViewModel : AViewModel<IDiagnosticEntryViewModel>, I
     public DiagnosticEntryViewModel(Diagnostic diagnostic, IDiagnosticWriter writer)
     {
         Diagnostic = diagnostic;
+        Title = diagnostic.Title;
         Summary = diagnostic.FormatSummary(writer);
         Severity = diagnostic.Severity;
         SeeDetailsCommand = ReactiveCommand.Create<NavigationInformation, ValueTuple<Diagnostic, NavigationInformation>>(info => (diagnostic, info));
     }
 
     public Diagnostic Diagnostic { get; }
+    public string Title { get; }
     public string Summary { get; }
     public DiagnosticSeverity Severity { get; }
     public ReactiveCommand<NavigationInformation, ValueTuple<Diagnostic, NavigationInformation>> SeeDetailsCommand { get; }

diff --git a/src/NexusMods.App.UI/Controls/Diagnostics/IDiagnosticEntryViewModel.cs b/src/NexusMods.App.UI/Controls/Diagnostics/IDiagnosticEntryViewModel.cs
@@ -9,6 +9,8 @@ public interface IDiagnosticEntryViewModel : IViewModelInterface
 {
     Diagnostic Diagnostic { get; }
 
+    string Title { get; }
+
     string Summary { get; }
 
     DiagnosticSeverity Severity { get; }

diff --git a/src/NexusMods.App.UI/LeftMenu/Items/IconDesignViewModel.cs b/src/NexusMods.App.UI/LeftMenu/Items/IconDesignViewModel.cs
@@ -22,7 +22,7 @@ public class IconDesignViewModel : AViewModel<IIconViewModel>, IIconViewModel
 
     public IconDesignViewModel() : base()
     {
-        Icon = IconValues.ModLibrary;
+        Icon = IconValues.LibraryOutline;
         Name = "Sample Text";
         Badges = new[] { "82" };
     }

diff --git a/src/NexusMods.App.UI/LeftMenu/Loadout/LoadoutLeftMenuDesignViewModel.cs b/src/NexusMods.App.UI/LeftMenu/Loadout/LoadoutLeftMenuDesignViewModel.cs
@@ -25,7 +25,7 @@ public LoadoutLeftMenuDesignViewModel()
                 new IconViewModel
                 {
                     Name = "Diagnostics",
-                    Icon = IconValues.Stethoscope,
+                    Icon = IconValues.Cardiology,
                 },
             ]
         );

diff --git a/src/NexusMods.App.UI/LeftMenu/Loadout/LoadoutLeftMenuViewModel.cs b/src/NexusMods.App.UI/LeftMenu/Loadout/LoadoutLeftMenuViewModel.cs
@@ -79,7 +79,7 @@ public LoadoutLeftMenuViewModel(
         {
             Name = Language.LibraryPageTitle,
             RelativeOrder = 3,
-            Icon = IconValues.ModLibrary,
+            Icon = IconValues.LibraryOutline,
             NavigateCommand = ReactiveCommand.Create<NavigationInformation>(info =>
             {
                 NewDownloadModelCount = 0;
@@ -102,7 +102,7 @@ public LoadoutLeftMenuViewModel(
         {
             Name = Language.LoadoutLeftMenuViewModel_LoadoutLeftMenuViewModel_Diagnostics,
             RelativeOrder = 4,
-            Icon = IconValues.Stethoscope,
+            Icon = IconValues.Cardiology,
             NavigateCommand = ReactiveCommand.Create<NavigationInformation>(info =>
             {
                 var pageData = new PageData

diff --git a/src/NexusMods.App.UI/NexusMods.App.UI.csproj b/src/NexusMods.App.UI/NexusMods.App.UI.csproj
@@ -705,6 +705,9 @@
         <Compile Update="Pages\Sorting\LoadOrder\LoadOrderItemDesignModel.cs">
           <DependentUpon>ILoadOrderItemModel.cs</DependentUpon>
         </Compile>
+        <Compile Update="Pages\Diagnostics\List\DiagnosticListDesignViewModel.cs.old">
+          <DependentUpon>IDiagnosticListViewModel.cs</DependentUpon>
+        </Compile>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NexusMods.App.UI/Pages/Diagnostics/Details/DiagnosticDetailsViewModel.cs b/src/NexusMods.App.UI/Pages/Diagnostics/Details/DiagnosticDetailsViewModel.cs
@@ -20,7 +20,7 @@ public DiagnosticDetailsViewModel(
         IMarkdownRendererViewModel markdownRendererViewModel,
         Diagnostic diagnostic) : base(windowManager)
     {
-        TabIcon = IconValues.Stethoscope;
+        TabIcon = IconValues.Cardiology;
         TabTitle = diagnostic.Title;
         Severity = diagnostic.Severity;
 

diff --git a/src/NexusMods.App.UI/Pages/Diagnostics/List/DiagnosticListPage.cs b/src/NexusMods.App.UI/Pages/Diagnostics/List/DiagnosticListPage.cs
@@ -46,7 +46,7 @@ public override IDiagnosticListViewModel CreateViewModel(DiagnosticListPageConte
             // TODO: translations?
             SectionName = "Utilities",
             ItemName = Language.DiagnosticListViewModel_DiagnosticListViewModel_Diagnostics,
-            Icon = IconValues.Stethoscope,
+            Icon = IconValues.Cardiology,
             PageData = new PageData
             {
                 FactoryId = StaticId,
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,5 +48,6 @@ private void InitializeData(IDiagnosticEntryViewModel vm) @@
             }
             DescriptionText.Text = vm.Summary;
+            TitleText.Text = vm.Title;
         }
     }