packages/wyatt_ui_components/lib/src/domain/entities/cards/skill_card_component.dart

@@ -43,7 +43,7 @@ abstract class SkillCardComponent extends CardComponent
     super.key,
   });
 
-  final Widget? icon;
+  final IconData? icon;
   final List<Color>? gradient;
   final TextWrapper? title;
   final TextWrapper? description;

packages/wyatt_ui_components/lib/src/domain/entities/cards/skill_card_component.g.dart

@@ -7,7 +7,7 @@ part of 'skill_card_component.dart';
 // **************************************************************************
 
 abstract class $SkillCardComponentCWProxy {
-  SkillCardComponent icon(Widget? icon);
+  SkillCardComponent icon(IconData? icon);
   SkillCardComponent gradient(List<Color>? gradient);
   SkillCardComponent title(TextWrapper? title);
   SkillCardComponent description(TextWrapper? description);
@@ -25,7 +25,7 @@ abstract class $SkillCardComponentCWProxy {
   SkillCardComponent background(Widget? background);
   SkillCardComponent key(Key? key);
   SkillCardComponent call({
-    Widget? icon,
+    IconData? icon,
     List<Color>? gradient,
     TextWrapper? title,
     TextWrapper? description,

packages/wyatt_ui_kit/example/lib/cards/skill_card/skill_cards.dart

@@ -36,18 +36,7 @@ class SkillCards extends StatelessWidget {
             children: [
               SkillCard(
                 gradient: const [Colors.red, Colors.orange],
-                icon: Container(
-                  padding: const EdgeInsets.all(15),
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: Colors.white.withOpacity(0.04),
-                  ),
-                  child: const GradientIcon(
-                    Icons.ac_unit_sharp,
-                    gradient:
-                        LinearGradient(colors: [Colors.red, Colors.orange]),
-                  ),
-                ),
+                icon: Icons.ac_unit_sharp,
                 title: 'Lorem Ipsum'.wrap(),
                 description: 'Cupidatat reprehenderit aliqua eiusmod Lorem. '
                         'Qui ipsum id ea ea nulla labore aute ullamco aute '
@@ -65,19 +54,7 @@ class SkillCards extends StatelessWidget {
               const Gap(20),
               SkillCard(
                 gradient: const [Colors.blue, Colors.green],
-                icon: Container(
-                  padding: const EdgeInsets.all(15),
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: Colors.white.withOpacity(0.04),
-                  ),
-                  child: const GradientIcon(
-                    Icons.ac_unit_sharp,
-                    gradient: LinearGradient(
-                      colors: [Colors.blue, Colors.green],
-                    ),
-                  ),
-                ),
+                icon: Icons.ac_unit_sharp,
                 title: 'Lorem Ipsum'.wrap(),
                 description: 'Cupidatat reprehenderit aliqua eiusmod Lorem. '
                         'Qui ipsum id ea ea nulla labore aute ullamco aute '

packages/wyatt_ui_kit/example/macos/Podfile.lock

@@ -22,8 +22,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
-  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
+  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 

packages/wyatt_ui_kit/lib/src/components/bars/top_navigation_bar.dart

@@ -96,7 +96,7 @@ class TopNavigationBar extends TopNavigationBarComponent
           ),
           primary: primary ?? true,
           excludeHeaderSemantics: excludeHeaderSemantics ?? false,
-          leadingWidth: 300,
+          leadingWidth: 200,
           title: Row(
             mainAxisSize: MainAxisSize.min,
             children: navigationItems != null

packages/wyatt_ui_kit/lib/src/components/bars/widgets/navigation_item.dart

@@ -33,28 +33,8 @@ class NavigationItem extends StatelessWidget {
         children: [
           if (selected)
             Container(
-              height: ThemeHelper.getThemeElement<double, double>(
-                [
-                  context
-                      .themeExtension<TopBarThemeExtension>()
-                      ?.selectedIndicatorHeight,
-                  // TODO: move default value
-                  5,
-                ],
-                valueValidator: (value) => value != null,
-                transform: (value) => value,
-              ),
-              width: ThemeHelper.getThemeElement<double, double>(
-                [
-                  context
-                      .themeExtension<TopBarThemeExtension>()
-                      ?.selectedIndicatorWidth,
-                  // TODO: move default value
-                  70,
-                ],
-                valueValidator: (value) => value != null,
-                transform: (value) => value,
-              ),
+              height: 5,
+              width: 70,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(100),
                 color: ThemeHelper.getThemeElement<Color, Color>(
@@ -69,37 +49,22 @@ class NavigationItem extends StatelessWidget {
                 ),
               ),
             ),
-          ConstrainedBox(
-            constraints: BoxConstraints(
-              minWidth: ThemeHelper.getThemeElement<double, double>(
-                [
-                  context
-                      .themeExtension<TopBarThemeExtension>()
-                      ?.selectedIndicatorWidth,
-                  // TODO: move default value
-                  70,
-                ],
-                valueValidator: (value) => value != null,
-                transform: (value) => value,
-              ) ?? double.infinity,
-            ),
-            child: SizedBox(
-              height: 50,
-              child: Center(
-                child: Text(
-                  item.data,
-                  style: ThemeHelper.getThemeElement<TextStyle, TextStyle>(
-                    [
-                      context.textTheme.titleMedium,
-                      context
-                          .themeExtension<TopBarThemeExtension>()
-                          ?.subTitleStyle,
-                      item.style,
-                    ],
-                    combine: (value, element) => value?.merge(element),
-                    valueValidator: (value) => value != null,
-                    transform: (value) => value,
-                  ),
+          SizedBox(
+            height: 50,
+            child: Center(
+              child: Text(
+                item.data,
+                style: ThemeHelper.getThemeElement<TextStyle, TextStyle>(
+                  [
+                    context.textTheme.titleMedium,
+                    context
+                        .themeExtension<TopBarThemeExtension>()
+                        ?.subTitleStyle,
+                    item.style,
+                  ],
+                  combine: (value, element) => value?.merge(element),
+                  valueValidator: (value) => value != null,
+                  transform: (value) => value,
                 ),
               ),
             ),

packages/wyatt_ui_kit/lib/src/components/cards/skill_card/skill_card.dart

@@ -62,6 +62,7 @@ class SkillCard extends SkillCardComponent with $SkillCardCWMixin {
               secondaryBackgroundColors: secondaryBackgroundColors,
               icon: icon,
               title: title,
+              gradient: gradient,
             ),
             const Gap(25),
             if (description != null) ...[

packages/wyatt_ui_kit/lib/src/components/cards/skill_card/skill_card.g.dart

@@ -10,7 +10,7 @@ class $SkillCardCWProxyImpl implements $SkillCardComponentCWProxy {
   const $SkillCardCWProxyImpl(this._value);
   final SkillCard _value;
   @override
-  SkillCard icon(Widget? icon) => this(icon: icon);
+  SkillCard icon(IconData? icon) => this(icon: icon);
   @override
   SkillCard gradient(List<Color>? gradient) => this(gradient: gradient);
   @override
@@ -48,7 +48,7 @@ class $SkillCardCWProxyImpl implements $SkillCardComponentCWProxy {
   SkillCard key(Key? key) => this(key: key);
   @override
   SkillCard call({
-    Widget? icon,
+    IconData? icon,
     List<Color>? gradient,
     TextWrapper? title,
     TextWrapper? description,

packages/wyatt_ui_kit/lib/src/components/cards/skill_card/widgets/skill_card_header.dart

@@ -18,38 +18,61 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:wyatt_ui_components/wyatt_ui_components.dart';
 import 'package:wyatt_ui_kit/src/components/cards/widgets/card_text.dart';
+import 'package:wyatt_ui_kit/src/components/gradients/gradient_icon.dart';
+import 'package:wyatt_ui_kit/src/domain/card_theme_extension.dart';
 
 class SkillCardHeader extends StatelessWidget {
   const SkillCardHeader({
     super.key,
     this.icon,
     this.title,
+    this.gradient,
     this.secondaryBackgroundColors,
   });
 
-  final Widget? icon;
+  final IconData? icon;
   final TextWrapper? title;
+  final List<Color>? gradient;
   final Color? secondaryBackgroundColors;
 
   @override
   Widget build(BuildContext context) => Column(
         children: [
           if (icon != null) ...[
-            icon!,
+            Container(
+              padding: const EdgeInsets.all(10),
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: secondaryBackgroundColors ??
+                    Theme.of(context)
+                        .extension<CardThemeExtension>()
+                        ?.secondaryBackgroundColor,
+              ),
+              child: gradient != null
+                  ? GradientIcon(
+                      icon,
+                      size: 45,
+                      gradient: LinearGradient(colors: gradient!),
+                    )
+                  : Icon(
+                      icon,
+                      size: 45,
+                    ),
+            ),
             const Gap(25),
-          ],
-          Column(
-            children: [
-              if (title != null) ...[
-                CardText(
-                  title!,
-                  textType: TextType.title,
-                  style: title!.style,
-                  gradientColors: title!.gradientColors,
-                ),
+            Column(
+              children: [
+                if (title != null) ...[
+                  CardText(
+                    title!,
+                    textType: TextType.title,
+                    style: title!.style,
+                    gradientColors: title!.gradientColors,
+                  ),
+                ],
               ],
-            ],
-          )
+            )
+          ],
         ],
       );
 }

packages/wyatt_ui_kit/lib/src/domain/top_bar_theme_extension.dart

@@ -25,8 +25,6 @@ abstract class TopBarThemeExtension
     this.secondaryColor,
     this.titleStyle,
     this.subTitleStyle,
-    this.selectedIndicatorHeight,
-    this.selectedIndicatorWidth,
   });
 
   final MultiColor? backgroundColors;
@@ -35,7 +33,4 @@ abstract class TopBarThemeExtension
 
   final TextStyle? titleStyle;
   final TextStyle? subTitleStyle;
-
-  final double? selectedIndicatorHeight;
-  final double? selectedIndicatorWidth;
 }