Skip to content

Commit 6335d14

Browse files
committed
Latest Release RM0305-1123-0.99.1-a8e557f on PATREON & GitHub - ADD JS SUBMENU
1 parent 6eab7d7 commit 6335d14

File tree

4 files changed

+166
-0
lines changed

4 files changed

+166
-0
lines changed

ReadMe.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ This software is for experimental purposes only and is not meant for any illegal
3333
- Last Synced/Checked Unleashed, changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2024-03-05 19:55 EST`
3434
- [Quick fix for rgb (By HaxSam)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/5bb4ab3a021a24406f7d3a996a119c3e2ea5dd87)
3535
- [Add is_connected api for expansion (By HaxSam)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/2f4186322bcd1899703fa22daeda29d554c3be2b)
36+
- [JS: Added Submenu support (By Spooks4576)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/5bb4ab3a021a24406f7d3a996a119c3e2ea5dd87)
3637

3738
<a name="release">
3839

applications/system/js_app/application.fam

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,11 @@ App(
6767
requires=["js_app"],
6868
sources=["modules/js_usbdisk/*.c"],
6969
)
70+
71+
App(
72+
appid="js_submenu",
73+
apptype=FlipperAppType.PLUGIN,
74+
entry_point="js_submenu_ep",
75+
requires=["js_app"],
76+
sources=["modules/js_submenu.c"],
77+
)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
let submenu = require("submenu");
2+
3+
submenu.addItem("Item 1", 0);
4+
submenu.addItem("Item 2", 1);
5+
submenu.addItem("Item 3", 2);
6+
7+
submenu.setHeader("Select an option:");
8+
9+
let result = submenu.show();
10+
11+
print("Result: ", result);
Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
#include <gui/modules/submenu.h>
2+
#include <gui/view_dispatcher.h>
3+
#include <gui/view.h>
4+
#include "../js_modules.h"
5+
6+
typedef struct {
7+
Submenu* submenu;
8+
ViewDispatcher* view_dispatcher;
9+
uint32_t result;
10+
} JsSubmenuInst;
11+
12+
static JsSubmenuInst* get_this_ctx(struct mjs* mjs) {
13+
mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
14+
JsSubmenuInst* storage = mjs_get_ptr(mjs, obj_inst);
15+
furi_assert(storage);
16+
return storage;
17+
}
18+
19+
static void ret_bad_args(struct mjs* mjs, const char* error) {
20+
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
21+
mjs_return(mjs, MJS_UNDEFINED);
22+
}
23+
24+
static bool check_arg_count(struct mjs* mjs, size_t count) {
25+
size_t num_args = mjs_nargs(mjs);
26+
if(num_args != count) {
27+
ret_bad_args(mjs, "Wrong argument count");
28+
return false;
29+
}
30+
return true;
31+
}
32+
33+
static bool get_str_arg(struct mjs* mjs, size_t index, const char** value) {
34+
mjs_val_t str_obj = mjs_arg(mjs, index);
35+
if(!mjs_is_string(str_obj)) {
36+
ret_bad_args(mjs, "Argument must be a string");
37+
return false;
38+
}
39+
size_t str_len = 0;
40+
*value = mjs_get_string(mjs, &str_obj, &str_len);
41+
if((str_len == 0) || (*value == NULL)) {
42+
ret_bad_args(mjs, "Bad string argument");
43+
return false;
44+
}
45+
return true;
46+
}
47+
48+
static int32_t get_int_arg(struct mjs* mjs, size_t index, int32_t* value) {
49+
mjs_val_t int_obj = mjs_arg(mjs, index);
50+
if(!mjs_is_number(int_obj)) {
51+
ret_bad_args(mjs, "Argument must be a number");
52+
return false;
53+
}
54+
*value = mjs_get_int32(mjs, int_obj);
55+
return true;
56+
}
57+
58+
static void submenu_callback(void* context, uint32_t id) {
59+
UNUSED(id);
60+
JsSubmenuInst* submenu = context;
61+
submenu->result = id;
62+
view_dispatcher_stop(submenu->view_dispatcher);
63+
}
64+
65+
static void js_submenu_add_item(struct mjs* mjs) {
66+
JsSubmenuInst* submenu = get_this_ctx(mjs);
67+
if(!check_arg_count(mjs, 2)) return;
68+
69+
const char* label;
70+
if(!get_str_arg(mjs, 0, &label)) return;
71+
72+
int32_t id;
73+
if(!get_int_arg(mjs, 1, &id)) return;
74+
75+
submenu_add_item(submenu->submenu, label, id, submenu_callback, submenu);
76+
77+
mjs_return(mjs, MJS_UNDEFINED);
78+
}
79+
80+
static void js_submenu_set_header(struct mjs* mjs) {
81+
JsSubmenuInst* submenu = get_this_ctx(mjs);
82+
if(!check_arg_count(mjs, 1)) return;
83+
84+
const char* header;
85+
if(!get_str_arg(mjs, 0, &header)) return;
86+
87+
submenu_set_header(submenu->submenu, header);
88+
89+
mjs_return(mjs, MJS_UNDEFINED);
90+
}
91+
92+
static void js_submenu_show(struct mjs* mjs) {
93+
JsSubmenuInst* submenu = get_this_ctx(mjs);
94+
if(!check_arg_count(mjs, 0)) return;
95+
submenu->result = 0;
96+
97+
view_dispatcher_attach_to_gui(
98+
submenu->view_dispatcher, furi_record_open(RECORD_GUI), ViewDispatcherTypeFullscreen);
99+
furi_record_close(RECORD_GUI);
100+
101+
view_dispatcher_switch_to_view(submenu->view_dispatcher, 0);
102+
103+
view_dispatcher_run(submenu->view_dispatcher);
104+
105+
submenu_reset(submenu->submenu);
106+
107+
mjs_return(mjs, mjs_mk_number(mjs, submenu->result));
108+
}
109+
110+
static void* js_submenu_create(struct mjs* mjs, mjs_val_t* object) {
111+
JsSubmenuInst* submenu = malloc(sizeof(JsSubmenuInst));
112+
mjs_val_t submenu_obj = mjs_mk_object(mjs);
113+
mjs_set(mjs, submenu_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, submenu));
114+
mjs_set(mjs, submenu_obj, "addItem", ~0, MJS_MK_FN(js_submenu_add_item));
115+
mjs_set(mjs, submenu_obj, "setHeader", ~0, MJS_MK_FN(js_submenu_set_header));
116+
mjs_set(mjs, submenu_obj, "show", ~0, MJS_MK_FN(js_submenu_show));
117+
submenu->submenu = submenu_alloc();
118+
submenu->view_dispatcher = view_dispatcher_alloc();
119+
view_dispatcher_enable_queue(submenu->view_dispatcher);
120+
view_dispatcher_add_view(submenu->view_dispatcher, 0, submenu_get_view(submenu->submenu));
121+
*object = submenu_obj;
122+
return submenu;
123+
}
124+
125+
static void js_submenu_destroy(void* inst) {
126+
JsSubmenuInst* submenu = inst;
127+
submenu_free(submenu->submenu);
128+
view_dispatcher_free(submenu->view_dispatcher);
129+
free(submenu);
130+
}
131+
132+
static const JsModuleDescriptor js_submenu_desc = {
133+
"submenu",
134+
js_submenu_create,
135+
js_submenu_destroy,
136+
};
137+
138+
static const FlipperAppPluginDescriptor submenu_plugin_descriptor = {
139+
.appid = PLUGIN_APP_ID,
140+
.ep_api_version = PLUGIN_API_VERSION,
141+
.entry_point = &js_submenu_desc,
142+
};
143+
144+
const FlipperAppPluginDescriptor* js_submenu_ep(void) {
145+
return &submenu_plugin_descriptor;
146+
}

0 commit comments

Comments
 (0)