HLE: rename AmiiboDecrypter to AmiiboDecryptor

src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
                 fileBytes = newFileBytes;
             }
 
-            AmiiboDecrypter amiiboDecryptor = new AmiiboDecrypter(keyRetailBinPath);
+            AmiiboDecryptor amiiboDecryptor = new(keyRetailBinPath);
             AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(fileBytes);
 
             byte[] titleId = new byte[8];
@@ -182,7 +182,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
                 readBytes = newFileBytes;
             }
 
-            AmiiboDecrypter amiiboDecryptor = new AmiiboDecrypter(keyRetailBinPath);
+            AmiiboDecryptor amiiboDecryptor = new AmiiboDecryptor(keyRetailBinPath);
             AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(readBytes);
 
             byte[] oldData = amiiboDump.GetData();
@@ -250,7 +250,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
                 readBytes = newFileBytes;
             }
 
-            AmiiboDecrypter amiiboDecryptor = new AmiiboDecrypter(keyRetailBinPath);
+            AmiiboDecryptor amiiboDecryptor = new AmiiboDecryptor(keyRetailBinPath);
             AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(readBytes);
             amiiboDump.AmiiboNickname = newNickName;
             byte[] oldData = amiiboDump.GetData();
@@ -333,10 +333,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
             return Path.Combine(AppDataManager.KeysDirPath, "key_retail.bin");
         }
 
-        public static bool HasKeyRetailBinPath()
-        {
-            return File.Exists(GetKeyRetailBinPath());
-        }
+        public static bool HasKeyRetailBinPath => File.Exists(GetKeyRetailBinPath());
+
+        
         public static DateTime DateTimeFromTag(ushort value)
         {
             try

src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecryptor.cs

@@ -2,12 +2,12 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
 {
-    public class AmiiboDecrypter
+    public class AmiiboDecryptor
     {
         public AmiiboMasterKey DataKey { get; private set; }
         public AmiiboMasterKey TagKey { get; private set; }
 
-        public AmiiboDecrypter(string keyRetailBinPath)
+        public AmiiboDecryptor(string keyRetailBinPath)
         {
             var combinedKeys = File.ReadAllBytes(keyRetailBinPath);
             var keys = AmiiboMasterKey.FromCombinedBin(combinedKeys);
@@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
         public AmiiboDump DecryptAmiiboDump(byte[] encryptedDumpData)
         {
             // Initialize AmiiboDump with encrypted data
-            AmiiboDump amiiboDump = new AmiiboDump(encryptedDumpData, DataKey, TagKey, isLocked: true);
+            AmiiboDump amiiboDump = new(encryptedDumpData, DataKey, TagKey, isLocked: true);
 
             // Unlock (decrypt) the dump
             amiiboDump.Unlock();
@@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
         public AmiiboDump EncryptAmiiboDump(byte[] decryptedDumpData)
         {
             // Initialize AmiiboDump with decrypted data
-            AmiiboDump amiiboDump = new AmiiboDump(decryptedDumpData, DataKey, TagKey, isLocked: false);
+            AmiiboDump amiiboDump = new(decryptedDumpData, DataKey, TagKey, isLocked: false);
 
             // Lock (encrypt) the dump
             amiiboDump.Lock();

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -127,6 +127,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public IEnumerable<LdnGameData> LastLdnGameData;
 
+        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
+        // 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")!);
 
@@ -330,6 +333,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                 OnPropertyChanged();
             }
         }
+
+        public bool CanScanAmiiboBinaries => AmiiboBinReader.HasKeyRetailBinPath;
+        
         public bool ShowLoadProgress
         {
             get => _showLoadProgress;

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

@@ -247,6 +247,7 @@
                     Click="OpenBinFile"
                     Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
                     Icon="{ext:Icon mdi-cube-scan}"
+                    IsVisible="{Binding CanScanAmiiboBinaries}"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"

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

@@ -178,7 +178,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void ScanBinAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (sender is MenuItem)
-                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath();
+                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath;
         }
 
         private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)