From 249bd685b190b4023e6ee1fc89f3b927733143a0 Mon Sep 17 00:00:00 2001
From: PartyDonut <PartyDonut@users.noreply.github.com>
Date: Sat, 5 Oct 2024 19:15:31 +0200
Subject: [PATCH] Fixed dashboard navigation

---
 lib/screens/login/login_screen.dart         | 2 +-
 lib/screens/settings/settings_scaffold.dart | 2 +-
 lib/screens/settings/settings_screen.dart   | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/screens/login/login_screen.dart b/lib/screens/login/login_screen.dart
index 16a2fc4..181898f 100644
--- a/lib/screens/login/login_screen.dart
+++ b/lib/screens/login/login_screen.dart
@@ -211,7 +211,7 @@ class _LoginPageState extends ConsumerState<LoginScreen> {
   void loggedInGoToHome() {
     ref.read(lockScreenActiveProvider.notifier).update((state) => false);
     if (context.mounted) {
-      context.router.push(const DashboardRoute());
+      context.router.navigate(const DashboardRoute());
     }
   }
 
diff --git a/lib/screens/settings/settings_scaffold.dart b/lib/screens/settings/settings_scaffold.dart
index 4223bc0..f6b37df 100644
--- a/lib/screens/settings/settings_scaffold.dart
+++ b/lib/screens/settings/settings_scaffold.dart
@@ -27,7 +27,7 @@ class SettingsScaffold extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final padding = MediaQuery.of(context).padding;
     return Scaffold(
-      backgroundColor: AdaptiveLayout.of(context).isDesktop ? Colors.transparent : null,
+      backgroundColor: AdaptiveLayout.of(context).size == ScreenLayout.dual ? Colors.transparent : null,
       floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
       floatingActionButton: floatingActionButton,
       body: Column(
diff --git a/lib/screens/settings/settings_screen.dart b/lib/screens/settings/settings_screen.dart
index 11675b8..1dfb0e5 100644
--- a/lib/screens/settings/settings_screen.dart
+++ b/lib/screens/settings/settings_screen.dart
@@ -90,7 +90,7 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
         scrollController: scrollController,
         showUserIcon: true,
         items: [
-          if (context.router.canPop() && AdaptiveLayout.of(context).size == ScreenLayout.single)
+          if (context.router.canPop() && AdaptiveLayout.of(context).size == ScreenLayout.dual)
             Align(
               alignment: Alignment.centerLeft,
               child: Padding(
@@ -205,7 +205,9 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
                                         ),
                                         onPressed: () async {
                                           await ref.read(authProvider.notifier).logOutUser();
-                                          if (context.mounted) context.router.navigate(const LoginRoute());
+                                          if (context.mounted) {
+                                            context.router.navigate(const LoginRoute());
+                                          }
                                         },
                                         child: Text(context.localized.logout),
                                       ),