From 30b376f4e3d0d0ca83420bbd210b10e78a55cb74 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 17 Jun 2024 16:40:10 +0300
Subject: [PATCH] subghz sync delete scene with ofw

---
 .../main/subghz/helpers/subghz_custom_event.h |  1 +
 .../main/subghz/scenes/subghz_scene_delete.c  | 62 ++++++++++++-------
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h
index 56bc7fe5f..2bf308e28 100644
--- a/applications/main/subghz/helpers/subghz_custom_event.h
+++ b/applications/main/subghz/helpers/subghz_custom_event.h
@@ -8,6 +8,7 @@ typedef enum {
     //SubGhzCustomEvent
     SubGhzCustomEventSceneDeleteSuccess = 100,
     SubGhzCustomEventSceneDelete,
+    SubGhzCustomEventSceneDeleteBack,
     SubGhzCustomEventSceneDeleteRAW,
     SubGhzCustomEventSceneDeleteRAWBack,
 
diff --git a/applications/main/subghz/scenes/subghz_scene_delete.c b/applications/main/subghz/scenes/subghz_scene_delete.c
index 3fc4be069..601e2711d 100644
--- a/applications/main/subghz/scenes/subghz_scene_delete.c
+++ b/applications/main/subghz/scenes/subghz_scene_delete.c
@@ -6,43 +6,57 @@ void subghz_scene_delete_callback(GuiButtonType result, InputType type, void* co
     SubGhz* subghz = context;
     if((result == GuiButtonTypeRight) && (type == InputTypeShort)) {
         view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventSceneDelete);
+    } else if((result == GuiButtonTypeLeft) && (type == InputTypeShort)) {
+        view_dispatcher_send_custom_event(
+            subghz->view_dispatcher, SubGhzCustomEventSceneDeleteBack);
     }
 }
 
 void subghz_scene_delete_on_enter(void* context) {
     SubGhz* subghz = context;
-    FuriString* frequency_str = furi_string_alloc();
-    FuriString* modulation_str = furi_string_alloc();
-    FuriString* text = furi_string_alloc();
 
-    subghz_txrx_get_frequency_and_modulation(subghz->txrx, frequency_str, modulation_str, false);
-    widget_add_string_element(
-        subghz->widget,
-        78,
-        0,
-        AlignLeft,
-        AlignTop,
-        FontSecondary,
-        furi_string_get_cstr(frequency_str));
+    FuriString* frequency_str;
+    FuriString* modulation_str;
+    FuriString* text_out;
+    FuriString* text;
+    text_out = furi_string_alloc();
+    text = furi_string_alloc();
 
-    widget_add_string_element(
-        subghz->widget,
-        113,
-        0,
-        AlignLeft,
-        AlignTop,
-        FontSecondary,
-        furi_string_get_cstr(modulation_str));
+    path_extract_filename(subghz->file_path, text, true);
+    furi_string_cat_printf(text_out, "\e#Delete %s?\e#\n", furi_string_get_cstr(text));
+
+    furi_string_reset(text);
     subghz_protocol_decoder_base_get_string(subghz_txrx_get_decoder(subghz->txrx), text);
-    widget_add_string_multiline_element(
-        subghz->widget, 0, 0, AlignLeft, AlignTop, FontSecondary, furi_string_get_cstr(text));
+
+    size_t dot = furi_string_search_char(text, '\r');
+    if(dot > 0) {
+        furi_string_left(text, dot);
+    }
+    furi_string_cat_printf(text_out, "%s\n", furi_string_get_cstr(text));
+
+    furi_string_free(text);
+
+    frequency_str = furi_string_alloc();
+    modulation_str = furi_string_alloc();
+    subghz_txrx_get_frequency_and_modulation(subghz->txrx, frequency_str, modulation_str, false);
+
+    furi_string_cat_printf(
+        text_out,
+        "%s %s",
+        furi_string_get_cstr(frequency_str),
+        furi_string_get_cstr(modulation_str));
+
+    widget_add_text_box_element(
+        subghz->widget, 0, 0, 128, 54, AlignCenter, AlignTop, furi_string_get_cstr(text_out), false);
 
     furi_string_free(frequency_str);
     furi_string_free(modulation_str);
-    furi_string_free(text);
+    furi_string_free(text_out);
 
     widget_add_button_element(
         subghz->widget, GuiButtonTypeRight, "Delete", subghz_scene_delete_callback, subghz);
+    widget_add_button_element(
+        subghz->widget, GuiButtonTypeLeft, "Cancel", subghz_scene_delete_callback, subghz);
 
     view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdWidget);
 }
@@ -59,6 +73,8 @@ bool subghz_scene_delete_on_event(void* context, SceneManagerEvent event) {
                     subghz->scene_manager, SubGhzSceneStart);
             }
             return true;
+        } else if(event.event == SubGhzCustomEventSceneDeleteBack) {
+            return scene_manager_previous_scene(subghz->scene_manager);
         }
     }
     return false;