move to material design 3

hobleyd · Dec 19, 2023 · 23abeed · 23abeed
1 parent c2b7eab
commit 23abeed
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/lib/providers/shackleton_theme.dart b/lib/providers/shackleton_theme.dart
@@ -14,13 +14,12 @@ class ShackletonTheme extends _$ShackletonTheme {
 
   ThemeData buildThemeData(double fontSize) {
     return ThemeData(
+      colorSchemeSeed: Colors.teal,
       fontFamily: Platform.isMacOS ? 'San Francisco' : 'OpenSans',
       inputDecorationTheme: const InputDecorationTheme(
           enabledBorder: UnderlineInputBorder(borderSide: BorderSide(color: Colors.grey)),
           errorBorder: UnderlineInputBorder(borderSide: BorderSide(color: Colors.red, width: 2)),
           focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: Colors.teal, width: 2))),
-      primarySwatch: Colors.teal,
-      splashColor: Colors.blueGrey,
       textTheme: TextTheme(
         titleSmall:  TextStyle(fontSize: fontSize - 2, fontWeight: FontWeight.w700),
         bodyMedium:  TextStyle(fontSize: fontSize + 1, fontWeight: FontWeight.w400),
@@ -31,6 +30,7 @@ class ShackletonTheme extends _$ShackletonTheme {
       textSelectionTheme: const TextSelectionThemeData(
         selectionHandleColor: Color(0xf0e8e4df),
       ),
+      useMaterial3: true,
       visualDensity: VisualDensity.compact,
     );
   }

diff --git a/lib/widgets/import_folder.dart b/lib/widgets/import_folder.dart
@@ -22,6 +22,8 @@ class _ImportFolder extends ConsumerState<ImportFolder> {
 
     return Scaffold(
         appBar: AppBar(
+          elevation: 2,
+          shadowColor: Theme.of(context).shadowColor,
           title: Text('Import files to Library', style: Theme.of(context).textTheme.labelSmall),
         ),
         body: Consumer(

diff --git a/lib/widgets/navigation.dart b/lib/widgets/navigation.dart
@@ -43,7 +43,7 @@ class _Navigation extends ConsumerState<Navigation> {
           },
           child: Container(
             alignment: Alignment.topLeft,
-            color: const Color.fromRGBO(217, 217, 217, 100),
+            color: Theme.of(context).secondaryHeaderColor,
             child: EntityContextMenu(
               fileType: FileType.folderList,
               folder: FileOfInterest(entity: Directory(getHomeFolder())),
@@ -54,7 +54,7 @@ class _Navigation extends ConsumerState<Navigation> {
                   child: Column(
                     children: [
                       const NavigationSpace(),
-                      Container(color: const Color.fromRGBO(217, 217, 217, 100), height: 2),
+                      Container(color: Theme.of(context).primaryColorLight, height: 2),
                       const NavigationFavourites(),
                       if (Platform.isMacOS || Platform.isLinux) ...[
                         const SizedBox(height: 10),

diff --git a/lib/widgets/preview_pane.dart b/lib/widgets/preview_pane.dart
@@ -37,6 +37,8 @@ class _PreviewPane extends ConsumerState<PreviewPane> implements KeyboardCallbac
 
     return Scaffold(
         appBar: AppBar(
+          elevation: 2,
+          shadowColor: Theme.of(context).shadowColor,
           title: Text(entities.toString(), style: Theme.of(context).textTheme.labelSmall),
         ),
         body: Row(children: [

diff --git a/lib/widgets/shackleton.dart b/lib/widgets/shackleton.dart
@@ -37,6 +37,8 @@ class _Shackleton extends ConsumerState<Shackleton> {
 
     return Scaffold(
         appBar: AppBar(
+          elevation: 2,
+          shadowColor: Theme.of(context).shadowColor,
           title: Text(paths.map((e) => basename(e.path)).toList().toString(), style: Theme.of(context).textTheme.labelSmall),
           actions: <Widget>[
             IconButton(icon: const Icon(Icons.import_export), tooltip: 'Import images from folder...', onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => const ImportFolder()))),

diff --git a/lib/widgets/shackleton_settings.dart b/lib/widgets/shackleton_settings.dart
@@ -27,6 +27,8 @@ class ShackletonSettings extends ConsumerWidget {
         fontSizeController.text = '${appSettings.fontSize}';
         return Scaffold(
           appBar: AppBar(
+            elevation: 2,
+            shadowColor: Theme.of(context).shadowColor,
             title: Text('Settings', style: Theme.of(context).textTheme.labelSmall),
           ),
           body: Padding(