Merge pull request #395 from kejml/back-to-close

lucien144 · May 19, 2023 · 69bab20 · 69bab20
2 parents 6452634 + 606b742
commit 69bab20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/pages/HomePage.dart b/lib/pages/HomePage.dart
@@ -140,7 +140,7 @@ class _HomePageState extends State<HomePage> with RouteAware, WidgetsBindingObse
     ];
 
     return WillPopScope(
-      onWillPop: () async => false,
+      onWillPop: () async => true,
       child: Stack(children: [
         Positioned.fill(
           // Do not prevent the scroll down if the submenu is up. Only hide the submenu and keep scrolling...

diff --git a/lib/pages/TutorialPage.dart b/lib/pages/TutorialPage.dart
@@ -75,7 +75,7 @@ class _TutorialPageState extends State<TutorialPage> {
                     setState(() => _loggingIn = true);
                     ApiController().getCredentials().then((credentials) {
                       MainRepository().credentials = credentials!;
-                      Navigator.of(context).pushNamed('/home');
+                      Navigator.of(context).pushNamedAndRemoveUntil('/home', ModalRoute.withName('/'));
                     }).catchError((error) => onError(error));
                   })
                 : slideButton(L.TUTORIAL_NYX,