Adjusted some ThemeData.

Author: Clon1998

lib/main.dart

@@ -45,8 +45,8 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
         title: 'Mobileraker',
-        theme: getLightTheme(),
-        darkTheme: getDarkTheme(),
+        theme: getLightTheme(context),
+        darkTheme: getDarkTheme(context),
         navigatorKey: StackedService.navigatorKey,
         onGenerateRoute: StackedRouter().onGenerateRoute,
         localizationsDelegates: [

lib/ui/theme_setup.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 const int darkRed = 0xffb21818;
@@ -14,7 +15,6 @@ var redish = MaterialColor(darkRed, <int, Color>{
   900: Color(darkRed),
 });
 
-
 var brownish = MaterialColor(0xffd2a855, <int, Color>{
   50: Color(0xfff6f0e1),
   100: Color(0xffebd9b3),
@@ -67,12 +67,35 @@ var tealy = MaterialColor(0xff18b2b2, <int, Color>{
   900: Color(0xff004941),
 });
 
-ThemeData getLightTheme() => ThemeData(
-      primarySwatch: Colors.blue,
-    );
+ThemeData getLightTheme(BuildContext context) {
+  var themeData =  ThemeData(
+    primarySwatch: Colors.blue,
+  );
+
+  return themeData.copyWith(
+    elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+            padding: EdgeInsets.all(8),
+            shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(Radius.circular(5.0))))),
+  );
 
-ThemeData getDarkTheme() => ThemeData(
-    colorScheme: ColorScheme.fromSwatch(
-        primarySwatch: brownish,
-        brightness: Brightness.dark,
-        accentColor: Color(darkRed)),);
+}
+
+ThemeData getDarkTheme(BuildContext context) {
+  var colorScheme = ColorScheme.fromSwatch(
+          primarySwatch: brownish,
+          primaryColorDark: Colors.grey[900]!,
+          brightness: Brightness.dark,
+          accentColor: Color(darkRed));
+  return ThemeData(
+      elevatedButtonTheme: ElevatedButtonThemeData(
+          style: ElevatedButton.styleFrom(
+              primary: colorScheme.secondary,
+              onPrimary: colorScheme.onSecondary,
+              padding: EdgeInsets.all(8),
+              shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(5.0))))),
+      colorScheme: colorScheme,
+    );
+}

lib/ui/views/overview/tabs/control_tab.dart

@@ -146,8 +146,6 @@ class _FanTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var col = Theme.of(context).primaryColorLight;
-
     double icoSize = 30;
     var w = speed > 0
         ? SpinningFan(size: icoSize)
@@ -158,7 +156,6 @@ class _FanTile extends StatelessWidget {
 
     return CardWithButton(
         width: width,
-        backgroundColor: col,
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
@@ -241,38 +238,24 @@ class ExtruderControlCard extends ViewModelWidget<ControlTabViewModel> {
                   children: [
                     Container(
                       margin: const EdgeInsets.all(5),
-                      child: TextButton.icon(
+                      child: ElevatedButton.icon(
                         onPressed:
                             model.canUsePrinter ? model.onDeRetractBtn : null,
                         icon: Icon(FlutterIcons.plus_ant),
                         label:
                             Text('pages.overview.control.extrude_card.extrude')
                                 .tr(),
-                        style: TextButton.styleFrom(
-                            backgroundColor:
-                                Theme.of(context).colorScheme.secondary,
-                            shape: RoundedRectangleBorder(
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(5.0))),
-                            primary: textBtnColor),
                       ),
                     ),
                     Container(
                       margin: const EdgeInsets.all(5),
-                      child: TextButton.icon(
+                      child: ElevatedButton.icon(
                         onPressed:
                             model.canUsePrinter ? model.onRetractBtn : null,
                         icon: Icon(FlutterIcons.minus_ant),
                         label:
                             Text('pages.overview.control.extrude_card.retract')
                                 .tr(),
-                        style: TextButton.styleFrom(
-                            backgroundColor:
-                                Theme.of(context).colorScheme.secondary,
-                            shape: RoundedRectangleBorder(
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(5.0))),
-                            primary: textBtnColor),
                       ),
                     ),
                   ],
@@ -330,9 +313,12 @@ class GcodeMacroCard extends ViewModelWidget<ControlTabViewModel> {
           ),
           Padding(
             padding: const EdgeInsets.fromLTRB(15, 0, 15, 15),
-            child: Wrap(
-              spacing: 5.0,
-              children: _generateGCodeChips(context, model),
+            child: ChipTheme(
+              data: ChipThemeData(labelStyle: TextStyle(color: Colors.white),deleteIconColor: Colors.white),
+              child: Wrap(
+                spacing: 5.0,
+                children: _generateGCodeChips(context, model),
+              ),
             ),
           ),
         ],
@@ -453,11 +439,8 @@ class _PinTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var col = Theme.of(context).primaryColorLight;
-
     return CardWithButton(
         width: width,
-        backgroundColor: col,
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -496,27 +479,17 @@ class MultipliersCard extends ViewModelWidget<ControlTabViewModel> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: <Widget>[
-                TextButton(
+                ElevatedButton(
                   onPressed:
                       model.canUsePrinter ? model.onEditSpeedMultiplier : null,
                   child: Text(
                       '${tr('pages.overview.general.print_card.speed')}: ${model.speedMultiplier}%'),
-                  style: TextButton.styleFrom(
-                      backgroundColor: Theme.of(context).colorScheme.secondary,
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(5.0))),
-                      primary: textBtnColor),
                 ),
-                TextButton(
+                ElevatedButton(
                   onPressed:
                       model.canUsePrinter ? model.onEditFlowMultiplier : null,
                   child: Text(
                       '${tr('pages.overview.control.multipl_card.flow')}: ${model.flowMultiplier}%'),
-                  style: TextButton.styleFrom(
-                      backgroundColor: Theme.of(context).colorScheme.secondary,
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(5.0))),
-                      primary: textBtnColor),
                 ),
               ],
             ),