From d25dabe025343bc2c0275721772e51867327126e Mon Sep 17 00:00:00 2001 From: its your bedtime <23366927+itsyourbedtime@users.noreply.github.com> Date: Fri, 23 Jul 2021 16:15:25 +0300 Subject: [PATCH] [FL-1606] Hide "Unlocked" message on any user interaction #599 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: あく --- applications/dolphin/dolphin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/dolphin/dolphin.c b/applications/dolphin/dolphin.c index de2ee320..3ccbab82 100644 --- a/applications/dolphin/dolphin.c +++ b/applications/dolphin/dolphin.c @@ -114,15 +114,8 @@ bool dolphin_view_idle_main_input(InputEvent* event, void* context) { // unlocked if(!dolphin->locked) { 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( dolphin->menu_vm, (Menu * menu) { menu_ok(menu); }); - } else if(event->key == InputKeyUp && event->type == InputTypeShort) { osTimerStart(dolphin->timeout_timer, 40); 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) { 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 { // locked