[411] fix: remove AppLock widget when lock is disabled

Author: maelchiotti

lib/app.dart

@@ -98,8 +98,8 @@ class _AppState extends ConsumerState<App> {
     final useWhiteTextDarkMode = ref.watch(
       preferencesProvider.select((preferences) => preferences.useWhiteTextDarkMode),
     );
-    final lock = PreferenceKey.lockApp.preferenceOrDefault;
-    final lockDelay = PreferenceKey.lockAppDelay.preferenceOrDefault;
+    final lockApp = PreferenceKey.lockApp.preferenceOrDefault;
+    final lockAppDelay = PreferenceKey.lockAppDelay.preferenceOrDefault;
 
     return DynamicColorBuilder(
       builder: (lightDynamicColorScheme, darkDynamicColorScheme) {
@@ -134,24 +134,26 @@ class _AppState extends ConsumerState<App> {
 
               return Directionality(
                 textDirection: SystemUtils().deviceLocale.textDirection,
-                child: AppLock(
-                  initiallyEnabled: lock,
-                  initialBackgroundLockLatency: Duration(seconds: lockDelay),
-                  builder: (BuildContext context, Object? launchArg) {
-                    SystemUtils().setQuickActions(context, ref);
-
-                    return child;
-                  },
-                  lockScreenBuilder: (BuildContext context) {
-                    final l = AppLocalizations.of(context);
-
-                    return LockPage(
-                      back: false,
-                      description: l.lock_page_description_app,
-                      reason: l.lock_page_reason_app,
-                    );
-                  },
-                ),
+                child: lockApp
+                    ? AppLock(
+                        initiallyEnabled: lockApp,
+                        initialBackgroundLockLatency: Duration(seconds: lockAppDelay),
+                        builder: (BuildContext context, Object? launchArg) {
+                          SystemUtils().setQuickActions(context, ref);
+
+                          return child;
+                        },
+                        lockScreenBuilder: (BuildContext context) {
+                          final l = AppLocalizations.of(context);
+
+                          return LockPage(
+                            back: false,
+                            description: l.lock_page_description_app,
+                            reason: l.lock_page_reason_app,
+                          );
+                        },
+                      )
+                    : child,
               );
             },
             theme: lightTheme,

lib/pages/editor/editor_page.dart

@@ -119,52 +119,56 @@ class _EditorState extends ConsumerState<NotesEditorPage> {
                 );
             }
 
-            return AppLock(
-              initiallyEnabled: lockNote,
-              initialBackgroundLockLatency: Duration(seconds: lockDelay),
-              builder: (BuildContext context, Object? launchArg) {
-                return Scaffold(
-                  appBar: const TopNavigation(
-                    appbar: EditorAppBar(),
-                    notesStatus: NoteStatus.available,
-                  ),
-                  body: Column(
-                    children: [
-                      Expanded(
-                        child: Column(
-                          children: [
-                            TitleEditor(
-                              readOnly: widget.readOnly,
-                              isNewNote: widget.isNewNote,
-                              onSubmitted: requestEditorFocus,
-                            ),
-                            Gap(8.0),
-                            Expanded(
-                              child: contentEditor,
-                            ),
-                          ],
+            final editor = Scaffold(
+              appBar: const TopNavigation(
+                appbar: EditorAppBar(),
+                notesStatus: NoteStatus.available,
+              ),
+              body: Column(
+                children: [
+                  Expanded(
+                    child: Column(
+                      children: [
+                        TitleEditor(
+                          readOnly: widget.readOnly,
+                          isNewNote: widget.isNewNote,
+                          onSubmitted: requestEditorFocus,
                         ),
-                      ),
-                      SafeArea(
-                        child: Column(
-                          children: [
-                            if (showLabelsList) EditorLabelsList(readOnly: widget.readOnly),
-                            if (toolbar != null && isEditorInEditMode && !currentNote.deleted) toolbar,
-                          ],
+                        Gap(8.0),
+                        Expanded(
+                          child: contentEditor,
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
                   ),
-                );
-              },
-              lockScreenBuilder: (BuildContext context) {
-                return LockPage(
-                  back: true,
-                  description: l.lock_page_description_note,
-                  reason: l.lock_page_reason_note,
-                );
-              },
+                  SafeArea(
+                    child: Column(
+                      children: [
+                        if (showLabelsList) EditorLabelsList(readOnly: widget.readOnly),
+                        if (toolbar != null && isEditorInEditMode && !currentNote.deleted) toolbar,
+                      ],
+                    ),
+                  ),
+                ],
+              ),
             );
+
+            return lockNote
+                ? AppLock(
+                    initiallyEnabled: lockNote,
+                    initialBackgroundLockLatency: Duration(seconds: lockDelay),
+                    builder: (BuildContext context, Object? launchArg) {
+                      return editor;
+                    },
+                    lockScreenBuilder: (BuildContext context) {
+                      return LockPage(
+                        back: true,
+                        description: l.lock_page_description_note,
+                        reason: l.lock_page_reason_note,
+                      );
+                    },
+                  )
+                : editor;
           },
         );
       },