feat: adding app launcher

ExpidusOS-archive · May 10, 2024 · dda1c1d · dda1c1d
1 parent 53d3f06
commit dda1c1d
Show file tree

Hide file tree

Showing 17 changed files with 447 additions and 46 deletions.
diff --git a/lib/logic/applications.dart b/lib/logic/applications.dart
@@ -0,0 +1,63 @@
+import 'dart:async';
+import 'dart:collection';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+class ApplicationsManager {
+  static const channel = MethodChannel('com.expidusos.genesis.shell/applications');
+
+  ApplicationsManager() {
+    channel.setMethodCallHandler((call) async {
+      switch (call.method) {
+        case 'sync':
+          _sync();
+          break;
+        default:
+          throw MissingPluginException();
+      }
+    });
+
+    _sync();
+  }
+
+  List<Application> _applications = [];
+  UnmodifiableListView<Application> get applications => UnmodifiableListView(_applications);
+
+  void _sync() {
+    channel.invokeListMethod('list').then((list) {
+      _applications.clear();
+      _applications.addAll(list!.map(
+        (app) =>
+          Application(
+            id: app['id'],
+            name: app['name'],
+            displayName: app['displayName'],
+            description: app['description'],
+            isHidden: app['isHidden'],
+            icon: app['icon'],
+          )
+      ));
+    }).catchError((err) {
+      print(err);
+    });
+  }
+}
+
+class Application {
+  const Application({
+    this.id,
+    this.name,
+    this.displayName,
+    this.description,
+    this.isHidden = false,
+    this.icon,
+  });
+
+  final String? id;
+  final String? name;
+  final String? displayName;
+  final String? description;
+  final bool isHidden;
+  final String? icon;
+}
diff --git a/lib/logic/wm.dart b/lib/logic/wm.dart
@@ -13,7 +13,7 @@ class WindowManager extends ChangeNotifier {
     this.mode = WindowManagerMode.stacking,
   });
 
-  final WindowManagerMode mode;
+  WindowManagerMode mode;
   List<Window> _wins = [];
 
   void dispose() {}

diff --git a/lib/main.dart b/lib/main.dart
@@ -6,6 +6,7 @@ import 'package:libtokyo/libtokyo.dart' hide TokyoApp;
 import 'package:provider/provider.dart';
 
 import 'logic/account.dart';
+import 'logic/applications.dart';
 import 'logic/display.dart';
 import 'logic/outputs.dart';
 import 'logic/power.dart';
@@ -64,6 +65,7 @@ class GenesisShellApp extends StatefulWidget {
 
 class _GenesisShellAppState extends State<GenesisShellApp> {
   late AccountManager _accountManager;
+  late ApplicationsManager _applicationsManager;
   late DisplayManager _displayManager;
   late OutputManager _outputManager;
   late PowerManager _powerManager;
@@ -73,6 +75,7 @@ class _GenesisShellAppState extends State<GenesisShellApp> {
     super.initState();
 
     _accountManager = AccountManager();
+    _applicationsManager = ApplicationsManager();
     _displayManager = DisplayManager();
     _outputManager = OutputManager();
     _powerManager = PowerManager.auto();
@@ -90,6 +93,7 @@ class _GenesisShellAppState extends State<GenesisShellApp> {
     MultiProvider(
       providers: [
         ChangeNotifierProvider(create: (_) => _accountManager),
+        Provider(create: (_) => _applicationsManager),
         ChangeNotifierProvider(create: (_) => _displayManager),
         ChangeNotifierProvider(create: (_) => _outputManager),
         Provider(create: (_) => _powerManager),

diff --git a/lib/views/desktop.dart b/lib/views/desktop.dart
@@ -41,6 +41,7 @@ class _DesktopViewState extends State<DesktopView> {
   String? sessionName = null;
   DisplayServer? _displayServer = null;
   GlobalKey _key = GlobalKey();
+  GlobalKey<WindowManagerViewState> _wmKey = GlobalKey();
 
   void _syncOutputs() {
     final outputs = Provider.of<OutputManager>(_key.currentContext!, listen: false);
@@ -117,6 +118,7 @@ class _DesktopViewState extends State<DesktopView> {
         constraints: BoxConstraints.expand(),
         child: _displayServer != null
           ? WindowManagerView(
+              key: _wmKey,
               displayServer: _displayServer!,
               mode: Breakpoints.small.isActive(context) ? WindowManagerMode.stacking : WindowManagerMode.floating,
             ) : null,
@@ -128,7 +130,10 @@ class _DesktopViewState extends State<DesktopView> {
     if (_displayServer != null) {
       value = ChangeNotifierProvider<DisplayServer>.value(
         value: _displayServer!,
-        child: value,
+        child: ChangeNotifierProvider<WindowManager>(
+          create: (context) => _wmKey!.currentState!.instance,
+          child: value,
+        ),
       );
     }
     return value;

diff --git a/lib/widgets/system_layout.dart b/lib/widgets/system_layout.dart
@@ -1,4 +1,5 @@
 import 'package:backdrop/backdrop.dart';
+import 'package:flutter/material.dart' as material;
 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;
@@ -100,6 +101,7 @@ class SystemLayout extends StatelessWidget {
         ? Padding(
             padding: const EdgeInsets.all(8.0),
             child: Drawer(
+              width: double.infinity,
               shape: RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(16.0),
               ),
@@ -111,7 +113,14 @@ class SystemLayout extends StatelessWidget {
                       backgroundColor: Theme.of(context).colorScheme.surface,
                     ),
                   ),
-                  child: UserDrawer(),
+                  child: Builder(
+                    builder: (context) =>
+                      UserDrawer(
+                        onClose: () {
+                          material.Scaffold.of(context).closeDrawer();
+                        },
+                      ),
+                  ),
                 ),
               ),
             ),

diff --git a/lib/widgets/system_navbar.dart b/lib/widgets/system_navbar.dart
@@ -1,9 +1,19 @@
+import 'package:flutter/material.dart' as material;
 import 'package:libtokyo_flutter/libtokyo.dart' hide ColorScheme;
 import 'package:libtokyo/libtokyo.dart' hide TokyoApp, Scaffold;
 
-class SystemNavbar extends StatelessWidget {
+import 'user_drawer.dart';
+
+class SystemNavbar extends StatefulWidget {
   const SystemNavbar({ super.key });
 
+  @override
+  State<SystemNavbar> createState() => _SystemNavbarState();
+}
+
+class _SystemNavbarState extends State<SystemNavbar> {
+  PersistentBottomSheetController? _controller;
+
   @override
   Widget build(BuildContext context) =>
     BottomAppBar(
@@ -17,7 +27,19 @@ class SystemNavbar extends StatelessWidget {
             icon: Icon(Icons.chevronLeft),
           ),
           IconButton(
-            onPressed: () {},
+            onPressed: () {
+              if (_controller != null) {
+                _controller!.close();
+                _controller = null;
+              } else {
+                _controller = material.Scaffold.of(context).showBottomSheet((context) =>
+                  UserDrawer(
+                    onClose: () {
+                      _controller!.close();
+                    },
+                  ));
+              }
+            },
             icon: Icon(Icons.circleDot),
           ),
           IconButton(

diff --git a/lib/widgets/toplevel.dart b/lib/widgets/toplevel.dart
@@ -20,8 +20,25 @@ class ToplevelDecor extends StatelessWidget {
   final VoidCallback? onClose;
 
   @override
-  Widget build(BuildContext context) =>
-    AppBar(
+  Widget build(BuildContext context) {
+    final actions = [
+      onMinimize != null
+        ? IconButton(
+            onPressed: onMinimize!,
+            icon: Icon(Icons.windowMinimize),
+          ) : null,
+      onMaximize != null
+        ? IconButton(
+            onPressed: onMaximize!,
+            icon: Icon(Icons.windowMaximize),
+          ) : null,
+      onClose != null
+        ? IconButton(
+            onPressed: onClose!,
+            icon: Icon(Icons.circleXmark),
+          ) : null,
+    ].where((e) => e != null).toList().cast<Widget>();
+    return AppBar(
       automaticallyImplyLeading: false,
       primary: false,
       title: Text(toplevel.title ?? 'Untitled Window'),
@@ -32,24 +49,12 @@ class ToplevelDecor extends StatelessWidget {
           topRight: Radius.circular(12),
         ),
       ),
-      actions: [
-        onMinimize != null
-          ? IconButton(
-              onPressed: onMinimize!,
-              icon: Icon(Icons.windowMinimize),
-            ) : null,
-        onMaximize != null
-          ? IconButton(
-              onPressed: onMaximize!,
-              icon: Icon(Icons.windowMaximize),
-            ) : null,
-        onClose != null
-          ? IconButton(
-              onPressed: onClose!,
-              icon: Icon(Icons.circleXmark),
-            ) : null,
-      ].where((e) => e != null).toList().cast<Widget>(),
+      actions: actions.isEmpty
+        ? [
+            const SizedBox()
+          ] : actions,
     );
+  }
 }
 
 class ToplevelView extends StatefulWidget {
@@ -91,13 +96,10 @@ class _ToplevelViewState extends State<ToplevelView> {
 
   @override
   Widget _buildContent(BuildContext context, DisplayServerToplevel toplevel) {
-    Widget content = ConstrainedBox(
-      constraints: toplevel.buildBoxConstraints(),
-      child: toplevel.texture == null
-        ? SizedBox() : Texture(
-            textureId: toplevel.texture!,
-          ),
-    );
+    Widget content = toplevel.texture == null
+      ? SizedBox() : Texture(
+          textureId: toplevel.texture!,
+        );
 
     if (widget.isFocusable) {
       content = Focus(
@@ -116,7 +118,10 @@ class _ToplevelViewState extends State<ToplevelView> {
           return true;
         },
         child: SizeChangedLayoutNotifier(
-          child: content,
+          child: ConstrainedBox(
+            constraints: toplevel.buildBoxConstraints(),
+            child: content,
+          ),
         ),
       );
     }