Reshape models

Author: Invvard

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

@@ -84,8 +84,12 @@
     <Compile Include="Helper\KeyContentTemplateSelector.cs" />
     <Compile Include="Helper\LoggerHelper.cs" />
     <Compile Include="Model\Enum\KeyDisplayType.cs" />
-    <Compile Include="Model\ErgodoxTag.cs" />
-    <Compile Include="Model\ErgodoxKeyFeature.cs" />
+    <Compile Include="Model\Ez\Content\BaseContent.cs" />
+    <Compile Include="Model\Ez\Content\ColorPicker.cs" />
+    <Compile Include="Model\Ez\Content\Glyph.cs" />
+    <Compile Include="Model\Ez\Content\Layer.cs" />
+    <Compile Include="Model\ZsaModels\ErgodoxTag.cs" />
+    <Compile Include="Model\ZsaModels\ErgodoxKeyFeature.cs" />
     <Compile Include="Model\KeyTemplate.cs" />
     <Compile Include="Model\Messenger\UpdatedLayoutMessage.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -102,19 +106,19 @@
     <Compile Include="Helper\EZLayoutMaker.cs" />
     <Compile Include="Model\Dictionary\KeyModifierDictionary.cs" />
     <Compile Include="Model\Enum\KeyModifier.cs" />
-    <Compile Include="Model\EZKey.cs" />
+    <Compile Include="Model\Ez\Key.cs" />
     <Compile Include="Model\EZLayout.cs" />
     <Compile Include="Model\EZModifier.cs" />
     <Compile Include="Model\Enum\KeyCategory.cs" />
     <Compile Include="Model\Dictionary\KeyDefinitionDictionary.cs" />
     <Compile Include="Model\Enum\SettingsName.cs" />
     <Compile Include="Model\EZLayer.cs" />
     <Compile Include="Model\Hotkey.cs" />
-    <Compile Include="Model\ErgodoxKey.cs" />
+    <Compile Include="Model\ZsaModels\ErgodoxKey.cs" />
     <Compile Include="Model\KeyDefinition.cs" />
-    <Compile Include="Model\ErgodoxLayer.cs" />
-    <Compile Include="Model\ErgodoxLayout.cs" />
-    <Compile Include="Model\ErgodoxModifiers.cs" />
+    <Compile Include="Model\ZsaModels\ErgodoxLayer.cs" />
+    <Compile Include="Model\ZsaModels\ErgodoxLayout.cs" />
+    <Compile Include="Model\ZsaModels\ErgodoxModifiers.cs" />
     <Compile Include="Model\Revision.cs" />
     <Compile Include="Service\Implementation\ApplicationService.cs" />
     <Compile Include="Service\Implementation\KeyboardHookService.cs" />
@@ -277,6 +281,7 @@
       <Version>1.4.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/InvvardDev.EZLayoutDisplay.Desktop/Model/EZKey.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Ez;
+using System.Collections.Generic;
 
 namespace InvvardDev.EZLayoutDisplay.Desktop.Model
 {
@@ -17,7 +18,7 @@ public class EZLayer
         /// <summary>
         /// Gets or sets the layer list of keys.
         /// </summary>
-        public List<EZKey> EZKeys { get; set; }
+        public List<Key> Keys { get; set; }
 
         /// <summary>
         /// Gets or sets the layer color.
@@ -26,7 +27,7 @@ public class EZLayer
 
         public EZLayer()
         {
-            EZKeys = new List<EZKey>();
+            Keys = new List<Key>();
         }
     }
 }

src/InvvardDev.EZLayoutDisplay.Desktop/Model/EZLayer.cs

@@ -0,0 +1,15 @@
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content
+{
+    public class BaseContent
+    {
+        /// <summary>
+        /// Gets or sets the key main label.
+        /// </summary>
+        public string Label { get; set; }
+
+        /// <summary>
+        /// Gets or sets the key tag.
+        /// </summary>
+        public string Tag { get; set; }
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Ez/Content/BaseContent.cs

@@ -0,0 +1,7 @@
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content
+{
+    public class ColorPicker : BaseContent
+    {
+        public string ColorCode { get; set; }
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Ez/Content/ColorPicker.cs

@@ -0,0 +1,7 @@
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content
+{
+    public class Glyph : BaseContent
+    {
+        public string Modifier { get; set; }
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Ez/Content/Glyph.cs

@@ -0,0 +1,7 @@
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content
+{
+    internal class Layer : BaseContent
+    {
+        public int Id { get; set; }
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Ez/Content/Layer.cs

@@ -0,0 +1,22 @@
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Enum;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content;
+
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Ez
+{
+    public class Key
+    {
+        public BaseContent Primary { get; set; }
+
+        public BaseContent Secondary { get; set;}
+
+        /// <summary>
+        /// Gets or sets the key glowing color.
+        /// </summary>
+        public string GlowColor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the key category.
+        /// </summary>
+        public KeyCategory Category { get; set; }
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Ez/Key.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Ez;
 using Newtonsoft.Json;
 
 namespace InvvardDev.EZLayoutDisplay.Desktop.Model
@@ -82,7 +83,7 @@ public class KeyTemplate
         // ReSharper restore MemberCanBePrivate.Global
         // ReSharper restore UnusedMember.Global
 
-        public EZKey EZKey { get; set; }
+        public Key Key { get; set; }
 
         public KeyTemplate()
         {

src/InvvardDev.EZLayoutDisplay.Desktop/Model/KeyTemplate.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.ZsaModels;
 using Newtonsoft.Json;
 
 namespace InvvardDev.EZLayoutDisplay.Desktop.Model