Android bugfixes and stuff

Author: SpaghettDev

CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.4] - 2024-03-13
+
+### Added
+
+- `RLLoadingCircle`, a better LoadingCircle lol
+
+### Changed
+
+- Cleaned up `#include`s in header files
+
+### Fixed
+
+- 5 Character limit in `RLIntegerInputLayer`
+- `LoadingCircle` in wrong position on Android
+
 ## [2.0.3] - 2024-03-09
 
 ### Changed

mod.json

@@ -1,16 +1,20 @@
 {
-	"geode": "2.0.0-beta.21",
+	"geode": "2.0.0-beta.22",
 	"gd": {
 		"win": "2.204",
 		"android": "2.205",
 		"mac": "2.200"
 	},
-	"version": "v2.0.3",
+	"version": "v2.0.4",
 	"id": "spaghettdev.gd-roulette",
 	"name": "GD-Roulette",
 	"developer": "SpaghettDev",
 	"description": "An in-game level roulette.",
 	"repository": "https://github.com/SpaghettDev/GD-Roulette",
+	"links": {
+		"community": "https://discord.gg/3bShQb6Jz3",
+		"source": "https://github.com/SpaghettDev/GD-Roulette"
+	},
 	"issues": {
 		"info": "Report any bugs/suggestions here.",
 		"url": "https://github.com/SpaghettDev/GD-Roulette/issues"

src/custom_layers/RLIntegerInputLayer.cpp

@@ -70,7 +70,7 @@ bool RLIntegerInputLayer::init(const IntegerInputInfo& iili)
 		input_node->setString(fmt::format("{}", m_iili.starting_value.value()).c_str());
 	input_node->setAllowedChars("0123456789");
 	input_node->setMaxLabelScale(.5f);
-	input_node->setMaxLabelLength(5);
+	input_node->setMaxLabelLength(m_iili.max_length);
 	input_node->setPosition({ .0f, 5.f });
 	input_node->setID("input-node");
 	m_buttonMenu->addChild(input_node);
@@ -100,7 +100,7 @@ void RLIntegerInputLayer::onClose(CCObject*)
 	{
 		m_integer = m_iili.starting_value.value_or(0);
 	}
-	
+
 	m_iili.onFinish(this);
 
 	this->setKeypadEnabled(false);

src/custom_layers/RLIntegerInputLayer.hpp

@@ -15,6 +15,7 @@ struct IntegerInputInfo
 	int fallback_value;
 	int max_value; // inclusive
 	std::optional<int> starting_value;
+	int max_length;
 	bool show_arrows;
 	std::function<void(RLIntegerInputLayer*)> onFinish;
 };

src/custom_layers/base/BaseCustomAlertLayer.hpp

@@ -1,7 +1,10 @@
 #pragma once
 #include <limits>
+#include <string>
 
-#include <Geode/Bindings.hpp>
+#include <Geode/cocos/include/ccTypes.h>
+#include <Geode/cocos/cocoa/CCObject.h>
+#include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 
 using namespace geode::prelude;
 

src/custom_nodes/RLDifficultyNode.hpp

@@ -1,8 +1,7 @@
 #pragma once
-// #include <Geode/cocos/base_nodes/CCNode.h>
-// #include <Geode/cocos/sprite_nodes/CCSprite.h>
-// #include <Geode/cocos/include/ccTypes.h>
-#include <Geode/Geode.hpp>
+#include <Geode/cocos/base_nodes/CCNode.h>
+#include <Geode/cocos/sprite_nodes/CCSprite.h>
+#include <Geode/cocos/include/ccTypes.h>
 
 using namespace geode::prelude;
 

src/custom_nodes/RLLoadingCircle.cpp

@@ -0,0 +1,79 @@
+// not taken from https://github.com/acaruso-xx/slope-geode/blob/main/src/plate/LoadingCircle.cpp
+#include "RLLoadingCircle.hpp"
+
+RLLoadingCircle* RLLoadingCircle::create()
+{
+	auto ret = new RLLoadingCircle();
+
+	if (ret && ret->init())
+		ret->autorelease();
+	else
+	{
+		delete ret;
+		ret = nullptr;
+	}
+
+	return ret;
+}
+
+bool RLLoadingCircle::init()
+{
+	if (!this->initWithFile("loadingCircle.png")) return false;
+
+	this->setBlendFunc({ GL_SRC_ALPHA, GL_ONE });
+	this->setOpacity(0);
+	this->setZOrder(105);
+
+	return true;
+}
+
+void RLLoadingCircle::positionCenter()
+{
+	this->setPosition(cocos2d::CCDirector::sharedDirector()->getWinSize() / 2);
+}
+
+void RLLoadingCircle::fadeIn()
+{
+	auto* fadeInAction = cocos2d::CCFadeTo::create(.4f, 200);
+	fadeInAction->setTag(ACTION_TAG::FADE_IN);
+
+	this->runAction(fadeInAction);
+}
+
+void RLLoadingCircle::fadeOut()
+{
+	this->stopActionByTag(ACTION_TAG::FADE_IN);
+	this->stopActionByTag(ACTION_TAG::ROTATE);
+
+	auto* fadeOutAction = cocos2d::CCFadeTo::create(.4f, 0);
+	fadeOutAction->setTag(ACTION_TAG::FADE_OUT);
+
+	this->runAction(fadeOutAction);
+}
+
+void RLLoadingCircle::startRotate()
+{
+	auto* rotateAction = cocos2d::CCRepeatForever::create(
+		cocos2d::CCRotateBy::create(1.f, 360.f)
+	);
+	rotateAction->setTag(ACTION_TAG::ROTATE);
+
+	this->runAction(rotateAction);
+}
+
+void RLLoadingCircle::stopRotate()
+{
+	this->stopActionByTag(ACTION_TAG::ROTATE);
+}
+
+void RLLoadingCircle::show()
+{
+	fadeIn();
+	startRotate();
+}
+
+void RLLoadingCircle::stopAndHide()
+{
+	stopRotate();
+	fadeOut();
+}

src/custom_nodes/RLLoadingCircle.hpp

@@ -0,0 +1,29 @@
+#pragma once
+#include <Geode/cocos/sprite_nodes/CCSprite.h>
+#include <Geode/cocos/actions/CCActionInterval.h>
+
+class RLLoadingCircle : public cocos2d::CCSprite
+{
+public:
+	static RLLoadingCircle* create();
+
+	bool init() override;
+
+	void positionCenter();
+
+	void fadeIn();
+	void fadeOut();
+	void startRotate();
+	void stopRotate();
+
+	void show();
+	void stopAndHide();
+
+private:
+	enum ACTION_TAG : int
+	{
+		FADE_IN,
+		FADE_OUT,
+		ROTATE
+	};
+};

src/layers/CreatorLayer.cpp

@@ -1,7 +1,6 @@
 #include "../roulette/manager/RouletteManager.hpp"
 #include "../roulette/layers/RLRouletteLayer.hpp"
 
-#include <Geode/Geode.hpp>
 #include <Geode/modify/CreatorLayer.hpp>
 
 using namespace geode::prelude;

src/layers/LevelInfoLayer.cpp

@@ -3,7 +3,6 @@
 #include "../roulette/manager/RouletteManager.hpp"
 #include "../roulette/layers/RLRouletteLayer.hpp"
 
-#include <Geode/Geode.hpp>
 #include <Geode/modify/LevelInfoLayer.hpp>
 
 using namespace geode::prelude;