diff --git a/example/lib/view/colors_view.dart b/example/lib/view/colors_view.dart index b6a803721..ba8c7f852 100644 --- a/example/lib/view/colors_view.dart +++ b/example/lib/view/colors_view.dart @@ -7,9 +7,130 @@ class ColorsView extends StatelessWidget { @override Widget build(BuildContext context) { + final theme = Theme.of(context); return ListView( padding: const EdgeInsets.all(15.0), children: [ + Text( + 'Colors', + style: Theme.of(context).textTheme.headlineMedium, + ), + const SizedBox(height: 15.0), + _themeColorRow( + theme.primaryColor, + 'primaryColor', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.primary, + 'colorScheme.primary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onPrimary, + 'colorScheme.onPrimary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onPrimaryContainer, + 'colorScheme.onPrimaryContainer', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.secondary, + 'colorScheme.secondary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onSecondary, + 'colorScheme.onSecondary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.secondaryContainer, + 'colorScheme.secondaryContainer', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onSecondaryContainer, + 'colorScheme.onSecondaryContainer', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.tertiary, + 'colorScheme.tertiary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onTertiary, + 'colorScheme.onTertiary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.tertiaryContainer, + 'colorScheme.tertiaryContainer', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onTertiaryContainer, + 'colorScheme.onTertiaryContainer', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.surface, + 'colorScheme.surface', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.surfaceTint, + 'colorScheme.surfaceTint', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.surfaceVariant, + 'colorScheme.surfaceVariant', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.background, + 'colorScheme.background', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onBackground, + 'colorScheme.onBackground', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.inversePrimary, + 'colorScheme.inversePrimary', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.inverseSurface, + 'colorScheme.inverseSurface', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.error, + 'colorScheme.error', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.errorContainer, + 'colorScheme.errorContainer', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.onError, + 'colorScheme.onError', + theme.brightness, + ), + _themeColorRow( + theme.colorScheme.scrim, + 'colorScheme.scrim', + theme.brightness, + ), Text( 'Accent Colors', style: Theme.of(context).textTheme.headlineMedium, @@ -111,6 +232,35 @@ class ColorsView extends StatelessWidget { ); } + Row _themeColorRow(Color color, String label, Brightness brightness) { + return Row( + children: [ + Expanded( + child: Container( + color: color, + height: 40, + child: Center( + child: Text( + label, + style: TextStyle( + color: Colors.white, + shadows: [ + BoxShadow( + offset: const Offset(1, 1), + color: Colors.black.withOpacity(0.8), + spreadRadius: 3, + blurRadius: 3, + ) + ], + ), + ), + ), + ), + ), + ], + ); + } + Widget colorPaletteExample(String colorName, MaterialColor color) { Map colorEntry = {colorName: color}; int shade = 50; diff --git a/lib/src/themes/common_themes.dart b/lib/src/themes/common_themes.dart index cc4287e28..5514005b9 100644 --- a/lib/src/themes/common_themes.dart +++ b/lib/src/themes/common_themes.dart @@ -5,6 +5,9 @@ import 'package:yaru/src/themes/constants.dart'; import 'package:yaru/src/themes/page_transitions.dart'; import 'package:yaru_colors/yaru_colors.dart'; +const kDividerColorDark = Color(0xff3a3a3a); +const kDividerColorLight = Color(0xffdcdcdc); + // AppBar AppBarTheme _createLightAppBar(ColorScheme colorScheme) { @@ -264,7 +267,9 @@ Color _getSwitchTrackColor( if (states.contains(MaterialState.selected)) { return colorScheme.primary; } else { - return colorScheme.onSurface.withOpacity(0.1); + return brightness == Brightness.dark + ? kDividerColorDark + : kDividerColorLight; } } } @@ -353,20 +358,44 @@ ProgressIndicatorThemeData _createProgressIndicatorTheme( /// Helper function to create a new Yaru light theme ThemeData createYaruLightTheme({ - required ColorScheme colorScheme, required Color primaryColor, Color? elevatedButtonColor, bool? useMaterial3 = true, }) { - const dividerColor = Color(0xffdcdcdc); + final colorScheme = ColorScheme.fromSeed( + seedColor: primaryColor, + error: YaruColors.error, + brightness: Brightness.light, + primary: primaryColor, + onPrimary: Colors.white, + primaryContainer: YaruColors.porcelain, + onPrimaryContainer: YaruColors.inkstone, + inversePrimary: YaruColors.inkstone, + secondary: elevatedButtonColor ?? primaryColor, + onSecondary: Colors.white, + secondaryContainer: elevatedButtonColor ?? YaruColors.porcelain, + onSecondaryContainer: + elevatedButtonColor != null ? Colors.white : YaruColors.inkstone, + background: Colors.white, + onBackground: YaruColors.inkstone, + surface: YaruColors.porcelain, + onSurface: YaruColors.inkstone, + inverseSurface: YaruColors.jet, + onInverseSurface: YaruColors.porcelain, + surfaceTint: YaruColors.warmGrey, + surfaceVariant: YaruColors.warmGrey, + tertiary: const Color(0xFF18b6ec), + onTertiary: Colors.white, + tertiaryContainer: const Color(0xFF18b6ec), + onTertiaryContainer: Colors.white, + onSurfaceVariant: YaruColors.coolGrey, + outline: kDividerColorLight, + scrim: Colors.black, + ); return ThemeData.from( useMaterial3: useMaterial3, - colorScheme: ColorScheme.fromSeed( - seedColor: primaryColor, - brightness: Brightness.light, - error: colorScheme.error, - ), + colorScheme: colorScheme, ).copyWith( iconButtonTheme: IconButtonThemeData( style: IconButton.styleFrom( @@ -381,14 +410,14 @@ ThemeData createYaruLightTheme({ _createProgressIndicatorTheme(colorScheme, Brightness.light), pageTransitionsTheme: YaruPageTransitionsTheme.horizontal, tabBarTheme: - _createTabBarTheme(colorScheme, Brightness.light, dividerColor), + _createTabBarTheme(colorScheme, Brightness.light, kDividerColorLight), dialogTheme: _createDialogTheme(Brightness.light), brightness: Brightness.light, primaryColor: colorScheme.primary, canvasColor: colorScheme.background, scaffoldBackgroundColor: colorScheme.background, cardColor: colorScheme.surface, - dividerColor: dividerColor, + dividerColor: kDividerColorLight, dialogBackgroundColor: colorScheme.background, textTheme: createTextTheme(YaruColors.inkstone), indicatorColor: colorScheme.secondary, @@ -428,7 +457,7 @@ ThemeData createYaruLightTheme({ navigationRailTheme: _createNavigationRailTheme(colorScheme, Brightness.light), dividerTheme: const DividerThemeData( - color: dividerColor, + color: kDividerColorLight, ), badgeTheme: BadgeThemeData( backgroundColor: elevatedButtonColor ?? colorScheme.primary, @@ -439,19 +468,44 @@ ThemeData createYaruLightTheme({ /// Helper function to create a new Yaru dark theme ThemeData createYaruDarkTheme({ - required ColorScheme colorScheme, required Color primaryColor, Color? elevatedButtonColor, bool? useMaterial3 = true, + bool highcontrast = false, }) { - const dividerColor = Color(0xff3a3a3a); + final colorScheme = ColorScheme.fromSeed( + seedColor: primaryColor, + error: YaruColors.error, + brightness: Brightness.dark, + primary: primaryColor, + primaryContainer: YaruColors.coolGrey, + onPrimary: YaruColors.porcelain, + onPrimaryContainer: YaruColors.porcelain, + inversePrimary: YaruColors.porcelain, + secondary: elevatedButtonColor ?? primaryColor, + onSecondary: Colors.white, + secondaryContainer: elevatedButtonColor ?? YaruColors.inkstone, + onSecondaryContainer: + elevatedButtonColor != null ? Colors.white : YaruColors.inkstone, + background: YaruColors.jet, + onBackground: YaruColors.porcelain, + surface: YaruColors.jet, + onSurface: YaruColors.porcelain, + inverseSurface: YaruColors.porcelain, + onInverseSurface: YaruColors.inkstone, + surfaceTint: YaruColors.coolGrey, + surfaceVariant: YaruColors.inkstone, + tertiary: const Color(0xFF18b6ec), + onTertiary: YaruColors.porcelain, + tertiaryContainer: const Color(0xFF18b6ec), + onTertiaryContainer: YaruColors.porcelain, + onSurfaceVariant: YaruColors.warmGrey, + outline: kDividerColorDark, + scrim: Colors.black, + ); return ThemeData.from( useMaterial3: useMaterial3, - colorScheme: ColorScheme.fromSeed( - seedColor: primaryColor, - error: colorScheme.error, - brightness: Brightness.dark, - ), + colorScheme: colorScheme, ).copyWith( iconButtonTheme: IconButtonThemeData( style: IconButton.styleFrom( @@ -466,14 +520,15 @@ ThemeData createYaruDarkTheme({ primaryIconTheme: IconThemeData(color: colorScheme.onSurface), pageTransitionsTheme: YaruPageTransitionsTheme.horizontal, useMaterial3: useMaterial3, - tabBarTheme: _createTabBarTheme(colorScheme, Brightness.dark, dividerColor), + tabBarTheme: + _createTabBarTheme(colorScheme, Brightness.dark, kDividerColorDark), dialogTheme: _createDialogTheme(Brightness.dark), brightness: Brightness.dark, primaryColor: colorScheme.primary, canvasColor: colorScheme.background, scaffoldBackgroundColor: colorScheme.background, cardColor: colorScheme.surface, - dividerColor: dividerColor, + dividerColor: kDividerColorDark, dialogBackgroundColor: colorScheme.background, textTheme: createTextTheme(colorScheme.onSurface), indicatorColor: colorScheme.primary, @@ -494,7 +549,7 @@ ThemeData createYaruDarkTheme({ appBarTheme: _createDarkAppBarTheme(colorScheme), floatingActionButtonTheme: FloatingActionButtonThemeData( backgroundColor: elevatedButtonColor ?? primaryColor, - foregroundColor: Colors.white, + foregroundColor: highcontrast ? Colors.black : Colors.white, ), bottomNavigationBarTheme: BottomNavigationBarThemeData( selectedItemColor: colorScheme.primary, @@ -513,11 +568,11 @@ ThemeData createYaruDarkTheme({ navigationRailTheme: _createNavigationRailTheme(colorScheme, Brightness.dark), dividerTheme: const DividerThemeData( - color: dividerColor, + color: kDividerColorDark, ), badgeTheme: BadgeThemeData( backgroundColor: elevatedButtonColor ?? colorScheme.primary, - textColor: Colors.white, + textColor: highcontrast ? Colors.black : Colors.white, ), ); } diff --git a/lib/src/themes/high_contrast.dart b/lib/src/themes/high_contrast.dart index 0234d3449..c114c141c 100644 --- a/lib/src/themes/high_contrast.dart +++ b/lib/src/themes/high_contrast.dart @@ -1,24 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:yaru_colors/yaru_colors.dart'; - import 'package:yaru/src/themes/common_themes.dart'; final yaruHighContrastLight = createYaruLightTheme( - colorScheme: const ColorScheme.highContrastLight( - primary: Colors.black, - secondary: Colors.black, - onSecondary: Colors.white, - error: YaruColors.error, - ), primaryColor: Colors.black, ); final yaruHighContrastDark = createYaruDarkTheme( - colorScheme: const ColorScheme.highContrastDark( - primary: Colors.white, - secondary: Colors.white, - onSecondary: Colors.black, - error: YaruColors.error, - ), primaryColor: Colors.white, + highcontrast: true, ); diff --git a/lib/src/themes/kubuntu.dart b/lib/src/themes/kubuntu.dart index 546d12a52..d9892ea47 100644 --- a/lib/src/themes/kubuntu.dart +++ b/lib/src/themes/kubuntu.dart @@ -1,35 +1,12 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.kubuntuBlue; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruKubuntuLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruKubuntuDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/lubuntu.dart b/lib/src/themes/lubuntu.dart index 1e47ae5a7..d73fde4b0 100644 --- a/lib/src/themes/lubuntu.dart +++ b/lib/src/themes/lubuntu.dart @@ -1,35 +1,12 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.lubuntuBlue; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruLubuntuLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruLubuntuDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/ubuntu_budgie.dart b/lib/src/themes/ubuntu_budgie.dart index 0b3e9b31b..180b44672 100644 --- a/lib/src/themes/ubuntu_budgie.dart +++ b/lib/src/themes/ubuntu_budgie.dart @@ -1,35 +1,12 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuBudgieBlue; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruUbuntuBudgieLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruUbuntuBudgieDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/ubuntu_butterfly.dart b/lib/src/themes/ubuntu_butterfly.dart index 7919046a0..df3d098ff 100644 --- a/lib/src/themes/ubuntu_butterfly.dart +++ b/lib/src/themes/ubuntu_butterfly.dart @@ -1,35 +1,12 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuButterflyPink; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruUbuntuButterflyLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruUbuntuButterflyDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/ubuntu_mate.dart b/lib/src/themes/ubuntu_mate.dart index 7c7b4f7e7..ba64311b0 100644 --- a/lib/src/themes/ubuntu_mate.dart +++ b/lib/src/themes/ubuntu_mate.dart @@ -1,41 +1,18 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuMateGreen; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - @Deprecated('Use yaruUbuntuMateLight instead') final yaruMateLight = yaruUbuntuMateLight; final yaruUbuntuMateLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - @Deprecated('Use yaruUbuntuMateDark instead') final yaruMateDark = yaruUbuntuMateDark; final yaruUbuntuMateDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/ubuntu_studio.dart b/lib/src/themes/ubuntu_studio.dart index 498384243..d7b05942d 100644 --- a/lib/src/themes/ubuntu_studio.dart +++ b/lib/src/themes/ubuntu_studio.dart @@ -1,35 +1,12 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuStudioBlue; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruUbuntuStudioLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruUbuntuStudioDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/xubuntu.dart b/lib/src/themes/xubuntu.dart index a5b94f389..98d1f8fcf 100644 --- a/lib/src/themes/xubuntu.dart +++ b/lib/src/themes/xubuntu.dart @@ -1,35 +1,12 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.xubuntuBlue; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruXubuntuLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruXubuntuDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, ); diff --git a/lib/src/themes/yaru.dart b/lib/src/themes/yaru.dart index dacec2005..0446af383 100644 --- a/lib/src/themes/yaru.dart +++ b/lib/src/themes/yaru.dart @@ -1,271 +1,86 @@ -import 'package:flutter/material.dart'; import 'package:yaru_colors/yaru_colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.orange; -final _lightColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, -); - final yaruLight = createYaruLightTheme( - colorScheme: _lightColorScheme, primaryColor: _primaryColor, elevatedButtonColor: YaruColors.success, ); -final _darkColorScheme = ColorScheme.fromSwatch( - primarySwatch: _primaryColor, - primaryColorDark: YaruColors.coolGrey, - accentColor: _primaryColor, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, -); - final yaruDark = createYaruDarkTheme( - colorScheme: _darkColorScheme, primaryColor: _primaryColor, elevatedButtonColor: YaruColors.success, ); final yaruSageLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.sage, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.sage, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.sage, ); final yaruSageDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.sage, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.sage, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.sage, ); final yaruPrussianGreenLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.prussianGreen, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.prussianGreen, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.prussianGreen, ); final yaruPrussianGreenDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.prussianGreen, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.prussianGreen, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.prussianGreen, ); final yaruOliveLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.olive, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.olive, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.olive, ); final yaruOliveDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.olive, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.olive, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.olive, ); final yaruBarkLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.bark, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.bark, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.bark, ); final yaruBarkDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.bark, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.bark, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.bark, ); final yaruViridianLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.viridian, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.viridian, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.viridian, ); final yaruViridianDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.viridian, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.viridian, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.viridian, ); final yaruPurpleLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.purple, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.purple, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.purple, ); final yaruPurpleDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.purple, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.purple, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.purple, ); final yaruRedLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.red, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.red, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.red, ); final yaruRedDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.red, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.red, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.red, ); final yaruBlueLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.blue, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.blue, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.blue, ); final yaruBlueDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.blue, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.blue, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.blue, ); final yaruMagentaLight = createYaruLightTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.magenta, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.magenta, - cardColor: Colors.white, - backgroundColor: YaruColors.porcelain, - errorColor: YaruColors.error, - brightness: Brightness.light, - ), primaryColor: YaruColors.magenta, ); final yaruMagentaDark = createYaruDarkTheme( - colorScheme: ColorScheme.fromSwatch( - primarySwatch: YaruColors.magenta, - primaryColorDark: YaruColors.coolGrey, - accentColor: YaruColors.magenta, - cardColor: YaruColors.jet, - backgroundColor: YaruColors.jet, - errorColor: YaruColors.error, - brightness: Brightness.dark, - ), primaryColor: YaruColors.magenta, );