Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

[FL-3753] UI SubGhz: fix UI only_rx scene (#3379)

Browse Source 
* UI SubGhz: fix UI only_rx scene
* UI SubGhz: delete unused scene

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Skorpionm
2024-02-09 12:49:58 +04:00
committed by GitHub
parent 50e0521bf7
commit c0db3d541e
3 changed files with 4 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/scenes/subghz_scene_config.h
View File

@@ -8,7 +8,6 @@ ADD_SCENE(subghz, saved, Saved)
ADD_SCENE(subghz, transmitter, Transmitter) ADD_SCENE(subghz, transmitter, Transmitter)
ADD_SCENE(subghz, show_error, ShowError) ADD_SCENE(subghz, show_error, ShowError)
ADD_SCENE(subghz, show_error_sub, ShowErrorSub) ADD_SCENE(subghz, show_error_sub, ShowErrorSub)
ADD_SCENE(subghz, show_only_rx, ShowOnlyRx)
ADD_SCENE(subghz, saved_menu, SavedMenu) ADD_SCENE(subghz, saved_menu, SavedMenu)
ADD_SCENE(subghz, delete, Delete) ADD_SCENE(subghz, delete, Delete)
ADD_SCENE(subghz, delete_success, DeleteSuccess) ADD_SCENE(subghz, delete_success, DeleteSuccess)

49
applications/main/subghz/scenes/subghz_scene_show_only_rx.c
View File

@@ -1,49 +0,0 @@
#include "../subghz_i.h"
#include "../helpers/subghz_custom_event.h"
void subghz_scene_show_only_rx_popup_callback(void* context) {
SubGhz* subghz = context;
view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventSceneShowOnlyRX);
}
void subghz_scene_show_only_rx_on_enter(void* context) {
SubGhz* subghz = context;
// Setup view
Popup* popup = subghz->popup;
const char* header_text = "Transmission is blocked";
const char* message_text = "Transmission on\nthis frequency is\nrestricted in\nyour region";
if(!furi_hal_region_is_provisioned()) {
header_text = "Firmware update needed";
message_text = "Please update\nfirmware before\nusing this feature\nflipp.dev/upd";
}
popup_set_header(popup, header_text, 63, 3, AlignCenter, AlignTop);
popup_set_text(popup, message_text, 0, 17, AlignLeft, AlignTop);
popup_set_icon(popup, 83, 22, &I_WarningDolphinFlip_45x42);
popup_set_timeout(popup, 1500);
popup_set_context(popup, subghz);
popup_set_callback(popup, subghz_scene_show_only_rx_popup_callback);
popup_enable_timeout(popup);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdPopup);
}
bool subghz_scene_show_only_rx_on_event(void* context, SceneManagerEvent event) {
SubGhz* subghz = context;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubGhzCustomEventSceneShowOnlyRX) {
scene_manager_previous_scene(subghz->scene_manager);
return true;
}
}
return false;
}
void subghz_scene_show_only_rx_on_exit(void* context) {
SubGhz* subghz = context;
Popup* popup = subghz->popup;
popup_reset(popup);
}

8
applications/main/subghz/subghz_i.c
View File

@@ -60,15 +60,15 @@ void subghz_dialog_message_show_only_rx(SubGhz* subghz) {
DialogsApp* dialogs = subghz->dialogs; DialogsApp* dialogs = subghz->dialogs;
DialogMessage* message = dialog_message_alloc(); DialogMessage* message = dialog_message_alloc();
const char* header_text = "Transmission is blocked"; const char* header_text = "Transmission is Blocked!";
const char* message_text = "Transmission on\nthis frequency is\nrestricted in\nyour region"; const char* message_text = "Transmission on\nthis frequency is\nrestricted in your\nregion";
if(!furi_hal_region_is_provisioned()) { if(!furi_hal_region_is_provisioned()) {
header_text = "Firmware update needed"; header_text = "Firmware update needed";
message_text = "Please update\nfirmware before\nusing this feature\nflipp.dev/upd"; message_text = "Please update\nfirmware before\nusing this feature\nflipp.dev/upd";
} }
dialog_message_set_header(message, header_text, 63, 3, AlignCenter, AlignTop); dialog_message_set_header(message, header_text, 63, 0, AlignCenter, AlignTop);
dialog_message_set_text(message, message_text, 0, 17, AlignLeft, AlignTop); dialog_message_set_text(message, message_text, 1, 13, AlignLeft, AlignTop);
dialog_message_set_icon(message, &I_WarningDolphinFlip_45x42, 83, 22); dialog_message_set_icon(message, &I_WarningDolphinFlip_45x42, 83, 22);