fix: [MDS-696] Swap light gohan and goku colors (#258)

coingaming · Sep 25, 2023 · 0fb1750 · 0fb1750
1 parent 4333315
commit 0fb1750
Show file tree

Hide file tree

Showing 38 changed files with 52 additions and 52 deletions.
diff --git a/example/lib/src/storybook/stories/carousel.dart b/example/lib/src/storybook/stories/carousel.dart
@@ -88,7 +88,7 @@ class CarouselStory extends Story {
                           clampMaxExtent: clampMaxExtentKnob,
                           itemBuilder: (BuildContext context, int itemIndex, int realIndex) => Container(
                             decoration: ShapeDecoration(
-                              color: context.moonColors!.gohan,
+                              color: context.moonColors!.goku,
                               shape: MoonSquircleBorder(
                                 borderRadius: BorderRadius.circular(12).squircleBorderRadius(context),
                               ),
@@ -121,7 +121,7 @@ class CarouselStory extends Story {
                                       onIndexChanged: (int index) => setState(() => selectedDot = index),
                                       itemBuilder: (BuildContext context, int itemIndex, int realIndex) => Container(
                                         decoration: ShapeDecoration(
-                                          color: context.moonColors!.gohan,
+                                          color: context.moonColors!.goku,
                                           shape: MoonSquircleBorder(
                                             borderRadius: BorderRadius.circular(12).squircleBorderRadius(context),
                                           ),
@@ -146,7 +146,7 @@ class CarouselStory extends Story {
                                                     : MoonIcons.chevron_right_small_24,
                                               ),
                                               decoration: ShapeDecorationWithPremultipliedAlpha(
-                                                color: context.moonColors!.gohan,
+                                                color: context.moonColors!.goku,
                                                 shadows: context.moonShadows!.sm,
                                                 shape: MoonSquircleBorder(
                                                   borderRadius: BorderRadius.circular(8).squircleBorderRadius(context),
@@ -163,7 +163,7 @@ class CarouselStory extends Story {
                                                     : MoonIcons.chevron_left_small_24,
                                               ),
                                               decoration: ShapeDecorationWithPremultipliedAlpha(
-                                                color: context.moonColors!.gohan,
+                                                color: context.moonColors!.goku,
                                                 shadows: context.moonShadows!.sm,
                                                 shape: MoonSquircleBorder(
                                                   borderRadius: BorderRadius.circular(8).squircleBorderRadius(context),

diff --git a/lib/src/theme/accordion/accordion_theme.dart b/lib/src/theme/accordion/accordion_theme.dart
@@ -39,8 +39,8 @@ class MoonAccordionTheme extends ThemeExtension<MoonAccordionTheme> with Diagnos
               expandedIconColor: tokens.colors.iconPrimary,
               trailingIconColor: tokens.colors.iconPrimary,
               expandedTrailingIconColor: tokens.colors.iconSecondary,
-              backgroundColor: tokens.colors.gohan,
-              expandedBackgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
+              expandedBackgroundColor: tokens.colors.goku,
               borderColor: tokens.colors.beerus,
               dividerColor: tokens.colors.beerus,
             ),

diff --git a/lib/src/theme/alert/alert_theme.dart b/lib/src/theme/alert/alert_theme.dart
@@ -22,7 +22,7 @@ class MoonAlertTheme extends ThemeExtension<MoonAlertTheme> with DiagnosticableT
     MoonAlertProperties? properties,
   })  : colors = colors ??
             MoonAlertColors(
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               borderColor: tokens.colors.textSecondary,
               iconColor: tokens.colors.iconPrimary,
               textColor: tokens.colors.textPrimary,

diff --git a/lib/src/theme/authcode/authcode_theme.dart b/lib/src/theme/authcode/authcode_theme.dart
@@ -26,9 +26,9 @@ class MoonAuthCodeTheme extends ThemeExtension<MoonAuthCodeTheme> with Diagnosti
               activeBorderColor: tokens.colors.beerus,
               inactiveBorderColor: tokens.colors.beerus,
               errorBorderColor: tokens.colors.chiChi100,
-              selectedFillColor: tokens.colors.gohan,
-              activeFillColor: tokens.colors.gohan,
-              inactiveFillColor: tokens.colors.gohan,
+              selectedFillColor: tokens.colors.goku,
+              activeFillColor: tokens.colors.goku,
+              inactiveFillColor: tokens.colors.goku,
               textColor: tokens.colors.textPrimary,
             ),
         properties = properties ??

diff --git a/lib/src/theme/avatar/avatar_theme.dart b/lib/src/theme/avatar/avatar_theme.dart
@@ -22,7 +22,7 @@ class MoonAvatarTheme extends ThemeExtension<MoonAvatarTheme> with Diagnosticabl
     MoonAvatarSizes? sizes,
   })  : colors = colors ??
             MoonAvatarColors(
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               badgeColor: tokens.colors.roshi100,
               iconColor: tokens.colors.iconPrimary,
               textColor: tokens.colors.textPrimary,

diff --git a/lib/src/theme/bottom_sheet/bottom_sheet_theme.dart b/lib/src/theme/bottom_sheet/bottom_sheet_theme.dart
@@ -24,7 +24,7 @@ class MoonBottomSheetTheme extends ThemeExtension<MoonBottomSheetTheme> with Dia
             MoonBottomSheetColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               barrierColor: tokens.colors.zeno,
             ),
         properties = properties ??

diff --git a/lib/src/theme/chip/chip_theme.dart b/lib/src/theme/chip/chip_theme.dart
@@ -23,7 +23,7 @@ class MoonChipTheme extends ThemeExtension<MoonChipTheme> with DiagnosticableTre
   })  : colors = colors ??
             MoonChipColors(
               activeColor: tokens.colors.piccolo,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               activeBackgroundColor: tokens.colors.jiren,
               textColor: tokens.colors.textPrimary,
             ),

diff --git a/lib/src/theme/drawer/drawer_theme.dart b/lib/src/theme/drawer/drawer_theme.dart
@@ -29,7 +29,7 @@ class MoonDrawerTheme extends ThemeExtension<MoonDrawerTheme> with Diagnosticabl
             MoonDrawerColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               barrierColor: tokens.colors.zeno,
             ),
         properties = properties ??

diff --git a/lib/src/theme/dropdown/dropdown_theme.dart b/lib/src/theme/dropdown/dropdown_theme.dart
@@ -29,7 +29,7 @@ class MoonDropdownTheme extends ThemeExtension<MoonDropdownTheme> with Diagnosti
             MoonDropdownColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
             ),
         properties = properties ??
             MoonDropdownProperties(

diff --git a/lib/src/theme/modal/modal_theme.dart b/lib/src/theme/modal/modal_theme.dart
@@ -24,7 +24,7 @@ class MoonModalTheme extends ThemeExtension<MoonModalTheme> with DiagnosticableT
             MoonModalColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               barrierColor: tokens.colors.zeno,
             ),
         properties = properties ??

diff --git a/lib/src/theme/popover/popover_theme.dart b/lib/src/theme/popover/popover_theme.dart
@@ -29,7 +29,7 @@ class MoonPopoverTheme extends ThemeExtension<MoonPopoverTheme> with Diagnostica
             MoonPopoverColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
             ),
         properties = properties ??
             MoonPopoverProperties(

diff --git a/lib/src/theme/segmented_control/segmented_control_theme.dart b/lib/src/theme/segmented_control/segmented_control_theme.dart
@@ -27,8 +27,8 @@ class MoonSegmentedControlTheme extends ThemeExtension<MoonSegmentedControlTheme
     MoonSegmentedControlSizes? sizes,
   })  : colors = colors ??
             MoonSegmentedControlColors(
-              backgroundColor: tokens.colors.goku,
-              selectedSegmentColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.gohan,
+              selectedSegmentColor: tokens.colors.goku,
               textColor: tokens.colors.textPrimary,
               selectedTextColor: tokens.colors.textPrimary,
             ),

diff --git a/lib/src/theme/tab_bar/tab_bar_theme.dart b/lib/src/theme/tab_bar/tab_bar_theme.dart
@@ -31,7 +31,7 @@ class MoonTabBarTheme extends ThemeExtension<MoonTabBarTheme> with Diagnosticabl
               textColor: tokens.colors.textPrimary,
               selectedTextColor: tokens.colors.piccolo,
               selectedPillTextColor: tokens.colors.textPrimary,
-              selectedPillTabColor: tokens.colors.gohan,
+              selectedPillTabColor: tokens.colors.goku,
             ),
         properties = properties ??
             MoonTabBarProperties(

diff --git a/lib/src/theme/tag/tag_theme.dart b/lib/src/theme/tag/tag_theme.dart
@@ -24,7 +24,7 @@ class MoonTagTheme extends ThemeExtension<MoonTagTheme> with DiagnosticableTreeM
             MoonTagColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
             ),
         sizes = sizes ?? MoonTagSizes(tokens: tokens);
 

diff --git a/lib/src/theme/text_area/text_area_theme.dart b/lib/src/theme/text_area/text_area_theme.dart
@@ -22,7 +22,7 @@ class MoonTextAreaTheme extends ThemeExtension<MoonTextAreaTheme> with Diagnosti
     MoonTextAreaProperties? properties,
   })  : colors = colors ??
             MoonTextAreaColors(
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               activeBorderColor: tokens.colors.piccolo,
               inactiveBorderColor: tokens.colors.beerus,
               errorColor: tokens.colors.chiChi100,

diff --git a/lib/src/theme/text_input/text_input_theme.dart b/lib/src/theme/text_input/text_input_theme.dart
@@ -27,7 +27,7 @@ class MoonTextInputTheme extends ThemeExtension<MoonTextInputTheme> with Diagnos
     MoonTextInputSizes? sizes,
   })  : colors = colors ??
             MoonTextInputColors(
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               activeBorderColor: tokens.colors.piccolo,
               inactiveBorderColor: tokens.colors.beerus,
               errorColor: tokens.colors.chiChi100,

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
@@ -22,7 +22,7 @@ class MoonTextInputGroupTheme extends ThemeExtension<MoonTextInputGroupTheme> wi
     MoonTextInputGroupProperties? properties,
   })  : colors = colors ??
             MoonTextInputGroupColors(
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
               errorColor: tokens.colors.chiChi100,
               helperTextColor: tokens.colors.trunks,
               borderColor: tokens.colors.beerus,

diff --git a/lib/src/theme/toast/toast_theme.dart b/lib/src/theme/toast/toast_theme.dart
@@ -27,8 +27,8 @@ class MoonToastTheme extends ThemeExtension<MoonToastTheme> with DiagnosticableT
     MoonToastShadows? shadows,
   })  : colors = colors ??
             MoonToastColors(
-              lightVariantBackgroundColor: tokens.colors.gohan,
-              darkVariantBackgroundColor: tokens.complementaryColors.gohan,
+              lightVariantBackgroundColor: tokens.colors.goku,
+              darkVariantBackgroundColor: tokens.complementaryColors.goku,
               lightVariantTextColor: tokens.colors.bulma,
               darkVariantTextColor: tokens.complementaryColors.bulma,
               lightVariantIconColor: tokens.colors.bulma,

diff --git a/lib/src/theme/tokens/colors.dart b/lib/src/theme/tokens/colors.dart
@@ -9,8 +9,8 @@ class MoonColors extends ThemeExtension<MoonColors> with DiagnosticableTreeMixin
     piccolo: Color(0xFF4E46B4),
     hit: Color(0xFF40A69F),
     beerus: Color(0xFFE2E2E2),
-    goku: Color(0xFFF5F5F5),
-    gohan: Color(0xFFFFFFFF),
+    goku: Color(0xFFFFFFFF),
+    gohan: Color(0xFFF5F5F5),
     bulma: Color(0xFF000000),
     trunks: Color(0xFF595D62),
     goten: Color(0xFFFFFFFF),

diff --git a/lib/src/theme/tooltip/tooltip_theme.dart b/lib/src/theme/tooltip/tooltip_theme.dart
@@ -29,7 +29,7 @@ class MoonTooltipTheme extends ThemeExtension<MoonTooltipTheme> with Diagnostica
             MoonTooltipColors(
               textColor: tokens.colors.textPrimary,
               iconColor: tokens.colors.iconPrimary,
-              backgroundColor: tokens.colors.gohan,
+              backgroundColor: tokens.colors.goku,
             ),
         properties = properties ??
             MoonTooltipProperties(

diff --git a/lib/src/widgets/accordion/accordion.dart b/lib/src/widgets/accordion/accordion.dart
@@ -433,11 +433,11 @@ class _MoonAccordionState<T> extends State<MoonAccordion<T>> with TickerProvider
     _resolvedDirectionalHeaderPadding = _effectiveHeaderPadding.resolve(Directionality.of(context));
 
     final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? context.moonTheme?.accordionTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        widget.backgroundColor ?? context.moonTheme?.accordionTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveExpandedBackgroundColor = widget.expandedBackgroundColor ??
         context.moonTheme?.accordionTheme.colors.expandedBackgroundColor ??
-        MoonColors.light.gohan;
+        MoonColors.light.goku;
 
     final Color effectiveIconColor =
         widget.iconColor ?? context.moonTheme?.accordionTheme.colors.iconColor ?? MoonColors.light.iconPrimary;

diff --git a/lib/src/widgets/alert/alert.dart b/lib/src/widgets/alert/alert.dart
@@ -175,7 +175,7 @@ class _MoonAlertState extends State<MoonAlert> with SingleTickerProviderStateMix
         widget.minimumHeight ?? context.moonTheme?.alertTheme.properties.minimumHeight ?? MoonSizes.sizes.xl;
 
     final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? context.moonTheme?.alertTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        widget.backgroundColor ?? context.moonTheme?.alertTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveBorderColor =
         widget.borderColor ?? context.moonTheme?.alertTheme.colors.borderColor ?? MoonColors.light.bulma;

diff --git a/lib/src/widgets/authcode/authcode.dart b/lib/src/widgets/authcode/authcode.dart
@@ -702,13 +702,13 @@ class _MoonAuthCodeState extends State<MoonAuthCode> with TickerProviderStateMix
         MoonColors.light.chiChi100;
 
     _effectiveSelectedFillColor =
-        widget.selectedFillColor ?? context.moonTheme?.authCodeTheme.colors.selectedFillColor ?? MoonColors.light.gohan;
+        widget.selectedFillColor ?? context.moonTheme?.authCodeTheme.colors.selectedFillColor ?? MoonColors.light.goku;
 
     _effectiveActiveFillColor =
-        widget.activeFillColor ?? context.moonTheme?.authCodeTheme.colors.activeFillColor ?? MoonColors.light.gohan;
+        widget.activeFillColor ?? context.moonTheme?.authCodeTheme.colors.activeFillColor ?? MoonColors.light.goku;
 
     _effectiveInactiveFillColor =
-        widget.inactiveFillColor ?? context.moonTheme?.authCodeTheme.colors.inactiveFillColor ?? MoonColors.light.gohan;
+        widget.inactiveFillColor ?? context.moonTheme?.authCodeTheme.colors.inactiveFillColor ?? MoonColors.light.goku;
 
     _effectiveTextStyle =
         context.moonTheme?.authCodeTheme.properties.textStyle ?? MoonTypography.typography.body.text24;

diff --git a/lib/src/widgets/avatar/avatar.dart b/lib/src/widgets/avatar/avatar.dart
@@ -145,7 +145,7 @@ class MoonAvatar extends StatelessWidget {
     final resolvedBorderRadius = effectiveBorderRadius.resolve(Directionality.of(context));
 
     final Color effectiveBackgroundColor =
-        backgroundColor ?? context.moonTheme?.avatarTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        backgroundColor ?? context.moonTheme?.avatarTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveBadgeColor =
         badgeColor ?? context.moonTheme?.avatarTheme.colors.badgeColor ?? MoonColors.light.roshi100;

diff --git a/lib/src/widgets/bottom_sheet/bottom_sheet.dart b/lib/src/widgets/bottom_sheet/bottom_sheet.dart
@@ -321,7 +321,7 @@ class MoonBottomSheetState extends State<MoonBottomSheet> with TickerProviderSta
         MoonBorders.borders.surfaceSm;
 
     final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? context.moonTheme?.bottomSheetTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        widget.backgroundColor ?? context.moonTheme?.bottomSheetTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveIconColor =
         context.moonTheme?.bottomSheetTheme.colors.iconColor ?? MoonColors.light.iconPrimary;

diff --git a/lib/src/widgets/chips/chip.dart b/lib/src/widgets/chips/chip.dart
@@ -251,7 +251,7 @@ class _MoonChipState extends State<MoonChip> with SingleTickerProviderStateMixin
         widget.activeColor ?? context.moonTheme?.chipTheme.colors.activeColor ?? MoonColors.light.piccolo;
 
     final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? context.moonTheme?.chipTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        widget.backgroundColor ?? context.moonTheme?.chipTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveActiveBackgroundColor = widget.activeBackgroundColor ??
         context.moonTheme?.chipTheme.colors.activeBackgroundColor ??

diff --git a/lib/src/widgets/drawer/drawer.dart b/lib/src/widgets/drawer/drawer.dart
@@ -51,7 +51,7 @@ class MoonDrawer extends StatelessWidget {
         borderRadius ?? context.moonTheme?.drawerTheme.properties.borderRadius ?? BorderRadius.zero;
 
     final Color effectiveBackgroundColor =
-        backgroundColor ?? context.moonTheme?.drawerTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        backgroundColor ?? context.moonTheme?.drawerTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveTextColor = context.moonTheme?.drawerTheme.colors.textColor ?? MoonColors.light.textPrimary;
 

diff --git a/lib/src/widgets/dropdown/dropdown.dart b/lib/src/widgets/dropdown/dropdown.dart
@@ -370,7 +370,7 @@ class _MoonDropdownState extends State<MoonDropdown> with RouteAware, SingleTick
         widget.borderRadius ?? context.moonTheme?.dropdownTheme.properties.borderRadius ?? BorderRadius.circular(12);
 
     final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? context.moonTheme?.dropdownTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        widget.backgroundColor ?? context.moonTheme?.dropdownTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveTextColor = context.moonTheme?.dropdownTheme.colors.textColor ?? MoonColors.light.textPrimary;
 

diff --git a/lib/src/widgets/modal/modal.dart b/lib/src/widgets/modal/modal.dart
@@ -154,7 +154,7 @@ class MoonModal extends StatelessWidget {
         borderRadius ?? context.moonTheme?.modalTheme.properties.borderRadius ?? MoonBorders.borders.surfaceSm;
 
     final Color effectiveBackgroundColor =
-        backgroundColor ?? context.moonTheme?.modalTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        backgroundColor ?? context.moonTheme?.modalTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveTextColor = context.moonTheme?.modalTheme.colors.textColor ?? MoonColors.light.textPrimary;
 

diff --git a/lib/src/widgets/popover/popover.dart b/lib/src/widgets/popover/popover.dart
@@ -360,7 +360,7 @@ class MoonPopoverState extends State<MoonPopover> with RouteAware, SingleTickerP
         widget.borderRadius ?? context.moonTheme?.popoverTheme.properties.borderRadius ?? BorderRadius.circular(12);
 
     final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? context.moonTheme?.popoverTheme.colors.backgroundColor ?? MoonColors.light.gohan;
+        widget.backgroundColor ?? context.moonTheme?.popoverTheme.colors.backgroundColor ?? MoonColors.light.goku;
 
     final Color effectiveTextColor = context.moonTheme?.popoverTheme.colors.textColor ?? MoonColors.light.textPrimary;
 

diff --git a/lib/src/widgets/segmented_control/segmented_control.dart b/lib/src/widgets/segmented_control/segmented_control.dart
@@ -179,7 +179,7 @@ class _MoonSegmentedControlState extends State<MoonSegmentedControl> {
 
     final Color effectiveBackgroundColor = widget.backgroundColor ??
         context.moonTheme?.segmentedControlTheme.colors.backgroundColor ??
-        MoonColors.light.goku;
+        MoonColors.light.gohan;
 
     final double effectiveDisabledOpacityValue = context.moonOpacities?.disabled ?? MoonOpacities.opacities.disabled;
 
@@ -316,7 +316,7 @@ class _SegmentBuilderState extends State<_SegmentBuilder> with SingleTickerProvi
 
     final Color effectiveSelectedSegmentColor = segmentStyle?.selectedSegmentColor ??
         context.moonTheme?.segmentedControlTheme.colors.selectedSegmentColor ??
-        MoonColors.light.gohan;
+        MoonColors.light.goku;
 
     final Color effectiveTextColor = segmentStyle?.textStyle?.color ??
         segmentStyle?.textColor ??

diff --git a/lib/src/widgets/tab_bar/tab_bar.dart b/lib/src/widgets/tab_bar/tab_bar.dart
@@ -539,7 +539,7 @@ class _PillTabBuilderState extends State<_PillTabBuilder> with SingleTickerProvi
 
     final Color effectiveSelectedTabColor = tabStyle?.selectedTabColor ??
         context.moonTheme?.tabBarTheme.colors.selectedPillTabColor ??
-        MoonColors.light.gohan;
+        MoonColors.light.goku;
 
     final Color effectiveTextColor = tabStyle?.textStyle?.color ??
         tabStyle?.textColor ??