| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 |
- commit 3b2cf0b6641d360c65e4c9ac38c0c574c3cf91fb
- Author: MX <10697207+xMasterX@users.noreply.github.com>
- Date: Mon Sep 4 19:41:36 2023 +0300
- Naming fixes
-
- thanks Willy-JL
- diff --git a/fuzzer.c b/fuzzer.c
- index 18fd97aad..96f74c20a 100644
- --- a/fuzzer.c
- +++ b/fuzzer.c
- @@ -140,6 +140,7 @@ int32_t fuzzer_start_ibtn(void* p) {
- .key_extension = ".ibtn",
- .path_key_folder = "/ext/ibutton",
- .key_icon = &I_ibutt_10px,
- + .file_prefix = "iBtn",
- };
- fuzzer_app->fuzzer_const = &app_const;
-
- @@ -159,6 +160,7 @@ int32_t fuzzer_start_rfid(void* p) {
- .key_extension = ".rfid",
- .path_key_folder = "/ext/lfrfid",
- .key_icon = &I_125_10px,
- + .file_prefix = "RFID",
- };
- fuzzer_app->fuzzer_const = &app_const;
-
- diff --git a/fuzzer_i.h b/fuzzer_i.h
- index 1edc6b7e7..ad10dd8a2 100644
- --- a/fuzzer_i.h
- +++ b/fuzzer_i.h
- @@ -32,6 +32,7 @@ typedef struct {
- const char* key_extension;
- const char* path_key_folder;
- const Icon* key_icon;
- + const char* file_prefix;
- } FuzzerConsts;
-
- typedef struct {
- diff --git a/scenes/fuzzer_scene_save_name.c b/scenes/fuzzer_scene_save_name.c
- index 983bf0a58..c622f59b3 100644
- --- a/scenes/fuzzer_scene_save_name.c
- +++ b/scenes/fuzzer_scene_save_name.c
- @@ -1,6 +1,6 @@
- #include "../fuzzer_i.h"
-
- -#include <toolbox/random_name.h>
- +#include <toolbox/name_generator.h>
- #include <toolbox/path.h>
-
- static void fuzzer_scene_save_name_text_input_callback(void* context) {
- @@ -12,7 +12,7 @@ void fuzzer_scene_save_name_on_enter(void* context) {
- PacsFuzzerApp* app = context;
- TextInput* text_input = app->text_input;
-
- - set_random_name(app->key_name, KEY_NAME_SIZE);
- + name_generator_make_auto(app->key_name, KEY_NAME_SIZE, app->fuzzer_const->file_prefix);
-
- text_input_set_header_text(text_input, "Name the key");
- text_input_set_result_callback(
- @@ -21,7 +21,7 @@ void fuzzer_scene_save_name_on_enter(void* context) {
- app,
- app->key_name,
- KEY_NAME_SIZE,
- - false);
- + true);
-
- ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
- app->fuzzer_const->path_key_folder, app->fuzzer_const->key_extension, app->key_name);
|