From f93ee425c289fe7c829d5baf7694fe93aa83c1ef Mon Sep 17 00:00:00 2001
From: bluepilledgreat <97983689+bluepilledgreat@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:46:45 +0100
Subject: [PATCH] add emoji types to locale

---
 Bloxstrap/Extensions/EmojiTypeEx.cs           | 12 ++---
 Bloxstrap/Resources/Strings.Designer.cs       | 45 +++++++++++++++++++
 Bloxstrap/Resources/Strings.resx              | 15 +++++++
 .../UI/Elements/Menu/Pages/ModsPage.xaml      |  8 +++-
 Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs |  8 ++--
 5 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/Bloxstrap/Extensions/EmojiTypeEx.cs b/Bloxstrap/Extensions/EmojiTypeEx.cs
index 4313fab..5cf694f 100644
--- a/Bloxstrap/Extensions/EmojiTypeEx.cs
+++ b/Bloxstrap/Extensions/EmojiTypeEx.cs
@@ -2,13 +2,13 @@
 {
     static class EmojiTypeEx
     {
-        public static IReadOnlyDictionary<string, EmojiType> Selections => new Dictionary<string, EmojiType>
+        public static IReadOnlyCollection<EmojiType> Selections => new EmojiType[]
         {
-            { "Default (Twemoji)", EmojiType.Default },
-            { "Catmoji", EmojiType.Catmoji },
-            { "Windows 11", EmojiType.Windows11 },
-            { "Windows 10", EmojiType.Windows10 },
-            { "Windows 8", EmojiType.Windows8 },
+            EmojiType.Default,
+            EmojiType.Catmoji,
+            EmojiType.Windows11,
+            EmojiType.Windows10,
+            EmojiType.Windows8
         };
 
         public static IReadOnlyDictionary<EmojiType, string> Filenames => new Dictionary<EmojiType, string>
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index 63c7161..93fec38 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -864,6 +864,51 @@ namespace Bloxstrap.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Catmoji.
+        /// </summary>
+        public static string Enums_EmojiType_Catmoji {
+            get {
+                return ResourceManager.GetString("Enums.EmojiType.Catmoji", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default (Twemoji).
+        /// </summary>
+        public static string Enums_EmojiType_Default {
+            get {
+                return ResourceManager.GetString("Enums.EmojiType.Default", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Windows 10.
+        /// </summary>
+        public static string Enums_EmojiType_Windows10 {
+            get {
+                return ResourceManager.GetString("Enums.EmojiType.Windows10", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Windows 11.
+        /// </summary>
+        public static string Enums_EmojiType_Windows11 {
+            get {
+                return ResourceManager.GetString("Enums.EmojiType.Windows11", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Windows 8.
+        /// </summary>
+        public static string Enums_EmojiType_Windows8 {
+            get {
+                return ResourceManager.GetString("Enums.EmojiType.Windows8", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Default.
         /// </summary>
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index f638aa7..edd4dc0 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -387,6 +387,21 @@ Your ReShade configuration files will still be saved, and you can locate them by
   <data name="Enums.ChannelChangeMode.Prompt" xml:space="preserve">
     <value>Always prompt</value>
   </data>
+  <data name="Enums.EmojiType.Catmoji" xml:space="preserve">
+    <value>Catmoji</value>
+  </data>
+  <data name="Enums.EmojiType.Default" xml:space="preserve">
+    <value>Default (Twemoji)</value>
+  </data>
+  <data name="Enums.EmojiType.Windows10" xml:space="preserve">
+    <value>Windows 10</value>
+  </data>
+  <data name="Enums.EmojiType.Windows11" xml:space="preserve">
+    <value>Windows 11</value>
+  </data>
+  <data name="Enums.EmojiType.Windows8" xml:space="preserve">
+    <value>Windows 8</value>
+  </data>
   <data name="Enums.FlagPresets.InGameMenuVersion.Default" xml:space="preserve">
     <value>Default</value>
   </data>
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml
index 41ddb47..3728dd6 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml
@@ -120,7 +120,13 @@
           <TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_Mods_Presets_EmojiType_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
         </StackPanel>
       </ui:CardControl.Header>
-      <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding EmojiTypes.Keys, Mode=OneTime}" Text="{Binding SelectedEmojiType, Mode=TwoWay}" />
+      <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding EmojiTypes, Mode=OneTime}" Text="{Binding SelectedEmojiType, Mode=TwoWay}">
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Path=., Converter={StaticResource ResourceConverter}, ConverterParameter='Enums.EmojiType.'}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
     </ui:CardControl>
 
     <TextBlock Text="{x:Static resources:Strings.Common_Miscellaneous}" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
diff --git a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs
index 9e4f8b1..268522d 100644
--- a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs
@@ -82,12 +82,12 @@ namespace Bloxstrap.UI.ViewModels.Menu
             set => App.Settings.Prop.UseDisableAppPatch = value;
         }
 
-        public IReadOnlyDictionary<string, EmojiType> EmojiTypes => EmojiTypeEx.Selections;
+        public IReadOnlyCollection<EmojiType> EmojiTypes => EmojiTypeEx.Selections;
 
-        public string SelectedEmojiType
+        public EmojiType SelectedEmojiType
         {
-            get => EmojiTypes.FirstOrDefault(x => x.Value == App.Settings.Prop.EmojiType).Key;
-            set => App.Settings.Prop.EmojiType = EmojiTypes[value];
+            get => App.Settings.Prop.EmojiType;
+            set => App.Settings.Prop.EmojiType = value;
         }
 
         public Visibility ChooseCustomFontVisibility => _usingCustomFont ? Visibility.Collapsed : Visibility.Visible;