From c8b8d0b43f9d380770c0225f65c8875c003beba1 Mon Sep 17 00:00:00 2001
From: Athozus <athozus@gmail.com>
Date: Sat, 2 Dec 2023 19:31:20 +0100
Subject: [PATCH] Rework color utility using tables

Instead of one-letter symbols, it now supports tables of identifiers or single strings
---
 onjoin.lua            |  2 +-
 ui/about.lua          |  4 ++--
 ui/contacts.lua       |  2 +-
 ui/drafts.lua         |  2 +-
 ui/inbox.lua          | 10 +++++-----
 ui/maillists.lua      |  2 +-
 ui/message.lua        |  2 +-
 ui/outbox.lua         |  6 +++---
 ui/receivers.lua      |  6 +++---
 ui/select_contact.lua |  6 +++---
 ui/settings.lua       |  2 +-
 ui/trash.lua          |  2 +-
 util/colors.lua       | 34 ++++++++++++++++++----------------
 13 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/onjoin.lua b/onjoin.lua
index 30db56c..d5f4648 100644
--- a/onjoin.lua
+++ b/onjoin.lua
@@ -17,7 +17,7 @@ minetest.register_on_joinplayer(function(player)
 
 		if unreadcount > 0 and mail.get_setting(name, "onjoin_notifications") then
 			minetest.chat_send_player(name,
-				minetest.colorize(mail.get_color("n"), "(" .. unreadcount .. ") " .. S("You have mail! Type /mail to read")))
+				minetest.colorize(mail.get_color("new"), "(" .. unreadcount .. ") " .. S("You have mail! Type /mail to read")))
 		end
 	end, player:get_player_name())
 end)
diff --git a/ui/about.lua b/ui/about.lua
index 34dc39f..745b6ba 100644
--- a/ui/about.lua
+++ b/ui/about.lua
@@ -21,8 +21,8 @@ function mail.show_about(name)
 
 			tablecolumns[color;text;text]
 			table[5,0.75;4.9,5.5;contributors;]] ..
-			mail.get_color("h") .. [[,]] .. S("Contributors") .. [[,,]] ..
-			mail.get_color("i") .. [[,Cheapie,Initial idea/project,]] ..
+			mail.get_color("header") .. [[,]] .. S("Contributors") .. [[,,]] ..
+			mail.get_color("important") .. [[,Cheapie,Initial idea/project,]] ..
 			[[,Rubenwardy,Lua/UI improvements,]] ..
 			[[,BuckarooBanzay,Clean-ups\, Refactoring,]] ..
 			[[,Athozus,Boxes\, Maillists\, UI\, Settings,]] ..
diff --git a/ui/contacts.lua b/ui/contacts.lua
index c206f48..a56af7f 100644
--- a/ui/contacts.lua
+++ b/ui/contacts.lua
@@ -9,7 +9,7 @@ local contacts_formspec = "size[8,9;]" .. mail.theme .. [[
 		button[6,1.60;2,0.5;delete;]] .. S("Delete") .. [[]
 		button[6,8.25;2,0.5;back;]] .. S("Back") .. [[]
 		tablecolumns[color;text;text]
-		table[0,0;5.75,9;contacts;]] .. mail.get_color("h") .. "," .. S("Name") .. "," .. S("Note")
+		table[0,0;5.75,9;contacts;]] .. mail.get_color("header") .. "," .. S("Name") .. "," .. S("Note")
 
 
 function mail.show_contacts(name)
diff --git a/ui/drafts.lua b/ui/drafts.lua
index 4fbbd1e..2fd15f4 100644
--- a/ui/drafts.lua
+++ b/ui/drafts.lua
@@ -21,7 +21,7 @@ function mail.show_drafts(name)
 		button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[]
 
 		tablecolumns[color;text;text]
-		table[0,0.7;5.75,9.35;drafts;]] .. mail.get_color("h") .. "," .. S("To") .. "," .. S("Subject")
+		table[0,0.7;5.75,9.35;drafts;]] .. mail.get_color("header") .. "," .. S("To") .. "," .. S("Subject")
 
     local formspec = { drafts_formspec }
     local entry = mail.get_storage_entry(name)
diff --git a/ui/inbox.lua b/ui/inbox.lua
index 9c18c58..556e822 100644
--- a/ui/inbox.lua
+++ b/ui/inbox.lua
@@ -67,7 +67,7 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
         button[3.5,9.5;2.5,0.5;selectall;]] .. S("(Un)select all") .. [[]
 
         tablecolumns[color;text;text]
-        table[0,0.7;5.75,7.45;inbox;]] .. mail.get_color("h") .. "," .. S("From") .. "," .. S("Subject")
+        table[0,0.7;5.75,7.45;inbox;]] .. mail.get_color("header") .. "," .. S("From") .. "," .. S("Subject")
     local formspec = { inbox_formspec }
 
     mail.message_drafts[name] = nil
@@ -78,7 +78,7 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
     if #messages > 0 then
         for _, message in ipairs(messages) do
             local selected_id = 0
-            local displayed_color = ""
+            local displayed_color = {}
             -- check if message is in selection list and return its id
             if mail.selected_idxs.inbox[name] and #mail.selected_idxs.inbox[name] > 0 then
                 for i, selected_msg in ipairs(mail.selected_idxs.inbox[name]) do
@@ -89,13 +89,13 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
                 end
             end
             if selected_id > 0 then
-                displayed_color = displayed_color .. "s"
+                table.insert(displayed_color, "selected")
             end
             if not message.read and unread_color_enable then
-                displayed_color = displayed_color .. "i"
+                table.insert(displayed_color, "important")
             end
             if not mail.player_in_list(name, message.to) and cc_color_enable then
-                displayed_color = displayed_color .. "a"
+                table.insert(displayed_color, "additional")
             end
             formspec[#formspec + 1] = "," .. mail.get_color(displayed_color)
             formspec[#formspec + 1] = ","
diff --git a/ui/maillists.lua b/ui/maillists.lua
index cb41933..31e55f3 100644
--- a/ui/maillists.lua
+++ b/ui/maillists.lua
@@ -9,7 +9,7 @@ local maillists_formspec = "size[8,9;]" .. mail.theme .. [[
 		button[6,1.60;2,0.5;delete;]] .. S("Delete") .. [[]
 		button[6,8.25;2,0.5;back;]] .. S("Back") .. [[]
 		tablecolumns[color;text;text]
-		table[0,0;5.75,9;maillists;]] .. mail.get_color("h") .. "," .. S("Name") .. "," .. S("Note")
+		table[0,0;5.75,9;maillists;]] .. mail.get_color("header") .. "," .. S("Name") .. "," .. S("Note")
 
 function mail.show_maillists(name)
 	local formspec = { maillists_formspec }
diff --git a/ui/message.lua b/ui/message.lua
index d2e01d5..d910c32 100644
--- a/ui/message.lua
+++ b/ui/message.lua
@@ -15,7 +15,7 @@ function mail.show_message(name, id)
 	local formspec = [[
 			size[8,9]
 
-			box[0,0;7,1.9;]] .. mail.get_color("H") .. [[]
+			box[0,0;7,1.9;]] .. mail.get_color("highlighted") .. [[]
 
 			button[7.25,0.15;0.75,0.5;back;X]
 
diff --git a/ui/outbox.lua b/ui/outbox.lua
index dc3e41e..a52c9cb 100644
--- a/ui/outbox.lua
+++ b/ui/outbox.lua
@@ -65,7 +65,7 @@ function mail.show_outbox(name, sortfieldindex, sortdirection, filter)
         button[3.5,9.5;2.5,0.5;selectall;]] .. S("(Un)select all") .. [[]
 
 		tablecolumns[color;text;text]
-        table[0,0.7;5.75,7.45;outbox;]] .. mail.get_color("h") .. "," .. S("To") .. "," .. S("Subject")
+        table[0,0.7;5.75,7.45;outbox;]] .. mail.get_color("header") .. "," .. S("To") .. "," .. S("Subject")
 	local formspec = { outbox_formspec }
 
 	mail.message_drafts[name] = nil
@@ -73,7 +73,7 @@ function mail.show_outbox(name, sortfieldindex, sortdirection, filter)
 	if #messages > 0 then
         for _, message in ipairs(messages) do
             local selected_id = 0
-            local displayed_color = ""
+            local displayed_color = {}
             -- check if message is in selection list and return its id
             if mail.selected_idxs.outbox[name] and #mail.selected_idxs.outbox[name] > 0 then
                 for i, selected_msg in ipairs(mail.selected_idxs.outbox[name]) do
@@ -84,7 +84,7 @@ function mail.show_outbox(name, sortfieldindex, sortdirection, filter)
                 end
             end
             if selected_id > 0 then
-                displayed_color = displayed_color .. "s"
+                table.insert(displayed_color, "selected")
             end
             formspec[#formspec + 1] = "," .. mail.get_color(displayed_color)
             formspec[#formspec + 1] = ","
diff --git a/ui/receivers.lua b/ui/receivers.lua
index ceeadc8..64d775d 100644
--- a/ui/receivers.lua
+++ b/ui/receivers.lua
@@ -9,7 +9,7 @@ function mail.show_receivers(name, id)
 	local formspec = [[
 			size[8,6]
 
-			box[0,0;7,1.1;]] .. mail.get_color("H") .. [[]
+			box[0,0;7,1.1;]] .. mail.get_color("highlighted") .. [[]
 
 			button[7.25,0.15;0.75,0.5;back;X]
 
@@ -25,10 +25,10 @@ function mail.show_receivers(name, id)
 
 	local from = minetest.formspec_escape(message.from) or ""
 	local to = mail.parse_player_list(message.to or "")
-	local to_str = mail.get_color("h") .. "," .. S("To") .. ",,"
+	local to_str = mail.get_color("header") .. "," .. S("To") .. ",,"
 	to_str = to_str .. table.concat(to, ",,")
 	local cc = mail.parse_player_list(message.cc or "")
-	local cc_str = mail.get_color("h") .. "," .. S("CC") .. ",,"
+	local cc_str = mail.get_color("header") .. "," .. S("CC") .. ",,"
 	cc_str = cc_str .. table.concat(cc, ",,")
 	local date = type(message.time) == "number"
 		and minetest.formspec_escape(os.date(mail.get_setting(name, "date_format"), message.time)) or ""
diff --git a/ui/select_contact.lua b/ui/select_contact.lua
index 9752e4e..03cfa13 100644
--- a/ui/select_contact.lua
+++ b/ui/select_contact.lua
@@ -5,15 +5,15 @@ local FORMNAME = "mail:selectcontact"
 
 local select_contact_formspec = "size[8,9;]" .. mail.theme .. [[
     tablecolumns[color;text;text]
-    table[0,0;3.5,9;contacts;]] .. mail.get_color("h") .. "," .. S("Name") .. "," .. S("Note") .. [[%s]
+    table[0,0;3.5,9;contacts;]] .. mail.get_color("header") .. "," .. S("Name") .. "," .. S("Note") .. [[%s]
     button[3.55,2.00;1.75,0.5;toadd;→ ]] .. S("Add") .. [[]
     button[3.55,2.75;1.75,0.5;toremove;← ]] .. S("Remove") .. [[]
     button[3.55,6.00;1.75,0.5;ccadd;→ ]] .. S("Add") .. [[]
     button[3.55,6.75;1.75,0.5;ccremove;← ]] .. S("Remove") .. [[]
     tablecolumns[color;text;text]
-    table[5.15,0.0;2.75,4.5;to;]] .. mail.get_color("h") .. "," .. S("To") .. ":," .. S("Note") .. [[%s]
+    table[5.15,0.0;2.75,4.5;to;]] .. mail.get_color("header") .. "," .. S("To") .. ":," .. S("Note") .. [[%s]
     tablecolumns[color;text;text]
-    table[5.15,4.6;2.75,4.5;cc;]] .. mail.get_color("h") .. "," .. S("CC") .. ":," .. S("Note") .. [[%s]
+    table[5.15,4.6;2.75,4.5;cc;]] .. mail.get_color("header") .. "," .. S("CC") .. ":," .. S("Note") .. [[%s]
     button[3.55,8.25;1.75,0.5;back;]] .. S("Back") .. [[]
 ]]
 
diff --git a/ui/settings.lua b/ui/settings.lua
index 96da5a1..6cc929f 100644
--- a/ui/settings.lua
+++ b/ui/settings.lua
@@ -23,7 +23,7 @@ function mail.show_settings(name)
 			tablecolumns[text]
             table[0,0.775;3,4.5;groups;]] .. groups_str .. [[;]] .. group_index .. [[]
 
-			box[3.5,0.8;3,0.45;]] .. mail.get_color("H") .. [[]
+			box[3.5,0.8;3,0.45;]] .. mail.get_color("highlighted") .. [[]
 			label[3.7,0.8;]] .. mail.settings_groups[group_index].label .. [[]
 
             button[0,5.65;2.5,0.5;reset;]] .. S("Reset") .. [[]
diff --git a/ui/trash.lua b/ui/trash.lua
index ba78ca4..ef7801e 100644
--- a/ui/trash.lua
+++ b/ui/trash.lua
@@ -16,7 +16,7 @@ local trash_formspec = "size[8.5,10;]" .. mail.theme .. [[
 	button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[]
 
 	tablecolumns[color;text;text]
-	table[0,0.7;5.75,9.35;trash;]] .. mail.get_color("h") .. "," .. S("From/To") .. "," .. S("Subject")
+	table[0,0.7;5.75,9.35;trash;]] .. mail.get_color("header") .. "," .. S("From/To") .. "," .. S("Subject")
 
 
 function mail.show_trash(name)
diff --git a/util/colors.lua b/util/colors.lua
index ac0ebbd..abca3da 100644
--- a/util/colors.lua
+++ b/util/colors.lua
@@ -1,13 +1,14 @@
-local function get_base_color(id)
-    local colors = {
-		h = "#999999", -- header
-		s = "#72FF63", -- selected
-		i = "#FFD700", -- important
-		a = "#CCCCDD", -- additional
-		H = "#608631", -- highlighted
-		n = "#00F529" -- new
-	}
-	return colors[id]
+local generic_colors = {
+	header         = "#999999",
+	selected       = "#72FF63",
+	important      = "#FFD700",
+	additional     = "#CCCCDD",
+	highlighted    = "#608631",
+	new            = "#00F529",
+}
+
+local function get_base_color(c)
+    return generic_colors[c] or ""
 end
 
 local function hex2rgb(hex)
@@ -39,15 +40,16 @@ local function rgbColorsMix(colors)
 end
 
 function mail.get_color(mix)
-    if #mix == 1 then
+    if type(mix) == "string" then
         return get_base_color(mix)
+    elseif #mix == 1 then
+        return get_base_color(mix[1])
     else
-        local colors = {}
-        for i = 1, #mix do
-            local c = mix:sub(i,i)
-            colors[#colors+1] = hex2rgb(get_base_color(c))
+        local colors2mix = {}
+        for _, c in ipairs(mix) do
+            colors2mix[#colors2mix+1] = hex2rgb(get_base_color(c))
         end
-        local mixed_color = rgbColorsMix(colors)
+        local mixed_color = rgbColorsMix(colors2mix)
         return rgb2hex(mixed_color)
     end
 end