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;
namespace Ryujinx.Ava.UI.Models;
public class AddModel : BaseModel
namespace Ryujinx.Ava.UI.Models
{
public class AddModel : BaseModel
{
}
}

View file

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

View file

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