From b9e25d3aedc4daf71419d70ea14586a87ee10a43 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sun, 5 Mar 2023 23:33:21 +0000 Subject: [PATCH] Add varitemlist callabcks to all xfw app panes --- .../scenes/xtreme_app_scene_dolphin.c | 29 ++++++++++++-- .../scenes/xtreme_app_scene_graphics.c | 31 +++++++++++++-- .../scenes/xtreme_app_scene_protocols.c | 39 +++++++++++++++---- .../scenes/xtreme_app_scene_statusbar.c | 31 +++++++++++++-- 4 files changed, 114 insertions(+), 16 deletions(-) diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c index 2a4943e45..a157b269a 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c @@ -1,5 +1,15 @@ #include "../xtreme_app.h" +enum VarItemListIndex { + VarItemListIndexXpLevel, + VarItemListIndexButthurtTimer, +}; + +void xtreme_app_scene_dolphin_var_item_list_callback(void* context, uint32_t index) { + XtremeApp* app = context; + view_dispatcher_send_custom_event(app->view_dispatcher, index); +} + static void xtreme_app_scene_dolphin_xp_level_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); app->dolphin_level = variable_item_get_current_value_index(item) + 1; @@ -51,15 +61,28 @@ void xtreme_app_scene_dolphin_on_enter(void* context) { variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, butthurt_timer_names[value_index]); - variable_item_list_set_selected_item(var_item_list, 0); + variable_item_list_set_enter_callback( + var_item_list, xtreme_app_scene_dolphin_var_item_list_callback, app); + + variable_item_list_set_selected_item( + var_item_list, scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneDolphin)); view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList); } bool xtreme_app_scene_dolphin_on_event(void* context, SceneManagerEvent event) { - UNUSED(context); - UNUSED(event); + XtremeApp* app = context; bool consumed = false; + + if(event.type == SceneManagerEventTypeCustom) { + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneDolphin, event.event); + consumed = true; + switch(event.event) { + default: + break; + } + } + return consumed; } diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c index 4698a9d21..99a302a44 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c @@ -1,5 +1,17 @@ #include "../xtreme_app.h" +enum VarItemListIndex { + VarItemListIndexAssetPack, + VarItemListIndexAnimSpeed, + VarItemListIndexCycleAnims, + VarItemListIndexUnlockAnims, +}; + +void xtreme_app_scene_graphics_var_item_list_callback(void* context, uint32_t index) { + XtremeApp* app = context; + view_dispatcher_send_custom_event(app->view_dispatcher, index); +} + static void xtreme_app_scene_graphics_asset_pack_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); @@ -103,15 +115,28 @@ void xtreme_app_scene_graphics_on_enter(void* context) { variable_item_set_current_value_index(item, xtreme_settings->unlock_anims); variable_item_set_current_value_text(item, xtreme_settings->unlock_anims ? "ON" : "OFF"); - variable_item_list_set_selected_item(var_item_list, 0); + variable_item_list_set_enter_callback( + var_item_list, xtreme_app_scene_graphics_var_item_list_callback, app); + + variable_item_list_set_selected_item( + var_item_list, scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneGraphics)); view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList); } bool xtreme_app_scene_graphics_on_event(void* context, SceneManagerEvent event) { - UNUSED(context); - UNUSED(event); + XtremeApp* app = context; bool consumed = false; + + if(event.type == SceneManagerEventTypeCustom) { + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneGraphics, event.event); + consumed = true; + switch(event.event) { + default: + break; + } + } + return consumed; } 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 d0d8f5b29..c4d0b1250 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c @@ -1,6 +1,18 @@ #include "../xtreme_app.h" -static void xtreme_app_scene_protocols_bad_bk_mode_changed(VariableItem* item) { +enum VarItemListIndex { + VarItemListIndexBadkbMode, + VarItemListIndexBadbtRemember, + VarItemListIndexSubghzExtend, + VarItemListIndexSubghzBypass, +}; + +void xtreme_app_scene_protocols_var_item_list_callback(void* context, uint32_t index) { + XtremeApp* app = context; + view_dispatcher_send_custom_event(app->view_dispatcher, index); +} + +static void xtreme_app_scene_protocols_badkb_mode_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "BT" : "USB"); @@ -8,7 +20,7 @@ static void xtreme_app_scene_protocols_bad_bk_mode_changed(VariableItem* item) { app->save_settings = true; } -static void xtreme_app_scene_protocols_bad_bt_remember_changed(VariableItem* item) { +static void xtreme_app_scene_protocols_badbt_remember_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); @@ -37,7 +49,7 @@ void xtreme_app_scene_protocols_on_enter(void* context) { VariableItem* item; item = variable_item_list_add( - var_item_list, "BadKB Mode", 2, xtreme_app_scene_protocols_bad_bk_mode_changed, app); + var_item_list, "BadKB Mode", 2, xtreme_app_scene_protocols_badkb_mode_changed, app); variable_item_set_current_value_index(item, xtreme_settings->bad_bt); variable_item_set_current_value_text(item, xtreme_settings->bad_bt ? "BT" : "USB"); @@ -45,7 +57,7 @@ void xtreme_app_scene_protocols_on_enter(void* context) { var_item_list, "BadBT Rmembr", 2, - xtreme_app_scene_protocols_bad_bt_remember_changed, + xtreme_app_scene_protocols_badbt_remember_changed, app); 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"); @@ -60,15 +72,28 @@ void xtreme_app_scene_protocols_on_enter(void* context) { variable_item_set_current_value_index(item, app->subghz_bypass); variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF"); - variable_item_list_set_selected_item(var_item_list, 0); + variable_item_list_set_enter_callback( + var_item_list, xtreme_app_scene_protocols_var_item_list_callback, app); + + variable_item_list_set_selected_item( + var_item_list, scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocols)); view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList); } bool xtreme_app_scene_protocols_on_event(void* context, SceneManagerEvent event) { - UNUSED(context); - UNUSED(event); + XtremeApp* app = context; bool consumed = false; + + if(event.type == SceneManagerEventTypeCustom) { + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneProtocols, event.event); + consumed = true; + switch(event.event) { + default: + break; + } + } + return consumed; } diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c index 07f542be8..48d7e6484 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c @@ -1,5 +1,17 @@ #include "../xtreme_app.h" +enum VarItemListIndex { + VarItemListIndexBatteryIcon, + VarItemListIndexStatusIcons, + VarItemListIndexBarBorders, + VarItemListIndexbarBackground, +}; + +void xtreme_app_scene_statusbar_var_item_list_callback(void* context, uint32_t index) { + XtremeApp* app = context; + view_dispatcher_send_custom_event(app->view_dispatcher, index); +} + const char* const battery_icon_names[] = {"OFF", "Bar", "%", "Inv. %", "Retro 3", "Retro 5", "Bar %"}; static void xtreme_app_scene_statusbar_battery_icon_changed(VariableItem* item) { @@ -64,15 +76,28 @@ void xtreme_app_scene_statusbar_on_enter(void* context) { variable_item_set_current_value_index(item, xtreme_settings->bar_background); variable_item_set_current_value_text(item, xtreme_settings->bar_background ? "ON" : "OFF"); - variable_item_list_set_selected_item(var_item_list, 0); + variable_item_list_set_enter_callback( + var_item_list, xtreme_app_scene_statusbar_var_item_list_callback, app); + + variable_item_list_set_selected_item( + var_item_list, scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneStatusbar)); view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList); } bool xtreme_app_scene_statusbar_on_event(void* context, SceneManagerEvent event) { - UNUSED(context); - UNUSED(event); + XtremeApp* app = context; bool consumed = false; + + if(event.type == SceneManagerEventTypeCustom) { + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneStatusbar, event.event); + consumed = true; + switch(event.event) { + default: + break; + } + } + return consumed; }