diff --git a/client/lib/app.dart b/client/lib/app.dart index a56e9b68..0ee9f475 100644 --- a/client/lib/app.dart +++ b/client/lib/app.dart @@ -72,8 +72,19 @@ class PhylumApp extends StatelessWidget { key: ValueKey(account.id), title: 'Phylum', debugShowCheckedModeBanner: false, - theme: ThemeData(colorScheme: ColorScheme.fromSeed(seedColor: Colors.orange)), - darkTheme: ThemeData.dark(), + theme: ThemeData( + colorScheme: ColorScheme.fromSeed( + seedColor: Color(0x0063a002), + dynamicSchemeVariant: DynamicSchemeVariant.neutral, + ), + ), + darkTheme: ThemeData( + colorScheme: ColorScheme.fromSeed( + seedColor: Color(0x0063a002), + dynamicSchemeVariant: DynamicSchemeVariant.neutral, + brightness: Brightness.dark, + ), + ), routerConfig: _appRouter, shortcuts: getAppShortcuts(), ); diff --git a/client/lib/ui/app/app_layout.dart b/client/lib/ui/app/app_layout.dart index 1b61c3b4..2d3463c6 100644 --- a/client/lib/ui/app/app_layout.dart +++ b/client/lib/ui/app/app_layout.dart @@ -73,7 +73,13 @@ class AppLayout extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ PathView.create(folderId), - Expanded(child: ExplorerView.create(folderId)), + Expanded( + child: Card( + margin: const EdgeInsets.all(12), + elevation: 0, + child: ExplorerView.create(folderId), + ), + ), ], ); } diff --git a/client/lib/ui/explorer/path_view.dart b/client/lib/ui/explorer/path_view.dart index de35d108..7d98b714 100644 --- a/client/lib/ui/explorer/path_view.dart +++ b/client/lib/ui/explorer/path_view.dart @@ -15,7 +15,13 @@ class PathView extends StatefulWidget { static Widget create(String id) { return SizedBox( height: 56, - child: Align(alignment: Alignment.centerLeft, child: PathView._(id: id)), + child: Align( + alignment: Alignment.centerLeft, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12), + child: PathView._(id: id), + ), + ), ); } @@ -63,17 +69,26 @@ class _PathViewState extends State { @override Widget build(BuildContext context) { if (ancestors == null) { - return const Text('Loading'); + return const Text(''); } return Row( mainAxisSize: MainAxisSize.min, children: [ for (final r in ancestors!) - ElevatedButton( - child: Text(r.parent == null ? "/" : r.name), - onPressed: () { - context.goNamed('folder', pathParameters: {'id': r.id}); - }, + Card( + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)), + margin: EdgeInsets.symmetric(horizontal: 6), + child: InkWell( + onTap: r.id == widget.id + ? null + : () { + context.goNamed('folder', pathParameters: {'id': r.id}); + }, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + child: Text(r.parent == null ? "/" : r.name), + ), + ), ), ], );