From e098a22f1407ed74976293dac31dc70904d9831b Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Tue, 22 Mar 2022 21:06:39 -0700
Subject: [PATCH 1/7] Added filter when you click on the "Installed" header,
 currently does not work with search

---
 VRCMelonAssistant/Pages/Mods.xaml    | 14 +++++++++++++-
 VRCMelonAssistant/Pages/Mods.xaml.cs | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml b/VRCMelonAssistant/Pages/Mods.xaml
index e87e618..ff74750 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml
+++ b/VRCMelonAssistant/Pages/Mods.xaml
@@ -91,7 +91,19 @@
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
 
-                            <GridViewColumn x:Name="InstalledColumn" Header="{DynamicResource Mods:Header:Installed}">
+                            <GridViewColumn x:Name="InstalledColumn">
+                                <GridViewColumn.Header>
+                                    <Button
+                                        Name="InstalledButton"
+                                        Margin="-5"
+                                        Padding="9,-1,9,0"
+                                        Background="#00000000"
+                                        BorderThickness="0"
+                                        Click="InstalledButton_Click"
+                                        Content="{DynamicResource Mods:Header:Installed}"
+                                        FontSize="11"
+                                    />
+                                </GridViewColumn.Header>
                                 <GridViewColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock
diff --git a/VRCMelonAssistant/Pages/Mods.xaml.cs b/VRCMelonAssistant/Pages/Mods.xaml.cs
index e3a123d..9e19763 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml.cs
+++ b/VRCMelonAssistant/Pages/Mods.xaml.cs
@@ -40,6 +40,7 @@ namespace VRCMelonAssistant.Pages
         public CollectionView view;
         public bool PendingChanges;
         public bool HaveInstalledMods;
+        public bool FilteredToInstalled = false;
 
         private readonly SemaphoreSlim _modsLoadSem = new SemaphoreSlim(1, 1);
 
@@ -541,6 +542,27 @@ namespace VRCMelonAssistant.Pages
             return false;
         }
 
+        private void InstalledButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (!FilteredToInstalled)
+            {
+                FilteredToInstalled = true;
+                ModsListView.Items.Filter = new Predicate<object>(InstalledFilter);
+            }
+            else
+            {
+                ModsListView.Items.Filter = null;
+                FilteredToInstalled = false;
+            }
+        }
+
+        private bool InstalledFilter(object mod)
+        {
+            ModListItem item = mod as ModListItem;
+            if (item.IsInstalled) return true;
+            return false;
+        }
+
         private void Animate(TextBlock target, double oldHeight, double newHeight, TimeSpan duration)
         {
             target.Height = oldHeight;

From b27acd9b9904311c514830b44aee7d3350c1f054 Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Tue, 22 Mar 2022 21:34:45 -0700
Subject: [PATCH 2/7] Made the installed filter work with the search filter

---
 VRCMelonAssistant/Pages/Mods.xaml.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml.cs b/VRCMelonAssistant/Pages/Mods.xaml.cs
index 9e19763..c0818a9 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml.cs
+++ b/VRCMelonAssistant/Pages/Mods.xaml.cs
@@ -515,7 +515,10 @@ namespace VRCMelonAssistant.Pages
             {
                 Animate(SearchBar, 16, 0, new TimeSpan(0, 0, 0, 0, 300));
                 Animate(SearchText, 16, 0, new TimeSpan(0, 0, 0, 0, 300));
-                ModsListView.Items.Filter = null;
+                if (!FilteredToInstalled)
+                {
+                    ModsListView.Items.Filter = null;
+                }
             }
         }
 
@@ -535,11 +538,16 @@ namespace VRCMelonAssistant.Pages
         private bool SearchFilter(object mod)
         {
             ModListItem item = mod as ModListItem;
-            if (item.ModName.ToLower().Contains(SearchBar.Text.ToLower())) return true;
-            if (item.ModDescription.ToLower().Contains(SearchBar.Text.ToLower())) return true;
-            if (item.ModName.ToLower().Replace(" ", string.Empty).Contains(SearchBar.Text.ToLower().Replace(" ", string.Empty))) return true;
-            if (item.ModDescription.ToLower().Replace(" ", string.Empty).Contains(SearchBar.Text.ToLower().Replace(" ", string.Empty))) return true;
-            return false;
+            if (FilteredToInstalled && !item.IsInstalled) return false;
+            if (SearchBar.Height != 0)
+            {
+                if (item.ModName.ToLower().Contains(SearchBar.Text.ToLower())) return true;
+                if (item.ModDescription.ToLower().Contains(SearchBar.Text.ToLower())) return true;
+                if (item.ModName.ToLower().Replace(" ", string.Empty).Contains(SearchBar.Text.ToLower().Replace(" ", string.Empty))) return true;
+                if (item.ModDescription.ToLower().Replace(" ", string.Empty).Contains(SearchBar.Text.ToLower().Replace(" ", string.Empty))) return true;
+                return false;
+            }
+            return true;
         }
 
         private void InstalledButton_Click(object sender, RoutedEventArgs e)
@@ -547,13 +555,12 @@ namespace VRCMelonAssistant.Pages
             if (!FilteredToInstalled)
             {
                 FilteredToInstalled = true;
-                ModsListView.Items.Filter = new Predicate<object>(InstalledFilter);
             }
             else
             {
-                ModsListView.Items.Filter = null;
                 FilteredToInstalled = false;
             }
+            ModsListView.Items.Filter = new Predicate<object>(SearchFilter);
         }
 
         private bool InstalledFilter(object mod)

From 3fc3394070ca81f68b8fa518b9363c5cc02761c3 Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Tue, 22 Mar 2022 22:09:20 -0700
Subject: [PATCH 3/7] Added visual indicator to "Installed" header by making it
 a checkbox

---
 VRCMelonAssistant/Pages/Mods.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml b/VRCMelonAssistant/Pages/Mods.xaml
index ff74750..91eeda8 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml
+++ b/VRCMelonAssistant/Pages/Mods.xaml
@@ -93,15 +93,15 @@
 
                             <GridViewColumn x:Name="InstalledColumn">
                                 <GridViewColumn.Header>
-                                    <Button
+                                    <CheckBox
                                         Name="InstalledButton"
-                                        Margin="-5"
+                                        Margin="7,-5,-5,-5"
                                         Padding="9,-1,9,0"
                                         Background="#00000000"
                                         BorderThickness="0"
-                                        Click="InstalledButton_Click"
                                         Content="{DynamicResource Mods:Header:Installed}"
                                         FontSize="11"
+                                        IsChecked="False" Checked="InstalledButton_Checked" Unchecked="InstalledButton_Unchecked"
                                     />
                                 </GridViewColumn.Header>
                                 <GridViewColumn.CellTemplate>

From aef7b9f15da420da56a4f692dc91ba849978573e Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Tue, 22 Mar 2022 22:11:55 -0700
Subject: [PATCH 4/7] Moved _Click logic for installed filter to _Checked and
 _Unchecked. Added FilteredBySearch to fix a bug I introduced,
 SearchBar.Height does not update fast enough to be used in SearchFilter().

---
 VRCMelonAssistant/Pages/Mods.xaml.cs | 31 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml.cs b/VRCMelonAssistant/Pages/Mods.xaml.cs
index c0818a9..1538122 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml.cs
+++ b/VRCMelonAssistant/Pages/Mods.xaml.cs
@@ -41,6 +41,7 @@ namespace VRCMelonAssistant.Pages
         public bool PendingChanges;
         public bool HaveInstalledMods;
         public bool FilteredToInstalled = false;
+        public bool FilteredBySearch = false;
 
         private readonly SemaphoreSlim _modsLoadSem = new SemaphoreSlim(1, 1);
 
@@ -509,13 +510,19 @@ namespace VRCMelonAssistant.Pages
                 SearchBar.Focus();
                 Animate(SearchBar, 0, 16, new TimeSpan(0, 0, 0, 0, 300));
                 Animate(SearchText, 0, 16, new TimeSpan(0, 0, 0, 0, 300));
+                FilteredBySearch = true;
                 ModsListView.Items.Filter = new Predicate<object>(SearchFilter);
             }
             else
             {
                 Animate(SearchBar, 16, 0, new TimeSpan(0, 0, 0, 0, 300));
                 Animate(SearchText, 16, 0, new TimeSpan(0, 0, 0, 0, 300));
-                if (!FilteredToInstalled)
+                FilteredBySearch = false;
+                if (FilteredToInstalled)
+                {
+                    ModsListView.Items.Filter = ModsListView.Items.Filter;
+                }
+                else
                 {
                     ModsListView.Items.Filter = null;
                 }
@@ -524,7 +531,7 @@ namespace VRCMelonAssistant.Pages
 
         private void SearchBar_TextChanged(object sender, TextChangedEventArgs e)
         {
-            ModsListView.Items.Filter = new Predicate<object>(SearchFilter);
+            ModsListView.Items.Filter = ModsListView.Items.Filter;
             if (SearchBar.Text.Length > 0)
             {
                 SearchText.Text = null;
@@ -539,7 +546,7 @@ namespace VRCMelonAssistant.Pages
         {
             ModListItem item = mod as ModListItem;
             if (FilteredToInstalled && !item.IsInstalled) return false;
-            if (SearchBar.Height != 0)
+            if (FilteredBySearch)
             {
                 if (item.ModName.ToLower().Contains(SearchBar.Text.ToLower())) return true;
                 if (item.ModDescription.ToLower().Contains(SearchBar.Text.ToLower())) return true;
@@ -550,16 +557,15 @@ namespace VRCMelonAssistant.Pages
             return true;
         }
 
-        private void InstalledButton_Click(object sender, RoutedEventArgs e)
+        private void InstalledButton_Checked(object sender, RoutedEventArgs e)
         {
-            if (!FilteredToInstalled)
-            {
-                FilteredToInstalled = true;
-            }
-            else
-            {
-                FilteredToInstalled = false;
-            }
+            FilteredToInstalled = true;
+            ModsListView.Items.Filter = new Predicate<object>(SearchFilter);
+        }
+
+        private void InstalledButton_Unchecked(object sender, RoutedEventArgs e)
+        {
+            FilteredToInstalled = false;
             ModsListView.Items.Filter = new Predicate<object>(SearchFilter);
         }
 
@@ -591,5 +597,6 @@ namespace VRCMelonAssistant.Pages
             if (selectedMod == null) return;
             MainWindow.ShowModInfoWindow(selectedMod.ModInfo);
         }
+
     }
 }

From d2d318471d31635c01fe5e8f7813a48e4925abee Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Tue, 22 Mar 2022 22:29:02 -0700
Subject: [PATCH 5/7] Removed extra line

---
 VRCMelonAssistant/Pages/Mods.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml.cs b/VRCMelonAssistant/Pages/Mods.xaml.cs
index 1538122..8c724d4 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml.cs
+++ b/VRCMelonAssistant/Pages/Mods.xaml.cs
@@ -597,6 +597,5 @@ namespace VRCMelonAssistant.Pages
             if (selectedMod == null) return;
             MainWindow.ShowModInfoWindow(selectedMod.ModInfo);
         }
-
     }
 }

From 7a99408e36d1074857471397f90b7d4361fc0d47 Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Wed, 23 Mar 2022 01:12:54 -0700
Subject: [PATCH 6/7] Removed an unused function that I'd added, added some
 comments

---
 VRCMelonAssistant/Pages/Mods.xaml.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml.cs b/VRCMelonAssistant/Pages/Mods.xaml.cs
index 8c724d4..7dfe950 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml.cs
+++ b/VRCMelonAssistant/Pages/Mods.xaml.cs
@@ -522,6 +522,7 @@ namespace VRCMelonAssistant.Pages
                 {
                     ModsListView.Items.Filter = ModsListView.Items.Filter;
                 }
+                // Only null this if both filters (search and installed) are off
                 else
                 {
                     ModsListView.Items.Filter = null;
@@ -545,7 +546,9 @@ namespace VRCMelonAssistant.Pages
         private bool SearchFilter(object mod)
         {
             ModListItem item = mod as ModListItem;
+            // If the installed filter is on, don't search the text of mods that aren't installed
             if (FilteredToInstalled && !item.IsInstalled) return false;
+            // SearchBar.Height does not adjust fast enough to be used here, FilteredBySearch is changed at the same time
             if (FilteredBySearch)
             {
                 if (item.ModName.ToLower().Contains(SearchBar.Text.ToLower())) return true;
@@ -569,13 +572,6 @@ namespace VRCMelonAssistant.Pages
             ModsListView.Items.Filter = new Predicate<object>(SearchFilter);
         }
 
-        private bool InstalledFilter(object mod)
-        {
-            ModListItem item = mod as ModListItem;
-            if (item.IsInstalled) return true;
-            return false;
-        }
-
         private void Animate(TextBlock target, double oldHeight, double newHeight, TimeSpan duration)
         {
             target.Height = oldHeight;

From 12002dcc76c88054689d005828865716839186f5 Mon Sep 17 00:00:00 2001
From: BlazyNights <BlazyNights@gmail.com>
Date: Wed, 23 Mar 2022 01:29:28 -0700
Subject: [PATCH 7/7] More cleanup

---
 VRCMelonAssistant/Pages/Mods.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/VRCMelonAssistant/Pages/Mods.xaml b/VRCMelonAssistant/Pages/Mods.xaml
index 91eeda8..0756ebc 100644
--- a/VRCMelonAssistant/Pages/Mods.xaml
+++ b/VRCMelonAssistant/Pages/Mods.xaml
@@ -101,8 +101,9 @@
                                         BorderThickness="0"
                                         Content="{DynamicResource Mods:Header:Installed}"
                                         FontSize="11"
-                                        IsChecked="False" Checked="InstalledButton_Checked" Unchecked="InstalledButton_Unchecked"
-                                    />
+                                        IsChecked="False"
+                                        Checked="InstalledButton_Checked"
+                                        Unchecked="InstalledButton_Unchecked" />
                                 </GridViewColumn.Header>
                                 <GridViewColumn.CellTemplate>
                                     <DataTemplate>