Themes (#2009)

* initial impl

* revert old setting

* readd sapphire resources

Author: altalk23

loader/include/Geode/utils/ColorProvider.hpp

@@ -104,6 +104,25 @@ namespace geode {
          */
         cocos2d::ccColor3B color3b(std::string_view id) const;
     };
+
+    class ThemeIDProvidingEvent final : public Event<ThemeIDProvidingEvent, bool(std::string& idOut)> {
+    public:
+        // listener params idOut
+        using Event::Event;
+    };
+
+    /**
+     * An event that gets posted for someone to request a node for a specific ID. This is
+     * used in Geode themes to provide custom nodes.
+     */
+    class NodeProvidingEvent final : public GlobalEvent<NodeProvidingEvent, bool(std::string_view id, cocos2d::CCNode*& nodeOut, std::string_view theme), bool(cocos2d::CCNode*& nodeOut, std::string_view theme), std::string> {
+    public:
+        // listener params node
+        // filter params id
+        using GlobalEvent::GlobalEvent;
+
+        bool send(cocos2d::CCNode*& nodeOut);
+    };
 }
 
 inline cocos2d::ccColor4B operator""_cc4b_gd(const char* str, size_t) {

loader/resources/images/sapphire-bg.png

@@ -92,11 +92,17 @@
             "name": "Disable Crash Popup",
             "description": "Disables the popup at startup asking if you'd like to send a bug report; intended for developers"
         },
-        "enable-geode-theme": {
-            "type": "bool",
-            "default": true,
-            "name": "Enable Geode-Themed Colors",
-            "description": "When enabled, the Geode menu has a <ca>Geode-themed color scheme</c>. <cy>This does not affect any other menus!</c>"
+        "used-theme": {
+            "type": "string",
+            "name": "Used Theme",
+            "description": "The theme used for Geode menu. <cy>This does not affect any other menus!</c>",
+            "default": "Geode",
+            "one-of": [
+                "Geode",
+                "Geometry Dash",
+                "Rainbow",
+                "Sapphire"
+            ]
         },
         "infinite-local-mods-list": {
             "type": "bool",

loader/resources/logos/sapphire-logo-outline-gold.png

@@ -15,6 +15,7 @@
 #include <loader/updater.hpp>
 #include <Geode/binding/ButtonSprite.hpp>
 #include <Geode/modify/LevelSelectLayer.hpp>
+#include <Geode/utils/ColorProvider.hpp>
 
 using namespace geode::prelude;
 
@@ -36,7 +37,7 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
 
     struct Fields {
         bool m_menuDisabled = false;
-        CCSprite* m_geodeButton = nullptr;
+        CCNode* m_geodeButton = nullptr;
         async::TaskHolder<Result<InstalledModsUpdateCheck, server::ServerError>> m_updateCheckTask;
     };
 
@@ -53,16 +54,45 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
 
         // add geode button
         if (!m_fields->m_menuDisabled) {
-            m_fields->m_geodeButton = CircleButtonSprite::createWithSpriteFrameName(
-                "geode-logo-outline-gold.png"_spr,
-                .95f,
-                CircleBaseColor::Green,
-                CircleBaseSize::MediumAlt
-            );
+            auto listener = NodeProvidingEvent("geode-button-sprite"_spr).listen([this](cocos2d::CCNode*& nodeOut, std::string_view theme) -> void {
+                if (nodeOut) return; // someone overrode it already
+                CCSprite* geodeButton;
+                if (theme == "sapphire") {
+                    geodeButton = CircleButtonSprite::createWithSpriteFrameName(
+                        "sapphire-logo-outline-gold.png"_spr,
+                        .95f,
+                        CircleBaseColor::Green,
+                        CircleBaseSize::MediumAlt
+                    );
+                }
+                else {
+                    geodeButton = CircleButtonSprite::createWithSpriteFrameName(
+                        "geode-logo-outline-gold.png"_spr,
+                        .95f,
+                        CircleBaseColor::Green,
+                        CircleBaseSize::MediumAlt
+                    );
+                }
+
+                if (!geodeButton || geodeButton->isUsingFallback()) {
+                    nodeOut = nullptr;
+                }
+                else {
+                    nodeOut = geodeButton;
+                }
+            }, Priority::Last);
+
+            cocos2d::CCNode* geodeBtn = nullptr;
+            NodeProvidingEvent("geode-button-sprite"_spr).send(geodeBtn);
+
             auto geodeBtnSelector = &CustomMenuLayer::onGeode;
-            if (!m_fields->m_geodeButton || m_fields->m_geodeButton->isUsingFallback()) {
-                geodeBtnSelector = &CustomMenuLayer::onMissingTextures;
+            if (geodeBtn) {
+                m_fields->m_geodeButton = static_cast<CCSprite*>(geodeBtn);
+            }
+            else {
+                log::warn("No node provided for geode-button-sprite, using fallback instead");
                 m_fields->m_geodeButton = ButtonSprite::create("!!");
+                geodeBtnSelector = &CustomMenuLayer::onMissingTextures;
             }
 
             auto bottomMenu = static_cast<CCMenu*>(this->getChildByID("bottom-menu"));

loader/resources/logos/sapphire-logo.png

@@ -5,6 +5,7 @@
 #include <Geode/ui/MDPopup.hpp>
 #include <Geode/ui/LoadingSpinner.hpp>
 #include <Geode/ui/LazySprite.hpp>
+#include <Geode/utils/ColorProvider.hpp>
 #include <Geode/utils/web.hpp>
 #include <server/Server.hpp>
 #include "mods/GeodeStyle.hpp"
@@ -264,10 +265,26 @@ class ModLogoSprite : public CCNodeRGBA {
                 if (!mod->isInternal()) {
                     m_sprite->loadFromFile(dirs::getModRuntimeDir() / mod->getID() / "logo.png");
                 } else {
-                    if (Mod::get()->getSavedValue("alternate-geode-style", false)) {
-                        m_sprite->initWithSpriteFrameName("geode-logo-alternate.png"_spr);
-                    }
-                    else {
+                    // We only support lazySprite for this because i have no idea how to better integrate this
+                    auto listener = NodeProvidingEvent("geode-mod-logo-sprite"_spr).listen([this](cocos2d::CCNode*& nodeOut, std::string_view theme) -> void {
+                        auto sprite = typeinfo_cast<LazySprite*>(nodeOut);
+                        if (!sprite) return; // someone overrode it, which will probably break maybe
+
+                        if (theme == "rainbow") {
+                            m_sprite->initWithSpriteFrameName("geode-logo-alternate.png"_spr);
+                        }
+                        else if (theme == "sapphire") {
+                            m_sprite->initWithSpriteFrameName("sapphire-logo.png"_spr);
+                        }
+                        else {
+                            m_sprite->initWithSpriteFrameName("geode-logo.png"_spr);
+                        }
+                    }, Priority::Last);
+                    CCNode* ptr = m_sprite;
+                    NodeProvidingEvent("geode-mod-logo-sprite"_spr).send(ptr);
+
+                    // fallback
+                    if (ptr != m_sprite) {
                         m_sprite->initWithSpriteFrameName("geode-logo.png"_spr);
                     }
                 }