Refactor key templates

Author: Invvard

src/InvvardDev.EZLayoutDisplay.Desktop/Helper/KeyContentTemplateSelector.cs

@@ -8,20 +8,14 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.Helper
 {
     public class KeyContentTemplateSelector : DataTemplateSelector
     {
-        public DataTemplate CustomLabelDataTemplate { private get; set; }
         public DataTemplate SingleFeatureDataTemplate { private get; set; }
         public DataTemplate DoubleFeatureDataTemplate { private get; set; }
 
         public override DataTemplate SelectTemplate(object item, DependencyObject container)
-        {
-            if (!(item is KeyTemplate key)) return CustomLabelDataTemplate;
-
-            return key.EZKey.DisplayMode switch
+            => item switch
             {
-                KeyDisplayMode.SingleFeature => SingleFeatureDataTemplate,
-                KeyDisplayMode.DoubleFeature => DoubleFeatureDataTemplate,
-                _ => CustomLabelDataTemplate
+                KeyTemplate { Key.DisplayMode: KeyDisplayMode.DualFunction } => DoubleFeatureDataTemplate,
+                _ => SingleFeatureDataTemplate
             };
-        }
     }
 }

src/InvvardDev.EZLayoutDisplay.Desktop/Helper/KeyFeatureTemplateSelector.cs

@@ -0,0 +1,27 @@
+using System.Windows;
+using System.Windows.Controls;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content;
+
+namespace InvvardDev.EZLayoutDisplay.Desktop.Helper
+{
+    public class KeyFeatureTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate SimpleLabelDataTemplate { private get; set; }
+        public DataTemplate GlyphDataTemplate { private get; set; }
+        public DataTemplate ModdedGlyphDataTemplate { private get; set; }
+        public DataTemplate LayerDataTemplate { private get; set; }
+        public DataTemplate ColorPickerDataTemplate { private get; set; }
+
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            return item switch
+            {
+                Glyph glyph when !string.IsNullOrWhiteSpace(glyph.Modifier) => ModdedGlyphDataTemplate,
+                Glyph glyph when string.IsNullOrWhiteSpace(glyph.Modifier) => GlyphDataTemplate,
+                Layer => LayerDataTemplate,
+                ColorPicker => ColorPickerDataTemplate,
+                _ => SimpleLabelDataTemplate
+            };
+        }
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj

@@ -81,6 +81,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Helper\KeyFeatureTemplateSelector.cs" />
     <Compile Include="Helper\KeyContentTemplateSelector.cs" />
     <Compile Include="Helper\LoggerHelper.cs" />
     <Compile Include="Model\Enum\KeyDisplayMode.cs" />

src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/SettingsService.cs

@@ -23,6 +23,7 @@ public class SettingsService : ISettingsService
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private readonly Settings _settings;
+        private readonly JsonSerializerSettings _serializerSettings;
 
         #endregion
 
@@ -34,6 +35,8 @@ public SettingsService(Settings settings)
 
             _settings = settings;
             _defaultHotkey = new Hotkey(Keys.Space, ModifierKeys.Alt, ModifierKeys.Control, ModifierKeys.Shift, ModifierKeys.WindowsKey);
+
+            _serializerSettings = new JsonSerializerSettings { TypeNameHandling= TypeNameHandling.Objects };
         }
 
         #endregion
@@ -116,7 +119,7 @@ public EZLayout EZLayout
 
                     ezLayout = string.IsNullOrWhiteSpace(setting)
                                    ? new EZLayout()
-                                   : JsonConvert.DeserializeObject<EZLayout>(setting);
+                                   : JsonConvert.DeserializeObject<EZLayout>(setting, _serializerSettings);
                     Logger.Debug("Loaded Layout = {@ezLayout}", ezLayout);
                 }
                 catch (Exception ex)
@@ -135,7 +138,7 @@ public EZLayout EZLayout
                 Logger.TraceMethod();
                 Logger.DebugInputParam(nameof(EZLayout), value);
 
-                var setting = JsonConvert.SerializeObject(value);
+                var setting = JsonConvert.SerializeObject(value, _serializerSettings);
                 _settings[SettingsName.EZLayout] = setting;
             }
         }
@@ -157,9 +160,5 @@ public void Cancel()
         }
 
         #endregion
-
-        #region Private methods
-
-        #endregion
     }
 }