Search bar

Ryujinx.Ava/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -33,8 +33,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private VirtualFileSystem                           _virtualFileSystem;
         private AvaloniaList<DownloadableContentModel>      _downloadableContents = new();
+        private AvaloniaList<DownloadableContentModel>      _views = new();
         private AvaloniaList<DownloadableContentModel>      _selectedDownloadableContents = new();
 
+        private string _search;
+
         private ulong _titleId;
         private string _titleName;
 
@@ -46,6 +49,17 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _downloadableContents = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(UpdateCount));
+                Sort();
+            }
+        }
+
+        public AvaloniaList<DownloadableContentModel> Views
+        {
+            get => _views;
+            set
+            {
+                _views = value;
+                OnPropertyChanged();
             }
         }
 
@@ -59,6 +73,17 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public string Search
+        {
+            get => _search;
+            set
+            {
+                _search = value;
+                OnPropertyChanged();
+                Sort();
+            }
+        }
+
         public string UpdateCount
         {
             get => string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowHeading], DownloadableContents.Count);
@@ -126,6 +151,28 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // NOTE: Save the list again to remove leftovers.
             Save();
+            Sort();
+        }
+
+        public void Sort()
+        {
+            DownloadableContents.AsObservableChangeSet()
+                .Filter(Filter)
+                .Bind(out var view).AsObservableList();
+
+            _views.Clear();
+            _views.AddRange(view);
+            OnPropertyChanged(nameof(Views));
+        }
+
+        private bool Filter(object arg)
+        {
+            if (arg is DownloadableContentModel content)
+            {
+                return string.IsNullOrWhiteSpace(_search) || content.FileName.ToLower().Contains(_search.ToLower());
+            }
+
+            return false;
         }
 
         private Nca TryOpenNca(IStorage ncaStorage, string containerPath)
@@ -212,6 +259,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     SelectedDownloadableContents.Add(content);
 
                     OnPropertyChanged(nameof(UpdateCount));
+                    Sort();
 
                     containsDownloadableContent = true;
                 }
@@ -227,12 +275,14 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             DownloadableContents.Remove(model);
             OnPropertyChanged(nameof(UpdateCount));
+            Sort();
         }
 
         public void RemoveAll()
         {
             DownloadableContents.Clear();
             OnPropertyChanged(nameof(UpdateCount));
+            Sort();
         }
 
         public void EnableAll()

Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml

@@ -23,14 +23,19 @@
         <Panel
             Margin="0 0 0 10"
             Grid.Row="0">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Grid.Column="0"
+                    Text="{Binding UpdateCount}" />
                 <StackPanel
-                Orientation="Horizontal"
+                    Margin="10 0"
-                HorizontalAlignment="Left">
+                    Grid.Column="1"
-                <TextBlock Text="{Binding UpdateCount}" />
+                    Orientation="Horizontal">
-            </StackPanel>
-            <StackPanel
-                Orientation="Horizontal"
-                HorizontalAlignment="Right">
                     <Button
                         Name="EnableAllButton"
                         MinWidth="90"
@@ -46,6 +51,14 @@
                         <TextBlock Text="{locale:Locale DlcManagerDisableAllButton}" />
                     </Button>
                 </StackPanel>
+                <TextBox
+                    Grid.Column="2"
+                    MinHeight="23"
+                    MaxHeight="23"
+                    HorizontalAlignment="Stretch"
+                    Watermark="{locale:Locale Search}"
+                    Text="{Binding Search}" />
+            </Grid>
         </Panel>
         <Border
             Grid.Row="1"
@@ -63,7 +76,7 @@
                 Background="Transparent"
                 SelectionChanged="OnSelectionChanged"
                 SelectedItems="{Binding SelectedDownloadableContents, Mode=TwoWay}"
-                Items="{Binding DownloadableContents}">
+                Items="{Binding Views}">
                 <ListBox.DataTemplates>
                     <DataTemplate
                         DataType="models:DownloadableContentModel">