Wyatt-FOSS/wyatt-packages
Wyatt-FOSS/wyatt-packages
6
2
Fork 0
Code Issues 20 Pull Requests 3 Actions Packages Projects Releases Activity

master #81

Closed
malo wants to merge 322 commits from master into feat/bloc_layout/new-package
pull from: master
merge into: Wyatt-FOSS:feat/bloc_layout/new-package
Conversation 0 Commits 322 Files Changed 1069 +107 -29
3 changed files with 107 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e1b76e07b - Show all commits

88
packages/wyatt_ui_kit/example/lib/buttons/buttons.dart
View File

@ -22,6 +22,10 @@ import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';
const _color1 = Color(0xFF3C97FB); const _color1 = Color(0xFF3C97FB);
const _color2 = Color(0xFF446DF4); const _color2 = Color(0xFF446DF4);
const _colors = [_color1, _color2]; const _colors = [_color1, _color2];
const _disabled = Color(0xFF6B7280);
const _background = Color(0xFF16191D);
const _disabledBackground = Color(0xFF16191D + 0x66FFFFFF);
const _disabledColors = [Color(0xFF60656A), Color(0xFF383C40)];
class Buttons extends StatelessWidget { class Buttons extends StatelessWidget {
const Buttons({super.key}); const Buttons({super.key});
@ -37,7 +41,7 @@ class Buttons extends StatelessWidget {
const OutlinedButton( const OutlinedButton(
label: TextWrapper('Voir notre savoir faire', gradient: _colors), label: TextWrapper('Voir notre savoir faire', gradient: _colors),
style: OutlinedButtonStyle( style: OutlinedButtonStyle(
borderColors: _colors, borderColors: MultiColor(_colors),
stroke: 3, stroke: 3,
), ),
prefix: Icon( prefix: Icon(
@ -57,7 +61,7 @@ class Buttons extends StatelessWidget {
context.textTheme.titleLarge?.copyWith(color: Colors.white), context.textTheme.titleLarge?.copyWith(color: Colors.white),
), ),
style: const FlatButtonStyle( style: const FlatButtonStyle(
borderColors: _colors, backgroundColors: MultiColor(_colors),
), ),
prefix: const Icon( prefix: const Icon(
Icons.arrow_forward_rounded, Icons.arrow_forward_rounded,
@ -68,6 +72,86 @@ class Buttons extends StatelessWidget {
color: Colors.white, color: Colors.white,
), ),
), ),
const Gap(20),
ColoredBox(
color: _background,
child: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Column(
children: [
const Gap(20),
OutlinedButton(
label: TextWrapper(
'Démarrer mon projet',
style: context.textTheme.titleLarge
?.copyWith(color: _disabled),
),
style: const OutlinedButtonStyle(
borderColors: MultiColor(_disabledColors),
backgroundColors:
MultiColor.single(_disabledBackground),
stroke: 1,
),
),
const Gap(20),
FlatButton(
label: TextWrapper(
'Démarrer mon projet',
style: context.textTheme.titleLarge
?.copyWith(color: Colors.white),
),
style: const FlatButtonStyle(
backgroundColors: MultiColor(_colors),
),
),
const Gap(20),
],
),
const Gap(20),
Column(
children: [
const Gap(20),
OutlinedButton(
label: TextWrapper(
'Aller voir nos réalisations',
style: context.textTheme.titleLarge
?.copyWith(color: Colors.white),
),
style: const OutlinedButtonStyle(
borderColors: MultiColor(_colors),
backgroundColors:
MultiColor.single(_disabledBackground),
stroke: 3,
),
suffix: const Icon(
Icons.arrow_forward_rounded,
color: Colors.white,
),
),
const Gap(20),
FlatButton(
label: TextWrapper(
'Aller voir nos réalisations',
style: context.textTheme.titleLarge
?.copyWith(color: Colors.white),
),
style: const FlatButtonStyle(
backgroundColors: MultiColor(_colors),
),
suffix: const Icon(
Icons.arrow_forward_rounded,
color: Colors.white,
),
),
const Gap(20),
],
),
],
),
),
),
], ],
); );
} }

21
packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button.dart
View File

@ -40,20 +40,17 @@ class FlatButton extends FlatButtonComponent with $FlatButtonCWMixin {
@override @override
Widget build(BuildContext context) => Material( Widget build(BuildContext context) => Material(
color: const Color(0x00000000),
child: Ink( child: Ink(
decoration: BoxDecoration( decoration: BoxDecoration(
color: style?.backgroundColor ?? color: (style != null)
Theme.of(context).buttonTheme.colorScheme?.onPrimary, ? style!.backgroundColors?.color
gradient: LinearGradient( : Theme.of(context).buttonTheme.colorScheme?.onPrimary,
colors: (style?.borderColors != null && gradient: (style?.backgroundColors?.isGradient ?? false)
style!.borderColors!.length >= 2) ? LinearGradient(
? style!.borderColors! colors: style!.backgroundColors!.colors,
: [ )
// TODO(hpcl): change this : null,
Theme.of(context).cardColor,
Theme.of(context).cardColor
],
),
boxShadow: [ boxShadow: [
if (style?.shadow != null) ...[style!.shadow!] if (style?.shadow != null) ...[style!.shadow!]
], ],

27
packages/wyatt_ui_kit/lib/src/components/buttons/outlined_button/outlined_button.dart
View File

@ -42,23 +42,20 @@ class OutlinedButton extends OutlinedButtonComponent
@override @override
Widget build(BuildContext context) => Material( Widget build(BuildContext context) => Material(
color: const Color(0x00000000),
child: Ink( child: Ink(
decoration: BoxDecoration( decoration: BoxDecoration(
color: style?.backgroundColor ?? color: (style != null)
Theme.of(context).buttonTheme.colorScheme?.onPrimary, ? style!.backgroundColors?.color
border: GradientBoxBorder( : Theme.of(context).buttonTheme.colorScheme?.onPrimary,
gradient: LinearGradient( border: (style?.borderColors?.isGradient ?? false)
colors: (style?.borderColors != null && ? GradientBoxBorder(
style!.borderColors!.length >= 2) gradient: LinearGradient(
? style!.borderColors! colors: style!.borderColors!.colors,
: [ ),
// TODO(hpcl): change this width: style?.stroke ?? 2,
Theme.of(context).cardColor, )
Theme.of(context).cardColor : null,
],
),
width: style?.stroke ?? 2,
),
boxShadow: [ boxShadow: [
if (style?.shadow != null) ...[style!.shadow!] if (style?.shadow != null) ...[style!.shadow!]
], ],