Refactor item filtering to not include empty entries after comma

Also remove extra border and use one built into textbox so aligns with mouse over etc, move filtering logic into UI instead of item class

Author: Wufflez

Loki/InventoryListItem.cs

@@ -17,8 +17,6 @@ public InventoryListItem(string name, string category, SharedItemData itemData)
             ItemData = itemData;
         }
 
-        public static string ItemsFilter { get; set; }
-
         public static List<InventoryListItem> AllItems = ItemDb.AllItems
             .Select(CreateListItem).ToList();
 
@@ -56,32 +54,5 @@ private static InventoryListItem CreateListItem(SharedItemData itemData)
             };
             return new InventoryListItem(displayName, category, itemData);
         }
-
-        public static bool FilterListItem(InventoryListItem item)
-        {
-            if (string.IsNullOrWhiteSpace(ItemsFilter))
-            {
-                return true;
-            }
-            else
-            {
-                string[] filterItems = ItemsFilter.ToLower().Split(new char[] { ',' });
-
-                foreach(string filterItem in filterItems)
-                {
-                    if(item.Name.ToLower().Contains(filterItem))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        public static bool FilterListItemObject(object itemObject)
-        {
-            return FilterListItem(itemObject as InventoryListItem);
-        }
     }
 }

Loki/MainWindow.xaml

@@ -216,23 +216,25 @@
                         <Grid Grid.Row="0" Margin="0,4,4,0">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <Label Grid.Column="0" FontSize="10">Search:</Label>
-                            <Border Grid.Column="1" BorderBrush="DarkGray" BorderThickness="1" Padding="2,0,2,0">
-                                <TextBox x:Name="itemSearch" VerticalContentAlignment="Center" TextChanged="itemSearch_TextChanged" Padding="0,0,-1,0" BorderBrush="{x:Null}"></TextBox>
-                            </Border>
+                            <TextBox Grid.Column="1" BorderBrush="DarkGray" BorderThickness="1" Padding="2,0,2,0"
+                                     x:Name="ItemSearch" VerticalContentAlignment="Center" TextChanged="itemSearch_TextChanged" />
+                           
                         </Grid>
 
                         <!-- Item Picker -->
                         <ScrollViewer Grid.Row="1" Margin="4,4,4,4" Padding="0,0,8,0" MinWidth="250">
-                            <ItemsControl x:Name="itemsControl" DockPanel.Dock="Left">
+                            <ItemsControl DockPanel.Dock="Left">
 
                                 <ItemsControl.ItemsSource>
                                     <Binding>
                                         <Binding.Source>
                                             <CollectionViewSource
-                                            Source="{x:Static loki:InventoryListItem.AllItems}">
+                                                x:Name ="InventoryViewSource"
+                                                Filter="InventoryViewSource_OnFilter"
+                                                Source="{x:Static loki:InventoryListItem.AllItems}">
                                                 <CollectionViewSource.GroupDescriptions>
                                                     <PropertyGroupDescription PropertyName="Category" />
                                                 </CollectionViewSource.GroupDescriptions>

Loki/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -84,8 +85,7 @@ public bool SaveInProgress
             get => (bool) GetValue(SaveInProgressProperty);
             set => SetValue(SaveInProgressProperty, value);
         }
-
-
+        
         private static void SelectedCharacterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var window = (MainWindow) d;
@@ -233,13 +233,18 @@ private async Task ShowNotification(string notifyText)
 
         }
 
-        private void itemSearch_TextChanged(object sender, TextChangedEventArgs e)
+        private void itemSearch_TextChanged(object sender, TextChangedEventArgs e) 
+            => InventoryViewSource.View.Refresh();
+
+        private void InventoryViewSource_OnFilter(object sender, FilterEventArgs e)
         {
-            InventoryListItem.ItemsFilter = itemSearch.Text;
-            if (itemsControl?.ItemsSource != null)
+            if (string.IsNullOrWhiteSpace(ItemSearch.Text))
+                e.Accepted = true;
+            else if (e.Item is InventoryListItem item)
             {
-                var collectionViewSource = CollectionViewSource.GetDefaultView(itemsControl.ItemsSource);
-                collectionViewSource.Filter = new Predicate<object>(InventoryListItem.FilterListItemObject);
+                string[] filterItems = ItemSearch.Text.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                e.Accepted = filterItems.Any(filterItem =>
+                    item.Name.Contains(filterItem, StringComparison.OrdinalIgnoreCase));
             }
         }
     }