|
@@ -29,7 +29,7 @@ typedef struct {
|
|
|
TextInputValidatorCallback validator_callback;
|
|
TextInputValidatorCallback validator_callback;
|
|
|
void* validator_callback_context;
|
|
void* validator_callback_context;
|
|
|
FuriString* validator_text;
|
|
FuriString* validator_text;
|
|
|
- bool valadator_message_visible;
|
|
|
|
|
|
|
+ bool validator_message_visible;
|
|
|
} TextInputModel;
|
|
} TextInputModel;
|
|
|
|
|
|
|
|
static const uint8_t keyboard_origin_x = 1;
|
|
static const uint8_t keyboard_origin_x = 1;
|
|
@@ -254,7 +254,7 @@ static void text_input_view_draw_callback(Canvas* canvas, void* _model) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if(model->valadator_message_visible) {
|
|
|
|
|
|
|
+ if(model->validator_message_visible) {
|
|
|
canvas_set_font(canvas, FontSecondary);
|
|
canvas_set_font(canvas, FontSecondary);
|
|
|
canvas_set_color(canvas, ColorWhite);
|
|
canvas_set_color(canvas, ColorWhite);
|
|
|
canvas_draw_box(canvas, 8, 10, 110, 48);
|
|
canvas_draw_box(canvas, 8, 10, 110, 48);
|
|
@@ -319,7 +319,7 @@ static void text_input_handle_ok(TextInput* text_input, TextInputModel* model, b
|
|
|
if(model->validator_callback &&
|
|
if(model->validator_callback &&
|
|
|
(!model->validator_callback(
|
|
(!model->validator_callback(
|
|
|
model->text_buffer, model->validator_text, model->validator_callback_context))) {
|
|
model->text_buffer, model->validator_text, model->validator_callback_context))) {
|
|
|
- model->valadator_message_visible = true;
|
|
|
|
|
|
|
+ model->validator_message_visible = true;
|
|
|
furi_timer_start(text_input->timer, furi_kernel_get_tick_frequency() * 4);
|
|
furi_timer_start(text_input->timer, furi_kernel_get_tick_frequency() * 4);
|
|
|
} else if(model->callback != 0 && text_length > 0) {
|
|
} else if(model->callback != 0 && text_length > 0) {
|
|
|
model->callback(model->callback_context);
|
|
model->callback(model->callback_context);
|
|
@@ -348,8 +348,8 @@ static bool text_input_view_input_callback(InputEvent* event, void* context) {
|
|
|
TextInputModel* model = view_get_model(text_input->view);
|
|
TextInputModel* model = view_get_model(text_input->view);
|
|
|
|
|
|
|
|
if((!(event->type == InputTypePress) && !(event->type == InputTypeRelease)) &&
|
|
if((!(event->type == InputTypePress) && !(event->type == InputTypeRelease)) &&
|
|
|
- model->valadator_message_visible) {
|
|
|
|
|
- model->valadator_message_visible = false;
|
|
|
|
|
|
|
+ model->validator_message_visible) {
|
|
|
|
|
+ model->validator_message_visible = false;
|
|
|
consumed = true;
|
|
consumed = true;
|
|
|
} else if(event->type == InputTypeShort) {
|
|
} else if(event->type == InputTypeShort) {
|
|
|
consumed = true;
|
|
consumed = true;
|
|
@@ -435,7 +435,7 @@ void text_input_timer_callback(void* context) {
|
|
|
with_view_model(
|
|
with_view_model(
|
|
|
text_input->view,
|
|
text_input->view,
|
|
|
TextInputModel * model,
|
|
TextInputModel * model,
|
|
|
- { model->valadator_message_visible = false; },
|
|
|
|
|
|
|
+ { model->validator_message_visible = false; },
|
|
|
true);
|
|
true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -495,7 +495,7 @@ void text_input_reset(TextInput* text_input) {
|
|
|
model->validator_callback = NULL;
|
|
model->validator_callback = NULL;
|
|
|
model->validator_callback_context = NULL;
|
|
model->validator_callback_context = NULL;
|
|
|
furi_string_reset(model->validator_text);
|
|
furi_string_reset(model->validator_text);
|
|
|
- model->valadator_message_visible = false;
|
|
|
|
|
|
|
+ model->validator_message_visible = false;
|
|
|
},
|
|
},
|
|
|
true);
|
|
true);
|
|
|
}
|
|
}
|