Compare commits

...

4 Commits

Author SHA1 Message Date
3679efece1 feat'ui_kit): increase top bar leading width
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-12 12:31:00 +00:00
8c06f98624 feat(ui_kit): make top bar selector customizable 2023-04-12 12:31:00 +00:00
30a7cc4894 feat(ui_component): generate new skillcard component 2023-04-12 12:31:00 +00:00
6f09eeca0e feat(ui_kit): make skillcard header icon customizable 2023-04-12 12:31:00 +00:00
10 changed files with 105 additions and 66 deletions

View File

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

View File

@ -7,7 +7,7 @@ part of 'skill_card_component.dart';
// **************************************************************************
abstract class $SkillCardComponentCWProxy {
SkillCardComponent icon(IconData? icon);
SkillCardComponent icon(Widget? 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({
IconData? icon,
Widget? icon,
List<Color>? gradient,
TextWrapper? title,
TextWrapper? description,

View File

@ -36,7 +36,18 @@ class SkillCards extends StatelessWidget {
children: [
SkillCard(
gradient: const [Colors.red, Colors.orange],
icon: Icons.ac_unit_sharp,
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]),
),
),
title: 'Lorem Ipsum'.wrap(),
description: 'Cupidatat reprehenderit aliqua eiusmod Lorem. '
'Qui ipsum id ea ea nulla labore aute ullamco aute '
@ -54,7 +65,19 @@ class SkillCards extends StatelessWidget {
const Gap(20),
SkillCard(
gradient: const [Colors.blue, Colors.green],
icon: Icons.ac_unit_sharp,
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],
),
),
),
title: 'Lorem Ipsum'.wrap(),
description: 'Cupidatat reprehenderit aliqua eiusmod Lorem. '
'Qui ipsum id ea ea nulla labore aute ullamco aute '

View File

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

View File

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

View File

@ -33,8 +33,28 @@ class NavigationItem extends StatelessWidget {
children: [
if (selected)
Container(
height: 5,
width: 70,
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,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: ThemeHelper.getThemeElement<Color, Color>(
@ -49,7 +69,21 @@ class NavigationItem extends StatelessWidget {
),
),
),
SizedBox(
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(
@ -69,6 +103,7 @@ class NavigationItem extends StatelessWidget {
),
),
),
),
],
);
}

View File

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

View File

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

View File

@ -18,48 +18,26 @@ 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 IconData? icon;
final Widget? icon;
final TextWrapper? title;
final List<Color>? gradient;
final Color? secondaryBackgroundColors;
@override
Widget build(BuildContext context) => Column(
children: [
if (icon != null) ...[
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,
),
),
icon!,
const Gap(25),
],
Column(
children: [
if (title != null) ...[
@ -73,6 +51,5 @@ class SkillCardHeader extends StatelessWidget {
],
)
],
],
);
}

View File

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