From cd16726376972e941622e1b29d8ab338df4e32ff Mon Sep 17 00:00:00 2001
From: BAXY Square <baxysquare@gmail.com>
Date: Wed, 17 Apr 2024 09:48:48 -0600
Subject: [PATCH] Add FlatUX Theme, Remove Retired Themes

With some help from @gouchi, I decided to try and add the FlatUX theme, which has been in the retroarch-assets repository for years.  FlatUX was designed to merge the FlatUI and Retroactive themes into a single, unified design.

With the addition of FlatUX, the Retroactive and Neoactive themes will be retired. This PR removes them both from the menus. The theme files will be removed from retroarch-assets, but are archived on baxy-retroarch-themes.
---
 intl/msg_hash_us.h  | 12 ++++--------
 menu/drivers/xmb.c  |  6 ++----
 menu/menu_defines.h |  3 +--
 menu/menu_setting.c |  8 ++------
 msg_hash.h          |  3 +--
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 6a1fd6769835..3c32e001414e 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -11997,6 +11997,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
    "FlatUI"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
+   "FlatUX"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
    "Monochrome"
@@ -12009,18 +12013,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
    "Systematic"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
-   "NeoActive"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
    "Pixel"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
-   "RetroActive"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
    "Retrosystem"
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ea1ce9d13235..f21a5d259715 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -542,14 +542,12 @@ const char* xmb_theme_ident(void)
    {
       case XMB_ICON_THEME_FLATUI:
          return "flatui";
-      case XMB_ICON_THEME_RETROACTIVE:
-         return "retroactive";
+      case XMB_ICON_THEME_FLATUX:
+         return "flatux";
       case XMB_ICON_THEME_RETROSYSTEM:
          return "retrosystem";
       case XMB_ICON_THEME_PIXEL:
          return "pixel";
-      case XMB_ICON_THEME_NEOACTIVE:
-         return "neoactive";
       case XMB_ICON_THEME_SYSTEMATIC:
          return "systematic";
       case XMB_ICON_THEME_DOTART:
diff --git a/menu/menu_defines.h b/menu/menu_defines.h
index ac806a784775..571454d429ac 100644
--- a/menu/menu_defines.h
+++ b/menu/menu_defines.h
@@ -323,9 +323,8 @@ enum xmb_icon_theme
 {
    XMB_ICON_THEME_MONOCHROME = 0,
    XMB_ICON_THEME_FLATUI,
-   XMB_ICON_THEME_RETROACTIVE,
+   XMB_ICON_THEME_FLATUX,
    XMB_ICON_THEME_PIXEL,
-   XMB_ICON_THEME_NEOACTIVE,
    XMB_ICON_THEME_SYSTEMATIC,
    XMB_ICON_THEME_DOTART,
    XMB_ICON_THEME_CUSTOM,
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 60ebc177944f..d53a5ed1aca0 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -4184,9 +4184,9 @@ static void setting_get_string_representation_uint_xmb_icon_theme(
          strlcpy(s,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI), len);
          break;
-      case XMB_ICON_THEME_RETROACTIVE:
+      case XMB_ICON_THEME_FLATUX:
          strlcpy(s,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE), len);
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX), len);
          break;
       case XMB_ICON_THEME_RETROSYSTEM:
          strlcpy(s,
@@ -4196,10 +4196,6 @@ static void setting_get_string_representation_uint_xmb_icon_theme(
          strlcpy(s,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL), len);
          break;
-      case XMB_ICON_THEME_NEOACTIVE:
-         strlcpy(s,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE), len);
-         break;
       case XMB_ICON_THEME_SYSTEMATIC:
          strlcpy(s,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC), len);
diff --git a/msg_hash.h b/msg_hash.h
index 490b5960a9a9..64fabda1b3ec 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -731,10 +731,9 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
-   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
+   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
-   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,