Updated to Material3

dchristl · Mar 29, 2024 · a562ce7 · a562ce7
1 parent 684993c
commit a562ce7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/macless_haystack/lib/accessory/accessory_list.dart b/macless_haystack/lib/accessory/accessory_list.dart
@@ -95,8 +95,7 @@ class _AccessoryListState extends State<AccessoryList> {
                                     accessory.name);
                               }
                             },
-                            backgroundColor: Colors.blue,
-                            foregroundColor: Colors.white,
+                            foregroundColor: Theme.of(context).primaryColor,
                             icon: Icons.directions,
                             label: 'Navigate',
                           ),
@@ -111,8 +110,7 @@ class _AccessoryListState extends State<AccessoryList> {
                                         )),
                               );
                             },
-                            backgroundColor: Colors.orange,
-                            foregroundColor: Colors.white,
+                            backgroundColor: Theme.of(context).primaryColor,
                             icon: Icons.history,
                             label: 'History',
                           ),

diff --git a/macless_haystack/lib/dashboard/dashboard.dart b/macless_haystack/lib/dashboard/dashboard.dart
@@ -25,7 +25,6 @@ class Dashboard extends StatefulWidget {
 }
 
 class _DashboardState extends State<Dashboard> {
-
   /// A list of the tabs displayed in the bottom tab bar.
   late final List<Map<String, dynamic>> _tabs = [
     {
@@ -143,7 +142,7 @@ class _DashboardState extends State<Dashboard> {
                 ))
             .toList(),
         currentIndex: _selectedIndex,
-        selectedItemColor: Theme.of(context).indicatorColor,
+        unselectedItemColor: Theme.of(context).secondaryHeaderColor,
         onTap: _onItemTapped,
       ),
       floatingActionButton:

diff --git a/macless_haystack/lib/item_management/item_file_import.dart b/macless_haystack/lib/item_management/item_file_import.dart
@@ -273,18 +273,15 @@ class _ItemFileImportState extends State<ItemFileImport> {
       appBar: AppBar(
         title: const Text('Select Accessories'),
         actions: [
-          TextButton(
+          ElevatedButton(
             onPressed: () {
               if (accessories != null) {
                 _importSelectedAccessories();
                 Navigator.of(context, rootNavigator: true).pop();
               }
             },
-            child: Text(
-              'Import',
-              style: TextStyle(
-                color: accessories == null ? Colors.grey : Colors.white,
-              ),
+            child: const Text(
+              'Import'
             ),
           ),
         ],

diff --git a/macless_haystack/lib/main.dart b/macless_haystack/lib/main.dart
@@ -26,9 +26,7 @@ class MyApp extends StatelessWidget {
       child: MaterialApp(
         title: 'Macless Haystack',
         theme: ThemeData(
-          brightness: Brightness.light,
-          primarySwatch: Colors.blue,
-          primaryColor: Colors.blue
+          primarySwatch: Colors.blue
         ),
         darkTheme: ThemeData.dark(),
         home: const AppLayout(),