beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Removed hack for stroke

Browse source
This commit is contained in:
ashilkn 2023-01-16 16:20:47 +05:30
parent 56058c3762
commit e35905268e
2 changed files with 134 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

274
lib/ui/components/button_widget.dart
View file

@ -115,7 +115,6 @@ class ButtonWidget extends StatelessWidget {
buttonType.defaultBorderColor(colorScheme, buttonSize); buttonType.defaultBorderColor(colorScheme, buttonSize);
buttonStyle.pressedBorderColor = buttonType.pressedBorderColor( buttonStyle.pressedBorderColor = buttonType.pressedBorderColor(
colorScheme: colorScheme, colorScheme: colorScheme,
inverseColorScheme: inverseColorScheme,
buttonSize: buttonSize, buttonSize: buttonSize,
); );
buttonStyle.disabledBorderColor = buttonStyle.disabledBorderColor =
@ -231,151 +230,146 @@ class _ButtonChildWidgetState extends State<ButtonChildWidget> {
onTapDown: _shouldRegisterGestures ? _onTapDown : null, onTapDown: _shouldRegisterGestures ? _onTapDown : null,
onTapUp: _shouldRegisterGestures ? _onTapUp : null, onTapUp: _shouldRegisterGestures ? _onTapUp : null,
onTapCancel: _shouldRegisterGestures ? _onTapCancel : null, onTapCancel: _shouldRegisterGestures ? _onTapCancel : null,
child: Padding( child: Container(
padding: widget.buttonType == ButtonType.tertiaryCritical decoration: BoxDecoration(
? const EdgeInsets.all(1) borderRadius: const BorderRadius.all(Radius.circular(4)),
: const EdgeInsets.all(0), border: widget.buttonType == ButtonType.tertiaryCritical
child: Container( ? Border.all(color: borderColor)
: null,
),
child: AnimatedContainer(
duration: const Duration(milliseconds: 16),
width: widget.buttonSize == ButtonSize.large ? double.infinity : null,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(4)), borderRadius: const BorderRadius.all(Radius.circular(4)),
border: Border.all(color: borderColor), color: buttonColor,
), ),
child: AnimatedContainer( child: Padding(
duration: const Duration(milliseconds: 16), padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 16),
width: child: AnimatedSwitcher(
widget.buttonSize == ButtonSize.large ? double.infinity : null, duration: const Duration(milliseconds: 175),
decoration: BoxDecoration( switchInCurve: Curves.easeInOutExpo,
borderRadius: const BorderRadius.all(Radius.circular(4)), switchOutCurve: Curves.easeInOutExpo,
color: buttonColor, child: executionState == ExecutionState.idle ||
), !widget.shouldSurfaceExecutionStates
child: Padding( ? widget.buttonType.hasTrailingIcon
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 16), ? Row(
child: AnimatedSwitcher( mainAxisAlignment: MainAxisAlignment.spaceBetween,
duration: const Duration(milliseconds: 175), children: [
switchInCurve: Curves.easeInOutExpo, widget.labelText == null
switchOutCurve: Curves.easeInOutExpo, ? const SizedBox.shrink()
child: executionState == ExecutionState.idle || : Flexible(
!widget.shouldSurfaceExecutionStates child: Padding(
? widget.buttonType.hasTrailingIcon padding: widget.icon == null
? Row( ? const EdgeInsets.symmetric(
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(
horizontal: 8, horizontal: 8,
), )
child: Text( : const EdgeInsets.only(right: 16),
widget.labelText!, child: Text(
style: labelStyle, widget.labelText!,
maxLines: 2, overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis, maxLines: 2,
), style: labelStyle,
),
)
],
);
},
)
: 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, 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( : executionState == ExecutionState.inProgress
width: widthOfButton, ? SizedBox(
child: Icon( width: widthOfButton,
Icons.check_outlined, child: Row(
size: 20, mainAxisAlignment: MainAxisAlignment.center,
color: checkIconColor, mainAxisSize: MainAxisSize.min,
), children: [
) progressStatus == null
: const SizedBox.shrink(), //fallback ? 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
), ),
), ),
), ),

7
lib/ui/components/models/button_type.dart
View file

@ -88,15 +88,8 @@ enum ButtonType {
//Returning null to fallback to default color //Returning null to fallback to default color
Color? pressedBorderColor({ Color? pressedBorderColor({
required EnteColorScheme colorScheme, required EnteColorScheme colorScheme,
required EnteColorScheme inverseColorScheme,
required ButtonSize buttonSize, required ButtonSize buttonSize,
}) { }) {
if (buttonSize == ButtonSize.small && this == ButtonType.tertiaryCritical) {
return null;
}
if (isNeutral) {
return inverseColorScheme.strokeBase;
}
if (this == ButtonType.tertiaryCritical && buttonSize == ButtonSize.large) { if (this == ButtonType.tertiaryCritical && buttonSize == ButtonSize.large) {
return colorScheme.warning700; return colorScheme.warning700;
} }