feat: fabs update button labels in example and fix icon color handling

ZebraDevs · Dec 13, 2024 · 95135d2 · 95135d2
1 parent 419ded2
commit 95135d2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/example/lib/pages/components/button_example.dart b/example/lib/pages/components/button_example.dart
@@ -36,7 +36,7 @@ class _ButtonExampleState extends State<ButtonExample> {
       fabs = [
         ZetaFAB(
           scrollController: _scrollController,
-          label: 'Small Circle Primary',
+          label: 'Small Circle Disabled',
           size: ZetaFabSize.small,
           expanded: false,
           shape: ZetaWidgetBorder.full,
@@ -45,15 +45,15 @@ class _ButtonExampleState extends State<ButtonExample> {
         ZetaFAB(
           scrollController: _scrollController,
           expanded: false,
-          label: 'Small Rounded Primary',
+          label: 'Small Rounded Secondary',
           size: ZetaFabSize.small,
           shape: ZetaWidgetBorder.rounded,
           type: ZetaFabType.secondary,
           onPressed: () => setFab(1),
         ),
         ZetaFAB(
           scrollController: _scrollController,
-          label: 'Small Sharp Primary',
+          label: 'Small Sharp Inverse',
           size: ZetaFabSize.small,
           shape: ZetaWidgetBorder.sharp,
           expanded: false,
@@ -62,7 +62,7 @@ class _ButtonExampleState extends State<ButtonExample> {
         ),
         ZetaFAB(
           scrollController: _scrollController,
-          label: 'Large Circle Primary',
+          label: 'Large Circle Secondary',
           size: ZetaFabSize.large,
           shape: ZetaWidgetBorder.full,
           type: ZetaFabType.secondary,
@@ -71,7 +71,7 @@ class _ButtonExampleState extends State<ButtonExample> {
         ),
         ZetaFAB(
           scrollController: _scrollController,
-          label: 'Large Rounded Secondary',
+          label: 'Large Rounded Inverse',
           size: ZetaFabSize.large,
           shape: ZetaWidgetBorder.rounded,
           expanded: false,
@@ -80,7 +80,7 @@ class _ButtonExampleState extends State<ButtonExample> {
         ),
         ZetaFAB(
           scrollController: _scrollController,
-          label: 'Large Sharp Secondary',
+          label: 'Large Sharp Primary',
           size: ZetaFabSize.large,
           shape: ZetaWidgetBorder.sharp,
           type: ZetaFabType.primary,

diff --git a/lib/src/components/fabs/fab.dart b/lib/src/components/fabs/fab.dart
@@ -162,7 +162,13 @@ class _ZetaFABState extends State<ZetaFAB> {
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  ZetaIcon(widget.icon, size: widget.size.iconSize(context)),
+                  ZetaIcon(
+                    widget.icon,
+                    size: widget.size.iconSize(context),
+                    color: widget.onPressed != null
+                        ? widget.type.iconColors(context)
+                        : Zeta.of(context).colors.iconDisabled,
+                  ),
                   if (widget.expanded && widget.label != null)
                     Row(
                       mainAxisSize: MainAxisSize.min,
@@ -206,6 +212,17 @@ extension on ZetaFabType {
         return zetaColors.cool;
     }
   }
+
+  Color iconColors(BuildContext context) {
+    final zetaColors = Zeta.of(context).colors;
+    switch (this) {
+      case ZetaFabType.primary:
+      case ZetaFabType.inverse:
+        return zetaColors.iconInverse;
+      case ZetaFabType.secondary:
+        return zetaColors.iconDefault;
+    }
+  }
 }
 
 extension on ZetaWidgetBorder {