Add lock mode popup to lock menu

applications/services/desktop/scenes/desktop_scene_lock_menu.c

@@ -53,6 +53,8 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
             if(desktop->settings.pin_code.length > 0) {
                 desktop_lock_menu_set_pin_state(desktop->lock_menu, true);
                 scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0);
+                desktop_pin_lock(&desktop->settings);
+                desktop_lock(desktop);
             }
         }
     } else if(event.type == SceneManagerEventTypeCustom) {

applications/services/desktop/views/desktop_view_lock_menu.c

@@ -41,7 +41,10 @@ void desktop_lock_menu_set_pin_state(DesktopLockMenuView* lock_menu, bool pin_is
     with_view_model(
         lock_menu->view,
         DesktopLockMenuViewModel * model,
-        { model->pin_is_set = pin_is_set; },
+        {
+            model->pin_is_set = pin_is_set;
+            model->pin_lock = pin_is_set;
+        },
         true);
 }
 
@@ -154,6 +157,14 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) {
             canvas_draw_rframe(canvas, x, y, w, h, 5);
         }
     }
+
+    if(m->show_lock_menu) {
+        canvas_set_font(canvas, FontSecondary);
+        elements_bold_rounded_frame(canvas, 24, 10, 80, 44);
+        canvas_draw_str_aligned(canvas, 64, 24, AlignCenter, AlignCenter, "Keypad Lock");
+        canvas_draw_str_aligned(canvas, 64, 40, AlignCenter, AlignCenter, "PIN Code Lock");
+        elements_frame(canvas, 30, m->pin_lock ? 32 : 16, 68, 15);
+    }
 }
 
 View* desktop_lock_menu_get_view(DesktopLockMenuView* lock_menu) {
@@ -167,14 +178,26 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
 
     DesktopLockMenuView* lock_menu = context;
     uint8_t idx = 0;
+    bool pin_lock = false;
+    bool show_lock_menu = false;
     bool consumed = true;
 
     with_view_model(
         lock_menu->view,
         DesktopLockMenuViewModel * model,
         {
+            show_lock_menu = model->show_lock_menu;
             if((event->type == InputTypeShort) || (event->type == InputTypeRepeat)) {
-                if(model->idx < 6) {
+                if(model->show_lock_menu) {
+                    if(event->key == InputKeyUp || event->key == InputKeyDown) {
+                        model->pin_lock = !model->pin_lock;
+                    } else if(event->key == InputKeyBack || event->key == InputKeyOk) {
+                        model->show_lock_menu = false;
+                    }
+                } else {
+                    if(model->idx == DesktopLockMenuIndexLock && event->key == InputKeyOk) {
+                        model->show_lock_menu = true;
+                    } else if(model->idx < 6) {
                         if(event->key == InputKeyUp || event->key == InputKeyDown) {
                             if(model->idx % 2) {
                                 model->idx--;
@@ -206,15 +229,25 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
                         }
                     }
                 }
+            }
             idx = model->idx;
+            pin_lock = model->pin_lock;
         },
         true);
 
-    UNUSED(idx);
+    DesktopEvent desktop_event = 0;
+    if(show_lock_menu) {
+        if(event->key == InputKeyOk && event->type == InputTypeShort) {
+            if(pin_lock) {
+                desktop_event = DesktopLockMenuEventLockPin;
+            } else {
+                desktop_event = DesktopLockMenuEventLock;
+            }
+        }
+    } else {
         if(event->key == InputKeyBack) {
             consumed = false;
         } else if(event->key == InputKeyOk && event->type == InputTypeShort) {
-        DesktopEvent event = 0;
             switch(idx) {
             case DesktopLockMenuIndexLefthandedMode:
                 if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagHandOrient)) {
@@ -224,15 +257,12 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
                 }
                 break;
             case DesktopLockMenuIndexSettings:
-            event = DesktopLockMenuEventSettings;
+                desktop_event = DesktopLockMenuEventSettings;
                 break;
             case DesktopLockMenuIndexDarkMode:
                 XTREME_SETTINGS()->dark_mode = !XTREME_SETTINGS()->dark_mode;
                 lock_menu->save_xtreme = true;
                 break;
-        case DesktopLockMenuIndexLock:
-            event = DesktopLockMenuEventLock;
-            break;
             case DesktopLockMenuIndexBluetooth:
                 lock_menu->bt->bt_settings.enabled = !lock_menu->bt->bt_settings.enabled;
                 if(lock_menu->bt->bt_settings.enabled) {
@@ -243,14 +273,11 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
                 lock_menu->save_bt = true;
                 break;
             case DesktopLockMenuIndexXtreme:
-            event = DesktopLockMenuEventXtreme;
+                desktop_event = DesktopLockMenuEventXtreme;
                 break;
             default:
                 break;
             }
-        if(event) {
-            lock_menu->callback(event, lock_menu->context);
-        }
         } else if(idx >= 6 && (event->type == InputTypeShort || event->type == InputTypeRepeat)) {
             int8_t offset = 0;
             if(event->key == InputKeyUp) {
@@ -280,6 +307,10 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
                 }
             }
         }
+    }
+    if(desktop_event) {
+        lock_menu->callback(desktop_event, lock_menu->context);
+    }
 
     return consumed;
 }

applications/services/desktop/views/desktop_view_lock_menu.h

@@ -25,6 +25,8 @@ struct DesktopLockMenuView {
 typedef struct {
     uint8_t idx;
     bool pin_is_set;
+    bool pin_lock;
+    bool show_lock_menu;
     DesktopLockMenuView* lock_menu;
 } DesktopLockMenuViewModel;