Merge pull request #3 from RayDeeUx/main

add mobile suppor for real this time

Author: wlagos3

.github/workflows/multi-platform.yml

@@ -18,6 +18,18 @@ jobs:
           - name: macOS
             os: macos-latest
 
+          - name: iOS
+            os: macos-latest
+            target: iOS
+
+          - name: Android32
+            os: ubuntu-latest
+            target: Android32
+
+          - name: Android64
+            os: ubuntu-latest
+            target: Android64
+
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
@@ -28,7 +40,6 @@ jobs:
         uses: geode-sdk/build-geode-mod@main
         with:
           bindings: geode-sdk/bindings
-          bindings-ref: main
           combine: true
           target: ${{ matrix.config.target }}
 

CMakeLists.txt

@@ -1,7 +1,11 @@
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
+	set(CMAKE_OSX_ARCHITECTURES "arm64")
+else()
+	set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 project(Attempt-Set VERSION 1.0.0)

mod.json

@@ -1,8 +1,10 @@
 {
-  "geode": "4.0.1",
+  "geode": "4.10.2",
   "gd": {
     "win": "2.2074",
-    "mac": "2.2074"
+    "mac": "2.2074",
+    "ios": "2.2074",
+    "android": "2.2074"
   },
   "id": "zsa.edit-attempts",
   "name": "Edit Attempts",
@@ -12,11 +14,7 @@
   "resources": {
     "sprites": ["resources/editAttemptsButton.png"]
   },
-  "dependencies": [
-    {
-      "id": "geode.node-ids",
-      "version": "1.17.0",
-      "importance": "required"
-    }
-  ]
+  "dependencies": {
+    "geode.node-ids": ">=1.17.0"
+  }
 }

src/main.cpp

@@ -32,38 +32,32 @@ class ModifyAttemptCountPopup : public geode::Popup<GJGameLevel*> {
         }
         void onSetButtonClick(CCObject* sender){
             if(inputNode->getString().empty()){return;}
-            try {
-                int val = std::stoi(inputNode->getString());
+            int val = geode::numFromString<int>(inputNode->getString()).unwrapOr(-1);
+            if (val > -1) {
                 setAttempts(val);
-                this->removeMeAndCleanup();
-            } catch (const std::invalid_argument& e) {
-                log::warn("Input is not a valid integer");
-            } catch (const std::out_of_range& e) {
-                log::warn("Input is out of range");
+                this->onClose(nullptr);
+            } else {
+                geode::Notification::create("Input is not a valid number", NotificationIcon::Error, 2.f)->show();
             }
         }
         void onPlusButtonClick(CCObject* sender){
             if(inputNode->getString().empty()){return;}
-            try {
-                int val = std::stoi(inputNode->getString());
+            int val = geode::numFromString<int>(inputNode->getString()).unwrapOr(-1);
+            if (val > -1) {
                 addAttempts(val);
-                this->removeMeAndCleanup();
-            } catch (const std::invalid_argument& e) {
-                log::warn("Input is not a valid integer");
-            } catch (const std::out_of_range& e) {
-                log::warn("Input is out of range");
+                this->onClose(nullptr);
+            } else {
+                geode::Notification::create("Input is not a valid number", NotificationIcon::Error, 2.f)->show();
             }
         }
         void onMinusButtonClick(CCObject* sender){
             if(inputNode->getString().empty()){return;}
-            try {
-                int val = std::stoi(inputNode->getString());
+            int val = geode::numFromString<int>(inputNode->getString()).unwrapOr(-1);
+            if (val > -1) {
                 subtractAttempts(val);
-                this->removeMeAndCleanup();
-            } catch (const std::invalid_argument& e) {
-                log::warn("Input is not a valid integer");
-            } catch (const std::out_of_range& e) {
-                log::warn("Input is out of range");
+                this->onClose(nullptr);
+            } else {
+                geode::Notification::create("Input is not a valid number", NotificationIcon::Error, 2.f)->show();
             }
         }
         bool setup(GJGameLevel* level) override {
@@ -75,8 +69,8 @@ class ModifyAttemptCountPopup : public geode::Popup<GJGameLevel*> {
             auto menu = CCMenu::create();
 
             auto input = CCTextInputNode::create(100, 100, "Attempts", "bigFont.fnt");
-                       input->setScale(0.75);
-            input->setPosition(CCPoint(272.5, 170 ));
+            input->setScale(0.75);
+            input->setPosition(CCPoint(this->m_mainLayer->getContentWidth() / 2.f, 170 ));
             input->setAllowedChars("0123456789");
             inputNode = input;