misc tweaks

Next-Flip · Jan 12, 2025 · 3ef4488 · 3ef4488
1 parent 08d342a
commit 3ef4488
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/applications/main/infrared/scenes/infrared_scene_learn.c b/applications/main/infrared/scenes/infrared_scene_learn.c
@@ -15,7 +15,7 @@ static void infrared_scene_learn_dialog_result_callback(DialogExResult result, v
 static void infrared_scene_learn_update_button_name(InfraredApp* infrared, bool increment) {
     DialogEx* dialog_ex = infrared->dialog_ex;
     int32_t button_index;
-    
+
     if(infrared->app_state.is_learning_new_remote) {
         // For new remotes, use current_button_index directly
         button_index = infrared->app_state.current_button_index;
@@ -80,7 +80,8 @@ void infrared_scene_learn_on_enter(void* context) {
         infrared_scene_learn_update_button_name(infrared, false);
         dialog_ex_set_icon(dialog_ex, 0, 22, &I_InfraredLearnShort_128x31);
         // Only show skip if not at last button
-        if(infrared->app_state.current_button_index + 1 < (int32_t)COUNT_OF(easy_mode_button_names)) {
+        if(infrared->app_state.current_button_index + 1 <
+           (int32_t)COUNT_OF(easy_mode_button_names)) {
             dialog_ex_set_center_button_text(dialog_ex, "Skip");
         }
     } else {
@@ -125,7 +126,7 @@ bool infrared_scene_learn_on_event(void* context, SceneManagerEvent event) {
 
 void infrared_scene_learn_on_exit(void* context) {
     InfraredApp* infrared = context;
-    
+
     // Reset dialog
     dialog_ex_reset(infrared->dialog_ex);
 

diff --git a/applications/main/infrared/scenes/infrared_scene_learn_enter_name.c b/applications/main/infrared/scenes/infrared_scene_learn_enter_name.c
@@ -7,7 +7,6 @@ static const char* const easy_mode_button_names[] = {"Power", "Vol_up", "Vol_dn"
                                                      "Pause", "Stop",   "Prev",   "Next",  "Rew",
                                                      "FF",    "Exit",   "Menu"};
 
-
 void infrared_scene_learn_enter_name_on_enter(void* context) {
     InfraredApp* infrared = context;
     TextInput* text_input = infrared->text_input;

diff --git a/applications/main/infrared/scenes/infrared_scene_start.c b/applications/main/infrared/scenes/infrared_scene_start.c
@@ -84,7 +84,12 @@ void infrared_scene_start_on_enter(void* context) {
     const uint32_t submenu_index =
         scene_manager_get_scene_state(scene_manager, InfraredSceneStart);
     submenu_set_selected_item(submenu, submenu_index);
-    scene_manager_set_scene_state(scene_manager, InfraredSceneStart, SubmenuIndexUniversalRemotes);
+
+    // Only reset menu position if we're not coming from a toggle
+    if(submenu_index == 0) {
+        scene_manager_set_scene_state(
+            scene_manager, InfraredSceneStart, SubmenuIndexUniversalRemotes);
+    }
 
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewSubmenu);
 }
@@ -99,6 +104,9 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
         if(event.event == SubmenuIndexEasyLearn) {
             infrared->app_state.is_easy_mode = !infrared->app_state.is_easy_mode;
             infrared_save_settings(infrared);
+            // Save current position
+            scene_manager_set_scene_state(
+                scene_manager, InfraredSceneStart, SubmenuIndexEasyLearn);
             scene_manager_previous_scene(scene_manager);
             scene_manager_next_scene(scene_manager, InfraredSceneStart);
             consumed = true;