From 8051318d25cafb2165ee43378eabfdd2e11cafa2 Mon Sep 17 00:00:00 2001
From: JonatanRek <vasek@steelants.cz>
Date: Mon, 9 Sep 2024 13:56:27 -0700
Subject: [PATCH] Refactoring

---
 FakeeDeck/ButtonType/Button.cs             | 30 ++++++++++++++++------
 FakeeDeck/ButtonType/HelldiversTwoMacro.cs |  8 +-----
 FakeeDeck/ButtonType/MediaMacro.cs         | 12 ++-------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/FakeeDeck/ButtonType/Button.cs b/FakeeDeck/ButtonType/Button.cs
index a7b1782..15ca58c 100644
--- a/FakeeDeck/ButtonType/Button.cs
+++ b/FakeeDeck/ButtonType/Button.cs
@@ -8,17 +8,31 @@ namespace FakeeDeck.ButtonType
 {
     internal class Button
     {
-        public static string getButton(string Key)
+        public static string getButtonHTML(string icon, string image, string name, string action, Dictionary<string, string> parameters)
         {
-            return
-                "<div class=\"m-2\">" +
-                "  <form style=\"margin-bottom: 0px;\" method=\"post\" action=\"button\\stratogem\">" +
-                "    <input type=\"hidden\" name=\"stratogem\" value=>" +
-                "    <input style=\"background-size: cover; ; width: 150px;height: 150px;background-color: aquamarine;\" type=\"submit\" value=\"\">" +
-                "  </form>" +
-                "</div>";
+            string body = "<div class=\"m-2\">";
+            body += "<form style=\"margin-bottom: 0px;\" method=\"post\" action=\"" + action + "\">";
+
+            foreach (var parameter in parameters)
+            {
+                body += "<input type=\"hidden\" name=\"" + parameter.Key + "\" value=\"" + parameter.Value + "\">";
+            }
+
+            body += "<button type=\"submit\" value=\"submit\" style=\"background-size: cover; " + (!string.IsNullOrEmpty(image) ? "background-image: url('" + image + "');" : "") + " width: 150px;height: 150px; background-color: aquamarine;\" >";
+            body += (!string.IsNullOrEmpty(icon) ? "<i class=\"fa-solid " + icon + "\"></i>" : name);
+
+            body += "</button>";
+            body += "</form>";
+            body += "</div>";
+            return body;
         }
 
+        public static string getButton(string Key)
+        {
+            return ""; //getButtonHTML(null, "https://docs.itego.cz/uploads/images/system/2022-04/OdRTPJ4iTTInmhdP-jagq7dfjpi2lilfg-imageedit-2-6604933313.gif");
+
+
+        }
         public static bool invokeAction(string Key)
         {
             return false;
diff --git a/FakeeDeck/ButtonType/HelldiversTwoMacro.cs b/FakeeDeck/ButtonType/HelldiversTwoMacro.cs
index 09e63ec..5442c67 100644
--- a/FakeeDeck/ButtonType/HelldiversTwoMacro.cs
+++ b/FakeeDeck/ButtonType/HelldiversTwoMacro.cs
@@ -49,13 +49,7 @@ namespace FakeeDeck.ButtonType
 
         public static string getButton(string Key)
         {
-            return
-                "<div class=\"m-2\">" +
-                "  <form style=\"margin-bottom: 0px;\" method=\"post\" action=\"button\\HelldiversTwoMacro\">" +
-                "    <input type=\"hidden\" name=\"stratogem\" value=\"" + Key + "\">" +
-                "    <input style=\"background-size: cover; background-image: url('" + stratogemsIcons[Key].ToString() + "'); width: 150px;height: 150px;background-color: aquamarine;\" type=\"submit\" value=\"" + FirstLetterToUpper(Key) + "\">" +
-                "  </form>" +
-                "</div>";
+            return getButtonHTML(null, stratogemsIcons[Key].ToString(), Key, "button\\HelldiversTwoMacro", new Dictionary<string, string>() { { "stratogem", Key } });
         }
 
         public static bool invokeAction(string stratogem)
diff --git a/FakeeDeck/ButtonType/MediaMacro.cs b/FakeeDeck/ButtonType/MediaMacro.cs
index 171a01c..2c35a6b 100644
--- a/FakeeDeck/ButtonType/MediaMacro.cs
+++ b/FakeeDeck/ButtonType/MediaMacro.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace FakeeDeck.ButtonType
 {
-    internal class MediaMacro
+    internal class MediaMacro : Button
     {
         public static Dictionary<string, uint[]> mediaControls = new Dictionary<string, uint[]>
         {
@@ -22,15 +22,7 @@ namespace FakeeDeck.ButtonType
 
         public static string getButton(string Key)
         {
-            return
-                "<div class=\"m-2\">" +
-                "  <form style=\"margin-bottom: 0px;\" method=\"post\" action=\"button\\MediaMacro\">" +
-                "    <input type=\"hidden\" name=\"control_action\" value=\"" + Key + "\">" +
-                "    <button type=\"submit\" value=\"" + Key + "\" style=\"width: 150px;height: 150px;background-color: aquamarine;\" >" +
-                "      <i class=\"fa-solid "+ mediaIcons[Key] +"\"></i>" +
-                "    </button>" +
-                "  </form>" +
-                "</div>";
+            return getButtonHTML(mediaIcons[Key], null, Key, "button\\MediaMacro", new Dictionary<string, string>() { { "control_action", Key } });
         }
 
         public static bool invokeAction(string control_action)