DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-28 07:47:35 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'flipperdevices:dev' into dev

Browse Source
This commit is contained in:
Eng1n33r 2022-03-20 18:56:17 +03:00 committed by GitHub
commit d7540c7a4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
applications/gui/modules/text_input.c
View File

@ -131,7 +131,11 @@ static const bool char_is_lowercase(char letter) {
} }
static const char char_to_uppercase(const char letter) { static const char char_to_uppercase(const char letter) {
if(isalpha(letter)) {
return (letter - 0x20); return (letter - 0x20);
} else {
return letter;
}
} }
static void text_input_backspace_cb(TextInputModel* model) { static void text_input_backspace_cb(TextInputModel* model) {
@ -305,12 +309,16 @@ static void text_input_handle_right(TextInput* text_input) {
}); });
} }
static void text_input_handle_ok(TextInput* text_input) { static void text_input_handle_ok(TextInput* text_input, bool shift) {
with_view_model( with_view_model(
text_input->view, (TextInputModel * model) { text_input->view, (TextInputModel * model) {
char selected = get_selected_char(model); char selected = get_selected_char(model);
uint8_t text_length = strlen(model->text_buffer); uint8_t text_length = strlen(model->text_buffer);
if(shift) {
selected = char_to_uppercase(selected);
}
if(selected == ENTER_KEY) { if(selected == ENTER_KEY) {
if(model->validator_callback && (!model->validator_callback( if(model->validator_callback && (!model->validator_callback(
model->text_buffer, model->text_buffer,
@ -343,7 +351,7 @@ static bool text_input_view_input_callback(InputEvent* event, void* context) {
furi_assert(text_input); furi_assert(text_input);
bool consumed = false; bool consumed = false;
if(event->type == InputTypeShort || event->type == InputTypeRepeat) { if(event->type == InputTypeShort) {
with_view_model( with_view_model(
text_input->view, (TextInputModel * model) { text_input->view, (TextInputModel * model) {
if(model->valadator_message_visible) { if(model->valadator_message_visible) {
@ -372,7 +380,7 @@ static bool text_input_view_input_callback(InputEvent* event, void* context) {
consumed = true; consumed = true;
break; break;
case InputKeyOk: case InputKeyOk:
text_input_handle_ok(text_input); text_input_handle_ok(text_input, false);
consumed = true; consumed = true;
break; break;
default: default:
@ -395,6 +403,29 @@ static bool text_input_view_input_callback(InputEvent* event, void* context) {
consumed = true; consumed = true;
} }
// Allow shift key on long press
if(event->type == InputTypeLong && event->key == InputKeyOk) {
with_view_model(
text_input->view, (TextInputModel * model) {
if(model->valadator_message_visible) {
if(event->key == InputKeyBack) {
consumed = true;
}
}
model->valadator_message_visible = false;
return false;
});
switch(event->key) {
case InputKeyOk:
text_input_handle_ok(text_input, true);
consumed = true;
break;
default:
break;
}
}
return consumed; return consumed;
} }