UartTerminal: Fix scenes

uart_terminal/scenes/uart_terminal_scene_hex_input.c

@@ -32,7 +32,7 @@ bool uart_terminal_scene_hex_input_on_event(void* context, SceneManagerEvent eve
         if(event.event == UART_TerminalEventStartConsole) {
             // Point to custom string to send
             app->selected_tx_string = app->text_input_store;
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewConsoleOutput);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneConsoleOutput);
             consumed = true;
         }
     }

uart_terminal/scenes/uart_terminal_scene_setup.c

@@ -65,7 +65,7 @@ static void uart_terminal_scene_setup_var_list_change_callback(VariableItem* ite
 
 void uart_terminal_scene_setup_on_enter(void* context) {
     UART_TerminalApp* app = context;
-    VariableItemList* var_item_list = app->setup_var_item_list;
+    VariableItemList* var_item_list = app->var_item_list;
 
     variable_item_list_set_enter_callback(
         var_item_list, uart_terminal_scene_setup_var_list_enter_callback, app);
@@ -86,7 +86,7 @@ void uart_terminal_scene_setup_on_enter(void* context) {
     variable_item_list_set_selected_item(
         var_item_list, scene_manager_get_scene_state(app->scene_manager, UART_TerminalSceneSetup));
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, UART_TerminalAppViewSetup);
+    view_dispatcher_switch_to_view(app->view_dispatcher, UART_TerminalAppViewVarItemList);
 }
 
 bool uart_terminal_scene_setup_on_event(void* context, SceneManagerEvent event) {
@@ -97,7 +97,7 @@ bool uart_terminal_scene_setup_on_event(void* context, SceneManagerEvent event)
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {
-        app->setup_selected_menu_index = variable_item_list_get_selected_item_index(app->setup_var_item_list);
+        app->setup_selected_menu_index = variable_item_list_get_selected_item_index(app->var_item_list);
         consumed = true;
     }
 
@@ -106,5 +106,5 @@ bool uart_terminal_scene_setup_on_event(void* context, SceneManagerEvent event)
 
 void uart_terminal_scene_setup_on_exit(void* context) {
     UART_TerminalApp* app = context;
-    variable_item_list_reset(app->setup_var_item_list);
+    variable_item_list_reset(app->var_item_list);
 }

uart_terminal/scenes/uart_terminal_scene_start.c

@@ -148,23 +148,23 @@ bool uart_terminal_scene_start_on_event(void* context, SceneManagerEvent event)
         if(event.event == UART_TerminalEventSetup) {
             scene_manager_set_scene_state(
                 app->scene_manager, UART_TerminalSceneStart, app->selected_menu_index);
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewSetup);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneSetup);
         } else if(event.event == UART_TerminalEventStartKeyboardText) {
             scene_manager_set_scene_state(
                 app->scene_manager, UART_TerminalSceneStart, app->selected_menu_index);
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewTextInput);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneTextInput);
         } else if(event.event == UART_TerminalEventStartKeyboardHex) {
             scene_manager_set_scene_state(
                 app->scene_manager, UART_TerminalSceneStart, app->selected_menu_index);
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewHexInput);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneHexInput);
         } else if(event.event == UART_TerminalEventStartConsole) {
             scene_manager_set_scene_state(
                 app->scene_manager, UART_TerminalSceneStart, app->selected_menu_index);
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewConsoleOutput);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneConsoleOutput);
         } else if(event.event == UART_TerminalEventStartHelp) {
             scene_manager_set_scene_state(
                 app->scene_manager, UART_TerminalSceneStart, app->selected_menu_index);
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewHelp);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneHelp);
         }
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {

uart_terminal/scenes/uart_terminal_scene_text_input.c

@@ -53,7 +53,7 @@ bool uart_terminal_scene_text_input_on_event(void* context, SceneManagerEvent ev
         if(event.event == UART_TerminalEventStartConsole) {
             // Point to custom string to send
             app->selected_tx_string = app->text_input_store;
-            scene_manager_next_scene(app->scene_manager, UART_TerminalAppViewConsoleOutput);
+            scene_manager_next_scene(app->scene_manager, UART_TerminalSceneConsoleOutput);
             consumed = true;
         }
     }

uart_terminal/uart_terminal_app.c

@@ -50,12 +50,6 @@ UART_TerminalApp* uart_terminal_app_alloc() {
         app->selected_option_index[i] = 0;
     }
 
-    app->setup_var_item_list = variable_item_list_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher,
-        UART_TerminalAppViewSetup,
-        variable_item_list_get_view(app->setup_var_item_list));
-
     for(int i = 0; i < SETUP_MENU_ITEMS; ++i) {
         app->setup_selected_option_index[i] = 0;
     }
@@ -89,14 +83,12 @@ void uart_terminal_app_free(UART_TerminalApp* app) {
 
     // Views
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewVarItemList);
-    view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewSetup);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewHelp);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewConsoleOutput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewTextInput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewHexInput);
 
     variable_item_list_free(app->var_item_list);
-    variable_item_list_free(app->setup_var_item_list);
     widget_free(app->widget);
     text_box_free(app->text_box);
     furi_string_free(app->text_box_store);

uart_terminal/uart_terminal_app_i.h

@@ -33,7 +33,6 @@ struct UART_TerminalApp {
     ByteInput* hex_input;
     Widget* widget;
     VariableItemList* var_item_list;
-    VariableItemList* setup_var_item_list;
     UART_TerminalUart* uart;
 
     int setup_selected_menu_index;
@@ -54,7 +53,6 @@ struct UART_TerminalApp {
 
 typedef enum {
     UART_TerminalAppViewVarItemList,
-    UART_TerminalAppViewSetup,
     UART_TerminalAppViewConsoleOutput,
     UART_TerminalAppViewTextInput,
     UART_TerminalAppViewHexInput,