From d81d6804201b98aad232841eb656e125c465123e Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Thu, 3 Dec 2020 11:55:14 +0100
Subject: [PATCH] fix borderradius

---
 lib/src/message_list_view.dart |  7 +++++-
 lib/src/message_widget.dart    | 39 ++++++++++++----------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index 3feda8ce..430e0b85 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -617,7 +617,12 @@ class _MessageListViewState extends State<MessageListView> {
       showDeleteMessage: isMyMessage,
       borderSide: isMyMessage ? BorderSide.none : null,
       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),
       borderRadiusGeometry: BorderRadius.only(
         topLeft: Radius.circular(16),
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index deeaa921..1ba4db87 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -301,22 +301,19 @@ class _MessageWidgetState extends State<MessageWidget> {
                                           ),
                                         )
                                       : Material(
+                                          clipBehavior: Clip.antiAlias,
                                           shape: widget.shape ??
                                               RoundedRectangleBorder(
-                                                side: !hasFiles
-                                                    ? BorderSide.none
-                                                    : widget.borderSide ??
-                                                        BorderSide(
-                                                          color: Theme.of(context)
-                                                                      .brightness ==
-                                                                  Brightness
-                                                                      .dark
-                                                              ? Colors.white
-                                                                  .withAlpha(24)
-                                                              : Colors.black
-                                                                  .withAlpha(
-                                                                      24),
-                                                        ),
+                                                side: widget.borderSide ??
+                                                    BorderSide(
+                                                      color: Theme.of(context)
+                                                                  .brightness ==
+                                                              Brightness.dark
+                                                          ? Colors.white
+                                                              .withAlpha(24)
+                                                          : Colors.black
+                                                              .withAlpha(24),
+                                                    ),
                                                 borderRadius: widget
                                                         .borderRadiusGeometry ??
                                                     BorderRadius.zero,
@@ -327,7 +324,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                                                 hasFiles ? 2.0 : 0.0),
                                             child: Column(
                                               crossAxisAlignment:
-                                                  CrossAxisAlignment.end,
+                                                  CrossAxisAlignment.start,
                                               mainAxisSize: MainAxisSize.min,
                                               children: <Widget>[
                                                 ..._parseAttachments(context),
@@ -828,17 +825,7 @@ class _MessageWidgetState extends State<MessageWidget> {
     BuildContext context,
     Widget child,
   }) {
-    return Material(
-      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,
-          ),
+    return Container(
       color: _getBackgroundColor(),
       child: child,
     );