UI: Abstract applet launch logic for future potential applets

Optimize locale loading (remove always loading english, that was only needed with the old system)
UI: Fix negative space savings in XCI trimmer
2024-12-25 00:56:01 -06:00 · 2024-12-25 00:06:29 -06:00 · 2024-12-24 22:19:58 -06:00 · 2024-12-24 21:55:12 -06:00 · 2024-12-24 21:15:13 -06:00 · 2024-12-24 21:14:17 -06:00
39 changed files with 344 additions and 304 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@ build/
 AppDir/
 publish_appimage/

-# Validation project assemblies folder
-/src/Ryujinx.BuildValidationTasks/temp_assemblies/
-
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,13 +10,12 @@
    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" />
-    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.6" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
    <PackageVersion Include="Concentus" Version="2.2.0" />
    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
@@ -55,9 +54,6 @@
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
    <PackageVersion Include="System.Management" Version="9.0.0" />
-    <PackageVersion Include="System.Memory" Version="4.6.0" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
-</Project>
+</Project>
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -80,7 +80,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
@@ -259,12 +258,13 @@ Global
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -3,19 +3,27 @@ using Microsoft.Build.Utilities;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using System.Text.Json;
+using Newtonsoft.Json;
 using Microsoft.Build.Framework;
-using System.Text.Encodings.Web;

 namespace Ryujinx.BuildValidationTasks
 {
-    public class LocalesValidationTask : Task
+    public class LocaleValidationTask : Task
    {
-        public string Path { get; set; }
-
        public override bool Execute()
        {
-            string path = Path;
+            string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+
+            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
+            {
+                //i assume that we are in a build directory in the solution dir
+                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+            }
+            else
+            {
+                path = path.Split(["src"], StringSplitOptions.None)[0];
+                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+            }

            string data;

@@ -24,21 +32,7 @@ namespace Ryujinx.BuildValidationTasks
                data = sr.ReadToEnd();
            }

-            LocalesJson json;
-
-
-            try
-            {
-                json = JsonSerializer.Deserialize<LocalesJson>(data);
-
-            }
-            catch (Exception e)
-            {
-                Log.LogError($"Json Validation failed! {e.Message}");
-
-                return false;
-            }
-
+            LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);

            for (int i = 0; i < json.Locales.Count; i++)
            {
@@ -54,13 +48,7 @@ namespace Ryujinx.BuildValidationTasks
                json.Locales[i] = locale;
            }

-            JsonSerializerOptions jsonOptions = new JsonSerializerOptions()
-            {
-                WriteIndented = true,
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-            };
-
-            string jsonString = JsonSerializer.Serialize(json, jsonOptions);
+            string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);

            using (StreamWriter sw = new(path))
            {
--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@@ -1,56 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-
-    <temp_assemblies>$(MSBuildThisFileDirectory)temp_assemblies/</temp_assemblies>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" />
    <PackageReference Include="Microsoft.Build.Utilities.Core" />
-    <PackageReference Include="Microsoft.Build.Framework" />
-    <PackageReference Include="System.Text.Json" GeneratePathProperty="true" />
-    <PackageReference Include="System.Text.Encodings.Web" GeneratePathProperty="true" />
-    <PackageReference Include="System.Memory" GeneratePathProperty="true" />
+    <PackageReference Include="Newtonsoft.Json" />
  </ItemGroup>

-  <Target Name="ValidationTask">
-    <Message Text="Running Validations..." Importance="high" />
+  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />

-    <!--Run Validation Targets Here-->
-    <CallTarget Targets="MasterLocalesValidationTask" />
-
-    <Message Text="Validations Succeeded!" Importance="high" />
-  </Target>
-  
-  <!--__________________________________________________Start LocalesValidation Task__________________________________________________-->
-
-  <PropertyGroup>
-    <!--Name of Validation Task. <Name> refers to this name-->
-    <Name>LocalesValidation</Name>
-  </PropertyGroup>
-
-
-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.$(Name)Task" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-    <ParameterGroup>
-      <Path Required="true" />
-    </ParameterGroup>
-    <Task>
-      <Reference Include="$(PkgSystem_Text_Json)/lib/netstandard2.0/System.Text.Json.dll" />
-      <Reference Include="$(PkgSystem_Text_Encodings_Web)/lib/netstandard2.0/System.Text.Encodings.Web.dll" />
-      <Reference Include="$(PkgSystem_Memory)/lib/netstandard2.0/System.Memory.dll" Version="4.6.0" />
-      <Code Language="cs" Source="$(MSBuildThisFileDirectory)$(Name)Task.cs" />
-    </Task>
-  </UsingTask>
-
-  <!--Name should be "Master<Name>Task"-->
-  <Target Name="MasterLocalesValidationTask">
-    <Message Text="Running $(Name)Task... " Importance="high" />
-    <!--Should call "Ryujinx.BuildValidationTasks.<Name>Task"-->
-    <Ryujinx.BuildValidationTasks.LocalesValidationTask Path="$(MSBuildThisFileDirectory)../Ryujinx/Assets/locales.json" />
-    <Message Text="$(Name)Task finished!" Importance="high" />
+  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
+    <LocaleValidationTask />
  </Target>

 </Project>
--- a/src/Ryujinx.HLE/FileSystem/ContentManager.cs
+++ b/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,22 @@ namespace Ryujinx.HLE.FileSystem
            {
                throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
            }
-        }

-        private bool verifyKeys(string[] lines, string regex)
-        {
-            foreach (string line in lines)
+            return;
+            
+            bool VerifyKeys(string[] lines, string regex)
            {
-                if (!Regex.IsMatch(line, regex))
+                foreach (string line in lines)
                {
-                    return false;
+                    if (!Regex.IsMatch(line, regex))
+                    {
+                        return false;
+                    }
                }
+                return true;
            }
-            return true;
        }
-
+        
        public bool AreKeysAlredyPresent(string pathToCheck)
        {
            string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };
--- a/src/Ryujinx.UI.Common/Helper/AppletMetadata.cs
+++ b/src/Ryujinx.UI.Common/Helper/AppletMetadata.cs
@@ -0,0 +1,64 @@
+using LibHac.Common;
+using LibHac.Ncm;
+using LibHac.Ns;
+using LibHac.Tools.FsSystem.NcaUtils;
+using Ryujinx.HLE;
+using Ryujinx.HLE.FileSystem;
+using Ryujinx.UI.App.Common;
+
+namespace Ryujinx.UI.Common.Helper
+{
+        public readonly struct AppletMetadata
+        {
+            private readonly ContentManager _contentManager;
+            
+            public string Name { get; }
+            public ulong ProgramId { get; }
+            
+            public string Version { get; }
+
+            public AppletMetadata(ContentManager contentManager, string name, ulong programId, string version = "1.0.0") 
+                : this(name, programId, version)
+            {
+                _contentManager = contentManager;
+            }
+            
+            public AppletMetadata(string name, ulong programId, string version = "1.0.0")
+            {
+                Name = name;
+                ProgramId = programId;
+                Version = version;
+            }
+            
+            public string GetContentPath(ContentManager contentManager)
+                => (contentManager ?? _contentManager)
+                    .GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
+
+            public bool CanStart(ContentManager contentManager, out ApplicationData appData, out BlitStruct<ApplicationControlProperty> appControl)
+            {
+                contentManager ??= _contentManager;
+                if (contentManager == null)
+                {
+                    appData = null;
+                    appControl = new BlitStruct<ApplicationControlProperty>(0);
+                    return false;
+                }
+                
+                appData = new()
+                {
+                    Name = Name,
+                    Id = ProgramId,
+                    Path = GetContentPath(contentManager)
+                };
+
+                if (string.IsNullOrEmpty(appData.Path))
+                {
+                    appControl = new BlitStruct<ApplicationControlProperty>(0);
+                    return false;
+                }
+
+                appControl = StructHelpers.CreateCustomNacpData(Name, Version);
+                return true;
+            }
+        }
+}
--- a/src/Ryujinx.UI.Common/Resources/Logo_Ryujinx_AntiAlias.png
+++ b/src/Ryujinx.UI.Common/Resources/Logo_Ryujinx_AntiAlias.png
--- a/src/Ryujinx.UI.Common/Resources/Logo_Thiccjinx.png
+++ b/src/Ryujinx.UI.Common/Resources/Logo_Thiccjinx.png
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/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_Thiccjinx.png" />
+    <EmbeddedResource Include="Resources\Logo_Ryujinx_AntiAlias.png" />
    <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
    <EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
    <EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -3797,7 +3797,7 @@
        "el_GR": "Ζώνη Ώρας Συστήματος:",
        "en_US": "System Time Zone:",
        "es_ES": "Zona horaria del sistema:",
-        "fr_FR": "Fuseau horaire du système\u00A0:",
+        "fr_FR": "Fuseau horaire du système :",
        "he_IL": "אזור זמן מערכת:",
        "it_IT": "Fuso orario del sistema:",
        "ja_JP": "タイムゾーン:",
@@ -15125,7 +15125,7 @@
        "el_GR": "",
        "en_US": "Aspect Ratio applied to the renderer window.\n\nOnly change this if you're using an aspect ratio mod for your game, otherwise the graphics will be stretched.\n\nLeave on 16:9 if unsure.",
        "es_ES": "Relación de aspecto aplicada a la ventana del renderizador.\n\nSolamente modificar esto si estás utilizando un mod de relación de aspecto para su juego, en cualquier otro caso los gráficos se estirarán.\n\nDejar en 16:9 si no sabe que hacer.",
-        "fr_FR": "Format\u00A0d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format\u00A0d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
+        "fr_FR": "Format d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
        "he_IL": "",
        "it_IT": "Proporzioni dello schermo applicate alla finestra di renderizzazione.\n\nCambialo solo se stai usando una mod di proporzioni per il tuo gioco, altrimenti la grafica verrà allungata.\n\nLasciare il 16:9 se incerto.",
        "ja_JP": "レンダリングウインドウに適用するアスペクト比です.\n\nゲームにアスペクト比を変更する mod を使用している場合のみ変更してください.\n\nわからない場合は16:9のままにしておいてください.\n",
@@ -20213,7 +20213,7 @@
        "el_GR": "Όνομα",
        "en_US": "Name",
        "es_ES": "Nombre",
-        "fr_FR": "Nom\u00A0",
+        "fr_FR": "Nom ",
        "he_IL": "שם",
        "it_IT": "Nome",
        "ja_JP": "名称",
@@ -21694,4 +21694,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/Common/ApplicationHelper.cs
+++ b/src/Ryujinx/Common/ApplicationHelper.cs
@@ -146,7 +146,7 @@ namespace Ryujinx.Ava.Common
            var cancellationToken = new CancellationTokenSource();

            UpdateWaitWindow waitingDialog = new(
-                App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
+                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(titleFilePath)),
                cancellationToken);

@@ -268,10 +268,9 @@ namespace Ryujinx.Ava.Common
                        {
                            Dispatcher.UIThread.Post(waitingDialog.Close);

-                            NotificationHelper.Show(
-                                App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
-                                $"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}",
-                                NotificationType.Information);
+                            NotificationHelper.ShowInformation(
+                                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
+                                $"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
                        }
                    }

--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -1,7 +1,6 @@
 using Gommon;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common;
-using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.UI.Common.Configuration;
 using System;
@@ -17,7 +16,6 @@ namespace Ryujinx.Ava.Common.Locale
        private const string DefaultLanguageCode = "en_US";

        private readonly Dictionary<LocaleKeys, string> _localeStrings;
-        private Dictionary<LocaleKeys, string> _localeDefaultStrings;
        private readonly ConcurrentDictionary<LocaleKeys, object[]> _dynamicValues;
        private string _localeLanguageCode;

@@ -27,7 +25,6 @@ namespace Ryujinx.Ava.Common.Locale
        public LocaleManager()
        {
            _localeStrings = new Dictionary<LocaleKeys, string>();
-            _localeDefaultStrings = new Dictionary<LocaleKeys, string>();
            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>();

            Load();
@@ -37,9 +34,7 @@ namespace Ryujinx.Ava.Common.Locale
        {
            var localeLanguageCode = !string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
                ConfigurationState.Instance.UI.LanguageCode.Value : CultureInfo.CurrentCulture.Name.Replace('-', '_');
-
-            // Load en_US as default, if the target language translation is missing or incomplete.
-            LoadDefaultLanguage();
+            
            LoadLanguage(localeLanguageCode);

            // Save whatever we ended up with.
@@ -66,26 +61,14 @@ namespace Ryujinx.Ava.Common.Locale
                        }
                        catch
                        {
-                            // If formatting failed use the default text instead.
-                            if (_localeDefaultStrings.TryGetValue(key, out value))
-                                try
-                                {
-                                    return string.Format(value, dynamicValue);
-                                }
-                                catch
-                                {
-                                    // If formatting the default text failed return the key.
-                                    return key.ToString();
-                                }
+                            // If formatting the text failed,
+                            // continue to the below line & return the text without formatting.
                        }

                    return value;
                }
-
-                // If the locale doesn't contain the key return the default one.
-                return _localeDefaultStrings.TryGetValue(key, out string defaultValue)
-                    ? defaultValue
-                    : key.ToString(); // If the locale text doesn't exist return the key.
+                
+                return key.ToString(); // If the locale text doesn't exist return the key.
            }
            set
            {
@@ -109,16 +92,11 @@ namespace Ryujinx.Ava.Common.Locale
        {
            _dynamicValues[key] = values;

-            OnPropertyChanged("Item");
+            OnPropertyChanged("Translation");

            return this[key];
        }

-        private void LoadDefaultLanguage()
-        {
-            _localeDefaultStrings = LoadJsonLanguage(DefaultLanguageCode);
-        }
-
        public void LoadLanguage(string languageCode)
        {
            var locale = LoadJsonLanguage(languageCode);
@@ -126,7 +104,7 @@ namespace Ryujinx.Ava.Common.Locale
            if (locale == null)
            {
                _localeLanguageCode = DefaultLanguageCode;
-                locale = _localeDefaultStrings;
+                locale = LoadJsonLanguage(_localeLanguageCode);
            }
            else
            {
@@ -138,16 +116,12 @@ namespace Ryujinx.Ava.Common.Locale
                _localeStrings[key] = val;
            }

-            OnPropertyChanged("Item");
+            OnPropertyChanged("Translation");

            LocaleChanged?.Invoke();
        }

-        #nullable enable
-
        private static LocalesJson? _localeData;
-        
-        #nullable disable

        private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode)
        {
@@ -158,18 +132,29 @@ namespace Ryujinx.Ava.Common.Locale

            foreach (LocalesEntry locale in _localeData.Value.Locales)
            {
-                if (locale.Translations.Count != _localeData.Value.Languages.Count)
+                if (locale.Translations.Count < _localeData.Value.Languages.Count)
                {
                    throw new Exception($"Locale key {{{locale.ID}}} is missing languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
+                } 
+                
+                if (locale.Translations.Count > _localeData.Value.Languages.Count)
+                {
+                    throw new Exception($"Locale key {{{locale.ID}}} has too many languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
                }

                if (!Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
                    continue;

-                localeStrings[localeKey] =
-                    locale.Translations.TryGetValue(languageCode, out string val) && val != string.Empty
-                        ? val
-                        : locale.Translations[DefaultLanguageCode];
+                var str = locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val)
+                    ? val
+                    : locale.Translations[DefaultLanguageCode];
+                
+                if (string.IsNullOrEmpty(str))
+                {
+                    throw new Exception($"Locale key '{locale.ID}' has no valid translations for desired language {languageCode}! {DefaultLanguageCode} is an empty string or null");
+                }
+
+                localeStrings[localeKey] = str;
            }

            return localeStrings;
--- a/src/Ryujinx/Common/Markup/BasicMarkupExtension.cs
+++ b/src/Ryujinx/Common/Markup/BasicMarkupExtension.cs
@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.Common.Markup
 {
    internal abstract class BasicMarkupExtension<T> : MarkupExtension
    {
-        public virtual string Name => "Item";
+        public abstract string Name { get; }
        public virtual Action<object, T?>? Setter => null;

        protected abstract T? Value { get; }
--- a/src/Ryujinx/Common/Markup/MarkupExtensions.cs
+++ b/src/Ryujinx/Common/Markup/MarkupExtensions.cs
@@ -6,16 +6,19 @@ namespace Ryujinx.Ava.Common.Markup
 {
    internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
    {
+        public override string Name => "Icon";
        protected override Icon Value => new() { Value = iconString };
    }
    
    internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
    {
+        public override string Name => "SIcon";
        protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
    }
    
    internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
    {
+        public override string Name => "Translation";
        protected override string Value => LocaleManager.Instance[key];

        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -65,7 +65,7 @@ namespace Ryujinx.Ava
        }

        public static AppBuilder BuildAvaloniaApp() =>
-            AppBuilder.Configure<App>()
+            AppBuilder.Configure<RyujinxApp>()
                .UsePlatformDetect()
                .With(new X11PlatformOptions
                {
@@ -100,7 +100,7 @@ namespace Ryujinx.Ava
            // Delete backup files after updating.
            Task.Run(Updater.CleanupUpdate);

-            Console.Title = $"{App.FullAppName} Console {Version}";
+            Console.Title = $"{RyujinxApp.FullAppName} Console {Version}";

            // Hook unhandled exception and process exit events.
            AppDomain.CurrentDomain.UnhandledException += (sender, e)
@@ -225,7 +225,7 @@ namespace Ryujinx.Ava

        private static void PrintSystemInfo()
        {
-            Logger.Notice.Print(LogClass.Application, $"{App.FullAppName} Version: {Version}");
+            Logger.Notice.Print(LogClass.Application, $"{RyujinxApp.FullAppName} Version: {Version}");
            SystemInfo.Gather().Print();

            var enabledLogLevels = Logger.GetEnabledLevels().ToArray();
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -13,8 +13,8 @@
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

-  <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="ValidationTask" >
+  <Target Name="BuildValidationProj" BeforeTargets="BeforeRebuild">
+    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="Rebuild">
    </MSBuild>
  </Target>

--- a/src/Ryujinx/RyujinxApp.axaml
+++ b/src/Ryujinx/RyujinxApp.axaml
@@ -1,5 +1,5 @@
 <Application
-    x:Class="Ryujinx.Ava.App"
+    x:Class="Ryujinx.Ava.RyujinxApp"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:sty="using:FluentAvalonia.Styling">
--- a/src/Ryujinx/RyujinxApp.axaml.cs
+++ b/src/Ryujinx/RyujinxApp.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
@@ -19,7 +20,7 @@ using System.Diagnostics;

 namespace Ryujinx.Ava
 {
-    public class App : Application
+    public class RyujinxApp : Application
    {
        internal static string FormatTitle(LocaleKeys? windowTitleKey = null)
            => windowTitleKey is null
@@ -32,6 +33,12 @@ namespace Ryujinx.Ava
            .ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
            .MainWindow.Cast<MainWindow>();

+        public static bool IsClipboardAvailable(out IClipboard clipboard)
+        {
+            clipboard = MainWindow.Clipboard;
+            return clipboard != null;
+        }
+
        public static void SetTaskbarProgress(TaskBarProgressBarState state) => MainWindow.PlatformFeatures.SetTaskBarProgressBarState(state);
        public static void SetTaskbarProgressValue(ulong current, ulong total) => MainWindow.PlatformFeatures.SetTaskBarProgressBarValue(current, total);
        public static void SetTaskbarProgressValue(long current, long total) => SetTaskbarProgressValue(Convert.ToUInt64(current), Convert.ToUInt64(total));
@@ -132,7 +139,7 @@ namespace Ryujinx.Ava
            };

        public static ThemeVariant DetectSystemTheme() =>
-            Current is App { PlatformSettings: not null } app
+            Current is RyujinxApp { PlatformSettings: not null } app
                ? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
                : ThemeVariant.Default;
    }
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -101,11 +101,21 @@
                                    VerticalAlignment="Top"
                                    Orientation="Vertical"
                                    Spacing="5">
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding IdString}"
-                                        TextAlignment="Start"
-                                        TextWrapping="Wrap" />
+                                    <Button 
+                                        Click="IdString_OnClick" 
+                                        HorizontalContentAlignment="Left" 
+                                        VerticalAlignment="Center"
+                                        Background="{DynamicResource AppListBackgroundColor}"
+                                        Margin="-1, 0, 0, 0"
+                                        Padding="0" >
+                                        <TextBlock
+                                            Margin="1.5"
+                                            HorizontalAlignment="Stretch"
+                                            Text="{Binding IdString}"
+                                            Tag="{Binding Id}"
+                                            TextAlignment="Start"
+                                            TextWrapping="Wrap" />
+                                    </Button>
                                    <TextBlock
                                        HorizontalAlignment="Stretch"
                                        Text="{Binding FileExtension}"
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -1,10 +1,13 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.UI.App.Common;
 using System;
+using System.Linq;

 namespace Ryujinx.Ava.UI.Controls
 {
@@ -32,5 +35,27 @@ namespace Ryujinx.Ava.UI.Controls
            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
                viewModel.ListSelectedApplication = selected;
        }
+
+        private async void IdString_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
+            if (sender is not Button { Content: TextBlock idText })
+                return;
+
+            if (!RyujinxApp.IsClipboardAvailable(out var clipboard))
+                return;
+            
+            var appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            if (appData is null)
+                return;
+            
+            await clipboard.SetTextAsync(appData.IdString);
+                
+            NotificationHelper.ShowInformation(
+                "Copied Title ID", 
+                $"{appData.Name} ({appData.IdString})");
+        }
    }
 }
--- a/src/Ryujinx/UI/Controls/SliderScroll.axaml.cs
+++ b/src/Ryujinx/UI/Controls/SliderScroll.axaml.cs
--- a/src/Ryujinx/UI/Controls/StatusBarSeparator.cs
+++ b/src/Ryujinx/UI/Controls/StatusBarSeparator.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace Ryujinx.Ava.UI.Controls
+{
+    public class MiniVerticalSeparator : Border
+    {
+        public MiniVerticalSeparator()
+        {
+            Width = 2;
+            Height = 12;
+            Margin = new Thickness();
+            BorderBrush = Brushes.Gray;
+            Background = Brushes.Gray;
+            BorderThickness = new Thickness(1);
+        }
+    }
+}
--- a/src/Ryujinx/UI/Helpers/NotificationHelper.cs
+++ b/src/Ryujinx/UI/Helpers/NotificationHelper.cs
@@ -62,9 +62,46 @@ namespace Ryujinx.Ava.UI.Helpers
            _notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
        }

-        public static void ShowError(string message)
-        {
-            Show(LocaleManager.Instance[LocaleKeys.DialogErrorTitle], $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}", NotificationType.Error);
-        }
+        public static void ShowError(string message) =>
+            ShowError(
+                LocaleManager.Instance[LocaleKeys.DialogErrorTitle], 
+                $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}"
+            );
+
+        public static void ShowInformation(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Information,
+                waitingExit, 
+                onClick, 
+                onClose);
+
+        public static void ShowSuccess(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Success,
+                waitingExit, 
+                onClick, 
+                onClose);
+
+        public static void ShowWarning(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Warning,
+                waitingExit, 
+                onClick, 
+                onClose);
+
+        public static void ShowError(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Error,
+                waitingExit, 
+                onClick, 
+                onClose);
    }
 }
--- a/src/Ryujinx/UI/Helpers/XCITrimmerFileSpaceSavingsConverter.cs
+++ b/src/Ryujinx/UI/Helpers/XCITrimmerFileSpaceSavingsConverter.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Data;
 using Avalonia.Data.Converters;
+using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.UI.Common.Models;
 using System;
@@ -32,11 +33,11 @@ namespace Ryujinx.Ava.UI.Helpers

            if (app.CurrentSavingsB < app.PotentialSavingsB)
            {
-                return LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.TitleXCICanSaveLabel, (app.PotentialSavingsB - app.CurrentSavingsB) / _bytesPerMB);
+                return LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.TitleXCICanSaveLabel, ((app.PotentialSavingsB - app.CurrentSavingsB) / _bytesPerMB).CoerceAtLeast(0));
            }
            else
            {
-                return LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.TitleXCISavingLabel, app.CurrentSavingsB / _bytesPerMB);
+                return LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.TitleXCISavingLabel, (app.CurrentSavingsB / _bytesPerMB).CoerceAtLeast(0));
            }
        }

--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public AboutWindowViewModel()
        {
-            Version = App.FullAppName + "\n" + Program.Version;
+            Version = RyujinxApp.FullAppName + "\n" + Program.Version;
            UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);

            ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
@@ -64,7 +64,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        private void UpdateLogoTheme(string theme)
        {
-            bool isDarkTheme = theme == "Dark" || (theme == "Auto" && App.DetectSystemTheme() == ThemeVariant.Dark);
+            bool isDarkTheme = theme == "Dark" || (theme == "Auto" && RyujinxApp.DetectSystemTheme() == ThemeVariant.Dark);

            string basePath = "resm:Ryujinx.UI.Common.Resources.";
            string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png";
--- a/src/Ryujinx/UI/ViewModels/BaseModel.cs
+++ b/src/Ryujinx/UI/ViewModels/BaseModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;

@@ -11,5 +12,13 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
        }
+        
+        protected void OnPropertiesChanged(params ReadOnlySpan<string> propertyNames)
+        {
+            foreach (var propertyName in propertyNames)
+            {
+                OnPropertyChanged(propertyName);
+            }
+        }
    }
 }
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/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_Thiccjinx.png")!);
+            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png")!);

        public MainWindow Window { get; init; }

@@ -2051,7 +2051,7 @@ namespace Ryujinx.Ava.UI.ViewModels

            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                Title = App.FormatTitle();
+                Title = RyujinxApp.FormatTitle();
            });
        }

--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -71,8 +71,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            {
                _resolutionScale = value;

-                OnPropertyChanged(nameof(CustomResolutionScale));
-                OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
+                OnPropertiesChanged(nameof(CustomResolutionScale), nameof(IsCustomResolutionScaleActive));
            }
        }

@@ -181,8 +180,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                int newInterval = (int)((value / 100f) * 60);
                _customVSyncInterval = newInterval;
                _customVSyncIntervalPercentageProxy = value;
-                OnPropertyChanged((nameof(CustomVSyncInterval)));
-                OnPropertyChanged((nameof(CustomVSyncIntervalPercentageText)));
+                OnPropertiesChanged(
+                    nameof(CustomVSyncInterval), 
+                    nameof(CustomVSyncIntervalPercentageText));
            }
        }

@@ -190,7 +190,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            get
            {
-                string text = CustomVSyncIntervalPercentageProxy.ToString() + "%";
+                string text = CustomVSyncIntervalPercentageProxy + "%";
                return text;
            }
        }
@@ -221,8 +221,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                _customVSyncInterval = value;
                int newPercent = (int)((value / 60f) * 100);
                _customVSyncIntervalPercentageProxy = newPercent;
-                OnPropertyChanged(nameof(CustomVSyncIntervalPercentageProxy));
-                OnPropertyChanged(nameof(CustomVSyncIntervalPercentageText));
+                OnPropertiesChanged(
+                    nameof(CustomVSyncIntervalPercentageProxy), 
+                    nameof(CustomVSyncIntervalPercentageText));
                OnPropertyChanged();
            }
        }
--- a/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
@@ -91,39 +91,42 @@ namespace Ryujinx.Ava.UI.ViewModels

        private void SortingChanged()
        {
-            OnPropertyChanged(nameof(IsSortedByName));
-            OnPropertyChanged(nameof(IsSortedBySaved));
-            OnPropertyChanged(nameof(SortingAscending));
-            OnPropertyChanged(nameof(SortingField));
-            OnPropertyChanged(nameof(SortingFieldName));
+            OnPropertiesChanged(
+                nameof(IsSortedByName), 
+                nameof(IsSortedBySaved), 
+                nameof(SortingAscending), 
+                nameof(SortingField), 
+                nameof(SortingFieldName));
+            
            SortAndFilter();
        }

        private void DisplayedChanged()
        {
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(DisplayedXCIFiles));
-            OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
+            OnPropertiesChanged(nameof(Status), nameof(DisplayedXCIFiles), nameof(SelectedDisplayedXCIFiles));
        }

        private void ApplicationsChanged()
        {
-            OnPropertyChanged(nameof(AllXCIFiles));
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(PotentialSavings));
-            OnPropertyChanged(nameof(ActualSavings));
-            OnPropertyChanged(nameof(CanTrim));
-            OnPropertyChanged(nameof(CanUntrim));
+            OnPropertiesChanged(
+                nameof(AllXCIFiles), 
+                nameof(Status), 
+                nameof(PotentialSavings), 
+                nameof(ActualSavings), 
+                nameof(CanTrim), 
+                nameof(CanUntrim));
+            
            DisplayedChanged();
            SortAndFilter();
        }

        private void SelectionChanged(bool displayedChanged = true)
        {
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(CanTrim));
-            OnPropertyChanged(nameof(CanUntrim));
-            OnPropertyChanged(nameof(SelectedXCIFiles));
+            OnPropertiesChanged(
+                nameof(Status), 
+                nameof(CanTrim), 
+                nameof(CanUntrim), 
+                nameof(SelectedXCIFiles));

            if (displayedChanged)
                OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
@@ -131,11 +134,12 @@ namespace Ryujinx.Ava.UI.ViewModels

        private void ProcessingChanged()
        {
-            OnPropertyChanged(nameof(Processing));
-            OnPropertyChanged(nameof(Cancel));
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(CanTrim));
-            OnPropertyChanged(nameof(CanUntrim));
+            OnPropertiesChanged(
+                nameof(Processing), 
+                nameof(Cancel), 
+                nameof(Status), 
+                nameof(CanTrim), 
+                nameof(CanUntrim));
        }

        private IEnumerable<XCITrimmerFileModel> GetSelectedDisplayedXCIFiles()
@@ -360,7 +364,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                    value = _processingApplication.Value with { PercentageProgress = null };

                if (value.HasValue)
-                    _displayedXCIFiles.ReplaceWith(value.Value);
+                    _displayedXCIFiles.ReplaceWith(value);

                _processingApplication = value;
                OnPropertyChanged();
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/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_Thiccjinx.png?assembly=Ryujinx.UI.Common" />
+            Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png?assembly=Ryujinx.UI.Common" />
        <Menu
            Name="Menu"
            Height="32"
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -3,8 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Gommon;
-using LibHac.Ncm;
-using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
@@ -12,8 +10,6 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
-using Ryujinx.HLE;
-using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
@@ -124,26 +120,13 @@ namespace Ryujinx.Ava.UI.Views.Main
            ViewModel.LoadConfigurableHotKeys();
        }

+        public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009);
+
        public async void OpenMiiApplet(object sender, RoutedEventArgs e)
        {
-            const string AppletName = "miiEdit";
-            const ulong AppletProgramId = 0x0100000000001009;
-            const string AppletVersion = "1.0.0";
-            
-            string contentPath = ViewModel.ContentManager.GetInstalledContentPath(AppletProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
-
-            if (!string.IsNullOrEmpty(contentPath))
+            if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData))
            {
-                ApplicationData applicationData = new()
-                {
-                    Name = AppletName,
-                    Id = AppletProgramId,
-                    Path = contentPath
-                };
-                
-                var nacpData = StructHelpers.CreateCustomNacpData(AppletName, AppletVersion);
-
-                await ViewModel.LoadApplication(applicationData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
+                await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
            }
        }

--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
@@ -7,6 +7,7 @@
    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"
@@ -132,14 +133,7 @@
                        </Flyout>
                    </Button.Flyout>
                </Button>
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
            <TextBlock
                Name="DockedStatus"
                Margin="5,0,5,0"
@@ -149,14 +143,7 @@
                PointerReleased="DockedStatus_PointerReleased"
                Text="{Binding DockedStatusText}"
                TextAlignment="Start" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
            <SplitButton
                Name="AspectRatioStatus"
                Padding="5,0,5,0"
@@ -203,14 +190,7 @@
                    </MenuFlyout>
                </SplitButton.Flyout>
            </SplitButton>
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
            <ToggleSplitButton
                Name="VolumeStatus"
                Padding="5,0,5,0"
@@ -254,14 +234,7 @@
                    </Flyout>
                </ToggleSplitButton.Flyout>
            </ToggleSplitButton>
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
            <TextBlock
                Margin="5,0,5,0"
                HorizontalAlignment="Left"
@@ -269,14 +242,7 @@
                IsVisible="{Binding !ShowLoadProgress}"
                Text="{Binding GameStatusText}"
                TextAlignment="Start" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
            <TextBlock
                Margin="5,0,5,0"
                HorizontalAlignment="Left"
@@ -298,13 +264,7 @@
                VerticalAlignment="Center"
                IsVisible="{Binding ShowShaderCompilationHint}"
                Text="{Binding ShaderCountText}" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding ShowShaderCompilationHint}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
            <TextBlock
                Margin="5,0,5,0"
                HorizontalAlignment="Left"
@@ -312,14 +272,7 @@
                IsVisible="{Binding !ShowLoadProgress}"
                Text="{Binding BackendText}"
                TextAlignment="Start" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
            <TextBlock
                Margin="5,0,0,0"
                HorizontalAlignment="Left"
@@ -334,13 +287,7 @@
            VerticalAlignment="Center"
            IsVisible="{Binding ShowFirmwareStatus}"
            Orientation="Horizontal">
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding IsGameRunning}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding IsGameRunning}" />
            <TextBlock
                Name="FirmwareStatus"
                Margin="5, 0, 0, 0"
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
@@ -62,12 +62,7 @@ namespace Ryujinx.Ava.UI.Views.Main
            // Change the volume by 5% at a time
            float newValue = Window.ViewModel.Volume + (float)e.Delta.Y * 0.05f;

-            Window.ViewModel.Volume = newValue switch
-            {
-                < 0 => 0,
-                > 1 => 1,
-                _ => newValue,
-            };
+            Window.ViewModel.Volume = Math.Clamp(newValue, 0, 1);

            e.Handled = true;
        }
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
@@ -16,7 +16,7 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();

-            Title = App.FormatTitle(LocaleKeys.Amiibo);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
        }

        public AmiiboWindow()
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.Windows

            if (Program.PreviewerDetached)
            {
-                Title = App.FormatTitle(LocaleKeys.Amiibo);
+                Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
            }
        }

--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();

-            Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
        }

        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
@@ -93,7 +93,7 @@ namespace Ryujinx.Ava.UI.Windows

            DataContext = this;

-            Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
        }

        public void Save()
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -86,17 +86,22 @@ namespace Ryujinx.Ava.UI.Windows

            UiHandler = new AvaHostUIHandler(this);

-            ViewModel.Title = App.FormatTitle();
+            ViewModel.Title = RyujinxApp.FormatTitle();

            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;

            SetWindowSizePosition();

@@ -114,7 +119,7 @@ namespace Ryujinx.Ava.UI.Windows
        /// </summary>
        private static void OnPlatformColorValuesChanged(object sender, PlatformColorValues e)
        {
-            if (Application.Current is App app)
+            if (Application.Current is RyujinxApp app)
                app.ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
        }

--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.UI.Windows

        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
        {
-            Title = App.FormatTitle(LocaleKeys.Settings);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);

            DataContext = ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);

--- a/src/Ryujinx/Updater.cs
+++ b/src/Ryujinx/Updater.cs
@@ -76,7 +76,7 @@ namespace Ryujinx.Ava

            if (!Version.TryParse(Program.Version, out Version currentVersion))
            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {App.FullAppName} version!");
+                Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {RyujinxApp.FullAppName} version!");

                await ContentDialogHelper.CreateWarningDialog(
                    LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
@@ -159,7 +159,7 @@ namespace Ryujinx.Ava

            if (!Version.TryParse(_buildVer, out Version newVersion))
            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {App.FullAppName} version from GitHub!");
+                Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {RyujinxApp.FullAppName} version from GitHub!");

                await ContentDialogHelper.CreateWarningDialog(
                    LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
@@ -266,7 +266,7 @@ namespace Ryujinx.Ava
                SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
                IconSource = new SymbolIconSource { Symbol = Symbol.Download },
                ShowProgressBar = true,
-                XamlRoot = App.MainWindow,
+                XamlRoot = RyujinxApp.MainWindow,
            };

            taskDialog.Opened += (s, e) =>
@@ -490,7 +490,7 @@ namespace Ryujinx.Ava
                bytesWritten += readSize;

                taskDialog.SetProgressBarState(GetPercentage(bytesWritten, totalBytes), TaskDialogProgressState.Normal);
-                App.SetTaskbarProgressValue(bytesWritten, totalBytes);
+                RyujinxApp.SetTaskbarProgressValue(bytesWritten, totalBytes);

                updateFileStream.Write(buffer, 0, readSize);
            }
Author	SHA1	Message	Date
Evan Husted	412d4065b8	UI: Abstract applet launch logic for future potential applets Optimize locale loading (remove always loading english, that was only needed with the old system)	2024-12-25 00:56:01 -06:00
Evan Husted	e6644626fc	UI: Fix negative space savings in XCI trimmer	2024-12-25 00:06:29 -06:00
Evan Husted	0bacdb8765	Improve locale file parsing error descriptions	2024-12-24 22:19:58 -06:00
Evan Husted	0ca4d6e921	misc: Move StatusBarSeparator into Controls namespace, rename to MiniVerticalSeparator add bulk property change event method give each markup extension its own property name	2024-12-24 21:55:12 -06:00
Evan Husted	f0aa7eedf6	lol	2024-12-24 21:15:13 -06:00
Evan Husted	41acc4b1f3	UI: misc: Collapse repeated identical Border usages into a helper control.	2024-12-24 21:14:17 -06:00
Evan Husted	7aede70ba9	UI: Make custom title bar window controls extend exactly as long as the menu bar is tall	2024-12-24 21:00:41 -06:00
Evan Husted	a0a4f78cff	UI: Thin down the borders of the app icon a little bit and trim down the file size significantly.	2024-12-24 20:47:14 -06:00
Evan Husted	16a60fdf12	UI: Rename App to RyujinxApp Add more NotificationHelper methods Simplify ID copy logic	2024-12-24 13:39:48 -06:00
Evan Husted	4d7350fc6e	UI: Copy Title ID by clicking on it.	2024-12-24 13:23:43 -06:00