Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lib/screens/widgets/overrides/button_themes.dart

Author: Lukas Gundermann

lib/screens/widgets/overrides/button_themes.dart

@@ -11,9 +11,6 @@ class ButtonThemes extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final isDark = context.watch<ThemeCubit>().state.isDarkMode;
-    final bgColor = isDark ? Colors.gray[400] : Colors.gray[100];
-    final textColor = isDark ? Colors.black : Colors.blue[900];
-    final iconColor = textColor;
     return ComponentTheme(
       data: OutlineButtonTheme(
         decoration: (context, states, defaultDecoration) {
@@ -33,18 +30,18 @@ class ButtonThemes extends StatelessWidget {
             );
           } else {
             return defaultDecoration.copyWithIfBoxDecoration(
-              color: bgColor,
+              color: isDark ? Colors.gray[400] : Colors.gray[100],
               border: Border.all(
                 color: isDark ? Colors.blue[100] : Colors.blue[900],
               ),
             );
           }
         },
         textStyle: (context, states, defaultTextStyle) {
-          return defaultTextStyle.copyWith(color: textColor);
+          return defaultTextStyle.copyWith(color: isDark ? Colors.black : Colors.blue[900]);
         },
         iconTheme: (context, states, defaultIconTheme) {
-          return defaultIconTheme.copyWith(color: iconColor);
+          return defaultIconTheme.copyWith(color: isDark ? Colors.black : Colors.blue[900]);
         },
       ),
       child: ComponentTheme(
@@ -59,14 +56,14 @@ class ButtonThemes extends StatelessWidget {
                 color: isDark ? Colors.gray[300] : Colors.gray[200],
               );
             } else {
-              return defaultDecoration.copyWithIfBoxDecoration(color: bgColor);
+              return defaultDecoration.copyWithIfBoxDecoration(color: isDark ? Colors.gray[400] : Colors.gray[100]);
             }
           },
           textStyle: (context, states, defaultTextStyle) {
-            return defaultTextStyle.copyWith(color: textColor);
+            return defaultTextStyle.copyWith(color: isDark ? Colors.black : Colors.blue[900]);
           },
           iconTheme: (context, states, defaultIconTheme) {
-            return defaultIconTheme.copyWith(color: iconColor);
+            return defaultIconTheme.copyWith(color: isDark ? Colors.black : Colors.blue[900]);
           },
         ),
         child: ComponentTheme(
@@ -84,20 +81,22 @@ class ButtonThemes extends StatelessWidget {
                 return defaultTextStyle.copyWith(
                   color: isDark ? Colors.gray[300] : Colors.gray[600],
                 );
-              } else if (states.contains(WidgetState.hovered)) {
-                return defaultTextStyle.copyWith(
-                  color: isDark ? Colors.gray[300] : Colors.blue[900],
-                );
               } else {
                 return defaultTextStyle.copyWith(
                   color: isDark ? Colors.gray[300] : Colors.blue[900],
                 );
               }
             },
             iconTheme: (context, states, defaultIconTheme) {
-              return defaultIconTheme.copyWith(
-                color: isDark ? Colors.gray[300] : Colors.blue[900],
-              );
+              if (states.contains(WidgetState.disabled)) {
+                return defaultIconTheme.copyWith(
+                  color: isDark ? Colors.gray[300] : Colors.gray[600],
+                );
+              } else {
+                return defaultIconTheme.copyWith(
+                  color: isDark ? Colors.gray[300] : Colors.blue[900],
+                );
+              }
             },
           ),
           child: ComponentTheme(