fix borderradius

This commit is contained in:
Salvatore Giordano
2020-12-03 11:55:14 +01:00
parent e1c02de320
commit d81d680420
2 changed files with 19 additions and 27 deletions
+6 -1
View File
@@ -617,7 +617,12 @@ class _MessageListViewState extends State<MessageListView> {
showDeleteMessage: isMyMessage, showDeleteMessage: isMyMessage,
borderSide: isMyMessage ? BorderSide.none : null, borderSide: isMyMessage ? BorderSide.none : null,
onThreadTap: _onThreadTap, onThreadTap: _onThreadTap,
attachmentBorderRadiusGeometry: BorderRadius.circular(16), attachmentBorderRadiusGeometry: BorderRadius.only(
topLeft: Radius.circular(16),
bottomLeft: Radius.circular(!isNextUser ? 0 : 16),
topRight: Radius.circular(16),
bottomRight: Radius.circular(16),
),
attachmentPadding: const EdgeInsets.all(2), attachmentPadding: const EdgeInsets.all(2),
borderRadiusGeometry: BorderRadius.only( borderRadiusGeometry: BorderRadius.only(
topLeft: Radius.circular(16), topLeft: Radius.circular(16),
+13 -26
View File
@@ -301,22 +301,19 @@ class _MessageWidgetState extends State<MessageWidget> {
), ),
) )
: Material( : Material(
clipBehavior: Clip.antiAlias,
shape: widget.shape ?? shape: widget.shape ??
RoundedRectangleBorder( RoundedRectangleBorder(
side: !hasFiles side: widget.borderSide ??
? BorderSide.none BorderSide(
: widget.borderSide ?? color: Theme.of(context)
BorderSide( .brightness ==
color: Theme.of(context) Brightness.dark
.brightness == ? Colors.white
Brightness .withAlpha(24)
.dark : Colors.black
? Colors.white .withAlpha(24),
.withAlpha(24) ),
: Colors.black
.withAlpha(
24),
),
borderRadius: widget borderRadius: widget
.borderRadiusGeometry ?? .borderRadiusGeometry ??
BorderRadius.zero, BorderRadius.zero,
@@ -327,7 +324,7 @@ class _MessageWidgetState extends State<MessageWidget> {
hasFiles ? 2.0 : 0.0), hasFiles ? 2.0 : 0.0),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.end, CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
..._parseAttachments(context), ..._parseAttachments(context),
@@ -828,17 +825,7 @@ class _MessageWidgetState extends State<MessageWidget> {
BuildContext context, BuildContext context,
Widget child, Widget child,
}) { }) {
return Material( return Container(
shape: widget.shape ??
RoundedRectangleBorder(
side: widget.borderSide ??
BorderSide(
color: Theme.of(context).brightness == Brightness.dark
? Colors.white.withAlpha(24)
: Colors.black.withAlpha(24),
),
borderRadius: widget.borderRadiusGeometry ?? BorderRadius.zero,
),
color: _getBackgroundColor(), color: _getBackgroundColor(),
child: child, child: child,
); );