diff --git a/example/lib/view/colors_view.dart b/example/lib/view/colors_view.dart index 175f8dc3a..c4e3c2505 100644 --- a/example/lib/view/colors_view.dart +++ b/example/lib/view/colors_view.dart @@ -1,6 +1,12 @@ import 'package:flutter/material.dart'; +import 'package:yaru/yaru.dart'; -import 'package:yaru_colors/yaru_colors.dart'; +const _gridDelegate = SliverGridDelegateWithMaxCrossAxisExtent( + maxCrossAxisExtent: 300, + mainAxisExtent: 40, + mainAxisSpacing: 20, + crossAxisSpacing: 20, +); class ColorsView extends StatelessWidget { const ColorsView({Key? key}) : super(key: key); @@ -8,327 +14,215 @@ class ColorsView extends StatelessWidget { @override Widget build(BuildContext context) { final theme = Theme.of(context); + + final headlineStyle = theme.textTheme.headlineMedium; + 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, - ), - const SizedBox(height: 15.0), - Row( - children: [ - Expanded(child: colorPaletteExample('orange', YaruColors.orange)), - const SizedBox(width: 25.0), - Expanded(child: colorPaletteExample('olive', YaruColors.olive)), - const SizedBox(width: 25.0), - Expanded(child: colorPaletteExample('bark', YaruColors.bark)), - ], + padding: const EdgeInsets.all(15), + children: [ + Padding( + padding: const EdgeInsets.only(bottom: 20, left: 5), + child: Text( + 'Theme Colors', + style: headlineStyle, + ), ), - const Divider(height: 50.0), - Row( + GridView( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + gridDelegate: _gridDelegate, children: [ - Expanded( - child: colorPaletteExample('viridian', YaruColors.viridian), + _colorContainer( + 'primaryColor', + theme.primaryColor, ), - const SizedBox(width: 25.0), - Expanded(child: colorPaletteExample('purple', YaruColors.purple)), - const SizedBox(width: 25.0), - Expanded(child: colorPaletteExample('red', YaruColors.red)), - ], - ), - const Divider(height: 50.0), - Row( - children: [ - Expanded(child: colorPaletteExample('blue', YaruColors.blue)), - const SizedBox(width: 25.0), - Expanded(child: colorPaletteExample('magenta', YaruColors.magenta)), - const SizedBox(width: 25.0), - Expanded(child: colorPaletteExample('sage', YaruColors.sage)), - ], - ), - const Divider(height: 50.0), - Row( - children: [ - Expanded( - child: colorPaletteExample( - 'prussianGreen', - YaruColors.prussianGreen, - ), + _colorContainer( + 'primary', + theme.colorScheme.primary, + ), + _colorContainer( + 'onPrimary', + theme.colorScheme.onPrimary, + ), + _colorContainer( + 'onPrimaryContainer', + theme.colorScheme.onPrimaryContainer, + ), + _colorContainer( + 'secondary', + theme.colorScheme.secondary, + ), + _colorContainer( + 'onSecondary', + theme.colorScheme.onSecondary, + ), + _colorContainer( + 'secondaryContainer', + theme.colorScheme.secondaryContainer, + ), + _colorContainer( + 'onSecondaryContainer', + theme.colorScheme.onSecondaryContainer, + ), + _colorContainer( + 'tertiary', + theme.colorScheme.tertiary, + ), + _colorContainer( + 'onTertiary', + theme.colorScheme.onTertiary, + ), + _colorContainer( + 'tertiaryContainer', + theme.colorScheme.tertiaryContainer, + ), + _colorContainer( + 'onTertiaryContainer', + theme.colorScheme.onTertiaryContainer, + ), + _colorContainer( + 'surface', + theme.colorScheme.surface, + ), + _colorContainer( + 'surfaceTint', + theme.colorScheme.surfaceTint, + ), + _colorContainer( + 'surfaceVariant', + theme.colorScheme.surfaceVariant, + ), + _colorContainer( + 'background', + theme.colorScheme.background, + ), + _colorContainer( + 'onBackground', + theme.colorScheme.onBackground, + ), + _colorContainer( + 'inversePrimary', + theme.colorScheme.inversePrimary, + ), + _colorContainer( + 'inverseSurface', + theme.colorScheme.inverseSurface, + ), + _colorContainer( + 'error', + theme.colorScheme.error, + ), + _colorContainer( + 'errorContainer', + theme.colorScheme.errorContainer, + ), + _colorContainer( + 'onError', + theme.colorScheme.onError, + ), + _colorContainer( + 'scrim', + theme.colorScheme.scrim, ), - const SizedBox(width: 25.0), - const Spacer(), - const SizedBox(width: 25.0), - const Spacer(), ], ), - const SizedBox(height: 15.0), - Text( - 'Flavor Colors', - style: Theme.of(context).textTheme.headlineMedium, + const _SpacedDivider(), + Padding( + padding: const EdgeInsets.only(bottom: 20, left: 5), + child: Text( + 'Accent Colors', + style: headlineStyle, + ), ), - const SizedBox(height: 15.0), - Row( + GridView( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + gridDelegate: _gridDelegate, children: [ - Expanded( - child: colorPaletteExample('kubuntuBlue', YaruColors.kubuntuBlue), - ), - const SizedBox(width: 25.0), - Expanded( - child: colorPaletteExample('lubuntuBlue', YaruColors.lubuntuBlue), - ), - const SizedBox(width: 25.0), - Expanded( - child: colorPaletteExample( - 'ubuntuBudgieBlue', - YaruColors.ubuntuBudgieBlue, - ), - ), + _colorContainer('orange', YaruColors.orange), + _colorContainer('olive', YaruColors.olive), + _colorContainer('viridian', YaruColors.viridian), + _colorContainer('purple', YaruColors.purple), + _colorContainer('red', YaruColors.red), + _colorContainer('blue', YaruColors.blue), + _colorContainer('magenta', YaruColors.magenta), + _colorContainer('sage', YaruColors.sage), + _colorContainer('prussianGreen', YaruColors.prussianGreen), + _colorContainer('bark', YaruColors.bark), ], ), - const Divider(height: 50.0), - Row( + const _SpacedDivider(), + Padding( + padding: const EdgeInsets.only(bottom: 20, left: 5), + child: Text( + 'Flavor Colors', + style: headlineStyle, + ), + ), + GridView( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + gridDelegate: _gridDelegate, children: [ - Expanded( - child: colorPaletteExample( - 'ubuntuButterflyPink', - YaruColors.ubuntuButterflyPink, - ), + _colorContainer('kubuntuBlue', YaruColors.kubuntuBlue), + _colorContainer('lubuntuBlue', YaruColors.lubuntuBlue), + _colorContainer( + 'ubuntuBudgieBlue', + YaruColors.ubuntuBudgieBlue, ), - const SizedBox(width: 25.0), - Expanded( - child: colorPaletteExample( - 'ubuntuCinnamonBrown', - YaruColors.ubuntuCinnamonBrown, - ), + _colorContainer( + 'ubuntuButterflyPink', + YaruColors.ubuntuButterflyPink, ), - const SizedBox(width: 25.0), - Expanded( - child: colorPaletteExample( - 'ubuntuMateGreen', - YaruColors.ubuntuMateGreen, - ), + _colorContainer( + 'ubuntuCinnamonBrown', + YaruColors.ubuntuCinnamonBrown, ), - ], - ), - const Divider(height: 50.0), - Row( - children: [ - Expanded( - child: colorPaletteExample( - 'ubuntuStudioBlue', - YaruColors.ubuntuStudioBlue, - ), + _colorContainer( + 'ubuntuMateGreen', + YaruColors.ubuntuMateGreen, ), - const SizedBox(width: 25.0), - Expanded( - child: colorPaletteExample( - 'ubuntuUnityPurple', - YaruColors.ubuntuUnityPurple, - ), + _colorContainer( + 'ubuntuStudioBlue', + YaruColors.ubuntuStudioBlue, ), - const SizedBox(width: 25.0), - Expanded( - child: colorPaletteExample('xubuntuBlue', YaruColors.xubuntuBlue), + _colorContainer( + 'ubuntuUnityPurple', + YaruColors.ubuntuUnityPurple, ), + _colorContainer('xubuntuBlue', YaruColors.xubuntuBlue), ], ), ], ); } - 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 _colorContainer(String colorName, Color color) { + return Container( + decoration: + BoxDecoration(color: color, borderRadius: BorderRadius.circular(6)), + child: Center( + child: Text( + colorName, + style: TextStyle( + color: contrastColor(color), ), ), - ], + ), ); } +} - Widget colorPaletteExample(String colorName, MaterialColor color) { - Map colorEntry = {colorName: color}; - int shade = 50; - TextStyle textStyle(int shade) => TextStyle( - color: (colorEntry.values.first[shade]!.computeLuminance() > 0.4) - ? Colors.black - : Colors.white, - fontSize: 9.0, - ); - List colorItem = []; - for (int i = 1; i <= 10; i++) { - colorItem.add( - Container( - height: 40.0, - color: colorEntry.values.first[shade], - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - flex: 10, - child: Text( - '${colorEntry.keys.first}[$shade]', - style: textStyle(shade), - ), - ), - Expanded( - flex: 4, - child: Text( - '#${colorEntry.values.first[shade]!.value.toRadixString(16).substring(2).toUpperCase()}', - style: textStyle(shade), - ), - ), - ], - ), - ), - ), - ); - shade = i * 100; - } - return Column( - children: colorItem, +class _SpacedDivider extends StatelessWidget { + const _SpacedDivider(); + + @override + Widget build(BuildContext context) { + return const Padding( + padding: EdgeInsets.only(top: 30, bottom: 20), + child: Divider( + height: 0, + ), ); } } diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 4486510cc..58a674e48 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -12,7 +12,6 @@ dependencies: handy_window: ^0.1.2 yaru: path: ../ - yaru_colors: ^0.1.0 dev_dependencies: flutter_lints: ^2.0.1 diff --git a/lib/src/colors.dart b/lib/src/colors.dart new file mode 100644 index 000000000..5bc20bbad --- /dev/null +++ b/lib/src/colors.dart @@ -0,0 +1,111 @@ +import 'package:flutter/material.dart'; + +/// Available Yaru colors. +class YaruColors { + YaruColors._(); + + /// Ubuntu Orange + static const Color orange = Color(0xFFE95420); + + /// Warm Grey + /// + /// For balance. The addition of warm grey softens the combination of orange + /// and aubergine and provides a bridge between the two. + /// + /// Warm grey can be used for; backgrounds, graphics, dot patterns, charts and + /// diagrams. It can also be used for large size text. + static const Color warmGrey = Color(0xFFAEA79F); + + /// Cool Grey + /// + /// For typography, particularly body copy. Black can be quite harsh in + /// combination with aubergine, but grey delivers more balance while still + /// being legible. + /// + /// Cool grey can also be used within charts and diagrams. + static const Color coolGrey = Color(0xFF333333); + + /// Text Grey + /// + /// Text grey is used for small size headings, sub-headings and body copy text + /// only. + static const Color textGrey = Color(0xFF111111); + + /// Error + static const Color error = Color(0xFFff0000); + + /// Warning + static const Color warning = Color(0xFFf99b11); + + /// Success + static const Color success = Color(0xFF0e8420); + + /// Porcelain + static const Color porcelain = Color(0xFFFAFAFA); + + /// Inkstone + static const Color inkstone = Color(0xFF3B3B3B); + + /// Jet + static const Color jet = Color(0xFF2B2B2B); + + /// Light title bar + static const Color titleBarLight = Color(0xFFEBEBEB); + + /// Dark title bar + static const Color titleBarDark = Color(0xFF303030); + + /// Olive + static const Color olive = Color(0xFF4B8501); + + /// Bark + static const Color bark = Color(0xFF787859); + + /// Sage + static const Color sage = Color(0xFF657B69); + + /// Prussian Green + static const Color prussianGreen = Color(0xFF308280); + + /// Viridian + static const Color viridian = Color(0xFF03875B); + + /// Purple + static const Color purple = Color(0xFF7764D8); + + /// Red + static const Color red = Color(0xFFDA3450); + + /// Blue + static const Color blue = Color(0xFF0073E5); + + /// Magenta + static const Color magenta = Color(0xFFB34CB3); + + /// Kubuntu Blue + static const Color kubuntuBlue = Color(0xFF0079C1); + + /// Lubuntu Blue + static const Color lubuntuBlue = Color(0xFF0068C8); + + /// Ubuntu Budgie Blue + static const Color ubuntuBudgieBlue = Color(0xFF2196F3); + + /// Ubuntu Butterfly Pink + static const Color ubuntuButterflyPink = Color(0xFFFF135B); + + /// Ubuntu Cinnamon Brown + static const Color ubuntuCinnamonBrown = Color(0xFFDD682A); + + /// Ubuntu MATE Green + static const Color ubuntuMateGreen = Color(0xFF73AF59); + + /// Ubuntu Studio Blue + static const Color ubuntuStudioBlue = Color(0xFF009BF9); + + /// Ubuntu Unity Purple + static const Color ubuntuUnityPurple = Color(0xFF9005D5); + + /// Xubuntu Blue + static const Color xubuntuBlue = Color(0xFF0044AA); +} diff --git a/lib/src/themes/common_themes.dart b/lib/src/themes/common_themes.dart index 9e2d76e2c..97d486d2f 100644 --- a/lib/src/themes/common_themes.dart +++ b/lib/src/themes/common_themes.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/text/text_theme.dart'; 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.fromARGB(255, 65, 65, 65); const kDividerColorLight = Color(0xffdcdcdc); diff --git a/lib/src/themes/extensions.dart b/lib/src/themes/extensions.dart index d407bf247..d31e9afb5 100644 --- a/lib/src/themes/extensions.dart +++ b/lib/src/themes/extensions.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; /// Yaru-specific theming extensions. extension YaruThemeDataExtension on ThemeData { diff --git a/lib/src/themes/kubuntu.dart b/lib/src/themes/kubuntu.dart index d9892ea47..89b502335 100644 --- a/lib/src/themes/kubuntu.dart +++ b/lib/src/themes/kubuntu.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.kubuntuBlue; diff --git a/lib/src/themes/lubuntu.dart b/lib/src/themes/lubuntu.dart index d73fde4b0..2dde4560d 100644 --- a/lib/src/themes/lubuntu.dart +++ b/lib/src/themes/lubuntu.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.lubuntuBlue; diff --git a/lib/src/themes/ubuntu_budgie.dart b/lib/src/themes/ubuntu_budgie.dart index 180b44672..77d3a9866 100644 --- a/lib/src/themes/ubuntu_budgie.dart +++ b/lib/src/themes/ubuntu_budgie.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuBudgieBlue; diff --git a/lib/src/themes/ubuntu_butterfly.dart b/lib/src/themes/ubuntu_butterfly.dart index df3d098ff..191a9b07b 100644 --- a/lib/src/themes/ubuntu_butterfly.dart +++ b/lib/src/themes/ubuntu_butterfly.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuButterflyPink; diff --git a/lib/src/themes/ubuntu_cinnamon.dart b/lib/src/themes/ubuntu_cinnamon.dart index 568cb2b57..4609f49ca 100644 --- a/lib/src/themes/ubuntu_cinnamon.dart +++ b/lib/src/themes/ubuntu_cinnamon.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuCinnamonBrown; diff --git a/lib/src/themes/ubuntu_mate.dart b/lib/src/themes/ubuntu_mate.dart index ba64311b0..030ed8f5e 100644 --- a/lib/src/themes/ubuntu_mate.dart +++ b/lib/src/themes/ubuntu_mate.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuMateGreen; diff --git a/lib/src/themes/ubuntu_studio.dart b/lib/src/themes/ubuntu_studio.dart index d7b05942d..ccadbf207 100644 --- a/lib/src/themes/ubuntu_studio.dart +++ b/lib/src/themes/ubuntu_studio.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuStudioBlue; diff --git a/lib/src/themes/ubuntu_unity.dart b/lib/src/themes/ubuntu_unity.dart index f96b22cc4..f3f207d4c 100644 --- a/lib/src/themes/ubuntu_unity.dart +++ b/lib/src/themes/ubuntu_unity.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.ubuntuUnityPurple; diff --git a/lib/src/themes/variant.dart b/lib/src/themes/variant.dart index 83424e0ed..e91ccf966 100644 --- a/lib/src/themes/variant.dart +++ b/lib/src/themes/variant.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/kubuntu.dart'; import 'package:yaru/src/themes/lubuntu.dart'; import 'package:yaru/src/themes/ubuntu_budgie.dart'; @@ -54,7 +54,7 @@ enum YaruVariant { const YaruVariant(this.color); /// The primary color of the variant. - final MaterialColor color; + final Color color; /// A light theme for the variant. ThemeData get theme => _yaruLightThemes[this]!; diff --git a/lib/src/themes/xubuntu.dart b/lib/src/themes/xubuntu.dart index 2ac9788f2..6fbb04c65 100644 --- a/lib/src/themes/xubuntu.dart +++ b/lib/src/themes/xubuntu.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.xubuntuBlue; @@ -8,5 +8,5 @@ final yaruXubuntuLight = createYaruLightTheme( ); final yaruXubuntuDark = createYaruDarkTheme( - primaryColor: _primaryColor.shade500, + primaryColor: _primaryColor, ); diff --git a/lib/src/themes/yaru.dart b/lib/src/themes/yaru.dart index 55c66cc9c..1fb7a6cf7 100644 --- a/lib/src/themes/yaru.dart +++ b/lib/src/themes/yaru.dart @@ -1,4 +1,4 @@ -import 'package:yaru_colors/yaru_colors.dart'; +import 'package:yaru/src/colors.dart'; import 'package:yaru/src/themes/common_themes.dart'; const _primaryColor = YaruColors.orange; @@ -18,7 +18,7 @@ final yaruSageLight = createYaruLightTheme( ); final yaruSageDark = createYaruDarkTheme( - primaryColor: YaruColors.sage.shade500, + primaryColor: YaruColors.sage, ); final yaruPrussianGreenLight = createYaruLightTheme( @@ -42,7 +42,7 @@ final yaruBarkLight = createYaruLightTheme( ); final yaruBarkDark = createYaruDarkTheme( - primaryColor: YaruColors.bark.shade500, + primaryColor: YaruColors.bark, ); final yaruViridianLight = createYaruLightTheme( diff --git a/lib/yaru.dart b/lib/yaru.dart index 0dae55f55..300ebbfd7 100644 --- a/lib/yaru.dart +++ b/lib/yaru.dart @@ -1,5 +1,6 @@ library yaru; +export 'package:yaru/src/colors.dart'; export 'package:yaru/src/themes/common_themes.dart'; export 'package:yaru/src/themes/extensions.dart'; export 'package:yaru/src/themes/high_contrast.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 6d84824fc..6db558fb9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,6 @@ dependencies: sdk: flutter gtk: ^2.0.0 platform: ^3.1.0 - yaru_colors: ^0.1.4 dev_dependencies: build_runner: ^2.1.10