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 517a0c857..51ac87b5a 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 ccd707058..508794127 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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
Iaiz527t}2nSpWb4

diff --git a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
index eb84aad61..387e998b0 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 f7f64be22..20c435d08 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 2dc95662a..7ba6642ab 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 61e797736..ce1ce6453 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 d44f0875a..b071140b8 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 9731123e9..4fe7a5d1f 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)