Fix some of the issues. DO NOT MERGE - Tests still failing

Author: thelukewalton

packages/zeta_flutter/lib/src/components/buttons/button.dart

@@ -40,21 +40,6 @@ class ZetaButton extends ZetaStatelessWidget {
     this.child,
   }) : type = ZetaButtonType.primary;
 
-  /// Constructs [ZetaButton] with Secondary theme.
-  @Deprecated('Secondary buttons are deprecated and will be removed in a future version.')
-  const ZetaButton.secondary({
-    super.key,
-    required this.label,
-    this.onPressed,
-    this.size = ZetaWidgetSize.medium,
-    this.borderType,
-    this.leadingIcon,
-    this.trailingIcon,
-    this.focusNode,
-    this.semanticLabel,
-    this.child,
-  }) : type = ZetaButtonType.secondary;
-
   /// Constructs [ZetaButton] with Positive theme.
   const ZetaButton.positive({
     super.key,

packages/zeta_flutter/lib/src/components/buttons/button_style.dart

@@ -1,6 +1,3 @@
-// Ignored whilst secondary is still in use
-// ignore_for_file: deprecated_member_use_from_same_package
-
 import 'package:flutter/material.dart';
 
 import '../../../zeta_flutter.dart';
@@ -11,12 +8,6 @@ enum ZetaButtonType {
   /// Border: None.
   primary,
 
-  /// Background: Secondary color; defaults to yellow.
-  /// Border: None.
-
-  @Deprecated('Secondary buttons are deprecated and will be removed in a future version.')
-  secondary,
-
   /// Background: Positive color; defaults to green.
   /// Border: None.
   positive,
@@ -46,9 +37,7 @@ enum ZetaButtonType {
   Color _backgroundColor(ZetaColors colors) {
     switch (this) {
       case ZetaButtonType.primary:
-        return colors.statePrimaryEnabled;
-      case ZetaButtonType.secondary:
-        return colors.stateSecondaryEnabled;
+        return colors.statePrimaryLegacyEnabled;
       case ZetaButtonType.positive:
         return colors.statePositiveEnabled;
       case ZetaButtonType.negative:
@@ -66,9 +55,7 @@ enum ZetaButtonType {
   Color _hoverColor(ZetaColors colors) {
     switch (this) {
       case ZetaButtonType.primary:
-        return colors.statePrimaryHover;
-      case ZetaButtonType.secondary:
-        return colors.stateSecondaryHover;
+        return colors.statePrimaryLegacyHover;
       case ZetaButtonType.positive:
         return colors.statePositiveHover;
       case ZetaButtonType.negative:
@@ -85,9 +72,7 @@ enum ZetaButtonType {
   Color _pressedColor(ZetaColors colors) {
     switch (this) {
       case ZetaButtonType.primary:
-        return colors.statePrimarySelected;
-      case ZetaButtonType.secondary:
-        return colors.stateSecondarySelected;
+        return colors.statePrimaryLegacySelected;
       case ZetaButtonType.positive:
         return colors.statePositiveSelected;
       case ZetaButtonType.negative:
@@ -142,11 +127,10 @@ ButtonStyle buttonStyle(
         switch (type) {
           case ZetaButtonType.outline:
           case ZetaButtonType.text:
-            return colors.mainPrimary;
+            return colors.mainPrimaryLegacy;
           case ZetaButtonType.outlineSubtle:
             return colors.mainDefault;
           case ZetaButtonType.primary:
-          case ZetaButtonType.secondary:
           case ZetaButtonType.positive:
           case ZetaButtonType.negative:
             return colors.stateDefaultEnabled;
@@ -164,11 +148,11 @@ ButtonStyle buttonStyle(
       }
       // TODO(UX-1134): This removes a defualt border when focused, rather than adding a second border when focused.
       if (states.contains(WidgetState.focused)) {
-        return BorderSide(color: colors.borderPrimary, width: ZetaBorders.medium);
+        return BorderSide(color: colors.borderPrimaryLegacy, width: ZetaBorders.medium);
       }
       if (type._border) {
         return BorderSide(
-          color: type == ZetaButtonType.outline ? colors.borderPrimaryMain : colors.borderSubtle,
+          color: type == ZetaButtonType.outline ? colors.borderPrimaryLegacy : colors.borderSubtle,
         );
       }
 
@@ -184,11 +168,10 @@ ButtonStyle buttonStyle(
         switch (type) {
           case ZetaButtonType.outline:
           case ZetaButtonType.text:
-            return colors.mainPrimary;
+            return colors.mainPrimaryLegacy;
           case ZetaButtonType.outlineSubtle:
             return colors.mainDefault;
           case ZetaButtonType.primary:
-          case ZetaButtonType.secondary:
           case ZetaButtonType.positive:
           case ZetaButtonType.negative:
             return colors.stateDefaultEnabled;

packages/zeta_flutter/lib/src/components/buttons/icon_button.dart

@@ -34,18 +34,6 @@ class ZetaIconButton extends ZetaStatelessWidget {
     this.semanticLabel,
   }) : type = ZetaButtonType.primary;
 
-  /// Constructs [ZetaIconButton] with Secondary theme.
-  @Deprecated('Secondary buttons are deprecated and will be removed in a future version.')
-  const ZetaIconButton.secondary({
-    super.key,
-    super.rounded,
-    required this.icon,
-    this.onPressed,
-    this.size = ZetaWidgetSize.medium,
-    this.borderType,
-    this.semanticLabel,
-  }) : type = ZetaButtonType.secondary;
-
   /// Constructs [ZetaIconButton] with Positive theme.
   const ZetaIconButton.positive({
     super.key,

packages/zeta_flutter/lib/src/components/checkbox/checkbox.dart

@@ -241,7 +241,7 @@ class _CheckboxState extends State<ZetaInternalCheckbox> {
                 BoxShadow(
                   spreadRadius: 2,
                   blurStyle: BlurStyle.solid,
-                  color: theme.colors.borderPrimary,
+                  color: theme.colors.borderPrimaryLegacy,
                 ),
             ],
             color: _getBackground(theme),

packages/zeta_flutter/lib/src/components/chips/chip.dart

@@ -243,7 +243,7 @@ class _ZetaChipState extends State<ZetaChip> {
                     if (states.contains(WidgetState.hovered)) {
                       return colors.borderHover;
                     }
-                    return colors.surfaceDefaultInverse;
+                    return colors.stateInverseEnabled;
                   }
                   if (states.contains(WidgetState.pressed) || isDragging) {
                     return colors.surfaceSelected;

packages/zeta_flutter/lib/src/components/fabs/fab.dart

@@ -211,7 +211,7 @@ class _ZetaFABState extends State<ZetaFAB> {
               (Set<WidgetState> states) {
                 if (states.contains(WidgetState.focused)) {
                   // TODO(UX-1134): This removes a defualt border when focused, rather than adding a second border when focused.
-                  return BorderSide(color: Zeta.of(context).colors.borderPrimary, width: ZetaBorders.medium);
+                  return BorderSide(color: Zeta.of(context).colors.borderPrimaryLegacy, width: ZetaBorders.medium);
                 }
                 return null;
               },

packages/zeta_flutter/lib/src/components/range_selector/range_selector.dart

@@ -112,7 +112,7 @@ class _ZetaRangeSelectorState extends State<ZetaRangeSelector> {
     if (widget.onChange == null) {
       return colors.mainDisabled;
     }
-    return _selected ? colors.mainPrimary : colors.surfaceDefaultInverse;
+    return _selected ? colors.mainPrimary : colors.mainDefault;
   }
 
   void _onSubmit(TextEditingController controller, {bool lower = true}) {

packages/zeta_flutter/lib/src/components/snack_bar/snack_bar.dart

@@ -131,7 +131,7 @@ class ZetaSnackBar extends SnackBar {
       ZetaSnackBarType.warning => colors.surfaceWarningSubtle,
       ZetaSnackBarType.deletion || ZetaSnackBarType.error => colors.surfaceNegativeSubtle,
       ZetaSnackBarType.view => colors.surfacePrimarySubtle,
-      _ => colors.surfaceDefaultInverse,
+      _ => colors.surfaceInversePure,
     };
   }
 }
@@ -225,12 +225,12 @@ class _Action extends StatelessWidget {
         return switch (type) {
           ZetaSnackBarType.defaultType => _IconButton(
               onPressed: () => ScaffoldMessenger.of(context).removeCurrentSnackBar(),
-              color: colors.surfaceDefaultInverse,
+              color: colors.iconInverse,
             ),
           ZetaSnackBarType.action => _ActionButton(
               onPressed: onPressed,
               label: label,
-              color: colors.borderPrimaryMain,
+              color: colors.mainLight,
             ),
           ZetaSnackBarType.positive ||
           ZetaSnackBarType.info ||
@@ -253,7 +253,7 @@ class _Action extends StatelessWidget {
           _ => _ActionButton(
               onPressed: onPressed,
               label: label,
-              color: colors.borderPrimaryMain,
+              color: colors.mainDefault,
             ),
         };
       }(),

packages/zeta_flutter/test/src/components/button/button_test.dart

@@ -15,18 +15,16 @@ void main() {
   });
 
   group('Accessibility Tests', () {
-    // Ignoring the secondary button type as it is deprecated.
-    // ignore: deprecated_member_use_from_same_package
-    final buttonTypes = ZetaButtonType.values.where((type) => type != ZetaButtonType.secondary);
-    for (final buttonType in buttonTypes) {
+    for (final buttonType in ZetaButtonType.values) {
       for (final size in ZetaWidgetSize.values) {
         meetsAccessibilityGuidelinesTest(
           ZetaButton(
             onPressed: () {},
-            label: '${buttonType.name} ${size.name}',
+            label: '$buttonType ${size.name}',
             type: buttonType,
             size: size,
           ),
+          testName: '$buttonType ${size.name}',
         );
       }
     }