Use block namespaces

This commit is contained in:
Isaac Marovitz 2023-01-03 18:17:03 -05:00
parent e629a383d4
commit 50a2876f7b
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
3 changed files with 101 additions and 98 deletions

View file

@ -1,8 +1,9 @@
using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.ViewModels;
namespace Ryujinx.Ava.UI.Models; namespace Ryujinx.Ava.UI.Models
public class AddModel : BaseModel
{ {
public class AddModel : BaseModel
{
}
} }

View file

@ -1,17 +1,18 @@
namespace Ryujinx.Ava.UI.ViewModels; namespace Ryujinx.Ava.UI.ViewModels
internal class UserProfileImageSelectorViewModel : BaseModel
{ {
private bool _firmwareFound; internal class UserProfileImageSelectorViewModel : BaseModel
public bool FirmwareFound
{ {
get => _firmwareFound; private bool _firmwareFound;
set public bool FirmwareFound
{ {
_firmwareFound = value; get => _firmwareFound;
OnPropertyChanged();
set
{
_firmwareFound = value;
OnPropertyChanged();
}
} }
} }
} }

View file

@ -5,107 +5,108 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
namespace Ryujinx.Ava.UI.ViewModels; namespace Ryujinx.Ava.UI.ViewModels
public class UserSaveManagerViewModel : BaseModel
{ {
private int _sortIndex; public class UserSaveManagerViewModel : BaseModel
private int _orderIndex;
private string _search;
private ObservableCollection<SaveModel> _saves;
private ObservableCollection<SaveModel> _views;
public int SortIndex
{ {
get => _sortIndex; private int _sortIndex;
set private int _orderIndex;
{ private string _search;
_sortIndex = value; private ObservableCollection<SaveModel> _saves;
OnPropertyChanged(); private ObservableCollection<SaveModel> _views;
Sort();
}
}
public int OrderIndex public int SortIndex
{
get => _orderIndex;
set
{ {
_orderIndex = value; get => _sortIndex;
OnPropertyChanged(); set
Sort(); {
_sortIndex = value;
OnPropertyChanged();
Sort();
}
} }
}
public string Search public int OrderIndex
{
get => _search;
set
{ {
_search = value; get => _orderIndex;
OnPropertyChanged(); set
Sort(); {
_orderIndex = value;
OnPropertyChanged();
Sort();
}
} }
}
public ObservableCollection<SaveModel> Saves public string Search
{
get => _saves;
set
{ {
_saves = value; get => _search;
OnPropertyChanged(); set
Sort(); {
_search = value;
OnPropertyChanged();
Sort();
}
}
public ObservableCollection<SaveModel> Saves
{
get => _saves;
set
{
_saves = value;
OnPropertyChanged();
Sort();
}
} }
}
public ObservableCollection<SaveModel> Views public ObservableCollection<SaveModel> Views
{ {
get => _views; get => _views;
} }
public UserSaveManagerViewModel() public UserSaveManagerViewModel()
{ {
_saves = new ObservableCollection<SaveModel>(); _saves = new ObservableCollection<SaveModel>();
_views = new ObservableCollection<SaveModel>(); _views = new ObservableCollection<SaveModel>();
} }
public void Sort() public void Sort()
{ {
Saves.AsObservableChangeSet() Saves.AsObservableChangeSet()
.Filter(Filter) .Filter(Filter)
.Sort(GetComparer()) .Sort(GetComparer())
.Bind(out var view).AsObservableList(); .Bind(out var view).AsObservableList();
_views.Clear(); _views.Clear();
_views.AddRange(view); _views.AddRange(view);
OnPropertyChanged(nameof(Views)); OnPropertyChanged(nameof(Views));
}
private bool Filter(object arg)
{
if (arg is SaveModel save)
{
return string.IsNullOrWhiteSpace(_search) || save.Title.ToLower().Contains(_search.ToLower());
} }
return false;
}
private IComparer<SaveModel> GetComparer() private bool Filter(object arg)
{
switch (SortIndex)
{ {
case 0: if (arg is SaveModel save)
return OrderIndex == 0 {
? SortExpressionComparer<SaveModel>.Ascending(save => save.Title) return string.IsNullOrWhiteSpace(_search) || save.Title.ToLower().Contains(_search.ToLower());
: SortExpressionComparer<SaveModel>.Descending(save => save.Title); }
case 1:
return OrderIndex == 0 return false;
? SortExpressionComparer<SaveModel>.Ascending(save => save.Size) }
: SortExpressionComparer<SaveModel>.Descending(save => save.Size);
default: private IComparer<SaveModel> GetComparer()
return null; {
switch (SortIndex)
{
case 0:
return OrderIndex == 0
? SortExpressionComparer<SaveModel>.Ascending(save => save.Title)
: SortExpressionComparer<SaveModel>.Descending(save => save.Title);
case 1:
return OrderIndex == 0
? SortExpressionComparer<SaveModel>.Ascending(save => save.Size)
: SortExpressionComparer<SaveModel>.Descending(save => save.Size);
default:
return null;
}
} }
} }
} }