mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-12-23 15:24:53 +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>
88 lines
2.7 KiB
C#
88 lines
2.7 KiB
C#
using Avalonia.Controls;
|
|
using Avalonia.Interactivity;
|
|
using FluentAvalonia.UI.Controls;
|
|
using FluentAvalonia.UI.Navigation;
|
|
using Ryujinx.Ava.UI.Controls;
|
|
using Ryujinx.Ava.UI.Models;
|
|
using Ryujinx.Ava.UI.ViewModels;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using SixLabors.ImageSharp;
|
|
using SixLabors.ImageSharp.Formats.Png;
|
|
using SixLabors.ImageSharp.PixelFormats;
|
|
using SixLabors.ImageSharp.Processing;
|
|
using System.IO;
|
|
|
|
namespace Ryujinx.Ava.UI.Views.User
|
|
{
|
|
public partial class UserFirmwareAvatarSelectorView : UserControl
|
|
{
|
|
private NavigationDialogHost _parent;
|
|
private TempProfile _profile;
|
|
|
|
public UserFirmwareAvatarSelectorView(ContentManager contentManager)
|
|
{
|
|
ContentManager = contentManager;
|
|
|
|
DataContext = ViewModel;
|
|
|
|
InitializeComponent();
|
|
}
|
|
|
|
public UserFirmwareAvatarSelectorView()
|
|
{
|
|
InitializeComponent();
|
|
|
|
AddHandler(Frame.NavigatedToEvent, (s, e) =>
|
|
{
|
|
NavigatedTo(e);
|
|
}, RoutingStrategies.Direct);
|
|
}
|
|
|
|
private void NavigatedTo(NavigationEventArgs arg)
|
|
{
|
|
if (Program.PreviewerDetached)
|
|
{
|
|
if (arg.NavigationMode == NavigationMode.New)
|
|
{
|
|
(_parent, _profile) = ((NavigationDialogHost, TempProfile))arg.Parameter;
|
|
ContentManager = _parent.ContentManager;
|
|
if (Program.PreviewerDetached)
|
|
{
|
|
ViewModel = new UserFirmwareAvatarSelectorViewModel();
|
|
}
|
|
|
|
DataContext = ViewModel;
|
|
}
|
|
}
|
|
}
|
|
|
|
public ContentManager ContentManager { get; private set; }
|
|
|
|
internal UserFirmwareAvatarSelectorViewModel ViewModel { get; set; }
|
|
|
|
private void GoBack(object sender, RoutedEventArgs e)
|
|
{
|
|
_parent.GoBack();
|
|
}
|
|
|
|
private void ChooseButton_OnClick(object sender, RoutedEventArgs e)
|
|
{
|
|
if (ViewModel.SelectedImage != null)
|
|
{
|
|
MemoryStream streamJpg = new();
|
|
SixLabors.ImageSharp.Image avatarImage = SixLabors.ImageSharp.Image.Load(ViewModel.SelectedImage, new PngDecoder());
|
|
|
|
avatarImage.Mutate(x => x.BackgroundColor(new Rgba32(
|
|
ViewModel.BackgroundColor.R,
|
|
ViewModel.BackgroundColor.G,
|
|
ViewModel.BackgroundColor.B,
|
|
ViewModel.BackgroundColor.A)));
|
|
avatarImage.SaveAsJpeg(streamJpg);
|
|
|
|
_profile.Image = streamJpg.ToArray();
|
|
|
|
_parent.GoBack();
|
|
}
|
|
}
|
|
}
|
|
} |