Merge pull request #2366 from Nexus-Mods/fix/mygames-empty-nogames

Added empty text when no game installs found
Nexus-Mods · Dec 11, 2024 · aee540d · aee540d
2 parents fcc46e3 + 46df0d1
commit aee540d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/src/NexusMods.App.UI/Controls/MiniGameWidget/MiniGameWidget.axaml.cs b/src/NexusMods.App.UI/Controls/MiniGameWidget/MiniGameWidget.axaml.cs
@@ -41,7 +41,10 @@ public MiniGameWidget()
                 this.WhenAnyValue(view => view.ViewModel!.GameInstallations)
                     .Subscribe(installations =>
                         {
-                            var tooltip = string.Join(", ", installations!.Select(installation => installation.Store.ToString()));
+                            if(installations is null)
+                                return;
+
+                            var tooltip = string.Join(", ", installations.Select(installation => installation.Store.ToString()));
                             ToolTip.SetTip(IsFoundTextBlock, tooltip);
                         }
                     )

diff --git a/src/NexusMods.App.UI/Pages/MyGames/MyGamesView.axaml b/src/NexusMods.App.UI/Pages/MyGames/MyGamesView.axaml
@@ -34,6 +34,10 @@
                     <TextBlock Text="Add games to get started"
                                Theme="{StaticResource HeadingXSSemiTheme}"
                                Foreground="{StaticResource NeutralStrongBrush}" />
+                    <TextBlock x:Name="NoGamesDetectedText"
+                        Text="No games detected"
+                        Theme="{StaticResource BodyMDNormalTheme}"
+                        Foreground="{StaticResource NeutralSubduedBrush}" />
                     <ItemsControl
                         x:Name="DetectedGamesItemsControl">
                         <ItemsControl.ItemsPanel>

diff --git a/src/NexusMods.App.UI/Pages/MyGames/MyGamesView.axaml.cs b/src/NexusMods.App.UI/Pages/MyGames/MyGamesView.axaml.cs
@@ -12,21 +12,31 @@ public MyGamesView()
         InitializeComponent();
 
         this.WhenActivated(d =>
-        {
-            this.WhenAnyValue(view => view.ViewModel!.InstalledGames)
-                .BindToView(this, view => view.DetectedGamesItemsControl.ItemsSource)
-                .DisposeWith(d);
-
-            this.WhenAnyValue(view => view.ViewModel!.SupportedGames)
-                .BindToView(this, view => view.SupportedGamesItemsControl.ItemsSource)
-                .DisposeWith(d);
-
-            this.BindCommand(ViewModel, vm => vm.GiveFeedbackCommand, view => view.GiveFeedbackButton)
-                .DisposeWith(d);
-
-            this.BindCommand(ViewModel, vm => vm.OpenRoadmapCommand, view => view.OpenRoadmapButton)
-                .DisposeWith(d);
-        });
+            {
+                this.WhenAnyValue(view => view.ViewModel!.InstalledGames)
+                    .BindToView(this, view => view.DetectedGamesItemsControl.ItemsSource)
+                    .DisposeWith(d);
+
+                this.WhenAnyValue(view => view.ViewModel!.SupportedGames)
+                    .BindToView(this, view => view.SupportedGamesItemsControl.ItemsSource)
+                    .DisposeWith(d);
+
+                this.BindCommand(ViewModel, vm => vm.GiveFeedbackCommand, view => view.GiveFeedbackButton)
+                    .DisposeWith(d);
+
+                this.BindCommand(ViewModel, vm => vm.OpenRoadmapCommand, view => view.OpenRoadmapButton)
+                    .DisposeWith(d);
+
+                this.WhenAnyValue(view  => view.ViewModel!.InstalledGames.Count)
+                    .Select(installedCount  => installedCount == 0)
+                    .Subscribe(isEmpty =>
+                        {
+                            NoGamesDetectedText.IsVisible = isEmpty;
+                            DetectedGamesItemsControl.IsVisible = !isEmpty;
+                        }
+                    )
+                    .DisposeWith(d);
+            }
+        );
     }
 }
-