diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 51acdaa4..8ea07c9a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.37.0" + ".": "0.38.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e2e5026..0753e576 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.38.0](https://github.com/coingaming/moon_flutter/compare/v0.37.0...v0.38.0) (2023-12-15) + + +### Features + +* [MDS-910] Rename color tokens to align more with design variables ([#311](https://github.com/coingaming/moon_flutter/issues/311)) ([3c54130](https://github.com/coingaming/moon_flutter/commit/3c541304ee74a4239ad25d5c80a892a2b868fe51)) + ## [0.37.0](https://github.com/coingaming/moon_flutter/compare/v0.36.1...v0.37.0) (2023-12-08) diff --git a/example/lib/src/storybook/common/color_options.dart b/example/lib/src/storybook/common/color_options.dart index 5d13f7b6..035a56a7 100644 --- a/example/lib/src/storybook/common/color_options.dart +++ b/example/lib/src/storybook/common/color_options.dart @@ -20,31 +20,31 @@ List> colorOptions = const [ Option(label: "jiren", value: 9), Option(label: "heles", value: 10), Option(label: "zeno", value: 11), - Option(label: "krillin100", value: 12), + Option(label: "krillin", value: 12), Option(label: "krillin60", value: 13), Option(label: "krillin10", value: 14), - Option(label: "chichi100", value: 15), + Option(label: "chichi", value: 15), Option(label: "chichi60", value: 16), Option(label: "chichi10", value: 17), - Option(label: "roshi100", value: 18), + Option(label: "roshi", value: 18), Option(label: "roshi60", value: 19), Option(label: "roshi10", value: 20), - Option(label: "frieza100", value: 21), + Option(label: "frieza", value: 21), Option(label: "frieza60", value: 22), Option(label: "frieza10", value: 23), - Option(label: "dodoria100", value: 24), + Option(label: "dodoria", value: 24), Option(label: "dodoria60", value: 25), Option(label: "dodoria10", value: 26), - Option(label: "cell100", value: 27), + Option(label: "cell", value: 27), Option(label: "cell60", value: 28), Option(label: "cell10", value: 29), - Option(label: "raditz100", value: 30), + Option(label: "raditz", value: 30), Option(label: "raditz60", value: 31), Option(label: "raditz10", value: 32), - Option(label: "nappa100", value: 33), + Option(label: "nappa", value: 33), Option(label: "nappa60", value: 34), Option(label: "nappa10", value: 35), - Option(label: "whis100", value: 36), + Option(label: "whis", value: 36), Option(label: "whis60", value: 37), Option(label: "whis10", value: 38), Option(label: "transparent", value: 39), @@ -64,31 +64,31 @@ List colorTable(BuildContext context) => [ context.moonColors!.jiren, context.moonColors!.heles, context.moonColors!.zeno, - context.moonColors!.krillin100, + context.moonColors!.krillin, context.moonColors!.krillin60, context.moonColors!.krillin10, - context.moonColors!.chiChi100, - context.moonColors!.chiChi60, - context.moonColors!.chiChi10, - context.moonColors!.roshi100, + context.moonColors!.chichi, + context.moonColors!.chichi60, + context.moonColors!.chichi10, + context.moonColors!.roshi, context.moonColors!.roshi60, context.moonColors!.roshi10, - context.moonColors!.frieza100, + context.moonColors!.frieza, context.moonColors!.frieza60, context.moonColors!.frieza10, - context.moonColors!.dodoria100, + context.moonColors!.dodoria, context.moonColors!.dodoria60, context.moonColors!.dodoria10, - context.moonColors!.cell100, + context.moonColors!.cell, context.moonColors!.cell60, context.moonColors!.cell10, - context.moonColors!.raditz100, + context.moonColors!.raditz, context.moonColors!.raditz60, context.moonColors!.raditz10, - context.moonColors!.nappa100, + context.moonColors!.nappa, context.moonColors!.nappa60, context.moonColors!.nappa10, - context.moonColors!.whis100, + context.moonColors!.whis, context.moonColors!.whis60, context.moonColors!.whis10, Colors.transparent, diff --git a/example/lib/src/storybook/stories/alert.dart b/example/lib/src/storybook/stories/alert.dart index 0a619978..368b0794 100644 --- a/example/lib/src/storybook/stories/alert.dart +++ b/example/lib/src/storybook/stories/alert.dart @@ -194,7 +194,7 @@ class _AlertStoryState extends State { const TextDivider(text: "Filled MoonAlert variant"), MoonFilledAlert( show: true, - color: context.moonColors!.chiChi100, + color: context.moonColors!.chichi, borderRadius: borderRadius, leading: showLeadingKnob ? const Icon(MoonIcons.notifications_alert_24_light) : null, title: const Text("Filled error MoonAlert"), @@ -212,7 +212,7 @@ class _AlertStoryState extends State { const SizedBox(height: 16), MoonFilledAlert( show: true, - color: context.moonColors!.krillin100, + color: context.moonColors!.krillin, borderRadius: borderRadius, leading: showLeadingKnob ? const Icon(MoonIcons.generic_alarm_round_24_light) : null, title: const Text("Filled warning MoonAlert"), @@ -230,7 +230,7 @@ class _AlertStoryState extends State { const TextDivider(text: "Outlined MoonAlert variant"), MoonOutlinedAlert( show: true, - color: context.moonColors!.roshi100, + color: context.moonColors!.roshi, borderRadius: borderRadius, leading: showLeadingKnob ? const Icon(MoonIcons.generic_check_rounded_24_light) : null, title: const Text("Outlined success MoonAlert"), @@ -248,7 +248,7 @@ class _AlertStoryState extends State { const SizedBox(height: 16), MoonOutlinedAlert( show: true, - color: context.moonColors!.whis100, + color: context.moonColors!.whis, borderRadius: borderRadius, leading: showLeadingKnob ? const Icon(MoonIcons.notifications_alert_24_light) : null, title: const Text('Outlined info MoonAlert'), diff --git a/example/lib/src/storybook/stories/button.dart b/example/lib/src/storybook/stories/button.dart index ab392514..cd91ba57 100644 --- a/example/lib/src/storybook/stories/button.dart +++ b/example/lib/src/storybook/stories/button.dart @@ -249,8 +249,8 @@ class ButtonStory extends StatelessWidget { begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - context.moonColors!.krillin100, - context.moonColors!.dodoria100, + context.moonColors!.krillin, + context.moonColors!.dodoria, ], ), shape: const StarBorder(pointRounding: 0.5, valleyRounding: 0.5), diff --git a/example/lib/src/storybook/stories/chip.dart b/example/lib/src/storybook/stories/chip.dart index 0c779461..c87056c7 100644 --- a/example/lib/src/storybook/stories/chip.dart +++ b/example/lib/src/storybook/stories/chip.dart @@ -159,9 +159,9 @@ class ChipStory extends StatelessWidget { const TextDivider(text: "Preset MoonChip"), MoonChip( isActive: isActiveKnob, - activeColor: context.moonColors!.dodoria100, - backgroundColor: context.moonColors!.krillin100, - activeBackgroundColor: context.moonColors!.chiChi10, + activeColor: context.moonColors!.dodoria, + backgroundColor: context.moonColors!.krillin, + activeBackgroundColor: context.moonColors!.chichi10, textColor: context.moonColors!.goten, borderWidth: 2, showBorder: showBorderKnob, diff --git a/example/lib/src/storybook/stories/dropdown.dart b/example/lib/src/storybook/stories/dropdown.dart index e0d92b3e..b1d41759 100644 --- a/example/lib/src/storybook/stories/dropdown.dart +++ b/example/lib/src/storybook/stories/dropdown.dart @@ -101,8 +101,8 @@ class _DropdownStoryState extends State { // Used to avoid the stale closure within callbacks in Story final colorPiccolo = context.moonColors!.piccolo; - final colorKrillin = context.moonColors!.krillin100; - final colorRoshi100 = context.moonColors!.roshi100; + final colorKrillin = context.moonColors!.krillin; + final colorRoshi100 = context.moonColors!.roshi; final colorRoshi60 = context.moonColors!.roshi60; final colorRoshi10 = context.moonColors!.roshi10; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index a1e71b2e..63c4ba4c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,7 +1,7 @@ name: example description: Showcase Moon Design. publish_to: none -version: 0.37.0 +version: 0.38.0 environment: sdk: '>=3.1.2 <4.0.0' dependencies: diff --git a/lib/src/theme/authcode/authcode_theme.dart b/lib/src/theme/authcode/authcode_theme.dart index c7470f29..08292597 100644 --- a/lib/src/theme/authcode/authcode_theme.dart +++ b/lib/src/theme/authcode/authcode_theme.dart @@ -25,7 +25,7 @@ class MoonAuthCodeTheme extends ThemeExtension with Diagnosti selectedBorderColor: tokens.colors.piccolo, activeBorderColor: tokens.colors.beerus, inactiveBorderColor: tokens.colors.beerus, - errorBorderColor: tokens.colors.chiChi100, + errorBorderColor: tokens.colors.chichi, selectedFillColor: tokens.colors.goku, activeFillColor: tokens.colors.goku, inactiveFillColor: tokens.colors.goku, diff --git a/lib/src/theme/avatar/avatar_theme.dart b/lib/src/theme/avatar/avatar_theme.dart index 39a640d5..fcddfaaa 100644 --- a/lib/src/theme/avatar/avatar_theme.dart +++ b/lib/src/theme/avatar/avatar_theme.dart @@ -23,7 +23,7 @@ class MoonAvatarTheme extends ThemeExtension with Diagnosticabl }) : colors = colors ?? MoonAvatarColors( backgroundColor: tokens.colors.goku, - badgeColor: tokens.colors.roshi100, + badgeColor: tokens.colors.roshi, iconColor: tokens.colors.iconPrimary, textColor: tokens.colors.textPrimary, ), diff --git a/lib/src/theme/text_area/text_area_theme.dart b/lib/src/theme/text_area/text_area_theme.dart index de6a57f4..94b70f87 100644 --- a/lib/src/theme/text_area/text_area_theme.dart +++ b/lib/src/theme/text_area/text_area_theme.dart @@ -25,7 +25,7 @@ class MoonTextAreaTheme extends ThemeExtension with Diagnosti backgroundColor: tokens.colors.goku, activeBorderColor: tokens.colors.piccolo, inactiveBorderColor: tokens.colors.beerus, - errorColor: tokens.colors.chiChi100, + errorColor: tokens.colors.chichi, hoverBorderColor: tokens.colors.beerus, textColor: tokens.colors.textPrimary, helperTextColor: tokens.colors.trunks, diff --git a/lib/src/theme/text_input/text_input_theme.dart b/lib/src/theme/text_input/text_input_theme.dart index 59edd011..9e5fc6a7 100644 --- a/lib/src/theme/text_input/text_input_theme.dart +++ b/lib/src/theme/text_input/text_input_theme.dart @@ -30,7 +30,7 @@ class MoonTextInputTheme extends ThemeExtension with Diagnos backgroundColor: tokens.colors.goku, activeBorderColor: tokens.colors.piccolo, inactiveBorderColor: tokens.colors.beerus, - errorColor: tokens.colors.chiChi100, + errorColor: tokens.colors.chichi, hoverBorderColor: tokens.colors.beerus, textColor: tokens.colors.textPrimary, helperTextColor: tokens.colors.textSecondary, diff --git a/lib/src/theme/text_input_group/text_input_group_theme.dart b/lib/src/theme/text_input_group/text_input_group_theme.dart index daf54496..4fdf20e7 100644 --- a/lib/src/theme/text_input_group/text_input_group_theme.dart +++ b/lib/src/theme/text_input_group/text_input_group_theme.dart @@ -23,7 +23,7 @@ class MoonTextInputGroupTheme extends ThemeExtension wi }) : colors = colors ?? MoonTextInputGroupColors( backgroundColor: tokens.colors.goku, - errorColor: tokens.colors.chiChi100, + errorColor: tokens.colors.chichi, helperTextColor: tokens.colors.trunks, borderColor: tokens.colors.beerus, hoverBorderColor: tokens.colors.beerus, diff --git a/lib/src/theme/tokens/colors.dart b/lib/src/theme/tokens/colors.dart index 0c420370..37195da3 100644 --- a/lib/src/theme/tokens/colors.dart +++ b/lib/src/theme/tokens/colors.dart @@ -18,31 +18,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin jiren: Color(0x1F5C33CF), heles: Color(0x0A000000), zeno: Color(0x8F000000), - krillin100: Color(0xFFFFB319), + krillin: Color(0xFFFFB319), krillin60: Color(0x8FFFB319), krillin10: Color(0x14FFB319), - chiChi100: Color(0xFFFF4E64), - chiChi60: Color(0x8FFF4E64), - chiChi10: Color(0x14FF4E64), - roshi100: Color(0xFF49B356), + chichi: Color(0xFFFF4E64), + chichi60: Color(0x8FFF4E64), + chichi10: Color(0x14FF4E64), + roshi: Color(0xFF49B356), roshi60: Color(0x8F49B356), roshi10: Color(0x1449B356), - dodoria100: Color(0xFFD33030), + dodoria: Color(0xFFD33030), dodoria60: Color(0x8FD33030), dodoria10: Color(0x14D33030), - cell100: Color(0xFF95F1D5), + cell: Color(0xFF95F1D5), cell60: Color(0x8F95F1D5), cell10: Color(0x1495F1D5), - raditz100: Color(0xFFB3804A), + raditz: Color(0xFFB3804A), raditz60: Color(0x8FB3804A), raditz10: Color(0x14B3804A), - whis100: Color(0xFF3448F0), + whis: Color(0xFF3448F0), whis60: Color(0x8F3448F0), whis10: Color(0x143448F0), - frieza100: Color(0xFF5C33CF), + frieza: Color(0xFF5C33CF), frieza60: Color(0x8F5C33CF), frieza10: Color(0x145C33CF), - nappa100: Color(0xFF725550), + nappa: Color(0xFF725550), nappa60: Color(0x8F725550), nappa10: Color(0x14725550), textPrimary: Color(0xFF000000), // bulma @@ -64,31 +64,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin jiren: Color(0x1F5C33CF), heles: Color(0x14FFFFFF), zeno: Color(0x8F000000), - krillin100: Color(0xFFFFB319), + krillin: Color(0xFFFFB319), krillin60: Color(0x8FFFB319), krillin10: Color(0x14FFB319), - chiChi100: Color(0xFFFF4E64), - chiChi60: Color(0x8FFF4E64), - chiChi10: Color(0x14FF4E64), - roshi100: Color(0xFF49B356), + chichi: Color(0xFFFF4E64), + chichi60: Color(0x8FFF4E64), + chichi10: Color(0x14FF4E64), + roshi: Color(0xFF49B356), roshi60: Color(0x8F49B356), roshi10: Color(0x1449B356), - dodoria100: Color(0xFFD33030), + dodoria: Color(0xFFD33030), dodoria60: Color(0x8FD33030), dodoria10: Color(0x14D33030), - cell100: Color(0xFF95F1D5), + cell: Color(0xFF95F1D5), cell60: Color(0x8F95F1D5), cell10: Color(0x1495F1D5), - raditz100: Color(0xFFB3804A), + raditz: Color(0xFFB3804A), raditz60: Color(0x8FB3804A), raditz10: Color(0x14B3804A), - whis100: Color(0xFF3448F0), + whis: Color(0xFF3448F0), whis60: Color(0x8F3448F0), whis10: Color(0x143448F0), - frieza100: Color(0xFF5C33CF), + frieza: Color(0xFF5C33CF), frieza60: Color(0x8F5C33CF), frieza10: Color(0x145C33CF), - nappa100: Color(0xFF725550), + nappa: Color(0xFF725550), nappa60: Color(0x8F725550), nappa10: Color(0x14725550), textPrimary: Color(0xFFFFFFFF), // bulma @@ -138,7 +138,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin // Supportive and Semantic colors: /// Warning color. - final Color krillin100; + final Color krillin; /// Warning color. final Color krillin60; @@ -147,16 +147,16 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color krillin10; /// Error color. - final Color chiChi100; + final Color chichi; /// Error color. - final Color chiChi60; + final Color chichi60; /// Error color. - final Color chiChi10; + final Color chichi10; /// Success color. - final Color roshi100; + final Color roshi; /// Success color. final Color roshi60; @@ -165,7 +165,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color roshi10; /// Supportive color. - final Color frieza100; + final Color frieza; /// Supportive color. final Color frieza60; @@ -174,7 +174,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color frieza10; /// Supportive color. - final Color dodoria100; + final Color dodoria; /// Supportive color. final Color dodoria60; @@ -183,7 +183,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color dodoria10; /// Supportive color. - final Color cell100; + final Color cell; /// Supportive color. final Color cell60; @@ -192,7 +192,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color cell10; /// Supportive color. - final Color raditz100; + final Color raditz; /// Supportive color. final Color raditz60; @@ -201,7 +201,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color raditz10; /// Supportive color. - final Color nappa100; + final Color nappa; /// Supportive color. final Color nappa60; @@ -210,7 +210,7 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin final Color nappa10; /// Supportive color. - final Color whis100; + final Color whis; /// Supportive color. final Color whis60; @@ -243,31 +243,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin required this.jiren, required this.heles, required this.zeno, - required this.krillin100, + required this.krillin, required this.krillin60, required this.krillin10, - required this.chiChi100, - required this.chiChi60, - required this.chiChi10, - required this.roshi100, + required this.chichi, + required this.chichi60, + required this.chichi10, + required this.roshi, required this.roshi60, required this.roshi10, - required this.frieza100, + required this.frieza, required this.frieza60, required this.frieza10, - required this.dodoria100, + required this.dodoria, required this.dodoria60, required this.dodoria10, - required this.cell100, + required this.cell, required this.cell60, required this.cell10, - required this.raditz100, + required this.raditz, required this.raditz60, required this.raditz10, - required this.nappa100, + required this.nappa, required this.nappa60, required this.nappa10, - required this.whis100, + required this.whis, required this.whis60, required this.whis10, required this.textPrimary, @@ -290,31 +290,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin Color? jiren, Color? heles, Color? zeno, - Color? krillin100, + Color? krillin, Color? krillin60, Color? krillin10, - Color? chiChi100, - Color? chiChi60, - Color? chiChi10, - Color? roshi100, + Color? chichi, + Color? chichi60, + Color? chichi10, + Color? roshi, Color? roshi60, Color? roshi10, - Color? frieza100, + Color? frieza, Color? frieza60, Color? frieza10, - Color? dodoria100, + Color? dodoria, Color? dodoria60, Color? dodoria10, - Color? cell100, + Color? cell, Color? cell60, Color? cell10, - Color? raditz100, + Color? raditz, Color? raditz60, Color? raditz10, - Color? nappa100, + Color? nappa, Color? nappa60, Color? nappa10, - Color? whis100, + Color? whis, Color? whis60, Color? whis10, Color? textPrimary, @@ -335,31 +335,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin jiren: jiren ?? this.jiren, heles: heles ?? this.heles, zeno: zeno ?? this.zeno, - krillin100: krillin100 ?? this.krillin100, + krillin: krillin ?? this.krillin, krillin60: krillin60 ?? this.krillin60, krillin10: krillin10 ?? this.krillin10, - chiChi100: chiChi100 ?? this.chiChi100, - chiChi60: chiChi60 ?? this.chiChi60, - chiChi10: chiChi10 ?? this.chiChi10, - roshi100: roshi100 ?? this.roshi100, + chichi: chichi ?? this.chichi, + chichi60: chichi60 ?? this.chichi60, + chichi10: chichi10 ?? this.chichi10, + roshi: roshi ?? this.roshi, roshi60: roshi60 ?? this.roshi60, roshi10: roshi10 ?? this.roshi10, - frieza100: frieza100 ?? this.frieza100, + frieza: frieza ?? this.frieza, frieza60: frieza60 ?? this.frieza60, frieza10: frieza10 ?? this.frieza10, - dodoria100: dodoria100 ?? this.dodoria100, + dodoria: dodoria ?? this.dodoria, dodoria60: dodoria60 ?? this.dodoria60, dodoria10: dodoria10 ?? this.dodoria10, - cell100: cell100 ?? this.cell100, + cell: cell ?? this.cell, cell60: cell60 ?? this.cell60, cell10: cell10 ?? this.cell10, - raditz100: raditz100 ?? this.raditz100, + raditz: raditz ?? this.raditz, raditz60: raditz60 ?? this.raditz60, raditz10: raditz10 ?? this.raditz10, - nappa100: nappa100 ?? this.nappa100, + nappa: nappa ?? this.nappa, nappa60: nappa60 ?? this.nappa60, nappa10: nappa10 ?? this.nappa10, - whis100: whis100 ?? this.whis100, + whis: whis ?? this.whis, whis60: whis60 ?? this.whis60, whis10: whis10 ?? this.whis10, textPrimary: textPrimary ?? this.textPrimary, @@ -386,31 +386,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin jiren: colorPremulLerp(jiren, other.jiren, t)!, heles: colorPremulLerp(heles, other.heles, t)!, zeno: colorPremulLerp(zeno, other.zeno, t)!, - krillin100: colorPremulLerp(krillin100, other.krillin100, t)!, + krillin: colorPremulLerp(krillin, other.krillin, t)!, krillin60: colorPremulLerp(krillin60, other.krillin60, t)!, krillin10: colorPremulLerp(krillin10, other.krillin10, t)!, - chiChi100: colorPremulLerp(chiChi100, other.chiChi100, t)!, - chiChi60: colorPremulLerp(chiChi60, other.chiChi60, t)!, - chiChi10: colorPremulLerp(chiChi10, other.chiChi10, t)!, - roshi100: colorPremulLerp(roshi100, other.roshi100, t)!, + chichi: colorPremulLerp(chichi, other.chichi, t)!, + chichi60: colorPremulLerp(chichi60, other.chichi60, t)!, + chichi10: colorPremulLerp(chichi10, other.chichi10, t)!, + roshi: colorPremulLerp(roshi, other.roshi, t)!, roshi60: colorPremulLerp(roshi60, other.roshi60, t)!, roshi10: colorPremulLerp(roshi10, other.roshi10, t)!, - frieza100: colorPremulLerp(frieza100, other.frieza100, t)!, + frieza: colorPremulLerp(frieza, other.frieza, t)!, frieza60: colorPremulLerp(frieza60, other.frieza60, t)!, frieza10: colorPremulLerp(frieza10, other.frieza10, t)!, - dodoria100: colorPremulLerp(dodoria100, other.dodoria100, t)!, + dodoria: colorPremulLerp(dodoria, other.dodoria, t)!, dodoria60: colorPremulLerp(dodoria60, other.dodoria60, t)!, dodoria10: colorPremulLerp(dodoria10, other.dodoria10, t)!, - cell100: colorPremulLerp(cell100, other.cell100, t)!, + cell: colorPremulLerp(cell, other.cell, t)!, cell60: colorPremulLerp(cell60, other.cell60, t)!, cell10: colorPremulLerp(cell10, other.cell10, t)!, - raditz100: colorPremulLerp(raditz100, other.raditz100, t)!, + raditz: colorPremulLerp(raditz, other.raditz, t)!, raditz60: colorPremulLerp(raditz60, other.raditz60, t)!, raditz10: colorPremulLerp(raditz10, other.raditz10, t)!, - nappa100: colorPremulLerp(nappa100, other.nappa100, t)!, + nappa: colorPremulLerp(nappa, other.nappa, t)!, nappa60: colorPremulLerp(nappa60, other.nappa60, t)!, nappa10: colorPremulLerp(nappa10, other.nappa10, t)!, - whis100: colorPremulLerp(whis100, other.whis100, t)!, + whis: colorPremulLerp(whis, other.whis, t)!, whis60: colorPremulLerp(whis60, other.whis60, t)!, whis10: colorPremulLerp(whis10, other.whis10, t)!, textPrimary: colorPremulLerp(textPrimary, other.textPrimary, t)!, @@ -437,31 +437,31 @@ class MoonColors extends ThemeExtension with DiagnosticableTreeMixin ..add(ColorProperty("jiren", jiren)) ..add(ColorProperty("heles", heles)) ..add(ColorProperty("zeno", zeno)) - ..add(ColorProperty("krillin100", krillin100)) + ..add(ColorProperty("krillin", krillin)) ..add(ColorProperty("krillin60", krillin60)) ..add(ColorProperty("krillin10", krillin10)) - ..add(ColorProperty("chiChi100", chiChi100)) - ..add(ColorProperty("chiChi60", chiChi60)) - ..add(ColorProperty("chiChi10", chiChi10)) - ..add(ColorProperty("roshi100", roshi100)) + ..add(ColorProperty("chichi", chichi)) + ..add(ColorProperty("chichi60", chichi60)) + ..add(ColorProperty("chichi10", chichi10)) + ..add(ColorProperty("roshi", roshi)) ..add(ColorProperty("roshi60", roshi60)) ..add(ColorProperty("roshi10", roshi10)) - ..add(ColorProperty("frieza100", frieza100)) + ..add(ColorProperty("frieza", frieza)) ..add(ColorProperty("frieza60", frieza60)) ..add(ColorProperty("frieza10", frieza10)) - ..add(ColorProperty("dodoria100", dodoria100)) + ..add(ColorProperty("dodoria", dodoria)) ..add(ColorProperty("dodoria60", dodoria60)) ..add(ColorProperty("dodoria10", dodoria10)) - ..add(ColorProperty("cell100", cell100)) + ..add(ColorProperty("cell", cell)) ..add(ColorProperty("cell60", cell60)) ..add(ColorProperty("cell10", cell10)) - ..add(ColorProperty("raditz100", raditz100)) + ..add(ColorProperty("raditz", raditz)) ..add(ColorProperty("raditz60", raditz60)) ..add(ColorProperty("raditz10", raditz10)) - ..add(ColorProperty("nappa100", nappa100)) + ..add(ColorProperty("nappa", nappa)) ..add(ColorProperty("nappa60", nappa60)) ..add(ColorProperty("nappa10", nappa10)) - ..add(ColorProperty("whis100", whis100)) + ..add(ColorProperty("whis", whis)) ..add(ColorProperty("whis60", whis60)) ..add(ColorProperty("whis10", whis10)) ..add(ColorProperty("textPrimary", textPrimary)) diff --git a/lib/src/widgets/authcode/authcode.dart b/lib/src/widgets/authcode/authcode.dart index c0bee6f2..920a5c94 100644 --- a/lib/src/widgets/authcode/authcode.dart +++ b/lib/src/widgets/authcode/authcode.dart @@ -693,9 +693,8 @@ class _MoonAuthCodeState extends State with TickerProviderStateMix context.moonTheme?.authCodeTheme.colors.inactiveBorderColor ?? MoonColors.light.beerus; - _effectiveErrorBorderColor = widget.errorBorderColor ?? - context.moonTheme?.authCodeTheme.colors.errorBorderColor ?? - MoonColors.light.chiChi100; + _effectiveErrorBorderColor = + widget.errorBorderColor ?? context.moonTheme?.authCodeTheme.colors.errorBorderColor ?? MoonColors.light.chichi; _effectiveSelectedFillColor = widget.selectedFillColor ?? context.moonTheme?.authCodeTheme.colors.selectedFillColor ?? MoonColors.light.goku; diff --git a/lib/src/widgets/avatar/avatar.dart b/lib/src/widgets/avatar/avatar.dart index 42be2ab2..87ee9532 100644 --- a/lib/src/widgets/avatar/avatar.dart +++ b/lib/src/widgets/avatar/avatar.dart @@ -148,7 +148,7 @@ class MoonAvatar extends StatelessWidget { backgroundColor ?? context.moonTheme?.avatarTheme.colors.backgroundColor ?? MoonColors.light.goku; final Color effectiveBadgeColor = - badgeColor ?? context.moonTheme?.avatarTheme.colors.badgeColor ?? MoonColors.light.roshi100; + badgeColor ?? context.moonTheme?.avatarTheme.colors.badgeColor ?? MoonColors.light.roshi; final Color effectiveTextColor = context.moonTheme?.avatarTheme.colors.textColor ?? MoonColors.light.textPrimary; diff --git a/lib/src/widgets/text_area/text_area.dart b/lib/src/widgets/text_area/text_area.dart index df23ff0f..db0333ca 100644 --- a/lib/src/widgets/text_area/text_area.dart +++ b/lib/src/widgets/text_area/text_area.dart @@ -292,7 +292,7 @@ class MoonTextArea extends StatelessWidget { inactiveBorderColor ?? context.moonTheme?.textAreaTheme.colors.inactiveBorderColor ?? MoonColors.light.beerus; final Color effectiveErrorColor = - errorColor ?? context.moonTheme?.textAreaTheme.colors.errorColor ?? MoonColors.light.chiChi100; + errorColor ?? context.moonTheme?.textAreaTheme.colors.errorColor ?? MoonColors.light.chichi; final Color effectiveHoverBorderColor = hoverBorderColor ?? context.moonTheme?.textAreaTheme.colors.hoverBorderColor ?? MoonColors.light.beerus; diff --git a/lib/src/widgets/text_input/text_input.dart b/lib/src/widgets/text_input/text_input.dart index 155da46f..c4c0fc3a 100644 --- a/lib/src/widgets/text_input/text_input.dart +++ b/lib/src/widgets/text_input/text_input.dart @@ -1041,7 +1041,7 @@ class _MoonTextInputState extends State MoonColors.light.beerus; final Color effectiveErrorColor = - widget.errorColor ?? context.moonTheme?.textInputTheme.colors.errorColor ?? MoonColors.light.chiChi100; + widget.errorColor ?? context.moonTheme?.textInputTheme.colors.errorColor ?? MoonColors.light.chichi; final Color effectiveHoverBorderColor = widget.hoverBorderColor ?? context.moonTheme?.textInputTheme.colors.hoverBorderColor ?? MoonColors.light.beerus; diff --git a/lib/src/widgets/text_input_group/text_input_group.dart b/lib/src/widgets/text_input_group/text_input_group.dart index 8c586963..04eb6b11 100644 --- a/lib/src/widgets/text_input_group/text_input_group.dart +++ b/lib/src/widgets/text_input_group/text_input_group.dart @@ -156,7 +156,7 @@ class _MoonTextInputGroupState extends State { widget.borderColor ?? context.moonTheme?.textInputGroupTheme.colors.borderColor ?? MoonColors.light.beerus; final Color effectiveErrorColor = - widget.errorColor ?? context.moonTheme?.textInputGroupTheme.colors.errorColor ?? MoonColors.light.chiChi100; + widget.errorColor ?? context.moonTheme?.textInputGroupTheme.colors.errorColor ?? MoonColors.light.chichi; final Color effectiveHelperTextColor = widget.hintTextColor ?? context.moonTheme?.textInputGroupTheme.colors.helperTextColor ?? diff --git a/pubspec.yaml b/pubspec.yaml index 7da2ecf2..459b03a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: moon_design description: Moon Design System for Flutter. A set of coherent, themable, and extensible widgets following the Moon Design System. -version: 0.37.0 +version: 0.38.0 homepage: https://flutter.moon.io/ repository: https://github.com/coingaming/moon_flutter