Move dolphin options to own submenu

applications/main/xtreme_app/scenes/xtreme_app_scene_config.h

@@ -13,4 +13,5 @@ ADD_SCENE(xtreme_app, protocols_frequencies_hopper, ProtocolsFrequenciesHopper)
 ADD_SCENE(xtreme_app, protocols_frequencies_add, ProtocolsFrequenciesAdd)
 ADD_SCENE(xtreme_app, misc, Misc)
 ADD_SCENE(xtreme_app, misc_screen, MiscScreen)
+ADD_SCENE(xtreme_app, misc_dolphin, MiscDolphin)
 ADD_SCENE(xtreme_app, misc_rename, MiscRename)

applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c

@@ -2,10 +2,8 @@
 
 enum VarItemListIndex {
     VarItemListIndexScreen,
+    VarItemListIndexDolphin,
     VarItemListIndexChangeDeviceName,
-    VarItemListIndexDolphinLevel,
-    VarItemListIndexDolphinAngry,
-    VarItemListIndexButthurtTimer,
     VarItemListIndexChargeCap,
 };
 
@@ -14,37 +12,6 @@ void xtreme_app_scene_misc_var_item_list_callback(void* context, uint32_t index)
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
 
-static void xtreme_app_scene_misc_dolphin_level_changed(VariableItem* item) {
-    XtremeApp* app = variable_item_get_context(item);
-    app->dolphin_level = variable_item_get_current_value_index(item) + 1;
-    char level_str[4];
-    snprintf(level_str, 4, "%li", app->dolphin_level);
-    variable_item_set_current_value_text(item, level_str);
-    app->save_level = true;
-}
-
-static void xtreme_app_scene_misc_dolphin_angry_changed(VariableItem* item) {
-    XtremeApp* app = variable_item_get_context(item);
-    app->dolphin_angry = variable_item_get_current_value_index(item);
-    char angry_str[4];
-    snprintf(angry_str, 4, "%li", app->dolphin_angry);
-    variable_item_set_current_value_text(item, angry_str);
-    app->save_angry = true;
-}
-
-const char* const butthurt_timer_names[] =
-    {"OFF", "30 M", "1 H", "2 H", "4 H", "6 H", "8 H", "12 H", "24 H", "48 H"};
-const uint32_t butthurt_timer_values[COUNT_OF(butthurt_timer_names)] =
-    {0, 1800, 3600, 7200, 14400, 21600, 28800, 43200, 86400, 172800};
-static void xtreme_app_scene_misc_butthurt_timer_changed(VariableItem* item) {
-    XtremeApp* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, butthurt_timer_names[index]);
-    XTREME_SETTINGS()->butthurt_timer = butthurt_timer_values[index];
-    app->save_settings = true;
-    app->require_reboot = true;
-}
-
 #define CHARGE_CAP_INTV 5
 static void xtreme_app_scene_misc_charge_cap_changed(VariableItem* item) {
     XtremeApp* app = variable_item_get_context(item);
@@ -66,41 +33,11 @@ void xtreme_app_scene_misc_on_enter(void* context) {
     item = variable_item_list_add(var_item_list, "Screen", 0, NULL, app);
     variable_item_set_current_value_text(item, ">");
 
+    item = variable_item_list_add(var_item_list, "Dolphin", 0, NULL, app);
+    variable_item_set_current_value_text(item, ">");
+
     variable_item_list_add(var_item_list, "Change Device Name", 0, NULL, app);
 
-    char level_str[4];
-    snprintf(level_str, 4, "%li", app->dolphin_level);
-    item = variable_item_list_add(
-        var_item_list,
-        "Dolphin Level",
-        DOLPHIN_LEVEL_COUNT + 1,
-        xtreme_app_scene_misc_dolphin_level_changed,
-        app);
-    variable_item_set_current_value_index(item, app->dolphin_level - 1);
-    variable_item_set_current_value_text(item, level_str);
-
-    char angry_str[4];
-    snprintf(angry_str, 4, "%li", app->dolphin_angry);
-    item = variable_item_list_add(
-        var_item_list,
-        "Dolphin Angry",
-        BUTTHURT_MAX + 1,
-        xtreme_app_scene_misc_dolphin_angry_changed,
-        app);
-    variable_item_set_current_value_index(item, app->dolphin_angry);
-    variable_item_set_current_value_text(item, angry_str);
-
-    item = variable_item_list_add(
-        var_item_list,
-        "Butthurt Timer",
-        COUNT_OF(butthurt_timer_names),
-        xtreme_app_scene_misc_butthurt_timer_changed,
-        app);
-    value_index = value_index_uint32(
-        xtreme_settings->butthurt_timer, butthurt_timer_values, COUNT_OF(butthurt_timer_values));
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, butthurt_timer_names[value_index]);
-
     char cap_str[6];
     value_index = xtreme_settings->charge_cap / CHARGE_CAP_INTV;
     snprintf(cap_str, 6, "%lu%%", (uint32_t)value_index * CHARGE_CAP_INTV);
@@ -133,6 +70,9 @@ bool xtreme_app_scene_misc_on_event(void* context, SceneManagerEvent event) {
         case VarItemListIndexScreen:
             scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscScreen);
             break;
+        case VarItemListIndexDolphin:
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscDolphin);
+            break;
         case VarItemListIndexChangeDeviceName:
             scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscRename);
             break;

applications/main/xtreme_app/scenes/xtreme_app_scene_misc_dolphin.c

@@ -0,0 +1,114 @@
+#include "../xtreme_app.h"
+
+enum VarItemListIndex {
+    VarItemListIndexDolphinLevel,
+    VarItemListIndexDolphinAngry,
+    VarItemListIndexButthurtTimer,
+};
+
+void xtreme_app_scene_misc_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_misc_dolphin_dolphin_level_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
+    app->dolphin_level = variable_item_get_current_value_index(item) + 1;
+    char level_str[4];
+    snprintf(level_str, 4, "%li", app->dolphin_level);
+    variable_item_set_current_value_text(item, level_str);
+    app->save_level = true;
+}
+
+static void xtreme_app_scene_misc_dolphin_dolphin_angry_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
+    app->dolphin_angry = variable_item_get_current_value_index(item);
+    char angry_str[4];
+    snprintf(angry_str, 4, "%li", app->dolphin_angry);
+    variable_item_set_current_value_text(item, angry_str);
+    app->save_angry = true;
+}
+
+const char* const butthurt_timer_names[] =
+    {"OFF", "30 M", "1 H", "2 H", "4 H", "6 H", "8 H", "12 H", "24 H", "48 H"};
+const uint32_t butthurt_timer_values[COUNT_OF(butthurt_timer_names)] =
+    {0, 1800, 3600, 7200, 14400, 21600, 28800, 43200, 86400, 172800};
+static void xtreme_app_scene_misc_dolphin_butthurt_timer_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    variable_item_set_current_value_text(item, butthurt_timer_names[index]);
+    XTREME_SETTINGS()->butthurt_timer = butthurt_timer_values[index];
+    app->save_settings = true;
+    app->require_reboot = true;
+}
+
+void xtreme_app_scene_misc_dolphin_on_enter(void* context) {
+    XtremeApp* app = context;
+    XtremeSettings* xtreme_settings = XTREME_SETTINGS();
+    VariableItemList* var_item_list = app->var_item_list;
+    VariableItem* item;
+    uint8_t value_index;
+
+    char level_str[4];
+    snprintf(level_str, 4, "%li", app->dolphin_level);
+    item = variable_item_list_add(
+        var_item_list,
+        "Dolphin Level",
+        DOLPHIN_LEVEL_COUNT + 1,
+        xtreme_app_scene_misc_dolphin_dolphin_level_changed,
+        app);
+    variable_item_set_current_value_index(item, app->dolphin_level - 1);
+    variable_item_set_current_value_text(item, level_str);
+
+    char angry_str[4];
+    snprintf(angry_str, 4, "%li", app->dolphin_angry);
+    item = variable_item_list_add(
+        var_item_list,
+        "Dolphin Angry",
+        BUTTHURT_MAX + 1,
+        xtreme_app_scene_misc_dolphin_dolphin_angry_changed,
+        app);
+    variable_item_set_current_value_index(item, app->dolphin_angry);
+    variable_item_set_current_value_text(item, angry_str);
+
+    item = variable_item_list_add(
+        var_item_list,
+        "Butthurt Timer",
+        COUNT_OF(butthurt_timer_names),
+        xtreme_app_scene_misc_dolphin_butthurt_timer_changed,
+        app);
+    value_index = value_index_uint32(
+        xtreme_settings->butthurt_timer, butthurt_timer_values, COUNT_OF(butthurt_timer_values));
+    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_enter_callback(
+        var_item_list, xtreme_app_scene_misc_dolphin_var_item_list_callback, app);
+
+    variable_item_list_set_selected_item(
+        var_item_list,
+        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneMiscDolphin));
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
+}
+
+bool xtreme_app_scene_misc_dolphin_on_event(void* context, SceneManagerEvent event) {
+    XtremeApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneMiscDolphin, event.event);
+        consumed = true;
+        switch(event.event) {
+        default:
+            break;
+        }
+    }
+
+    return consumed;
+}
+
+void xtreme_app_scene_misc_dolphin_on_exit(void* context) {
+    XtremeApp* app = context;
+    variable_item_list_reset(app->var_item_list);
+}