feat: pass username when logging in

ExpidusOS-archive · May 2, 2024 · 7214bbf · 7214bbf
1 parent b51d5fc
commit 7214bbf
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 6 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -43,6 +43,15 @@ void main(List<String> argsList) async {
   });
 }
 
+String? _getUserName(BuildContext context) {
+  final route = ModalRoute.of(context);
+  if (route == null) return null;
+  if (route.settings.arguments == null) return null;
+
+  final args = route.settings.arguments as Map<String, dynamic>;
+  return args['userName'];
+}
+
 class GenesisShellApp extends StatelessWidget {
   const GenesisShellApp({
     super.key,
@@ -69,8 +78,8 @@ class GenesisShellApp extends StatelessWidget {
           ),
           themeMode: ThemeMode.dark,
           routes: {
-            '/': (_) => const DesktopView(),
-            '/lock': (_) => const LockView(),
+            '/': (context) => DesktopView(userName: _getUserName(context)),
+            '/lock': (context) => LockView(userName: _getUserName(context)),
             '/login': (_) => const LoginView(),
           },
           initialRoute: initLocked ? '/lock' : (displayManager ? '/login' : '/'),

diff --git a/lib/views/desktop.dart b/lib/views/desktop.dart
@@ -13,11 +13,13 @@ class DesktopView extends StatefulWidget {
     this.wallpaper = null,
     this.desktopWallpaper = null,
     this.mobileWallpaper = null,
+    this.userName = null,
   });
 
   final String? wallpaper;
   final String? desktopWallpaper;
   final String? mobileWallpaper;
+  final String? userName;
 
   @override
   State<DesktopView> createState() => _DesktopViewState();
@@ -52,6 +54,7 @@ class _DesktopViewState extends State<DesktopView> {
   Widget build(BuildContext context) =>
     SystemLayout(
       userMode: true,
+      userName: widget.userName,
       body: Container(
         decoration: BoxDecoration(
           image: getWallpaper(

diff --git a/lib/views/lock.dart b/lib/views/lock.dart
@@ -16,17 +16,20 @@ class LockView extends StatelessWidget {
     this.wallpaper = null,
     this.desktopWallpaper = null,
     this.mobileWallpaper = null,
+    this.userName = null,
   });
 
   final String? wallpaper;
   final String? desktopWallpaper;
   final String? mobileWallpaper;
+  final String? userName;
 
   @override
   Widget build(BuildContext context) =>
     SystemLayout(
       userMode: true,
       isLocked: true,
+      userName: userName,
       body: Container(
         decoration: BoxDecoration(
           image: getWallpaper(

diff --git a/lib/views/login.dart b/lib/views/login.dart
@@ -106,7 +106,12 @@ class _LoginViewState extends State<LoginView> {
         LoginPrompt(
           onLogin: () {
             final nav = Navigator.of(context);
-            nav.pushNamed('/');
+            nav.pushNamed(
+              '/',
+              arguments: {
+                'userName': _selectedUser!,
+              },
+            );
           },
         ),
         const Spacer(),

diff --git a/lib/widgets/system_drawer.dart b/lib/widgets/system_drawer.dart
@@ -11,10 +11,12 @@ class SystemDrawer extends StatefulWidget {
     super.key,
     this.userMode = false,
     this.isLocked = false,
+    this.userName = null,
   });
 
   final bool userMode;
   final bool isLocked;
+  final String? userName;
 
   @override
   State<SystemDrawer> createState() => _SystemDrawerState();
@@ -30,7 +32,8 @@ class _SystemDrawerState extends State<SystemDrawer> {
       child: ListView(
         shrinkWrap: true,
         children: [
-          widget.userMode && !Breakpoints.small.isActive(context) ? const AccountProfile() : null,
+          widget.userMode && !Breakpoints.small.isActive(context)
+            ? (widget.userName == null ? AccountProfile() : AccountProfile.name(name: widget.userName!)) : null,
           Row(
             children: [
               Expanded(

diff --git a/lib/widgets/system_layout.dart b/lib/widgets/system_layout.dart
@@ -15,13 +15,15 @@ class SystemLayout extends StatelessWidget {
     this.isLocked = false,
     this.bottomSheet,
     this.bottomNavigationBar,
+    this.userName = null,
   });
 
   final Widget body;
   final bool userMode;
   final bool isLocked;
   final Widget? bottomSheet;
   final Widget? bottomNavigationBar;
+  final String? userName;
 
   Widget _buildMobile(BuildContext context) =>
     BackdropScaffold(
@@ -57,9 +59,9 @@ class SystemLayout extends StatelessWidget {
                                 shape: const LinearBorder(),
                                 color: Theme.of(context).colorScheme.background,
                                 margin: EdgeInsets.zero,
-                                child: const Padding(
+                                child: Padding(
                                   padding: const EdgeInsets.all(8),
-                                  child: AccountProfile(),
+                                  child: userName == null ? AccountProfile() : AccountProfile.name(name: userName!),
                                 ),
                               ),
                             ),
@@ -108,6 +110,7 @@ class SystemLayout extends StatelessWidget {
               child: SystemDrawer(
                 userMode: userMode,
                 isLocked: isLocked,
+                userName: userName,
               ),
             ),
           ),