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

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

@ -2,7 +2,10 @@
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml.Templates;
using Avalonia.Styling;
using Avalonia.Threading;
using DynamicData;
using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale;
using Ryujinx.Common.Utilities;
@ -37,14 +40,21 @@ namespace Ryujinx.Ava.UI.Windows
var content = new AboutWindow();
ContentDialog contentDialog = new ContentDialog
{
Title = LocaleManager.Instance["MenuBarHelpAbout"],
PrimaryButtonText = "",
SecondaryButtonText = "",
CloseButtonText = LocaleManager.Instance["UserProfilesClose"],
Content = content,
Padding = new Thickness(0)
Content = content
};
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();
}

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