Undo a testing change

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -1034,16 +1034,16 @@ namespace Ryujinx.HLE.FileSystem
                 switch (fileName)
                 {
                     case "prod.keys":
-                        verified = VerifyKeys(lines, genericPattern);
+                        verified = verifyKeys(lines, genericPattern);
                         break;
                     case "title.keys":
-                        verified = VerifyKeys(lines, titlePattern);
+                        verified = verifyKeys(lines, titlePattern);
                         break;
                     case "console.keys":
-                        verified = VerifyKeys(lines, genericPattern);
+                        verified = verifyKeys(lines, genericPattern);
                         break;
                     case "dev.keys":
-                        verified = VerifyKeys(lines, genericPattern);
+                        verified = verifyKeys(lines, genericPattern);
                         break;
                     default:
                         throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
@@ -1056,20 +1056,18 @@ namespace Ryujinx.HLE.FileSystem
             {
                 throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
             }
+        }
 
-            return;
+        private bool verifyKeys(string[] lines, string regex)
-            
+        {
-            bool VerifyKeys(string[] lines, string regex)
+            foreach (string line in lines)
             {
-                foreach (string line in lines)
+                if (!Regex.IsMatch(line, regex))
                 {
-                    if (!Regex.IsMatch(line, regex))
+                    return false;
-                    {
-                        return false;
-                    }
                 }
-                return true;
             }
+            return true;
         }
 
         public bool AreKeysAlredyPresent(string pathToCheck)

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -33,7 +33,7 @@
     <EmbeddedResource Include="Resources\Icon_XCI.png" />
     <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
     <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
-    <EmbeddedResource Include="Resources\Logo_Ryujinx_AntiAlias.png" />
+    <EmbeddedResource Include="Resources\Logo_Thiccjinx.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
     <EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ryu="clr-namespace:Ryujinx.Ava">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -52,5 +53,22 @@
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
         </ResourceDictionary>
+        <ResourceDictionary x:Key="{x:Static ryu:RyujinxApp.AmoledThemeVariant}">
+            <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
+                             Color="{DynamicResource DataGridSelectionColor}" />
+            <Color x:Key="ControlFillColorSecondary">#008AA8</Color>
+            <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
+            <Color x:Key="ThemeContentBackgroundColor">#FF000000</Color>
+            <Color x:Key="ThemeControlBorderColor">#2D000000</Color>
+            <Color x:Key="ThemeForegroundColor">#FFFFFFFF</Color>
+            <Color x:Key="MenuFlyoutPresenterBorderColor">#79000000</Color>
+            <Color x:Key="AppListBackgroundColor">#50000000</Color>
+            <Color x:Key="AppListHoverBackgroundColor">#40000000</Color>
+            <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
+            <Color x:Key="Switch">#FF2EEAC9</Color>
+            <Color x:Key="Unbounded">#FFFF4554</Color>
+            <Color x:Key="Custom">#6483F5</Color>
+        </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>

src/Ryujinx/RyujinxApp.axaml.cs

@@ -98,6 +98,9 @@ namespace Ryujinx.Ava
 
         private void ThemeChanged_Event(object _, ReactiveEventArgs<string> rArgs) => ApplyConfiguredTheme(rArgs.NewValue);
 
+
+        public static readonly ThemeVariant AmoledThemeVariant = new("Amoled", ThemeVariant.Dark); 
+
         public void ApplyConfiguredTheme(string baseStyle)
         {
             try
@@ -116,6 +119,7 @@ namespace Ryujinx.Ava
                     "Auto" => DetectSystemTheme(),
                     "Light" => ThemeVariant.Light,
                     "Dark" => ThemeVariant.Dark,
+                    "AMOLED" => AmoledThemeVariant,
                     _ => ThemeVariant.Default,
                 };
             }

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -55,6 +55,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             ClipToBounds="True"
+                            Background="{DynamicResource ThemeControlBorderColor}"
                             CornerRadius="5">
                             <Grid ColumnDefinitions="Auto,10,*,150,100">
                                 <Image
@@ -105,6 +106,7 @@
                                         Click="IdString_OnClick" 
                                         HorizontalContentAlignment="Left" 
                                         VerticalAlignment="Center"
+                                        
                                         Background="{DynamicResource AppListBackgroundColor}"
                                         Margin="-1, 0, 0, 0"
                                         Padding="0" >

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -131,7 +131,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
         // The border gets reduced to colored pixels in the 4 corners.
         public static readonly Bitmap IconBitmap =
-            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png")!);
+            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png")!);
 
         public MainWindow Window { get; init; }
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -547,6 +547,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 "Auto" => 0,
                 "Light" => 1,
                 "Dark" => 2,
+                "AMOLED" => 3,
                 _ => 0
             };
 
@@ -656,6 +657,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 0 => "Auto",
                 1 => "Light",
                 2 => "Dark",
+                3 => "AMOLED",
                 _ => "Auto"
             };
 

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -18,7 +18,7 @@
             Height="25"
             Width="25"
             ToolTip.Tip="{Binding Title}"
-            Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png?assembly=Ryujinx.UI.Common" />
+            Source="resm:Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png?assembly=Ryujinx.UI.Common" />
         <Menu
             Name="Menu"
             Height="32"

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml

@@ -7,7 +7,6 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:local="clr-namespace:Ryujinx.Ava.UI.Views.Main"
     xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
@@ -133,7 +132,14 @@
                         </Flyout>
                     </Button.Flyout>
                 </Button>
-            <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                Background="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Name="DockedStatus"
                 Margin="5,0,5,0"
@@ -143,7 +149,14 @@
                 PointerReleased="DockedStatus_PointerReleased"
                 Text="{Binding DockedStatusText}"
                 TextAlignment="Start" />
-            <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                Background="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding !ShowLoadProgress}" />
             <SplitButton
                 Name="AspectRatioStatus"
                 Padding="5,0,5,0"
@@ -190,7 +203,14 @@
                     </MenuFlyout>
                 </SplitButton.Flyout>
             </SplitButton>
-            <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                Background="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding !ShowLoadProgress}" />
             <ToggleSplitButton
                 Name="VolumeStatus"
                 Padding="5,0,5,0"
@@ -234,7 +254,14 @@
                     </Flyout>
                 </ToggleSplitButton.Flyout>
             </ToggleSplitButton>
-            <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                Background="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -242,7 +269,14 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding GameStatusText}"
                 TextAlignment="Start" />
-            <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                Background="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -264,7 +298,13 @@
                 VerticalAlignment="Center"
                 IsVisible="{Binding ShowShaderCompilationHint}"
                 Text="{Binding ShaderCountText}" />
-            <local:StatusBarSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding ShowShaderCompilationHint}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -272,7 +312,14 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding BackendText}"
                 TextAlignment="Start" />
-            <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                Background="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Margin="5,0,0,0"
                 HorizontalAlignment="Left"
@@ -287,7 +334,13 @@
             VerticalAlignment="Center"
             IsVisible="{Binding ShowFirmwareStatus}"
             Orientation="Horizontal">
-            <local:StatusBarSeparator IsVisible="{Binding IsGameRunning}" />
+            <Border
+                Width="2"
+                Height="12"
+                Margin="0"
+                BorderBrush="Gray"
+                BorderThickness="1"
+                IsVisible="{Binding IsGameRunning}" />
             <TextBlock
                 Name="FirmwareStatus"
                 Margin="5, 0, 0, 0"

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -2,7 +2,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
 using Avalonia.Threading;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Windows;
@@ -73,26 +72,4 @@ namespace Ryujinx.Ava.UI.Views.Main
             e.Handled = true;
         }
     }
-
-    public class StatusBarSeparator : Border
-    {
-        public StatusBarSeparator()
-        {
-            Width = 2;
-            Height = 12;
-            Margin = new Thickness();
-            BorderBrush = Brushes.Gray;
-            Background = Brushes.Gray;
-            BorderThickness = new Thickness(1);
-        }
-        /*
-        <Border
-        Width="2"
-    Height="12"
-    Margin="0"
-    BorderBrush="Gray"
-    Background="Gray"
-    BorderThickness="1"
-    IsVisible="{Binding !ShowLoadProgress}" />*/
-    }
 }

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -77,6 +77,9 @@
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
                             </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="AMOLED" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -91,15 +91,13 @@ namespace Ryujinx.Ava.UI.Windows
             TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
             TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
 
+            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
+            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
+
             // NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
             StatusBarHeight = StatusBarView.StatusBar.MinHeight;
             MenuBarHeight = MenuBar.MinHeight;
 
-            TitleBar.Height = MenuBarHeight;
-            
-            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
-
             ApplicationList.DataContext = DataContext;
             ApplicationGrid.DataContext = DataContext;