From ad973e1ffad0685eaaa85f61c2959716886802ec Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Wed, 4 Jan 2023 21:36:22 +0100
Subject: [PATCH] Removed support for all deprecated theme properties.

---
 es-core/src/ThemeData.cpp | 27 ++-------------------------
 es-core/src/ThemeData.h   |  1 -
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
index cbc940904..df181b7fd 100644
--- a/es-core/src/ThemeData.cpp
+++ b/es-core/src/ThemeData.cpp
@@ -66,14 +66,8 @@ std::vector<std::string> ThemeData::sLegacyProperties {
     {"logoRotation"},
     {"logoRotationOrigin"},
     {"logoAlignment"},
-    {"maxLogoCount"}};
-
-std::vector<std::string> ThemeData::sDeprecatedProperties {
-    {"selectorOffsetY"},
-    {"staticItem"},
-    {"itemType"},
-    {"defaultItem"},
-    {"itemInterpolation"}};
+    {"maxLogoCount"},
+    {"selectorOffsetY"}};
 
 std::vector<std::pair<std::string, std::string>> ThemeData::sSupportedAspectRatios {
     {"automatic", "automatic"},
@@ -128,9 +122,6 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"staticImage", PATH},
        {"imageType", STRING},
        {"defaultImage", PATH},
-       {"staticItem", PATH},                       // TEMPORARY: For backward compatibility.
-       {"itemType", STRING},                       // TEMPORARY: For backward compatibility.
-       {"defaultItem", PATH},                      // TEMPORARY: For backward compatibility.
        {"maxItemCount", FLOAT},
        {"maxLogoCount", FLOAT},                    // For backward compatibility with legacy themes.
        {"itemsBeforeCenter", UNSIGNED_INTEGER},
@@ -141,7 +132,6 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"itemRotation", FLOAT},
        {"itemRotationOrigin", NORMALIZED_PAIR},
        {"itemAxisHorizontal", BOOLEAN},
-       {"itemInterpolation", STRING},              // TEMPORARY: For backward compatibility.
        {"imageInterpolation", STRING},
        {"imageColor", COLOR},
        {"imageColorEnd", COLOR},
@@ -193,7 +183,6 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"itemTransitions", STRING},
        {"rowTransitions", STRING},
        {"unfocusedItemOpacity", FLOAT},
-       {"edgeScaleInwards", BOOLEAN},              // TODO
        {"imageFit", STRING},
        {"imageRelativeScale", FLOAT},
        {"imageColor", COLOR},
@@ -1615,18 +1604,6 @@ void ThemeData::parseElement(const pugi::xml_node& root,
             }
         }
 
-        // Print a warning if a deprecated property is used for a non-legacy theme set.
-        if (!mLegacyTheme) {
-            for (auto& deprecatedProperty : sDeprecatedProperties) {
-                if (nodeName == deprecatedProperty) {
-                    LOG(LogWarning)
-                        << "ThemeData::parseElement(): Property \"" << deprecatedProperty
-                        << "\" is deprecated and support for it will be removed in a future "
-                           "version";
-                }
-            }
-        }
-
         // If an attribute exists, then replace nodeName with its name.
         auto attributeEntry = sPropertyAttributeMap.find(element.type);
         if (attributeEntry != sPropertyAttributeMap.end()) {
diff --git a/es-core/src/ThemeData.h b/es-core/src/ThemeData.h
index ed5b823e8..2d718bb26 100644
--- a/es-core/src/ThemeData.h
+++ b/es-core/src/ThemeData.h
@@ -294,7 +294,6 @@ private:
     static std::vector<std::string> sLegacySupportedViews;
     static std::vector<std::string> sLegacySupportedFeatures;
     static std::vector<std::string> sLegacyProperties;
-    static std::vector<std::string> sDeprecatedProperties;
     static std::vector<std::pair<std::string, std::string>> sSupportedAspectRatios;
     static std::map<std::string, float> sAspectRatioMap;