Finalizing changes. There are issued that need fixing before versioning an nuget release

Author: DerekGooding

SimpleDataGrid.Example/AdvancedExamplesViewModel.cs

@@ -1,10 +1,5 @@
 using SimpleDataGrid.Pagination;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.IO;
-using System.Reflection;
 
 namespace SimpleDataGrid.Example;
 
@@ -45,41 +40,24 @@ private static List<Person> GetPeople()
         return people;
     }
 
-    public void ApplyFilter(int minAge)
-    {
-        People.SetFilter("minAge", p => p.Age >= minAge);
-    }
+    public void ApplyFilter(int minAge) => People.SetFilter("minAge", p => p.Age >= minAge);
 
-    public void ApplyMaxAgeFilter(int maxAge)
-    {
-        People.SetFilter("maxAge", p => p.Age <= maxAge);
-    }
+    public void ApplyMaxAgeFilter(int maxAge) => People.SetFilter("maxAge", p => p.Age <= maxAge);
 
-    public void ApplyNameFilter(string namePrefix)
-    {
-        People.SetFilter("namePrefix", p => p.Name.StartsWith(namePrefix, StringComparison.OrdinalIgnoreCase));
-    }
+    public void ApplyNameFilter(string namePrefix) => People.SetFilter("namePrefix", p => p.Name.StartsWith(namePrefix, StringComparison.OrdinalIgnoreCase));
 
-    public void RemoveFilter(string key)
-    {
-        People.RemoveFilter(key);
-    }
+    public void RemoveFilter(string key) => People.RemoveFilter(key);
 
     public IReadOnlyCollection<string> ActiveFilters => People.GetActiveFilters();
 
     public string CustomFilterExpression { get; set; } = "Age > 30 && Name.Contains(\"Person 1\")";
 
-    public void ClearFilter()
-    {
-        People.ClearFilters();
-    }
+    public void ClearFilter() => People.ClearFilters();
 
-    public void ApplyCustomFilter()
-    {
+    public void ApplyCustomFilter() =>
         // This is a placeholder. A real implementation would parse the CustomFilterExpression
         // and create a Func<Person, bool> from it.
         People.SetFilter("customFilter", p => p.Age > 30);
-    }
 
     public void ExportCurrentPageToCsv()
     {
@@ -90,13 +68,13 @@ public void ExportCurrentPageToCsv()
 
         // Add header row
         var headers = typeof(Person).GetProperties().Select(p => p.Name);
-        csv.AppendLine(string.Join(",", headers));
+        csv.AppendJoin(",", headers).AppendLine();
 
         // Add data rows
-        foreach (Person item in items)
+        foreach (var item in items)
         {
             var fields = typeof(Person).GetProperties().Select(p => p.GetValue(item)?.ToString() ?? string.Empty);
-            csv.AppendLine(string.Join(",", fields));
+            csv.AppendJoin(",", fields).AppendLine();
         }
 
         var filePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "CurrentPage.csv");
@@ -105,8 +83,5 @@ public void ExportCurrentPageToCsv()
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;
-    protected virtual void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
+    protected virtual void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 }

SimpleDataGrid.Example/AdvancedExamplesWindow.xaml.cs

@@ -1,17 +1,11 @@
-using SimpleDataGrid.Controls;
-using System;
-using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace SimpleDataGrid.Example;
 
 public partial class AdvancedExamplesWindow : Window
 {
-    public AdvancedExamplesWindow()
-    {
-        InitializeComponent();
-    }
+    public AdvancedExamplesWindow() => InitializeComponent();
 
     private void PreviousButton_Click(object sender, RoutedEventArgs e)
     {
@@ -25,15 +19,9 @@ private void NextButton_Click(object sender, RoutedEventArgs e)
         viewModel.People.NextPage();
     }
 
-    private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
-    {
-        ApplyMultiColumnSearch();
-    }
+    private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e) => ApplyMultiColumnSearch();
 
-    private void SearchOption_Changed(object sender, RoutedEventArgs e)
-    {
-        ApplyMultiColumnSearch();
-    }
+    private void SearchOption_Changed(object sender, RoutedEventArgs e) => ApplyMultiColumnSearch();
 
     private void ApplyMultiColumnSearch()
     {

SimpleDataGrid.Example/Converters/ItemCountConverter.cs

@@ -1,25 +1,20 @@
-using System;
 using System.Globalization;
 using System.Windows.Data;
 
-namespace SimpleDataGrid.Example.Converters
+namespace SimpleDataGrid.Example.Converters;
+
+public class ItemCountConverter : IMultiValueConverter
 {
-    public class ItemCountConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        if (values.Length == 4 && values[0] is int count && values[1] is int page && values[2] is int total && values[3] is int pageSize)
         {
-            if (values.Length == 4 && values[0] is int count && values[1] is int page && values[2] is int total && values[3] is int pageSize)
-            {
-                var start = (page - 1) * pageSize + 1;
-                var end = start + count - 1;
-                return $"Showing items {start}-{end} of {total}";
-            }
-            return string.Empty;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
+            var start = ((page - 1) * pageSize) + 1;
+            var end = start + count - 1;
+            return $"Showing items {start}-{end} of {total}";
         }
+        return string.Empty;
     }
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();
 }

SimpleDataGrid.Example/MainViewModel.cs

@@ -1,6 +1,4 @@
 using SimpleDataGrid.Pagination;
-using System;
-using System.Collections.Generic;
 
 namespace SimpleDataGrid.Example;
 

SimpleDataGrid.Example/MainWindow.xaml.cs

@@ -1,6 +1,3 @@
-using SimpleDataGrid.Controls;
-using System;
-using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;