master #81

Closed
malo wants to merge 322 commits from master into feat/bloc_layout/new-package
Showing only changes of commit 2baaf5c0bb - Show all commits

View File

@ -169,7 +169,11 @@ class FlatButtonScreen extends CubitScreen<ButtonCubit, ButtonState> {
mainAxisSize: mainAxisSize ?? MainAxisSize.min, mainAxisSize: mainAxisSize ?? MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
if (style.foregroundColors?.color != null && if (prefix != null &&
(prefix is Icon?) &&
((prefix as Icon?)?.color != null)) ...[
prefix!
] else if (style.foregroundColors?.color != null &&
prefix != null) ...[ prefix != null) ...[
ColorFiltered( ColorFiltered(
colorFilter: ColorFilter.mode( colorFilter: ColorFilter.mode(
@ -208,7 +212,21 @@ class FlatButtonScreen extends CubitScreen<ButtonCubit, ButtonState> {
) )
], ],
Gap(style.padding?.vertical ?? 10), Gap(style.padding?.vertical ?? 10),
if (style.foregroundColors?.color != null && if (suffix != null &&
(suffix is Icon?) &&
((suffix as Icon?)?.color != null)) ...[
suffix!
] else if (style.foregroundColors?.colors != null &&
style.foregroundColors!.colors.isNotEmpty &&
suffix != null) ...[
ColorFiltered(
colorFilter: ColorFilter.mode(
style.foregroundColors!.colors.last,
BlendMode.srcIn,
),
child: suffix,
)
] else if (style.foregroundColors?.color != null &&
suffix != null) ...[ suffix != null) ...[
ColorFiltered( ColorFiltered(
colorFilter: ColorFilter.mode( colorFilter: ColorFilter.mode(