Removed hack for stroke
This commit is contained in:
ashilkn
parent
56058c3762
commit
e35905268e
|
|
@ -115,7 +115,6 @@ class ButtonWidget extends StatelessWidget {
|
|||
buttonType.defaultBorderColor(colorScheme, buttonSize);
|
||||
buttonStyle.pressedBorderColor = buttonType.pressedBorderColor(
|
||||
colorScheme: colorScheme,
|
||||
inverseColorScheme: inverseColorScheme,
|
||||
buttonSize: buttonSize,
|
||||
);
|
||||
buttonStyle.disabledBorderColor =
|
||||
|
|
@ -231,151 +230,146 @@ class _ButtonChildWidgetState extends State<ButtonChildWidget> {
|
|||
onTapDown: _shouldRegisterGestures ? _onTapDown : null,
|
||||
onTapUp: _shouldRegisterGestures ? _onTapUp : null,
|
||||
onTapCancel: _shouldRegisterGestures ? _onTapCancel : null,
|
||||
child: Padding(
|
||||
padding: widget.buttonType == ButtonType.tertiaryCritical
|
||||
? const EdgeInsets.all(1)
|
||||
: const EdgeInsets.all(0),
|
||||
child: Container(
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.all(Radius.circular(4)),
|
||||
border: widget.buttonType == ButtonType.tertiaryCritical
|
||||
? Border.all(color: borderColor)
|
||||
: null,
|
||||
),
|
||||
child: AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 16),
|
||||
width: widget.buttonSize == ButtonSize.large ? double.infinity : null,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.all(Radius.circular(4)),
|
||||
border: Border.all(color: borderColor),
|
||||
color: buttonColor,
|
||||
),
|
||||
child: AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 16),
|
||||
width:
|
||||
widget.buttonSize == ButtonSize.large ? double.infinity : null,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.all(Radius.circular(4)),
|
||||
color: buttonColor,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 16),
|
||||
child: AnimatedSwitcher(
|
||||
duration: const Duration(milliseconds: 175),
|
||||
switchInCurve: Curves.easeInOutExpo,
|
||||
switchOutCurve: Curves.easeInOutExpo,
|
||||
child: executionState == ExecutionState.idle ||
|
||||
!widget.shouldSurfaceExecutionStates
|
||||
? widget.buttonType.hasTrailingIcon
|
||||
? Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
widget.labelText == null
|
||||
? const SizedBox.shrink()
|
||||
: Flexible(
|
||||
child: Padding(
|
||||
padding: widget.icon == null
|
||||
? const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
)
|
||||
: const EdgeInsets.only(right: 16),
|
||||
child: Text(
|
||||
widget.labelText!,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
maxLines: 2,
|
||||
style: labelStyle,
|
||||
),
|
||||
),
|
||||
),
|
||||
widget.icon == null
|
||||
? const SizedBox.shrink()
|
||||
: Icon(
|
||||
widget.icon,
|
||||
size: 20,
|
||||
color: iconColor,
|
||||
),
|
||||
],
|
||||
)
|
||||
: Builder(
|
||||
builder: (context) {
|
||||
SchedulerBinding.instance.addPostFrameCallback(
|
||||
(timeStamp) {
|
||||
final box =
|
||||
context.findRenderObject() as RenderBox;
|
||||
widthOfButton = box.size.width;
|
||||
},
|
||||
);
|
||||
return Row(
|
||||
mainAxisSize:
|
||||
widget.buttonSize == ButtonSize.large
|
||||
? MainAxisSize.max
|
||||
: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
widget.icon == null
|
||||
? const SizedBox.shrink()
|
||||
: Icon(
|
||||
widget.icon,
|
||||
size: 20,
|
||||
color: iconColor,
|
||||
),
|
||||
widget.icon == null ||
|
||||
widget.labelText == null
|
||||
? const SizedBox.shrink()
|
||||
: const SizedBox(width: 8),
|
||||
widget.labelText == null
|
||||
? const SizedBox.shrink()
|
||||
: Flexible(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 16),
|
||||
child: AnimatedSwitcher(
|
||||
duration: const Duration(milliseconds: 175),
|
||||
switchInCurve: Curves.easeInOutExpo,
|
||||
switchOutCurve: Curves.easeInOutExpo,
|
||||
child: executionState == ExecutionState.idle ||
|
||||
!widget.shouldSurfaceExecutionStates
|
||||
? widget.buttonType.hasTrailingIcon
|
||||
? Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
widget.labelText == null
|
||||
? const SizedBox.shrink()
|
||||
: Flexible(
|
||||
child: Padding(
|
||||
padding: widget.icon == null
|
||||
? const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
),
|
||||
child: Text(
|
||||
widget.labelText!,
|
||||
style: labelStyle,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
},
|
||||
)
|
||||
: executionState == ExecutionState.inProgress
|
||||
? SizedBox(
|
||||
width: widthOfButton,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
progressStatus == null
|
||||
? const SizedBox.shrink()
|
||||
: ValueListenableBuilder<String>(
|
||||
valueListenable: progressStatus!,
|
||||
builder: (
|
||||
BuildContext context,
|
||||
String value,
|
||||
Widget? child,
|
||||
) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
right: 8.0),
|
||||
child: Text(
|
||||
value,
|
||||
style: lightTextTheme.smallBold,
|
||||
),
|
||||
);
|
||||
},
|
||||
)
|
||||
: const EdgeInsets.only(right: 16),
|
||||
child: Text(
|
||||
widget.labelText!,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
maxLines: 2,
|
||||
style: labelStyle,
|
||||
),
|
||||
EnteLoadingWidget(
|
||||
is20pts: true,
|
||||
color: loadingIconColor,
|
||||
),
|
||||
),
|
||||
),
|
||||
widget.icon == null
|
||||
? const SizedBox.shrink()
|
||||
: Icon(
|
||||
widget.icon,
|
||||
size: 20,
|
||||
color: iconColor,
|
||||
),
|
||||
],
|
||||
)
|
||||
: Builder(
|
||||
builder: (context) {
|
||||
SchedulerBinding.instance.addPostFrameCallback(
|
||||
(timeStamp) {
|
||||
final box =
|
||||
context.findRenderObject() as RenderBox;
|
||||
widthOfButton = box.size.width;
|
||||
},
|
||||
);
|
||||
return Row(
|
||||
mainAxisSize:
|
||||
widget.buttonSize == ButtonSize.large
|
||||
? MainAxisSize.max
|
||||
: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
widget.icon == null
|
||||
? const SizedBox.shrink()
|
||||
: Icon(
|
||||
widget.icon,
|
||||
size: 20,
|
||||
color: iconColor,
|
||||
),
|
||||
widget.icon == null || widget.labelText == null
|
||||
? const SizedBox.shrink()
|
||||
: const SizedBox(width: 8),
|
||||
widget.labelText == null
|
||||
? const SizedBox.shrink()
|
||||
: Flexible(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
),
|
||||
child: Text(
|
||||
widget.labelText!,
|
||||
style: labelStyle,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
)
|
||||
: executionState == ExecutionState.successful
|
||||
? SizedBox(
|
||||
width: widthOfButton,
|
||||
child: Icon(
|
||||
Icons.check_outlined,
|
||||
size: 20,
|
||||
color: checkIconColor,
|
||||
),
|
||||
)
|
||||
: const SizedBox.shrink(), //fallback
|
||||
),
|
||||
);
|
||||
},
|
||||
)
|
||||
: executionState == ExecutionState.inProgress
|
||||
? SizedBox(
|
||||
width: widthOfButton,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
progressStatus == null
|
||||
? const SizedBox.shrink()
|
||||
: ValueListenableBuilder<String>(
|
||||
valueListenable: progressStatus!,
|
||||
builder: (
|
||||
BuildContext context,
|
||||
String value,
|
||||
Widget? child,
|
||||
) {
|
||||
return Padding(
|
||||
padding:
|
||||
const EdgeInsets.only(right: 8.0),
|
||||
child: Text(
|
||||
value,
|
||||
style: lightTextTheme.smallBold,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
EnteLoadingWidget(
|
||||
is20pts: true,
|
||||
color: loadingIconColor,
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
: executionState == ExecutionState.successful
|
||||
? SizedBox(
|
||||
width: widthOfButton,
|
||||
child: Icon(
|
||||
Icons.check_outlined,
|
||||
size: 20,
|
||||
color: checkIconColor,
|
||||
),
|
||||
)
|
||||
: const SizedBox.shrink(), //fallback
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -88,15 +88,8 @@ enum ButtonType {
|
|||
//Returning null to fallback to default color
|
||||
Color? pressedBorderColor({
|
||||
required EnteColorScheme colorScheme,
|
||||
required EnteColorScheme inverseColorScheme,
|
||||
required ButtonSize buttonSize,
|
||||
}) {
|
||||
if (buttonSize == ButtonSize.small && this == ButtonType.tertiaryCritical) {
|
||||
return null;
|
||||
}
|
||||
if (isNeutral) {
|
||||
return inverseColorScheme.strokeBase;
|
||||
}
|
||||
if (this == ButtonType.tertiaryCritical && buttonSize == ButtonSize.large) {
|
||||
return colorScheme.warning700;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue