Add ClockMod Settings Button to Main Menu, for quicker access

michael-r-elp · michael-r-elp · commit 262002bcc333 · 2025-09-03T21:06:33.000+02:00
diff --git a/include/ClockViewController.hpp b/include/ClockViewController.hpp
@@ -6,11 +6,12 @@
 
 DECLARE_CLASS_CODEGEN(ClockMod, ClockViewController, HMUI::ViewController) {
 
-    DECLARE_OVERRIDE_METHOD(void, DidActivate, il2cpp_utils::FindMethodUnsafe("HMUI", "ViewController", "DidActivate", 3), bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling);
-    DECLARE_OVERRIDE_METHOD(void, DidDeactivate, il2cpp_utils::FindMethodUnsafe("HMUI", "ViewController", "DidDeactivate", 2), bool removedFromHierarchy, bool systemScreenDisabling);
+    DECLARE_OVERRIDE_METHOD_MATCH(void, DidActivate, &HMUI::ViewController::DidActivate, bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling);
+    DECLARE_OVERRIDE_METHOD_MATCH(void, DidDeactivate, &HMUI::ViewController::DidDeactivate, bool removedFromHierarchy, bool systemScreenDisabling);
 
     DECLARE_INSTANCE_FIELD(BSML::ModalColorPicker*, ColorPicker);
     DECLARE_INSTANCE_FIELD(HMUI::CurvedTextMeshPro*, TimeInfo);
+    DECLARE_INSTANCE_FIELD(UnityEngine::Coroutine*, timeInfoRoutine);
 
     custom_types::Helpers::Coroutine UpdateTimeText();
     bool SettingsOpen;
diff --git a/qpm.json b/qpm.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",
   "version": "0.4.0",
   "sharedDir": "shared",
   "dependenciesDir": "extern",
@@ -22,7 +21,7 @@
         "pwsh build.ps1 -clean"
       ]
     },
-    "ndk": "^27.3.13750724",
+    "ndk": "^27.2.12479018",
     "qmodIncludeDirs": [
       "build",
       "extern/libs"
@@ -75,4 +74,4 @@
       }
     }
   ]
-}
+}
diff --git a/qpm.shared.json b/qpm.shared.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json",
   "config": {
     "version": "0.4.0",
     "sharedDir": "shared",
@@ -23,7 +22,7 @@
           "pwsh build.ps1 -clean"
         ]
       },
-      "ndk": "^27.3.13750724",
+      "ndk": "^27.2.12479018",
       "qmodIncludeDirs": [
         "build",
         "extern/libs"
diff --git a/src/ClockViewContoller.cpp b/src/ClockViewContoller.cpp
@@ -138,23 +138,22 @@ namespace ClockMod {
     //        BeatSaberUI::AddHoverHint(AddConfigValueIncrementFloat(parent, getModConfig().ClockYOffset, 1, 0.1f, -10.0f, 10.0f)->get_gameObject(), "Offsets the Y (Up/Down) Position of the Clock");
     //        BeatSaberUI::AddHoverHint(AddConfigValueIncrementFloat(parent, getModConfig().ClockZOffset, 1, 0.1f, -10.0f, 10.0f)->get_gameObject(), "Offsets the Z (Forward/Backward) Position of the Clock");
 
-            //BeatSaberUI::CreateColorPicker(parent, getModConfig().ClockColor.GetName(), getModConfig().ClockColor.GetValue(),
-            //    [](UnityEngine::Color value, GlobalNamespace::ColorChangeUIEventType eventType) {
-            //        getModConfig().ClockColor.SetValue(value);
-            //    });
-
             if (ColorPicker)
                 BSML::Lite::CreateUIButton(parent, "Change ClockColor", [this] {
                     ColorPicker->modalView->Show();
                     }
                 );
 
         }
-        StartCoroutine(custom_types::Helpers::CoroutineHelper::New(UpdateTimeText()));
+        timeInfoRoutine = StartCoroutine(custom_types::Helpers::CoroutineHelper::New(UpdateTimeText()));
     }
     void ClockViewController::DidDeactivate(bool removedFromHierarchy, bool systemScreenDisabling) {
         SettingsOpen = false;
-        StopAllCoroutines();
+        if (timeInfoRoutine) {
+            StopCoroutine(timeInfoRoutine);
+            timeInfoRoutine = nullptr;
+        }
+        // StopAllCoroutines();
         //Config.InSettings = false;
     }
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -550,6 +550,7 @@ MOD_EXPORT void late_load() {
 
     custom_types::Register::AutoRegister();
     BSML::Register::RegisterSettingsMenu<ClockMod::ClockViewController*>("ClockMod");
+    BSML::Register::RegisterMainMenu<ClockMod::ClockViewController*>("ClockMod", "ClockMod", "Open the ClockMod Settings");
 
     if (timeinfo && (timeinfo->tm_mon == 2 && timeinfo->tm_mday == 31) || (timeinfo->tm_mon == 3 && timeinfo->tm_mday == 1)) {
         INSTALL_HOOK(hkLog, ResultsViewController_DidActivate);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",`
`3`	`2`	`"version": "0.4.0",`
`4`	`3`	`"sharedDir": "shared",`
`5`	`4`	`"dependenciesDir": "extern",`
`@@ -22,7 +21,7 @@`
`22`	`21`	`"pwsh build.ps1 -clean"`
`23`	`22`	`]`
`24`	`23`	`},`
`25`		`- "ndk": "^27.3.13750724",`
	`24`	`+ "ndk": "^27.2.12479018",`
`26`	`25`	`"qmodIncludeDirs": [`
`27`	`26`	`"build",`
`28`	`27`	`"extern/libs"`
`@@ -75,4 +74,4 @@`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`	`]`
`78`		`-}`
	`77`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json",`
`3`	`2`	`"config": {`
`4`	`3`	`"version": "0.4.0",`
`5`	`4`	`"sharedDir": "shared",`
`@@ -23,7 +22,7 @@`
`23`	`22`	`"pwsh build.ps1 -clean"`
`24`	`23`	`]`
`25`	`24`	`},`
`26`		`- "ndk": "^27.3.13750724",`
	`25`	`+ "ndk": "^27.2.12479018",`
`27`	`26`	`"qmodIncludeDirs": [`
`28`	`27`	`"build",`
`29`	`28`	`"extern/libs"`
Original file line number	Diff line number	Diff line change
`@@ -138,23 +138,22 @@ namespace ClockMod {`
`138`	`138`	`// BeatSaberUI::AddHoverHint(AddConfigValueIncrementFloat(parent, getModConfig().ClockYOffset, 1, 0.1f, -10.0f, 10.0f)->get_gameObject(), "Offsets the Y (Up/Down) Position of the Clock");`
`139`	`139`	`// BeatSaberUI::AddHoverHint(AddConfigValueIncrementFloat(parent, getModConfig().ClockZOffset, 1, 0.1f, -10.0f, 10.0f)->get_gameObject(), "Offsets the Z (Forward/Backward) Position of the Clock");`
`140`	`140`
`141`		`- //BeatSaberUI::CreateColorPicker(parent, getModConfig().ClockColor.GetName(), getModConfig().ClockColor.GetValue(),`
`142`		`- // [](UnityEngine::Color value, GlobalNamespace::ColorChangeUIEventType eventType) {`
`143`		`- // getModConfig().ClockColor.SetValue(value);`
`144`		`- // });`
`145`		`-`
`146`	`141`	`if (ColorPicker)`
`147`	`142`	`BSML::Lite::CreateUIButton(parent, "Change ClockColor", [this] {`
`148`	`143`	`ColorPicker->modalView->Show();`
`149`	`144`	`}`
`150`	`145`	`);`
`151`	`146`
`152`	`147`	`}`
`153`		`- StartCoroutine(custom_types::Helpers::CoroutineHelper::New(UpdateTimeText()));`
	`148`	`+ timeInfoRoutine = StartCoroutine(custom_types::Helpers::CoroutineHelper::New(UpdateTimeText()));`
`154`	`149`	`}`
`155`	`150`	`void ClockViewController::DidDeactivate(bool removedFromHierarchy, bool systemScreenDisabling) {`
`156`	`151`	`SettingsOpen = false;`
`157`		`- StopAllCoroutines();`
	`152`	`+ if (timeInfoRoutine) {`
	`153`	`+ StopCoroutine(timeInfoRoutine);`
	`154`	`+ timeInfoRoutine = nullptr;`
	`155`	`+ }`
	`156`	`+ // StopAllCoroutines();`
`158`	`157`	`//Config.InSettings = false;`
`159`	`158`	`}`
`160`	`159`	`}`