mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 14:54:00 +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>
128 lines
3.7 KiB
C#
128 lines
3.7 KiB
C#
using Avalonia.Controls;
|
|
using Avalonia.Input;
|
|
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.ViewModels;
|
|
using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
|
|
|
|
namespace Ryujinx.Ava.UI.Views.User
|
|
{
|
|
public partial class UserSelectorViews : UserControl
|
|
{
|
|
private NavigationDialogHost _parent;
|
|
|
|
public UserProfileViewModel ViewModel { get; set; }
|
|
|
|
public UserSelectorViews()
|
|
{
|
|
InitializeComponent();
|
|
|
|
if (Program.PreviewerDetached)
|
|
{
|
|
AddHandler(Frame.NavigatedToEvent, (s, e) =>
|
|
{
|
|
NavigatedTo(e);
|
|
}, RoutingStrategies.Direct);
|
|
}
|
|
}
|
|
|
|
private void NavigatedTo(NavigationEventArgs arg)
|
|
{
|
|
if (Program.PreviewerDetached)
|
|
{
|
|
if (arg.NavigationMode == NavigationMode.New)
|
|
{
|
|
_parent = (NavigationDialogHost)arg.Parameter;
|
|
ViewModel = _parent.ViewModel;
|
|
}
|
|
|
|
if (arg.NavigationMode == NavigationMode.Back)
|
|
{
|
|
((ContentDialog)_parent.Parent).Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle];
|
|
}
|
|
|
|
DataContext = ViewModel;
|
|
}
|
|
}
|
|
|
|
private void Grid_PointerEntered(object sender, PointerEventArgs e)
|
|
{
|
|
if (sender is Grid grid)
|
|
{
|
|
if (grid.DataContext is UserProfile profile)
|
|
{
|
|
profile.IsPointerOver = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
private void Grid_OnPointerExited(object sender, PointerEventArgs e)
|
|
{
|
|
if (sender is Grid grid)
|
|
{
|
|
if (grid.DataContext is UserProfile profile)
|
|
{
|
|
profile.IsPointerOver = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
{
|
|
if (sender is ListBox listBox)
|
|
{
|
|
int selectedIndex = listBox.SelectedIndex;
|
|
|
|
if (selectedIndex >= 0 && selectedIndex < ViewModel.Profiles.Count)
|
|
{
|
|
if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
|
|
{
|
|
_parent?.AccountManager?.OpenUser(userProfile.UserId);
|
|
|
|
foreach (BaseModel profile in ViewModel.Profiles)
|
|
{
|
|
if (profile is UserProfile uProfile)
|
|
{
|
|
uProfile.UpdateState();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private void AddUser(object sender, RoutedEventArgs e)
|
|
{
|
|
_parent.AddUser();
|
|
}
|
|
|
|
private void EditUser(object sender, RoutedEventArgs e)
|
|
{
|
|
if (sender is Avalonia.Controls.Button button)
|
|
{
|
|
if (button.DataContext is UserProfile userProfile)
|
|
{
|
|
_parent.EditUser(userProfile);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void ManageSaves(object sender, RoutedEventArgs e)
|
|
{
|
|
_parent.ManageSaves();
|
|
}
|
|
|
|
private void RecoverLostAccounts(object sender, RoutedEventArgs e)
|
|
{
|
|
_parent.RecoverLostAccounts();
|
|
}
|
|
|
|
private void Close(object sender, RoutedEventArgs e)
|
|
{
|
|
((ContentDialog)_parent.Parent).Hide();
|
|
}
|
|
}
|
|
} |