mirror of
https://github.com/GreemDev/Ryujinx
synced 2024-11-28 20:49:22 +01: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>
165 lines
No EOL
5.7 KiB
C#
165 lines
No EOL
5.7 KiB
C#
using Avalonia.Controls;
|
|
using Avalonia.Data;
|
|
using Avalonia.Interactivity;
|
|
using FluentAvalonia.UI.Controls;
|
|
using FluentAvalonia.UI.Navigation;
|
|
using Ryujinx.Ava.Common.Locale;
|
|
using Ryujinx.Ava.UI.Controls;
|
|
using Ryujinx.Ava.UI.Models;
|
|
using Ryujinx.Ava.UI.Helpers;
|
|
using Ryujinx.HLE.HOS.Services.Account.Acc;
|
|
using System;
|
|
using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
|
|
|
|
namespace Ryujinx.Ava.UI.Views.User
|
|
{
|
|
public partial class UserEditorView : UserControl
|
|
{
|
|
private NavigationDialogHost _parent;
|
|
private UserProfile _profile;
|
|
private bool _isNewUser;
|
|
|
|
public TempProfile TempProfile { get; set; }
|
|
public uint MaxProfileNameLength => 0x20;
|
|
public bool IsDeletable => _profile.UserId != AccountManager.DefaultUserId;
|
|
|
|
public UserEditorView()
|
|
{
|
|
InitializeComponent();
|
|
AddHandler(Frame.NavigatedToEvent, (s, e) =>
|
|
{
|
|
NavigatedTo(e);
|
|
}, RoutingStrategies.Direct);
|
|
}
|
|
|
|
private void NavigatedTo(NavigationEventArgs arg)
|
|
{
|
|
if (Program.PreviewerDetached)
|
|
{
|
|
switch (arg.NavigationMode)
|
|
{
|
|
case NavigationMode.New:
|
|
var args = ((NavigationDialogHost parent, UserProfile profile, bool isNewUser))arg.Parameter;
|
|
_isNewUser = args.isNewUser;
|
|
_profile = args.profile;
|
|
TempProfile = new TempProfile(_profile);
|
|
|
|
_parent = args.parent;
|
|
break;
|
|
}
|
|
|
|
((ContentDialog)_parent.Parent).Title = $"{LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle]} - " +
|
|
$"{ (_isNewUser ? LocaleManager.Instance[LocaleKeys.UserEditorTitleCreate] : LocaleManager.Instance[LocaleKeys.UserEditorTitle])}";
|
|
|
|
DataContext = TempProfile;
|
|
|
|
AddPictureButton.IsVisible = _isNewUser;
|
|
ChangePictureButton.IsVisible = !_isNewUser;
|
|
IdLabel.IsVisible = _profile != null;
|
|
IdText.IsVisible = _profile != null;
|
|
if (!_isNewUser && IsDeletable)
|
|
{
|
|
DeleteButton.IsVisible = true;
|
|
}
|
|
else
|
|
{
|
|
DeleteButton.IsVisible = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
private async void BackButton_Click(object sender, RoutedEventArgs e)
|
|
{
|
|
if (_isNewUser)
|
|
{
|
|
if (TempProfile.Name != String.Empty || TempProfile.Image != null)
|
|
{
|
|
if (await ContentDialogHelper.CreateChoiceDialog(
|
|
LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesTitle],
|
|
LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesMessage],
|
|
LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesSubMessage]))
|
|
{
|
|
_parent?.GoBack();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
_parent?.GoBack();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (_profile.Name != TempProfile.Name || _profile.Image != TempProfile.Image)
|
|
{
|
|
if (await ContentDialogHelper.CreateChoiceDialog(
|
|
LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesTitle],
|
|
LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesMessage],
|
|
LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesSubMessage]))
|
|
{
|
|
_parent?.GoBack();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
_parent?.GoBack();
|
|
}
|
|
}
|
|
}
|
|
|
|
private void DeleteButton_Click(object sender, RoutedEventArgs e)
|
|
{
|
|
_parent.DeleteUser(_profile);
|
|
}
|
|
|
|
private void SaveButton_Click(object sender, RoutedEventArgs e)
|
|
{
|
|
DataValidationErrors.ClearErrors(NameBox);
|
|
|
|
if (string.IsNullOrWhiteSpace(TempProfile.Name))
|
|
{
|
|
DataValidationErrors.SetError(NameBox, new DataValidationException(LocaleManager.Instance[LocaleKeys.UserProfileEmptyNameError]));
|
|
|
|
return;
|
|
}
|
|
|
|
if (TempProfile.Image == null)
|
|
{
|
|
_parent.Navigate(typeof(UserProfileImageSelectorView), (_parent, TempProfile));
|
|
|
|
return;
|
|
}
|
|
|
|
if (_profile != null && !_isNewUser)
|
|
{
|
|
_profile.Name = TempProfile.Name;
|
|
_profile.Image = TempProfile.Image;
|
|
_profile.UpdateState();
|
|
_parent.AccountManager.SetUserName(_profile.UserId, _profile.Name);
|
|
_parent.AccountManager.SetUserImage(_profile.UserId, _profile.Image);
|
|
}
|
|
else if (_isNewUser)
|
|
{
|
|
_parent.AccountManager.AddUser(TempProfile.Name, TempProfile.Image, TempProfile.UserId);
|
|
}
|
|
else
|
|
{
|
|
return;
|
|
}
|
|
|
|
_parent?.GoBack();
|
|
}
|
|
|
|
public void SelectProfileImage()
|
|
{
|
|
_parent.Navigate(typeof(UserProfileImageSelectorView), (_parent, TempProfile));
|
|
}
|
|
|
|
private void ChangePictureButton_Click(object sender, RoutedEventArgs e)
|
|
{
|
|
if (_profile != null || _isNewUser)
|
|
{
|
|
SelectProfileImage();
|
|
}
|
|
}
|
|
}
|
|
} |