[FL-2215, FL-2168] Display long names and rename RAW files (#971)

* [FL-2215] SubGhz:  fix long names on RAW and Delete screens
* [FL-2168] SubGhz: fix rename RAW
This commit is contained in:
Skorpionm
2022-01-27 20:38:47 +04:00
committed by GitHub
parent cb0369a7f3
commit 53e7415d12
5 changed files with 14 additions and 15 deletions

View File

@@ -19,7 +19,8 @@ void subghz_scene_save_name_on_enter(void* context) {
if(!strcmp(subghz->file_name, "")) {
set_random_name(subghz->file_name, sizeof(subghz->file_name));
//highlighting the entire filename by default
dev_name_empty = true;
} else {
strcpy(subghz->file_name_tmp, subghz->file_name);
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) ==
@@ -27,8 +28,6 @@ void subghz_scene_save_name_on_enter(void* context) {
subghz_get_next_name_file(subghz);
}
}
//highlighting the entire filename by default
dev_name_empty = true;
text_input_set_header_text(text_input, "Name signal");
text_input_set_result_callback(
@@ -67,6 +66,8 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
SubghzCustomEventManagerSet) {
subghz_protocol_raw_set_last_file_name(
(SubGhzProtocolRAW*)subghz->txrx->protocol_result, subghz->file_name);
scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneReadRAW, SubghzCustomEventManagerNoSet);
} else {
subghz_file_name_clear(subghz);
}
@@ -86,12 +87,11 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
void subghz_scene_save_name_on_exit(void* context) {
SubGhz* subghz = context;
// Clear view
// Clear validator
void* validator_context = text_input_get_validator_callback_context(subghz->text_input);
text_input_set_validator(subghz->text_input, NULL, NULL);
validator_is_file_free(validator_context);
// Clear view
text_input_reset(subghz->text_input);
scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneReadRAW, SubghzCustomEventManagerNoSet);
}