liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1606] Hide "Unlocked" message on any user interaction #599

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
its your bedtime 2021-07-23 16:15:25 +03:00 committed by GitHub
parent 3f640e8f1c
commit d25dabe025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applications/dolphin/dolphin.c
View File

@ -114,15 +114,8 @@ bool dolphin_view_idle_main_input(InputEvent* event, void* context) {
// unlocked // unlocked
if(!dolphin->locked) { if(!dolphin->locked) {
if(event->key == InputKeyOk && event->type == InputTypeShort) { if(event->key == InputKeyOk && event->type == InputTypeShort) {
with_view_model(
dolphin->idle_view_main, (DolphinViewMainModel * model) {
model->hint_timeout = 0; // clear hint timeout
return true;
});
with_value_mutex( with_value_mutex(
dolphin->menu_vm, (Menu * menu) { menu_ok(menu); }); dolphin->menu_vm, (Menu * menu) { menu_ok(menu); });
} else if(event->key == InputKeyUp && event->type == InputTypeShort) { } else if(event->key == InputKeyUp && event->type == InputTypeShort) {
osTimerStart(dolphin->timeout_timer, 40); osTimerStart(dolphin->timeout_timer, 40);
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewLockMenu); view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewLockMenu);
@ -139,6 +132,13 @@ bool dolphin_view_idle_main_input(InputEvent* event, void* context) {
} else if(event->key == InputKeyBack && event->type == InputTypeShort) { } else if(event->key == InputKeyBack && event->type == InputTypeShort) {
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewIdleMain); view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewIdleMain);
} }
with_view_model(
dolphin->idle_view_main, (DolphinViewMainModel * model) {
model->hint_timeout = 0; // clear hint timeout
return true;
});
} else { } else {
// locked // locked