Fixed selected item on back

ERSUCC · Aug 8, 2024 · 5222f2d · 5222f2d
1 parent 098eab4
commit 5222f2d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/scenes/insults_scene_saved.c b/scenes/insults_scene_saved.c
@@ -17,6 +17,18 @@ void insults_scene_saved_on_enter(void* context) {
             insults_app);
     }
 
+    unsigned int index =
+        scene_manager_get_scene_state(insults_app->scene_manager, InsultsSceneSaved);
+
+    if(index >= insults_app->saved_lines->num_lines) {
+        submenu_set_selected_item(
+            insults_app->saved_menu, insults_app->saved_lines->num_lines - 1);
+    }
+
+    else {
+        submenu_set_selected_item(insults_app->saved_menu, index);
+    }
+
     view_dispatcher_switch_to_view(insults_app->view_dispatcher, InsultsViewSaved);
 }
 
@@ -26,6 +38,8 @@ bool insults_scene_saved_on_event(void* context, SceneManagerEvent event) {
     if(event.type == SceneManagerEventTypeCustom) {
         insults_app->insult_string = strdup(insults_app->saved_lines->lines[event.event]);
 
+        scene_manager_set_scene_state(insults_app->scene_manager, InsultsSceneSaved, event.event);
+
         scene_manager_next_scene(insults_app->scene_manager, InsultsSceneSavedDetail);
 
         return true;

diff --git a/scenes/insults_scene_saved_detail.c b/scenes/insults_scene_saved_detail.c
@@ -27,7 +27,8 @@ void insults_scene_saved_detail_dialog_callback(DialogExResult result, void* con
 
     if(result == DialogExResultLeft) {
         insults_files_delete_insult(
-            insults_app->insults_files, submenu_get_selected_item(insults_app->saved_menu));
+            insults_app->insults_files,
+            scene_manager_get_scene_state(insults_app->scene_manager, InsultsSceneSaved));
 
         scene_manager_handle_back_event(insults_app->scene_manager);
     }

diff --git a/scenes/insults_scene_saved_detail.h b/scenes/insults_scene_saved_detail.h
@@ -4,7 +4,6 @@
 #include <gui/scene_manager.h>
 #include <gui/view_dispatcher.h>
 #include <gui/modules/dialog_ex.h>
-#include <gui/modules/submenu.h>
 #include <storage/storage.h>
 
 #include "../insults_app.h"

diff --git a/scenes/insults_scene_start.c b/scenes/insults_scene_start.c
@@ -11,12 +11,19 @@ bool insults_scene_start_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InsultsSceneStartIndexNew) {
+            scene_manager_set_scene_state(
+                insults_app->scene_manager, InsultsSceneStart, event.event);
+
             scene_manager_next_scene(insults_app->scene_manager, InsultsSceneInsult);
 
             return true;
         }
 
         if(event.event == InsultsSceneStartIndexSaved) {
+            scene_manager_set_scene_state(
+                insults_app->scene_manager, InsultsSceneStart, event.event);
+            scene_manager_set_scene_state(insults_app->scene_manager, InsultsSceneSaved, 0);
+
             scene_manager_next_scene(insults_app->scene_manager, InsultsSceneSaved);
 
             return true;