feat(activity_drawer): rename from user_drawer and restrict running w…

…indows height
ExpidusOS-archive · May 11, 2024 · c3b74d1 · c3b74d1
1 parent 27229e6
commit c3b74d1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/lib/widgets/user_drawer.dart → lib/widgets/activity_drawer.dart b/lib/widgets/user_drawer.dart → lib/widgets/activity_drawer.dart
@@ -13,8 +13,8 @@ import '../logic/wm.dart';
 
 import 'toplevel.dart';
 
-class UserDrawer extends StatelessWidget {
-  const UserDrawer({
+class ActivityDrawer extends StatelessWidget {
+  const ActivityDrawer({
     super.key,
     required this.onClose,
     this.hasDisplayServer = false,
@@ -28,7 +28,7 @@ class UserDrawer extends StatelessWidget {
     ListView(
       children: [
         hasDisplayServer
-          ? SingleChildScrollView(
+          ? Container(height: MediaQuery.of(context).size.height / 3, child: SingleChildScrollView(
               scrollDirection: Axis.horizontal,
               child: Row(
                 children: context.watch<DisplayServer>().toplevels.map(
@@ -77,11 +77,14 @@ class UserDrawer extends StatelessWidget {
                     )
                 ).toList(),
               ),
-            ) : null,
+            )) : null,
         Padding(
           padding: const EdgeInsets.all(8),
-          child: GridView.count(
-            crossAxisCount: 5,
+          child: GridView(
+            gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+              maxCrossAxisExtent: 84,
+              mainAxisExtent: 84,
+            ),
             shrinkWrap: true,
             children: (Provider.of<ApplicationsManager>(context).applications.toList()..where((app) => !app.isHidden))
               .map(
@@ -93,24 +96,26 @@ class UserDrawer extends StatelessWidget {
                     },
                     child: Column(
                       children: [
+                        const Spacer(),
                         app.icon != null
                           ? (path.extension(app.icon!) == '.svg'
                             ? SvgPicture.file(
                                 File(app.icon!),
-                                width: 40,
-                                height: 40,
+                                width: 64,
+                                height: 64,
                               ) : Image.file(
                                     File(app.icon!),
-                                    width: 40,
-                                    height: 40,
-                                  )) : Icon(Icons.tablet, size: 40),
+                                    width: 64,
+                                    height: 64,
+                                  )) : Icon(Icons.tablet, size: 58),
                         Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 4.0),
                           child: Text(
                             app.displayName ?? app.name ?? '',
                             overflow: TextOverflow.ellipsis,
                           ),
                         ),
+                        const Spacer(),
                       ],
                     ),
                   )

diff --git a/lib/widgets/system_layout.dart b/lib/widgets/system_layout.dart
@@ -4,11 +4,11 @@ import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
 import 'package:libtokyo_flutter/libtokyo.dart' hide ColorScheme;
 import 'package:libtokyo/libtokyo.dart' hide TokyoApp, Scaffold;
 
+import 'activity_drawer.dart';
 import 'account_profile.dart';
 import 'output_layout.dart';
 import 'system_bar.dart';
 import 'system_drawer.dart';
-import 'user_drawer.dart';
 
 class SystemLayout extends StatelessWidget {
   const SystemLayout({
@@ -117,7 +117,7 @@ class SystemLayout extends StatelessWidget {
                   ),
                   child: Builder(
                     builder: (context) =>
-                      UserDrawer(
+                      ActivityDrawer(
                         hasDisplayServer: hasDisplayServer,
                         onClose: () {
                           material.Scaffold.of(context).closeDrawer();

diff --git a/lib/widgets/system_navbar.dart b/lib/widgets/system_navbar.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
 import 'package:libtokyo_flutter/libtokyo.dart' hide ColorScheme;
 import 'package:libtokyo/libtokyo.dart' hide TokyoApp, Scaffold;
 
-import 'user_drawer.dart';
+import 'activity_drawer.dart';
 
 class SystemNavbar extends StatefulWidget {
   const SystemNavbar({ super.key });
@@ -33,7 +33,7 @@ class _SystemNavbarState extends State<SystemNavbar> {
                 _controller = null;
               } else {
                 _controller = material.Scaffold.of(context).showBottomSheet((context) =>
-                  UserDrawer(
+                  ActivityDrawer(
                     onClose: () {
                       _controller!.close();
                     },

diff --git a/nix/module.nix b/nix/module.nix
@@ -7,6 +7,7 @@
         program = "${lib.getExe pkgs.expidus.genesis-shell} --display-manager";
       };
       accounts-daemon.enable = true;
+      upower.enable = true;
     };
 
     users.users.${config.services.cage.user} = {