refactor ui

Author: BlueWitherer

CMakeLists.txt

@@ -13,7 +13,7 @@ project(HorribleMenu VERSION 1.0.0)
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE include src)
 
 if(PROJECT_IS_TOP_LEVEL)
     target_compile_definitions(${PROJECT_NAME} PRIVATE BRKD_HORRIBLE_API_EXPORTING)

src/Utils.h

@@ -17,8 +17,11 @@
 #include <util/ui/WhackButton.hpp>
 
 #include <cue/Util.hpp>
+#include <cue/DropdownNode.hpp>
 #include <cue/PlayerIcon.hpp>
 
+#include <asp/fs.hpp>
+
 #include <cocos2d.h>
 
 #include <Geode/ui/Button.hpp>
@@ -60,7 +63,8 @@ namespace horrible {
         };
     };
 
-    namespace str = geode::utils::string;  // Shortcut for geode::utils::string
+    namespace fs = asp::fs;                // Shortcut for `asp::fs`
+    namespace str = geode::utils::string;  // Shortcut for `geode::utils::string`
 
     // For convenience
     namespace setting {

src/hooks/Mock.cpp

@@ -19,9 +19,6 @@ static auto const o = Option::create(THIS_ID)
                           ->autoRegister();
 
 #if !defined(GEODE_IS_MACOS) && !defined(GEODE_IS_IOS)  // not compat with these platforms
-// Shortcut for `std::filesystem`
-namespace fs = std::filesystem;
-
 class $modify(MockMenuLayer, MenuLayer) {
     HORRIBLE_DELEGATE_HOOKS(THIS_ID);
 

src/hooks/jumpscares/ForceLevels.cpp

@@ -41,7 +41,7 @@ class $modify(GriefPlayLayer, PlayLayer) {
     HORRIBLE_DELEGATE_HOOKS(THIS_ID_GRIEF);
 
     struct Fields {
-        int chance = options::getChance(oGrief->getID());
+        unsigned int chance = options::getChance(oGrief->getID());
 
         bool dontCreateObjects = false;
     };
@@ -62,7 +62,7 @@ class $modify(CongregationPlayLayer, PlayLayer) {
     HORRIBLE_DELEGATE_HOOKS(THIS_ID_CONGREG);
 
     struct Fields {
-        int chance = options::getChance(oCongreg->getID());
+        unsigned int chance = options::getChance(oCongreg->getID());
 
         bool dontCreateObjects = false;
     };

src/hooks/obstructive/TOS.cpp

@@ -20,7 +20,7 @@ class $modify(TOSGJBaseGameLayer, GJBaseGameLayer) {
     HORRIBLE_DELEGATE_HOOKS(THIS_ID);
 
     struct Fields {
-        int chance = options::getChance(THIS_ID);
+        unsigned int chance = options::getChance(THIS_ID);
 
         Ref<TermsAndConditions> currentTos = nullptr;
     };

src/hooks/randoms/FakeCrash.cpp

@@ -39,7 +39,6 @@ class $modify(FakeCrashGJBaseGameLayer, GJBaseGameLayer) {
     void scheduler(float) {
         auto f = m_fields.self();
 
-        // log::debug("FakeCrash update tick");
         if (!f->inFakeCrash && randng::fast() % f->chance == 0) {
             log::debug("Faking crash");
             f->lastTimeWarp = LevelTools::getLastTimewarp();

src/ui/Menu.h

@@ -5,20 +5,12 @@
 #include <Geode/Geode.hpp>
 
 namespace horrible {
-    class MenuNothingNode final : public cocos2d::CCNode {
-    protected:
-        bool init(cocos2d::CCSize const& size, cocos2d::CCPoint const& pos);
-
-    public:
-        static MenuNothingNode* create(cocos2d::CCSize const& size, cocos2d::CCPoint const& pos);
-    };
-
     class Menu final : public geode::Popup {
         struct TierFilterBtnData final {
             SillyTier tier;
             const char* label;
             const char* id;
-            ccColor3B color;
+            cocos2d::ccColor3B const& color;
         };
 
         struct SocialBtnData final {
@@ -35,7 +27,7 @@ namespace horrible {
         static Menu* s_inst;
 
         void setupSafeModeNode(bool safeMode);
-        void setupImageBackground(std::filesystem::path path);
+        void setupImageBackground(fs::path const& path);
 
     protected:
         Menu();

src/ui/MenuFilterCells.hpp

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <Utils.h>
+
+#include <Geode/Geode.hpp>
+
+namespace horrible {
+    class MenuCategoryFilterCell final : public cocos2d::CCMenu {
+        using Callback = geode::Function<void(std::string_view, bool)>;
+
+    private:
+        std::string m_category = "";             // The category name
+        CCMenuItemToggler* m_toggler = nullptr;  // The toggler for the option
+        Callback m_toggleCallback = nullptr;     // Callback for when the category is toggled
+
+    protected:
+        void onToggle(CCObject* sender);
+
+        bool init(cocos2d::CCSize const& size, std::string category);
+
+    public:
+        static MenuCategoryFilterCell* create(cocos2d::CCSize const& size, std::string category);
+
+        void setToggleCallback(Callback&& callback);
+        void setToggled(bool on);
+
+        geode::ZStringView getCategory() const noexcept;
+    };
+
+    class MenuSillyFilterCell final : public cocos2d::CCNode {
+    private:
+        SillyTier m_silly = SillyTier::None;
+
+    protected:
+        bool init(cocos2d::CCSize const& size, SillyTier silly, std::string id, geode::ZStringView label, cocos2d::ccColor3B const& color);
+
+    public:
+        static MenuSillyFilterCell* create(cocos2d::CCSize const& size, SillyTier silly, std::string id, geode::ZStringView label, cocos2d::ccColor3B const& color);
+
+        SillyTier getSillyTier() const noexcept;
+    };
+};

src/ui/MenuOption.h src/ui/MenuOption.hppsrc/ui/MenuOption.h renamed to src/ui/MenuOption.hpp

@@ -5,6 +5,14 @@
 #include <Geode/Geode.hpp>
 
 namespace horrible {
+    class MenuNothingNode final : public cocos2d::CCNode {
+    protected:
+        bool init(cocos2d::CCSize const& size, cocos2d::CCPoint const& pos);
+
+    public:
+        static MenuNothingNode* create(cocos2d::CCSize const& size, cocos2d::CCPoint const& pos);
+    };
+
     class MenuOption final : public cocos2d::CCMenu {
         using Callback = Function<void()>;