Skip to content

Filter by installed #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BlazyNights wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Filter by installed #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e098a22
Added filter when you click on the "Installed" header, currently does…
BlazyNights Mar 23, 2022
b27acd9
Made the installed filter work with the search filter
BlazyNights Mar 23, 2022
3fc3394
Added visual indicator to "Installed" header by making it a checkbox
BlazyNights Mar 23, 2022
aef7b9f
Moved _Click logic for installed filter to _Checked and _Unchecked. A…
BlazyNights Mar 23, 2022
d2d3184
Removed extra line
BlazyNights Mar 23, 2022
7a99408
Removed an unused function that I'd added, added some comments
BlazyNights Mar 23, 2022
12002dc
More cleanup
BlazyNights Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion VRCMelonAssistant/Pages/Mods.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,20 @@
</GridViewColumn.CellTemplate>
</GridViewColumn>

<GridViewColumn x:Name="InstalledColumn" Header="{DynamicResource Mods:Header:Installed}">
<GridViewColumn x:Name="InstalledColumn">
<GridViewColumn.Header>
<CheckBox
Name="InstalledButton"
Margin="7,-5,-5,-5"
Padding="9,-1,9,0"
Background="#00000000"
BorderThickness="0"
Content="{DynamicResource Mods:Header:Installed}"
FontSize="11"
IsChecked="False"
Checked="InstalledButton_Checked"
Unchecked="InstalledButton_Unchecked" />
</GridViewColumn.Header>
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock
Expand Down
45 changes: 38 additions & 7 deletions VRCMelonAssistant/Pages/Mods.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public sealed partial class Mods : Page
public CollectionView view;
public bool PendingChanges;
public bool HaveInstalledMods;
public bool FilteredToInstalled = false;
public bool FilteredBySearch = false;

private readonly SemaphoreSlim _modsLoadSem = new SemaphoreSlim(1, 1);

Expand Down Expand Up @@ -508,19 +510,29 @@ private void SearchButton_Click(object sender, RoutedEventArgs e)
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));
ModsListView.Items.Filter = null;
FilteredBySearch = false;
if (FilteredToInstalled)
{
ModsListView.Items.Filter = ModsListView.Items.Filter;
}
// Only null this if both filters (search and installed) are off
else
{
ModsListView.Items.Filter = null;
}
}
}

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;
Expand All @@ -534,11 +546,30 @@ private void SearchBar_TextChanged(object sender, TextChangedEventArgs e)
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 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;
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_Checked(object sender, RoutedEventArgs e)
{
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);
}

private void Animate(TextBlock target, double oldHeight, double newHeight, TimeSpan duration)
Expand Down