- You can now filter by game state in the library

- Bug fix: Sometimes the colors of the Genre/Tag pills were too bright - Bug fix: Sometimes the add buttons on the pill selector were cut off
Phalcode · Oct 25, 2024 · 193f106 · 193f106
1 parent 52d2d67
commit 193f106
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,11 @@
 Recommended Gamevault Server Version: `v13.0.0`
 ### Changes
 
+- You can now filter by game state in the library
 - GameVault now stores the forced installation type for the uninstallation
 - Bug fix: Application name is blank in the taskbar
+- Bug fix: Sometimes the colors of the Genre/Tag pills were too bright
+- Bug fix: Sometimes the add buttons on the pill selector were cut off
 
 ## 1.12.5
 Recommended Gamevault Server Version: `v13.0.0`

diff --git a/gamevault/Converter/EnumDescriptionConverter.cs b/gamevault/Converter/EnumDescriptionConverter.cs
@@ -14,11 +14,16 @@ internal class EnumDescriptionConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if ((GameType)value != GameType.UNDETECTABLE)
+            if (value is GameType && (GameType)value != GameType.UNDETECTABLE)
             {
                 string result = ((DescriptionAttribute[])typeof(GameType).GetField(((GameType)value).ToString()).GetCustomAttributes(typeof(DescriptionAttribute), false))[0].Description.ToString();
                 return result;
             }
+            else if (value is State)
+            {
+                string result = ((DescriptionAttribute[])typeof(State).GetField(((State)value).ToString()).GetCustomAttributes(typeof(DescriptionAttribute), false))[0].Description.ToString();
+                return result;
+            }
             return string.Empty;
         }
 

diff --git a/gamevault/Converter/StringToColorConverter.cs b/gamevault/Converter/StringToColorConverter.cs
@@ -19,23 +19,25 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             }
             return Brushes.Black;
         }
-
         private Color GenerateColor(int numericValue)
         {
             byte red = (byte)((numericValue >> 16) & 0xFF);
             byte green = (byte)((numericValue >> 8) & 0xFF);
             byte blue = (byte)(numericValue & 0xFF);
 
-            // Darken the color by reducing each component by a fixed amount
-            const int darkeningAmount = 10;
-            red = (byte)Math.Max(0, red - darkeningAmount);
-            green = (byte)Math.Max(0, green - darkeningAmount);
-            blue = (byte)Math.Max(0, blue - darkeningAmount);
+            // Ensure the color is saturated by setting the maximum component to 255
+            byte maxComponent = Math.Max(red, Math.Max(green, blue));
+            if (maxComponent > 0)
+            {
+                float scale = 200f / maxComponent;
+                red = (byte)(red * scale);
+                green = (byte)(green * scale);
+                blue = (byte)(blue * scale);
+            }
 
             return Color.FromRgb(red, green, blue);
         }
 
-
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             return Colors.White;

diff --git a/gamevault/Helper/AnalyticsHelper.cs b/gamevault/Helper/AnalyticsHelper.cs
@@ -59,7 +59,7 @@ internal AnalyticsHelper()
         {
             trackingEnabled = SettingsViewModel.Instance.SendAnonymousAnalytics;
 #if DEBUG
-            // trackingEnabled = false;
+            trackingEnabled = false;
 #endif
             if (!trackingEnabled)
                 return;

diff --git a/gamevault/UserControls/GameViewUserControl.xaml b/gamevault/UserControls/GameViewUserControl.xaml
@@ -279,7 +279,7 @@
                                             <DataTemplate>
                                                 <Button Style="{StaticResource ButtonWrapper}" Cursor="Hand" Height="25" Margin="5,0,0,0" Click="Genre_Clicked">
                                                     <Border CornerRadius="5" Background="{Binding Name,Converter={StaticResource nameColorConv}}" Padding="0" >
-                                                        <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Margin="8,0,8,0" FontSize="10" FontWeight="Bold"/>
+                                                        <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" Margin="8,0,8,0" FontSize="10" FontWeight="Bold"/>
                                                     </Border>
                                                 </Button>
                                             </DataTemplate>

diff --git a/gamevault/UserControls/GameViewUserControl.xaml.cs b/gamevault/UserControls/GameViewUserControl.xaml.cs
@@ -344,7 +344,7 @@ private void Tag_Clicked(object sender, RoutedEventArgs e)
             {
                 TagMetadata data = (TagMetadata)((FrameworkElement)sender).DataContext;
                 MainWindowViewModel.Instance.Library.ClearAllFilters();
-                MainWindowViewModel.Instance.Library.uiFilterPillSelector.SetEntries(new Pill[] { new Pill() { ID = data.ID, Name = data.Name, ProviderDataId = data.ProviderDataId } });
+                MainWindowViewModel.Instance.Library.uiFilterTagSelector.SetEntries(new Pill[] { new Pill() { ID = data.ID, Name = data.Name, ProviderDataId = data.ProviderDataId } });
                 MainWindowViewModel.Instance.SetActiveControl(MainControl.Library);
             }
             catch { }

diff --git a/gamevault/UserControls/GeneralControls/PillSelector.xaml b/gamevault/UserControls/GeneralControls/PillSelector.xaml
@@ -40,11 +40,11 @@
                     <StackPanel Margin="5">
                         <TextBlock x:Name="uiTxtSelectionHeader" HorizontalAlignment="Center"/>
                         <TextBox Style="{DynamicResource SearchTextBox}" Height="26" TextChanged="Search_TextChanged" Margin="0,1,0,5"/>
-                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" MaxHeight="200">
+                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible" MaxHeight="200">
                             <ItemsControl x:Name="uiSelectionEntries">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid Margin="2"  MaxWidth="180">
+                                        <Grid Margin="2" Width="170" HorizontalAlignment="Left">
                                             <Border CornerRadius="5" Background="{Binding Name,Converter={StaticResource colorConv}}" Margin="0,0,25,0">
                                                 <TextBlock Text="{Binding Name}" Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                             </Border>

diff --git a/gamevault/UserControls/GeneralControls/PillSelector.xaml.cs b/gamevault/UserControls/GeneralControls/PillSelector.xaml.cs
@@ -17,7 +17,9 @@ public enum Selection
     {
         Tags,
         Genres,
-        GameType
+        GameType,
+        GameState
+
     }
     public partial class PillSelector : UserControl
     {
@@ -44,6 +46,7 @@ private async void UserControl_Loaded(object sender, RoutedEventArgs e)
                 Selection.Tags => "Tags",
                 Selection.Genres => "Genres",
                 Selection.GameType => "Game Type",
+                Selection.GameState => "Game State",
                 _ => uiTxtHeader.Text
             };
             InitTimer();
@@ -60,6 +63,9 @@ public string GetSelectedEntries()
             if (SelectionType == Selection.GameType)
                 return string.Join(",", selectedEntries.Select(o => o.OriginName));
 
+            if (SelectionType == Selection.GameState)
+                return string.Join(",", selectedEntries.Select(o => o.OriginName));
+
             return string.Join(",", selectedEntries.Select(o => o.Name));
         }
         public bool HasEntries()
@@ -92,7 +98,32 @@ private async void DebounceTimerElapsed(object? sender, EventArgs e)
         private async Task LoadSelectionEntries()
         {
             Pill[] data = null;
-            if (SelectionType != Selection.GameType)
+            if (SelectionType == Selection.GameType)
+            {
+                EnumDescriptionConverter conv = new EnumDescriptionConverter();
+                List<Pill> list = new List<Pill>();
+                foreach (GameType type in Enum.GetValues(typeof(GameType)))
+                {
+                    if (type == GameType.UNDETECTABLE)
+                        continue;
+
+                    list.Add(new Pill() { OriginName = type.ToString(), Name = (string)conv.Convert(type, null, null, null) });
+                }
+                data = list.ToArray();
+                data = data.Where(x => x.Name.Contains(debounceTimer.Data, StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+            else if (SelectionType == Selection.GameState)
+            {
+                EnumDescriptionConverter conv = new EnumDescriptionConverter();
+                List<Pill> list = new List<Pill>();
+                foreach (State type in Enum.GetValues(typeof(State)))
+                {
+                    list.Add(new Pill() { OriginName = type.ToString(), Name = (string)conv.Convert(type, null, null, null) });
+                }
+                data = list.ToArray();
+                data = data.Where(x => x.Name.Contains(debounceTimer.Data, StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+            else
             {
                 string url = string.Empty;
                 url = SelectionType switch
@@ -119,20 +150,6 @@ await Task.Run(() =>
                     }
                 });
             }
-            else
-            {
-                EnumDescriptionConverter conv = new EnumDescriptionConverter();
-                List<Pill> list = new List<Pill>();
-                foreach (GameType type in Enum.GetValues(typeof(GameType)))
-                {
-                    if (type == GameType.UNDETECTABLE)
-                        continue;
-
-                    list.Add(new Pill() { OriginName = type.ToString(), Name = (string)conv.Convert(type, null, null, null) });
-                }
-                data = list.ToArray();
-                data = data.Where(x => x.Name.Contains(debounceTimer.Data, StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
             uiSelectionEntries.ItemsSource = data;
         }
         private void OpenSelection_Click(object sender, MouseButtonEventArgs e)

diff --git a/gamevault/UserControls/LibraryUserControl.xaml b/gamevault/UserControls/LibraryUserControl.xaml
@@ -116,8 +116,9 @@
                             <Grid Visibility="{Binding FilterVisibility}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <local:PillSelector x:Name="uiFilterGameTypeSelector" SelectionType="GameType" Margin="12,0,24,0" Width="175" EntriesUpdated="FilterUpdated"/>
-                                    <local:PillSelector x:Name="uiFilterPillSelector" SelectionType="Tags" Margin="0,0,24,0" Width="175" EntriesUpdated="FilterUpdated"/>
-                                    <local:PillSelector x:Name="uiFilterGenreSelector" SelectionType="Genres" Margin="0,0,23,0" Width="175" EntriesUpdated="FilterUpdated"/>
+                                    <local:PillSelector x:Name="uiFilterTagSelector" SelectionType="Tags" Margin="0,0,24,0" Width="175" EntriesUpdated="FilterUpdated"/>
+                                    <local:PillSelector x:Name="uiFilterGenreSelector" SelectionType="Genres" Margin="0,0,24,0" Width="175" EntriesUpdated="FilterUpdated"/>
+                                    <local:PillSelector x:Name="uiFilterGameStateSelector" SelectionType="GameState" Margin="0,0,23,0" Width="175" EntriesUpdated="FilterUpdated"/>
                                     <StackPanel Margin="0,0,97,0">
                                         <TextBlock Text="Release Year" FontSize="15"/>
                                         <local:DateRangeSelector x:Name="uiFilterReleaseDateRangeSelector" EntriesUpdated="FilterUpdated"/>
@@ -158,7 +159,7 @@
                                     </StackPanel>
                                     <StackPanel>
                                         <TextBlock Text="Bookmarks" FontSize="15"/>
-                                        <ToggleButton x:Name="uiFilterBookmarks"  Cursor="Hand" Margin="3,3,0,0" HorizontalAlignment="Left" Click="FilterUpdated">
+                                        <ToggleButton x:Name="uiFilterBookmarks"  Cursor="Hand" Margin="0,3,0,0" HorizontalAlignment="Left" Click="FilterUpdated">
                                             <ToggleButton.Style>
                                                 <Style TargetType="ToggleButton">
                                                     <Style.Setters>

diff --git a/gamevault/UserControls/LibraryUserControl.xaml.cs b/gamevault/UserControls/LibraryUserControl.xaml.cs
@@ -228,7 +228,8 @@ public void ClearAllFilters()
         {
             uiFilterGameTypeSelector.ClearEntries();
             uiFilterGenreSelector.ClearEntries();
-            uiFilterPillSelector.ClearEntries();
+            uiFilterTagSelector.ClearEntries();
+            uiFilterGameStateSelector.ClearEntries();
             uiFilterReleaseDateRangeSelector.ClearSelection();
 
             uiFilterBookmarks.IsChecked = false;
@@ -300,14 +301,19 @@ private string ApplyFilter(string filter)
             {
                 filter += $"&filter.metadata.genres.name=$in:{genres}";
             }
-            string tags = uiFilterPillSelector.GetSelectedEntries();
+            string tags = uiFilterTagSelector.GetSelectedEntries();
             if (tags != string.Empty)
             {
                 filter += $"&filter.metadata.tags.name=$in:{tags}";
             }
+            string gameStates = uiFilterGameStateSelector.GetSelectedEntries();
+            if (gameStates != string.Empty)
+            {
+                filter += $"&filter.progresses.state=$in:{gameStates}&filter.progresses.user.id=$eq:{LoginManager.Instance.GetCurrentUser()?.ID}";
+            }
             if (uiFilterBookmarks.IsChecked == true)
             {
-                filter += $"&filter.bookmarked_users.id=$eq:{LoginManager.Instance.GetCurrentUser().ID}";
+                filter += $"&filter.bookmarked_users.id=$eq:{LoginManager.Instance.GetCurrentUser()?.ID}";
             }
             return filter;
         }
@@ -439,7 +445,8 @@ private void RefreshFilterCounter()
             int filterCount = 0;
             filterCount += uiFilterGameTypeSelector.HasEntries() ? 1 : 0;
             filterCount += uiFilterGenreSelector.HasEntries() ? 1 : 0;
-            filterCount += uiFilterPillSelector.HasEntries() ? 1 : 0;
+            filterCount += uiFilterTagSelector.HasEntries() ? 1 : 0;
+            filterCount += uiFilterGameStateSelector.HasEntries() ? 1 : 0;
             filterCount += (bool)uiFilterEarlyAccess.IsChecked ? 1 : 0;
             filterCount += (bool)uiFilterBookmarks.IsChecked ? 1 : 0;
 

diff --git a/gamevault/Windows/MainWindow.xaml b/gamevault/Windows/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:uc="clr-namespace:gamevault.UserControls"
 		xmlns:conv="clr-namespace:gamevault.Converter"
         mc:Ignorable="d"
-        Title="GameVault"
+        Title="GameVault" TitleForeground="Transparent"
         WindowTitleBrush="Transparent" NonActiveWindowTitleBrush="Transparent"
        Height="450" Width="800" WindowStartupLocation="CenterScreen" WindowState="Maximized" MinWidth="600" MinHeight="345" Loaded="MetroWindow_Loaded" Closing="MetroWindow_Closing">
     <mah:MetroWindow.TaskbarItemInfo>