Drive list QoL improvements

Author: dvd-bnc

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

lib/backend/drive_provider.dart

@@ -15,6 +15,8 @@ class DriveProvider with ChangeNotifier {
 
   List<UDisksBlockDevice> get blockDevices => List.of(_blockDevices);
   List<UDisksDrive> get drives => List.of(_drives);
+  List<String> get supportedFilesystems =>
+      List.of(_client.supportedFilesystems);
 
   Future<void> init() async {
     await _client.connect();

lib/widgets/drive_list.dart

@@ -2,16 +2,18 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:files/backend/providers.dart';
+import 'package:files/backend/workspace.dart';
 import 'package:files/widgets/separated_flex.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flutter/material.dart';
+import 'package:path/path.dart' as p;
 import 'package:udisks/udisks.dart';
 import 'package:yaru/yaru.dart';
 
 class DriveList extends StatelessWidget {
-  const DriveList({this.onDriveTap, super.key});
+  const DriveList({required this.workspace, super.key});
 
-  final ValueChanged<String>? onDriveTap;
+  final WorkspaceController workspace;
 
   @override
   Widget build(BuildContext context) {
@@ -29,11 +31,11 @@ class DriveList extends StatelessWidget {
                     !e.userspaceMountOptions.contains('x-gvfs-hide'),
               )
               .where((e) => !e.hintIgnore && e.filesystem != null)
+              .where(
+                (e) => driveProvider.supportedFilesystems.contains(e.idType),
+              )
               .map(
-                (e) => _DriveTile(
-                  blockDevice: e,
-                  onTap: onDriveTap,
-                ),
+                (e) => _DriveTile(blockDevice: e, workspace: workspace),
               )
               .toList(),
         );
@@ -45,10 +47,11 @@ class DriveList extends StatelessWidget {
 class _DriveTile extends StatefulWidget {
   const _DriveTile({
     required this.blockDevice,
-    this.onTap,
+    required this.workspace,
   });
+
   final UDisksBlockDevice blockDevice;
-  final ValueChanged<String>? onTap;
+  final WorkspaceController workspace;
 
   @override
   State<_DriveTile> createState() => _DriveTileState();
@@ -118,6 +121,13 @@ class _DriveTileState extends State<_DriveTile> {
             ? YaruOptionButton(
                 onPressed: () async {
                   await widget.blockDevice.filesystem!.unmount();
+                  if (p.isWithin(mountPoint!, widget.workspace.currentDir) ||
+                      p.equals(mountPoint!, widget.workspace.currentDir)) {
+                    await widget.workspace.changeCurrentDir(
+                      folderProvider.destinations.first.path,
+                    );
+                  }
+
                   setState(() {});
                 },
                 style: OutlinedButton.styleFrom(
@@ -132,7 +142,7 @@ class _DriveTileState extends State<_DriveTile> {
             setState(() {});
           }
 
-          widget.onTap?.call(mountPoint!);
+          await widget.workspace.changeCurrentDir(mountPoint!);
         },
       ),
     );

lib/widgets/side_pane.dart

@@ -58,11 +58,11 @@ class _SidePaneState extends State<SidePane> {
       child: Material(
         color: Theme.of(context).colorScheme.surface,
         child: ListView.separated(
-          padding: const EdgeInsets.only(top: 16),
+          padding: const EdgeInsets.only(top: 16, bottom: 16),
           itemCount: widget.destinations.length + 1,
           separatorBuilder: (context, index) {
             if (index == widget.destinations.length - 1) {
-              return const Divider();
+              return const Divider(height: 32);
             }
 
             return SizedBox(
@@ -71,7 +71,7 @@ class _SidePaneState extends State<SidePane> {
           },
           itemBuilder: (context, index) {
             if (index == widget.destinations.length) {
-              return DriveList(onDriveTap: widget.workspace.changeCurrentDir);
+              return DriveList(workspace: widget.workspace);
             }
 
             return ContextMenu(

lib/widgets/workspace.dart

@@ -466,7 +466,6 @@ class _WorkspaceTopbar extends StatelessWidget {
       case WorkspaceView.grid:
         return YaruIcons.app_grid;
       case WorkspaceView.table:
-      default:
         return YaruIcons.unordered_list;
     }
   }