IR: buttons move feature rework

applications/main/infrared/scenes/infrared_scene_config.h

@@ -8,7 +8,6 @@ ADD_SCENE(infrared, edit_button_select, EditButtonSelect)
 ADD_SCENE(infrared, edit_rename, EditRename)
 ADD_SCENE(infrared, edit_rename_done, EditRenameDone)
 ADD_SCENE(infrared, edit_move, EditMove)
-ADD_SCENE(infrared, edit_move_done, EditMoveDone)
 ADD_SCENE(infrared, learn, Learn)
 ADD_SCENE(infrared, learn_done, LearnDone)
 ADD_SCENE(infrared, learn_enter_name, LearnEnterName)

applications/main/infrared/scenes/infrared_scene_edit.c

@@ -82,9 +82,7 @@ bool infrared_scene_edit_on_event(void* context, SceneManagerEvent event) {
             scene_manager_next_scene(scene_manager, InfraredSceneEditButtonSelect);
             consumed = true;
         } else if(submenu_index == SubmenuIndexMoveButton) {
-            infrared->app_state.edit_target = InfraredEditTargetButton;
-            infrared->app_state.edit_mode = InfraredEditModeMove;
-            scene_manager_next_scene(scene_manager, InfraredSceneEditButtonSelect);
+            scene_manager_next_scene(scene_manager, InfraredSceneEditMove);
             consumed = true;
         } else if(submenu_index == SubmenuIndexDeleteButton) {
             infrared->app_state.edit_target = InfraredEditTargetButton;

applications/main/infrared/scenes/infrared_scene_edit_button_select.c

@@ -11,23 +11,9 @@ void infrared_scene_edit_button_select_on_enter(void* context) {
     InfraredRemote* remote = infrared->remote;
     InfraredAppState* app_state = &infrared->app_state;
 
-    const char* header = NULL;
-    switch(infrared->app_state.edit_mode) {
-    case InfraredEditModeRename:
-        header = "Rename Button:";
-        break;
-    case InfraredEditModeDelete:
-        header = "Delete Button:";
-        break;
-    case InfraredEditModeMove:
-        header = "Select Button to Move:";
-        break;
-    case InfraredEditModeMoveSelectDest:
-    case InfraredEditModeNone:
-    default:
-        header = "Move Button Before:";
-        break;
-    }
+    const char* header = infrared->app_state.edit_mode == InfraredEditModeRename ?
+                             "Rename Button:" :
+                             "Delete Button:";
     submenu_set_header(submenu, header);
 
     const size_t button_count = infrared_remote_get_button_count(remote);
@@ -40,14 +26,6 @@ void infrared_scene_edit_button_select_on_enter(void* context) {
             infrared_scene_edit_button_select_submenu_callback,
             context);
     }
-    if(infrared->app_state.edit_mode == InfraredEditModeMoveSelectDest) {
-        submenu_add_item(
-            submenu,
-            "-- Move to the end --",
-            button_count,
-            infrared_scene_edit_button_select_submenu_callback,
-            context);
-    }
     if(button_count && app_state->current_button_index != InfraredButtonIndexNone) {
         submenu_set_selected_item(submenu, app_state->current_button_index);
         app_state->current_button_index = InfraredButtonIndexNone;
@@ -69,12 +47,6 @@ bool infrared_scene_edit_button_select_on_event(void* context, SceneManagerEvent
             scene_manager_next_scene(scene_manager, InfraredSceneEditRename);
         } else if(edit_mode == InfraredEditModeDelete) {
             scene_manager_next_scene(scene_manager, InfraredSceneEditDelete);
-        } else if(edit_mode == InfraredEditModeMove) {
-            app_state->current_button_index_move_orig = event.event;
-            app_state->edit_mode = InfraredEditModeMoveSelectDest;
-            scene_manager_next_scene(scene_manager, InfraredSceneEditButtonSelect);
-        } else if(edit_mode == InfraredEditModeMoveSelectDest) {
-            scene_manager_next_scene(scene_manager, InfraredSceneEditMove);
         } else {
             furi_assert(0);
         }

applications/main/infrared/scenes/infrared_scene_edit_move.c

@@ -1,103 +1,44 @@
 #include "../infrared_i.h"
 
-static void infrared_scene_edit_move_dialog_result_callback(DialogExResult result, void* context) {
-    Infrared* infrared = context;
-    view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
+static void infrared_scene_move_button(uint32_t index_old, uint32_t index_new, void* context) {
+    InfraredRemote* remote = context;
+    furi_assert(remote);
+    infrared_remote_move_button(remote, index_old, index_new);
+}
+
+static const char* infrared_scene_get_btn_name(uint32_t index, void* context) {
+    InfraredRemote* remote = context;
+    furi_assert(remote);
+    InfraredRemoteButton* button = infrared_remote_get_button(remote, index);
+    return (infrared_remote_button_get_name(button));
 }
 
 void infrared_scene_edit_move_on_enter(void* context) {
     Infrared* infrared = context;
-    DialogEx* dialog_ex = infrared->dialog_ex;
     InfraredRemote* remote = infrared->remote;
 
-    const InfraredEditTarget edit_target = infrared->app_state.edit_target;
-    if(edit_target == InfraredEditTargetButton) {
-        int32_t current_button_index = infrared->app_state.current_button_index_move_orig;
-        furi_assert(current_button_index != InfraredButtonIndexNone);
+    infrared_move_view_set_callback(infrared->move_view, infrared_scene_move_button);
 
-        dialog_ex_set_header(dialog_ex, "Move Button?", 64, 0, AlignCenter, AlignTop);
-        InfraredRemoteButton* current_button =
-            infrared_remote_get_button(remote, current_button_index);
-        InfraredSignal* signal = infrared_remote_button_get_signal(current_button);
+    uint32_t btn_count = infrared_remote_get_button_count(remote);
+    infrared_move_view_list_init(
+        infrared->move_view, btn_count, infrared_scene_get_btn_name, remote);
+    infrared_move_view_list_update(infrared->move_view);
 
-        if(infrared_signal_is_raw(signal)) {
-            const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
-            infrared_text_store_set(
-                infrared,
-                0,
-                "%s\nRAW\n%ld samples",
-                infrared_remote_button_get_name(current_button),
-                raw->timings_size);
-
-        } else {
-            const InfraredMessage* message = infrared_signal_get_message(signal);
-            infrared_text_store_set(
-                infrared,
-                0,
-                "%s\n%s\nA=0x%0*lX C=0x%0*lX",
-                infrared_remote_button_get_name(current_button),
-                infrared_get_protocol_name(message->protocol),
-                ROUND_UP_TO(infrared_get_protocol_address_length(message->protocol), 4),
-                message->address,
-                ROUND_UP_TO(infrared_get_protocol_command_length(message->protocol), 4),
-                message->command);
-        }
-    } else {
-        furi_assert(0);
-    }
-
-    dialog_ex_set_text(dialog_ex, infrared->text_store[0], 64, 31, AlignCenter, AlignCenter);
-    dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
-    dialog_ex_set_left_button_text(dialog_ex, "Cancel");
-    dialog_ex_set_right_button_text(dialog_ex, "Move");
-    dialog_ex_set_result_callback(dialog_ex, infrared_scene_edit_move_dialog_result_callback);
-    dialog_ex_set_context(dialog_ex, context);
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewDialogEx);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewMove);
 }
 
 bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
     Infrared* infrared = context;
-    SceneManager* scene_manager = infrared->scene_manager;
     bool consumed = false;
 
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == DialogExResultLeft) {
-            scene_manager_previous_scene(scene_manager);
-            consumed = true;
-        } else if(event.event == DialogExResultRight) {
-            bool success = false;
-            InfraredRemote* remote = infrared->remote;
-            InfraredAppState* app_state = &infrared->app_state;
-            const InfraredEditTarget edit_target = app_state->edit_target;
-
-            if(edit_target == InfraredEditTargetButton) {
-                furi_assert(app_state->current_button_index != InfraredButtonIndexNone);
-                success = infrared_remote_move_button(
-                    remote,
-                    app_state->current_button_index_move_orig,
-                    app_state->current_button_index);
-                app_state->current_button_index_move_orig = InfraredButtonIndexNone;
-                app_state->current_button_index = InfraredButtonIndexNone;
-            } else {
-                furi_assert(0);
-            }
-
-            if(success) {
-                scene_manager_next_scene(scene_manager, InfraredSceneEditMoveDone);
-            } else {
-                const uint32_t possible_scenes[] = {InfraredSceneRemoteList, InfraredSceneStart};
-                scene_manager_search_and_switch_to_previous_scene_one_of(
-                    scene_manager, possible_scenes, COUNT_OF(possible_scenes));
-            }
-            consumed = true;
-        }
-    }
+    UNUSED(event);
+    UNUSED(infrared);
 
     return consumed;
 }
 
 void infrared_scene_edit_move_on_exit(void* context) {
     Infrared* infrared = context;
-    UNUSED(infrared);
+    InfraredRemote* remote = infrared->remote;
+    infrared_remote_store(remote);
 }

applications/main/infrared/scenes/infrared_scene_edit_move_done.c

@@ -1,48 +0,0 @@
-#include "../infrared_i.h"
-
-void infrared_scene_edit_move_done_on_enter(void* context) {
-    Infrared* infrared = context;
-    Popup* popup = infrared->popup;
-
-    popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62);
-    popup_set_header(popup, "Moved", 83, 19, AlignLeft, AlignBottom);
-
-    popup_set_callback(popup, infrared_popup_closed_callback);
-    popup_set_context(popup, context);
-    popup_set_timeout(popup, 1500);
-    popup_enable_timeout(popup);
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewPopup);
-}
-
-bool infrared_scene_edit_move_done_on_event(void* context, SceneManagerEvent event) {
-    Infrared* infrared = context;
-    SceneManager* scene_manager = infrared->scene_manager;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == InfraredCustomEventTypePopupClosed) {
-            const InfraredEditTarget edit_target = infrared->app_state.edit_target;
-            if(edit_target == InfraredEditTargetButton) {
-                scene_manager_search_and_switch_to_previous_scene(
-                    scene_manager, InfraredSceneRemote);
-            } else if(edit_target == InfraredEditTargetRemote) {
-                const uint32_t possible_scenes[] = {InfraredSceneStart, InfraredSceneRemoteList};
-                if(!scene_manager_search_and_switch_to_previous_scene_one_of(
-                       scene_manager, possible_scenes, COUNT_OF(possible_scenes))) {
-                    view_dispatcher_stop(infrared->view_dispatcher);
-                }
-            } else {
-                furi_assert(0);
-            }
-            consumed = true;
-        }
-    }
-
-    return consumed;
-}
-
-void infrared_scene_edit_move_done_on_exit(void* context) {
-    Infrared* infrared = context;
-    UNUSED(infrared);
-}