mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-09 09:18:43 +00:00
934b5a64e5
* Fix redundancies * Add back elses * Loading Screen fixes * Redesign User Profile Manager - Backported long selection bar in Grid/List view not working - Backported UserSelector is jank * Fix SelectionIndicator * Fix DataType * Fix SaveManager bug * Remove debug log * Load saves on UIThread * Reduce UI thread blocking * Fix locale keys * Use block namespaces * Fix close button width * Make UserProfile ordering consistent * Alphabetical order * Adjust layout, remove green circle for blue selector * Fix some inconsistencies * Fix no inital selected profile * Adjust appearance of edit button * Adjust SaveManager * Remove redundant warning dialog * Make firmware avatar selector clearer * View redesign again :hero_depressed: * Consistency adjustments * Adjust margins * Make `UserProfileImageSelector` consistent * Make `UserFirmwareAvatarSelector` consistent * Fix long grid view selector * Switch case * Remove long selection bar Handled in #4178 * Consistency * Started dialog titles * Fixes * Remaining titles * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml Co-authored-by: Mary-nyan <thog@protonmail.com> * Fix build * Hide UserRecoverer if no LostProfiles are found * UserEditor Avatar Placeholder * Watermark + locale adjustment * Border radius * Remove unnecessary styles * Fix firmware avatar image order * Cleanup `ColorPickerButton` * Make `UserId` copy/paste able * Make `FirmwareAvatarSelector` 6 images wide * Make selection bar better * Unsaved changes dialogue * Fix indentation * Remove extra check * Address suggestions * Reorganise - Remove unused views - Rename views to match convention - Fix weird namespacing * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * UserRecovererView empty placeholder * Update Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Models/UserProfile.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Remove AddModel * Update Ryujinx.Ava/Assets/Locales/en_US.json Co-authored-by: Ac_K <Acoustik666@gmail.com> * Fix bug Co-authored-by: Mary-nyan <thog@protonmail.com> Co-authored-by: Ac_K <Acoustik666@gmail.com>
103 lines
2.5 KiB
C#
103 lines
2.5 KiB
C#
using Avalonia.Media;
|
|
using Ryujinx.Ava.UI.Controls;
|
|
using Ryujinx.Ava.UI.ViewModels;
|
|
using Ryujinx.Ava.UI.Views.User;
|
|
using Ryujinx.HLE.HOS.Services.Account.Acc;
|
|
using Profile = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
|
|
|
|
namespace Ryujinx.Ava.UI.Models
|
|
{
|
|
public class UserProfile : BaseModel
|
|
{
|
|
private readonly Profile _profile;
|
|
private readonly NavigationDialogHost _owner;
|
|
private byte[] _image;
|
|
private string _name;
|
|
private UserId _userId;
|
|
private bool _isPointerOver;
|
|
private IBrush _backgroundColor;
|
|
|
|
public byte[] Image
|
|
{
|
|
get => _image;
|
|
set
|
|
{
|
|
_image = value;
|
|
OnPropertyChanged();
|
|
}
|
|
}
|
|
|
|
public UserId UserId
|
|
{
|
|
get => _userId;
|
|
set
|
|
{
|
|
_userId = value;
|
|
OnPropertyChanged();
|
|
}
|
|
}
|
|
|
|
public string Name
|
|
{
|
|
get => _name;
|
|
set
|
|
{
|
|
_name = value;
|
|
OnPropertyChanged();
|
|
}
|
|
}
|
|
|
|
public bool IsPointerOver
|
|
{
|
|
get => _isPointerOver;
|
|
set
|
|
{
|
|
_isPointerOver = value;
|
|
OnPropertyChanged();
|
|
}
|
|
}
|
|
|
|
public IBrush BackgroundColor
|
|
{
|
|
get => _backgroundColor;
|
|
set
|
|
{
|
|
_backgroundColor = value;
|
|
OnPropertyChanged();
|
|
}
|
|
}
|
|
|
|
public UserProfile(Profile profile, NavigationDialogHost owner)
|
|
{
|
|
_profile = profile;
|
|
_owner = owner;
|
|
|
|
UpdateBackground();
|
|
|
|
Image = profile.Image;
|
|
Name = profile.Name;
|
|
UserId = profile.UserId;
|
|
}
|
|
|
|
public void UpdateState()
|
|
{
|
|
UpdateBackground();
|
|
OnPropertyChanged(nameof(Name));
|
|
}
|
|
|
|
private void UpdateBackground()
|
|
{
|
|
Avalonia.Application.Current.Styles.TryGetResource("ControlFillColorSecondary", out object color);
|
|
|
|
if (color is not null)
|
|
{
|
|
BackgroundColor = _profile.AccountState == AccountState.Open ? new SolidColorBrush((Color)color) : Brushes.Transparent;
|
|
}
|
|
}
|
|
|
|
public void Recover(UserProfile userProfile)
|
|
{
|
|
_owner.Navigate(typeof(UserEditorView), (_owner, userProfile, true));
|
|
}
|
|
}
|
|
} |