From b5562f20143ab56b6f1257f98501cea04eff17d7 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Wed, 13 Mar 2024 15:03:07 -0400
Subject: [PATCH] Use font icon instead of image

---
 src/Ryujinx.UI.Common/App/ApplicationData.cs  |   2 ++
 .../App/ApplicationLibrary.cs                 |   8 +++--
 .../Resources/Icon_Folder.png                 | Bin 2091 -> 0 bytes
 .../Ryujinx.UI.Common.csproj                  |   2 --
 src/Ryujinx/Assets/Styles/Styles.xaml         |  32 ++++++++++++++++++
 .../UI/Controls/ApplicationGridView.axaml     |   9 +++++
 .../UI/Controls/ApplicationListView.axaml     |  10 ++++++
 src/Ryujinx/UI/Helpers/Glyph.cs               |   1 +
 src/Ryujinx/UI/Helpers/GlyphValueConverter.cs |   1 +
 9 files changed, 60 insertions(+), 5 deletions(-)
 delete mode 100644 src/Ryujinx.UI.Common/Resources/Icon_Folder.png

diff --git a/src/Ryujinx.UI.Common/App/ApplicationData.cs b/src/Ryujinx.UI.Common/App/ApplicationData.cs
index 517a0c857b..51ac87b5a8 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationData.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationData.cs
@@ -38,6 +38,8 @@ namespace Ryujinx.UI.App.Common
 
         public bool IsGame => FileExtension != "Folder";
 
+        public bool IsFolder => FileExtension == "Folder";
+
         public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem, string titleFilePath)
         {
             using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index ccd7070585..508794127d 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -41,7 +41,6 @@ namespace Ryujinx.UI.App.Common
         private readonly byte[] _ncaIcon;
         private readonly byte[] _nroIcon;
         private readonly byte[] _nsoIcon;
-        private readonly byte[] _folderIcon;
 
         private readonly VirtualFileSystem _virtualFileSystem;
         private Language _desiredTitleLanguage;
@@ -59,11 +58,15 @@ namespace Ryujinx.UI.App.Common
             _ncaIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NCA.png");
             _nroIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NRO.png");
             _nsoIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NSO.png");
-            _folderIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_Folder.png");
         }
 
         private static byte[] GetResourceBytes(string resourceName)
         {
+            if (resourceName == "")
+            {
+                return Array.Empty<byte>();
+            }
+
             Stream resourceStream = Assembly.GetCallingAssembly().GetManifestResourceStream(resourceName);
             byte[] resourceByteArray = new byte[resourceStream.Length];
 
@@ -131,7 +134,6 @@ namespace Ryujinx.UI.App.Common
                                 TitleName = fileInfo.Name,
                                 FileExtension = "Folder",
                                 Path = fullPath,
-                                Icon = _folderIcon,
                             };
                             OnApplicationAdded(new ApplicationAddedEventArgs
                             {
diff --git a/src/Ryujinx.UI.Common/Resources/Icon_Folder.png b/src/Ryujinx.UI.Common/Resources/Icon_Folder.png
deleted file mode 100644
index dba7ff44d74db4fbf1ef51bfee016c55d43d1bd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2091
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
UHO##n{0bEJp00i_>zopr0MsoQSpWb4

diff --git a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
index eb84aad61c..387e998b0b 100644
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -15,7 +15,6 @@
     <None Remove="Resources\Icon_NSO.png" />
     <None Remove="Resources\Icon_NSP.png" />
     <None Remove="Resources\Icon_XCI.png" />
-    <None Remove="Resources\Icon_Folder.png" />
     <None Remove="Resources\Logo_Amiibo.png" />
     <None Remove="Resources\Logo_Discord.png" />
     <None Remove="Resources\Logo_GitHub.png" />
@@ -34,7 +33,6 @@
     <EmbeddedResource Include="Resources\Icon_NSO.png" />
     <EmbeddedResource Include="Resources\Icon_NSP.png" />
     <EmbeddedResource Include="Resources\Icon_XCI.png" />
-    <EmbeddedResource Include="Resources\Icon_Folder.png" />
     <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
     <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index f7f64be22f..20c435d08e 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -86,6 +86,38 @@
         <Setter Property="Width"
                 Value="120" />
     </Style>
+    <Style Selector="ui|SymbolIcon.listSmall">
+        <Setter Property="FontSize"
+                Value="50" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listNormal">
+        <Setter Property="FontSize"
+                Value="80" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listLarge">
+        <Setter Property="FontSize"
+                Value="100" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listHuge">
+        <Setter Property="FontSize"
+                Value="120" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridSmall">
+        <Setter Property="FontSize"
+                Value="100" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridNormal">
+        <Setter Property="FontSize"
+                Value="130" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridLarge">
+        <Setter Property="FontSize"
+                Value="140" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridHuge">
+        <Setter Property="FontSize"
+                Value="180" />
+    </Style>
     <Style Selector="#TitleBarHost &gt; Image">
         <Setter Property="Margin"
                 Value="10" />
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 2dc95662a1..7ba6642ab7 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -69,7 +69,16 @@
                                     Grid.Row="0"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Top"
+                                    IsVisible="{Binding IsGame}"
                                     Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <ui:SymbolIcon
+                                    Grid.Row="0"
+                                    Classes.gridHuge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}"
+                                    Classes.gridLarge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
+                                    Classes.gridNormal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
+                                    Classes.gridSmall="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsFolder}"
+                                    Symbol="Folder" />
                                 <Panel
                                     Grid.Row="1"
                                     Height="50"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 61e7977367..ce1ce64538 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -71,7 +71,17 @@
                                     Classes.large="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
                                     Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
                                     Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsGame}"
                                     Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <ui:SymbolIcon
+                                    Grid.RowSpan="3"
+                                    Grid.Column="0"
+                                    Classes.listHuge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}"
+                                    Classes.listLarge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
+                                    Classes.listNormal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
+                                    Classes.listSmall="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsFolder}"
+                                    Symbol="Folder" />
                                 <Border
                                     Grid.Column="2"
                                     Margin="0,0,5,0"
diff --git a/src/Ryujinx/UI/Helpers/Glyph.cs b/src/Ryujinx/UI/Helpers/Glyph.cs
index d44f0875a8..b071140b83 100644
--- a/src/Ryujinx/UI/Helpers/Glyph.cs
+++ b/src/Ryujinx/UI/Helpers/Glyph.cs
@@ -6,5 +6,6 @@ namespace Ryujinx.Ava.UI.Helpers
         Grid,
         Back,
         Chip,
+        Folder,
     }
 }
diff --git a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
index 9731123e97..4fe7a5d1fb 100644
--- a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
@@ -15,6 +15,7 @@ namespace Ryujinx.Ava.UI.Helpers
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
             { Glyph.Back, char.ConvertFromUtf32((int)Symbol.Back) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
+            { Glyph.Folder, char.ConvertFromUtf32(61739) },
         };
 
         public GlyphValueConverter(string key)