manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-14 20:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redesign

Browse source
This commit is contained in:
Isaac Marovitz 2022-12-31 19:10:59 +01:00
parent 7c00738631
commit 6c7e9eb500
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
3 changed files with 138 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

277
Ryujinx.Ava/UI/Windows/AboutWindow.axaml
View file

@ -4,256 +4,229 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox" xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="500" d:DesignHeight="260"
d:DesignWidth="750" d:DesignWidth="550"
Height="500" Height="260"
Width="750" Width="550"
x:Class="Ryujinx.Ava.UI.Windows.AboutWindow" x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
Margin="0 -12 0 0"
Focusable="True"> Focusable="True">
<Grid <Grid
Margin="15"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid <Grid
Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Margin="20"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0"> <Grid
Grid.Row="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition Width="Auto" />
<ColumnDefinition /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image <Image
Grid.Column="0" Grid.Column="0"
Height="100" Height="80"
Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" /> Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
<flex:FlexPanel <flex:FlexPanel
Grid.Column="1" Grid.Column="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
JustifyContent="SpaceBetween"
AlignContent="Center"
Direction="Column" Direction="Column"
Margin="5"> JustifyContent="SpaceAround"
RowSpacing="2">
<TextBlock <TextBlock
FontSize="35" FontSize="28"
FontWeight="Bold"
Text="Ryujinx" Text="Ryujinx"
TextAlignment="Center" /> TextAlignment="Left" />
<TextBlock <TextBlock
FontSize="16"
Text="(REE-YOU-JINX)" Text="(REE-YOU-JINX)"
TextAlignment="Center" /> TextAlignment="Left" />
<Button
HorizontalAlignment="Center"
Background="Transparent"
Click="Button_OnClick"
Tag="https://www.ryujinx.org/">
<TextBlock
Text="www.ryujinx.org"
TextAlignment="Center"
TextDecorations="Underline"
ToolTip.Tip="{locale:Locale AboutUrlTooltipMessage}" />
</Button>
</flex:FlexPanel> </flex:FlexPanel>
</Grid> </Grid>
<flex:FlexPanel <StackPanel
Grid.Row="1" Grid.Row="2"
Direction="Column" Spacing="10"
JustifyContent="FlexEnd"
RowSpacing="10"
AlignContent="Center"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Version}" Text="{Binding Version}"
TextAlignment="Center" /> TextAlignment="Center"
FontSize="10"
LineHeight="12" />
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
MaxLines="2" MaxLines="2"
Text="{locale:Locale AboutDisclaimerMessage}" Text="{locale:Locale AboutDisclaimerMessage}"
TextAlignment="Center" /> TextAlignment="Center"
FontSize="10"
LineHeight="12" />
<TextBlock <TextBlock
Name="AmiiboLabel" Name="AmiiboLabel"
HorizontalAlignment="Center" HorizontalAlignment="Center"
MaxLines="2" MaxLines="2"
PointerPressed="AmiiboLabel_OnPointerPressed" PointerPressed="AmiiboLabel_OnPointerPressed"
Text="{locale:Locale AboutAmiiboDisclaimerMessage}" Text="{locale:Locale AboutAmiiboDisclaimerMessage}"
TextAlignment="Center" /> TextAlignment="Center"
FontSize="10"
LineHeight="12" />
<StackPanel <StackPanel
HorizontalAlignment="Center" HorizontalAlignment="Center"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="10"> Spacing="10">
<StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutPatreonUrlTooltipMessage}"> <Button
<Button MaxHeight="30"
Height="65" MaxWidth="30"
Background="Transparent" MinHeight="30"
Click="Button_OnClick" MinWidth="30"
Tag="https://www.patreon.com/ryujinx"> Padding="8"
<Grid> CornerRadius="15"
<Grid.RowDefinitions> Background="Transparent"
<RowDefinition /> Click="Button_OnClick"
<RowDefinition Height="Auto" /> Tag="https://www.patreon.com/ryujinx">
</Grid.RowDefinitions> <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Patreon.png?assembly=Ryujinx.Ui.Common" />
<Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Patreon.png?assembly=Ryujinx.Ui.Common" /> </Button>
<TextBlock <Button
Grid.Row="1" MaxHeight="30"
Margin="0,5,0,0" MaxWidth="30"
HorizontalAlignment="Center" MinHeight="30"
Text="Patreon" /> MinWidth="30"
</Grid> Padding="8"
</Button> CornerRadius="15"
</StackPanel> Background="Transparent"
<StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutGithubUrlTooltipMessage}"> Click="Button_OnClick"
<Button Tag="https://github.com/Ryujinx/Ryujinx">
Height="65" <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_GitHub.png?assembly=Ryujinx.Ui.Common" />
Background="Transparent" </Button>
Click="Button_OnClick" <Button
Tag="https://github.com/Ryujinx/Ryujinx"> MaxHeight="30"
<Grid> MaxWidth="30"
<Grid.RowDefinitions> MinHeight="30"
<RowDefinition /> MinWidth="30"
<RowDefinition Height="Auto" /> Padding="8"
</Grid.RowDefinitions> CornerRadius="15"
<Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_GitHub.png?assembly=Ryujinx.Ui.Common" /> Background="Transparent"
<TextBlock Click="Button_OnClick"
Grid.Row="1" Tag="https://discordapp.com/invite/N2FmfVc">
Margin="0,5,0,0" <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Discord.png?assembly=Ryujinx.Ui.Common" />
HorizontalAlignment="Center" </Button>
Text="GitHub" /> <Button
</Grid> MaxHeight="30"
</Button> MaxWidth="30"
</StackPanel> MinHeight="30"
<StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutDiscordUrlTooltipMessage}"> MinWidth="30"
<Button Padding="8"
Height="65" CornerRadius="15"
Background="Transparent" Background="Transparent"
Click="Button_OnClick" Click="Button_OnClick"
Tag="https://discordapp.com/invite/N2FmfVc"> Tag="https://twitter.com/RyujinxEmu">
<Grid> <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Twitter.png?assembly=Ryujinx.Ui.Common" />
<Grid.RowDefinitions> </Button>
<RowDefinition /> <Button
<RowDefinition Height="Auto" /> MaxHeight="30"
</Grid.RowDefinitions> MaxWidth="30"
<Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Discord.png?assembly=Ryujinx.Ui.Common" /> MinHeight="30"
<TextBlock MinWidth="30"
Grid.Row="1" Padding="8"
Margin="0,5,0,0" CornerRadius="15"
HorizontalAlignment="Center" Background="Transparent"
Text="Discord" /> Click="Button_OnClick"
</Grid> Tag="https://www.ryujinx.org">
</Button> <ui:SymbolIcon
</StackPanel> Symbol="Link"
<StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutTwitterUrlTooltipMessage}"> Foreground="{DynamicResource ThemeForegroundColor}" />
<Button </Button>
Height="65"
Background="Transparent"
Click="Button_OnClick"
Tag="https://twitter.com/RyujinxEmu">
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Twitter.png?assembly=Ryujinx.Ui.Common" />
<TextBlock
Grid.Row="1"
Margin="0,5,0,0"
HorizontalAlignment="Center"
Text="Twitter" />
</Grid>
</Button>
</StackPanel>
</StackPanel> </StackPanel>
</flex:FlexPanel> </StackPanel>
</Grid> </Grid>
<Border <Border
Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="1" Width="1"
Margin="20 0"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
BorderBrush="Black" BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1,0,0,0" /> BorderThickness="1,0,0,0"
<flex:FlexPanel Margin="20 0"/>
Grid.Row="1" <Grid
Grid.Column="2" Grid.Column="2"
AlignContent="SpaceEvenly" HorizontalAlignment="Stretch"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Spacing="10"> Grid.Row="0"
Spacing="2">
<TextBlock <TextBlock
FontWeight="Bold" FontWeight="Bold"
FontSize="18" FontSize="15"
Text="{locale:Locale AboutRyujinxAboutTitle}" /> Text="{locale:Locale AboutRyujinxAboutTitle}" />
<TextBlock <TextBlock
LineHeight="20" FontSize="10"
TextWrapping="Wrap" TextWrapping="Wrap"
Text="{locale:Locale AboutRyujinxAboutContent}" /> Text="{locale:Locale AboutRyujinxAboutContent}" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Spacing="10"> Grid.Row="1"
Spacing="2">
<TextBlock <TextBlock
FontWeight="Bold" FontWeight="Bold"
FontSize="18" FontSize="15"
Text="{locale:Locale AboutRyujinxMaintainersTitle}" /> Text="{locale:Locale AboutRyujinxMaintainersTitle}" />
<TextBlock <TextBlock
LineHeight="18" FontSize="12"
TextWrapping="Wrap" TextWrapping="Wrap"
Text="{Binding Developers}" /> Text="{Binding Developers}" />
<Button <Button
HorizontalAlignment="Right" HorizontalAlignment="Right"
Background="Transparent" Background="Transparent"
Click="Button_OnClick" Click="Button_OnClick"
Padding="5"
Tag="https://github.com/Ryujinx/Ryujinx/graphs/contributors?type=a"> Tag="https://github.com/Ryujinx/Ryujinx/graphs/contributors?type=a">
<TextBlock <TextBlock
FontSize="10"
Text="{locale:Locale AboutRyujinxContributorsButtonHeader}" Text="{locale:Locale AboutRyujinxContributorsButtonHeader}"
TextAlignment="Right" TextAlignment="Right"
ToolTip.Tip="{locale:Locale AboutRyujinxMaintainersContentTooltipMessage}" /> ToolTip.Tip="{locale:Locale AboutRyujinxMaintainersContentTooltipMessage}" />
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Spacing="10"> Grid.Row="2"
Spacing="2">
<TextBlock <TextBlock
FontWeight="Bold" FontWeight="Bold"
FontSize="18" FontSize="15"
Text="{locale:Locale AboutRyujinxSupprtersTitle}" /> Text="{locale:Locale AboutRyujinxSupprtersTitle}" />
<Border <ScrollViewer
Padding="5" VerticalScrollBarVisibility="Visible"
VerticalAlignment="Stretch" HorizontalScrollBarVisibility="Disabled"
BorderBrush="Black" Height="70">
BorderThickness="1"
CornerRadius="5">
<TextBlock <TextBlock
Name="SupportersTextBlock" Name="SupportersTextBlock"
VerticalAlignment="Top" VerticalAlignment="Top"
TextTrimming="CharacterEllipsis"
FontSize="10" FontSize="10"
MaxLines="10"
TextWrapping="Wrap" TextWrapping="Wrap"
LineHeight="12"
Text="{Binding Supporters}" /> Text="{Binding Supporters}" />
</Border> </ScrollViewer>
</StackPanel> </StackPanel>
</flex:FlexPanel> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>

16
Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs
View file

@ -2,7 +2,10 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Markup.Xaml.Templates;
using Avalonia.Styling;
using Avalonia.Threading; using Avalonia.Threading;
using DynamicData;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Common.Utilities; using Ryujinx.Common.Utilities;
@ -37,14 +40,21 @@ namespace Ryujinx.Ava.UI.Windows
var content = new AboutWindow(); var content = new AboutWindow();
ContentDialog contentDialog = new ContentDialog ContentDialog contentDialog = new ContentDialog
{ {
Title = LocaleManager.Instance["MenuBarHelpAbout"],
PrimaryButtonText = "", PrimaryButtonText = "",
SecondaryButtonText = "", SecondaryButtonText = "",
CloseButtonText = LocaleManager.Instance["UserProfilesClose"], CloseButtonText = LocaleManager.Instance["UserProfilesClose"],
Content = content, Content = content
Padding = new Thickness(0)
}; };
Style closeButton = new(x => x.Name("CloseButton"));
closeButton.Setters.Add(new Setter(WidthProperty, 70d));
Style closeButtonParent = new(x => x.Name("CommandSpace"));
closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, Avalonia.Layout.HorizontalAlignment.Right));
contentDialog.Styles.Add(closeButton);
contentDialog.Styles.Add(closeButtonParent);
await contentDialog.ShowAsync(); await contentDialog.ShowAsync();
} }

BIN
Ryujinx.Ui.Common/Resources/Logo_Discord.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 37 KiB