From 2c1834f1f3ca9d4b703e53ecab654fd84aa0563d Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Sun, 4 Jun 2023 23:58:05 +0100 Subject: [PATCH] Add submenu indicator to xtreme app --- .../scenes/xtreme_app_scene_interface.c | 20 ++++++++++++++----- .../scenes/xtreme_app_scene_protocols.c | 3 ++- .../xtreme_app_scene_protocols_frequencies.c | 6 ++++-- .../scenes/xtreme_app_scene_start.c | 13 +++++++++--- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c index a033e4746..5e04fc4b8 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c @@ -16,12 +16,22 @@ void xtreme_app_scene_interface_var_item_list_callback(void* context, uint32_t i void xtreme_app_scene_interface_on_enter(void* context) { XtremeApp* app = context; VariableItemList* var_item_list = app->var_item_list; + VariableItem* item; - variable_item_list_add(var_item_list, "Graphics", 0, NULL, app); - variable_item_list_add(var_item_list, "Mainmenu", 0, NULL, app); - variable_item_list_add(var_item_list, "Lockscreen", 0, NULL, app); - variable_item_list_add(var_item_list, "Statusbar", 0, NULL, app); - variable_item_list_add(var_item_list, "Common", 0, NULL, app); + item = variable_item_list_add(var_item_list, "Graphics", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); + + item = variable_item_list_add(var_item_list, "Mainmenu", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); + + item = variable_item_list_add(var_item_list, "Lockscreen", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); + + item = variable_item_list_add(var_item_list, "Statusbar", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); + + item = variable_item_list_add(var_item_list, "Common", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_interface_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c index b1322b0da..497d3f1ec 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c @@ -55,7 +55,8 @@ void xtreme_app_scene_protocols_on_enter(void* context) { variable_item_set_current_value_index(item, xtreme_settings->bad_bt_remember); variable_item_set_current_value_text(item, xtreme_settings->bad_bt_remember ? "ON" : "OFF"); - variable_item_list_add(var_item_list, "SubGHz Frequencies", 0, NULL, app); + item = variable_item_list_add(var_item_list, "SubGHz Frequencies", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); item = variable_item_list_add( var_item_list, "SubGHz Extend", 2, xtreme_app_scene_protocols_subghz_extend_changed, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_frequencies.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_frequencies.c index 6b92d1eb0..668fe8327 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_frequencies.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_frequencies.c @@ -33,9 +33,11 @@ void xtreme_app_scene_protocols_frequencies_on_enter(void* context) { variable_item_set_current_value_index(item, app->subghz_use_defaults); variable_item_set_current_value_text(item, app->subghz_use_defaults ? "ON" : "OFF"); - variable_item_list_add(var_item_list, "Static Frequencies", 0, NULL, app); + item = variable_item_list_add(var_item_list, "Static Frequencies", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); - variable_item_list_add(var_item_list, "Hopper Frequencies", 0, NULL, app); + item = variable_item_list_add(var_item_list, "Hopper Frequencies", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_protocols_frequencies_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c index 7cb1153df..1f1c1de70 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c @@ -15,10 +15,17 @@ void xtreme_app_scene_start_var_item_list_callback(void* context, uint32_t index void xtreme_app_scene_start_on_enter(void* context) { XtremeApp* app = context; VariableItemList* var_item_list = app->var_item_list; + VariableItem* item; + + item = variable_item_list_add(var_item_list, "Interface", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); + + item = variable_item_list_add(var_item_list, "Protocols", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); + + item = variable_item_list_add(var_item_list, "Misc", 0, NULL, app); + variable_item_set_current_value_text(item, ">"); - variable_item_list_add(var_item_list, "Interface", 0, NULL, app); - variable_item_list_add(var_item_list, "Protocols", 0, NULL, app); - variable_item_list_add(var_item_list, "Misc", 0, NULL, app); variable_item_list_add(var_item_list, furi_string_get_cstr(app->version_tag), 0, NULL, app); variable_item_list_set_enter_callback(